diff --git a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h
index f8ec0d9fab7017..85805fa3da64bb 100644
--- a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h
+++ b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h
@@ -172424,8 +172424,8 @@ class Test_TC_S_2_2 : public TestCommandBridge {
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
         AddArgument("G1", 0, UINT16_MAX, &mG1);
         AddArgument("G2", 0, UINT16_MAX, &mG2);
-        AddArgument("GroupKeyManagement.Endpoint", 0, UINT16_MAX, &mGroupKeyManagementEndpoint);
-        AddArgument("Groups.Endpoint", 0, UINT16_MAX, &mGroupsEndpoint);
+        AddArgument("GroupKeyManagementEndpoint", 0, UINT16_MAX, &mGroupKeyManagementEndpoint);
+        AddArgument("GroupsEndpoint", 0, UINT16_MAX, &mGroupsEndpoint);
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
     // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
@@ -173111,7 +173111,7 @@ class Test_TC_S_2_2 : public TestCommandBridge {
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
-        __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(GroupKeyManagement.Endpoint) queue:mCallbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(GroupKeyManagementEndpoint) queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[MTRGroupKeyManagementClusterKeySetWriteParams alloc] init];
@@ -173149,7 +173149,7 @@ class Test_TC_S_2_2 : public TestCommandBridge {
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
-        __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(GroupKeyManagement.Endpoint) queue:mCallbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(GroupKeyManagementEndpoint) queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         id groupKeyMapArgument;
@@ -173186,7 +173186,7 @@ class Test_TC_S_2_2 : public TestCommandBridge {
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
-        __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(Groups.Endpoint) queue:mCallbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(GroupsEndpoint) queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster removeAllGroupsWithCompletion:
@@ -174580,7 +174580,7 @@ class Test_TC_S_2_2 : public TestCommandBridge {
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
-        __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(GroupKeyManagement.Endpoint) queue:mCallbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(GroupKeyManagementEndpoint) queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[MTRGroupKeyManagementClusterKeySetRemoveParams alloc] init];
@@ -174610,7 +174610,7 @@ class Test_TC_S_2_3 : public TestCommandBridge {
         AddArgument("cluster", &mCluster);
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
         AddArgument("G1", 0, UINT16_MAX, &mG1);
-        AddArgument("GroupKeyManagement.Endpoint", 0, UINT16_MAX, &mGroupKeyManagementEndpoint);
+        AddArgument("GroupKeyManagementEndpoint", 0, UINT16_MAX, &mGroupKeyManagementEndpoint);
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
     // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
@@ -174972,7 +174972,7 @@ class Test_TC_S_2_3 : public TestCommandBridge {
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
-        __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(GroupKeyManagement.Endpoint) queue:mCallbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(GroupKeyManagementEndpoint) queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[MTRGroupKeyManagementClusterKeySetWriteParams alloc] init];
@@ -175010,7 +175010,7 @@ class Test_TC_S_2_3 : public TestCommandBridge {
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
-        __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(GroupKeyManagement.Endpoint) queue:mCallbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(GroupKeyManagementEndpoint) queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         id groupKeyMapArgument;
@@ -175072,7 +175072,7 @@ class Test_TC_S_2_3 : public TestCommandBridge {
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
-        __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(GroupKeyManagement.Endpoint) queue:mCallbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(GroupKeyManagementEndpoint) queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         id aclArgument;
@@ -175719,7 +175719,7 @@ class Test_TC_S_2_3 : public TestCommandBridge {
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
-        __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(GroupKeyManagement.Endpoint) queue:mCallbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(GroupKeyManagementEndpoint) queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[MTRGroupKeyManagementClusterKeySetRemoveParams alloc] init];
@@ -175749,7 +175749,7 @@ class Test_TC_S_2_4 : public TestCommandBridge {
         AddArgument("cluster", &mCluster);
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
         AddArgument("G1", 0, UINT16_MAX, &mG1);
-        AddArgument("GroupKeyManagement.Endpoint", 0, UINT16_MAX, &mGroupKeyManagementEndpoint);
+        AddArgument("GroupKeyManagementEndpoint", 0, UINT16_MAX, &mGroupKeyManagementEndpoint);
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
     // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
@@ -176106,7 +176106,7 @@ class Test_TC_S_2_4 : public TestCommandBridge {
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
-        __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(GroupKeyManagement.Endpoint) queue:mCallbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(GroupKeyManagementEndpoint) queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[MTRGroupKeyManagementClusterKeySetWriteParams alloc] init];
@@ -176144,7 +176144,7 @@ class Test_TC_S_2_4 : public TestCommandBridge {
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
-        __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(GroupKeyManagement.Endpoint) queue:mCallbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(GroupKeyManagementEndpoint) queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         id groupKeyMapArgument;
@@ -176679,7 +176679,7 @@ class Test_TC_S_2_4 : public TestCommandBridge {
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
-        __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(GroupKeyManagement.Endpoint) queue:mCallbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(GroupKeyManagementEndpoint) queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[MTRGroupKeyManagementClusterKeySetRemoveParams alloc] init];