diff --git a/agent/consul/state/acl.go b/agent/consul/state/acl.go
index 480de1757..d9e5953b2 100644
--- a/agent/consul/state/acl.go
+++ b/agent/consul/state/acl.go
@@ -13,7 +13,7 @@ type TokenPoliciesIndex struct {
 func (s *TokenPoliciesIndex) FromObject(obj interface{}) (bool, [][]byte, error) {
 	token, ok := obj.(*structs.ACLToken)
 	if !ok {
-		return false, nil, fmt.Errorf("object is not an ACLTokenPolicyLink")
+		return false, nil, fmt.Errorf("object is not an ACLToken")
 	}
 
 	links := token.Policies
diff --git a/agent/consul/state/state_store.go b/agent/consul/state/state_store.go
index 78a397e24..daa8835e9 100644
--- a/agent/consul/state/state_store.go
+++ b/agent/consul/state/state_store.go
@@ -21,20 +21,20 @@ var (
 	// is attempted with an empty session ID.
 	ErrMissingSessionID = errors.New("Missing session ID")
 
-	// ErrMissingACLTokenSecret is returned when an token set is called on
-	// an token with an empty SecretID.
+	// ErrMissingACLTokenSecret is returned when a token set is called on a
+	// token with an empty SecretID.
 	ErrMissingACLTokenSecret = errors.New("Missing ACL Token SecretID")
 
-	// ErrMissingACLTokenAccessor is returned when an token set is called on
-	// an token with an empty AccessorID.
+	// ErrMissingACLTokenAccessor is returned when a token set is called on a
+	// token with an empty AccessorID.
 	ErrMissingACLTokenAccessor = errors.New("Missing ACL Token AccessorID")
 
-	// ErrMissingACLPolicyID is returned when an policy set is called on
-	// an policy with an empty ID.
+	// ErrMissingACLPolicyID is returned when a policy set is called on a
+	// policy with an empty ID.
 	ErrMissingACLPolicyID = errors.New("Missing ACL Policy ID")
 
-	// ErrMissingACLPolicyName is returned when an policy set is called on
-	// an policy with an empty Name.
+	// ErrMissingACLPolicyName is returned when a policy set is called on a
+	// policy with an empty Name.
 	ErrMissingACLPolicyName = errors.New("Missing ACL Policy Name")
 
 	// ErrMissingQueryID is returned when a Query set is called on
diff --git a/command/acl/policy/create/policy_create.go b/command/acl/policy/create/policy_create.go
index e38a1c3a9..7655425ec 100644
--- a/command/acl/policy/create/policy_create.go
+++ b/command/acl/policy/create/policy_create.go
@@ -41,7 +41,7 @@ func (c *cmd) init() {
 	c.flags = flag.NewFlagSet("", flag.ContinueOnError)
 	c.flags.BoolVar(&c.showMeta, "meta", false, "Indicates that policy metadata such "+
 		"as the content hash and raft indices should be shown for each entry")
-	c.flags.StringVar(&c.name, "name", "", "The new policies name. This flag is required.")
+	c.flags.StringVar(&c.name, "name", "", "The new policy's name. This flag is required.")
 	c.flags.StringVar(&c.description, "description", "", "A description of the policy")
 	c.flags.Var((*flags.AppendSliceValue)(&c.datacenters), "valid-datacenter", "Datacenter "+
 		"that the policy should be valid within. This flag may be specified multiple times")
diff --git a/website/source/docs/commands/acl/acl-policy.html.md.erb b/website/source/docs/commands/acl/acl-policy.html.md.erb
index 8ab8aebe7..06ec290a6 100644
--- a/website/source/docs/commands/acl/acl-policy.html.md.erb
+++ b/website/source/docs/commands/acl/acl-policy.html.md.erb
@@ -82,7 +82,7 @@ Usage: `consul acl policy create [options] [args]`
 * `-meta` - Indicates that policy metadata such as the content hash and raft
    indices should be shown for each entry.
 
-* `-name=<string>` - The new policies name. This flag is required.
+* `-name=<string>` - The new policy's name. This flag is required.
 
 * `-rules=<string>` - The policy rules. May be prefixed with '@' to indicate that the
    value is a file path to load the rules from. '-' may also be given