diff --git a/src/app/tests/suites/certification/PICS.yaml b/src/app/tests/suites/certification/PICS.yaml
index 6e13ca476beb56..56aea7c1c2416d 100644
--- a/src/app/tests/suites/certification/PICS.yaml
+++ b/src/app/tests/suites/certification/PICS.yaml
@@ -4117,7 +4117,7 @@ PICS:
     - label:
           "Does the DUT support the Content Launcher server cluster, Content
           Search feature?"
-      id: CONTENTLAUNCHER.S.CS
+      id: CONTENTLAUNCHER.S.F00
 
     #
     # server / attributes
@@ -4125,12 +4125,12 @@ PICS:
     - label:
           "Does the DUT support the Application Launcher server cluster,
           Application Platform feature?"
-      id: APPLAUNCHER.S.AP
+      id: APPLAUNCHER.S.F00
 
     - label:
           "Does the DUT support the Media Playback server cluster, Advanced Seek
           feature?"
-      id: MEDIAPLAYBACK.S.AS
+      id: MEDIAPLAYBACK.S.F00
 
     - label:
           "Does the DUT support the Wake On LAN server cluster, MACAddress
@@ -4431,44 +4431,44 @@ PICS:
     - label:
           "Does the DUT support the Keypad Input server cluster, Navigation
           Keys?"
-      id: KEYPADINPUT.S.NV
+      id: KEYPADINPUT.S.F00
 
     - label:
           "Does the DUT support the Keypad Input server cluster, Location Keys?"
-      id: KEYPADINPUT.S.LK
+      id: KEYPADINPUT.S.F01
 
     - label:
           "Does the DUT support the Keypad Input server cluster, Number Keys?"
-      id: KEYPADINPUT.S.NK
+      id: KEYPADINPUT.S.F02
 
     - label:
           "Does the DUT support the Media Input server cluster, Name Updates
           feature?"
-      id: MEDIAINPUT.S.NU
+      id: MEDIAINPUT.S.F00
 
     - label:
           "Does the DUT support the Channel server cluster, Channel List
           feature?"
-      id: CHANNEL.S.CL
+      id: CHANNEL.S.F00
 
     - label:
           "Does the DUT support the Channel server cluster, Lineup Info feature?"
-      id: CHANNEL.S.LI
+      id: CHANNEL.S.F01
 
     - label:
           "Does the DUT support the Media Playback server cluster, Variable
           Speed feature?"
-      id: MEDIAPLAYBACK.S.VS
+      id: MEDIAPLAYBACK.S.F01
 
     - label:
           "Does the DUT support the Audio Ouput server cluster, Name Updates
           feature?"
-      id: AUDIOOUTPUT.S.NU
+      id: AUDIOOUTPUT.S.F00
 
     - label:
           "Does the DUT support the Content Launcher server cluster, URL
           Playback feature?"
-      id: CONTENTLAUNCHER.S.UP
+      id: CONTENTLAUNCHER.S.F01
 
     - label:
           "Does the DUT support the Content Launcher server cluster and is
@@ -4478,12 +4478,12 @@ PICS:
     - label:
           "Does the DUT support the commissioning procedure initiated by a
           commissionee using User Directed Commissioning?"
-      id: MC.S.UDC
+      id: MC.S.M.UDC
 
     - label:
           "Does the DUT support the commissioning procedure initiated by a
           commissionee using User Directed Commissioning without PIN code entry?"
-      id: MC.S.UDCLOGIN
+      id: MC.S.M.UDCLOGIN
 
     #
     # client / commandsGenerated
diff --git a/src/app/tests/suites/certification/Test_TC_APPLAUNCHER_1_3.yaml b/src/app/tests/suites/certification/Test_TC_APPLAUNCHER_1_3.yaml
index 593f5cc568f87a..57e842c6b34d42 100644
--- a/src/app/tests/suites/certification/Test_TC_APPLAUNCHER_1_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_APPLAUNCHER_1_3.yaml
@@ -42,7 +42,7 @@ tests:
               type: int16u
 
     - label: "Read the global attribute: FeatureMap"
-      PICS: APPLAUNCHER.S.AP
+      PICS: APPLAUNCHER.S.F00
       command: "readAttribute"
       attribute: "FeatureMap"
       response:
@@ -51,7 +51,7 @@ tests:
               type: bitmap32
 
     - label: "Read the global attribute: FeatureMap"
-      PICS: " !APPLAUNCHER.S.AP "
+      PICS: " !APPLAUNCHER.S.F00 "
       command: "readAttribute"
       attribute: "FeatureMap"
       response:
diff --git a/src/app/tests/suites/certification/Test_TC_AUDIOOUTPUT_1_8.yaml b/src/app/tests/suites/certification/Test_TC_AUDIOOUTPUT_1_8.yaml
index bd4d8d3ae0c60f..9bca97c0b23887 100644
--- a/src/app/tests/suites/certification/Test_TC_AUDIOOUTPUT_1_8.yaml
+++ b/src/app/tests/suites/certification/Test_TC_AUDIOOUTPUT_1_8.yaml
@@ -42,13 +42,22 @@ tests:
               type: int16u
 
     - label: "Read the global attribute: FeatureMap"
+      PICS: AUDIOOUTPUT.S.F00
       command: "readAttribute"
       attribute: "FeatureMap"
       response:
           constraints:
               type: bitmap32
-              minValue: 0
-              maxValue: 3
+              hasMasksSet: [0x2]
+
+    - label: "Read the global attribute: FeatureMap"
+      PICS: " !AUDIOOUTPUT.S.F00 "
+      command: "readAttribute"
+      attribute: "FeatureMap"
+      response:
+          constraints:
+              type: bitmap32
+              hasMasksClear: [0x2]
 
     - label: "Read the global attribute: AttributeList"
       command: "readAttribute"
diff --git a/src/app/tests/suites/certification/Test_TC_CHANNEL_1_6.yaml b/src/app/tests/suites/certification/Test_TC_CHANNEL_1_6.yaml
index 1fabbbb907a625..6ec3c9f86e2892 100644
--- a/src/app/tests/suites/certification/Test_TC_CHANNEL_1_6.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CHANNEL_1_6.yaml
@@ -41,7 +41,7 @@ tests:
               type: int16u
 
     - label: "Read the global attribute: FeatureMap"
-      PICS: ( !CHANNEL.S.CL && !CHANNEL.S.LI )
+      PICS: ( !CHANNEL.S.F00 && !CHANNEL.S.F01 )
       command: "readAttribute"
       attribute: "FeatureMap"
       response:
@@ -49,8 +49,9 @@ tests:
           constraints:
               type: bitmap32
 
-    - label: "Given CHANNEL.S.CL ensure featuremap has the correct bit set"
-      PICS: CHANNEL.S.CL
+    - label:
+          "Given CCHANNEL.S.F00(CL) ensure featuremap has the correct bit set"
+      PICS: CHANNEL.S.F00
       command: "readAttribute"
       attribute: "FeatureMap"
       response:
@@ -58,8 +59,8 @@ tests:
               type: bitmap32
               hasMasksSet: [0x1]
 
-    - label: "Given CHANNEL.S.LI ensure featuremap has the correct bit set"
-      PICS: CHANNEL.S.LI
+    - label: "Given CHANNEL.S.F01(LI) ensure featuremap has the correct bit set"
+      PICS: CHANNEL.S.F01
       command: "readAttribute"
       attribute: "FeatureMap"
       response:
@@ -132,7 +133,7 @@ tests:
               contains: [3]
 
     - label: "Read the global attribute: GeneratedCommandList"
-      PICS: ( !CHANNEL.S.CL && !CHANNEL.S.LI )
+      PICS: ( !CHANNEL.S.F00 && !CHANNEL.S.F01 )
       command: "readAttribute"
       attribute: "GeneratedCommandList"
       response:
@@ -141,7 +142,7 @@ tests:
               type: list
 
     - label: "Read the global attribute: GeneratedCommandList"
-      PICS: CHANNEL.S.CL || CHANNEL.S.LI
+      PICS: CHANNEL.S.F00 || CHANNEL.S.F01
       command: "readAttribute"
       attribute: "GeneratedCommandList"
       response:
diff --git a/src/app/tests/suites/certification/Test_TC_CONTENTLAUNCHER_1_11.yaml b/src/app/tests/suites/certification/Test_TC_CONTENTLAUNCHER_1_11.yaml
index 1a85df436ed44c..7de4f61f1ea817 100644
--- a/src/app/tests/suites/certification/Test_TC_CONTENTLAUNCHER_1_11.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CONTENTLAUNCHER_1_11.yaml
@@ -42,7 +42,7 @@ tests:
               type: int16u
 
     - label: "Read the global attribute: FeatureMap"
-      PICS: ( !CONTENTLAUNCHER.S.CS && !CONTENTLAUNCHER.S.UP )
+      PICS: ( !CONTENTLAUNCHER.S.F00 && !CONTENTLAUNCHER.S.F01 )
       command: "readAttribute"
       attribute: "FeatureMap"
       response:
@@ -51,8 +51,9 @@ tests:
               type: bitmap32
 
     - label:
-          "Given CONTENTLAUNCHER.S.CS) ensure featuremap has the correct bit set"
-      PICS: CONTENTLAUNCHER.S.CS
+          "Given CONTENTLAUNCHER.S.F00 (CS) ensure featuremap has the correct
+          bit set"
+      PICS: CONTENTLAUNCHER.S.F00
       command: "readAttribute"
       attribute: "FeatureMap"
       response:
@@ -61,8 +62,9 @@ tests:
               hasMasksSet: [0x1]
 
     - label:
-          "Given CONTENTLAUNCHER.S.UP ensure featuremap has the correct bit set"
-      PICS: CONTENTLAUNCHER.S.UP
+          "Given CONTENTLAUNCHER.S.F01(UP) ensure featuremap has the correct bit
+          set"
+      PICS: CONTENTLAUNCHER.S.F01
       command: "readAttribute"
       attribute: "FeatureMap"
       response:
diff --git a/src/app/tests/suites/certification/Test_TC_KEYPADINPUT_1_2.yaml b/src/app/tests/suites/certification/Test_TC_KEYPADINPUT_1_2.yaml
index df107b1de3424b..0cc8524324be96 100644
--- a/src/app/tests/suites/certification/Test_TC_KEYPADINPUT_1_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_KEYPADINPUT_1_2.yaml
@@ -42,7 +42,7 @@ tests:
               type: int16u
 
     - label: "Read the global attribute: FeatureMap"
-      PICS: " !KEYPADINPUT.S.NV && KEYPADINPUT.S.LK && !KEYPADINPUT.S.NK "
+      PICS: " !KEYPADINPUT.S.F00 && KEYPADINPUT.S.F01 && !KEYPADINPUT.S.F02 "
       command: "readAttribute"
       attribute: "FeatureMap"
       response:
@@ -50,8 +50,8 @@ tests:
           constraints:
               type: bitmap32
 
-    - label: "Given (KEYPADINPUT.S.NV) FeatureMap bit mask is set or not"
-      PICS: KEYPADINPUT.S.NV
+    - label: "Given (KEYPADINPUT.S.F00(NV)) FeatureMap bit mask is set or not"
+      PICS: KEYPADINPUT.S.F00
       command: "readAttribute"
       attribute: "FeatureMap"
       response:
@@ -59,8 +59,8 @@ tests:
               type: bitmap32
               hasMasksSet: [0x1]
 
-    - label: "Given (KEYPADINPUT.S.LK) FeatureMap bit mask is set or not"
-      PICS: KEYPADINPUT.S.LK
+    - label: "Given (KEYPADINPUT.S.F01(LK)) FeatureMap bit mask is set or not"
+      PICS: KEYPADINPUT.S.F01
       command: "readAttribute"
       attribute: "FeatureMap"
       response:
@@ -68,8 +68,8 @@ tests:
               type: bitmap32
               hasMasksSet: [0x2]
 
-    - label: "Given (KEYPADINPUT.S.NK) FeatureMap bit mask is set or not"
-      PICS: KEYPADINPUT.S.NK
+    - label: "Given (KEYPADINPUT.S.F02(NK)) FeatureMap bit mask is set or not"
+      PICS: KEYPADINPUT.S.F02
       command: "readAttribute"
       attribute: "FeatureMap"
       response:
diff --git a/src/app/tests/suites/certification/Test_TC_KEYPADINPUT_3_2.yaml b/src/app/tests/suites/certification/Test_TC_KEYPADINPUT_3_2.yaml
index eb915a197d5b80..89a9b9646634c5 100644
--- a/src/app/tests/suites/certification/Test_TC_KEYPADINPUT_3_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_KEYPADINPUT_3_2.yaml
@@ -15,7 +15,7 @@
 name: 19.3.2. [TC-KEYPADINPUT-3.2] Location Keys Verification
 
 PICS:
-    - KEYPADINPUT.S.LK
+    - KEYPADINPUT.S.F01
 
 config:
     nodeId: 0x12344321
@@ -32,7 +32,7 @@ tests:
                 value: nodeId
 
     - label: "TH sends CEC Settings Keys(0x0A) to DUT"
-      PICS: KEYPADINPUT.S.LK && KEYPADINPUT.S.C00.Rsp
+      PICS: KEYPADINPUT.S.F01 && KEYPADINPUT.S.C00.Rsp
       command: "SendKey"
       arguments:
           values:
@@ -44,7 +44,7 @@ tests:
                 value: 0
 
     - label: "TH sends CEC Home Keys(0x09) to DUT"
-      PICS: KEYPADINPUT.S.LK && KEYPADINPUT.S.C00.Rsp
+      PICS: KEYPADINPUT.S.F01 && KEYPADINPUT.S.C00.Rsp
       command: "SendKey"
       arguments:
           values:
diff --git a/src/app/tests/suites/certification/Test_TC_KEYPADINPUT_3_3.yaml b/src/app/tests/suites/certification/Test_TC_KEYPADINPUT_3_3.yaml
index 02c3fd5a104551..22e8f2332fd632 100644
--- a/src/app/tests/suites/certification/Test_TC_KEYPADINPUT_3_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_KEYPADINPUT_3_3.yaml
@@ -15,7 +15,7 @@
 name: 19.3.3. [TC-KEYPADINPUT-3.3] Number Keys Verification
 
 PICS:
-    - KEYPADINPUT.S.NK
+    - KEYPADINPUT.S.F02
 
 config:
     nodeId: 0x12344321
@@ -32,7 +32,7 @@ tests:
                 value: nodeId
 
     - label: "Send Numbers1"
-      PICS: KEYPADINPUT.S.C00.Rsp && KEYPADINPUT.S.NK
+      PICS: KEYPADINPUT.S.C00.Rsp && KEYPADINPUT.S.F02
       command: "SendKey"
       arguments:
           values:
@@ -44,7 +44,7 @@ tests:
                 value: 0
 
     - label: "Send Numbers2"
-      PICS: KEYPADINPUT.S.C00.Rsp && KEYPADINPUT.S.NK
+      PICS: KEYPADINPUT.S.C00.Rsp && KEYPADINPUT.S.F02
       command: "SendKey"
       arguments:
           values:
@@ -56,7 +56,7 @@ tests:
                 value: 0
 
     - label: "Send Numbers3"
-      PICS: KEYPADINPUT.S.C00.Rsp && KEYPADINPUT.S.NK
+      PICS: KEYPADINPUT.S.C00.Rsp && KEYPADINPUT.S.F02
       command: "SendKey"
       arguments:
           values:
@@ -68,7 +68,7 @@ tests:
                 value: 0
 
     - label: "Send Numbers4"
-      PICS: KEYPADINPUT.S.C00.Rsp && KEYPADINPUT.S.NK
+      PICS: KEYPADINPUT.S.C00.Rsp && KEYPADINPUT.S.F02
       command: "SendKey"
       arguments:
           values:
@@ -80,7 +80,7 @@ tests:
                 value: 0
 
     - label: "Send Numbers5"
-      PICS: KEYPADINPUT.S.C00.Rsp && KEYPADINPUT.S.NK
+      PICS: KEYPADINPUT.S.C00.Rsp && KEYPADINPUT.S.F02
       command: "SendKey"
       arguments:
           values:
@@ -92,7 +92,7 @@ tests:
                 value: 0
 
     - label: "Send Numbers6"
-      PICS: KEYPADINPUT.S.C00.Rsp && KEYPADINPUT.S.NK
+      PICS: KEYPADINPUT.S.C00.Rsp && KEYPADINPUT.S.F02
       command: "SendKey"
       arguments:
           values:
@@ -104,7 +104,7 @@ tests:
                 value: 0
 
     - label: "Send Numbers7"
-      PICS: KEYPADINPUT.S.C00.Rsp && KEYPADINPUT.S.NK
+      PICS: KEYPADINPUT.S.C00.Rsp && KEYPADINPUT.S.F02
       command: "SendKey"
       arguments:
           values:
@@ -116,7 +116,7 @@ tests:
                 value: 0
 
     - label: "Send Numbers8"
-      PICS: KEYPADINPUT.S.C00.Rsp && KEYPADINPUT.S.NK
+      PICS: KEYPADINPUT.S.C00.Rsp && KEYPADINPUT.S.F02
       command: "SendKey"
       arguments:
           values:
@@ -128,7 +128,7 @@ tests:
                 value: 0
 
     - label: "Send Numbers9"
-      PICS: KEYPADINPUT.S.C00.Rsp && KEYPADINPUT.S.NK
+      PICS: KEYPADINPUT.S.C00.Rsp && KEYPADINPUT.S.F02
       command: "SendKey"
       arguments:
           values:
diff --git a/src/app/tests/suites/certification/Test_TC_MC_11_1.yaml b/src/app/tests/suites/certification/Test_TC_MC_11_1.yaml
index b43b6b73853aad..f2739a908c5c9a 100644
--- a/src/app/tests/suites/certification/Test_TC_MC_11_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_MC_11_1.yaml
@@ -18,7 +18,7 @@ name:
     Verification (DUT as Server)
 
 PICS:
-    - MC.S.UDCLOGIN
+    - MC.S.M.UDCLOGIN
 
 config:
     nodeId: 0x12344321
diff --git a/src/app/tests/suites/certification/Test_TC_MC_11_2.yaml b/src/app/tests/suites/certification/Test_TC_MC_11_2.yaml
index 5f1add558f194e..923f37b0bd6a7b 100644
--- a/src/app/tests/suites/certification/Test_TC_MC_11_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_MC_11_2.yaml
@@ -18,7 +18,7 @@ name:
     Verification (DUT as Server)
 
 PICS:
-    - MC.S.UDC
+    - MC.S.M.UDC
 
 config:
     nodeId: 0x12344321
diff --git a/src/app/tests/suites/certification/Test_TC_MEDIAINPUT_1_4.yaml b/src/app/tests/suites/certification/Test_TC_MEDIAINPUT_1_4.yaml
index 9e7125eaae654b..4ab9ae77a4b3cd 100644
--- a/src/app/tests/suites/certification/Test_TC_MEDIAINPUT_1_4.yaml
+++ b/src/app/tests/suites/certification/Test_TC_MEDIAINPUT_1_4.yaml
@@ -42,7 +42,7 @@ tests:
               type: int16u
 
     - label: "Read the global attribute: FeatureMap"
-      PICS: " !MEDIAINPUT.S.NU "
+      PICS: " !MEDIAINPUT.S.F00 "
       command: "readAttribute"
       attribute: "FeatureMap"
       response:
@@ -50,8 +50,9 @@ tests:
           constraints:
               type: bitmap32
 
-    - label: "Given MEDIAINPUT.S.NU ensure featuremap has the correct bit set"
-      PICS: MEDIAINPUT.S.NU
+    - label:
+          "Given MEDIAINPUT.S.F00(NU) ensure featuremap has the correct bit set"
+      PICS: MEDIAINPUT.S.F00
       command: "readAttribute"
       attribute: "FeatureMap"
       response:
diff --git a/src/app/tests/suites/certification/Test_TC_MEDIAPLAYBACK_1_7.yaml b/src/app/tests/suites/certification/Test_TC_MEDIAPLAYBACK_1_7.yaml
index e1fd3d5cd89267..792ed1e19f82b6 100644
--- a/src/app/tests/suites/certification/Test_TC_MEDIAPLAYBACK_1_7.yaml
+++ b/src/app/tests/suites/certification/Test_TC_MEDIAPLAYBACK_1_7.yaml
@@ -42,7 +42,7 @@ tests:
               type: int16u
 
     - label: "Read the global attribute: FeatureMap"
-      PICS: " !MEDIAPLAYBACK.S.AS && !MEDIAPLAYBACK.S.VS "
+      PICS: " !MEDIAPLAYBACK.S.F00 && !MEDIAPLAYBACK.S.F01 "
       command: "readAttribute"
       attribute: "FeatureMap"
       response:
@@ -51,8 +51,9 @@ tests:
               type: bitmap32
 
     - label:
-          "Given MEDIAPLAYBACK.S.AS ensure featuremap has the correct bit set"
-      PICS: MEDIAPLAYBACK.S.AS
+          "Given MEDIAPLAYBACK.S.F00(AS) ensure featuremap has the correct bit
+          set"
+      PICS: MEDIAPLAYBACK.S.F00
       command: "readAttribute"
       attribute: "FeatureMap"
       response:
@@ -61,8 +62,9 @@ tests:
               hasMasksSet: [0x1]
 
     - label:
-          "Given MEDIAPLAYBACK.S.VS ensure featuremap has the correct bit set"
-      PICS: MEDIAPLAYBACK.S.VS
+          "Given MEDIAPLAYBACK.S.F01(VS) ensure featuremap has the correct bit
+          set"
+      PICS: MEDIAPLAYBACK.S.F01
       command: "readAttribute"
       attribute: "FeatureMap"
       response:
diff --git a/src/app/tests/suites/certification/ci-pics-values b/src/app/tests/suites/certification/ci-pics-values
index 5b5fc568fb1847..3cb6b999f9ea01 100644
--- a/src/app/tests/suites/certification/ci-pics-values
+++ b/src/app/tests/suites/certification/ci-pics-values
@@ -309,7 +309,7 @@ CC.C.F04=0
 APPLAUNCHER.S=1
 APPLAUNCHER.S.A0000=1
 APPLAUNCHER.S.A0001=1
-APPLAUNCHER.S.AP=1
+APPLAUNCHER.S.F00=1
 
 APPLAUNCHER.C=1
 APPLAUNCHER.C.C00.Tx=1
@@ -320,9 +320,9 @@ APPLAUNCHER.S.C01.Rsp=1
 APPLAUNCHER.S.C02.Rsp=1
 
 KEYPADINPUT.S=1
-KEYPADINPUT.S.LK=1
-KEYPADINPUT.S.NK=1
-KEYPADINPUT.S.NV=1
+KEYPADINPUT.S.F01=1
+KEYPADINPUT.S.F02=1
+KEYPADINPUT.S.F00=1
 KEYPADINPUT.S.C00.Rsp=1
 KEYPADINPUT.C.C00.Tx=1
 
@@ -344,7 +344,7 @@ MEDIAINPUT.S.C00.Rsp=1
 MEDIAINPUT.S.C01.Rsp=1
 MEDIAINPUT.S.C02.Rsp=1
 MEDIAINPUT.S.C03.Rsp=1
-MEDIAINPUT.S.NU=1
+MEDIAINPUT.S.F00=1
 
 MEDIAINPUT.C=1
 MEDIAINPUT.C.C00.Tx=1
@@ -359,8 +359,8 @@ CHANNEL.S.A0002=1
 CHANNEL.S.C00.Rsp=1
 CHANNEL.S.C02.Rsp=1
 CHANNEL.S.C03.Rsp=1
-CHANNEL.S.LI=1
-CHANNEL.S.CL=0
+CHANNEL.S.F01=1
+CHANNEL.S.F00=0
 
 CHANNEL.C=1
 CHANNEL.C.C00.Tx=1
@@ -388,8 +388,8 @@ MEDIAPLAYBACK.S.C08.Rsp=1
 MEDIAPLAYBACK.S.C09.Rsp=1
 MEDIAPLAYBACK.S.C0b.Rsp=1
 
-MEDIAPLAYBACK.S.AS=1
-MEDIAPLAYBACK.S.VS=1
+MEDIAPLAYBACK.S.F00=1
+MEDIAPLAYBACK.S.F01=1
 
 MEDIAPLAYBACK.C=1
 MEDIAPLAYBACK.C.C00.Tx=1
@@ -412,7 +412,7 @@ AUDIOOUTPUT.S.C01.Rsp=1
 AUDIOOUTPUT.C=1
 AUDIOOUTPUT.C.C00.Tx=1
 AUDIOOUTPUT.C.C01.Tx=1
-AUDIOOUTPUT.S.NU=0
+AUDIOOUTPUT.S.F00=0
 
 TGTNAV.S=1
 TGTNAV.S.A0000=1
@@ -439,8 +439,8 @@ CONTENTLAUNCHER.S.A0000=1
 CONTENTLAUNCHER.S.A0001=1
 CONTENTLAUNCHER.S.A0000=1
 CONTENTLAUNCHER.S.A0001=1
-CONTENTLAUNCHER.S.CS=0
-CONTENTLAUNCHER.S.UP=1
+CONTENTLAUNCHER.S.F00=0
+CONTENTLAUNCHER.S.F01=1
 CONTENTLAUNCHER.S.C00.Rsp=1
 CONTENTLAUNCHER.S.C01.Rsp=1
 
@@ -459,8 +459,8 @@ ALOGIN.C.C00.Tx=1
 KEYPADINPUT.C=1
 
 MC.S=1
-MC.S.UDC=1
-MC.S.UDCLOGIN=1
+MC.S.M.UDC=1
+MC.S.M.UDCLOGIN=1
 MC.C=1
 
 # Level Control Cluster
diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h
index 8438ee593b983c..75996dcf0fc9a3 100644
--- a/zzz_generated/chip-tool/zap-generated/test/Commands.h
+++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h
@@ -33372,26 +33372,26 @@ class Test_TC_KEYPADINPUT_1_2Suite : public TestCommand
         }
         case 2: {
             LogStep(2, "Read the global attribute: FeatureMap");
-            VerifyOrDo(!ShouldSkip(" !KEYPADINPUT.S.NV && KEYPADINPUT.S.LK && !KEYPADINPUT.S.NK "),
+            VerifyOrDo(!ShouldSkip(" !KEYPADINPUT.S.F00 && KEYPADINPUT.S.F01 && !KEYPADINPUT.S.F02 "),
                        return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), KeypadInput::Id, KeypadInput::Attributes::FeatureMap::Id, true,
                                  chip::NullOptional);
         }
         case 3: {
-            LogStep(3, "Given (KEYPADINPUT.S.NV) FeatureMap bit mask is set or not");
-            VerifyOrDo(!ShouldSkip("KEYPADINPUT.S.NV"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            LogStep(3, "Given (KEYPADINPUT.S.F00(NV)) FeatureMap bit mask is set or not");
+            VerifyOrDo(!ShouldSkip("KEYPADINPUT.S.F00"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), KeypadInput::Id, KeypadInput::Attributes::FeatureMap::Id, true,
                                  chip::NullOptional);
         }
         case 4: {
-            LogStep(4, "Given (KEYPADINPUT.S.LK) FeatureMap bit mask is set or not");
-            VerifyOrDo(!ShouldSkip("KEYPADINPUT.S.LK"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            LogStep(4, "Given (KEYPADINPUT.S.F01(LK)) FeatureMap bit mask is set or not");
+            VerifyOrDo(!ShouldSkip("KEYPADINPUT.S.F01"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), KeypadInput::Id, KeypadInput::Attributes::FeatureMap::Id, true,
                                  chip::NullOptional);
         }
         case 5: {
-            LogStep(5, "Given (KEYPADINPUT.S.NK) FeatureMap bit mask is set or not");
-            VerifyOrDo(!ShouldSkip("KEYPADINPUT.S.NK"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            LogStep(5, "Given (KEYPADINPUT.S.F02(NK)) FeatureMap bit mask is set or not");
+            VerifyOrDo(!ShouldSkip("KEYPADINPUT.S.F02"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), KeypadInput::Id, KeypadInput::Attributes::FeatureMap::Id, true,
                                  chip::NullOptional);
         }
@@ -33581,13 +33581,13 @@ class Test_TC_APPLAUNCHER_1_3Suite : public TestCommand
         }
         case 2: {
             LogStep(2, "Read the global attribute: FeatureMap");
-            VerifyOrDo(!ShouldSkip("APPLAUNCHER.S.AP"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("APPLAUNCHER.S.F00"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), ApplicationLauncher::Id,
                                  ApplicationLauncher::Attributes::FeatureMap::Id, true, chip::NullOptional);
         }
         case 3: {
             LogStep(3, "Read the global attribute: FeatureMap");
-            VerifyOrDo(!ShouldSkip(" !APPLAUNCHER.S.AP "), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip(" !APPLAUNCHER.S.F00 "), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), ApplicationLauncher::Id,
                                  ApplicationLauncher::Attributes::FeatureMap::Id, true, chip::NullOptional);
         }
@@ -33793,13 +33793,13 @@ class Test_TC_MEDIAINPUT_1_4Suite : public TestCommand
         }
         case 2: {
             LogStep(2, "Read the global attribute: FeatureMap");
-            VerifyOrDo(!ShouldSkip(" !MEDIAINPUT.S.NU "), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip(" !MEDIAINPUT.S.F00 "), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), MediaInput::Id, MediaInput::Attributes::FeatureMap::Id, true,
                                  chip::NullOptional);
         }
         case 3: {
-            LogStep(3, "Given MEDIAINPUT.S.NU ensure featuremap has the correct bit set");
-            VerifyOrDo(!ShouldSkip("MEDIAINPUT.S.NU"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            LogStep(3, "Given MEDIAINPUT.S.F00(NU) ensure featuremap has the correct bit set");
+            VerifyOrDo(!ShouldSkip("MEDIAINPUT.S.F00"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), MediaInput::Id, MediaInput::Attributes::FeatureMap::Id, true,
                                  chip::NullOptional);
         }
@@ -34228,19 +34228,19 @@ class Test_TC_CHANNEL_1_6Suite : public TestCommand
         }
         case 2: {
             LogStep(2, "Read the global attribute: FeatureMap");
-            VerifyOrDo(!ShouldSkip("( !CHANNEL.S.CL && !CHANNEL.S.LI )"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("( !CHANNEL.S.F00 && !CHANNEL.S.F01 )"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Attributes::FeatureMap::Id, true,
                                  chip::NullOptional);
         }
         case 3: {
-            LogStep(3, "Given CHANNEL.S.CL ensure featuremap has the correct bit set");
-            VerifyOrDo(!ShouldSkip("CHANNEL.S.CL"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            LogStep(3, "Given CCHANNEL.S.F00(CL) ensure featuremap has the correct bit set");
+            VerifyOrDo(!ShouldSkip("CHANNEL.S.F00"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Attributes::FeatureMap::Id, true,
                                  chip::NullOptional);
         }
         case 4: {
-            LogStep(4, "Given CHANNEL.S.LI ensure featuremap has the correct bit set");
-            VerifyOrDo(!ShouldSkip("CHANNEL.S.LI"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            LogStep(4, "Given CHANNEL.S.F01(LI) ensure featuremap has the correct bit set");
+            VerifyOrDo(!ShouldSkip("CHANNEL.S.F01"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Attributes::FeatureMap::Id, true,
                                  chip::NullOptional);
         }
@@ -34287,13 +34287,13 @@ class Test_TC_CHANNEL_1_6Suite : public TestCommand
         }
         case 12: {
             LogStep(12, "Read the global attribute: GeneratedCommandList");
-            VerifyOrDo(!ShouldSkip("( !CHANNEL.S.CL && !CHANNEL.S.LI )"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("( !CHANNEL.S.F00 && !CHANNEL.S.F01 )"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Attributes::GeneratedCommandList::Id, true,
                                  chip::NullOptional);
         }
         case 13: {
             LogStep(13, "Read the global attribute: GeneratedCommandList");
-            VerifyOrDo(!ShouldSkip("CHANNEL.S.CL || CHANNEL.S.LI"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("CHANNEL.S.F00 || CHANNEL.S.F01"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Attributes::GeneratedCommandList::Id, true,
                                  chip::NullOptional);
         }
@@ -34586,19 +34586,20 @@ class Test_TC_MEDIAPLAYBACK_1_7Suite : public TestCommand
         }
         case 2: {
             LogStep(2, "Read the global attribute: FeatureMap");
-            VerifyOrDo(!ShouldSkip(" !MEDIAPLAYBACK.S.AS && !MEDIAPLAYBACK.S.VS "), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip(" !MEDIAPLAYBACK.S.F00 && !MEDIAPLAYBACK.S.F01 "),
+                       return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), MediaPlayback::Id, MediaPlayback::Attributes::FeatureMap::Id, true,
                                  chip::NullOptional);
         }
         case 3: {
-            LogStep(3, "Given MEDIAPLAYBACK.S.AS ensure featuremap has the correct bit set");
-            VerifyOrDo(!ShouldSkip("MEDIAPLAYBACK.S.AS"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            LogStep(3, "Given MEDIAPLAYBACK.S.F00(AS) ensure featuremap has the correct bit set");
+            VerifyOrDo(!ShouldSkip("MEDIAPLAYBACK.S.F00"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), MediaPlayback::Id, MediaPlayback::Attributes::FeatureMap::Id, true,
                                  chip::NullOptional);
         }
         case 4: {
-            LogStep(4, "Given MEDIAPLAYBACK.S.VS ensure featuremap has the correct bit set");
-            VerifyOrDo(!ShouldSkip("MEDIAPLAYBACK.S.VS"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            LogStep(4, "Given MEDIAPLAYBACK.S.F01(VS) ensure featuremap has the correct bit set");
+            VerifyOrDo(!ShouldSkip("MEDIAPLAYBACK.S.F01"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), MediaPlayback::Id, MediaPlayback::Attributes::FeatureMap::Id, true,
                                  chip::NullOptional);
         }
@@ -34715,7 +34716,7 @@ class Test_TC_AUDIOOUTPUT_1_8Suite : public TestCommand
 {
 public:
     Test_TC_AUDIOOUTPUT_1_8Suite(CredentialIssuerCommands * credsIssuerConfig) :
-        TestCommand("Test_TC_AUDIOOUTPUT_1_8", 7, credsIssuerConfig)
+        TestCommand("Test_TC_AUDIOOUTPUT_1_8", 8, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -34767,11 +34768,19 @@ class Test_TC_AUDIOOUTPUT_1_8Suite : public TestCommand
                 uint32_t value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckConstraintType("value", "bitmap32", "bitmap32"));
-                VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL));
-                VerifyOrReturn(CheckConstraintMaxValue("value", value, 3UL));
+                VerifyOrReturn(CheckConstraintHasMasksSet("value", value, 2UL));
             }
             break;
         case 3:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                uint32_t value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckConstraintType("value", "bitmap32", "bitmap32"));
+                VerifyOrReturn(CheckConstraintHasMasksClear("value", value, 2UL));
+            }
+            break;
+        case 4:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::DecodableList<chip::AttributeId> value;
@@ -34787,7 +34796,7 @@ class Test_TC_AUDIOOUTPUT_1_8Suite : public TestCommand
                 VerifyOrReturn(CheckConstraintContains("value", value, 65533UL));
             }
             break;
-        case 4:
+        case 5:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::DecodableList<chip::CommandId> value;
@@ -34796,7 +34805,7 @@ class Test_TC_AUDIOOUTPUT_1_8Suite : public TestCommand
                 VerifyOrReturn(CheckConstraintContains("value", value, 0UL));
             }
             break;
-        case 5:
+        case 6:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::DecodableList<chip::CommandId> value;
@@ -34808,7 +34817,7 @@ class Test_TC_AUDIOOUTPUT_1_8Suite : public TestCommand
                 VerifyOrReturn(CheckConstraintType("value", "list", "list"));
             }
             break;
-        case 6:
+        case 7:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::DecodableList<chip::EventId> value;
@@ -34849,26 +34858,33 @@ class Test_TC_AUDIOOUTPUT_1_8Suite : public TestCommand
         }
         case 2: {
             LogStep(2, "Read the global attribute: FeatureMap");
+            VerifyOrDo(!ShouldSkip("AUDIOOUTPUT.S.F00"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), AudioOutput::Id, AudioOutput::Attributes::FeatureMap::Id, true,
                                  chip::NullOptional);
         }
         case 3: {
-            LogStep(3, "Read the global attribute: AttributeList");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), AudioOutput::Id, AudioOutput::Attributes::AttributeList::Id, true,
+            LogStep(3, "Read the global attribute: FeatureMap");
+            VerifyOrDo(!ShouldSkip(" !AUDIOOUTPUT.S.F00 "), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), AudioOutput::Id, AudioOutput::Attributes::FeatureMap::Id, true,
                                  chip::NullOptional);
         }
         case 4: {
-            LogStep(4, "Read the global attribute: AcceptedCommandList");
+            LogStep(4, "Read the global attribute: AttributeList");
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), AudioOutput::Id, AudioOutput::Attributes::AttributeList::Id, true,
+                                 chip::NullOptional);
+        }
+        case 5: {
+            LogStep(5, "Read the global attribute: AcceptedCommandList");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), AudioOutput::Id, AudioOutput::Attributes::AcceptedCommandList::Id,
                                  true, chip::NullOptional);
         }
-        case 5: {
-            LogStep(5, "Read the global attribute: GeneratedCommandList");
+        case 6: {
+            LogStep(6, "Read the global attribute: GeneratedCommandList");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), AudioOutput::Id, AudioOutput::Attributes::GeneratedCommandList::Id,
                                  true, chip::NullOptional);
         }
-        case 6: {
-            LogStep(6, "Read the global attribute: EventList");
+        case 7: {
+            LogStep(7, "Read the global attribute: EventList");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), AudioOutput::Id, AudioOutput::Attributes::EventList::Id, true,
                                  chip::NullOptional);
         }
@@ -35444,20 +35460,20 @@ class Test_TC_CONTENTLAUNCHER_1_11Suite : public TestCommand
         }
         case 2: {
             LogStep(2, "Read the global attribute: FeatureMap");
-            VerifyOrDo(!ShouldSkip("( !CONTENTLAUNCHER.S.CS && !CONTENTLAUNCHER.S.UP )"),
+            VerifyOrDo(!ShouldSkip("( !CONTENTLAUNCHER.S.F00 && !CONTENTLAUNCHER.S.F01 )"),
                        return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), ContentLauncher::Id, ContentLauncher::Attributes::FeatureMap::Id,
                                  true, chip::NullOptional);
         }
         case 3: {
-            LogStep(3, "Given CONTENTLAUNCHER.S.CS) ensure featuremap has the correct bit set");
-            VerifyOrDo(!ShouldSkip("CONTENTLAUNCHER.S.CS"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            LogStep(3, "Given CONTENTLAUNCHER.S.F00 (CS) ensure featuremap has the correct bit set");
+            VerifyOrDo(!ShouldSkip("CONTENTLAUNCHER.S.F00"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), ContentLauncher::Id, ContentLauncher::Attributes::FeatureMap::Id,
                                  true, chip::NullOptional);
         }
         case 4: {
-            LogStep(4, "Given CONTENTLAUNCHER.S.UP ensure featuremap has the correct bit set");
-            VerifyOrDo(!ShouldSkip("CONTENTLAUNCHER.S.UP"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            LogStep(4, "Given CONTENTLAUNCHER.S.F01(UP) ensure featuremap has the correct bit set");
+            VerifyOrDo(!ShouldSkip("CONTENTLAUNCHER.S.F01"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), ContentLauncher::Id, ContentLauncher::Attributes::FeatureMap::Id,
                                  true, chip::NullOptional);
         }
@@ -35829,7 +35845,7 @@ class Test_TC_KEYPADINPUT_3_2Suite : public TestCommand
         }
         case 1: {
             LogStep(1, "TH sends CEC Settings Keys(0x0A) to DUT");
-            VerifyOrDo(!ShouldSkip("KEYPADINPUT.S.LK && KEYPADINPUT.S.C00.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("KEYPADINPUT.S.F01 && KEYPADINPUT.S.C00.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::KeypadInput::Commands::SendKey::Type value;
             value.keyCode = static_cast<chip::app::Clusters::KeypadInput::CecKeyCode>(10);
@@ -35840,7 +35856,7 @@ class Test_TC_KEYPADINPUT_3_2Suite : public TestCommand
         }
         case 2: {
             LogStep(2, "TH sends CEC Home Keys(0x09) to DUT");
-            VerifyOrDo(!ShouldSkip("KEYPADINPUT.S.LK && KEYPADINPUT.S.C00.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("KEYPADINPUT.S.F01 && KEYPADINPUT.S.C00.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::KeypadInput::Commands::SendKey::Type value;
             value.keyCode = static_cast<chip::app::Clusters::KeypadInput::CecKeyCode>(9);
@@ -35991,7 +36007,7 @@ class Test_TC_KEYPADINPUT_3_3Suite : public TestCommand
         }
         case 1: {
             LogStep(1, "Send Numbers1");
-            VerifyOrDo(!ShouldSkip("KEYPADINPUT.S.C00.Rsp && KEYPADINPUT.S.NK"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("KEYPADINPUT.S.C00.Rsp && KEYPADINPUT.S.F02"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::KeypadInput::Commands::SendKey::Type value;
             value.keyCode = static_cast<chip::app::Clusters::KeypadInput::CecKeyCode>(33);
@@ -36002,7 +36018,7 @@ class Test_TC_KEYPADINPUT_3_3Suite : public TestCommand
         }
         case 2: {
             LogStep(2, "Send Numbers2");
-            VerifyOrDo(!ShouldSkip("KEYPADINPUT.S.C00.Rsp && KEYPADINPUT.S.NK"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("KEYPADINPUT.S.C00.Rsp && KEYPADINPUT.S.F02"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::KeypadInput::Commands::SendKey::Type value;
             value.keyCode = static_cast<chip::app::Clusters::KeypadInput::CecKeyCode>(34);
@@ -36013,7 +36029,7 @@ class Test_TC_KEYPADINPUT_3_3Suite : public TestCommand
         }
         case 3: {
             LogStep(3, "Send Numbers3");
-            VerifyOrDo(!ShouldSkip("KEYPADINPUT.S.C00.Rsp && KEYPADINPUT.S.NK"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("KEYPADINPUT.S.C00.Rsp && KEYPADINPUT.S.F02"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::KeypadInput::Commands::SendKey::Type value;
             value.keyCode = static_cast<chip::app::Clusters::KeypadInput::CecKeyCode>(35);
@@ -36024,7 +36040,7 @@ class Test_TC_KEYPADINPUT_3_3Suite : public TestCommand
         }
         case 4: {
             LogStep(4, "Send Numbers4");
-            VerifyOrDo(!ShouldSkip("KEYPADINPUT.S.C00.Rsp && KEYPADINPUT.S.NK"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("KEYPADINPUT.S.C00.Rsp && KEYPADINPUT.S.F02"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::KeypadInput::Commands::SendKey::Type value;
             value.keyCode = static_cast<chip::app::Clusters::KeypadInput::CecKeyCode>(36);
@@ -36035,7 +36051,7 @@ class Test_TC_KEYPADINPUT_3_3Suite : public TestCommand
         }
         case 5: {
             LogStep(5, "Send Numbers5");
-            VerifyOrDo(!ShouldSkip("KEYPADINPUT.S.C00.Rsp && KEYPADINPUT.S.NK"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("KEYPADINPUT.S.C00.Rsp && KEYPADINPUT.S.F02"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::KeypadInput::Commands::SendKey::Type value;
             value.keyCode = static_cast<chip::app::Clusters::KeypadInput::CecKeyCode>(37);
@@ -36046,7 +36062,7 @@ class Test_TC_KEYPADINPUT_3_3Suite : public TestCommand
         }
         case 6: {
             LogStep(6, "Send Numbers6");
-            VerifyOrDo(!ShouldSkip("KEYPADINPUT.S.C00.Rsp && KEYPADINPUT.S.NK"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("KEYPADINPUT.S.C00.Rsp && KEYPADINPUT.S.F02"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::KeypadInput::Commands::SendKey::Type value;
             value.keyCode = static_cast<chip::app::Clusters::KeypadInput::CecKeyCode>(38);
@@ -36057,7 +36073,7 @@ class Test_TC_KEYPADINPUT_3_3Suite : public TestCommand
         }
         case 7: {
             LogStep(7, "Send Numbers7");
-            VerifyOrDo(!ShouldSkip("KEYPADINPUT.S.C00.Rsp && KEYPADINPUT.S.NK"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("KEYPADINPUT.S.C00.Rsp && KEYPADINPUT.S.F02"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::KeypadInput::Commands::SendKey::Type value;
             value.keyCode = static_cast<chip::app::Clusters::KeypadInput::CecKeyCode>(39);
@@ -36068,7 +36084,7 @@ class Test_TC_KEYPADINPUT_3_3Suite : public TestCommand
         }
         case 8: {
             LogStep(8, "Send Numbers8");
-            VerifyOrDo(!ShouldSkip("KEYPADINPUT.S.C00.Rsp && KEYPADINPUT.S.NK"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("KEYPADINPUT.S.C00.Rsp && KEYPADINPUT.S.F02"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::KeypadInput::Commands::SendKey::Type value;
             value.keyCode = static_cast<chip::app::Clusters::KeypadInput::CecKeyCode>(40);
@@ -36079,7 +36095,7 @@ class Test_TC_KEYPADINPUT_3_3Suite : public TestCommand
         }
         case 9: {
             LogStep(9, "Send Numbers9");
-            VerifyOrDo(!ShouldSkip("KEYPADINPUT.S.C00.Rsp && KEYPADINPUT.S.NK"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("KEYPADINPUT.S.C00.Rsp && KEYPADINPUT.S.F02"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::KeypadInput::Commands::SendKey::Type value;
             value.keyCode = static_cast<chip::app::Clusters::KeypadInput::CecKeyCode>(41);
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 e3eecd10fe1942..17a8cb276da312 100644
--- a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h
+++ b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h
@@ -43714,35 +43714,35 @@ class Test_TC_KEYPADINPUT_1_2 : public TestCommandBridge {
             break;
         case 2:
             ChipLogProgress(chipTool, " ***** Test Step 2 : Read the global attribute: FeatureMap\n");
-            if (ShouldSkip(" !KEYPADINPUT.S.NV && KEYPADINPUT.S.LK && !KEYPADINPUT.S.NK ")) {
+            if (ShouldSkip(" !KEYPADINPUT.S.F00 && KEYPADINPUT.S.F01 && !KEYPADINPUT.S.F02 ")) {
                 NextTest();
                 return;
             }
             err = TestReadTheGlobalAttributeFeatureMap_2();
             break;
         case 3:
-            ChipLogProgress(chipTool, " ***** Test Step 3 : Given (KEYPADINPUT.S.NV) FeatureMap bit mask is set or not\n");
-            if (ShouldSkip("KEYPADINPUT.S.NV")) {
+            ChipLogProgress(chipTool, " ***** Test Step 3 : Given (KEYPADINPUT.S.F00(NV)) FeatureMap bit mask is set or not\n");
+            if (ShouldSkip("KEYPADINPUT.S.F00")) {
                 NextTest();
                 return;
             }
-            err = TestGivenKeypadinputsnvFeatureMapBitMaskIsSetOrNot_3();
+            err = TestGivenKeypadinputsf00nvFeatureMapBitMaskIsSetOrNot_3();
             break;
         case 4:
-            ChipLogProgress(chipTool, " ***** Test Step 4 : Given (KEYPADINPUT.S.LK) FeatureMap bit mask is set or not\n");
-            if (ShouldSkip("KEYPADINPUT.S.LK")) {
+            ChipLogProgress(chipTool, " ***** Test Step 4 : Given (KEYPADINPUT.S.F01(LK)) FeatureMap bit mask is set or not\n");
+            if (ShouldSkip("KEYPADINPUT.S.F01")) {
                 NextTest();
                 return;
             }
-            err = TestGivenKeypadinputslkFeatureMapBitMaskIsSetOrNot_4();
+            err = TestGivenKeypadinputsf01lkFeatureMapBitMaskIsSetOrNot_4();
             break;
         case 5:
-            ChipLogProgress(chipTool, " ***** Test Step 5 : Given (KEYPADINPUT.S.NK) FeatureMap bit mask is set or not\n");
-            if (ShouldSkip("KEYPADINPUT.S.NK")) {
+            ChipLogProgress(chipTool, " ***** Test Step 5 : Given (KEYPADINPUT.S.F02(NK)) FeatureMap bit mask is set or not\n");
+            if (ShouldSkip("KEYPADINPUT.S.F02")) {
                 NextTest();
                 return;
             }
-            err = TestGivenKeypadinputsnkFeatureMapBitMaskIsSetOrNot_5();
+            err = TestGivenKeypadinputsf02nkFeatureMapBitMaskIsSetOrNot_5();
             break;
         case 6:
             ChipLogProgress(chipTool, " ***** Test Step 6 : Read the global attribute: AttributeList\n");
@@ -43877,7 +43877,7 @@ class Test_TC_KEYPADINPUT_1_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestGivenKeypadinputsnvFeatureMapBitMaskIsSetOrNot_3()
+    CHIP_ERROR TestGivenKeypadinputsf00nvFeatureMapBitMaskIsSetOrNot_3()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -43885,7 +43885,7 @@ class Test_TC_KEYPADINPUT_1_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Given (KEYPADINPUT.S.NV) FeatureMap bit mask is set or not Error: %@", err);
+            NSLog(@"Given (KEYPADINPUT.S.F00(NV)) FeatureMap bit mask is set or not Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -43896,7 +43896,7 @@ class Test_TC_KEYPADINPUT_1_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestGivenKeypadinputslkFeatureMapBitMaskIsSetOrNot_4()
+    CHIP_ERROR TestGivenKeypadinputsf01lkFeatureMapBitMaskIsSetOrNot_4()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -43904,7 +43904,7 @@ class Test_TC_KEYPADINPUT_1_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Given (KEYPADINPUT.S.LK) FeatureMap bit mask is set or not Error: %@", err);
+            NSLog(@"Given (KEYPADINPUT.S.F01(LK)) FeatureMap bit mask is set or not Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -43915,7 +43915,7 @@ class Test_TC_KEYPADINPUT_1_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestGivenKeypadinputsnkFeatureMapBitMaskIsSetOrNot_5()
+    CHIP_ERROR TestGivenKeypadinputsf02nkFeatureMapBitMaskIsSetOrNot_5()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -43923,7 +43923,7 @@ class Test_TC_KEYPADINPUT_1_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Given (KEYPADINPUT.S.NK) FeatureMap bit mask is set or not Error: %@", err);
+            NSLog(@"Given (KEYPADINPUT.S.F02(NK)) FeatureMap bit mask is set or not Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -44075,7 +44075,7 @@ class Test_TC_APPLAUNCHER_1_3 : public TestCommandBridge {
             break;
         case 2:
             ChipLogProgress(chipTool, " ***** Test Step 2 : Read the global attribute: FeatureMap\n");
-            if (ShouldSkip("APPLAUNCHER.S.AP")) {
+            if (ShouldSkip("APPLAUNCHER.S.F00")) {
                 NextTest();
                 return;
             }
@@ -44083,7 +44083,7 @@ class Test_TC_APPLAUNCHER_1_3 : public TestCommandBridge {
             break;
         case 3:
             ChipLogProgress(chipTool, " ***** Test Step 3 : Read the global attribute: FeatureMap\n");
-            if (ShouldSkip(" !APPLAUNCHER.S.AP ")) {
+            if (ShouldSkip(" !APPLAUNCHER.S.F00 ")) {
                 NextTest();
                 return;
             }
@@ -44465,19 +44465,20 @@ class Test_TC_MEDIAINPUT_1_4 : public TestCommandBridge {
             break;
         case 2:
             ChipLogProgress(chipTool, " ***** Test Step 2 : Read the global attribute: FeatureMap\n");
-            if (ShouldSkip(" !MEDIAINPUT.S.NU ")) {
+            if (ShouldSkip(" !MEDIAINPUT.S.F00 ")) {
                 NextTest();
                 return;
             }
             err = TestReadTheGlobalAttributeFeatureMap_2();
             break;
         case 3:
-            ChipLogProgress(chipTool, " ***** Test Step 3 : Given MEDIAINPUT.S.NU ensure featuremap has the correct bit set\n");
-            if (ShouldSkip("MEDIAINPUT.S.NU")) {
+            ChipLogProgress(
+                chipTool, " ***** Test Step 3 : Given MEDIAINPUT.S.F00(NU) ensure featuremap has the correct bit set\n");
+            if (ShouldSkip("MEDIAINPUT.S.F00")) {
                 NextTest();
                 return;
             }
-            err = TestGivenMediainputsnuEnsureFeaturemapHasTheCorrectBitSet_3();
+            err = TestGivenMediainputsf00nuEnsureFeaturemapHasTheCorrectBitSet_3();
             break;
         case 4:
             ChipLogProgress(chipTool, " ***** Test Step 4 : Read the global attribute: AttributeList\n");
@@ -44628,7 +44629,7 @@ class Test_TC_MEDIAINPUT_1_4 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestGivenMediainputsnuEnsureFeaturemapHasTheCorrectBitSet_3()
+    CHIP_ERROR TestGivenMediainputsf00nuEnsureFeaturemapHasTheCorrectBitSet_3()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -44636,7 +44637,7 @@ class Test_TC_MEDIAINPUT_1_4 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Given MEDIAINPUT.S.NU ensure featuremap has the correct bit set Error: %@", err);
+            NSLog(@"Given MEDIAINPUT.S.F00(NU) ensure featuremap has the correct bit set Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -45141,27 +45142,27 @@ class Test_TC_CHANNEL_1_6 : public TestCommandBridge {
             break;
         case 2:
             ChipLogProgress(chipTool, " ***** Test Step 2 : Read the global attribute: FeatureMap\n");
-            if (ShouldSkip("( !CHANNEL.S.CL && !CHANNEL.S.LI )")) {
+            if (ShouldSkip("( !CHANNEL.S.F00 && !CHANNEL.S.F01 )")) {
                 NextTest();
                 return;
             }
             err = TestReadTheGlobalAttributeFeatureMap_2();
             break;
         case 3:
-            ChipLogProgress(chipTool, " ***** Test Step 3 : Given CHANNEL.S.CL ensure featuremap has the correct bit set\n");
-            if (ShouldSkip("CHANNEL.S.CL")) {
+            ChipLogProgress(chipTool, " ***** Test Step 3 : Given CCHANNEL.S.F00(CL) ensure featuremap has the correct bit set\n");
+            if (ShouldSkip("CHANNEL.S.F00")) {
                 NextTest();
                 return;
             }
-            err = TestGivenChannelsclEnsureFeaturemapHasTheCorrectBitSet_3();
+            err = TestGivenCchannelsf00clEnsureFeaturemapHasTheCorrectBitSet_3();
             break;
         case 4:
-            ChipLogProgress(chipTool, " ***** Test Step 4 : Given CHANNEL.S.LI ensure featuremap has the correct bit set\n");
-            if (ShouldSkip("CHANNEL.S.LI")) {
+            ChipLogProgress(chipTool, " ***** Test Step 4 : Given CHANNEL.S.F01(LI) ensure featuremap has the correct bit set\n");
+            if (ShouldSkip("CHANNEL.S.F01")) {
                 NextTest();
                 return;
             }
-            err = TestGivenChannelsliEnsureFeaturemapHasTheCorrectBitSet_4();
+            err = TestGivenChannelsf01liEnsureFeaturemapHasTheCorrectBitSet_4();
             break;
         case 5:
             ChipLogProgress(chipTool, " ***** Test Step 5 : Read the global attribute: AttributeList\n");
@@ -45218,7 +45219,7 @@ class Test_TC_CHANNEL_1_6 : public TestCommandBridge {
             break;
         case 12:
             ChipLogProgress(chipTool, " ***** Test Step 12 : Read the global attribute: GeneratedCommandList\n");
-            if (ShouldSkip("( !CHANNEL.S.CL && !CHANNEL.S.LI )")) {
+            if (ShouldSkip("( !CHANNEL.S.F00 && !CHANNEL.S.F01 )")) {
                 NextTest();
                 return;
             }
@@ -45226,7 +45227,7 @@ class Test_TC_CHANNEL_1_6 : public TestCommandBridge {
             break;
         case 13:
             ChipLogProgress(chipTool, " ***** Test Step 13 : Read the global attribute: GeneratedCommandList\n");
-            if (ShouldSkip("CHANNEL.S.CL || CHANNEL.S.LI")) {
+            if (ShouldSkip("CHANNEL.S.F00 || CHANNEL.S.F01")) {
                 NextTest();
                 return;
             }
@@ -45368,7 +45369,7 @@ class Test_TC_CHANNEL_1_6 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestGivenChannelsclEnsureFeaturemapHasTheCorrectBitSet_3()
+    CHIP_ERROR TestGivenCchannelsf00clEnsureFeaturemapHasTheCorrectBitSet_3()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -45376,7 +45377,7 @@ class Test_TC_CHANNEL_1_6 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Given CHANNEL.S.CL ensure featuremap has the correct bit set Error: %@", err);
+            NSLog(@"Given CCHANNEL.S.F00(CL) ensure featuremap has the correct bit set Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -45387,7 +45388,7 @@ class Test_TC_CHANNEL_1_6 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestGivenChannelsliEnsureFeaturemapHasTheCorrectBitSet_4()
+    CHIP_ERROR TestGivenChannelsf01liEnsureFeaturemapHasTheCorrectBitSet_4()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -45395,7 +45396,7 @@ class Test_TC_CHANNEL_1_6 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Given CHANNEL.S.LI ensure featuremap has the correct bit set Error: %@", err);
+            NSLog(@"Given CHANNEL.S.F01(LI) ensure featuremap has the correct bit set Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -45676,27 +45677,29 @@ class Test_TC_MEDIAPLAYBACK_1_7 : public TestCommandBridge {
             break;
         case 2:
             ChipLogProgress(chipTool, " ***** Test Step 2 : Read the global attribute: FeatureMap\n");
-            if (ShouldSkip(" !MEDIAPLAYBACK.S.AS && !MEDIAPLAYBACK.S.VS ")) {
+            if (ShouldSkip(" !MEDIAPLAYBACK.S.F00 && !MEDIAPLAYBACK.S.F01 ")) {
                 NextTest();
                 return;
             }
             err = TestReadTheGlobalAttributeFeatureMap_2();
             break;
         case 3:
-            ChipLogProgress(chipTool, " ***** Test Step 3 : Given MEDIAPLAYBACK.S.AS ensure featuremap has the correct bit set\n");
-            if (ShouldSkip("MEDIAPLAYBACK.S.AS")) {
+            ChipLogProgress(
+                chipTool, " ***** Test Step 3 : Given MEDIAPLAYBACK.S.F00(AS) ensure featuremap has the correct bit set\n");
+            if (ShouldSkip("MEDIAPLAYBACK.S.F00")) {
                 NextTest();
                 return;
             }
-            err = TestGivenMediaplaybacksasEnsureFeaturemapHasTheCorrectBitSet_3();
+            err = TestGivenMediaplaybacksf00asEnsureFeaturemapHasTheCorrectBitSet_3();
             break;
         case 4:
-            ChipLogProgress(chipTool, " ***** Test Step 4 : Given MEDIAPLAYBACK.S.VS ensure featuremap has the correct bit set\n");
-            if (ShouldSkip("MEDIAPLAYBACK.S.VS")) {
+            ChipLogProgress(
+                chipTool, " ***** Test Step 4 : Given MEDIAPLAYBACK.S.F01(VS) ensure featuremap has the correct bit set\n");
+            if (ShouldSkip("MEDIAPLAYBACK.S.F01")) {
                 NextTest();
                 return;
             }
-            err = TestGivenMediaplaybacksvsEnsureFeaturemapHasTheCorrectBitSet_4();
+            err = TestGivenMediaplaybacksf01vsEnsureFeaturemapHasTheCorrectBitSet_4();
             break;
         case 5:
             ChipLogProgress(chipTool, " ***** Test Step 5 : Read the global attribute: AttributeList\n");
@@ -45982,7 +45985,7 @@ class Test_TC_MEDIAPLAYBACK_1_7 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestGivenMediaplaybacksasEnsureFeaturemapHasTheCorrectBitSet_3()
+    CHIP_ERROR TestGivenMediaplaybacksf00asEnsureFeaturemapHasTheCorrectBitSet_3()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -45990,7 +45993,7 @@ class Test_TC_MEDIAPLAYBACK_1_7 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Given MEDIAPLAYBACK.S.AS ensure featuremap has the correct bit set Error: %@", err);
+            NSLog(@"Given MEDIAPLAYBACK.S.F00(AS) ensure featuremap has the correct bit set Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -46001,7 +46004,7 @@ class Test_TC_MEDIAPLAYBACK_1_7 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestGivenMediaplaybacksvsEnsureFeaturemapHasTheCorrectBitSet_4()
+    CHIP_ERROR TestGivenMediaplaybacksf01vsEnsureFeaturemapHasTheCorrectBitSet_4()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -46009,7 +46012,7 @@ class Test_TC_MEDIAPLAYBACK_1_7 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Given MEDIAPLAYBACK.S.VS ensure featuremap has the correct bit set Error: %@", err);
+            NSLog(@"Given MEDIAPLAYBACK.S.F01(VS) ensure featuremap has the correct bit set Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -46458,23 +46461,35 @@ class Test_TC_AUDIOOUTPUT_1_8 : public TestCommandBridge {
             break;
         case 2:
             ChipLogProgress(chipTool, " ***** Test Step 2 : Read the global attribute: FeatureMap\n");
+            if (ShouldSkip("AUDIOOUTPUT.S.F00")) {
+                NextTest();
+                return;
+            }
             err = TestReadTheGlobalAttributeFeatureMap_2();
             break;
         case 3:
-            ChipLogProgress(chipTool, " ***** Test Step 3 : Read the global attribute: AttributeList\n");
-            err = TestReadTheGlobalAttributeAttributeList_3();
+            ChipLogProgress(chipTool, " ***** Test Step 3 : Read the global attribute: FeatureMap\n");
+            if (ShouldSkip(" !AUDIOOUTPUT.S.F00 ")) {
+                NextTest();
+                return;
+            }
+            err = TestReadTheGlobalAttributeFeatureMap_3();
             break;
         case 4:
-            ChipLogProgress(chipTool, " ***** Test Step 4 : Read the global attribute: AcceptedCommandList\n");
-            err = TestReadTheGlobalAttributeAcceptedCommandList_4();
+            ChipLogProgress(chipTool, " ***** Test Step 4 : Read the global attribute: AttributeList\n");
+            err = TestReadTheGlobalAttributeAttributeList_4();
             break;
         case 5:
-            ChipLogProgress(chipTool, " ***** Test Step 5 : Read the global attribute: GeneratedCommandList\n");
-            err = TestReadTheGlobalAttributeGeneratedCommandList_5();
+            ChipLogProgress(chipTool, " ***** Test Step 5 : Read the global attribute: AcceptedCommandList\n");
+            err = TestReadTheGlobalAttributeAcceptedCommandList_5();
             break;
         case 6:
-            ChipLogProgress(chipTool, " ***** Test Step 6 : Read the global attribute: EventList\n");
-            err = TestReadTheGlobalAttributeEventList_6();
+            ChipLogProgress(chipTool, " ***** Test Step 6 : Read the global attribute: GeneratedCommandList\n");
+            err = TestReadTheGlobalAttributeGeneratedCommandList_6();
+            break;
+        case 7:
+            ChipLogProgress(chipTool, " ***** Test Step 7 : Read the global attribute: EventList\n");
+            err = TestReadTheGlobalAttributeEventList_7();
             break;
         }
 
@@ -46508,6 +46523,9 @@ class Test_TC_AUDIOOUTPUT_1_8 : public TestCommandBridge {
         case 6:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
+        case 7:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
         }
 
         // Go on to the next test.
@@ -46521,7 +46539,7 @@ class Test_TC_AUDIOOUTPUT_1_8 : public TestCommandBridge {
 
 private:
     std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 7;
+    const uint16_t mTestCount = 8;
 
     chip::Optional<chip::NodeId> mNodeId;
     chip::Optional<chip::CharSpan> mCluster;
@@ -46573,16 +46591,32 @@ class Test_TC_AUDIOOUTPUT_1_8 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("featureMap", "bitmap32", "bitmap32"));
-            VerifyOrReturn(CheckConstraintMinValue<uint32_t>("featureMap", [value unsignedIntValue], 0UL));
-            VerifyOrReturn(CheckConstraintMaxValue<uint32_t>("featureMap", [value unsignedIntValue], 3UL));
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestReadTheGlobalAttributeFeatureMap_3()
+    {
+
+        MTRBaseDevice * device = GetDevice("alpha");
+        __auto_type * cluster = [[MTRBaseClusterAudioOutput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Read the global attribute: FeatureMap Error: %@", err);
 
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            VerifyOrReturn(CheckConstraintType("featureMap", "bitmap32", "bitmap32"));
             NextTest();
         }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheGlobalAttributeAttributeList_3()
+    CHIP_ERROR TestReadTheGlobalAttributeAttributeList_4()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -46610,7 +46644,7 @@ class Test_TC_AUDIOOUTPUT_1_8 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheGlobalAttributeAcceptedCommandList_4()
+    CHIP_ERROR TestReadTheGlobalAttributeAcceptedCommandList_5()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -46631,7 +46665,7 @@ class Test_TC_AUDIOOUTPUT_1_8 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheGlobalAttributeGeneratedCommandList_5()
+    CHIP_ERROR TestReadTheGlobalAttributeGeneratedCommandList_6()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -46655,7 +46689,7 @@ class Test_TC_AUDIOOUTPUT_1_8 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheGlobalAttributeEventList_6()
+    CHIP_ERROR TestReadTheGlobalAttributeEventList_7()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -47402,7 +47436,7 @@ class Test_TC_CONTENTLAUNCHER_1_11 : public TestCommandBridge {
             break;
         case 2:
             ChipLogProgress(chipTool, " ***** Test Step 2 : Read the global attribute: FeatureMap\n");
-            if (ShouldSkip("( !CONTENTLAUNCHER.S.CS && !CONTENTLAUNCHER.S.UP )")) {
+            if (ShouldSkip("( !CONTENTLAUNCHER.S.F00 && !CONTENTLAUNCHER.S.F01 )")) {
                 NextTest();
                 return;
             }
@@ -47410,21 +47444,21 @@ class Test_TC_CONTENTLAUNCHER_1_11 : public TestCommandBridge {
             break;
         case 3:
             ChipLogProgress(
-                chipTool, " ***** Test Step 3 : Given CONTENTLAUNCHER.S.CS) ensure featuremap has the correct bit set\n");
-            if (ShouldSkip("CONTENTLAUNCHER.S.CS")) {
+                chipTool, " ***** Test Step 3 : Given CONTENTLAUNCHER.S.F00 (CS) ensure featuremap has the correct bit set\n");
+            if (ShouldSkip("CONTENTLAUNCHER.S.F00")) {
                 NextTest();
                 return;
             }
-            err = TestGivenContentlauncherscsEnsureFeaturemapHasTheCorrectBitSet_3();
+            err = TestGivenContentlaunchersf00CsEnsureFeaturemapHasTheCorrectBitSet_3();
             break;
         case 4:
             ChipLogProgress(
-                chipTool, " ***** Test Step 4 : Given CONTENTLAUNCHER.S.UP ensure featuremap has the correct bit set\n");
-            if (ShouldSkip("CONTENTLAUNCHER.S.UP")) {
+                chipTool, " ***** Test Step 4 : Given CONTENTLAUNCHER.S.F01(UP) ensure featuremap has the correct bit set\n");
+            if (ShouldSkip("CONTENTLAUNCHER.S.F01")) {
                 NextTest();
                 return;
             }
-            err = TestGivenContentlaunchersupEnsureFeaturemapHasTheCorrectBitSet_4();
+            err = TestGivenContentlaunchersf01upEnsureFeaturemapHasTheCorrectBitSet_4();
             break;
         case 5:
             ChipLogProgress(chipTool, " ***** Test Step 5 : Read the global attribute: AttributeList\n");
@@ -47596,7 +47630,7 @@ class Test_TC_CONTENTLAUNCHER_1_11 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestGivenContentlauncherscsEnsureFeaturemapHasTheCorrectBitSet_3()
+    CHIP_ERROR TestGivenContentlaunchersf00CsEnsureFeaturemapHasTheCorrectBitSet_3()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -47604,7 +47638,7 @@ class Test_TC_CONTENTLAUNCHER_1_11 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Given CONTENTLAUNCHER.S.CS) ensure featuremap has the correct bit set Error: %@", err);
+            NSLog(@"Given CONTENTLAUNCHER.S.F00 (CS) ensure featuremap has the correct bit set Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -47615,7 +47649,7 @@ class Test_TC_CONTENTLAUNCHER_1_11 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestGivenContentlaunchersupEnsureFeaturemapHasTheCorrectBitSet_4()
+    CHIP_ERROR TestGivenContentlaunchersf01upEnsureFeaturemapHasTheCorrectBitSet_4()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -47623,7 +47657,7 @@ class Test_TC_CONTENTLAUNCHER_1_11 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Given CONTENTLAUNCHER.S.UP ensure featuremap has the correct bit set Error: %@", err);
+            NSLog(@"Given CONTENTLAUNCHER.S.F01(UP) ensure featuremap has the correct bit set Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -48217,7 +48251,7 @@ class Test_TC_KEYPADINPUT_3_2 : public TestCommandBridge {
             break;
         case 1:
             ChipLogProgress(chipTool, " ***** Test Step 1 : TH sends CEC Settings Keys(0x0A) to DUT\n");
-            if (ShouldSkip("KEYPADINPUT.S.LK && KEYPADINPUT.S.C00.Rsp")) {
+            if (ShouldSkip("KEYPADINPUT.S.F01 && KEYPADINPUT.S.C00.Rsp")) {
                 NextTest();
                 return;
             }
@@ -48225,7 +48259,7 @@ class Test_TC_KEYPADINPUT_3_2 : public TestCommandBridge {
             break;
         case 2:
             ChipLogProgress(chipTool, " ***** Test Step 2 : TH sends CEC Home Keys(0x09) to DUT\n");
-            if (ShouldSkip("KEYPADINPUT.S.LK && KEYPADINPUT.S.C00.Rsp")) {
+            if (ShouldSkip("KEYPADINPUT.S.F01 && KEYPADINPUT.S.C00.Rsp")) {
                 NextTest();
                 return;
             }
@@ -48376,7 +48410,7 @@ class Test_TC_KEYPADINPUT_3_3 : public TestCommandBridge {
             break;
         case 1:
             ChipLogProgress(chipTool, " ***** Test Step 1 : Send Numbers1\n");
-            if (ShouldSkip("KEYPADINPUT.S.C00.Rsp && KEYPADINPUT.S.NK")) {
+            if (ShouldSkip("KEYPADINPUT.S.C00.Rsp && KEYPADINPUT.S.F02")) {
                 NextTest();
                 return;
             }
@@ -48384,7 +48418,7 @@ class Test_TC_KEYPADINPUT_3_3 : public TestCommandBridge {
             break;
         case 2:
             ChipLogProgress(chipTool, " ***** Test Step 2 : Send Numbers2\n");
-            if (ShouldSkip("KEYPADINPUT.S.C00.Rsp && KEYPADINPUT.S.NK")) {
+            if (ShouldSkip("KEYPADINPUT.S.C00.Rsp && KEYPADINPUT.S.F02")) {
                 NextTest();
                 return;
             }
@@ -48392,7 +48426,7 @@ class Test_TC_KEYPADINPUT_3_3 : public TestCommandBridge {
             break;
         case 3:
             ChipLogProgress(chipTool, " ***** Test Step 3 : Send Numbers3\n");
-            if (ShouldSkip("KEYPADINPUT.S.C00.Rsp && KEYPADINPUT.S.NK")) {
+            if (ShouldSkip("KEYPADINPUT.S.C00.Rsp && KEYPADINPUT.S.F02")) {
                 NextTest();
                 return;
             }
@@ -48400,7 +48434,7 @@ class Test_TC_KEYPADINPUT_3_3 : public TestCommandBridge {
             break;
         case 4:
             ChipLogProgress(chipTool, " ***** Test Step 4 : Send Numbers4\n");
-            if (ShouldSkip("KEYPADINPUT.S.C00.Rsp && KEYPADINPUT.S.NK")) {
+            if (ShouldSkip("KEYPADINPUT.S.C00.Rsp && KEYPADINPUT.S.F02")) {
                 NextTest();
                 return;
             }
@@ -48408,7 +48442,7 @@ class Test_TC_KEYPADINPUT_3_3 : public TestCommandBridge {
             break;
         case 5:
             ChipLogProgress(chipTool, " ***** Test Step 5 : Send Numbers5\n");
-            if (ShouldSkip("KEYPADINPUT.S.C00.Rsp && KEYPADINPUT.S.NK")) {
+            if (ShouldSkip("KEYPADINPUT.S.C00.Rsp && KEYPADINPUT.S.F02")) {
                 NextTest();
                 return;
             }
@@ -48416,7 +48450,7 @@ class Test_TC_KEYPADINPUT_3_3 : public TestCommandBridge {
             break;
         case 6:
             ChipLogProgress(chipTool, " ***** Test Step 6 : Send Numbers6\n");
-            if (ShouldSkip("KEYPADINPUT.S.C00.Rsp && KEYPADINPUT.S.NK")) {
+            if (ShouldSkip("KEYPADINPUT.S.C00.Rsp && KEYPADINPUT.S.F02")) {
                 NextTest();
                 return;
             }
@@ -48424,7 +48458,7 @@ class Test_TC_KEYPADINPUT_3_3 : public TestCommandBridge {
             break;
         case 7:
             ChipLogProgress(chipTool, " ***** Test Step 7 : Send Numbers7\n");
-            if (ShouldSkip("KEYPADINPUT.S.C00.Rsp && KEYPADINPUT.S.NK")) {
+            if (ShouldSkip("KEYPADINPUT.S.C00.Rsp && KEYPADINPUT.S.F02")) {
                 NextTest();
                 return;
             }
@@ -48432,7 +48466,7 @@ class Test_TC_KEYPADINPUT_3_3 : public TestCommandBridge {
             break;
         case 8:
             ChipLogProgress(chipTool, " ***** Test Step 8 : Send Numbers8\n");
-            if (ShouldSkip("KEYPADINPUT.S.C00.Rsp && KEYPADINPUT.S.NK")) {
+            if (ShouldSkip("KEYPADINPUT.S.C00.Rsp && KEYPADINPUT.S.F02")) {
                 NextTest();
                 return;
             }
@@ -48440,7 +48474,7 @@ class Test_TC_KEYPADINPUT_3_3 : public TestCommandBridge {
             break;
         case 9:
             ChipLogProgress(chipTool, " ***** Test Step 9 : Send Numbers9\n");
-            if (ShouldSkip("KEYPADINPUT.S.C00.Rsp && KEYPADINPUT.S.NK")) {
+            if (ShouldSkip("KEYPADINPUT.S.C00.Rsp && KEYPADINPUT.S.F02")) {
                 NextTest();
                 return;
             }