diff --git a/sdk/framework/identity_test.go b/sdk/framework/identity_test.go
index 8459dd35346b..cb71eefdf9d8 100644
--- a/sdk/framework/identity_test.go
+++ b/sdk/framework/identity_test.go
@@ -18,12 +18,12 @@ func TestIdentityTemplating(t *testing.T) {
 					MountAccessor: "test_mount",
 					MountType:     "secret",
 					Metadata: map[string]string{
-						"alias-metadata": "metadata-value",
+						"alias-metadata": "alias-metadata-value",
 					},
 				},
 			},
 			Metadata: map[string]string{
-				"entity-metadata": "metadata-value",
+				"entity-metadata": "entity-metadata-value",
 			},
 		},
 		GroupsVal: []*logical.Group{
@@ -31,7 +31,7 @@ func TestIdentityTemplating(t *testing.T) {
 				ID:   "group1-id",
 				Name: "group1",
 				Metadata: map[string]string{
-					"group-metadata": "metadata-value",
+					"group-metadata": "group-metadata-value",
 				},
 			},
 		},
@@ -51,7 +51,7 @@ func TestIdentityTemplating(t *testing.T) {
 		},
 		{
 			tpl:      "{{identity.entity.metadata.entity-metadata}}",
-			expected: "metadata-value",
+			expected: "entity-metadata-value",
 		},
 		{
 			tpl:      "{{identity.entity.aliases.test_mount.id}}",
@@ -67,7 +67,7 @@ func TestIdentityTemplating(t *testing.T) {
 		},
 		{
 			tpl:      "{{identity.entity.aliases.test_mount.metadata.alias-metadata}}",
-			expected: "metadata-value",
+			expected: "alias-metadata-value",
 		},
 		{
 			tpl:      "{{identity.groups.ids.group1-id.name}}",
@@ -79,11 +79,11 @@ func TestIdentityTemplating(t *testing.T) {
 		},
 		{
 			tpl:      "{{identity.groups.names.group1.metadata.group-metadata}}",
-			expected: "metadata-value",
+			expected: "group-metadata-value",
 		},
 		{
 			tpl:      "{{identity.groups.ids.group1-id.metadata.group-metadata}}",
-			expected: "metadata-value",
+			expected: "group-metadata-value",
 		},
 	}
 
diff --git a/sdk/plugin/pb/backend.pb.go b/sdk/plugin/pb/backend.pb.go
index 8c7f57c1025e..efd386b8eb00 100644
--- a/sdk/plugin/pb/backend.pb.go
+++ b/sdk/plugin/pb/backend.pb.go
@@ -3524,7 +3524,7 @@ type SystemViewClient interface {
 	EntityInfo(ctx context.Context, in *EntityInfoArgs, opts ...grpc.CallOption) (*EntityInfoReply, error)
 	// PluginEnv returns Vault environment information used by plugins
 	PluginEnv(ctx context.Context, in *Empty, opts ...grpc.CallOption) (*PluginEnvReply, error)
-	// GroupsForEntity returns the group membersship information for the given
+	// GroupsForEntity returns the group membership information for the given
 	// entity id
 	GroupsForEntity(ctx context.Context, in *EntityInfoArgs, opts ...grpc.CallOption) (*GroupsForEntityReply, error)
 }
@@ -3671,7 +3671,7 @@ type SystemViewServer interface {
 	EntityInfo(context.Context, *EntityInfoArgs) (*EntityInfoReply, error)
 	// PluginEnv returns Vault environment information used by plugins
 	PluginEnv(context.Context, *Empty) (*PluginEnvReply, error)
-	// GroupsForEntity returns the group membersship information for the given
+	// GroupsForEntity returns the group membership information for the given
 	// entity id
 	GroupsForEntity(context.Context, *EntityInfoArgs) (*GroupsForEntityReply, error)
 }
diff --git a/sdk/plugin/pb/backend.proto b/sdk/plugin/pb/backend.proto
index 9536fde6ca8c..7b910ea0f0dc 100644
--- a/sdk/plugin/pb/backend.proto
+++ b/sdk/plugin/pb/backend.proto
@@ -600,7 +600,7 @@ service SystemView {
 	// PluginEnv returns Vault environment information used by plugins
 	rpc PluginEnv(Empty) returns (PluginEnvReply);
 
-	// GroupsForEntity returns the group membersship information for the given
+	// GroupsForEntity returns the group membership information for the given
 	// entity id
 	rpc GroupsForEntity(EntityInfoArgs) returns (GroupsForEntityReply);
 }