diff --git a/cmd/artifact/artifact.go b/cmd/artifact/artifact.go
index 43b8b86f..8cac9b9d 100644
--- a/cmd/artifact/artifact.go
+++ b/cmd/artifact/artifact.go
@@ -30,7 +30,7 @@ import (
 )
 
 // NewArtifactCmd return the artifact command.
-func NewArtifactCmd(ctx context.Context, opt *commonoptions.CommonOptions) *cobra.Command {
+func NewArtifactCmd(ctx context.Context, opt *commonoptions.Common) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   "artifact",
 		DisableFlagsInUseLine: true,
diff --git a/cmd/artifact/follow/follow.go b/cmd/artifact/follow/follow.go
index 6bc43086..9125d85f 100644
--- a/cmd/artifact/follow/follow.go
+++ b/cmd/artifact/follow/follow.go
@@ -78,8 +78,8 @@ Example - Install and follow "cloudtrail" plugins using a fully qualified refere
 )
 
 type artifactFollowOptions struct {
-	*options.CommonOptions
-	*options.RegistryOptions
+	*options.Common
+	*options.Registry
 	rulesfilesDir string
 	pluginsDir    string
 	tmpDir        string
@@ -94,12 +94,14 @@ type artifactFollowOptions struct {
 }
 
 // NewArtifactFollowCmd returns the artifact follow command.
-func NewArtifactFollowCmd(ctx context.Context, opt *options.CommonOptions) *cobra.Command {
+//
+//nolint:gocyclo // unknown reason for cyclomatic complexity
+func NewArtifactFollowCmd(ctx context.Context, opt *options.Common) *cobra.Command {
 	o := artifactFollowOptions{
-		CommonOptions:   opt,
-		RegistryOptions: &options.RegistryOptions{},
-		closeChan:       make(chan bool),
-		versions:        config.FalcoVersions{},
+		Common:    opt,
+		Registry:  &options.Registry{},
+		closeChan: make(chan bool),
+		versions:  config.FalcoVersions{},
 	}
 
 	cmd := &cobra.Command{
@@ -220,7 +222,7 @@ func NewArtifactFollowCmd(ctx context.Context, opt *options.CommonOptions) *cobr
 		},
 	}
 
-	o.RegistryOptions.AddFlags(cmd)
+	o.Registry.AddFlags(cmd)
 	cmd.Flags().DurationVarP(&o.every, "every", "e", config.FollowResync, "Time interval how often it checks for a new version of the "+
 		"artifact. Cannot be used together with 'cron' option.")
 	cmd.Flags().StringVar(&o.cron, "cron", "", "Cron-like string to specify interval how often it checks for a new version of the artifact."+
diff --git a/cmd/artifact/info/info.go b/cmd/artifact/info/info.go
index 1ba7ed25..f1bf2a62 100644
--- a/cmd/artifact/info/info.go
+++ b/cmd/artifact/info/info.go
@@ -29,15 +29,15 @@ import (
 )
 
 type artifactInfoOptions struct {
-	*options.CommonOptions
-	*options.RegistryOptions
+	*options.Common
+	*options.Registry
 }
 
 // NewArtifactInfoCmd returns the artifact info command.
-func NewArtifactInfoCmd(ctx context.Context, opt *options.CommonOptions) *cobra.Command {
+func NewArtifactInfoCmd(ctx context.Context, opt *options.Common) *cobra.Command {
 	o := artifactInfoOptions{
-		CommonOptions:   opt,
-		RegistryOptions: &options.RegistryOptions{},
+		Common:   opt,
+		Registry: &options.Registry{},
 	}
 
 	cmd := &cobra.Command{
@@ -53,7 +53,7 @@ func NewArtifactInfoCmd(ctx context.Context, opt *options.CommonOptions) *cobra.
 		},
 	}
 
-	o.RegistryOptions.AddFlags(cmd)
+	o.Registry.AddFlags(cmd)
 
 	return cmd
 }
diff --git a/cmd/artifact/install/install.go b/cmd/artifact/install/install.go
index de731087..8f28a992 100644
--- a/cmd/artifact/install/install.go
+++ b/cmd/artifact/install/install.go
@@ -69,8 +69,8 @@ Example - Install "cloudtrail" plugins using a fully qualified reference:
 )
 
 type artifactInstallOptions struct {
-	*options.CommonOptions
-	*options.RegistryOptions
+	*options.Common
+	*options.Registry
 	rulesfilesDir string
 	pluginsDir    string
 	allowedTypes  oci.ArtifactTypeSlice
@@ -79,10 +79,10 @@ type artifactInstallOptions struct {
 }
 
 // NewArtifactInstallCmd returns the artifact install command.
-func NewArtifactInstallCmd(ctx context.Context, opt *options.CommonOptions) *cobra.Command {
+func NewArtifactInstallCmd(ctx context.Context, opt *options.Common) *cobra.Command {
 	o := artifactInstallOptions{
-		CommonOptions:   opt,
-		RegistryOptions: &options.RegistryOptions{},
+		Common:   opt,
+		Registry: &options.Registry{},
 	}
 
 	cmd := &cobra.Command{
@@ -161,7 +161,7 @@ func NewArtifactInstallCmd(ctx context.Context, opt *options.CommonOptions) *cob
 		},
 	}
 
-	o.RegistryOptions.AddFlags(cmd)
+	o.Registry.AddFlags(cmd)
 	cmd.Flags().StringVarP(&o.rulesfilesDir, FlagRulesFilesDir, "", config.RulesfilesDir,
 		"directory where to install rules.")
 	cmd.Flags().StringVarP(&o.pluginsDir, FlagPluginsFilesDir, "", config.PluginsDir,
diff --git a/cmd/artifact/list/artifact_list.go b/cmd/artifact/list/artifact_list.go
index 12853659..ddc15eb4 100644
--- a/cmd/artifact/list/artifact_list.go
+++ b/cmd/artifact/list/artifact_list.go
@@ -29,15 +29,15 @@ import (
 const CommandName = "list"
 
 type artifactListOptions struct {
-	*options.CommonOptions
+	*options.Common
 	artifactType oci.ArtifactType
 	index        string
 }
 
 // NewArtifactListCmd returns the artifact search command.
-func NewArtifactListCmd(ctx context.Context, opt *options.CommonOptions) *cobra.Command {
+func NewArtifactListCmd(ctx context.Context, opt *options.Common) *cobra.Command {
 	o := artifactListOptions{
-		CommonOptions: opt,
+		Common: opt,
 	}
 
 	cmd := &cobra.Command{
diff --git a/cmd/artifact/search/artifact_search.go b/cmd/artifact/search/artifact_search.go
index 7b84ef34..c726e51a 100644
--- a/cmd/artifact/search/artifact_search.go
+++ b/cmd/artifact/search/artifact_search.go
@@ -32,7 +32,7 @@ const (
 )
 
 type artifactSearchOptions struct {
-	*options.CommonOptions
+	*options.Common
 	minScore     float64
 	artifactType oci.ArtifactType
 }
@@ -46,9 +46,9 @@ func (o *artifactSearchOptions) Validate() error {
 }
 
 // NewArtifactSearchCmd returns the artifact search command.
-func NewArtifactSearchCmd(ctx context.Context, opt *options.CommonOptions) *cobra.Command {
+func NewArtifactSearchCmd(ctx context.Context, opt *options.Common) *cobra.Command {
 	o := artifactSearchOptions{
-		CommonOptions: opt,
+		Common: opt,
 	}
 
 	cmd := &cobra.Command{
diff --git a/cmd/cli_test.go b/cmd/cli_test.go
index 887fa2b2..20baf3b8 100644
--- a/cmd/cli_test.go
+++ b/cmd/cli_test.go
@@ -74,7 +74,7 @@ var tests = []testCase{
 
 func run(t *testing.T, test *testCase) {
 	// Setup
-	c := New(context.Background(), &options.CommonOptions{})
+	c := New(context.Background(), &options.Common{})
 	o := bytes.NewBufferString("")
 	c.SetOut(o)
 	c.SetErr(o)
diff --git a/cmd/cmd_suite_test.go b/cmd/cmd_suite_test.go
index 037fe5fb..7051ede6 100644
--- a/cmd/cmd_suite_test.go
+++ b/cmd/cmd_suite_test.go
@@ -45,7 +45,7 @@ var (
 	ctx          = context.Background()
 	output       = gbytes.NewBuffer()
 	rootCmd      *cobra.Command
-	opt          *commonoptions.CommonOptions
+	opt          *commonoptions.Common
 	port         int
 	orasRegistry *remote.Registry
 	configFile   string
diff --git a/cmd/index/add/add.go b/cmd/index/add/add.go
index f05e1afa..9dc400ff 100644
--- a/cmd/index/add/add.go
+++ b/cmd/index/add/add.go
@@ -27,13 +27,13 @@ import (
 
 // IndexAddOptions contains the options for the index add command.
 type IndexAddOptions struct {
-	*options.CommonOptions
+	*options.Common
 }
 
 // NewIndexAddCmd returns the index add command.
-func NewIndexAddCmd(ctx context.Context, opt *options.CommonOptions) *cobra.Command {
+func NewIndexAddCmd(ctx context.Context, opt *options.Common) *cobra.Command {
 	o := IndexAddOptions{
-		CommonOptions: opt,
+		Common: opt,
 	}
 
 	cmd := &cobra.Command{
diff --git a/cmd/index/index.go b/cmd/index/index.go
index c7cfe72f..f6f1142f 100644
--- a/cmd/index/index.go
+++ b/cmd/index/index.go
@@ -28,7 +28,7 @@ import (
 )
 
 // NewIndexCmd returns the index command.
-func NewIndexCmd(ctx context.Context, opt *commonoptions.CommonOptions) *cobra.Command {
+func NewIndexCmd(ctx context.Context, opt *commonoptions.Common) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   "index",
 		DisableFlagsInUseLine: true,
diff --git a/cmd/index/list/list.go b/cmd/index/list/list.go
index 10a27c68..7b3dd13f 100644
--- a/cmd/index/list/list.go
+++ b/cmd/index/list/list.go
@@ -26,13 +26,13 @@ import (
 )
 
 type indexListOptions struct {
-	*options.CommonOptions
+	*options.Common
 }
 
 // NewIndexListCmd returns the index list command.
-func NewIndexListCmd(_ context.Context, opt *options.CommonOptions) *cobra.Command {
+func NewIndexListCmd(_ context.Context, opt *options.Common) *cobra.Command {
 	o := indexListOptions{
-		CommonOptions: opt,
+		Common: opt,
 	}
 
 	cmd := &cobra.Command{
diff --git a/cmd/index/remove/remove.go b/cmd/index/remove/remove.go
index c69e90fa..56ef3de0 100644
--- a/cmd/index/remove/remove.go
+++ b/cmd/index/remove/remove.go
@@ -26,13 +26,13 @@ import (
 )
 
 type indexRemoveOptions struct {
-	*options.CommonOptions
+	*options.Common
 }
 
 // NewIndexRemoveCmd returns the index remove command.
-func NewIndexRemoveCmd(ctx context.Context, opt *options.CommonOptions) *cobra.Command {
+func NewIndexRemoveCmd(ctx context.Context, opt *options.Common) *cobra.Command {
 	o := indexRemoveOptions{
-		CommonOptions: opt,
+		Common: opt,
 	}
 
 	cmd := &cobra.Command{
diff --git a/cmd/index/update/update.go b/cmd/index/update/update.go
index 159b0268..bdc69578 100644
--- a/cmd/index/update/update.go
+++ b/cmd/index/update/update.go
@@ -26,13 +26,13 @@ import (
 )
 
 type indexUpdateOptions struct {
-	*options.CommonOptions
+	*options.Common
 }
 
 // NewIndexUpdateCmd returns the index update command.
-func NewIndexUpdateCmd(ctx context.Context, opt *options.CommonOptions) *cobra.Command {
+func NewIndexUpdateCmd(ctx context.Context, opt *options.Common) *cobra.Command {
 	o := indexUpdateOptions{
-		CommonOptions: opt,
+		Common: opt,
 	}
 
 	cmd := &cobra.Command{
diff --git a/cmd/registry/auth/auth.go b/cmd/registry/auth/auth.go
index 83f0c9bf..17b5a398 100644
--- a/cmd/registry/auth/auth.go
+++ b/cmd/registry/auth/auth.go
@@ -26,7 +26,7 @@ import (
 )
 
 // NewAuthCmd returns the registry command.
-func NewAuthCmd(ctx context.Context, opt *commonoptions.CommonOptions) *cobra.Command {
+func NewAuthCmd(ctx context.Context, opt *commonoptions.Common) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   "auth",
 		DisableFlagsInUseLine: true,
diff --git a/cmd/registry/auth/basic/basic.go b/cmd/registry/auth/basic/basic.go
index 73238d12..002f6ca4 100644
--- a/cmd/registry/auth/basic/basic.go
+++ b/cmd/registry/auth/basic/basic.go
@@ -29,13 +29,13 @@ import (
 )
 
 type loginOptions struct {
-	*options.CommonOptions
+	*options.Common
 }
 
 // NewBasicCmd returns the basic command.
-func NewBasicCmd(ctx context.Context, opt *options.CommonOptions) *cobra.Command {
+func NewBasicCmd(ctx context.Context, opt *options.Common) *cobra.Command {
 	o := loginOptions{
-		CommonOptions: opt,
+		Common: opt,
 	}
 
 	cmd := &cobra.Command{
diff --git a/cmd/registry/auth/gcp/gcp.go b/cmd/registry/auth/gcp/gcp.go
index 74c3a62d..61aca679 100644
--- a/cmd/registry/auth/gcp/gcp.go
+++ b/cmd/registry/auth/gcp/gcp.go
@@ -37,13 +37,13 @@ Example
 
 // RegistryGcpOptions contains the options for the registry gcp command.
 type RegistryGcpOptions struct {
-	*options.CommonOptions
+	*options.Common
 }
 
 // NewGcpCmd returns the gcp command.
-func NewGcpCmd(ctx context.Context, opt *options.CommonOptions) *cobra.Command {
+func NewGcpCmd(ctx context.Context, opt *options.Common) *cobra.Command {
 	o := RegistryGcpOptions{
-		CommonOptions: opt,
+		Common: opt,
 	}
 
 	cmd := &cobra.Command{
diff --git a/cmd/registry/auth/oauth/oauth.go b/cmd/registry/auth/oauth/oauth.go
index b314f1ba..7d488436 100644
--- a/cmd/registry/auth/oauth/oauth.go
+++ b/cmd/registry/auth/oauth/oauth.go
@@ -41,14 +41,14 @@ Example
 
 // RegistryOauthOptions contains the options for the registry oauth command.
 type RegistryOauthOptions struct {
-	*options.CommonOptions
+	*options.Common
 	Conf clientcredentials.Config
 }
 
 // NewOauthCmd returns the oauth command.
-func NewOauthCmd(ctx context.Context, opt *options.CommonOptions) *cobra.Command {
+func NewOauthCmd(ctx context.Context, opt *options.Common) *cobra.Command {
 	o := RegistryOauthOptions{
-		CommonOptions: opt,
+		Common: opt,
 	}
 
 	cmd := &cobra.Command{
diff --git a/cmd/registry/pull/pull.go b/cmd/registry/pull/pull.go
index 31bdda94..42607ea9 100644
--- a/cmd/registry/pull/pull.go
+++ b/cmd/registry/pull/pull.go
@@ -54,22 +54,22 @@ Example - Pull artifact "myrulesfile":
 )
 
 type pullOptions struct {
-	*options.CommonOptions
-	*options.ArtifactOptions
-	*options.RegistryOptions
+	*options.Common
+	*options.Artifact
+	*options.Registry
 	destDir string
 }
 
 func (o *pullOptions) Validate() error {
-	return o.ArtifactOptions.Validate()
+	return o.Artifact.Validate()
 }
 
 // NewPullCmd returns the pull command.
-func NewPullCmd(ctx context.Context, opt *options.CommonOptions) *cobra.Command {
+func NewPullCmd(ctx context.Context, opt *options.Common) *cobra.Command {
 	o := pullOptions{
-		CommonOptions:   opt,
-		ArtifactOptions: &options.ArtifactOptions{},
-		RegistryOptions: &options.RegistryOptions{},
+		Common:   opt,
+		Artifact: &options.Artifact{},
+		Registry: &options.Registry{},
 	}
 
 	cmd := &cobra.Command{
@@ -98,8 +98,8 @@ func NewPullCmd(ctx context.Context, opt *options.CommonOptions) *cobra.Command
 		},
 	}
 
-	o.RegistryOptions.AddFlags(cmd)
-	output.ExitOnErr(o.Printer, o.ArtifactOptions.AddFlags(cmd))
+	o.Registry.AddFlags(cmd)
+	output.ExitOnErr(o.Printer, o.Artifact.AddFlags(cmd))
 	cmd.Flags().StringVarP(&o.destDir, "dest-dir", "o", "", "destination dir where to save the artifacts(default: current directory)")
 	return cmd
 }
@@ -132,7 +132,7 @@ func (o *pullOptions) RunPull(ctx context.Context, args []string) error {
 	}
 
 	os, arch := runtime.GOOS, runtime.GOARCH
-	if len(o.ArtifactOptions.Platforms) > 0 {
+	if len(o.Artifact.Platforms) > 0 {
 		os, arch = o.OSArch(0)
 	}
 
diff --git a/cmd/registry/push/push.go b/cmd/registry/push/push.go
index 43b8e6f4..9547c175 100644
--- a/cmd/registry/push/push.go
+++ b/cmd/registry/push/push.go
@@ -67,21 +67,21 @@ Example - Push artifact "myrulesfile.tar.gz" of type "rulesfile" with multiple d
 )
 
 type pushOptions struct {
-	*options.CommonOptions
-	*options.ArtifactOptions
-	*options.RegistryOptions
+	*options.Common
+	*options.Artifact
+	*options.Registry
 }
 
 func (o pushOptions) validate() error {
-	return o.ArtifactOptions.Validate()
+	return o.Artifact.Validate()
 }
 
 // NewPushCmd returns the push command.
-func NewPushCmd(ctx context.Context, opt *options.CommonOptions) *cobra.Command {
+func NewPushCmd(ctx context.Context, opt *options.Common) *cobra.Command {
 	o := pushOptions{
-		CommonOptions:   opt,
-		ArtifactOptions: &options.ArtifactOptions{},
-		RegistryOptions: &options.RegistryOptions{},
+		Common:   opt,
+		Artifact: &options.Artifact{},
+		Registry: &options.Registry{},
 	}
 
 	cmd := &cobra.Command{
@@ -110,8 +110,8 @@ func NewPushCmd(ctx context.Context, opt *options.CommonOptions) *cobra.Command
 			return o.runPush(ctx, args)
 		},
 	}
-	o.RegistryOptions.AddFlags(cmd)
-	output.ExitOnErr(o.Printer, o.ArtifactOptions.AddFlags(cmd))
+	o.Registry.AddFlags(cmd)
+	output.ExitOnErr(o.Printer, o.Artifact.AddFlags(cmd))
 
 	return cmd
 }
diff --git a/cmd/registry/registry.go b/cmd/registry/registry.go
index 03329f65..4763e290 100644
--- a/cmd/registry/registry.go
+++ b/cmd/registry/registry.go
@@ -27,7 +27,7 @@ import (
 )
 
 // NewRegistryCmd returns the registry command.
-func NewRegistryCmd(ctx context.Context, opt *commonoptions.CommonOptions) *cobra.Command {
+func NewRegistryCmd(ctx context.Context, opt *commonoptions.Common) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   "registry",
 		DisableFlagsInUseLine: true,
diff --git a/cmd/root.go b/cmd/root.go
index 98c9a381..fb2acb00 100644
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -45,7 +45,7 @@ The official CLI tool for working with Falco and its ecosystem components
 )
 
 // New instantiates the root command and initializes the tree of commands.
-func New(ctx context.Context, opt *options.CommonOptions) *cobra.Command {
+func New(ctx context.Context, opt *options.Common) *cobra.Command {
 	rootCmd := &cobra.Command{
 		Use:               "falcoctl",
 		Short:             "The official CLI tool for working with Falco and its ecosystem components",
diff --git a/cmd/version/version.go b/cmd/version/version.go
index b8e9a28d..3ea1e250 100644
--- a/cmd/version/version.go
+++ b/cmd/version/version.go
@@ -48,7 +48,7 @@ var (
 )
 
 type options struct {
-	*commonoptions.CommonOptions
+	*commonoptions.Common
 	Output string
 }
 
@@ -77,9 +77,9 @@ func newVersion() version {
 }
 
 // NewVersionCmd returns the version command.
-func NewVersionCmd(opt *commonoptions.CommonOptions) *cobra.Command {
+func NewVersionCmd(opt *commonoptions.Common) *cobra.Command {
 	o := options{
-		CommonOptions: opt,
+		Common: opt,
 	}
 
 	v := newVersion()
diff --git a/cmd/version/version_test.go b/cmd/version/version_test.go
index a9416a61..1a895b63 100644
--- a/cmd/version/version_test.go
+++ b/cmd/version/version_test.go
@@ -47,8 +47,8 @@ var _ = Describe("Version", func() {
 		cfg := commonoptions.NewOptions()
 		cfg.Initialize(commonoptions.WithWriter(writer))
 		opt = &options{
-			CommonOptions: cfg,
-			Output:        outputFmt,
+			Common: cfg,
+			Output: outputFmt,
 		}
 	})
 
diff --git a/pkg/options/artifact_options.go b/pkg/options/artifact.go
similarity index 92%
rename from pkg/options/artifact_options.go
rename to pkg/options/artifact.go
index e6ae5816..09a48204 100644
--- a/pkg/options/artifact_options.go
+++ b/pkg/options/artifact.go
@@ -24,9 +24,9 @@ import (
 	"github.com/falcosecurity/falcoctl/pkg/oci"
 )
 
-// ArtifactOptions artifact specific options. Commands that need these options
+// Artifact specific options. Commands that need these options
 // may embed this struct in their options.
-type ArtifactOptions struct {
+type Artifact struct {
 	ArtifactType     oci.ArtifactType
 	Name             string
 	Version          string
@@ -40,7 +40,7 @@ type ArtifactOptions struct {
 var platformRgx = regexp.MustCompile(`^[a-z]+/[a-z0-9_]+$`)
 
 // Validate validates the options passed by the user.
-func (art *ArtifactOptions) Validate() error {
+func (art *Artifact) Validate() error {
 	for _, platform := range art.Platforms {
 		if ok := platformRgx.MatchString(platform); !ok {
 			return fmt.Errorf("platform %q seems to be in the wrong format: needs to be in OS/ARCH "+
@@ -53,7 +53,7 @@ func (art *ArtifactOptions) Validate() error {
 }
 
 // AddFlags registers the artifacts flags.
-func (art *ArtifactOptions) AddFlags(cmd *cobra.Command) error {
+func (art *Artifact) AddFlags(cmd *cobra.Command) error {
 	cmd.Flags().StringArrayVar(&art.Platforms, "platform", nil,
 		"os and architecture of the artifact in OS/ARCH format (only for plugins artifacts)")
 
@@ -100,7 +100,7 @@ func (art *ArtifactOptions) AddFlags(cmd *cobra.Command) error {
 }
 
 // OSArch returns the OS and the ARCH of the platform at index-th position.
-func (art *ArtifactOptions) OSArch(index int) (os, arch string) {
+func (art *Artifact) OSArch(index int) (os, arch string) {
 	if index >= len(art.Platforms) || index < 0 {
 		return "", ""
 	}
diff --git a/pkg/options/common_options.go b/pkg/options/common.go
similarity index 82%
rename from pkg/options/common_options.go
rename to pkg/options/common.go
index ff4b112d..d6bfa885 100644
--- a/pkg/options/common_options.go
+++ b/pkg/options/common.go
@@ -24,10 +24,10 @@ import (
 	"github.com/falcosecurity/falcoctl/pkg/output"
 )
 
-// CommonOptions provides the common flags, options, and printers for all the
-// commands. All the fields provided by the CommonOptions will be initialized before
+// Common provides the common flags, options, and printers for all the
+// commands. All the fields provided by the Common will be initialized before
 // the commands are executed through the Initialize func.
-type CommonOptions struct {
+type Common struct {
 	// Printer used by all commands to output messages.
 	Printer *output.Printer
 	// printerScope contains the data of the optional scope of a prefix.
@@ -46,38 +46,38 @@ type CommonOptions struct {
 	IndexCache *cache.Cache
 }
 
-// NewOptions returns a new CommonOptions struct.
-func NewOptions() *CommonOptions {
-	return &CommonOptions{}
+// NewOptions returns a new Common struct.
+func NewOptions() *Common {
+	return &Common{}
 }
 
 // Configs type of the configs accepted by the Initialize function.
-type Configs func(options *CommonOptions)
+type Configs func(options *Common)
 
 // WithPrinterScope sets the scope for the printer.
 func WithPrinterScope(scope string) Configs {
-	return func(options *CommonOptions) {
+	return func(options *Common) {
 		options.printerScope = scope
 	}
 }
 
 // WithWriter sets the writer for the printer.
 func WithWriter(writer io.Writer) Configs {
-	return func(options *CommonOptions) {
+	return func(options *Common) {
 		options.writer = writer
 	}
 }
 
 // WithIndexCache sets the index cache.
 func WithIndexCache(c *cache.Cache) Configs {
-	return func(options *CommonOptions) {
+	return func(options *Common) {
 		options.IndexCache = c
 	}
 }
 
 // Initialize initializes the options based on the configs. Subsequent calls will overwrite the
 // previous configurations based on the new configs passed to the functions.
-func (o *CommonOptions) Initialize(cfgs ...Configs) {
+func (o *Common) Initialize(cfgs ...Configs) {
 	for _, cfg := range cfgs {
 		cfg(o)
 	}
@@ -87,12 +87,12 @@ func (o *CommonOptions) Initialize(cfgs ...Configs) {
 }
 
 // IsVerbose used to check if the verbose flag is set or not.
-func (o *CommonOptions) IsVerbose() bool {
+func (o *Common) IsVerbose() bool {
 	return o.verbose
 }
 
 // AddFlags registers the common flags.
-func (o *CommonOptions) AddFlags(flags *pflag.FlagSet) {
+func (o *Common) AddFlags(flags *pflag.FlagSet) {
 	flags.BoolVarP(&o.verbose, "verbose", "v", false, "Enable verbose logs (default false)")
 	flags.BoolVar(&o.disableStyling, "disable-styling", false, "Disable output styling such as spinners, progress bars and colors. "+
 		"Styling is automatically disabled if not attacched to a tty (default false)")
diff --git a/pkg/options/registry_options.go b/pkg/options/registry.go
similarity index 82%
rename from pkg/options/registry_options.go
rename to pkg/options/registry.go
index 64b4446d..d41c700e 100644
--- a/pkg/options/registry_options.go
+++ b/pkg/options/registry.go
@@ -16,12 +16,12 @@ package options
 
 import "github.com/spf13/cobra"
 
-// RegistryOptions defines options that are common while interacting with a remote registry.
-type RegistryOptions struct {
+// Registry defines options that are common while interacting with a remote registry.
+type Registry struct {
 	PlainHTTP bool
 }
 
 // AddFlags registers the registry flags.
-func (r *RegistryOptions) AddFlags(cmd *cobra.Command) {
+func (r *Registry) AddFlags(cmd *cobra.Command) {
 	cmd.Flags().BoolVar(&r.PlainHTTP, "plain-http", false, "allows interacting with remote registry via plain http requests")
 }