diff --git a/examples/chip-tool/commands/tests/Commands.h b/examples/chip-tool/commands/tests/Commands.h
index b0cc88df02e14d..d1dfacb3b37b98 100644
--- a/examples/chip-tool/commands/tests/Commands.h
+++ b/examples/chip-tool/commands/tests/Commands.h
@@ -7831,10 +7831,10 @@ class TestCluster : public TestCommand
     }
 };
 
-class Test_3_1_1 : public TestCommand
+class Test_TC_OO_1_1 : public TestCommand
 {
 public:
-    Test_3_1_1() : TestCommand("Test_3_1_1"), mTestIndex(0) {}
+    Test_TC_OO_1_1() : TestCommand("Test_TC_OO_1_1"), mTestIndex(0) {}
 
     /////////// TestCommand Interface /////////
     void NextTest() override
@@ -7843,7 +7843,7 @@ class Test_3_1_1 : public TestCommand
 
         if (mTestCount == mTestIndex)
         {
-            ChipLogProgress(chipTool, "Test_3_1_1: Test complete");
+            ChipLogProgress(chipTool, "Test_TC_OO_1_1: Test complete");
             SetCommandExitStatus(CHIP_NO_ERROR);
         }
 
@@ -7869,7 +7869,7 @@ class Test_3_1_1 : public TestCommand
 
         if (CHIP_NO_ERROR != err)
         {
-            ChipLogProgress(chipTool, "Test_3_1_1: %s", chip::ErrorStr(err));
+            ChipLogProgress(chipTool, "Test_TC_OO_1_1: %s", chip::ErrorStr(err));
             SetCommandExitStatus(err);
         }
     }
@@ -7917,7 +7917,7 @@ class Test_3_1_1 : public TestCommand
     {
         ChipLogProgress(chipTool, "On/Off - read the global attribute: ClusterRevision: Failure Response");
 
-        Test_3_1_1 * runner = reinterpret_cast<Test_3_1_1 *>(context);
+        Test_TC_OO_1_1 * runner = reinterpret_cast<Test_TC_OO_1_1 *>(context);
 
         delete runner->mOnFailureCallback_0;
         delete runner->mOnSuccessCallback_0;
@@ -7936,7 +7936,7 @@ class Test_3_1_1 : public TestCommand
     {
         ChipLogProgress(chipTool, "On/Off - read the global attribute: ClusterRevision: Success Response");
 
-        Test_3_1_1 * runner = reinterpret_cast<Test_3_1_1 *>(context);
+        Test_TC_OO_1_1 * runner = reinterpret_cast<Test_TC_OO_1_1 *>(context);
 
         delete runner->mOnFailureCallback_0;
         delete runner->mOnSuccessCallback_0;
@@ -7993,7 +7993,7 @@ class Test_3_1_1 : public TestCommand
     {
         ChipLogProgress(chipTool, "On/Off - reads back global attribute: ClusterRevision: Failure Response");
 
-        Test_3_1_1 * runner = reinterpret_cast<Test_3_1_1 *>(context);
+        Test_TC_OO_1_1 * runner = reinterpret_cast<Test_TC_OO_1_1 *>(context);
 
         delete runner->mOnFailureCallback_1;
         delete runner->mOnSuccessCallback_1;
@@ -8012,7 +8012,7 @@ class Test_3_1_1 : public TestCommand
     {
         ChipLogProgress(chipTool, "On/Off - reads back global attribute: ClusterRevision: Success Response");
 
-        Test_3_1_1 * runner = reinterpret_cast<Test_3_1_1 *>(context);
+        Test_TC_OO_1_1 * runner = reinterpret_cast<Test_TC_OO_1_1 *>(context);
 
         delete runner->mOnFailureCallback_1;
         delete runner->mOnSuccessCallback_1;
@@ -8069,7 +8069,7 @@ class Test_3_1_1 : public TestCommand
     {
         ChipLogProgress(chipTool, "On/Off - read the optional global attribute: FeatureMap: Failure Response");
 
-        Test_3_1_1 * runner = reinterpret_cast<Test_3_1_1 *>(context);
+        Test_TC_OO_1_1 * runner = reinterpret_cast<Test_TC_OO_1_1 *>(context);
 
         delete runner->mOnFailureCallback_2;
         delete runner->mOnSuccessCallback_2;
@@ -8088,7 +8088,7 @@ class Test_3_1_1 : public TestCommand
     {
         ChipLogProgress(chipTool, "On/Off - read the optional global attribute: FeatureMap: Success Response");
 
-        Test_3_1_1 * runner = reinterpret_cast<Test_3_1_1 *>(context);
+        Test_TC_OO_1_1 * runner = reinterpret_cast<Test_TC_OO_1_1 *>(context);
 
         delete runner->mOnFailureCallback_2;
         delete runner->mOnSuccessCallback_2;
@@ -8145,7 +8145,7 @@ class Test_3_1_1 : public TestCommand
     {
         ChipLogProgress(chipTool, "On/Off - reads back optional global attribute: FeatureMap: Failure Response");
 
-        Test_3_1_1 * runner = reinterpret_cast<Test_3_1_1 *>(context);
+        Test_TC_OO_1_1 * runner = reinterpret_cast<Test_TC_OO_1_1 *>(context);
 
         delete runner->mOnFailureCallback_3;
         delete runner->mOnSuccessCallback_3;
@@ -8164,7 +8164,7 @@ class Test_3_1_1 : public TestCommand
     {
         ChipLogProgress(chipTool, "On/Off - reads back optional global attribute: FeatureMap: Success Response");
 
-        Test_3_1_1 * runner = reinterpret_cast<Test_3_1_1 *>(context);
+        Test_TC_OO_1_1 * runner = reinterpret_cast<Test_TC_OO_1_1 *>(context);
 
         delete runner->mOnFailureCallback_3;
         delete runner->mOnSuccessCallback_3;
@@ -8187,10 +8187,10 @@ class Test_3_1_1 : public TestCommand
     }
 };
 
-class Test_3_2_1 : public TestCommand
+class Test_TC_OO_2_1 : public TestCommand
 {
 public:
-    Test_3_2_1() : TestCommand("Test_3_2_1"), mTestIndex(0) {}
+    Test_TC_OO_2_1() : TestCommand("Test_TC_OO_2_1"), mTestIndex(0) {}
 
     /////////// TestCommand Interface /////////
     void NextTest() override
@@ -8199,7 +8199,7 @@ class Test_3_2_1 : public TestCommand
 
         if (mTestCount == mTestIndex)
         {
-            ChipLogProgress(chipTool, "Test_3_2_1: Test complete");
+            ChipLogProgress(chipTool, "Test_TC_OO_2_1: Test complete");
             SetCommandExitStatus(CHIP_NO_ERROR);
         }
 
@@ -8249,7 +8249,7 @@ class Test_3_2_1 : public TestCommand
 
         if (CHIP_NO_ERROR != err)
         {
-            ChipLogProgress(chipTool, "Test_3_2_1: %s", chip::ErrorStr(err));
+            ChipLogProgress(chipTool, "Test_TC_OO_2_1: %s", chip::ErrorStr(err));
             SetCommandExitStatus(err);
         }
     }
@@ -8297,7 +8297,7 @@ class Test_3_2_1 : public TestCommand
     {
         ChipLogProgress(chipTool, "On/Off - read the mandatory attribute: OnOff: Failure Response");
 
-        Test_3_2_1 * runner = reinterpret_cast<Test_3_2_1 *>(context);
+        Test_TC_OO_2_1 * runner = reinterpret_cast<Test_TC_OO_2_1 *>(context);
 
         delete runner->mOnFailureCallback_0;
         delete runner->mOnSuccessCallback_0;
@@ -8316,7 +8316,7 @@ class Test_3_2_1 : public TestCommand
     {
         ChipLogProgress(chipTool, "On/Off - read the mandatory attribute: OnOff: Success Response");
 
-        Test_3_2_1 * runner = reinterpret_cast<Test_3_2_1 *>(context);
+        Test_TC_OO_2_1 * runner = reinterpret_cast<Test_TC_OO_2_1 *>(context);
 
         delete runner->mOnFailureCallback_0;
         delete runner->mOnSuccessCallback_0;
@@ -8373,7 +8373,7 @@ class Test_3_2_1 : public TestCommand
     {
         ChipLogProgress(chipTool, "On/Off - reads back mandatory attribute: OnOff: Failure Response");
 
-        Test_3_2_1 * runner = reinterpret_cast<Test_3_2_1 *>(context);
+        Test_TC_OO_2_1 * runner = reinterpret_cast<Test_TC_OO_2_1 *>(context);
 
         delete runner->mOnFailureCallback_1;
         delete runner->mOnSuccessCallback_1;
@@ -8392,7 +8392,7 @@ class Test_3_2_1 : public TestCommand
     {
         ChipLogProgress(chipTool, "On/Off - reads back mandatory attribute: OnOff: Success Response");
 
-        Test_3_2_1 * runner = reinterpret_cast<Test_3_2_1 *>(context);
+        Test_TC_OO_2_1 * runner = reinterpret_cast<Test_TC_OO_2_1 *>(context);
 
         delete runner->mOnFailureCallback_1;
         delete runner->mOnSuccessCallback_1;
@@ -8449,7 +8449,7 @@ class Test_3_2_1 : public TestCommand
     {
         ChipLogProgress(chipTool, "On/Off - read LT attribute: GlobalSceneControl: Failure Response");
 
-        Test_3_2_1 * runner = reinterpret_cast<Test_3_2_1 *>(context);
+        Test_TC_OO_2_1 * runner = reinterpret_cast<Test_TC_OO_2_1 *>(context);
 
         delete runner->mOnFailureCallback_2;
         delete runner->mOnSuccessCallback_2;
@@ -8468,7 +8468,7 @@ class Test_3_2_1 : public TestCommand
     {
         ChipLogProgress(chipTool, "On/Off - read LT attribute: GlobalSceneControl: Success Response");
 
-        Test_3_2_1 * runner = reinterpret_cast<Test_3_2_1 *>(context);
+        Test_TC_OO_2_1 * runner = reinterpret_cast<Test_TC_OO_2_1 *>(context);
 
         delete runner->mOnFailureCallback_2;
         delete runner->mOnSuccessCallback_2;
@@ -8525,7 +8525,7 @@ class Test_3_2_1 : public TestCommand
     {
         ChipLogProgress(chipTool, "On/Off - read LT attribute: OnTime: Failure Response");
 
-        Test_3_2_1 * runner = reinterpret_cast<Test_3_2_1 *>(context);
+        Test_TC_OO_2_1 * runner = reinterpret_cast<Test_TC_OO_2_1 *>(context);
 
         delete runner->mOnFailureCallback_3;
         delete runner->mOnSuccessCallback_3;
@@ -8544,7 +8544,7 @@ class Test_3_2_1 : public TestCommand
     {
         ChipLogProgress(chipTool, "On/Off - read LT attribute: OnTime: Success Response");
 
-        Test_3_2_1 * runner = reinterpret_cast<Test_3_2_1 *>(context);
+        Test_TC_OO_2_1 * runner = reinterpret_cast<Test_TC_OO_2_1 *>(context);
 
         delete runner->mOnFailureCallback_3;
         delete runner->mOnSuccessCallback_3;
@@ -8601,7 +8601,7 @@ class Test_3_2_1 : public TestCommand
     {
         ChipLogProgress(chipTool, "On/Off - read LT attribute: OffWaitTime: Failure Response");
 
-        Test_3_2_1 * runner = reinterpret_cast<Test_3_2_1 *>(context);
+        Test_TC_OO_2_1 * runner = reinterpret_cast<Test_TC_OO_2_1 *>(context);
 
         delete runner->mOnFailureCallback_4;
         delete runner->mOnSuccessCallback_4;
@@ -8620,7 +8620,7 @@ class Test_3_2_1 : public TestCommand
     {
         ChipLogProgress(chipTool, "On/Off - read LT attribute: OffWaitTime: Success Response");
 
-        Test_3_2_1 * runner = reinterpret_cast<Test_3_2_1 *>(context);
+        Test_TC_OO_2_1 * runner = reinterpret_cast<Test_TC_OO_2_1 *>(context);
 
         delete runner->mOnFailureCallback_4;
         delete runner->mOnSuccessCallback_4;
@@ -8677,7 +8677,7 @@ class Test_3_2_1 : public TestCommand
     {
         ChipLogProgress(chipTool, "On/Off - read LT attribute: StartUpOnOff: Failure Response");
 
-        Test_3_2_1 * runner = reinterpret_cast<Test_3_2_1 *>(context);
+        Test_TC_OO_2_1 * runner = reinterpret_cast<Test_TC_OO_2_1 *>(context);
 
         delete runner->mOnFailureCallback_5;
         delete runner->mOnSuccessCallback_5;
@@ -8696,7 +8696,7 @@ class Test_3_2_1 : public TestCommand
     {
         ChipLogProgress(chipTool, "On/Off - read LT attribute: StartUpOnOff: Success Response");
 
-        Test_3_2_1 * runner = reinterpret_cast<Test_3_2_1 *>(context);
+        Test_TC_OO_2_1 * runner = reinterpret_cast<Test_TC_OO_2_1 *>(context);
 
         delete runner->mOnFailureCallback_5;
         delete runner->mOnSuccessCallback_5;
@@ -8754,7 +8754,7 @@ class Test_3_2_1 : public TestCommand
     {
         ChipLogProgress(chipTool, "On/Off - write the default value to LT attribute: OnTime: Failure Response");
 
-        Test_3_2_1 * runner = reinterpret_cast<Test_3_2_1 *>(context);
+        Test_TC_OO_2_1 * runner = reinterpret_cast<Test_TC_OO_2_1 *>(context);
 
         delete runner->mOnFailureCallback_6;
         delete runner->mOnSuccessCallback_6;
@@ -8773,7 +8773,7 @@ class Test_3_2_1 : public TestCommand
     {
         ChipLogProgress(chipTool, "On/Off - write the default value to LT attribute: OnTime: Success Response");
 
-        Test_3_2_1 * runner = reinterpret_cast<Test_3_2_1 *>(context);
+        Test_TC_OO_2_1 * runner = reinterpret_cast<Test_TC_OO_2_1 *>(context);
 
         delete runner->mOnFailureCallback_6;
         delete runner->mOnSuccessCallback_6;
@@ -8825,7 +8825,7 @@ class Test_3_2_1 : public TestCommand
     {
         ChipLogProgress(chipTool, "On/Off - write the default value to LT attribute: OffWaitTime: Failure Response");
 
-        Test_3_2_1 * runner = reinterpret_cast<Test_3_2_1 *>(context);
+        Test_TC_OO_2_1 * runner = reinterpret_cast<Test_TC_OO_2_1 *>(context);
 
         delete runner->mOnFailureCallback_7;
         delete runner->mOnSuccessCallback_7;
@@ -8844,7 +8844,7 @@ class Test_3_2_1 : public TestCommand
     {
         ChipLogProgress(chipTool, "On/Off - write the default value to LT attribute: OffWaitTime: Success Response");
 
-        Test_3_2_1 * runner = reinterpret_cast<Test_3_2_1 *>(context);
+        Test_TC_OO_2_1 * runner = reinterpret_cast<Test_TC_OO_2_1 *>(context);
 
         delete runner->mOnFailureCallback_7;
         delete runner->mOnSuccessCallback_7;
@@ -8896,7 +8896,7 @@ class Test_3_2_1 : public TestCommand
     {
         ChipLogProgress(chipTool, "On/Off - write the default value to LT attribute: StartUpOnOff: Failure Response");
 
-        Test_3_2_1 * runner = reinterpret_cast<Test_3_2_1 *>(context);
+        Test_TC_OO_2_1 * runner = reinterpret_cast<Test_TC_OO_2_1 *>(context);
 
         delete runner->mOnFailureCallback_8;
         delete runner->mOnSuccessCallback_8;
@@ -8915,7 +8915,7 @@ class Test_3_2_1 : public TestCommand
     {
         ChipLogProgress(chipTool, "On/Off - write the default value to LT attribute: StartUpOnOff: Success Response");
 
-        Test_3_2_1 * runner = reinterpret_cast<Test_3_2_1 *>(context);
+        Test_TC_OO_2_1 * runner = reinterpret_cast<Test_TC_OO_2_1 *>(context);
 
         delete runner->mOnFailureCallback_8;
         delete runner->mOnSuccessCallback_8;
@@ -8965,7 +8965,7 @@ class Test_3_2_1 : public TestCommand
     {
         ChipLogProgress(chipTool, "On/Off - reads back LT attribute: OnTime: Failure Response");
 
-        Test_3_2_1 * runner = reinterpret_cast<Test_3_2_1 *>(context);
+        Test_TC_OO_2_1 * runner = reinterpret_cast<Test_TC_OO_2_1 *>(context);
 
         delete runner->mOnFailureCallback_9;
         delete runner->mOnSuccessCallback_9;
@@ -8984,7 +8984,7 @@ class Test_3_2_1 : public TestCommand
     {
         ChipLogProgress(chipTool, "On/Off - reads back LT attribute: OnTime: Success Response");
 
-        Test_3_2_1 * runner = reinterpret_cast<Test_3_2_1 *>(context);
+        Test_TC_OO_2_1 * runner = reinterpret_cast<Test_TC_OO_2_1 *>(context);
 
         delete runner->mOnFailureCallback_9;
         delete runner->mOnSuccessCallback_9;
@@ -9041,7 +9041,7 @@ class Test_3_2_1 : public TestCommand
     {
         ChipLogProgress(chipTool, "On/Off - reads back LT attribute: OffWaitTime: Failure Response");
 
-        Test_3_2_1 * runner = reinterpret_cast<Test_3_2_1 *>(context);
+        Test_TC_OO_2_1 * runner = reinterpret_cast<Test_TC_OO_2_1 *>(context);
 
         delete runner->mOnFailureCallback_10;
         delete runner->mOnSuccessCallback_10;
@@ -9060,7 +9060,7 @@ class Test_3_2_1 : public TestCommand
     {
         ChipLogProgress(chipTool, "On/Off - reads back LT attribute: OffWaitTime: Success Response");
 
-        Test_3_2_1 * runner = reinterpret_cast<Test_3_2_1 *>(context);
+        Test_TC_OO_2_1 * runner = reinterpret_cast<Test_TC_OO_2_1 *>(context);
 
         delete runner->mOnFailureCallback_10;
         delete runner->mOnSuccessCallback_10;
@@ -9117,7 +9117,7 @@ class Test_3_2_1 : public TestCommand
     {
         ChipLogProgress(chipTool, "On/Off - reads back LT attribute: StartUpOnOff: Failure Response");
 
-        Test_3_2_1 * runner = reinterpret_cast<Test_3_2_1 *>(context);
+        Test_TC_OO_2_1 * runner = reinterpret_cast<Test_TC_OO_2_1 *>(context);
 
         delete runner->mOnFailureCallback_11;
         delete runner->mOnSuccessCallback_11;
@@ -9136,7 +9136,7 @@ class Test_3_2_1 : public TestCommand
     {
         ChipLogProgress(chipTool, "On/Off - reads back LT attribute: StartUpOnOff: Success Response");
 
-        Test_3_2_1 * runner = reinterpret_cast<Test_3_2_1 *>(context);
+        Test_TC_OO_2_1 * runner = reinterpret_cast<Test_TC_OO_2_1 *>(context);
 
         delete runner->mOnFailureCallback_11;
         delete runner->mOnSuccessCallback_11;
@@ -9159,10 +9159,10 @@ class Test_3_2_1 : public TestCommand
     }
 };
 
-class Test_3_2_2 : public TestCommand
+class Test_TC_OO_2_2 : public TestCommand
 {
 public:
-    Test_3_2_2() : TestCommand("Test_3_2_2"), mTestIndex(0) {}
+    Test_TC_OO_2_2() : TestCommand("Test_TC_OO_2_2"), mTestIndex(0) {}
 
     /////////// TestCommand Interface /////////
     void NextTest() override
@@ -9171,7 +9171,7 @@ class Test_3_2_2 : public TestCommand
 
         if (mTestCount == mTestIndex)
         {
-            ChipLogProgress(chipTool, "Test_3_2_2: Test complete");
+            ChipLogProgress(chipTool, "Test_TC_OO_2_2: Test complete");
             SetCommandExitStatus(CHIP_NO_ERROR);
         }
 
@@ -9227,7 +9227,7 @@ class Test_3_2_2 : public TestCommand
 
         if (CHIP_NO_ERROR != err)
         {
-            ChipLogProgress(chipTool, "Test_3_2_2: %s", chip::ErrorStr(err));
+            ChipLogProgress(chipTool, "Test_TC_OO_2_2: %s", chip::ErrorStr(err));
             SetCommandExitStatus(err);
         }
     }
@@ -9275,7 +9275,7 @@ class Test_3_2_2 : public TestCommand
     {
         ChipLogProgress(chipTool, "On/Off - Send Off Command: Failure Response");
 
-        Test_3_2_2 * runner = reinterpret_cast<Test_3_2_2 *>(context);
+        Test_TC_OO_2_2 * runner = reinterpret_cast<Test_TC_OO_2_2 *>(context);
 
         delete runner->mOnFailureCallback_0;
         delete runner->mOnSuccessCallback_0;
@@ -9294,7 +9294,7 @@ class Test_3_2_2 : public TestCommand
     {
         ChipLogProgress(chipTool, "On/Off - Send Off Command: Success Response");
 
-        Test_3_2_2 * runner = reinterpret_cast<Test_3_2_2 *>(context);
+        Test_TC_OO_2_2 * runner = reinterpret_cast<Test_TC_OO_2_2 *>(context);
 
         delete runner->mOnFailureCallback_0;
         delete runner->mOnSuccessCallback_0;
@@ -9344,7 +9344,7 @@ class Test_3_2_2 : public TestCommand
     {
         ChipLogProgress(chipTool, "On/Off - Check on/off attribute value is false after off command: Failure Response");
 
-        Test_3_2_2 * runner = reinterpret_cast<Test_3_2_2 *>(context);
+        Test_TC_OO_2_2 * runner = reinterpret_cast<Test_TC_OO_2_2 *>(context);
 
         delete runner->mOnFailureCallback_1;
         delete runner->mOnSuccessCallback_1;
@@ -9363,7 +9363,7 @@ class Test_3_2_2 : public TestCommand
     {
         ChipLogProgress(chipTool, "On/Off - Check on/off attribute value is false after off command: Success Response");
 
-        Test_3_2_2 * runner = reinterpret_cast<Test_3_2_2 *>(context);
+        Test_TC_OO_2_2 * runner = reinterpret_cast<Test_TC_OO_2_2 *>(context);
 
         delete runner->mOnFailureCallback_1;
         delete runner->mOnSuccessCallback_1;
@@ -9420,7 +9420,7 @@ class Test_3_2_2 : public TestCommand
     {
         ChipLogProgress(chipTool, "On/Off - Send On Command: Failure Response");
 
-        Test_3_2_2 * runner = reinterpret_cast<Test_3_2_2 *>(context);
+        Test_TC_OO_2_2 * runner = reinterpret_cast<Test_TC_OO_2_2 *>(context);
 
         delete runner->mOnFailureCallback_2;
         delete runner->mOnSuccessCallback_2;
@@ -9439,7 +9439,7 @@ class Test_3_2_2 : public TestCommand
     {
         ChipLogProgress(chipTool, "On/Off - Send On Command: Success Response");
 
-        Test_3_2_2 * runner = reinterpret_cast<Test_3_2_2 *>(context);
+        Test_TC_OO_2_2 * runner = reinterpret_cast<Test_TC_OO_2_2 *>(context);
 
         delete runner->mOnFailureCallback_2;
         delete runner->mOnSuccessCallback_2;
@@ -9489,7 +9489,7 @@ class Test_3_2_2 : public TestCommand
     {
         ChipLogProgress(chipTool, "On/Off - Check on/off attribute value is true after on command: Failure Response");
 
-        Test_3_2_2 * runner = reinterpret_cast<Test_3_2_2 *>(context);
+        Test_TC_OO_2_2 * runner = reinterpret_cast<Test_TC_OO_2_2 *>(context);
 
         delete runner->mOnFailureCallback_3;
         delete runner->mOnSuccessCallback_3;
@@ -9508,7 +9508,7 @@ class Test_3_2_2 : public TestCommand
     {
         ChipLogProgress(chipTool, "On/Off - Check on/off attribute value is true after on command: Success Response");
 
-        Test_3_2_2 * runner = reinterpret_cast<Test_3_2_2 *>(context);
+        Test_TC_OO_2_2 * runner = reinterpret_cast<Test_TC_OO_2_2 *>(context);
 
         delete runner->mOnFailureCallback_3;
         delete runner->mOnSuccessCallback_3;
@@ -9565,7 +9565,7 @@ class Test_3_2_2 : public TestCommand
     {
         ChipLogProgress(chipTool, "On/Off - Send Off Command: Failure Response");
 
-        Test_3_2_2 * runner = reinterpret_cast<Test_3_2_2 *>(context);
+        Test_TC_OO_2_2 * runner = reinterpret_cast<Test_TC_OO_2_2 *>(context);
 
         delete runner->mOnFailureCallback_4;
         delete runner->mOnSuccessCallback_4;
@@ -9584,7 +9584,7 @@ class Test_3_2_2 : public TestCommand
     {
         ChipLogProgress(chipTool, "On/Off - Send Off Command: Success Response");
 
-        Test_3_2_2 * runner = reinterpret_cast<Test_3_2_2 *>(context);
+        Test_TC_OO_2_2 * runner = reinterpret_cast<Test_TC_OO_2_2 *>(context);
 
         delete runner->mOnFailureCallback_4;
         delete runner->mOnSuccessCallback_4;
@@ -9634,7 +9634,7 @@ class Test_3_2_2 : public TestCommand
     {
         ChipLogProgress(chipTool, "On/Off - Check on/off attribute value is false after off command: Failure Response");
 
-        Test_3_2_2 * runner = reinterpret_cast<Test_3_2_2 *>(context);
+        Test_TC_OO_2_2 * runner = reinterpret_cast<Test_TC_OO_2_2 *>(context);
 
         delete runner->mOnFailureCallback_5;
         delete runner->mOnSuccessCallback_5;
@@ -9653,7 +9653,7 @@ class Test_3_2_2 : public TestCommand
     {
         ChipLogProgress(chipTool, "On/Off - Check on/off attribute value is false after off command: Success Response");
 
-        Test_3_2_2 * runner = reinterpret_cast<Test_3_2_2 *>(context);
+        Test_TC_OO_2_2 * runner = reinterpret_cast<Test_TC_OO_2_2 *>(context);
 
         delete runner->mOnFailureCallback_5;
         delete runner->mOnSuccessCallback_5;
@@ -9710,7 +9710,7 @@ class Test_3_2_2 : public TestCommand
     {
         ChipLogProgress(chipTool, "On/Off - Send Toggle Command: Failure Response");
 
-        Test_3_2_2 * runner = reinterpret_cast<Test_3_2_2 *>(context);
+        Test_TC_OO_2_2 * runner = reinterpret_cast<Test_TC_OO_2_2 *>(context);
 
         delete runner->mOnFailureCallback_6;
         delete runner->mOnSuccessCallback_6;
@@ -9729,7 +9729,7 @@ class Test_3_2_2 : public TestCommand
     {
         ChipLogProgress(chipTool, "On/Off - Send Toggle Command: Success Response");
 
-        Test_3_2_2 * runner = reinterpret_cast<Test_3_2_2 *>(context);
+        Test_TC_OO_2_2 * runner = reinterpret_cast<Test_TC_OO_2_2 *>(context);
 
         delete runner->mOnFailureCallback_6;
         delete runner->mOnSuccessCallback_6;
@@ -9779,7 +9779,7 @@ class Test_3_2_2 : public TestCommand
     {
         ChipLogProgress(chipTool, "On/Off - Check on/off attribute value is true after toggle command: Failure Response");
 
-        Test_3_2_2 * runner = reinterpret_cast<Test_3_2_2 *>(context);
+        Test_TC_OO_2_2 * runner = reinterpret_cast<Test_TC_OO_2_2 *>(context);
 
         delete runner->mOnFailureCallback_7;
         delete runner->mOnSuccessCallback_7;
@@ -9798,7 +9798,7 @@ class Test_3_2_2 : public TestCommand
     {
         ChipLogProgress(chipTool, "On/Off - Check on/off attribute value is true after toggle command: Success Response");
 
-        Test_3_2_2 * runner = reinterpret_cast<Test_3_2_2 *>(context);
+        Test_TC_OO_2_2 * runner = reinterpret_cast<Test_TC_OO_2_2 *>(context);
 
         delete runner->mOnFailureCallback_7;
         delete runner->mOnSuccessCallback_7;
@@ -9855,7 +9855,7 @@ class Test_3_2_2 : public TestCommand
     {
         ChipLogProgress(chipTool, "On/Off - Send Toggle Command: Failure Response");
 
-        Test_3_2_2 * runner = reinterpret_cast<Test_3_2_2 *>(context);
+        Test_TC_OO_2_2 * runner = reinterpret_cast<Test_TC_OO_2_2 *>(context);
 
         delete runner->mOnFailureCallback_8;
         delete runner->mOnSuccessCallback_8;
@@ -9874,7 +9874,7 @@ class Test_3_2_2 : public TestCommand
     {
         ChipLogProgress(chipTool, "On/Off - Send Toggle Command: Success Response");
 
-        Test_3_2_2 * runner = reinterpret_cast<Test_3_2_2 *>(context);
+        Test_TC_OO_2_2 * runner = reinterpret_cast<Test_TC_OO_2_2 *>(context);
 
         delete runner->mOnFailureCallback_8;
         delete runner->mOnSuccessCallback_8;
@@ -9924,7 +9924,7 @@ class Test_3_2_2 : public TestCommand
     {
         ChipLogProgress(chipTool, "On/Off - Check on/off attribute value is false after toggle command: Failure Response");
 
-        Test_3_2_2 * runner = reinterpret_cast<Test_3_2_2 *>(context);
+        Test_TC_OO_2_2 * runner = reinterpret_cast<Test_TC_OO_2_2 *>(context);
 
         delete runner->mOnFailureCallback_9;
         delete runner->mOnSuccessCallback_9;
@@ -9943,7 +9943,7 @@ class Test_3_2_2 : public TestCommand
     {
         ChipLogProgress(chipTool, "On/Off - Check on/off attribute value is false after toggle command: Success Response");
 
-        Test_3_2_2 * runner = reinterpret_cast<Test_3_2_2 *>(context);
+        Test_TC_OO_2_2 * runner = reinterpret_cast<Test_TC_OO_2_2 *>(context);
 
         delete runner->mOnFailureCallback_9;
         delete runner->mOnSuccessCallback_9;
@@ -10000,7 +10000,7 @@ class Test_3_2_2 : public TestCommand
     {
         ChipLogProgress(chipTool, "On/Off - Send On Command: Failure Response");
 
-        Test_3_2_2 * runner = reinterpret_cast<Test_3_2_2 *>(context);
+        Test_TC_OO_2_2 * runner = reinterpret_cast<Test_TC_OO_2_2 *>(context);
 
         delete runner->mOnFailureCallback_10;
         delete runner->mOnSuccessCallback_10;
@@ -10019,7 +10019,7 @@ class Test_3_2_2 : public TestCommand
     {
         ChipLogProgress(chipTool, "On/Off - Send On Command: Success Response");
 
-        Test_3_2_2 * runner = reinterpret_cast<Test_3_2_2 *>(context);
+        Test_TC_OO_2_2 * runner = reinterpret_cast<Test_TC_OO_2_2 *>(context);
 
         delete runner->mOnFailureCallback_10;
         delete runner->mOnSuccessCallback_10;
@@ -10069,7 +10069,7 @@ class Test_3_2_2 : public TestCommand
     {
         ChipLogProgress(chipTool, "On/Off - Check on/off attribute value is true after on command: Failure Response");
 
-        Test_3_2_2 * runner = reinterpret_cast<Test_3_2_2 *>(context);
+        Test_TC_OO_2_2 * runner = reinterpret_cast<Test_TC_OO_2_2 *>(context);
 
         delete runner->mOnFailureCallback_11;
         delete runner->mOnSuccessCallback_11;
@@ -10088,7 +10088,7 @@ class Test_3_2_2 : public TestCommand
     {
         ChipLogProgress(chipTool, "On/Off - Check on/off attribute value is true after on command: Success Response");
 
-        Test_3_2_2 * runner = reinterpret_cast<Test_3_2_2 *>(context);
+        Test_TC_OO_2_2 * runner = reinterpret_cast<Test_TC_OO_2_2 *>(context);
 
         delete runner->mOnFailureCallback_11;
         delete runner->mOnSuccessCallback_11;
@@ -10145,7 +10145,7 @@ class Test_3_2_2 : public TestCommand
     {
         ChipLogProgress(chipTool, "On/Off - Send Off Command: Failure Response");
 
-        Test_3_2_2 * runner = reinterpret_cast<Test_3_2_2 *>(context);
+        Test_TC_OO_2_2 * runner = reinterpret_cast<Test_TC_OO_2_2 *>(context);
 
         delete runner->mOnFailureCallback_12;
         delete runner->mOnSuccessCallback_12;
@@ -10164,7 +10164,7 @@ class Test_3_2_2 : public TestCommand
     {
         ChipLogProgress(chipTool, "On/Off - Send Off Command: Success Response");
 
-        Test_3_2_2 * runner = reinterpret_cast<Test_3_2_2 *>(context);
+        Test_TC_OO_2_2 * runner = reinterpret_cast<Test_TC_OO_2_2 *>(context);
 
         delete runner->mOnFailureCallback_12;
         delete runner->mOnSuccessCallback_12;
@@ -10214,7 +10214,7 @@ class Test_3_2_2 : public TestCommand
     {
         ChipLogProgress(chipTool, "On/Off - Check on/off attribute value is false after off command: Failure Response");
 
-        Test_3_2_2 * runner = reinterpret_cast<Test_3_2_2 *>(context);
+        Test_TC_OO_2_2 * runner = reinterpret_cast<Test_TC_OO_2_2 *>(context);
 
         delete runner->mOnFailureCallback_13;
         delete runner->mOnSuccessCallback_13;
@@ -10233,7 +10233,7 @@ class Test_3_2_2 : public TestCommand
     {
         ChipLogProgress(chipTool, "On/Off - Check on/off attribute value is false after off command: Success Response");
 
-        Test_3_2_2 * runner = reinterpret_cast<Test_3_2_2 *>(context);
+        Test_TC_OO_2_2 * runner = reinterpret_cast<Test_TC_OO_2_2 *>(context);
 
         delete runner->mOnFailureCallback_13;
         delete runner->mOnSuccessCallback_13;
@@ -10256,10 +10256,10 @@ class Test_3_2_2 : public TestCommand
     }
 };
 
-class Test_10_1_1 : public TestCommand
+class Test_TC_DM_1_1 : public TestCommand
 {
 public:
-    Test_10_1_1() : TestCommand("Test_10_1_1"), mTestIndex(0) {}
+    Test_TC_DM_1_1() : TestCommand("Test_TC_DM_1_1"), mTestIndex(0) {}
 
     /////////// TestCommand Interface /////////
     void NextTest() override
@@ -10268,7 +10268,7 @@ class Test_10_1_1 : public TestCommand
 
         if (mTestCount == mTestIndex)
         {
-            ChipLogProgress(chipTool, "Test_10_1_1: Test complete");
+            ChipLogProgress(chipTool, "Test_TC_DM_1_1: Test complete");
             SetCommandExitStatus(CHIP_NO_ERROR);
         }
 
@@ -10336,7 +10336,7 @@ class Test_10_1_1 : public TestCommand
 
         if (CHIP_NO_ERROR != err)
         {
-            ChipLogProgress(chipTool, "Test_10_1_1: %s", chip::ErrorStr(err));
+            ChipLogProgress(chipTool, "Test_TC_DM_1_1: %s", chip::ErrorStr(err));
             SetCommandExitStatus(err);
         }
     }
@@ -10384,7 +10384,7 @@ class Test_10_1_1 : public TestCommand
     {
         ChipLogProgress(chipTool, "Basic - Query Interaction Model Version: Failure Response");
 
-        Test_10_1_1 * runner = reinterpret_cast<Test_10_1_1 *>(context);
+        Test_TC_DM_1_1 * runner = reinterpret_cast<Test_TC_DM_1_1 *>(context);
 
         delete runner->mOnFailureCallback_0;
         delete runner->mOnSuccessCallback_0;
@@ -10403,7 +10403,7 @@ class Test_10_1_1 : public TestCommand
     {
         ChipLogProgress(chipTool, "Basic - Query Interaction Model Version: Success Response");
 
-        Test_10_1_1 * runner = reinterpret_cast<Test_10_1_1 *>(context);
+        Test_TC_DM_1_1 * runner = reinterpret_cast<Test_TC_DM_1_1 *>(context);
 
         delete runner->mOnFailureCallback_0;
         delete runner->mOnSuccessCallback_0;
@@ -10456,7 +10456,7 @@ class Test_10_1_1 : public TestCommand
     {
         ChipLogProgress(chipTool, "Basic - Query Vendor Name: Failure Response");
 
-        Test_10_1_1 * runner = reinterpret_cast<Test_10_1_1 *>(context);
+        Test_TC_DM_1_1 * runner = reinterpret_cast<Test_TC_DM_1_1 *>(context);
 
         delete runner->mOnFailureCallback_1;
         delete runner->mOnSuccessCallback_1;
@@ -10475,7 +10475,7 @@ class Test_10_1_1 : public TestCommand
     {
         ChipLogProgress(chipTool, "Basic - Query Vendor Name: Success Response");
 
-        Test_10_1_1 * runner = reinterpret_cast<Test_10_1_1 *>(context);
+        Test_TC_DM_1_1 * runner = reinterpret_cast<Test_TC_DM_1_1 *>(context);
 
         delete runner->mOnFailureCallback_1;
         delete runner->mOnSuccessCallback_1;
@@ -10534,7 +10534,7 @@ class Test_10_1_1 : public TestCommand
     {
         ChipLogProgress(chipTool, "Basic - Query VendorID: Failure Response");
 
-        Test_10_1_1 * runner = reinterpret_cast<Test_10_1_1 *>(context);
+        Test_TC_DM_1_1 * runner = reinterpret_cast<Test_TC_DM_1_1 *>(context);
 
         delete runner->mOnFailureCallback_2;
         delete runner->mOnSuccessCallback_2;
@@ -10553,7 +10553,7 @@ class Test_10_1_1 : public TestCommand
     {
         ChipLogProgress(chipTool, "Basic - Query VendorID: Success Response");
 
-        Test_10_1_1 * runner = reinterpret_cast<Test_10_1_1 *>(context);
+        Test_TC_DM_1_1 * runner = reinterpret_cast<Test_TC_DM_1_1 *>(context);
 
         delete runner->mOnFailureCallback_2;
         delete runner->mOnSuccessCallback_2;
@@ -10605,7 +10605,7 @@ class Test_10_1_1 : public TestCommand
     {
         ChipLogProgress(chipTool, "Basic - Query Product Name: Failure Response");
 
-        Test_10_1_1 * runner = reinterpret_cast<Test_10_1_1 *>(context);
+        Test_TC_DM_1_1 * runner = reinterpret_cast<Test_TC_DM_1_1 *>(context);
 
         delete runner->mOnFailureCallback_3;
         delete runner->mOnSuccessCallback_3;
@@ -10624,7 +10624,7 @@ class Test_10_1_1 : public TestCommand
     {
         ChipLogProgress(chipTool, "Basic - Query Product Name: Success Response");
 
-        Test_10_1_1 * runner = reinterpret_cast<Test_10_1_1 *>(context);
+        Test_TC_DM_1_1 * runner = reinterpret_cast<Test_TC_DM_1_1 *>(context);
 
         delete runner->mOnFailureCallback_3;
         delete runner->mOnSuccessCallback_3;
@@ -10683,7 +10683,7 @@ class Test_10_1_1 : public TestCommand
     {
         ChipLogProgress(chipTool, "Basic - Query ProductID: Failure Response");
 
-        Test_10_1_1 * runner = reinterpret_cast<Test_10_1_1 *>(context);
+        Test_TC_DM_1_1 * runner = reinterpret_cast<Test_TC_DM_1_1 *>(context);
 
         delete runner->mOnFailureCallback_4;
         delete runner->mOnSuccessCallback_4;
@@ -10702,7 +10702,7 @@ class Test_10_1_1 : public TestCommand
     {
         ChipLogProgress(chipTool, "Basic - Query ProductID: Success Response");
 
-        Test_10_1_1 * runner = reinterpret_cast<Test_10_1_1 *>(context);
+        Test_TC_DM_1_1 * runner = reinterpret_cast<Test_TC_DM_1_1 *>(context);
 
         delete runner->mOnFailureCallback_4;
         delete runner->mOnSuccessCallback_4;
@@ -10754,7 +10754,7 @@ class Test_10_1_1 : public TestCommand
     {
         ChipLogProgress(chipTool, "Basic - Query User Label: Failure Response");
 
-        Test_10_1_1 * runner = reinterpret_cast<Test_10_1_1 *>(context);
+        Test_TC_DM_1_1 * runner = reinterpret_cast<Test_TC_DM_1_1 *>(context);
 
         delete runner->mOnFailureCallback_5;
         delete runner->mOnSuccessCallback_5;
@@ -10773,7 +10773,7 @@ class Test_10_1_1 : public TestCommand
     {
         ChipLogProgress(chipTool, "Basic - Query User Label: Success Response");
 
-        Test_10_1_1 * runner = reinterpret_cast<Test_10_1_1 *>(context);
+        Test_TC_DM_1_1 * runner = reinterpret_cast<Test_TC_DM_1_1 *>(context);
 
         delete runner->mOnFailureCallback_5;
         delete runner->mOnSuccessCallback_5;
@@ -10832,7 +10832,7 @@ class Test_10_1_1 : public TestCommand
     {
         ChipLogProgress(chipTool, "Basic - Query User Location: Failure Response");
 
-        Test_10_1_1 * runner = reinterpret_cast<Test_10_1_1 *>(context);
+        Test_TC_DM_1_1 * runner = reinterpret_cast<Test_TC_DM_1_1 *>(context);
 
         delete runner->mOnFailureCallback_6;
         delete runner->mOnSuccessCallback_6;
@@ -10851,7 +10851,7 @@ class Test_10_1_1 : public TestCommand
     {
         ChipLogProgress(chipTool, "Basic - Query User Location: Success Response");
 
-        Test_10_1_1 * runner = reinterpret_cast<Test_10_1_1 *>(context);
+        Test_TC_DM_1_1 * runner = reinterpret_cast<Test_TC_DM_1_1 *>(context);
 
         delete runner->mOnFailureCallback_6;
         delete runner->mOnSuccessCallback_6;
@@ -10913,7 +10913,7 @@ class Test_10_1_1 : public TestCommand
     {
         ChipLogProgress(chipTool, "Basic - Query HardwareVersion: Failure Response");
 
-        Test_10_1_1 * runner = reinterpret_cast<Test_10_1_1 *>(context);
+        Test_TC_DM_1_1 * runner = reinterpret_cast<Test_TC_DM_1_1 *>(context);
 
         delete runner->mOnFailureCallback_7;
         delete runner->mOnSuccessCallback_7;
@@ -10932,7 +10932,7 @@ class Test_10_1_1 : public TestCommand
     {
         ChipLogProgress(chipTool, "Basic - Query HardwareVersion: Success Response");
 
-        Test_10_1_1 * runner = reinterpret_cast<Test_10_1_1 *>(context);
+        Test_TC_DM_1_1 * runner = reinterpret_cast<Test_TC_DM_1_1 *>(context);
 
         delete runner->mOnFailureCallback_7;
         delete runner->mOnSuccessCallback_7;
@@ -10984,7 +10984,7 @@ class Test_10_1_1 : public TestCommand
     {
         ChipLogProgress(chipTool, "Basic - Query HardwareVersionString: Failure Response");
 
-        Test_10_1_1 * runner = reinterpret_cast<Test_10_1_1 *>(context);
+        Test_TC_DM_1_1 * runner = reinterpret_cast<Test_TC_DM_1_1 *>(context);
 
         delete runner->mOnFailureCallback_8;
         delete runner->mOnSuccessCallback_8;
@@ -11003,7 +11003,7 @@ class Test_10_1_1 : public TestCommand
     {
         ChipLogProgress(chipTool, "Basic - Query HardwareVersionString: Success Response");
 
-        Test_10_1_1 * runner = reinterpret_cast<Test_10_1_1 *>(context);
+        Test_TC_DM_1_1 * runner = reinterpret_cast<Test_TC_DM_1_1 *>(context);
 
         delete runner->mOnFailureCallback_8;
         delete runner->mOnSuccessCallback_8;
@@ -11072,7 +11072,7 @@ class Test_10_1_1 : public TestCommand
     {
         ChipLogProgress(chipTool, "Basic - Query SoftwareVersion: Failure Response");
 
-        Test_10_1_1 * runner = reinterpret_cast<Test_10_1_1 *>(context);
+        Test_TC_DM_1_1 * runner = reinterpret_cast<Test_TC_DM_1_1 *>(context);
 
         delete runner->mOnFailureCallback_9;
         delete runner->mOnSuccessCallback_9;
@@ -11091,7 +11091,7 @@ class Test_10_1_1 : public TestCommand
     {
         ChipLogProgress(chipTool, "Basic - Query SoftwareVersion: Success Response");
 
-        Test_10_1_1 * runner = reinterpret_cast<Test_10_1_1 *>(context);
+        Test_TC_DM_1_1 * runner = reinterpret_cast<Test_TC_DM_1_1 *>(context);
 
         delete runner->mOnFailureCallback_9;
         delete runner->mOnSuccessCallback_9;
@@ -11143,7 +11143,7 @@ class Test_10_1_1 : public TestCommand
     {
         ChipLogProgress(chipTool, "Basic - Query SoftwareVersionString: Failure Response");
 
-        Test_10_1_1 * runner = reinterpret_cast<Test_10_1_1 *>(context);
+        Test_TC_DM_1_1 * runner = reinterpret_cast<Test_TC_DM_1_1 *>(context);
 
         delete runner->mOnFailureCallback_10;
         delete runner->mOnSuccessCallback_10;
@@ -11162,7 +11162,7 @@ class Test_10_1_1 : public TestCommand
     {
         ChipLogProgress(chipTool, "Basic - Query SoftwareVersionString: Success Response");
 
-        Test_10_1_1 * runner = reinterpret_cast<Test_10_1_1 *>(context);
+        Test_TC_DM_1_1 * runner = reinterpret_cast<Test_TC_DM_1_1 *>(context);
 
         delete runner->mOnFailureCallback_10;
         delete runner->mOnSuccessCallback_10;
@@ -11234,7 +11234,7 @@ class Test_10_1_1 : public TestCommand
     {
         ChipLogProgress(chipTool, "Basic - Query ManufacturingDate: Failure Response");
 
-        Test_10_1_1 * runner = reinterpret_cast<Test_10_1_1 *>(context);
+        Test_TC_DM_1_1 * runner = reinterpret_cast<Test_TC_DM_1_1 *>(context);
 
         delete runner->mOnFailureCallback_11;
         delete runner->mOnSuccessCallback_11;
@@ -11259,7 +11259,7 @@ class Test_10_1_1 : public TestCommand
     {
         ChipLogProgress(chipTool, "Basic - Query ManufacturingDate: Success Response");
 
-        Test_10_1_1 * runner = reinterpret_cast<Test_10_1_1 *>(context);
+        Test_TC_DM_1_1 * runner = reinterpret_cast<Test_TC_DM_1_1 *>(context);
 
         delete runner->mOnFailureCallback_11;
         delete runner->mOnSuccessCallback_11;
@@ -11328,7 +11328,7 @@ class Test_10_1_1 : public TestCommand
     {
         ChipLogProgress(chipTool, "Basic - Query PartNumber: Failure Response");
 
-        Test_10_1_1 * runner = reinterpret_cast<Test_10_1_1 *>(context);
+        Test_TC_DM_1_1 * runner = reinterpret_cast<Test_TC_DM_1_1 *>(context);
 
         delete runner->mOnFailureCallback_12;
         delete runner->mOnSuccessCallback_12;
@@ -11353,7 +11353,7 @@ class Test_10_1_1 : public TestCommand
     {
         ChipLogProgress(chipTool, "Basic - Query PartNumber: Success Response");
 
-        Test_10_1_1 * runner = reinterpret_cast<Test_10_1_1 *>(context);
+        Test_TC_DM_1_1 * runner = reinterpret_cast<Test_TC_DM_1_1 *>(context);
 
         delete runner->mOnFailureCallback_12;
         delete runner->mOnSuccessCallback_12;
@@ -11412,7 +11412,7 @@ class Test_10_1_1 : public TestCommand
     {
         ChipLogProgress(chipTool, "Basic - Query ProductURL: Failure Response");
 
-        Test_10_1_1 * runner = reinterpret_cast<Test_10_1_1 *>(context);
+        Test_TC_DM_1_1 * runner = reinterpret_cast<Test_TC_DM_1_1 *>(context);
 
         delete runner->mOnFailureCallback_13;
         delete runner->mOnSuccessCallback_13;
@@ -11437,7 +11437,7 @@ class Test_10_1_1 : public TestCommand
     {
         ChipLogProgress(chipTool, "Basic - Query ProductURL: Success Response");
 
-        Test_10_1_1 * runner = reinterpret_cast<Test_10_1_1 *>(context);
+        Test_TC_DM_1_1 * runner = reinterpret_cast<Test_TC_DM_1_1 *>(context);
 
         delete runner->mOnFailureCallback_13;
         delete runner->mOnSuccessCallback_13;
@@ -11498,7 +11498,7 @@ class Test_10_1_1 : public TestCommand
     {
         ChipLogProgress(chipTool, "Basic - Query ProductLabel: Failure Response");
 
-        Test_10_1_1 * runner = reinterpret_cast<Test_10_1_1 *>(context);
+        Test_TC_DM_1_1 * runner = reinterpret_cast<Test_TC_DM_1_1 *>(context);
 
         delete runner->mOnFailureCallback_14;
         delete runner->mOnSuccessCallback_14;
@@ -11523,7 +11523,7 @@ class Test_10_1_1 : public TestCommand
     {
         ChipLogProgress(chipTool, "Basic - Query ProductLabel: Success Response");
 
-        Test_10_1_1 * runner = reinterpret_cast<Test_10_1_1 *>(context);
+        Test_TC_DM_1_1 * runner = reinterpret_cast<Test_TC_DM_1_1 *>(context);
 
         delete runner->mOnFailureCallback_14;
         delete runner->mOnSuccessCallback_14;
@@ -11582,7 +11582,7 @@ class Test_10_1_1 : public TestCommand
     {
         ChipLogProgress(chipTool, "Basic - Query SerialNumber: Failure Response");
 
-        Test_10_1_1 * runner = reinterpret_cast<Test_10_1_1 *>(context);
+        Test_TC_DM_1_1 * runner = reinterpret_cast<Test_TC_DM_1_1 *>(context);
 
         delete runner->mOnFailureCallback_15;
         delete runner->mOnSuccessCallback_15;
@@ -11607,7 +11607,7 @@ class Test_10_1_1 : public TestCommand
     {
         ChipLogProgress(chipTool, "Basic - Query SerialNumber: Success Response");
 
-        Test_10_1_1 * runner = reinterpret_cast<Test_10_1_1 *>(context);
+        Test_TC_DM_1_1 * runner = reinterpret_cast<Test_TC_DM_1_1 *>(context);
 
         delete runner->mOnFailureCallback_15;
         delete runner->mOnSuccessCallback_15;
@@ -11666,7 +11666,7 @@ class Test_10_1_1 : public TestCommand
     {
         ChipLogProgress(chipTool, "Basic - Query LocalConfigDisabled: Failure Response");
 
-        Test_10_1_1 * runner = reinterpret_cast<Test_10_1_1 *>(context);
+        Test_TC_DM_1_1 * runner = reinterpret_cast<Test_TC_DM_1_1 *>(context);
 
         delete runner->mOnFailureCallback_16;
         delete runner->mOnSuccessCallback_16;
@@ -11691,7 +11691,7 @@ class Test_10_1_1 : public TestCommand
     {
         ChipLogProgress(chipTool, "Basic - Query LocalConfigDisabled: Success Response");
 
-        Test_10_1_1 * runner = reinterpret_cast<Test_10_1_1 *>(context);
+        Test_TC_DM_1_1 * runner = reinterpret_cast<Test_TC_DM_1_1 *>(context);
 
         delete runner->mOnFailureCallback_16;
         delete runner->mOnSuccessCallback_16;
@@ -11743,7 +11743,7 @@ class Test_10_1_1 : public TestCommand
     {
         ChipLogProgress(chipTool, "Basic - Query Reachable: Failure Response");
 
-        Test_10_1_1 * runner = reinterpret_cast<Test_10_1_1 *>(context);
+        Test_TC_DM_1_1 * runner = reinterpret_cast<Test_TC_DM_1_1 *>(context);
 
         delete runner->mOnFailureCallback_17;
         delete runner->mOnSuccessCallback_17;
@@ -11768,7 +11768,7 @@ class Test_10_1_1 : public TestCommand
     {
         ChipLogProgress(chipTool, "Basic - Query Reachable: Success Response");
 
-        Test_10_1_1 * runner = reinterpret_cast<Test_10_1_1 *>(context);
+        Test_TC_DM_1_1 * runner = reinterpret_cast<Test_TC_DM_1_1 *>(context);
 
         delete runner->mOnFailureCallback_17;
         delete runner->mOnSuccessCallback_17;
@@ -11831,8 +11831,8 @@ void registerCommandsTests(Commands & commands)
     const char * clusterName = "Tests";
 
     commands_list clusterCommands = {
-        make_unique<TestCluster>(), make_unique<Test_3_1_1>(),  make_unique<Test_3_2_1>(),
-        make_unique<Test_3_2_2>(),  make_unique<Test_10_1_1>(), make_unique<Test_TC_DM_3_1>(),
+        make_unique<TestCluster>(),    make_unique<Test_TC_OO_1_1>(), make_unique<Test_TC_OO_2_1>(),
+        make_unique<Test_TC_OO_2_2>(), make_unique<Test_TC_DM_1_1>(), make_unique<Test_TC_DM_3_1>(),
     };
 
     commands.Register(clusterName, clusterCommands);
diff --git a/examples/chip-tool/templates/tests-commands.zapt b/examples/chip-tool/templates/tests-commands.zapt
index cfddc2bcbcb1a9..be551aad14839d 100644
--- a/examples/chip-tool/templates/tests-commands.zapt
+++ b/examples/chip-tool/templates/tests-commands.zapt
@@ -4,7 +4,7 @@
 
 #include "TestCommand.h"
 
-{{>test_cluster tests="TestCluster, Test_3_1_1, Test_3_2_1, Test_3_2_2, Test_10_1_1, Test_TC_DM_3_1"}}
+{{>test_cluster tests="TestCluster, Test_TC_OO_1_1, Test_TC_OO_2_1, Test_TC_OO_2_2, Test_TC_DM_1_1, Test_TC_DM_3_1"}}
 
 void registerCommandsTests(Commands & commands)
 {
@@ -12,10 +12,10 @@ void registerCommandsTests(Commands & commands)
 
     commands_list clusterCommands = {
         make_unique<TestCluster>(),
-        make_unique<Test_3_1_1>(),
-        make_unique<Test_3_2_1>(),
-        make_unique<Test_3_2_2>(),
-        make_unique<Test_10_1_1>(),
+        make_unique<Test_TC_OO_1_1>(),
+        make_unique<Test_TC_OO_2_1>(),
+        make_unique<Test_TC_OO_2_2>(),
+        make_unique<Test_TC_DM_1_1>(),
         make_unique<Test_TC_DM_3_1>(),
     };
 
diff --git a/src/app/tests/suites/Test_10_1_1.yaml b/src/app/tests/suites/Test_TC_DM_1_1.yaml
similarity index 100%
rename from src/app/tests/suites/Test_10_1_1.yaml
rename to src/app/tests/suites/Test_TC_DM_1_1.yaml
diff --git a/src/app/tests/suites/Test_3_1_1.yaml b/src/app/tests/suites/Test_TC_OO_1_1.yaml
similarity index 100%
rename from src/app/tests/suites/Test_3_1_1.yaml
rename to src/app/tests/suites/Test_TC_OO_1_1.yaml
diff --git a/src/app/tests/suites/Test_3_2_1.yaml b/src/app/tests/suites/Test_TC_OO_2_1.yaml
similarity index 100%
rename from src/app/tests/suites/Test_3_2_1.yaml
rename to src/app/tests/suites/Test_TC_OO_2_1.yaml
diff --git a/src/app/tests/suites/Test_3_2_2.yaml b/src/app/tests/suites/Test_TC_OO_2_2.yaml
similarity index 100%
rename from src/app/tests/suites/Test_3_2_2.yaml
rename to src/app/tests/suites/Test_TC_OO_2_2.yaml
diff --git a/src/darwin/Framework/CHIP/templates/clusters-tests.zapt b/src/darwin/Framework/CHIP/templates/clusters-tests.zapt
index 136bb85337df00..52f07439242f08 100644
--- a/src/darwin/Framework/CHIP/templates/clusters-tests.zapt
+++ b/src/darwin/Framework/CHIP/templates/clusters-tests.zapt
@@ -137,7 +137,7 @@ CHIPDevice * GetPairedDevice(uint64_t deviceId)
     [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil];
 }
 
-{{>test_cluster tests="TestCluster, Test_3_1_1, Test_3_2_1, Test_3_2_2, Test_10_1_1, Test_TC_DM_3_1"}}
+{{>test_cluster tests="TestCluster, Test_TC_OO_1_1, Test_TC_OO_2_1, Test_TC_OO_2_2, Test_TC_DM_1_1, Test_TC_DM_3_1"}}
 
 {{#chip_client_clusters}}
 {{#unless (isStrEqual "Test Cluster" name)}}
diff --git a/src/darwin/Framework/CHIPTests/CHIPClustersTests.m b/src/darwin/Framework/CHIPTests/CHIPClustersTests.m
index 4ac59b6403c8c9..a5acc3a71004b1 100644
--- a/src/darwin/Framework/CHIPTests/CHIPClustersTests.m
+++ b/src/darwin/Framework/CHIPTests/CHIPClustersTests.m
@@ -2043,7 +2043,7 @@ - (void)testSendClusterTestCluster_000100_WriteAttribute
     [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil];
 }
 
-- (void)testSendClusterTest_3_1_1_000000_ReadAttribute
+- (void)testSendClusterTest_TC_OO_1_1_000000_ReadAttribute
 {
     XCTestExpectation * expectation = [self expectationWithDescription:@"read the global attribute: ClusterRevision"];
     CHIPDevice * device = GetPairedDevice(kDeviceId);
@@ -2061,7 +2061,7 @@ - (void)testSendClusterTest_3_1_1_000000_ReadAttribute
 
     [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil];
 }
-- (void)testSendClusterTest_3_1_1_000001_ReadAttribute
+- (void)testSendClusterTest_TC_OO_1_1_000001_ReadAttribute
 {
     XCTestExpectation * expectation = [self expectationWithDescription:@"reads back global attribute: ClusterRevision"];
     CHIPDevice * device = GetPairedDevice(kDeviceId);
@@ -2079,7 +2079,7 @@ - (void)testSendClusterTest_3_1_1_000001_ReadAttribute
 
     [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil];
 }
-- (void)testSendClusterTest_3_1_1_000002_ReadAttribute
+- (void)testSendClusterTest_TC_OO_1_1_000002_ReadAttribute
 {
     XCTestExpectation * expectation = [self expectationWithDescription:@"read the optional global attribute: FeatureMap"];
     CHIPDevice * device = GetPairedDevice(kDeviceId);
@@ -2097,7 +2097,7 @@ - (void)testSendClusterTest_3_1_1_000002_ReadAttribute
 
     [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil];
 }
-- (void)testSendClusterTest_3_1_1_000003_ReadAttribute
+- (void)testSendClusterTest_TC_OO_1_1_000003_ReadAttribute
 {
     XCTestExpectation * expectation = [self expectationWithDescription:@"reads back optional global attribute: FeatureMap"];
     CHIPDevice * device = GetPairedDevice(kDeviceId);
@@ -2116,7 +2116,7 @@ - (void)testSendClusterTest_3_1_1_000003_ReadAttribute
     [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil];
 }
 
-- (void)testSendClusterTest_3_2_1_000000_ReadAttribute
+- (void)testSendClusterTest_TC_OO_2_1_000000_ReadAttribute
 {
     XCTestExpectation * expectation = [self expectationWithDescription:@"read the mandatory attribute: OnOff"];
     CHIPDevice * device = GetPairedDevice(kDeviceId);
@@ -2134,7 +2134,7 @@ - (void)testSendClusterTest_3_2_1_000000_ReadAttribute
 
     [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil];
 }
-- (void)testSendClusterTest_3_2_1_000001_ReadAttribute
+- (void)testSendClusterTest_TC_OO_2_1_000001_ReadAttribute
 {
     XCTestExpectation * expectation = [self expectationWithDescription:@"reads back mandatory attribute: OnOff"];
     CHIPDevice * device = GetPairedDevice(kDeviceId);
@@ -2152,7 +2152,7 @@ - (void)testSendClusterTest_3_2_1_000001_ReadAttribute
 
     [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil];
 }
-- (void)testSendClusterTest_3_2_1_000002_ReadAttribute
+- (void)testSendClusterTest_TC_OO_2_1_000002_ReadAttribute
 {
     XCTestExpectation * expectation = [self expectationWithDescription:@"read LT attribute: GlobalSceneControl"];
     CHIPDevice * device = GetPairedDevice(kDeviceId);
@@ -2170,7 +2170,7 @@ - (void)testSendClusterTest_3_2_1_000002_ReadAttribute
 
     [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil];
 }
-- (void)testSendClusterTest_3_2_1_000003_ReadAttribute
+- (void)testSendClusterTest_TC_OO_2_1_000003_ReadAttribute
 {
     XCTestExpectation * expectation = [self expectationWithDescription:@"read LT attribute: OnTime"];
     CHIPDevice * device = GetPairedDevice(kDeviceId);
@@ -2188,7 +2188,7 @@ - (void)testSendClusterTest_3_2_1_000003_ReadAttribute
 
     [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil];
 }
-- (void)testSendClusterTest_3_2_1_000004_ReadAttribute
+- (void)testSendClusterTest_TC_OO_2_1_000004_ReadAttribute
 {
     XCTestExpectation * expectation = [self expectationWithDescription:@"read LT attribute: OffWaitTime"];
     CHIPDevice * device = GetPairedDevice(kDeviceId);
@@ -2206,7 +2206,7 @@ - (void)testSendClusterTest_3_2_1_000004_ReadAttribute
 
     [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil];
 }
-- (void)testSendClusterTest_3_2_1_000005_ReadAttribute
+- (void)testSendClusterTest_TC_OO_2_1_000005_ReadAttribute
 {
     XCTestExpectation * expectation = [self expectationWithDescription:@"read LT attribute: StartUpOnOff"];
     CHIPDevice * device = GetPairedDevice(kDeviceId);
@@ -2224,7 +2224,7 @@ - (void)testSendClusterTest_3_2_1_000005_ReadAttribute
 
     [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil];
 }
-- (void)testSendClusterTest_3_2_1_000006_WriteAttribute
+- (void)testSendClusterTest_TC_OO_2_1_000006_WriteAttribute
 {
     XCTestExpectation * expectation = [self expectationWithDescription:@"write the default value to LT attribute: OnTime"];
     CHIPDevice * device = GetPairedDevice(kDeviceId);
@@ -2243,7 +2243,7 @@ - (void)testSendClusterTest_3_2_1_000006_WriteAttribute
 
     [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil];
 }
-- (void)testSendClusterTest_3_2_1_000007_WriteAttribute
+- (void)testSendClusterTest_TC_OO_2_1_000007_WriteAttribute
 {
     XCTestExpectation * expectation = [self expectationWithDescription:@"write the default value to LT attribute: OffWaitTime"];
     CHIPDevice * device = GetPairedDevice(kDeviceId);
@@ -2262,7 +2262,7 @@ - (void)testSendClusterTest_3_2_1_000007_WriteAttribute
 
     [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil];
 }
-- (void)testSendClusterTest_3_2_1_000008_WriteAttribute
+- (void)testSendClusterTest_TC_OO_2_1_000008_WriteAttribute
 {
     XCTestExpectation * expectation = [self expectationWithDescription:@"write the default value to LT attribute: StartUpOnOff"];
     CHIPDevice * device = GetPairedDevice(kDeviceId);
@@ -2281,7 +2281,7 @@ - (void)testSendClusterTest_3_2_1_000008_WriteAttribute
 
     [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil];
 }
-- (void)testSendClusterTest_3_2_1_000009_ReadAttribute
+- (void)testSendClusterTest_TC_OO_2_1_000009_ReadAttribute
 {
     XCTestExpectation * expectation = [self expectationWithDescription:@"reads back LT attribute: OnTime"];
     CHIPDevice * device = GetPairedDevice(kDeviceId);
@@ -2299,7 +2299,7 @@ - (void)testSendClusterTest_3_2_1_000009_ReadAttribute
 
     [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil];
 }
-- (void)testSendClusterTest_3_2_1_000010_ReadAttribute
+- (void)testSendClusterTest_TC_OO_2_1_000010_ReadAttribute
 {
     XCTestExpectation * expectation = [self expectationWithDescription:@"reads back LT attribute: OffWaitTime"];
     CHIPDevice * device = GetPairedDevice(kDeviceId);
@@ -2317,7 +2317,7 @@ - (void)testSendClusterTest_3_2_1_000010_ReadAttribute
 
     [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil];
 }
-- (void)testSendClusterTest_3_2_1_000011_ReadAttribute
+- (void)testSendClusterTest_TC_OO_2_1_000011_ReadAttribute
 {
     XCTestExpectation * expectation = [self expectationWithDescription:@"reads back LT attribute: StartUpOnOff"];
     CHIPDevice * device = GetPairedDevice(kDeviceId);
@@ -2336,7 +2336,7 @@ - (void)testSendClusterTest_3_2_1_000011_ReadAttribute
     [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil];
 }
 
-- (void)testSendClusterTest_3_2_2_000000_Off
+- (void)testSendClusterTest_TC_OO_2_2_000000_Off
 {
     XCTestExpectation * expectation = [self expectationWithDescription:@"Send Off Command"];
     CHIPDevice * device = GetPairedDevice(kDeviceId);
@@ -2353,7 +2353,7 @@ - (void)testSendClusterTest_3_2_2_000000_Off
 
     [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil];
 }
-- (void)testSendClusterTest_3_2_2_000001_ReadAttribute
+- (void)testSendClusterTest_TC_OO_2_2_000001_ReadAttribute
 {
     XCTestExpectation * expectation = [self expectationWithDescription:@"Check on/off attribute value is false after off command"];
     CHIPDevice * device = GetPairedDevice(kDeviceId);
@@ -2371,7 +2371,7 @@ - (void)testSendClusterTest_3_2_2_000001_ReadAttribute
 
     [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil];
 }
-- (void)testSendClusterTest_3_2_2_000002_On
+- (void)testSendClusterTest_TC_OO_2_2_000002_On
 {
     XCTestExpectation * expectation = [self expectationWithDescription:@"Send On Command"];
     CHIPDevice * device = GetPairedDevice(kDeviceId);
@@ -2388,7 +2388,7 @@ - (void)testSendClusterTest_3_2_2_000002_On
 
     [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil];
 }
-- (void)testSendClusterTest_3_2_2_000003_ReadAttribute
+- (void)testSendClusterTest_TC_OO_2_2_000003_ReadAttribute
 {
     XCTestExpectation * expectation = [self expectationWithDescription:@"Check on/off attribute value is true after on command"];
     CHIPDevice * device = GetPairedDevice(kDeviceId);
@@ -2406,7 +2406,7 @@ - (void)testSendClusterTest_3_2_2_000003_ReadAttribute
 
     [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil];
 }
-- (void)testSendClusterTest_3_2_2_000004_Off
+- (void)testSendClusterTest_TC_OO_2_2_000004_Off
 {
     XCTestExpectation * expectation = [self expectationWithDescription:@"Send Off Command"];
     CHIPDevice * device = GetPairedDevice(kDeviceId);
@@ -2423,7 +2423,7 @@ - (void)testSendClusterTest_3_2_2_000004_Off
 
     [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil];
 }
-- (void)testSendClusterTest_3_2_2_000005_ReadAttribute
+- (void)testSendClusterTest_TC_OO_2_2_000005_ReadAttribute
 {
     XCTestExpectation * expectation = [self expectationWithDescription:@"Check on/off attribute value is false after off command"];
     CHIPDevice * device = GetPairedDevice(kDeviceId);
@@ -2441,7 +2441,7 @@ - (void)testSendClusterTest_3_2_2_000005_ReadAttribute
 
     [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil];
 }
-- (void)testSendClusterTest_3_2_2_000006_Toggle
+- (void)testSendClusterTest_TC_OO_2_2_000006_Toggle
 {
     XCTestExpectation * expectation = [self expectationWithDescription:@"Send Toggle Command"];
     CHIPDevice * device = GetPairedDevice(kDeviceId);
@@ -2458,7 +2458,7 @@ - (void)testSendClusterTest_3_2_2_000006_Toggle
 
     [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil];
 }
-- (void)testSendClusterTest_3_2_2_000007_ReadAttribute
+- (void)testSendClusterTest_TC_OO_2_2_000007_ReadAttribute
 {
     XCTestExpectation * expectation =
         [self expectationWithDescription:@"Check on/off attribute value is true after toggle command"];
@@ -2477,7 +2477,7 @@ - (void)testSendClusterTest_3_2_2_000007_ReadAttribute
 
     [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil];
 }
-- (void)testSendClusterTest_3_2_2_000008_Toggle
+- (void)testSendClusterTest_TC_OO_2_2_000008_Toggle
 {
     XCTestExpectation * expectation = [self expectationWithDescription:@"Send Toggle Command"];
     CHIPDevice * device = GetPairedDevice(kDeviceId);
@@ -2494,7 +2494,7 @@ - (void)testSendClusterTest_3_2_2_000008_Toggle
 
     [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil];
 }
-- (void)testSendClusterTest_3_2_2_000009_ReadAttribute
+- (void)testSendClusterTest_TC_OO_2_2_000009_ReadAttribute
 {
     XCTestExpectation * expectation =
         [self expectationWithDescription:@"Check on/off attribute value is false after toggle command"];
@@ -2513,7 +2513,7 @@ - (void)testSendClusterTest_3_2_2_000009_ReadAttribute
 
     [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil];
 }
-- (void)testSendClusterTest_3_2_2_000010_On
+- (void)testSendClusterTest_TC_OO_2_2_000010_On
 {
     XCTestExpectation * expectation = [self expectationWithDescription:@"Send On Command"];
     CHIPDevice * device = GetPairedDevice(kDeviceId);
@@ -2530,7 +2530,7 @@ - (void)testSendClusterTest_3_2_2_000010_On
 
     [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil];
 }
-- (void)testSendClusterTest_3_2_2_000011_ReadAttribute
+- (void)testSendClusterTest_TC_OO_2_2_000011_ReadAttribute
 {
     XCTestExpectation * expectation = [self expectationWithDescription:@"Check on/off attribute value is true after on command"];
     CHIPDevice * device = GetPairedDevice(kDeviceId);
@@ -2548,7 +2548,7 @@ - (void)testSendClusterTest_3_2_2_000011_ReadAttribute
 
     [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil];
 }
-- (void)testSendClusterTest_3_2_2_000012_Off
+- (void)testSendClusterTest_TC_OO_2_2_000012_Off
 {
     XCTestExpectation * expectation = [self expectationWithDescription:@"Send Off Command"];
     CHIPDevice * device = GetPairedDevice(kDeviceId);
@@ -2565,7 +2565,7 @@ - (void)testSendClusterTest_3_2_2_000012_Off
 
     [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil];
 }
-- (void)testSendClusterTest_3_2_2_000013_ReadAttribute
+- (void)testSendClusterTest_TC_OO_2_2_000013_ReadAttribute
 {
     XCTestExpectation * expectation = [self expectationWithDescription:@"Check on/off attribute value is false after off command"];
     CHIPDevice * device = GetPairedDevice(kDeviceId);
@@ -2584,7 +2584,7 @@ - (void)testSendClusterTest_3_2_2_000013_ReadAttribute
     [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil];
 }
 
-- (void)testSendClusterTest_10_1_1_000000_ReadAttribute
+- (void)testSendClusterTest_TC_DM_1_1_000000_ReadAttribute
 {
     XCTestExpectation * expectation = [self expectationWithDescription:@"Query Interaction Model Version"];
     CHIPDevice * device = GetPairedDevice(kDeviceId);
@@ -2601,7 +2601,7 @@ - (void)testSendClusterTest_10_1_1_000000_ReadAttribute
 
     [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil];
 }
-- (void)testSendClusterTest_10_1_1_000001_ReadAttribute
+- (void)testSendClusterTest_TC_DM_1_1_000001_ReadAttribute
 {
     XCTestExpectation * expectation = [self expectationWithDescription:@"Query Vendor Name"];
     CHIPDevice * device = GetPairedDevice(kDeviceId);
@@ -2619,7 +2619,7 @@ - (void)testSendClusterTest_10_1_1_000001_ReadAttribute
 
     [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil];
 }
-- (void)testSendClusterTest_10_1_1_000002_ReadAttribute
+- (void)testSendClusterTest_TC_DM_1_1_000002_ReadAttribute
 {
     XCTestExpectation * expectation = [self expectationWithDescription:@"Query VendorID"];
     CHIPDevice * device = GetPairedDevice(kDeviceId);
@@ -2636,7 +2636,7 @@ - (void)testSendClusterTest_10_1_1_000002_ReadAttribute
 
     [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil];
 }
-- (void)testSendClusterTest_10_1_1_000003_ReadAttribute
+- (void)testSendClusterTest_TC_DM_1_1_000003_ReadAttribute
 {
     XCTestExpectation * expectation = [self expectationWithDescription:@"Query Product Name"];
     CHIPDevice * device = GetPairedDevice(kDeviceId);
@@ -2654,7 +2654,7 @@ - (void)testSendClusterTest_10_1_1_000003_ReadAttribute
 
     [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil];
 }
-- (void)testSendClusterTest_10_1_1_000004_ReadAttribute
+- (void)testSendClusterTest_TC_DM_1_1_000004_ReadAttribute
 {
     XCTestExpectation * expectation = [self expectationWithDescription:@"Query ProductID"];
     CHIPDevice * device = GetPairedDevice(kDeviceId);
@@ -2671,7 +2671,7 @@ - (void)testSendClusterTest_10_1_1_000004_ReadAttribute
 
     [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil];
 }
-- (void)testSendClusterTest_10_1_1_000005_ReadAttribute
+- (void)testSendClusterTest_TC_DM_1_1_000005_ReadAttribute
 {
     XCTestExpectation * expectation = [self expectationWithDescription:@"Query User Label"];
     CHIPDevice * device = GetPairedDevice(kDeviceId);
@@ -2689,7 +2689,7 @@ - (void)testSendClusterTest_10_1_1_000005_ReadAttribute
 
     [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil];
 }
-- (void)testSendClusterTest_10_1_1_000006_ReadAttribute
+- (void)testSendClusterTest_TC_DM_1_1_000006_ReadAttribute
 {
     XCTestExpectation * expectation = [self expectationWithDescription:@"Query User Location"];
     CHIPDevice * device = GetPairedDevice(kDeviceId);
@@ -2707,7 +2707,7 @@ - (void)testSendClusterTest_10_1_1_000006_ReadAttribute
 
     [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil];
 }
-- (void)testSendClusterTest_10_1_1_000007_ReadAttribute
+- (void)testSendClusterTest_TC_DM_1_1_000007_ReadAttribute
 {
     XCTestExpectation * expectation = [self expectationWithDescription:@"Query HardwareVersion"];
     CHIPDevice * device = GetPairedDevice(kDeviceId);
@@ -2724,7 +2724,7 @@ - (void)testSendClusterTest_10_1_1_000007_ReadAttribute
 
     [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil];
 }
-- (void)testSendClusterTest_10_1_1_000008_ReadAttribute
+- (void)testSendClusterTest_TC_DM_1_1_000008_ReadAttribute
 {
     XCTestExpectation * expectation = [self expectationWithDescription:@"Query HardwareVersionString"];
     CHIPDevice * device = GetPairedDevice(kDeviceId);
@@ -2743,7 +2743,7 @@ - (void)testSendClusterTest_10_1_1_000008_ReadAttribute
 
     [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil];
 }
-- (void)testSendClusterTest_10_1_1_000009_ReadAttribute
+- (void)testSendClusterTest_TC_DM_1_1_000009_ReadAttribute
 {
     XCTestExpectation * expectation = [self expectationWithDescription:@"Query SoftwareVersion"];
     CHIPDevice * device = GetPairedDevice(kDeviceId);
@@ -2760,7 +2760,7 @@ - (void)testSendClusterTest_10_1_1_000009_ReadAttribute
 
     [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil];
 }
-- (void)testSendClusterTest_10_1_1_000010_ReadAttribute
+- (void)testSendClusterTest_TC_DM_1_1_000010_ReadAttribute
 {
     XCTestExpectation * expectation = [self expectationWithDescription:@"Query SoftwareVersionString"];
     CHIPDevice * device = GetPairedDevice(kDeviceId);
@@ -2779,7 +2779,7 @@ - (void)testSendClusterTest_10_1_1_000010_ReadAttribute
 
     [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil];
 }
-- (void)testSendClusterTest_10_1_1_000011_ReadAttribute
+- (void)testSendClusterTest_TC_DM_1_1_000011_ReadAttribute
 {
     XCTestExpectation * expectation = [self expectationWithDescription:@"Query ManufacturingDate"];
     CHIPDevice * device = GetPairedDevice(kDeviceId);
@@ -2803,7 +2803,7 @@ - (void)testSendClusterTest_10_1_1_000011_ReadAttribute
 
     [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil];
 }
-- (void)testSendClusterTest_10_1_1_000012_ReadAttribute
+- (void)testSendClusterTest_TC_DM_1_1_000012_ReadAttribute
 {
     XCTestExpectation * expectation = [self expectationWithDescription:@"Query PartNumber"];
     CHIPDevice * device = GetPairedDevice(kDeviceId);
@@ -2826,7 +2826,7 @@ - (void)testSendClusterTest_10_1_1_000012_ReadAttribute
 
     [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil];
 }
-- (void)testSendClusterTest_10_1_1_000013_ReadAttribute
+- (void)testSendClusterTest_TC_DM_1_1_000013_ReadAttribute
 {
     XCTestExpectation * expectation = [self expectationWithDescription:@"Query ProductURL"];
     CHIPDevice * device = GetPairedDevice(kDeviceId);
@@ -2849,7 +2849,7 @@ - (void)testSendClusterTest_10_1_1_000013_ReadAttribute
 
     [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil];
 }
-- (void)testSendClusterTest_10_1_1_000014_ReadAttribute
+- (void)testSendClusterTest_TC_DM_1_1_000014_ReadAttribute
 {
     XCTestExpectation * expectation = [self expectationWithDescription:@"Query ProductLabel"];
     CHIPDevice * device = GetPairedDevice(kDeviceId);
@@ -2872,7 +2872,7 @@ - (void)testSendClusterTest_10_1_1_000014_ReadAttribute
 
     [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil];
 }
-- (void)testSendClusterTest_10_1_1_000015_ReadAttribute
+- (void)testSendClusterTest_TC_DM_1_1_000015_ReadAttribute
 {
     XCTestExpectation * expectation = [self expectationWithDescription:@"Query SerialNumber"];
     CHIPDevice * device = GetPairedDevice(kDeviceId);
@@ -2895,7 +2895,7 @@ - (void)testSendClusterTest_10_1_1_000015_ReadAttribute
 
     [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil];
 }
-- (void)testSendClusterTest_10_1_1_000016_ReadAttribute
+- (void)testSendClusterTest_TC_DM_1_1_000016_ReadAttribute
 {
     XCTestExpectation * expectation = [self expectationWithDescription:@"Query LocalConfigDisabled"];
     CHIPDevice * device = GetPairedDevice(kDeviceId);
@@ -2917,7 +2917,7 @@ - (void)testSendClusterTest_10_1_1_000016_ReadAttribute
 
     [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil];
 }
-- (void)testSendClusterTest_10_1_1_000017_ReadAttribute
+- (void)testSendClusterTest_TC_DM_1_1_000017_ReadAttribute
 {
     XCTestExpectation * expectation = [self expectationWithDescription:@"Query Reachable"];
     CHIPDevice * device = GetPairedDevice(kDeviceId);