diff --git a/build_windows.md b/build_windows.md
index 6eb1ef57af..3640be8ca0 100644
--- a/build_windows.md
+++ b/build_windows.md
@@ -100,7 +100,7 @@ cd podman
 # Build podman.exe
 .\winmake.ps1 podman-remote
 
-# Downlaod gvproxy.exe and win-sshproxy.exe
+# Download gvproxy.exe and win-sshproxy.exe
 # that are needed to execute the podman client
 .\winmake.ps1 win-gvproxy
 ```
diff --git a/libpod/events.go b/libpod/events.go
index 1ca42ffd74..a9115b935f 100644
--- a/libpod/events.go
+++ b/libpod/events.go
@@ -127,7 +127,7 @@ func (c *Container) newExecDiedEvent(sessionID string, exitCode int) {
 	}
 }
 
-// netNetworkEvent creates a new event based on a network connect/disconnect
+// newNetworkEvent creates a new event based on a network connect/disconnect
 func (c *Container) newNetworkEvent(status events.Status, netName string) {
 	e := events.NewEvent(status)
 	e.ID = c.ID()
diff --git a/libpod/events/events.go b/libpod/events/events.go
index 80d8f0c083..01f97ea384 100644
--- a/libpod/events/events.go
+++ b/libpod/events/events.go
@@ -105,7 +105,7 @@ func (e *Event) ToHumanReadable(truncate bool) string {
 	return humanFormat
 }
 
-// NewEventFromString takes stringified json and converts
+// newEventFromJSONString takes stringified json and converts
 // it to an event
 func newEventFromJSONString(event string) (*Event, error) {
 	e := new(Event)
diff --git a/libpod/healthcheck.go b/libpod/healthcheck.go
index 47ddc04948..8e2a5a5e44 100644
--- a/libpod/healthcheck.go
+++ b/libpod/healthcheck.go
@@ -346,7 +346,7 @@ func newHealthCheckLog(start, end time.Time, exitCode int, log string) define.He
 	}
 }
 
-// updatedHealthCheckStatus updates the health status of the container
+// updateHealthStatus updates the health status of the container
 // in the healthcheck log
 func (c *Container) updateHealthStatus(status string) error {
 	healthCheck, err := c.getHealthCheckLog()
diff --git a/libpod/options.go b/libpod/options.go
index 5a6b599300..b0b76a3870 100644
--- a/libpod/options.go
+++ b/libpod/options.go
@@ -1827,7 +1827,7 @@ func WithSecrets(containerSecrets []*ContainerSecret) CtrCreateOption {
 	}
 }
 
-// WithSecrets adds environment variable secrets to the container
+// WithEnvSecrets adds environment variable secrets to the container
 func WithEnvSecrets(envSecrets map[string]string) CtrCreateOption {
 	return func(ctr *Container) error {
 		ctr.config.EnvSecrets = make(map[string]*secrets.Secret)
@@ -2085,7 +2085,7 @@ func WithPodCgroupParent(path string) PodCreateOption {
 	}
 }
 
-// WithPodCgroups tells containers in this pod to use the cgroup created for
+// WithPodParent tells containers in this pod to use the cgroup created for
 // this pod.
 // This can still be overridden at the container level by explicitly specifying
 // a Cgroup parent.
diff --git a/libpod/stats_freebsd.go b/libpod/stats_freebsd.go
index 9dbb8b12fd..538c8f5023 100644
--- a/libpod/stats_freebsd.go
+++ b/libpod/stats_freebsd.go
@@ -83,7 +83,7 @@ func (c *Container) getPlatformContainerStats(stats *define.ContainerStats, prev
 	return nil
 }
 
-// getMemory limit returns the memory limit for a container
+// getMemLimit returns the memory limit for a container
 func (c *Container) getMemLimit() uint64 {
 	memLimit := uint64(math.MaxUint64)
 
diff --git a/libpod/stats_linux.go b/libpod/stats_linux.go
index 19ce554cdc..36f861aa3e 100644
--- a/libpod/stats_linux.go
+++ b/libpod/stats_linux.go
@@ -69,7 +69,7 @@ func (c *Container) getPlatformContainerStats(stats *define.ContainerStats, prev
 	return nil
 }
 
-// getMemory limit returns the memory limit for a container
+// getMemLimit returns the memory limit for a container
 func (c *Container) getMemLimit(memLimit uint64) uint64 {
 	si := &syscall.Sysinfo_t{}
 	err := syscall.Sysinfo(si)
diff --git a/pkg/machine/update.go b/pkg/machine/update.go
index e5839c85e7..e910db66ce 100644
--- a/pkg/machine/update.go
+++ b/pkg/machine/update.go
@@ -15,7 +15,7 @@ func UpdatePodmanDockerSockService(mc *vmconfigs.MachineConfig) error {
 	command := fmt.Sprintf("'echo %q > %s'", content, ignition.PodmanDockerTmpConfPath)
 	args := []string{"sudo", "bash", "-c", command}
 	if err := CommonSSH(mc.SSH.RemoteUsername, mc.SSH.IdentityPath, mc.Name, mc.SSH.Port, args); err != nil {
-		logrus.Warnf("Could not not update internal docker sock config")
+		logrus.Warnf("Could not update internal docker sock config")
 		return err
 	}