diff --git a/internal/api/ui/login/device_auth.go b/internal/api/ui/login/device_auth.go
index 2135772e48..b05cc1a5fd 100644
--- a/internal/api/ui/login/device_auth.go
+++ b/internal/api/ui/login/device_auth.go
@@ -76,7 +76,7 @@ func (l *Login) renderDeviceAuthDone(w http.ResponseWriter, r *http.Request, aut
 	}
 }
 
-// handleDeviceUserCode serves the Device Authorization user code submission form.
+// handleDeviceAuthUserCode serves the Device Authorization user code submission form.
 // The "user_code" may be submitted by URL (GET) or form (POST).
 // When a "user_code" is received and found through query,
 // handleDeviceAuthUserCode will create a new AuthRequest in the repository.
diff --git a/internal/command/restrictions.go b/internal/command/restrictions.go
index e47a0e8c02..2e609029c6 100644
--- a/internal/command/restrictions.go
+++ b/internal/command/restrictions.go
@@ -37,7 +37,7 @@ func (s *SetRestrictions) Validate(defaultLanguage language.Tag) error {
 	return nil
 }
 
-// SetRestrictions creates new restrictions or updates existing restrictions.
+// SetInstanceRestrictions creates new restrictions or updates existing restrictions.
 func (c *Commands) SetInstanceRestrictions(
 	ctx context.Context,
 	setRestrictions *SetRestrictions,
diff --git a/internal/eventstore/handler/v2/handler.go b/internal/eventstore/handler/v2/handler.go
index 401d80a74e..02afc58ca2 100644
--- a/internal/eventstore/handler/v2/handler.go
+++ b/internal/eventstore/handler/v2/handler.go
@@ -421,7 +421,7 @@ func (h *Handler) Trigger(ctx context.Context, opts ...TriggerOpt) (_ context.Co
 	}
 }
 
-// lockInstances tries to lock the instance.
+// lockInstance tries to lock the instance.
 // If the instance is already locked from another process no cancel function is returned
 // the instance can be skipped then
 // If the instance is locked, an unlock deferrable function is returned