diff --git a/design/architecture.md b/design/architecture.md
index 0c3196580..45e2089e5 100644
--- a/design/architecture.md
+++ b/design/architecture.md
@@ -19,7 +19,7 @@ is simply a directory on the filesystem.
 
 ![Architecture](architecture.png)
 
-Note that while these architectural ideas are important to understanding the
+Note that while these architectural ideas are important to understand the
 system, code layout may not reflect the exact architecture. These ideas should
 be used as a guide for placing functionality and behavior and understanding the
 thought behind the design.
diff --git a/design/lifecycle.md b/design/lifecycle.md
index deafcadfe..e602c04a2 100644
--- a/design/lifecycle.md
+++ b/design/lifecycle.md
@@ -1,6 +1,6 @@
 # Container Lifecycle
 
-While containerd is a daemon that provides API to manage multiple containers, the containers themselves are not tied to the lifecycle of containerd.  Each container has a shim that acts as the direct parent for the container's processes as well has reporting the exit status and holding onto the STDIO of the container.  This also allows containerd to crash and restore all functionality to containers.  
+While containerd is a daemon that provides API to manage multiple containers, the containers themselves are not tied to the lifecycle of containerd.  Each container has a shim that acts as the direct parent for the container's processes as well as reporting the exit status and holding onto the STDIO of the container.  This also allows containerd to crash and restore all functionality to containers.
 
 
 ## containerd
diff --git a/remotes/handlers.go b/remotes/handlers.go
index 168fd2583..0a4db6bce 100644
--- a/remotes/handlers.go
+++ b/remotes/handlers.go
@@ -14,7 +14,7 @@ import (
 	"github.com/sirupsen/logrus"
 )
 
-// MakeRef returns a unique reference for the descriptor. This reference can be
+// MakeRefKey returns a unique reference for the descriptor. This reference can be
 // used to lookup ongoing processes related to the descriptor. This function
 // may look to the context to namespace the reference appropriately.
 func MakeRefKey(ctx context.Context, desc ocispec.Descriptor) string {
diff --git a/server/server_linux.go b/server/server_linux.go
index 324a1b05d..b2f5e8b4f 100644
--- a/server/server_linux.go
+++ b/server/server_linux.go
@@ -19,7 +19,7 @@ const (
 	DefaultStateDir = "/run/containerd"
 	// DefaultAddress is the default unix socket address
 	DefaultAddress = "/run/containerd/containerd.sock"
-	// DefaultDebuggAddress is the default unix socket address for pprof data
+	// DefaultDebugAddress is the default unix socket address for pprof data
 	DefaultDebugAddress = "/run/containerd/debug.sock"
 )
 
diff --git a/server/server_solaris.go b/server/server_solaris.go
index 35b7434e3..71e1c0927 100644
--- a/server/server_solaris.go
+++ b/server/server_solaris.go
@@ -5,7 +5,7 @@ import "context"
 const (
 	// DefaultAddress is the default unix socket address
 	DefaultAddress = "/var/run/containerd/containerd.sock"
-	// DefaultDebuggAddress is the default unix socket address for pprof data
+	// DefaultDebugAddress is the default unix socket address for pprof data
 	DefaultDebugAddress = "/var/run/containerd/debug.sock"
 )
 
diff --git a/server/server_unsupported.go b/server/server_unsupported.go
index 794067263..f820e3f0c 100644
--- a/server/server_unsupported.go
+++ b/server/server_unsupported.go
@@ -13,7 +13,7 @@ const (
 	DefaultStateDir = "/run/containerd"
 	// DefaultAddress is the default unix socket address
 	DefaultAddress = "/run/containerd/containerd.sock"
-	// DefaultDebuggAddress is the default unix socket address for pprof data
+	// DefaultDebugAddress is the default unix socket address for pprof data
 	DefaultDebugAddress = "/run/containerd/debug.sock"
 )