diff --git a/pkg/cmd/factory/default.go b/pkg/cmd/factory/default.go
index 0eedd31c8f..2d46518c6f 100644
--- a/pkg/cmd/factory/default.go
+++ b/pkg/cmd/factory/default.go
@@ -94,7 +94,7 @@ func New(cliVersion string) *Factory {
 			return nil, err
 		}
 
-		builder.WithOpts(connectionCfg)
+		builder.WithConnectionConfig(connectionCfg)
 
 		conn, err = builder.Build()
 		if err != nil {
diff --git a/pkg/connection/builder.go b/pkg/connection/builder.go
index 3c597e929a..0bf5954364 100644
--- a/pkg/connection/builder.go
+++ b/pkg/connection/builder.go
@@ -35,7 +35,7 @@ type Builder struct {
 	config            config.IConfig
 	logger            logging.Logger
 	transportWrapper  TransportWrapper
-	connectionOpts    *Config
+	connectionConfig  *Config
 }
 
 // TransportWrapper is a wrapper for a transport of type http.RoundTripper.
@@ -126,8 +126,9 @@ func (b *Builder) WithConfig(cfg config.IConfig) *Builder {
 	return b
 }
 
-func (b *Builder) WithOpts(cfg *Config) *Builder {
-	b.connectionOpts = cfg
+// WithConnectionConfig contains config for the connection instance
+func (b *Builder) WithConnectionConfig(cfg *Config) *Builder {
+	b.connectionConfig = cfg
 	return b
 }
 
@@ -151,11 +152,11 @@ func (b *Builder) BuildContext(ctx context.Context) (connection *KeycloakConnect
 		return nil, AuthErrorf("Missing client ID")
 	}
 
-	if b.connectionOpts.RequireAuth && b.accessToken == "" && b.refreshToken == "" {
+	if b.connectionConfig.RequireAuth && b.accessToken == "" && b.refreshToken == "" {
 		return nil, &AuthError{notLoggedInError()}
 	}
 
-	if b.connectionOpts.RequireMASAuth && b.masAccessToken == "" && b.masRefreshToken == "" {
+	if b.connectionConfig.RequireMASAuth && b.masAccessToken == "" && b.masRefreshToken == "" {
 		return nil, &MasAuthError{notLoggedInMASError()}
 	}
 
@@ -278,7 +279,7 @@ func (b *Builder) BuildContext(ctx context.Context) (connection *KeycloakConnect
 		masRealm:          masKcRealm,
 		logger:            b.logger,
 		Config:            b.config,
-		connectionOpts:    b.connectionOpts,
+		connectionConfig:  b.connectionConfig,
 	}
 
 	return connection, nil
diff --git a/pkg/connection/keycloak_connection.go b/pkg/connection/keycloak_connection.go
index 11565f0ad4..bd4eb58b6f 100644
--- a/pkg/connection/keycloak_connection.go
+++ b/pkg/connection/keycloak_connection.go
@@ -58,7 +58,7 @@ type KeycloakConnection struct {
 	masRealm          string
 	logger            logging.Logger
 	Config            config.IConfig
-	connectionOpts    *Config
+	connectionConfig  *Config
 }
 
 // RefreshTokens will fetch a refreshed copy of the access token and refresh token from the authentication server
@@ -73,7 +73,7 @@ func (c *KeycloakConnection) RefreshTokens(ctx context.Context) (err error) {
 
 	// track if we need to update the config with new token values
 	var cfgChanged bool
-	if c.connectionOpts.RequireAuth {
+	if c.connectionConfig.RequireAuth {
 		// nolint:govet
 		refreshedTk, err := c.keycloakClient.RefreshToken(ctx, c.Token.RefreshToken, c.clientID, "", c.defaultRealm)
 		if err != nil {
@@ -92,7 +92,7 @@ func (c *KeycloakConnection) RefreshTokens(ctx context.Context) (err error) {
 		}
 	}
 
-	if c.connectionOpts.RequireMASAuth {
+	if c.connectionConfig.RequireMASAuth {
 		// nolint:govet
 		refreshedMasTk, err := c.masKeycloakClient.RefreshToken(ctx, c.MASToken.RefreshToken, c.clientID, "", c.masRealm)
 		if err != nil {