diff --git a/pkg/openfeature/api.go b/pkg/openfeature/api.go
index 2c17d8f0..00a999f2 100644
--- a/pkg/openfeature/api.go
+++ b/pkg/openfeature/api.go
@@ -75,7 +75,7 @@ func (api *evaluationAPI) setNamedProvider(clientName string, provider FeaturePr
 		return errors.New("provider cannot be set to nil")
 	}
 
-	// Initialize new default provider and shutdown the old one
+	// Initialize new named provider and shutdown the old one
 	// Provider update must be non-blocking, hence initialization & shutdown happens concurrently
 	oldProvider := api.namedProviders[clientName]
 	api.namedProviders[clientName] = provider
@@ -89,7 +89,7 @@ func (api *evaluationAPI) setNamedProvider(clientName string, provider FeaturePr
 	return nil
 }
 
-// getNamedProviders return default providers
+// getNamedProviders returns named providers map.
 func (api *evaluationAPI) getNamedProviders() map[string]FeatureProvider {
 	api.mu.RLock()
 	defer api.mu.RUnlock()
diff --git a/pkg/openfeature/openfeature.go b/pkg/openfeature/openfeature.go
index 77d41d7a..cbf5b8c7 100644
--- a/pkg/openfeature/openfeature.go
+++ b/pkg/openfeature/openfeature.go
@@ -93,7 +93,7 @@ func getProvider() FeatureProvider {
 	return api.getProvider()
 }
 
-// getNamedProviders returns the default provider of the API. Intended to be used by tests
+// getNamedProviders returns the named provider map of the API. Intended to be used by tests
 func getNamedProviders() map[string]FeatureProvider {
 	return api.getNamedProviders()
 }
diff --git a/pkg/openfeature/openfeature_test.go b/pkg/openfeature/openfeature_test.go
index 4d1ee17c..3e88ecd1 100644
--- a/pkg/openfeature/openfeature_test.go
+++ b/pkg/openfeature/openfeature_test.go
@@ -171,7 +171,7 @@ func TestRequirement_1_1_2_3(t *testing.T) {
 		select {
 		// short enough wait time, but not too long
 		case <-time.After(100 * time.Millisecond):
-			t.Errorf("shutdown not invoked for old default provider when registering new provider")
+			t.Errorf("shutdown not invoked for old named provider when registering new provider")
 		case <-shutdownSem:
 			break
 		}