diff --git a/internal/epoch/epoch_advance.go b/internal/epoch/epoch_advance.go
index f7ede899b..07d86f1a2 100644
--- a/internal/epoch/epoch_advance.go
+++ b/internal/epoch/epoch_advance.go
@@ -6,7 +6,7 @@
 	"github.com/kopia/kopia/repo/blob"
 )
 
-// shouldAdvanceEpoch determines if the current epoch should be advanced based on set of blobs in it.
+// shouldAdvance determines if the current epoch should be advanced based on set of blobs in it.
 //
 // Epoch will be advanced if it's been more than 'minEpochDuration' between earliest and
 // most recent write AND at least one of the criteria has been met:
diff --git a/internal/epoch/epoch_utils.go b/internal/epoch/epoch_utils.go
index 4334f9f09..43a3705a4 100644
--- a/internal/epoch/epoch_utils.go
+++ b/internal/epoch/epoch_utils.go
@@ -32,7 +32,7 @@ func epochNumberFromBlobID(blobID blob.ID) (int, bool) {
 	return n, true
 }
 
-// epochNumberFromBlobID extracts the range epoch numbers from a string formatted as
+// epochRangeFromBlobID extracts the range epoch numbers from a string formatted as
 // <prefix><epochNumber>_<epochNumber2>_<remainder>.
 func epochRangeFromBlobID(blobID blob.ID) (min, max int, ok bool) {
 	parts := strings.Split(string(blobID), "_")
diff --git a/repo/maintenance/maintenance_run.go b/repo/maintenance/maintenance_run.go
index 6a0e632ca..bf3f9d515 100644
--- a/repo/maintenance/maintenance_run.go
+++ b/repo/maintenance/maintenance_run.go
@@ -531,7 +531,7 @@ func runFullMaintenance(ctx context.Context, runParams RunParameters, safety Saf
 	return nil
 }
 
-// shouldRewriteContents returns true if it's currently ok to rewrite contents.
+// shouldQuickRewriteContents returns true if it's currently ok to rewrite contents.
 // since each content rewrite will require deleting of orphaned blobs after some time passes,
 // we don't want to starve blob deletion by constantly doing rewrites.
 func shouldQuickRewriteContents(s *Schedule, safety SafetyParameters) bool {
diff --git a/tests/end_to_end_test/shallowrestore_test.go b/tests/end_to_end_test/shallowrestore_test.go
index 2fa58c675..131c15f70 100644
--- a/tests/end_to_end_test/shallowrestore_test.go
+++ b/tests/end_to_end_test/shallowrestore_test.go
@@ -700,7 +700,7 @@ func (rdc *repoDirEntryCache) getRepoDirEntry(t *testing.T, rop string) *snapsho
 	return nil
 }
 
-// validateXattr checks that shallowrestore absolute path srp has placeholder
+// validatePlaceholder checks that shallowrestore absolute path srp has placeholder
 // DirEntry value equal to the in-repository DirEntry for rootid/rop.
 func (rdc *repoDirEntryCache) validatePlaceholder(t *testing.T, rop, srp string) {
 	t.Helper()
diff --git a/tests/robustness/snapmeta/kopia_connector.go b/tests/robustness/snapmeta/kopia_connector.go
index 459554f94..460786bef 100644
--- a/tests/robustness/snapmeta/kopia_connector.go
+++ b/tests/robustness/snapmeta/kopia_connector.go
@@ -93,7 +93,7 @@ func (ki *kopiaConnector) initFilesystem(repoPath string) error {
 	return ki.snap.ConnectOrCreateFilesystem(repoPath)
 }
 
-// initS3WithServerFn initializes server mode with an S3 repository.
+// initS3WithServer initializes server mode with an S3 repository.
 func (ki *kopiaConnector) initS3WithServer(repoPath, bucketName, addr string) error {
 	cmd, fingerprint, err := ki.snap.ConnectOrCreateS3WithServer(addr, bucketName, repoPath)
 	ki.serverCmd = cmd