diff --git a/daemon/containerd/image_list.go b/daemon/containerd/image_list.go
index 2f49ffabe4..96244e3981 100644
--- a/daemon/containerd/image_list.go
+++ b/daemon/containerd/image_list.go
@@ -525,7 +525,7 @@ func getManifestPlatform(ctx context.Context, store content.Provider, manifestDe
 	return platforms.Normalize(platform), nil
 }
 
-// isImageManifests returns true if the manifest has any layer that is a known image layer.
+// isImageManifest returns true if the manifest has any layer that is a known image layer.
 // Some manifests use the image media type for compatibility, even if they are not a real image.
 func isImageManifest(mfst v1.Manifest) bool {
 	for _, l := range mfst.Layers {
diff --git a/daemon/kill.go b/daemon/kill.go
index 2d45fea0b8..420ea40b8d 100644
--- a/daemon/kill.go
+++ b/daemon/kill.go
@@ -178,7 +178,7 @@ func (daemon *Daemon) Kill(container *containerpkg.Container) error {
 	return nil
 }
 
-// killPossibleDeadProcess is a wrapper around killSig() suppressing "no such process" error.
+// killPossiblyDeadProcess is a wrapper around killSig() suppressing "no such process" error.
 func (daemon *Daemon) killPossiblyDeadProcess(container *containerpkg.Container, sig syscall.Signal) error {
 	err := daemon.killWithSignal(container, sig)
 	if errdefs.IsNotFound(err) {
diff --git a/daemon/logger/journald/journald.go b/daemon/logger/journald/journald.go
index 4d4e2c0019..fb04a45eb5 100644
--- a/daemon/logger/journald/journald.go
+++ b/daemon/logger/journald/journald.go
@@ -76,7 +76,7 @@ func init() {
 	}
 }
 
-// sanitizeKeyMode returns the sanitized string so that it could be used in journald.
+// sanitizeKeyMod returns the sanitized string so that it could be used in journald.
 // In journald log, there are special requirements for fields.
 // Fields must be composed of uppercase letters, numbers, and underscores, but must
 // not start with an underscore.
diff --git a/daemon/logger/plugin.go b/daemon/logger/plugin.go
index 8c155b0ddb..354f08e108 100644
--- a/daemon/logger/plugin.go
+++ b/daemon/logger/plugin.go
@@ -31,7 +31,7 @@ func RegisterPluginGetter(plugingetter getter.PluginGetter) {
 	pluginGetter = plugingetter
 }
 
-// GetDriver returns a logging driver by its name.
+// getPlugin returns a logging driver by its name.
 // If the driver is empty, it looks for the local driver.
 func getPlugin(name string, mode int) (Creator, error) {
 	p, err := pluginGetter.Get(name, extName, mode)
diff --git a/daemon/logs.go b/daemon/logs.go
index 567e3c7155..ef56b24e85 100644
--- a/daemon/logs.go
+++ b/daemon/logs.go
@@ -173,7 +173,7 @@ func (daemon *Daemon) getLogger(container *container.Container) (l logger.Logger
 	return
 }
 
-// mergeLogConfig merges the daemon log config to the container's log config if the container's log driver is not specified.
+// mergeAndVerifyLogConfig merges the daemon log config to the container's log config if the container's log driver is not specified.
 func (daemon *Daemon) mergeAndVerifyLogConfig(cfg *containertypes.LogConfig) error {
 	if cfg.Type == "" {
 		cfg.Type = daemon.defaultLogConfig.Type
diff --git a/dockerversion/useragent.go b/dockerversion/useragent.go
index 5e81438824..7fc3b69a75 100644
--- a/dockerversion/useragent.go
+++ b/dockerversion/useragent.go
@@ -30,7 +30,7 @@ var (
 	daemonUA     string
 )
 
-// getUserAgentFromContext returns the user-agent to use for requests made by
+// getDaemonUserAgent returns the user-agent to use for requests made by
 // the daemon.
 //
 // It includes;
diff --git a/integration/internal/build/build.go b/integration/internal/build/build.go
index 9dbdd1241e..0631a53605 100644
--- a/integration/internal/build/build.go
+++ b/integration/internal/build/build.go
@@ -27,7 +27,7 @@ func Do(ctx context.Context, t *testing.T, client client.APIClient, buildCtx *fa
 	return img
 }
 
-// GetImageIDFRommBody reads the image ID from the build response body.
+// GetImageIDFromBody reads the image ID from the build response body.
 func GetImageIDFromBody(t *testing.T, body io.Reader) string {
 	var (
 		jm  jsonmessage.JSONMessage