diff --git a/pkg/connector/registry.go b/pkg/connector/registry.go
index 3bc033b8e..6cda258ae 100644
--- a/pkg/connector/registry.go
+++ b/pkg/connector/registry.go
@@ -36,33 +36,34 @@ func NewConnectorRegistry() *ConnectorRegistry {
 	}
 }
 
-func (cr *ConnectorRegistry) Register(provider string, connector Connector) error {
-	cr.Lock()
-	defer cr.Unlock()
-	if _, ok := cr.connectors[provider]; ok {
-		return fmt.Errorf("connector %q already registered", provider)
+func (r *ConnectorRegistry) Register(provider string, c Connector) error {
+	r.Lock()
+	defer r.Unlock()
+	if _, ok := r.connectors[provider]; ok {
+		return fmt.Errorf("cannot register connector %q: already registered", provider)
 	}
-	cr.connectors[provider] = connector
+
+	r.connectors[provider] = c
 	return nil
 }
 
-func (cr *ConnectorRegistry) Get(provider string) (Connector, error) {
-	cr.RLock()
-	defer cr.RUnlock()
-	connector, ok := cr.connectors[provider]
+func (r *ConnectorRegistry) Get(provider string) (Connector, error) {
+	r.RLock()
+	defer r.RUnlock()
+	c, ok := r.connectors[provider]
 	if !ok {
-		return nil, fmt.Errorf("connector %q not found", provider)
+		return nil, fmt.Errorf("cannot find connector %q", provider)
 	}
-	return connector, nil
+	return c, nil
 }
 
-func (cr *ConnectorRegistry) Initiate(ctx context.Context, provider string, organizationID gid.GID, r *http.Request) (string, error) {
-	connector, err := cr.Get(provider)
+func (r *ConnectorRegistry) Initiate(ctx context.Context, provider string, organizationID gid.GID, req *http.Request) (string, error) {
+	c, err := r.Get(provider)
 	if err != nil {
 		return "", fmt.Errorf("cannot initiate connector: %w", err)
 	}
 
-	return connector.Initiate(ctx, provider, organizationID, r)
+	return c.Initiate(ctx, provider, organizationID, req)
 }
 
 // ExtractProviderFromState decodes the OAuth2 state token without
@@ -77,76 +78,78 @@ func ExtractProviderFromState(stateToken string) (string, error) {
 	}
 
 	if payload.Data.Provider == "" {
-		return "", fmt.Errorf("state token has no provider")
+		return "", fmt.Errorf("cannot extract provider from state token: missing provider field")
 	}
 
 	return payload.Data.Provider, nil
 }
 
-func (cr *ConnectorRegistry) Complete(ctx context.Context, provider string, r *http.Request) (Connection, *gid.GID, string, error) {
-	connector, err := cr.Get(provider)
+func (r *ConnectorRegistry) Complete(ctx context.Context, provider string, req *http.Request) (Connection, *gid.GID, string, error) {
+	c, err := r.Get(provider)
 	if err != nil {
 		return nil, nil, "", fmt.Errorf("cannot complete connector: %w", err)
 	}
 
-	return connector.Complete(ctx, r)
+	return c.Complete(ctx, req)
 }
 
 // CompleteWithState completes the OAuth2 flow and returns the full state
 // including any reconnection context (ConnectorID).
-func (cr *ConnectorRegistry) CompleteWithState(ctx context.Context, provider string, r *http.Request) (Connection, *OAuth2State, error) {
-	connector, err := cr.Get(provider)
+func (r *ConnectorRegistry) CompleteWithState(ctx context.Context, provider string, req *http.Request) (Connection, *OAuth2State, error) {
+	c, err := r.Get(provider)
 	if err != nil {
 		return nil, nil, fmt.Errorf("cannot complete connector: %w", err)
 	}
 
-	oauth2Connector, ok := connector.(*OAuth2Connector)
+	oauth2Connector, ok := c.(*OAuth2Connector)
 	if !ok {
-		return nil, nil, fmt.Errorf("connector %q is not an OAuth2 connector", provider)
+		return nil, nil, fmt.Errorf("cannot complete connector %q: not an OAuth2 connector", provider)
 	}
 
-	return oauth2Connector.CompleteWithState(ctx, r)
+	return oauth2Connector.CompleteWithState(ctx, req)
 }
 
 // providerProbeURLs maps provider names to lightweight API endpoints
 // used to verify OAuth token validity. Each URL must accept a GET
 // request with a Bearer token and return 401/403 for invalid tokens.
-var providerProbeURLs = map[string]string{
-	"SLACK":            "https://slack.com/api/users.list?limit=1",
-	"GOOGLE_WORKSPACE": "https://admin.googleapis.com/admin/directory/v1/users?customer=my_customer&maxResults=1",
-	"LINEAR":           "https://api.linear.app/graphql",
-	"BREX":             "https://platform.brexapis.com/v2/users/me",
-	"HUBSPOT":          "https://api.hubapi.com/account-info/v3/details",
-	"DOCUSIGN":         "https://account-d.docusign.com/oauth/userinfo",
-	"NOTION":           "https://api.notion.com/v1/users/me",
-	"GITHUB":           "https://api.github.com/user",
-	"SENTRY":           "https://sentry.io/api/0/organizations/",
-	"INTERCOM":         "https://api.intercom.io/me",
-	"CLOUDFLARE":       "https://api.cloudflare.com/client/v4/user/tokens/verify",
-	"OPENAI":           "https://api.openai.com/v1/models",
-	"SUPABASE":         "https://api.supabase.com/v1/organizations",
-	"TALLY":            "https://api.tally.so/me",
-	"RESEND":           "https://api.resend.com/domains",
-	"ONE_PASSWORD":     "https://events.1password.com/api/v1/auditevents",
-}
+var (
+	providerProbeURLs = map[string]string{
+		"SLACK":            "https://slack.com/api/users.list?limit=1",
+		"GOOGLE_WORKSPACE": "https://admin.googleapis.com/admin/directory/v1/users?customer=my_customer&maxResults=1",
+		"LINEAR":           "https://api.linear.app/graphql",
+		"BREX":             "https://platform.brexapis.com/v2/users/me",
+		"HUBSPOT":          "https://api.hubapi.com/account-info/v3/details",
+		"DOCUSIGN":         "https://account-d.docusign.com/oauth/userinfo",
+		"NOTION":           "https://api.notion.com/v1/users/me",
+		"GITHUB":           "https://api.github.com/user",
+		"SENTRY":           "https://sentry.io/api/0/organizations/",
+		"INTERCOM":         "https://api.intercom.io/me",
+		"CLOUDFLARE":       "https://api.cloudflare.com/client/v4/user/tokens/verify",
+		"OPENAI":           "https://api.openai.com/v1/models",
+		"SUPABASE":         "https://api.supabase.com/v1/organizations",
+		"TALLY":            "https://api.tally.so/me",
+		"RESEND":           "https://api.resend.com/domains",
+		"ONE_PASSWORD":     "https://events.1password.com/api/v1/auditevents",
+	}
+)
 
 // GetProbeURL returns the probe URL for a provider.
-func (cr *ConnectorRegistry) GetProbeURL(provider string) string {
+func (r *ConnectorRegistry) GetProbeURL(provider string) string {
 	return providerProbeURLs[provider]
 }
 
 // GetOAuth2RefreshConfig returns the OAuth2 refresh configuration for a provider.
 // Returns nil if the provider is not found or is not an OAuth2 connector.
-func (cr *ConnectorRegistry) GetOAuth2RefreshConfig(provider string) *OAuth2RefreshConfig {
-	cr.RLock()
-	defer cr.RUnlock()
+func (r *ConnectorRegistry) GetOAuth2RefreshConfig(provider string) *OAuth2RefreshConfig {
+	r.RLock()
+	defer r.RUnlock()
 
-	connector, ok := cr.connectors[provider]
+	c, ok := r.connectors[provider]
 	if !ok {
 		return nil
 	}
 
-	oauth2Connector, ok := connector.(*OAuth2Connector)
+	oauth2Connector, ok := c.(*OAuth2Connector)
 	if !ok {
 		return nil
 	}