diff --git a/agent/agent_endpoint_test.go b/agent/agent_endpoint_test.go
index 18149bdb0..36d1edfc1 100644
--- a/agent/agent_endpoint_test.go
+++ b/agent/agent_endpoint_test.go
@@ -456,7 +456,7 @@ func TestAgent_Service(t *testing.T) {
 			// state from config/snapshot again). If we do that naively then we don't
 			// just get a spurios wakeup on the watch if the service didn't change,
 			// but we get it wakeup and then race with the reload and probably see no
-			// services and return a 404 error which is gross. This test excercises
+			// services and return a 404 error which is gross. This test exercises
 			// that - even though the registrations were from API not config, they are
 			// persisted and cleared/reloaded from snapshot which has same effect.
 			//
diff --git a/agent/cache-types/catalog_datacenters.go b/agent/cache-types/catalog_datacenters.go
index c1245e17e..2c50b19b7 100644
--- a/agent/cache-types/catalog_datacenters.go
+++ b/agent/cache-types/catalog_datacenters.go
@@ -29,7 +29,7 @@ func (c *CatalogDatacenters) Fetch(opts cache.FetchOptions, req cache.Request) (
 	dup := *reqReal
 	reqReal = &dup
 
-	// Allways allow stale - there's no point in hitting leader if the request is
+	// Always allow stale - there's no point in hitting leader if the request is
 	// going to be served from cache and endup arbitrarily stale anyway. This
 	// allows cached service-discover to automatically read scale across all
 	// servers too.
diff --git a/agent/cache-types/health_services.go b/agent/cache-types/health_services.go
index 55ebf3e47..b3ccf8391 100644
--- a/agent/cache-types/health_services.go
+++ b/agent/cache-types/health_services.go
@@ -34,7 +34,7 @@ func (c *HealthServices) Fetch(opts cache.FetchOptions, req cache.Request) (cach
 	reqReal.QueryOptions.MinQueryIndex = opts.MinIndex
 	reqReal.QueryOptions.MaxQueryTime = opts.Timeout
 
-	// Allways allow stale - there's no point in hitting leader if the request is
+	// Always allow stale - there's no point in hitting leader if the request is
 	// going to be served from cache and endup arbitrarily stale anyway. This
 	// allows cached service-discover to automatically read scale across all
 	// servers too.
diff --git a/agent/cache-types/node_services.go b/agent/cache-types/node_services.go
index 33f9314bc..53ddd03be 100644
--- a/agent/cache-types/node_services.go
+++ b/agent/cache-types/node_services.go
@@ -34,7 +34,7 @@ func (c *NodeServices) Fetch(opts cache.FetchOptions, req cache.Request) (cache.
 	reqReal.QueryOptions.MinQueryIndex = opts.MinIndex
 	reqReal.QueryOptions.MaxQueryTime = opts.Timeout
 
-	// Allways allow stale - there's no point in hitting leader if the request is
+	// Always allow stale - there's no point in hitting leader if the request is
 	// going to be served from cache and endup arbitrarily stale anyway. This
 	// allows cached service-discover to automatically read scale across all
 	// servers too.
diff --git a/agent/cache-types/prepared_query.go b/agent/cache-types/prepared_query.go
index 7dc67129b..d7ec601ac 100644
--- a/agent/cache-types/prepared_query.go
+++ b/agent/cache-types/prepared_query.go
@@ -30,7 +30,7 @@ func (c *PreparedQuery) Fetch(opts cache.FetchOptions, req cache.Request) (cache
 	dup := *reqReal
 	reqReal = &dup
 
-	// Allways allow stale - there's no point in hitting leader if the request is
+	// Always allow stale - there's no point in hitting leader if the request is
 	// going to be served from cache and endup arbitrarily stale anyway. This
 	// allows cached service-discover to automatically read scale across all
 	// servers too.
diff --git a/agent/cache/entry.go b/agent/cache/entry.go
index f38a15c7f..dfeb982e0 100644
--- a/agent/cache/entry.go
+++ b/agent/cache/entry.go
@@ -59,7 +59,7 @@ func (e *cacheEntryExpiry) Reset() {
 }
 
 // expiryHeap is a heap implementation that stores information about
-// when entires expire. Implements container/heap.Interface.
+// when entries expire. Implements container/heap.Interface.
 //
 // All operations on the heap and read/write of the heap contents require
 // the proper entriesLock to be held on Cache.
diff --git a/agent/checks/check.go b/agent/checks/check.go
index 8040ffb08..3e414eab6 100644
--- a/agent/checks/check.go
+++ b/agent/checks/check.go
@@ -30,7 +30,7 @@ const (
 	MinInterval = time.Second
 
 	// DefaultBufSize is the maximum size of the captured
-	// check output by defaut. Prevents an enormous buffer
+	// check output by default. Prevents an enormous buffer
 	// from being captured
 	DefaultBufSize = 4 * 1024 // 4KB
 
diff --git a/agent/config/runtime.go b/agent/config/runtime.go
index 8b243fc25..272723214 100644
--- a/agent/config/runtime.go
+++ b/agent/config/runtime.go
@@ -339,12 +339,12 @@ type RuntimeConfig struct {
 	// flag: -recursor string [-recursor string]
 	DNSRecursors []string
 
-	// DNSUseCache wether or not to use cache for dns queries
+	// DNSUseCache whether or not to use cache for dns queries
 	//
 	// hcl: dns_config { use_cache = (true|false) }
 	DNSUseCache bool
 
-	// DNSUseCache wether or not to use cache for dns queries
+	// DNSUseCache whether or not to use cache for dns queries
 	//
 	// hcl: dns_config { cache_max_age = "duration" }
 	DNSCacheMaxAge time.Duration
diff --git a/agent/coordinate_endpoint_test.go b/agent/coordinate_endpoint_test.go
index 060db6f6b..2a93723f3 100644
--- a/agent/coordinate_endpoint_test.go
+++ b/agent/coordinate_endpoint_test.go
@@ -163,7 +163,7 @@ func TestCoordinate_Nodes(t *testing.T) {
 		if len(coordinates) != 2 ||
 			coordinates[0].Node != "bar" ||
 			coordinates[1].Node != "foo" {
-			r.Fatalf("expected: bar, foo recieved: %v", coordinates)
+			r.Fatalf("expected: bar, foo received: %v", coordinates)
 		}
 	})
 	// Filter on a nonexistent node segment
diff --git a/agent/http_oss.go b/agent/http_oss.go
index 4e753130f..9811a5685 100644
--- a/agent/http_oss.go
+++ b/agent/http_oss.go
@@ -47,7 +47,7 @@ func (s *HTTPServer) addEnterpriseHTMLTemplateVars(vars map[string]interface{})
 
 func parseACLAuthMethodEnterpriseMeta(req *http.Request, _ *structs.ACLAuthMethodEnterpriseMeta) error {
 	if methodNS := req.URL.Query().Get("authmethod-ns"); methodNS != "" {
-		return BadRequestError{Reason: "Invalid query paramter: \"authmethod-ns\" - Namespaces is a Consul Enterprise feature"}
+		return BadRequestError{Reason: "Invalid query parameter: \"authmethod-ns\" - Namespaces is a Consul Enterprise feature"}
 	}
 
 	return nil
diff --git a/command/connect/proxy/register.go b/command/connect/proxy/register.go
index a32919e08..d41ab54b6 100644
--- a/command/connect/proxy/register.go
+++ b/command/connect/proxy/register.go
@@ -25,7 +25,7 @@ const (
 // RegisterMonitor registers the proxy with the local Consul agent with a TTL
 // health check that is kept alive.
 //
-// This struct should be intialized with NewRegisterMonitor instead of being
+// This struct should be initialized with NewRegisterMonitor instead of being
 // allocated directly. Using this struct without calling NewRegisterMonitor
 // will result in panics.
 type RegisterMonitor struct {