diff --git a/src/app/tests/suites/certification/Test_TC_TCTL_3_2.yaml b/src/app/tests/suites/certification/Test_TC_TCTL_3_2.yaml
index 2c22fc392f5d52..b2ca70136c3618 100644
--- a/src/app/tests/suites/certification/Test_TC_TCTL_3_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_TCTL_3_2.yaml
@@ -135,7 +135,7 @@ tests:
           Operate device such that a temperature number cannot be accepted
       cluster: "LogCommands"
       command: "UserPrompt"
-      PICS: PICS_USER_PROMPT && TCTL.S.M.SupportsInvalidInMode
+      PICS: PICS_USER_PROMPT && TCTL.S.M.SupportsInvalidInState
       arguments:
           values:
               - name: "message"
@@ -147,7 +147,8 @@ tests:
           "Step 10: TH sends command SetTemperatureCommand with a temperature
           number between minTemp and maxTemp inclusive, saved as setTemp"
       command: "SetTemperature"
-      PICS: TCTL.S.C00.Rsp && PICS_USER_PROMPT && TCTL.S.M.SupportsInvalidInMode
+      PICS:
+          TCTL.S.C00.Rsp && PICS_USER_PROMPT && TCTL.S.M.SupportsInvalidInState
       arguments:
           values:
               - name: "TargetTemperature"
@@ -164,7 +165,7 @@ tests:
                 value: 5000
 
     - label: "Step 11: TH reads from the DUT the TemperatureSetpoint attribute"
-      PICS: TCTL.S.A0000 && TCTL.S.M.SupportsInvalidInMode
+      PICS: TCTL.S.A0000 && TCTL.S.M.SupportsInvalidInState
       command: "readAttribute"
       attribute: "TemperatureSetpoint"
       response:
diff --git a/src/app/tests/suites/certification/Test_TC_TCTL_3_3.yaml b/src/app/tests/suites/certification/Test_TC_TCTL_3_3.yaml
index bca4e83790ee2b..1ab48b81dfa8af 100644
--- a/src/app/tests/suites/certification/Test_TC_TCTL_3_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_TCTL_3_3.yaml
@@ -101,7 +101,7 @@ tests:
           Operate device such that a temperature level cannot be accepted
       cluster: "LogCommands"
       command: "UserPrompt"
-      PICS: PICS_USER_PROMPT && TCTL.S.M.SupportsInvalidInMode
+      PICS: PICS_USER_PROMPT && TCTL.S.M.SupportsInvalidInState
       arguments:
           values:
               - name: "message"
@@ -111,7 +111,7 @@ tests:
 
     - label:
           "Step 7: TH sends command SetTemperatureCommand with an invalid value"
-      PICS: TCTL.S.C00.Rsp && TCTL.S.M.SupportsInvalidInMode
+      PICS: TCTL.S.C00.Rsp && TCTL.S.M.SupportsInvalidInState
       command: "SetTemperature"
       arguments:
           values:
@@ -121,7 +121,7 @@ tests:
           error: CONSTRAINT_ERROR
 
     - label: "Wait for 5s"
-      PICS: TCTL.S.C00.Rsp && TCTL.S.M.SupportsInvalidInMode
+      PICS: TCTL.S.C00.Rsp && TCTL.S.M.SupportsInvalidInState
       cluster: "DelayCommands"
       command: "WaitForMs"
       arguments:
@@ -131,7 +131,7 @@ tests:
 
     - label:
           "Step 8: TH reads from the DUT the SelectedTemperatureLevel attribute"
-      PICS: TCTL.S.A0004 && TCTL.S.M.SupportsInvalidInMode
+      PICS: TCTL.S.A0004 && TCTL.S.M.SupportsInvalidInState
       command: "readAttribute"
       attribute: "SelectedTemperatureLevel"
       response: