diff --git a/pkg/registry/client.go b/pkg/registry/client.go
index ecc7a0d04..fadffac5b 100644
--- a/pkg/registry/client.go
+++ b/pkg/registry/client.go
@@ -771,7 +771,7 @@ func PushOptStrictMode(strictMode bool) PushOption {
 	}
 }
 
-// PushOptCreationDate returns a function that sets the creation time
+// PushOptCreationTime returns a function that sets the creation time
 func PushOptCreationTime(creationTime string) PushOption {
 	return func(operation *pushOperation) {
 		operation.creationTime = creationTime
diff --git a/pkg/storage/driver/mock_test.go b/pkg/storage/driver/mock_test.go
index 199da6505..53919b45d 100644
--- a/pkg/storage/driver/mock_test.go
+++ b/pkg/storage/driver/mock_test.go
@@ -166,7 +166,7 @@ func (mock *MockConfigMapsInterface) Delete(_ context.Context, name string, _ me
 	return nil
 }
 
-// newTestFixture initializes a MockSecretsInterface.
+// newTestFixtureSecrets initializes a MockSecretsInterface.
 // Secrets are created for each release provided.
 func newTestFixtureSecrets(t *testing.T, releases ...*rspb.Release) *Secrets {
 	var mock MockSecretsInterface
diff --git a/pkg/storage/storage_test.go b/pkg/storage/storage_test.go
index 056b7f5f5..1dadc9c93 100644
--- a/pkg/storage/storage_test.go
+++ b/pkg/storage/storage_test.go
@@ -476,7 +476,7 @@ func TestStorageLast(t *testing.T) {
 	}
 }
 
-// TestUpgradeInitiallyFailedRelease tests a case when there are no deployed release yet, but history limit has been
+// TestUpgradeInitiallyFailedReleaseWithHistoryLimit tests a case when there are no deployed release yet, but history limit has been
 // reached: the has-no-deployed-releases error should not occur in such case.
 func TestUpgradeInitiallyFailedReleaseWithHistoryLimit(t *testing.T) {
 	storage := Init(driver.NewMemory())