diff --git a/backend/jottacloud/jottacloud.go b/backend/jottacloud/jottacloud.go
index 5860dba6e..d482668ed 100644
--- a/backend/jottacloud/jottacloud.go
+++ b/backend/jottacloud/jottacloud.go
@@ -1451,7 +1451,7 @@ func (f *Fs) createOrUpdate(ctx context.Context, file string, createTime time.Ti
 	return info, nil
 }
 
-// copyOrMoves copies or moves directories or files depending on the method parameter
+// copyOrMove copies or moves directories or files depending on the method parameter
 func (f *Fs) copyOrMove(ctx context.Context, method, src, dest string) (info *api.JottaFile, err error) {
 	opts := rest.Opts{
 		Method:     "POST",
diff --git a/backend/swift/swift.go b/backend/swift/swift.go
index d15c33944..5a44f3353 100644
--- a/backend/swift/swift.go
+++ b/backend/swift/swift.go
@@ -1330,7 +1330,7 @@ func (o *Object) isDynamicLargeObject(ctx context.Context) (bool, error) {
 	return o.hasHeader(ctx, "X-Object-Manifest")
 }
 
-// isStaticLargeObjectFile checks for the X-Static-Large-Object header
+// isStaticLargeObject checks for the X-Static-Large-Object header
 func (o *Object) isStaticLargeObject(ctx context.Context) (bool, error) {
 	if o.fs.opt.NoLargeObjects {
 		return false, nil
diff --git a/backend/yandex/yandex.go b/backend/yandex/yandex.go
index 1abb3fc87..3edbfccd1 100644
--- a/backend/yandex/yandex.go
+++ b/backend/yandex/yandex.go
@@ -662,7 +662,7 @@ func (f *Fs) Purge(ctx context.Context, dir string) error {
 	return f.purgeCheck(ctx, dir, false)
 }
 
-// copyOrMoves copies or moves directories or files depending on the method parameter
+// copyOrMove copies or moves directories or files depending on the method parameter
 func (f *Fs) copyOrMove(ctx context.Context, method, src, dst string, overwrite bool) (err error) {
 	opts := rest.Opts{
 		Method:     "POST",
diff --git a/cmd/serve/sftp/handler.go b/cmd/serve/sftp/handler.go
index 1b3a1ab58..1ce26e062 100644
--- a/cmd/serve/sftp/handler.go
+++ b/cmd/serve/sftp/handler.go
@@ -18,7 +18,7 @@ type vfsHandler struct {
 	*vfs.VFS
 }
 
-// vfsHandler returns a Handlers object with the test handlers.
+// newVFSHandler returns a Handlers object with the test handlers.
 func newVFSHandler(vfs *vfs.VFS) sftp.Handlers {
 	v := vfsHandler{VFS: vfs}
 	return sftp.Handlers{
diff --git a/fs/rc/rcserver/rcserver_test.go b/fs/rc/rcserver/rcserver_test.go
index 95f766bfa..98bc895c6 100644
--- a/fs/rc/rcserver/rcserver_test.go
+++ b/fs/rc/rcserver/rcserver_test.go
@@ -376,7 +376,7 @@ func TestRemoteServing(t *testing.T) {
 	testServer(t, tests, &opt)
 }
 
-// checkServeRemote must reject request-derived backend instantiation on the
+// TestCheckServeRemote must reject request-derived backend instantiation on the
 // unauthenticated file-serving path, and global.* config mutation.
 func TestCheckServeRemote(t *testing.T) {
 	for _, test := range []struct {