diff --git a/.github/workflows/bloat_check.yaml b/.github/workflows/bloat_check.yaml
index 293b00ac6b9e7a..1df105da65301d 100644
--- a/.github/workflows/bloat_check.yaml
+++ b/.github/workflows/bloat_check.yaml
@@ -30,7 +30,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: connectedhomeip/chip-build:0.6.32
+            image: connectedhomeip/chip-build:0.6.34
 
         steps:
             - uses: Wandalen/wretry.action@v1.0.36
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index c57104e6171e87..66f2035df7f874 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -36,7 +36,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build:0.6.32
+            image: connectedhomeip/chip-build:0.6.34
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
             options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
@@ -138,7 +138,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build:0.6.32
+            image: connectedhomeip/chip-build:0.6.34
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
             options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
@@ -298,7 +298,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build:0.6.32
+            image: connectedhomeip/chip-build:0.6.34
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
             options: --sysctl "net.ipv6.conf.all.disable_ipv6=0
@@ -356,8 +356,8 @@ jobs:
         env:
             # NOTE: Generally kept in sync within the repo using
             #       scripts/tools/zap/version_update.py
-            ZAP_VERSION: v2023.01.18-nightly
-            ZAP_INSTALL_PATH: /usr/local/zap/zap-v2023.01.18-nightly
+            ZAP_VERSION: v2023.01.19-nightly
+            ZAP_INSTALL_PATH: /usr/local/zap/zap-v2023.01.19-nightly
 
         steps:
             - uses: Wandalen/wretry.action@v1.0.36
@@ -471,7 +471,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build:0.6.32
+            image: connectedhomeip/chip-build:0.6.34
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
             options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
diff --git a/.github/workflows/chef.yaml b/.github/workflows/chef.yaml
index e2d8c64198586e..40a11908b4b072 100644
--- a/.github/workflows/chef.yaml
+++ b/.github/workflows/chef.yaml
@@ -29,7 +29,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build:0.6.32
+            image: connectedhomeip/chip-build:0.6.34
             options: --user root
 
         steps:
@@ -57,7 +57,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-esp32:0.6.32
+            image: connectedhomeip/chip-build-esp32:0.6.34
             options: --user root
 
         steps:
@@ -85,7 +85,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-nrf-platform:0.6.32
+            image: connectedhomeip/chip-build-nrf-platform:0.6.34
             options: --user root
 
         steps:
diff --git a/.github/workflows/cirque.yaml b/.github/workflows/cirque.yaml
index 5ac18fbcdd9d07..5cc48487c6ae97 100644
--- a/.github/workflows/cirque.yaml
+++ b/.github/workflows/cirque.yaml
@@ -29,7 +29,7 @@ jobs:
         timeout-minutes: 90
 
         env:
-            DOCKER_RUN_VERSION: 0.6.32
+            DOCKER_RUN_VERSION: 0.6.34
             GITHUB_CACHE_PATH: /tmp/cirque-cache/
 
         runs-on: ubuntu-latest
@@ -38,7 +38,7 @@ jobs:
         # need to run with privilege, which isn't supported by job.XXX.contaner
         #  https://github.com/actions/container-action/issues/2
         #         container:
-        #             image: connectedhomeip/chip-build-cirque:0.6.32
+        #             image: connectedhomeip/chip-build-cirque:0.6.34
         #             volumes:
         #                 - "/tmp:/tmp"
         #                 - "/dev/pts:/dev/pts"
diff --git a/.github/workflows/darwin-tests.yaml b/.github/workflows/darwin-tests.yaml
index 8348562aadb93e..d9e70b82503984 100644
--- a/.github/workflows/darwin-tests.yaml
+++ b/.github/workflows/darwin-tests.yaml
@@ -41,8 +41,8 @@ jobs:
             LSAN_OPTIONS: detect_leaks=1 malloc_context_size=40 suppressions=scripts/tests/chiptest/lsan-mac-suppressions.txt
             # NOTE: Generally kept in sync within the repo using
             #       scripts/tools/zap/version_update.py
-            ZAP_VERSION: v2023.01.18-nightly
-            ZAP_INSTALL_PATH: /usr/local/zap/zap-v2023.01.18-nightly
+            ZAP_VERSION: v2023.01.19-nightly
+            ZAP_INSTALL_PATH: /usr/local/zap/zap-v2023.01.19-nightly
 
         if: github.actor != 'restyled-io[bot]'
         runs-on: macos-latest
diff --git a/.github/workflows/darwin.yaml b/.github/workflows/darwin.yaml
index 57009e371a2616..447c16fe8eb88a 100644
--- a/.github/workflows/darwin.yaml
+++ b/.github/workflows/darwin.yaml
@@ -66,8 +66,8 @@ jobs:
                   # NOTE: Generally kept in sync within the repo using
                   #       scripts/tools/zap/version_update.py
                   # This is scoped to only the steps that don't use xcodebuild.
-                  ZAP_VERSION: v2023.01.18-nightly
-                  ZAP_INSTALL_PATH: /usr/local/zap/zap-v2023.01.18-nightly
+                  ZAP_VERSION: v2023.01.19-nightly
+                  ZAP_INSTALL_PATH: /usr/local/zap/zap-v2023.01.19-nightly
             - name: Bootstrap
               timeout-minutes: 25
               run: scripts/build/gn_bootstrap.sh
@@ -126,8 +126,8 @@ jobs:
                   # NOTE: Generally kept in sync within the repo using
                   #       scripts/tools/zap/version_update.py
                   # This is scoped to only the steps that don't use xcodebuild.
-                  ZAP_VERSION: v2023.01.18-nightly
-                  ZAP_INSTALL_PATH: /usr/local/zap/zap-v2023.01.18-nightly
+                  ZAP_VERSION: v2023.01.19-nightly
+                  ZAP_INSTALL_PATH: /usr/local/zap/zap-v2023.01.19-nightly
             - name: Build example OTA Provider
               timeout-minutes: 10
               run: |
@@ -136,8 +136,8 @@ jobs:
                   # NOTE: Generally kept in sync within the repo using
                   #       scripts/tools/zap/version_update.py
                   # This is scoped to only the steps that don't use xcodebuild.
-                  ZAP_VERSION: v2023.01.18-nightly
-                  ZAP_INSTALL_PATH: /usr/local/zap/zap-v2023.01.18-nightly
+                  ZAP_VERSION: v2023.01.19-nightly
+                  ZAP_INSTALL_PATH: /usr/local/zap/zap-v2023.01.19-nightly
             - name: Build example OTA Requestor
               timeout-minutes: 10
               run: |
@@ -146,8 +146,8 @@ jobs:
                   # NOTE: Generally kept in sync within the repo using
                   #       scripts/tools/zap/version_update.py
                   # This is scoped to only the steps that don't use xcodebuild.
-                  ZAP_VERSION: v2023.01.18-nightly
-                  ZAP_INSTALL_PATH: /usr/local/zap/zap-v2023.01.18-nightly
+                  ZAP_VERSION: v2023.01.19-nightly
+                  ZAP_INSTALL_PATH: /usr/local/zap/zap-v2023.01.19-nightly
             - name: Delete Defaults
               run: defaults delete com.apple.dt.xctest.tool
               continue-on-error: true
diff --git a/.github/workflows/doxygen.yaml b/.github/workflows/doxygen.yaml
index bcf9b9596256a4..9ac5d34d6f8504 100644
--- a/.github/workflows/doxygen.yaml
+++ b/.github/workflows/doxygen.yaml
@@ -82,7 +82,7 @@ jobs:
 
         runs-on: ubuntu-20.04
         container:
-            image: connectedhomeip/chip-build-doxygen:0.6.32
+            image: connectedhomeip/chip-build-doxygen:0.6.34
 
         if: github.actor != 'restyled-io[bot]'
 
diff --git a/.github/workflows/examples-ameba.yaml b/.github/workflows/examples-ameba.yaml
index 4fd1b694708c6e..422c1819472cd7 100644
--- a/.github/workflows/examples-ameba.yaml
+++ b/.github/workflows/examples-ameba.yaml
@@ -35,7 +35,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-ameba:0.6.32
+            image: connectedhomeip/chip-build-ameba:0.6.34
             options: --user root
 
         steps:
diff --git a/.github/workflows/examples-bouffalolab.yaml b/.github/workflows/examples-bouffalolab.yaml
index cc721e63500521..1453b4d4d4bf40 100644
--- a/.github/workflows/examples-bouffalolab.yaml
+++ b/.github/workflows/examples-bouffalolab.yaml
@@ -35,7 +35,7 @@ jobs:
     if: github.actor != 'restyled-io[bot]'
 
     container:
-      image: connectedhomeip/chip-build-bouffalolab:0.6.32
+      image: connectedhomeip/chip-build-bouffalolab:0.6.34
       volumes:
         - "/tmp/bloat_reports:/tmp/bloat_reports"
     steps:
diff --git a/.github/workflows/examples-cc13x2x7_26x2x7.yaml b/.github/workflows/examples-cc13x2x7_26x2x7.yaml
index d18661146a1363..91ccd55f848360 100644
--- a/.github/workflows/examples-cc13x2x7_26x2x7.yaml
+++ b/.github/workflows/examples-cc13x2x7_26x2x7.yaml
@@ -37,7 +37,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-ti:0.6.32
+            image: connectedhomeip/chip-build-ti:0.6.34
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
         steps:
diff --git a/.github/workflows/examples-efr32.yaml b/.github/workflows/examples-efr32.yaml
index 57d20aa35ed79f..105e75ad731f30 100644
--- a/.github/workflows/examples-efr32.yaml
+++ b/.github/workflows/examples-efr32.yaml
@@ -38,7 +38,7 @@ jobs:
     if: github.actor != 'restyled-io[bot]'
 
     container:
-      image: connectedhomeip/chip-build-efr32:0.6.32
+      image: connectedhomeip/chip-build-efr32:0.6.34
       volumes:
         - "/tmp/bloat_reports:/tmp/bloat_reports"
     steps:
diff --git a/.github/workflows/examples-esp32.yaml b/.github/workflows/examples-esp32.yaml
index 1c9835c810de70..f621be81617cc6 100644
--- a/.github/workflows/examples-esp32.yaml
+++ b/.github/workflows/examples-esp32.yaml
@@ -34,7 +34,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-esp32:0.6.32
+            image: connectedhomeip/chip-build-esp32:0.6.34
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 
@@ -148,7 +148,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-esp32:0.6.32
+            image: connectedhomeip/chip-build-esp32:0.6.34
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 
diff --git a/.github/workflows/examples-infineon.yaml b/.github/workflows/examples-infineon.yaml
index e77f24e8f05ed8..e0b745fdd27365 100644
--- a/.github/workflows/examples-infineon.yaml
+++ b/.github/workflows/examples-infineon.yaml
@@ -35,7 +35,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-infineon:0.6.32
+            image: connectedhomeip/chip-build-infineon:0.6.34
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
         steps:
diff --git a/.github/workflows/examples-k32w.yaml b/.github/workflows/examples-k32w.yaml
index b91980408d9ba0..03867d3afd39e8 100644
--- a/.github/workflows/examples-k32w.yaml
+++ b/.github/workflows/examples-k32w.yaml
@@ -37,7 +37,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-k32w:0.6.32
+            image: connectedhomeip/chip-build-k32w:0.6.34
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
         steps:
diff --git a/.github/workflows/examples-linux-arm.yaml b/.github/workflows/examples-linux-arm.yaml
index 1a2cca2803b492..6b4fcfc8c2ec07 100644
--- a/.github/workflows/examples-linux-arm.yaml
+++ b/.github/workflows/examples-linux-arm.yaml
@@ -34,7 +34,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-crosscompile:0.6.32
+            image: connectedhomeip/chip-build-crosscompile:0.6.34
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 
diff --git a/.github/workflows/examples-linux-imx.yaml b/.github/workflows/examples-linux-imx.yaml
index 44796a2555e484..9bda08530bf2df 100644
--- a/.github/workflows/examples-linux-imx.yaml
+++ b/.github/workflows/examples-linux-imx.yaml
@@ -34,7 +34,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-imx:0.6.32
+            image: connectedhomeip/chip-build-imx:0.6.34
 
         steps:
             - uses: Wandalen/wretry.action@v1.0.36
diff --git a/.github/workflows/examples-linux-standalone.yaml b/.github/workflows/examples-linux-standalone.yaml
index 6a68cefc4116be..2e7016880da510 100644
--- a/.github/workflows/examples-linux-standalone.yaml
+++ b/.github/workflows/examples-linux-standalone.yaml
@@ -34,7 +34,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build:0.6.32
+            image: connectedhomeip/chip-build:0.6.34
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 
diff --git a/.github/workflows/examples-mbed.yaml b/.github/workflows/examples-mbed.yaml
index 9aae8281770313..a5b6c2e299b9b1 100644
--- a/.github/workflows/examples-mbed.yaml
+++ b/.github/workflows/examples-mbed.yaml
@@ -40,7 +40,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-mbed-os:0.6.32
+            image: connectedhomeip/chip-build-mbed-os:0.6.34
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 
diff --git a/.github/workflows/examples-mw320.yaml b/.github/workflows/examples-mw320.yaml
index b4859871c9a513..0d646e0442a7be 100755
--- a/.github/workflows/examples-mw320.yaml
+++ b/.github/workflows/examples-mw320.yaml
@@ -37,7 +37,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build:0.6.32
+            image: connectedhomeip/chip-build:0.6.34
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
         steps:
diff --git a/.github/workflows/examples-nrfconnect.yaml b/.github/workflows/examples-nrfconnect.yaml
index b2f06a99bc76ac..a88c4ac01702a3 100644
--- a/.github/workflows/examples-nrfconnect.yaml
+++ b/.github/workflows/examples-nrfconnect.yaml
@@ -37,7 +37,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-nrf-platform:0.6.32
+            image: connectedhomeip/chip-build-nrf-platform:0.6.34
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 
diff --git a/.github/workflows/examples-openiotsdk.yaml b/.github/workflows/examples-openiotsdk.yaml
index 1ffc269c4b67fb..c3fb39cf441bf8 100644
--- a/.github/workflows/examples-openiotsdk.yaml
+++ b/.github/workflows/examples-openiotsdk.yaml
@@ -35,7 +35,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-openiotsdk:0.6.32
+            image: connectedhomeip/chip-build-openiotsdk:0.6.34
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
             options: --privileged
diff --git a/.github/workflows/examples-qpg.yaml b/.github/workflows/examples-qpg.yaml
index c50968d86f807f..2e45bc73131d01 100644
--- a/.github/workflows/examples-qpg.yaml
+++ b/.github/workflows/examples-qpg.yaml
@@ -37,7 +37,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build:0.6.32
+            image: connectedhomeip/chip-build:0.6.34
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
         steps:
diff --git a/.github/workflows/examples-telink.yaml b/.github/workflows/examples-telink.yaml
index f8e4680527cc79..6aca1ff4caddf4 100644
--- a/.github/workflows/examples-telink.yaml
+++ b/.github/workflows/examples-telink.yaml
@@ -35,7 +35,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-telink:0.6.32
+            image: connectedhomeip/chip-build-telink:0.6.34
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 
diff --git a/.github/workflows/examples-tizen.yaml b/.github/workflows/examples-tizen.yaml
index d16191b3bd486c..528323915f6cd4 100644
--- a/.github/workflows/examples-tizen.yaml
+++ b/.github/workflows/examples-tizen.yaml
@@ -33,7 +33,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-tizen:0.6.32
+            image: connectedhomeip/chip-build-tizen:0.6.34
             options: --user root
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
diff --git a/.github/workflows/full-android.yaml b/.github/workflows/full-android.yaml
index 128a51c17bd0f4..ff7c0c6983ddd2 100644
--- a/.github/workflows/full-android.yaml
+++ b/.github/workflows/full-android.yaml
@@ -37,7 +37,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-android:0.6.32
+            image: connectedhomeip/chip-build-android:0.6.34
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
 
diff --git a/.github/workflows/fuzzing-build.yaml b/.github/workflows/fuzzing-build.yaml
index 84bc495c820301..c947ff5807a581 100644
--- a/.github/workflows/fuzzing-build.yaml
+++ b/.github/workflows/fuzzing-build.yaml
@@ -34,7 +34,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build:0.6.32
+            image: connectedhomeip/chip-build:0.6.34
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
 
@@ -91,8 +91,8 @@ jobs:
         env:
             # NOTE: Generally kept in sync within the repo using
             #       scripts/tools/zap/version_update.py
-            ZAP_VERSION: v2023.01.18-nightly
-            ZAP_INSTALL_PATH: /usr/local/zap/zap-v2023.01.18-nightly
+            ZAP_VERSION: v2023.01.19-nightly
+            ZAP_INSTALL_PATH: /usr/local/zap/zap-v2023.01.19-nightly
 
         steps:
             - uses: Wandalen/wretry.action@v1.0.36
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index bdf2f100b9ee21..00e6f7cb060fe2 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -28,7 +28,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build:0.6.32
+            image: connectedhomeip/chip-build:0.6.34
 
         steps:
             - uses: Wandalen/wretry.action@v1.0.36
diff --git a/.github/workflows/qemu.yaml b/.github/workflows/qemu.yaml
index eeb9a8347081c5..66c3b6a576088e 100644
--- a/.github/workflows/qemu.yaml
+++ b/.github/workflows/qemu.yaml
@@ -37,7 +37,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-esp32-qemu:0.6.32
+            image: connectedhomeip/chip-build-esp32-qemu:0.6.34
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
 
diff --git a/.github/workflows/release_artifacts.yaml b/.github/workflows/release_artifacts.yaml
index a73843c95e25e9..f53931717c01ea 100644
--- a/.github/workflows/release_artifacts.yaml
+++ b/.github/workflows/release_artifacts.yaml
@@ -29,7 +29,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: connectedhomeip/chip-build-esp32:0.6.32
+            image: connectedhomeip/chip-build-esp32:0.6.34
 
         steps:
             - uses: Wandalen/wretry.action@v1.0.36
@@ -75,7 +75,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: connectedhomeip/chip-build-efr32:0.6.32
+            image: connectedhomeip/chip-build-efr32:0.6.34
         steps:
             - uses: Wandalen/wretry.action@v1.0.36
               name: Checkout
diff --git a/.github/workflows/smoketest-android.yaml b/.github/workflows/smoketest-android.yaml
index e0cd6b9b4b5cba..44f1defff5cf11 100644
--- a/.github/workflows/smoketest-android.yaml
+++ b/.github/workflows/smoketest-android.yaml
@@ -37,7 +37,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-android:0.6.32
+            image: connectedhomeip/chip-build-android:0.6.34
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
 
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 3dbe100ad0932c..e002203160cd00 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -47,7 +47,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: connectedhomeip/chip-build:0.6.32
+            image: connectedhomeip/chip-build:0.6.34
             options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
                 net.ipv4.conf.all.forwarding=1 net.ipv6.conf.all.forwarding=1"
 
@@ -262,8 +262,8 @@ jobs:
             LSAN_OPTIONS: detect_leaks=1 suppressions=scripts/tests/chiptest/lsan-mac-suppressions.txt
             # NOTE: Generally kept in sync within the repo using
             #       scripts/tools/zap/version_update.py
-            ZAP_VERSION: v2023.01.18-nightly
-            ZAP_INSTALL_PATH: /usr/local/zap/zap-v2023.01.18-nightly
+            ZAP_VERSION: v2023.01.19-nightly
+            ZAP_INSTALL_PATH: /usr/local/zap/zap-v2023.01.19-nightly
 
         if: github.actor != 'restyled-io[bot]'
         runs-on: macos-latest
@@ -383,7 +383,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: connectedhomeip/chip-build:0.6.32
+            image: connectedhomeip/chip-build:0.6.34
             options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
                 net.ipv4.conf.all.forwarding=0 net.ipv6.conf.all.forwarding=0"
 
@@ -458,7 +458,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: connectedhomeip/chip-build:0.6.32
+            image: connectedhomeip/chip-build:0.6.34
             options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
                 net.ipv4.conf.all.forwarding=0 net.ipv6.conf.all.forwarding=0"
 
@@ -547,8 +547,8 @@ jobs:
             TSAN_OPTIONS: "halt_on_error=1"
             # NOTE: Generally kept in sync within the repo using
             #       scripts/tools/zap/version_update.py
-            ZAP_VERSION: v2023.01.18-nightly
-            ZAP_INSTALL_PATH: /usr/local/zap/zap-v2023.01.18-nightly
+            ZAP_VERSION: v2023.01.19-nightly
+            ZAP_INSTALL_PATH: /usr/local/zap/zap-v2023.01.19-nightly
 
         if: github.actor != 'restyled-io[bot]' && false
         runs-on: macos-latest
diff --git a/.github/workflows/unit_integration_test.yaml b/.github/workflows/unit_integration_test.yaml
index edf87331e436d8..c339a84510921c 100644
--- a/.github/workflows/unit_integration_test.yaml
+++ b/.github/workflows/unit_integration_test.yaml
@@ -37,7 +37,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: connectedhomeip/chip-build:0.6.32
+            image: connectedhomeip/chip-build:0.6.34
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
             options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0 net.ipv4.conf.all.forwarding=1 net.ipv6.conf.all.forwarding=1"
diff --git a/.github/workflows/zap_regeneration.yaml b/.github/workflows/zap_regeneration.yaml
index 8e08ddc5d5ce6c..740dc62b49d0a8 100644
--- a/.github/workflows/zap_regeneration.yaml
+++ b/.github/workflows/zap_regeneration.yaml
@@ -28,7 +28,7 @@ jobs:
 
         runs-on: ubuntu-20.04
         container:
-            image: connectedhomeip/chip-build:0.6.32
+            image: connectedhomeip/chip-build:0.6.34
         defaults:
             run:
                 shell: sh
diff --git a/.github/workflows/zap_templates.yaml b/.github/workflows/zap_templates.yaml
index 10f446e5e2bff0..dadb560e0a29fd 100644
--- a/.github/workflows/zap_templates.yaml
+++ b/.github/workflows/zap_templates.yaml
@@ -29,7 +29,7 @@ jobs:
 
         runs-on: ubuntu-20.04
         container:
-            image: connectedhomeip/chip-build:0.6.32
+            image: connectedhomeip/chip-build:0.6.34
         defaults:
             run:
                 shell: sh
diff --git a/.restyled.yaml b/.restyled.yaml
index 4bafb5c29ec2e8..8c77704457a15d 100644
--- a/.restyled.yaml
+++ b/.restyled.yaml
@@ -76,8 +76,7 @@ exclude:
     - "examples/platform/nxp/k32w/k32w0/scripts/demo_generated_certs/**/*"
     - "integrations/cloudbuild/*.yaml" # uglier long command line content
     - "scripts/run_codegen_targets.sh" # shellharden breaks for loops over command outputs
-    - "src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h" # Too big?
-    - "src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm" # Too big?
+    - "src/darwin/Framework/CHIP/zap-generated/*" # already clang-formatted by our zap tooling
     - "zzz_generated/**/*" # already clang-formatted by our zap tooling
 
 
diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
index 59b186e80f2fbe..07b9cfe618d80b 100644
--- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
+++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
@@ -3469,6 +3469,7 @@ server cluster ContentLauncher = 1290 {
     kSport = 10;
     kSportsTeam = 11;
     kType = 12;
+    kVideo = 13;
   }
 
   bitmap ContentLauncherFeature : BITMAP32 {
@@ -3481,37 +3482,37 @@ server cluster ContentLauncher = 1290 {
     kHls = 0x2;
   }
 
-  struct ContentSearch {
-    Parameter parameterList[] = 0;
+  struct ContentSearchStruct {
+    ParameterStruct parameterList[] = 0;
   }
 
-  struct Parameter {
+  struct ParameterStruct {
     ParameterEnum type = 0;
     char_string value = 1;
-    optional AdditionalInfo externalIDList[] = 2;
+    optional AdditionalInfoStruct externalIDList[] = 2;
   }
 
-  struct AdditionalInfo {
+  struct AdditionalInfoStruct {
     char_string name = 0;
     char_string value = 1;
   }
 
-  struct BrandingInformation {
+  struct BrandingInformationStruct {
     char_string providerName = 0;
-    optional StyleInformation background = 1;
-    optional StyleInformation logo = 2;
-    optional StyleInformation progressBar = 3;
-    optional StyleInformation splash = 4;
-    optional StyleInformation waterMark = 5;
+    optional StyleInformationStruct background = 1;
+    optional StyleInformationStruct logo = 2;
+    optional StyleInformationStruct progressBar = 3;
+    optional StyleInformationStruct splash = 4;
+    optional StyleInformationStruct waterMark = 5;
   }
 
-  struct StyleInformation {
-    optional char_string imageUrl = 0;
+  struct StyleInformationStruct {
+    optional char_string imageURL = 0;
     optional char_string color = 1;
-    optional Dimension size = 2;
+    optional DimensionStruct size = 2;
   }
 
-  struct Dimension {
+  struct DimensionStruct {
     double width = 0;
     double height = 1;
     MetricTypeEnum metric = 2;
diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
index 417eaac543dcd6..afb5464b44b5ad 100644
--- a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
+++ b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
@@ -2819,6 +2819,7 @@ server cluster ContentLauncher = 1290 {
     kSport = 10;
     kSportsTeam = 11;
     kType = 12;
+    kVideo = 13;
   }
 
   bitmap ContentLauncherFeature : BITMAP32 {
@@ -2831,37 +2832,37 @@ server cluster ContentLauncher = 1290 {
     kHls = 0x2;
   }
 
-  struct ContentSearch {
-    Parameter parameterList[] = 0;
+  struct ContentSearchStruct {
+    ParameterStruct parameterList[] = 0;
   }
 
-  struct Parameter {
+  struct ParameterStruct {
     ParameterEnum type = 0;
     char_string value = 1;
-    optional AdditionalInfo externalIDList[] = 2;
+    optional AdditionalInfoStruct externalIDList[] = 2;
   }
 
-  struct AdditionalInfo {
+  struct AdditionalInfoStruct {
     char_string name = 0;
     char_string value = 1;
   }
 
-  struct BrandingInformation {
+  struct BrandingInformationStruct {
     char_string providerName = 0;
-    optional StyleInformation background = 1;
-    optional StyleInformation logo = 2;
-    optional StyleInformation progressBar = 3;
-    optional StyleInformation splash = 4;
-    optional StyleInformation waterMark = 5;
+    optional StyleInformationStruct background = 1;
+    optional StyleInformationStruct logo = 2;
+    optional StyleInformationStruct progressBar = 3;
+    optional StyleInformationStruct splash = 4;
+    optional StyleInformationStruct waterMark = 5;
   }
 
-  struct StyleInformation {
-    optional char_string imageUrl = 0;
+  struct StyleInformationStruct {
+    optional char_string imageURL = 0;
     optional char_string color = 1;
-    optional Dimension size = 2;
+    optional DimensionStruct size = 2;
   }
 
-  struct Dimension {
+  struct DimensionStruct {
     double width = 0;
     double height = 1;
     MetricTypeEnum metric = 2;
diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter
index 1a6215df5c2ec1..edf4aed790aad1 100644
--- a/examples/placeholder/linux/apps/app1/config.matter
+++ b/examples/placeholder/linux/apps/app1/config.matter
@@ -2502,6 +2502,7 @@ client cluster ContentLauncher = 1290 {
     kSport = 10;
     kSportsTeam = 11;
     kType = 12;
+    kVideo = 13;
   }
 
   bitmap ContentLauncherFeature : BITMAP32 {
@@ -2514,37 +2515,37 @@ client cluster ContentLauncher = 1290 {
     kHls = 0x2;
   }
 
-  struct ContentSearch {
-    Parameter parameterList[] = 0;
+  struct ContentSearchStruct {
+    ParameterStruct parameterList[] = 0;
   }
 
-  struct Parameter {
+  struct ParameterStruct {
     ParameterEnum type = 0;
     char_string value = 1;
-    optional AdditionalInfo externalIDList[] = 2;
+    optional AdditionalInfoStruct externalIDList[] = 2;
   }
 
-  struct AdditionalInfo {
+  struct AdditionalInfoStruct {
     char_string name = 0;
     char_string value = 1;
   }
 
-  struct BrandingInformation {
+  struct BrandingInformationStruct {
     char_string providerName = 0;
-    optional StyleInformation background = 1;
-    optional StyleInformation logo = 2;
-    optional StyleInformation progressBar = 3;
-    optional StyleInformation splash = 4;
-    optional StyleInformation waterMark = 5;
+    optional StyleInformationStruct background = 1;
+    optional StyleInformationStruct logo = 2;
+    optional StyleInformationStruct progressBar = 3;
+    optional StyleInformationStruct splash = 4;
+    optional StyleInformationStruct waterMark = 5;
   }
 
-  struct StyleInformation {
-    optional char_string imageUrl = 0;
+  struct StyleInformationStruct {
+    optional char_string imageURL = 0;
     optional char_string color = 1;
-    optional Dimension size = 2;
+    optional DimensionStruct size = 2;
   }
 
-  struct Dimension {
+  struct DimensionStruct {
     double width = 0;
     double height = 1;
     MetricTypeEnum metric = 2;
@@ -2559,7 +2560,7 @@ client cluster ContentLauncher = 1290 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct LaunchContentRequest {
-    ContentSearch search = 0;
+    ContentSearchStruct search = 0;
     BOOLEAN autoPlay = 1;
     optional CHAR_STRING data = 2;
   }
@@ -2567,16 +2568,16 @@ client cluster ContentLauncher = 1290 {
   request struct LaunchURLRequest {
     CHAR_STRING contentURL = 0;
     optional CHAR_STRING displayString = 1;
-    optional BrandingInformation brandingInformation = 2;
+    optional BrandingInformationStruct brandingInformation = 2;
   }
 
-  response struct LaunchResponse = 2 {
+  response struct LauncherResponse = 2 {
     ContentLaunchStatusEnum status = 0;
     optional CHAR_STRING data = 1;
   }
 
-  command LaunchContent(LaunchContentRequest): LaunchResponse = 0;
-  command LaunchURL(LaunchURLRequest): LaunchResponse = 1;
+  command LaunchContent(LaunchContentRequest): LauncherResponse = 0;
+  command LaunchURL(LaunchURLRequest): LauncherResponse = 1;
 }
 
 server cluster ContentLauncher = 1290 {
@@ -2605,6 +2606,7 @@ server cluster ContentLauncher = 1290 {
     kSport = 10;
     kSportsTeam = 11;
     kType = 12;
+    kVideo = 13;
   }
 
   bitmap ContentLauncherFeature : BITMAP32 {
@@ -2617,37 +2619,37 @@ server cluster ContentLauncher = 1290 {
     kHls = 0x2;
   }
 
-  struct ContentSearch {
-    Parameter parameterList[] = 0;
+  struct ContentSearchStruct {
+    ParameterStruct parameterList[] = 0;
   }
 
-  struct Parameter {
+  struct ParameterStruct {
     ParameterEnum type = 0;
     char_string value = 1;
-    optional AdditionalInfo externalIDList[] = 2;
+    optional AdditionalInfoStruct externalIDList[] = 2;
   }
 
-  struct AdditionalInfo {
+  struct AdditionalInfoStruct {
     char_string name = 0;
     char_string value = 1;
   }
 
-  struct BrandingInformation {
+  struct BrandingInformationStruct {
     char_string providerName = 0;
-    optional StyleInformation background = 1;
-    optional StyleInformation logo = 2;
-    optional StyleInformation progressBar = 3;
-    optional StyleInformation splash = 4;
-    optional StyleInformation waterMark = 5;
+    optional StyleInformationStruct background = 1;
+    optional StyleInformationStruct logo = 2;
+    optional StyleInformationStruct progressBar = 3;
+    optional StyleInformationStruct splash = 4;
+    optional StyleInformationStruct waterMark = 5;
   }
 
-  struct StyleInformation {
-    optional char_string imageUrl = 0;
+  struct StyleInformationStruct {
+    optional char_string imageURL = 0;
     optional char_string color = 1;
-    optional Dimension size = 2;
+    optional DimensionStruct size = 2;
   }
 
-  struct Dimension {
+  struct DimensionStruct {
     double width = 0;
     double height = 1;
     MetricTypeEnum metric = 2;
@@ -2662,7 +2664,7 @@ server cluster ContentLauncher = 1290 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct LaunchContentRequest {
-    ContentSearch search = 0;
+    ContentSearchStruct search = 0;
     BOOLEAN autoPlay = 1;
     optional CHAR_STRING data = 2;
   }
@@ -2670,16 +2672,16 @@ server cluster ContentLauncher = 1290 {
   request struct LaunchURLRequest {
     CHAR_STRING contentURL = 0;
     optional CHAR_STRING displayString = 1;
-    optional BrandingInformation brandingInformation = 2;
+    optional BrandingInformationStruct brandingInformation = 2;
   }
 
-  response struct LaunchResponse = 2 {
+  response struct LauncherResponse = 2 {
     ContentLaunchStatusEnum status = 0;
     optional CHAR_STRING data = 1;
   }
 
-  command LaunchContent(LaunchContentRequest): LaunchResponse = 0;
-  command LaunchURL(LaunchURLRequest): LaunchResponse = 1;
+  command LaunchContent(LaunchContentRequest): LauncherResponse = 0;
+  command LaunchURL(LaunchURLRequest): LauncherResponse = 1;
 }
 
 client cluster ApplicationBasic = 1293 {
diff --git a/examples/placeholder/linux/apps/app1/config.zap b/examples/placeholder/linux/apps/app1/config.zap
index 4f3b0745b90fb6..200c328a48fa82 100644
--- a/examples/placeholder/linux/apps/app1/config.zap
+++ b/examples/placeholder/linux/apps/app1/config.zap
@@ -6457,7 +6457,7 @@
           "enabled": 1,
           "commands": [
             {
-              "name": "LaunchResponse",
+              "name": "LauncherResponse",
               "code": 2,
               "mfgCode": null,
               "source": "server",
diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter
index 4c3e0a9eabcace..619978a24acf5d 100644
--- a/examples/placeholder/linux/apps/app2/config.matter
+++ b/examples/placeholder/linux/apps/app2/config.matter
@@ -2479,6 +2479,7 @@ client cluster ContentLauncher = 1290 {
     kSport = 10;
     kSportsTeam = 11;
     kType = 12;
+    kVideo = 13;
   }
 
   bitmap ContentLauncherFeature : BITMAP32 {
@@ -2491,37 +2492,37 @@ client cluster ContentLauncher = 1290 {
     kHls = 0x2;
   }
 
-  struct ContentSearch {
-    Parameter parameterList[] = 0;
+  struct ContentSearchStruct {
+    ParameterStruct parameterList[] = 0;
   }
 
-  struct Parameter {
+  struct ParameterStruct {
     ParameterEnum type = 0;
     char_string value = 1;
-    optional AdditionalInfo externalIDList[] = 2;
+    optional AdditionalInfoStruct externalIDList[] = 2;
   }
 
-  struct AdditionalInfo {
+  struct AdditionalInfoStruct {
     char_string name = 0;
     char_string value = 1;
   }
 
-  struct BrandingInformation {
+  struct BrandingInformationStruct {
     char_string providerName = 0;
-    optional StyleInformation background = 1;
-    optional StyleInformation logo = 2;
-    optional StyleInformation progressBar = 3;
-    optional StyleInformation splash = 4;
-    optional StyleInformation waterMark = 5;
+    optional StyleInformationStruct background = 1;
+    optional StyleInformationStruct logo = 2;
+    optional StyleInformationStruct progressBar = 3;
+    optional StyleInformationStruct splash = 4;
+    optional StyleInformationStruct waterMark = 5;
   }
 
-  struct StyleInformation {
-    optional char_string imageUrl = 0;
+  struct StyleInformationStruct {
+    optional char_string imageURL = 0;
     optional char_string color = 1;
-    optional Dimension size = 2;
+    optional DimensionStruct size = 2;
   }
 
-  struct Dimension {
+  struct DimensionStruct {
     double width = 0;
     double height = 1;
     MetricTypeEnum metric = 2;
@@ -2536,7 +2537,7 @@ client cluster ContentLauncher = 1290 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct LaunchContentRequest {
-    ContentSearch search = 0;
+    ContentSearchStruct search = 0;
     BOOLEAN autoPlay = 1;
     optional CHAR_STRING data = 2;
   }
@@ -2544,16 +2545,16 @@ client cluster ContentLauncher = 1290 {
   request struct LaunchURLRequest {
     CHAR_STRING contentURL = 0;
     optional CHAR_STRING displayString = 1;
-    optional BrandingInformation brandingInformation = 2;
+    optional BrandingInformationStruct brandingInformation = 2;
   }
 
-  response struct LaunchResponse = 2 {
+  response struct LauncherResponse = 2 {
     ContentLaunchStatusEnum status = 0;
     optional CHAR_STRING data = 1;
   }
 
-  command LaunchContent(LaunchContentRequest): LaunchResponse = 0;
-  command LaunchURL(LaunchURLRequest): LaunchResponse = 1;
+  command LaunchContent(LaunchContentRequest): LauncherResponse = 0;
+  command LaunchURL(LaunchURLRequest): LauncherResponse = 1;
 }
 
 server cluster ContentLauncher = 1290 {
@@ -2582,6 +2583,7 @@ server cluster ContentLauncher = 1290 {
     kSport = 10;
     kSportsTeam = 11;
     kType = 12;
+    kVideo = 13;
   }
 
   bitmap ContentLauncherFeature : BITMAP32 {
@@ -2594,37 +2596,37 @@ server cluster ContentLauncher = 1290 {
     kHls = 0x2;
   }
 
-  struct ContentSearch {
-    Parameter parameterList[] = 0;
+  struct ContentSearchStruct {
+    ParameterStruct parameterList[] = 0;
   }
 
-  struct Parameter {
+  struct ParameterStruct {
     ParameterEnum type = 0;
     char_string value = 1;
-    optional AdditionalInfo externalIDList[] = 2;
+    optional AdditionalInfoStruct externalIDList[] = 2;
   }
 
-  struct AdditionalInfo {
+  struct AdditionalInfoStruct {
     char_string name = 0;
     char_string value = 1;
   }
 
-  struct BrandingInformation {
+  struct BrandingInformationStruct {
     char_string providerName = 0;
-    optional StyleInformation background = 1;
-    optional StyleInformation logo = 2;
-    optional StyleInformation progressBar = 3;
-    optional StyleInformation splash = 4;
-    optional StyleInformation waterMark = 5;
+    optional StyleInformationStruct background = 1;
+    optional StyleInformationStruct logo = 2;
+    optional StyleInformationStruct progressBar = 3;
+    optional StyleInformationStruct splash = 4;
+    optional StyleInformationStruct waterMark = 5;
   }
 
-  struct StyleInformation {
-    optional char_string imageUrl = 0;
+  struct StyleInformationStruct {
+    optional char_string imageURL = 0;
     optional char_string color = 1;
-    optional Dimension size = 2;
+    optional DimensionStruct size = 2;
   }
 
-  struct Dimension {
+  struct DimensionStruct {
     double width = 0;
     double height = 1;
     MetricTypeEnum metric = 2;
@@ -2639,7 +2641,7 @@ server cluster ContentLauncher = 1290 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct LaunchContentRequest {
-    ContentSearch search = 0;
+    ContentSearchStruct search = 0;
     BOOLEAN autoPlay = 1;
     optional CHAR_STRING data = 2;
   }
@@ -2647,16 +2649,16 @@ server cluster ContentLauncher = 1290 {
   request struct LaunchURLRequest {
     CHAR_STRING contentURL = 0;
     optional CHAR_STRING displayString = 1;
-    optional BrandingInformation brandingInformation = 2;
+    optional BrandingInformationStruct brandingInformation = 2;
   }
 
-  response struct LaunchResponse = 2 {
+  response struct LauncherResponse = 2 {
     ContentLaunchStatusEnum status = 0;
     optional CHAR_STRING data = 1;
   }
 
-  command LaunchContent(LaunchContentRequest): LaunchResponse = 0;
-  command LaunchURL(LaunchURLRequest): LaunchResponse = 1;
+  command LaunchContent(LaunchContentRequest): LauncherResponse = 0;
+  command LaunchURL(LaunchURLRequest): LauncherResponse = 1;
 }
 
 client cluster ApplicationBasic = 1293 {
diff --git a/examples/placeholder/linux/apps/app2/config.zap b/examples/placeholder/linux/apps/app2/config.zap
index 56cd5c6239ea6a..57f3dbe7c191a3 100644
--- a/examples/placeholder/linux/apps/app2/config.zap
+++ b/examples/placeholder/linux/apps/app2/config.zap
@@ -6741,7 +6741,7 @@
           "enabled": 1,
           "commands": [
             {
-              "name": "LaunchResponse",
+              "name": "LauncherResponse",
               "code": 2,
               "mfgCode": null,
               "source": "server",
diff --git a/examples/pump-app/pump-common/pump-app.zap b/examples/pump-app/pump-common/pump-app.zap
index 17b63f8886062e..2a9ff160061d43 100644
--- a/examples/pump-app/pump-common/pump-app.zap
+++ b/examples/pump-app/pump-common/pump-app.zap
@@ -7914,6 +7914,5 @@
       "endpointVersion": 1,
       "deviceIdentifier": 771
     }
-  ],
-  "log": []
+  ]
 }
\ No newline at end of file
diff --git a/examples/tv-app/android/include/content-launcher/AppContentLauncherManager.h b/examples/tv-app/android/include/content-launcher/AppContentLauncherManager.h
index cee210910dcbe4..2843486a037363 100644
--- a/examples/tv-app/android/include/content-launcher/AppContentLauncherManager.h
+++ b/examples/tv-app/android/include/content-launcher/AppContentLauncherManager.h
@@ -27,9 +27,9 @@ using chip::EndpointId;
 using chip::app::AttributeValueEncoder;
 using chip::app::CommandResponseHelper;
 using ContentLauncherDelegate     = chip::app::Clusters::ContentLauncher::Delegate;
-using LaunchResponseType          = chip::app::Clusters::ContentLauncher::Commands::LaunchResponse::Type;
-using ParameterType               = chip::app::Clusters::ContentLauncher::Structs::Parameter::DecodableType;
-using BrandingInformationType     = chip::app::Clusters::ContentLauncher::Structs::BrandingInformation::Type;
+using LaunchResponseType          = chip::app::Clusters::ContentLauncher::Commands::LauncherResponse::Type;
+using ParameterType               = chip::app::Clusters::ContentLauncher::Structs::ParameterStruct::DecodableType;
+using BrandingInformationType     = chip::app::Clusters::ContentLauncher::Structs::BrandingInformationStruct::Type;
 using ContentAppAttributeDelegate = chip::AppPlatform::ContentAppAttributeDelegate;
 
 class AppContentLauncherManager : public ContentLauncherDelegate
diff --git a/examples/tv-app/android/java/AppImpl.cpp b/examples/tv-app/android/java/AppImpl.cpp
index d0280edd92c074..e8d1c4c282dbd2 100644
--- a/examples/tv-app/android/java/AppImpl.cpp
+++ b/examples/tv-app/android/java/AppImpl.cpp
@@ -191,7 +191,7 @@ constexpr CommandId contentLauncherIncomingCommands[] = {
     kInvalidCommandId,
 };
 constexpr CommandId contentLauncherOutgoingCommands[] = {
-    app::Clusters::ContentLauncher::Commands::LaunchResponse::Id,
+    app::Clusters::ContentLauncher::Commands::LauncherResponse::Id,
     kInvalidCommandId,
 };
 // TODO: Sort out when the optional commands here should be listed.
diff --git a/examples/tv-app/android/java/ContentAppAttributeDelegate.cpp b/examples/tv-app/android/java/ContentAppAttributeDelegate.cpp
index b05f20ae2a768e..62ee49451de3bd 100644
--- a/examples/tv-app/android/java/ContentAppAttributeDelegate.cpp
+++ b/examples/tv-app/android/java/ContentAppAttributeDelegate.cpp
@@ -32,7 +32,7 @@
 namespace chip {
 namespace AppPlatform {
 
-using LaunchResponseType = chip::app::Clusters::ContentLauncher::Commands::LaunchResponse::Type;
+using LaunchResponseType = chip::app::Clusters::ContentLauncher::Commands::LauncherResponse::Type;
 
 std::string ContentAppAttributeDelegate::Read(const chip::app::ConcreteReadAttributePath & aPath)
 {
diff --git a/examples/tv-app/android/java/ContentAppCommandDelegate.cpp b/examples/tv-app/android/java/ContentAppCommandDelegate.cpp
index 585c97baaea3c9..7773548335db5f 100644
--- a/examples/tv-app/android/java/ContentAppCommandDelegate.cpp
+++ b/examples/tv-app/android/java/ContentAppCommandDelegate.cpp
@@ -35,7 +35,7 @@ namespace chip {
 namespace AppPlatform {
 
 using CommandHandlerInterface    = chip::app::CommandHandlerInterface;
-using LaunchResponseType         = chip::app::Clusters::ContentLauncher::Commands::LaunchResponse::Type;
+using LaunchResponseType         = chip::app::Clusters::ContentLauncher::Commands::LauncherResponse::Type;
 using PlaybackResponseType       = chip::app::Clusters::MediaPlayback::Commands::PlaybackResponse::Type;
 using NavigateTargetResponseType = chip::app::Clusters::TargetNavigator::Commands::NavigateTargetResponse::Type;
 
@@ -120,7 +120,7 @@ void ContentAppCommandDelegate::FormatResponseData(CommandHandlerInterface::Hand
     case app::Clusters::ContentLauncher::Id: {
         LaunchResponseType launchResponse;
         std::string statusFieldId =
-            std::to_string(to_underlying(app::Clusters::ContentLauncher::Commands::LaunchResponse::Fields::kStatus));
+            std::to_string(to_underlying(app::Clusters::ContentLauncher::Commands::LauncherResponse::Fields::kStatus));
         if (value[statusFieldId].empty())
         {
             handlerContext.mCommandHandler.AddStatus(handlerContext.mRequestPath, Protocols::InteractionModel::Status::Failure);
@@ -131,7 +131,7 @@ void ContentAppCommandDelegate::FormatResponseData(CommandHandlerInterface::Hand
             launchResponse.status =
                 static_cast<app::Clusters::ContentLauncher::ContentLaunchStatusEnum>(value[statusFieldId].asInt());
             std::string dataFieldId =
-                std::to_string(to_underlying(app::Clusters::ContentLauncher::Commands::LaunchResponse::Fields::kData));
+                std::to_string(to_underlying(app::Clusters::ContentLauncher::Commands::LauncherResponse::Fields::kData));
             if (!value[dataFieldId].empty())
             {
                 launchResponse.data = chip::MakeOptional(CharSpan::fromCharString(value[dataFieldId].asCString()));
diff --git a/examples/tv-app/android/java/ContentLauncherManager.cpp b/examples/tv-app/android/java/ContentLauncherManager.cpp
index 81fa61bb168c58..c91d86424008c3 100644
--- a/examples/tv-app/android/java/ContentLauncherManager.cpp
+++ b/examples/tv-app/android/java/ContentLauncherManager.cpp
@@ -49,7 +49,7 @@ void ContentLauncherManager::HandleLaunchContent(CommandResponseHelper<LaunchRes
                                                  const DecodableList<ParameterType> & parameterList, bool autoplay,
                                                  const chip::CharSpan & data)
 {
-    Commands::LaunchResponse::Type response;
+    Commands::LauncherResponse::Type response;
     CHIP_ERROR err = CHIP_NO_ERROR;
     JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
 
@@ -103,7 +103,7 @@ void ContentLauncherManager::HandleLaunchUrl(CommandResponseHelper<LaunchRespons
                                              const chip::CharSpan & displayString,
                                              const BrandingInformationType & brandingInformation)
 {
-    Commands::LaunchResponse::Type response;
+    Commands::LauncherResponse::Type response;
     CHIP_ERROR err = CHIP_NO_ERROR;
     JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
 
diff --git a/examples/tv-app/android/java/ContentLauncherManager.h b/examples/tv-app/android/java/ContentLauncherManager.h
index 79a35de13a534a..bdc42c9cce5a3b 100644
--- a/examples/tv-app/android/java/ContentLauncherManager.h
+++ b/examples/tv-app/android/java/ContentLauncherManager.h
@@ -29,9 +29,9 @@ using chip::CharSpan;
 using chip::app::AttributeValueEncoder;
 using chip::app::CommandResponseHelper;
 using ContentLauncherDelegate = chip::app::Clusters::ContentLauncher::Delegate;
-using LaunchResponseType      = chip::app::Clusters::ContentLauncher::Commands::LaunchResponse::Type;
-using ParameterType           = chip::app::Clusters::ContentLauncher::Structs::Parameter::DecodableType;
-using BrandingInformationType = chip::app::Clusters::ContentLauncher::Structs::BrandingInformation::Type;
+using LaunchResponseType      = chip::app::Clusters::ContentLauncher::Commands::LauncherResponse::Type;
+using ParameterType           = chip::app::Clusters::ContentLauncher::Structs::ParameterStruct::DecodableType;
+using BrandingInformationType = chip::app::Clusters::ContentLauncher::Structs::BrandingInformationStruct::Type;
 
 class ContentLauncherManager : public ContentLauncherDelegate
 {
diff --git a/examples/tv-app/linux/AppImpl.cpp b/examples/tv-app/linux/AppImpl.cpp
index 30c1ee90460295..6b0a306a78ac02 100644
--- a/examples/tv-app/linux/AppImpl.cpp
+++ b/examples/tv-app/linux/AppImpl.cpp
@@ -349,7 +349,7 @@ constexpr CommandId contentLauncherIncomingCommands[] = {
     kInvalidCommandId,
 };
 constexpr CommandId contentLauncherOutgoingCommands[] = {
-    app::Clusters::ContentLauncher::Commands::LaunchResponse::Id,
+    app::Clusters::ContentLauncher::Commands::LauncherResponse::Id,
     kInvalidCommandId,
 };
 // TODO: Sort out when the optional commands here should be listed.
diff --git a/examples/tv-app/linux/include/content-launcher/ContentLauncherManager.h b/examples/tv-app/linux/include/content-launcher/ContentLauncherManager.h
index 7073d89dd05c9e..b19663d2f11e8e 100644
--- a/examples/tv-app/linux/include/content-launcher/ContentLauncherManager.h
+++ b/examples/tv-app/linux/include/content-launcher/ContentLauncherManager.h
@@ -26,9 +26,9 @@ using chip::EndpointId;
 using chip::app::AttributeValueEncoder;
 using chip::app::CommandResponseHelper;
 using ContentLauncherDelegate = chip::app::Clusters::ContentLauncher::Delegate;
-using LaunchResponseType      = chip::app::Clusters::ContentLauncher::Commands::LaunchResponse::Type;
-using ParameterType           = chip::app::Clusters::ContentLauncher::Structs::Parameter::DecodableType;
-using BrandingInformationType = chip::app::Clusters::ContentLauncher::Structs::BrandingInformation::Type;
+using LaunchResponseType      = chip::app::Clusters::ContentLauncher::Commands::LauncherResponse::Type;
+using ParameterType           = chip::app::Clusters::ContentLauncher::Structs::ParameterStruct::DecodableType;
+using BrandingInformationType = chip::app::Clusters::ContentLauncher::Structs::BrandingInformationStruct::Type;
 
 class ContentEntry
 {
diff --git a/examples/tv-app/tv-common/tv-app.matter b/examples/tv-app/tv-common/tv-app.matter
index 6dce482b4495ef..eaf575cea6b9b8 100644
--- a/examples/tv-app/tv-common/tv-app.matter
+++ b/examples/tv-app/tv-common/tv-app.matter
@@ -1923,6 +1923,7 @@ server cluster ContentLauncher = 1290 {
     kSport = 10;
     kSportsTeam = 11;
     kType = 12;
+    kVideo = 13;
   }
 
   bitmap ContentLauncherFeature : BITMAP32 {
@@ -1935,37 +1936,37 @@ server cluster ContentLauncher = 1290 {
     kHls = 0x2;
   }
 
-  struct ContentSearch {
-    Parameter parameterList[] = 0;
+  struct ContentSearchStruct {
+    ParameterStruct parameterList[] = 0;
   }
 
-  struct Parameter {
+  struct ParameterStruct {
     ParameterEnum type = 0;
     char_string value = 1;
-    optional AdditionalInfo externalIDList[] = 2;
+    optional AdditionalInfoStruct externalIDList[] = 2;
   }
 
-  struct AdditionalInfo {
+  struct AdditionalInfoStruct {
     char_string name = 0;
     char_string value = 1;
   }
 
-  struct BrandingInformation {
+  struct BrandingInformationStruct {
     char_string providerName = 0;
-    optional StyleInformation background = 1;
-    optional StyleInformation logo = 2;
-    optional StyleInformation progressBar = 3;
-    optional StyleInformation splash = 4;
-    optional StyleInformation waterMark = 5;
+    optional StyleInformationStruct background = 1;
+    optional StyleInformationStruct logo = 2;
+    optional StyleInformationStruct progressBar = 3;
+    optional StyleInformationStruct splash = 4;
+    optional StyleInformationStruct waterMark = 5;
   }
 
-  struct StyleInformation {
-    optional char_string imageUrl = 0;
+  struct StyleInformationStruct {
+    optional char_string imageURL = 0;
     optional char_string color = 1;
-    optional Dimension size = 2;
+    optional DimensionStruct size = 2;
   }
 
-  struct Dimension {
+  struct DimensionStruct {
     double width = 0;
     double height = 1;
     MetricTypeEnum metric = 2;
@@ -1977,7 +1978,7 @@ server cluster ContentLauncher = 1290 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct LaunchContentRequest {
-    ContentSearch search = 0;
+    ContentSearchStruct search = 0;
     BOOLEAN autoPlay = 1;
     optional CHAR_STRING data = 2;
   }
@@ -1985,16 +1986,16 @@ server cluster ContentLauncher = 1290 {
   request struct LaunchURLRequest {
     CHAR_STRING contentURL = 0;
     optional CHAR_STRING displayString = 1;
-    optional BrandingInformation brandingInformation = 2;
+    optional BrandingInformationStruct brandingInformation = 2;
   }
 
-  response struct LaunchResponse = 2 {
+  response struct LauncherResponse = 2 {
     ContentLaunchStatusEnum status = 0;
     optional CHAR_STRING data = 1;
   }
 
-  command LaunchContent(LaunchContentRequest): LaunchResponse = 0;
-  command LaunchURL(LaunchURLRequest): LaunchResponse = 1;
+  command LaunchContent(LaunchContentRequest): LauncherResponse = 0;
+  command LaunchURL(LaunchURLRequest): LauncherResponse = 1;
 }
 
 server cluster AudioOutput = 1291 {
diff --git a/examples/tv-app/tv-common/tv-app.zap b/examples/tv-app/tv-common/tv-app.zap
index 871e5543af91eb..d078283993818d 100644
--- a/examples/tv-app/tv-common/tv-app.zap
+++ b/examples/tv-app/tv-common/tv-app.zap
@@ -8763,7 +8763,7 @@
           "enabled": 1,
           "commands": [
             {
-              "name": "LaunchResponse",
+              "name": "LauncherResponse",
               "code": 2,
               "mfgCode": null,
               "source": "server",
@@ -11637,7 +11637,7 @@
           "enabled": 1,
           "commands": [
             {
-              "name": "LaunchResponse",
+              "name": "LauncherResponse",
               "code": 2,
               "mfgCode": null,
               "source": "server",
diff --git a/examples/tv-casting-app/android/App/app/src/main/jni/cpp/TvCastingApp-JNI.cpp b/examples/tv-casting-app/android/App/app/src/main/jni/cpp/TvCastingApp-JNI.cpp
index 079c695a3bcd1d..59a1f765b51b3d 100644
--- a/examples/tv-casting-app/android/App/app/src/main/jni/cpp/TvCastingApp-JNI.cpp
+++ b/examples/tv-casting-app/android/App/app/src/main/jni/cpp/TvCastingApp-JNI.cpp
@@ -330,7 +330,7 @@ JNI_METHOD(jboolean, contentLauncherLaunchURL)
 }
 
 CHIP_ERROR CreateParameter(JNIEnv * env, jobject jParameter,
-                           chip::app::Clusters::ContentLauncher::Structs::Parameter::Type & parameter)
+                           chip::app::Clusters::ContentLauncher::Structs::ParameterStruct::Type & parameter)
 {
     jclass jParameterClass = env->GetObjectClass(jParameter);
 
@@ -348,7 +348,8 @@ CHIP_ERROR CreateParameter(JNIEnv * env, jobject jParameter,
 }
 
 CHIP_ERROR CreateContentSearch(JNIEnv * env, jobject jSearch,
-                               chip::app::Clusters::ContentLauncher::Structs::ContentSearch::Type & search, ListFreer & listFreer)
+                               chip::app::Clusters::ContentLauncher::Structs::ContentSearchStruct::Type & search,
+                               ListFreer & listFreer)
 {
     jclass jContentSearchClass;
     ReturnErrorOnFailure(
@@ -367,20 +368,21 @@ CHIP_ERROR CreateContentSearch(JNIEnv * env, jobject jSearch,
     jmethodID jNextMid    = env->GetMethodID(env->GetObjectClass(jIterator), "next", "()Ljava/lang/Object;");
     jmethodID jHasNextMid = env->GetMethodID(env->GetObjectClass(jIterator), "hasNext", "()Z");
 
-    auto * parameterListHolder = new ListHolder<chip::app::Clusters::ContentLauncher::Structs::Parameter::Type>(parameterListSize);
+    auto * parameterListHolder =
+        new ListHolder<chip::app::Clusters::ContentLauncher::Structs::ParameterStruct::Type>(parameterListSize);
     listFreer.add(parameterListHolder);
     int parameterIndex = 0;
     while (env->CallBooleanMethod(jIterator, jHasNextMid))
     {
         jobject jParameter = env->CallObjectMethod(jIterator, jNextMid);
-        chip::app::Clusters::ContentLauncher::Structs::Parameter::Type parameter;
+        chip::app::Clusters::ContentLauncher::Structs::ParameterStruct::Type parameter;
         ReturnErrorOnFailure(CreateParameter(env, jParameter, parameter));
         parameterListHolder->mList[parameterIndex].type           = parameter.type;
         parameterListHolder->mList[parameterIndex].value          = parameter.value;
         parameterListHolder->mList[parameterIndex].externalIDList = parameter.externalIDList;
         parameterIndex++;
     }
-    search.parameterList = chip::app::DataModel::List<chip::app::Clusters::ContentLauncher::Structs::Parameter::Type>(
+    search.parameterList = chip::app::DataModel::List<chip::app::Clusters::ContentLauncher::Structs::ParameterStruct::Type>(
         parameterListHolder->mList, parameterListSize);
 
     return CHIP_NO_ERROR;
@@ -400,7 +402,7 @@ JNI_METHOD(jboolean, contentLauncher_1launchContent)
     chip::Optional<chip::CharSpan> data = MakeOptional(CharSpan::fromCharString(nativeData));
 
     ListFreer listFreer;
-    chip::app::Clusters::ContentLauncher::Structs::ContentSearch::Type search;
+    chip::app::Clusters::ContentLauncher::Structs::ContentSearchStruct::Type search;
     CHIP_ERROR err = CreateContentSearch(env, jSearch, search, listFreer);
 
     TargetEndpointInfo endpoint;
diff --git a/examples/tv-casting-app/darwin/MatterTvCastingBridge/MatterTvCastingBridge/CastingServerBridge.mm b/examples/tv-casting-app/darwin/MatterTvCastingBridge/MatterTvCastingBridge/CastingServerBridge.mm
index 51af07afb380c4..9aa1efac725ca9 100644
--- a/examples/tv-casting-app/darwin/MatterTvCastingBridge/MatterTvCastingBridge/CastingServerBridge.mm
+++ b/examples/tv-casting-app/darwin/MatterTvCastingBridge/MatterTvCastingBridge/CastingServerBridge.mm
@@ -668,10 +668,10 @@ - (void)contentLauncher_launchContent:(ContentApp * _Nonnull)contentApp
         [ConversionUtils convertToCppTargetEndpointInfoFrom:contentApp outTargetEndpointInfo:endpoint];
 
         ListFreer listFreer;
-        chip::app::Clusters::ContentLauncher::Structs::ContentSearch::Type cppSearch;
+        chip::app::Clusters::ContentLauncher::Structs::ContentSearchStruct::Type cppSearch;
         if (contentSearch.parameterList.count > 0) {
-            auto * parameterListHolder
-                = new ListHolder<chip::app::Clusters::ContentLauncher::Structs::Parameter::Type>(contentSearch.parameterList.count);
+            auto * parameterListHolder = new ListHolder<chip::app::Clusters::ContentLauncher::Structs::ParameterStruct::Type>(
+                contentSearch.parameterList.count);
             listFreer.add(parameterListHolder);
 
             int parameterIndex = 0;
@@ -679,7 +679,7 @@ - (void)contentLauncher_launchContent:(ContentApp * _Nonnull)contentApp
                 int externalIdListIndex = 0;
                 if (parameter.externalIDList != nil) {
                     auto * externalIdListHolder
-                        = new ListHolder<chip::app::Clusters::ContentLauncher::Structs::AdditionalInfo::Type>(
+                        = new ListHolder<chip::app::Clusters::ContentLauncher::Structs::AdditionalInfoStruct::Type>(
                             parameter.externalIDList.count);
                     listFreer.add(externalIdListHolder);
 
@@ -691,11 +691,11 @@ - (void)contentLauncher_launchContent:(ContentApp * _Nonnull)contentApp
                         externalIdListIndex++;
                     }
                     parameterListHolder->mList[parameterIndex].externalIDList = MakeOptional(
-                        chip::app::DataModel::List<const chip::app::Clusters::ContentLauncher::Structs::AdditionalInfo::Type>(
+                        chip::app::DataModel::List<const chip::app::Clusters::ContentLauncher::Structs::AdditionalInfoStruct::Type>(
                             externalIdListHolder->mList, parameter.externalIDList.count));
                 } else {
                     parameterListHolder->mList[parameterIndex].externalIDList = chip::Optional<chip::app::DataModel::List<
-                        const chip::app::Clusters::ContentLauncher::Structs::AdditionalInfo::Type>>::Missing();
+                        const chip::app::Clusters::ContentLauncher::Structs::AdditionalInfoStruct::Type>>::Missing();
                 }
 
                 parameterListHolder->mList[parameterIndex].type
@@ -704,7 +704,7 @@ - (void)contentLauncher_launchContent:(ContentApp * _Nonnull)contentApp
                     [parameter.value UTF8String], [parameter.value lengthOfBytesUsingEncoding:NSUTF8StringEncoding]);
                 parameterIndex++;
                 cppSearch.parameterList
-                    = chip::app::DataModel::List<chip::app::Clusters::ContentLauncher::Structs::Parameter::Type>(
+                    = chip::app::DataModel::List<chip::app::Clusters::ContentLauncher::Structs::ParameterStruct::Type>(
                         parameterListHolder->mList, contentSearch.parameterList.count);
             }
         }
diff --git a/examples/tv-casting-app/tv-casting-common/include/CastingServer.h b/examples/tv-casting-app/tv-casting-common/include/CastingServer.h
index efa95615dc7c4b..979f48bf59348c 100644
--- a/examples/tv-casting-app/tv-casting-common/include/CastingServer.h
+++ b/examples/tv-casting-app/tv-casting-common/include/CastingServer.h
@@ -112,10 +112,10 @@ class CastingServer
      */
     CHIP_ERROR ContentLauncher_LaunchURL(
         TargetEndpointInfo * endpoint, const char * contentUrl, const char * contentDisplayStr,
-        chip::Optional<chip::app::Clusters::ContentLauncher::Structs::BrandingInformation::Type> brandingInformation,
+        chip::Optional<chip::app::Clusters::ContentLauncher::Structs::BrandingInformationStruct::Type> brandingInformation,
         std::function<void(CHIP_ERROR)> responseCallback);
     CHIP_ERROR ContentLauncher_LaunchContent(TargetEndpointInfo * endpoint,
-                                             chip::app::Clusters::ContentLauncher::Structs::ContentSearch::Type search,
+                                             chip::app::Clusters::ContentLauncher::Structs::ContentSearchStruct::Type search,
                                              bool autoPlay, chip::Optional<chip::CharSpan> data,
                                              std::function<void(CHIP_ERROR)> responseCallback);
     CHIP_ERROR
diff --git a/examples/tv-casting-app/tv-casting-common/include/ContentLauncher.h b/examples/tv-casting-app/tv-casting-common/include/ContentLauncher.h
index 4f05ef4d281ffb..72f331d88fdba8 100644
--- a/examples/tv-casting-app/tv-casting-common/include/ContentLauncher.h
+++ b/examples/tv-casting-app/tv-casting-common/include/ContentLauncher.h
@@ -24,23 +24,25 @@
 
 // COMMAND CLASSES
 class LaunchURLCommand : public MediaCommandBase<chip::app::Clusters::ContentLauncher::Commands::LaunchURL::Type,
-                                                 chip::app::Clusters::ContentLauncher::Commands::LaunchResponse::DecodableType>
+                                                 chip::app::Clusters::ContentLauncher::Commands::LauncherResponse::DecodableType>
 {
 public:
     LaunchURLCommand() : MediaCommandBase(chip::app::Clusters::ContentLauncher::Id) {}
 
-    CHIP_ERROR Invoke(const char * contentUrl, const char * contentDisplayStr,
-                      chip::Optional<chip::app::Clusters::ContentLauncher::Structs::BrandingInformation::Type> brandingInformation,
-                      std::function<void(CHIP_ERROR)> responseCallback);
+    CHIP_ERROR
+    Invoke(const char * contentUrl, const char * contentDisplayStr,
+           chip::Optional<chip::app::Clusters::ContentLauncher::Structs::BrandingInformationStruct::Type> brandingInformation,
+           std::function<void(CHIP_ERROR)> responseCallback);
 };
 
-class LaunchContentCommand : public MediaCommandBase<chip::app::Clusters::ContentLauncher::Commands::LaunchContent::Type,
-                                                     chip::app::Clusters::ContentLauncher::Commands::LaunchResponse::DecodableType>
+class LaunchContentCommand
+    : public MediaCommandBase<chip::app::Clusters::ContentLauncher::Commands::LaunchContent::Type,
+                              chip::app::Clusters::ContentLauncher::Commands::LauncherResponse::DecodableType>
 {
 public:
     LaunchContentCommand() : MediaCommandBase(chip::app::Clusters::ContentLauncher::Id) {}
 
-    CHIP_ERROR Invoke(chip::app::Clusters::ContentLauncher::Structs::ContentSearch::Type search, bool autoPlay,
+    CHIP_ERROR Invoke(chip::app::Clusters::ContentLauncher::Structs::ContentSearchStruct::Type search, bool autoPlay,
                       chip::Optional<chip::CharSpan> data, std::function<void(CHIP_ERROR)> responseCallback);
 };
 
diff --git a/examples/tv-casting-app/tv-casting-common/src/CastingServer.cpp b/examples/tv-casting-app/tv-casting-common/src/CastingServer.cpp
index 8569b31618f2e8..de27288bccd190 100644
--- a/examples/tv-casting-app/tv-casting-common/src/CastingServer.cpp
+++ b/examples/tv-casting-app/tv-casting-common/src/CastingServer.cpp
@@ -315,7 +315,7 @@ CastingServer::ContentLauncherLaunchURL(TargetEndpointInfo * endpoint, const cha
                                         std::function<void(CHIP_ERROR)> launchURLResponseCallback)
 {
     return ContentLauncher_LaunchURL(endpoint, contentUrl, contentDisplayStr,
-                                     MakeOptional(chip::app::Clusters::ContentLauncher::Structs::BrandingInformation::Type()),
+                                     MakeOptional(chip::app::Clusters::ContentLauncher::Structs::BrandingInformationStruct::Type()),
                                      launchURLResponseCallback);
 }
 
@@ -520,17 +520,16 @@ void CastingServer::Disconnect()
  */
 CHIP_ERROR CastingServer::ContentLauncher_LaunchURL(
     TargetEndpointInfo * endpoint, const char * contentUrl, const char * contentDisplayStr,
-    chip::Optional<chip::app::Clusters::ContentLauncher::Structs::BrandingInformation::Type> brandingInformation,
+    chip::Optional<chip::app::Clusters::ContentLauncher::Structs::BrandingInformationStruct::Type> brandingInformation,
     std::function<void(CHIP_ERROR)> responseCallback)
 {
     ReturnErrorOnFailure(mLaunchURLCommand.SetTarget(mActiveTargetVideoPlayerInfo, endpoint->GetEndpointId()));
     return mLaunchURLCommand.Invoke(contentUrl, contentDisplayStr, brandingInformation, responseCallback);
 }
 
-CHIP_ERROR CastingServer::ContentLauncher_LaunchContent(TargetEndpointInfo * endpoint,
-                                                        chip::app::Clusters::ContentLauncher::Structs::ContentSearch::Type search,
-                                                        bool autoPlay, chip::Optional<chip::CharSpan> data,
-                                                        std::function<void(CHIP_ERROR)> responseCallback)
+CHIP_ERROR CastingServer::ContentLauncher_LaunchContent(
+    TargetEndpointInfo * endpoint, chip::app::Clusters::ContentLauncher::Structs::ContentSearchStruct::Type search, bool autoPlay,
+    chip::Optional<chip::CharSpan> data, std::function<void(CHIP_ERROR)> responseCallback)
 {
     ReturnErrorOnFailure(mLaunchContentCommand.SetTarget(mActiveTargetVideoPlayerInfo, endpoint->GetEndpointId()));
     return mLaunchContentCommand.Invoke(search, autoPlay, data, responseCallback);
diff --git a/examples/tv-casting-app/tv-casting-common/src/ContentLauncher.cpp b/examples/tv-casting-app/tv-casting-common/src/ContentLauncher.cpp
index 48d7fd247bfcbb..a93ec8fa6132ba 100644
--- a/examples/tv-casting-app/tv-casting-common/src/ContentLauncher.cpp
+++ b/examples/tv-casting-app/tv-casting-common/src/ContentLauncher.cpp
@@ -22,7 +22,7 @@ using namespace chip;
 using namespace chip::app::Clusters;
 
 CHIP_ERROR LaunchURLCommand::Invoke(const char * contentUrl, const char * contentDisplayStr,
-                                    Optional<ContentLauncher::Structs::BrandingInformation::Type> brandingInformation,
+                                    Optional<ContentLauncher::Structs::BrandingInformationStruct::Type> brandingInformation,
                                     std::function<void(CHIP_ERROR)> responseCallback)
 {
     ContentLauncher::Commands::LaunchURL::Type request;
@@ -32,7 +32,7 @@ CHIP_ERROR LaunchURLCommand::Invoke(const char * contentUrl, const char * conten
     return MediaCommandBase::Invoke(request, responseCallback);
 }
 
-CHIP_ERROR LaunchContentCommand::Invoke(ContentLauncher::Structs::ContentSearch::Type search, bool autoPlay,
+CHIP_ERROR LaunchContentCommand::Invoke(ContentLauncher::Structs::ContentSearchStruct::Type search, bool autoPlay,
                                         Optional<chip::CharSpan> data, std::function<void(CHIP_ERROR)> responseCallback)
 {
     ContentLauncher::Commands::LaunchContent::Type request;
diff --git a/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter b/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter
index c4481ea1626c1f..1b7a708078e1c3 100644
--- a/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter
+++ b/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter
@@ -1978,6 +1978,7 @@ client cluster ContentLauncher = 1290 {
     kSport = 10;
     kSportsTeam = 11;
     kType = 12;
+    kVideo = 13;
   }
 
   bitmap ContentLauncherFeature : BITMAP32 {
@@ -1990,37 +1991,37 @@ client cluster ContentLauncher = 1290 {
     kHls = 0x2;
   }
 
-  struct ContentSearch {
-    Parameter parameterList[] = 0;
+  struct ContentSearchStruct {
+    ParameterStruct parameterList[] = 0;
   }
 
-  struct Parameter {
+  struct ParameterStruct {
     ParameterEnum type = 0;
     char_string value = 1;
-    optional AdditionalInfo externalIDList[] = 2;
+    optional AdditionalInfoStruct externalIDList[] = 2;
   }
 
-  struct AdditionalInfo {
+  struct AdditionalInfoStruct {
     char_string name = 0;
     char_string value = 1;
   }
 
-  struct BrandingInformation {
+  struct BrandingInformationStruct {
     char_string providerName = 0;
-    optional StyleInformation background = 1;
-    optional StyleInformation logo = 2;
-    optional StyleInformation progressBar = 3;
-    optional StyleInformation splash = 4;
-    optional StyleInformation waterMark = 5;
+    optional StyleInformationStruct background = 1;
+    optional StyleInformationStruct logo = 2;
+    optional StyleInformationStruct progressBar = 3;
+    optional StyleInformationStruct splash = 4;
+    optional StyleInformationStruct waterMark = 5;
   }
 
-  struct StyleInformation {
-    optional char_string imageUrl = 0;
+  struct StyleInformationStruct {
+    optional char_string imageURL = 0;
     optional char_string color = 1;
-    optional Dimension size = 2;
+    optional DimensionStruct size = 2;
   }
 
-  struct Dimension {
+  struct DimensionStruct {
     double width = 0;
     double height = 1;
     MetricTypeEnum metric = 2;
@@ -2031,7 +2032,7 @@ client cluster ContentLauncher = 1290 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct LaunchContentRequest {
-    ContentSearch search = 0;
+    ContentSearchStruct search = 0;
     BOOLEAN autoPlay = 1;
     optional CHAR_STRING data = 2;
   }
@@ -2039,11 +2040,11 @@ client cluster ContentLauncher = 1290 {
   request struct LaunchURLRequest {
     CHAR_STRING contentURL = 0;
     optional CHAR_STRING displayString = 1;
-    optional BrandingInformation brandingInformation = 2;
+    optional BrandingInformationStruct brandingInformation = 2;
   }
 
-  command LaunchContent(LaunchContentRequest): LaunchResponse = 0;
-  command LaunchURL(LaunchURLRequest): LaunchResponse = 1;
+  command LaunchContent(LaunchContentRequest): LauncherResponse = 0;
+  command LaunchURL(LaunchURLRequest): LauncherResponse = 1;
 }
 
 client cluster AudioOutput = 1291 {
diff --git a/integrations/docker/images/chip-cert-bins/Dockerfile b/integrations/docker/images/chip-cert-bins/Dockerfile
index 3b14f6ce55195e..69c50a005ba191 100644
--- a/integrations/docker/images/chip-cert-bins/Dockerfile
+++ b/integrations/docker/images/chip-cert-bins/Dockerfile
@@ -7,7 +7,7 @@ ARG COMMITHASH=451e602649b8b37ba6c9aab8ba5e30747293f778
 # ZAP Development install, so that it runs on both x64 and arm64
 # Generally this should match with the ZAP version that is used for codegen within the
 # specified SHA
-ARG ZAP_VERSION=v2023.01.18-nightly
+ARG ZAP_VERSION=v2023.01.19-nightly
 
 # Ensure TARGETPLATFORM is set
 RUN case ${TARGETPLATFORM} in \
diff --git a/scripts/tools/zap/zap_execution.py b/scripts/tools/zap/zap_execution.py
index f313b033152009..3705970571fada 100644
--- a/scripts/tools/zap/zap_execution.py
+++ b/scripts/tools/zap/zap_execution.py
@@ -23,7 +23,7 @@
 # Use scripts/tools/zap/version_update.py to manage ZAP versioning as many
 # files may need updating for versions
 #
-MIN_ZAP_VERSION = '2023.1.18'
+MIN_ZAP_VERSION = '2023.1.19'
 
 
 class ZapTool:
diff --git a/src/app/clusters/content-launch-server/content-launch-delegate.h b/src/app/clusters/content-launch-server/content-launch-delegate.h
index 0c0f65d22675d7..d52e49fe168468 100644
--- a/src/app/clusters/content-launch-server/content-launch-delegate.h
+++ b/src/app/clusters/content-launch-server/content-launch-delegate.h
@@ -31,8 +31,8 @@ namespace app {
 namespace Clusters {
 namespace ContentLauncher {
 
-using BrandingInformation = chip::app::Clusters::ContentLauncher::Structs::BrandingInformation::Type;
-using Parameter           = chip::app::Clusters::ContentLauncher::Structs::Parameter::DecodableType;
+using BrandingInformation = chip::app::Clusters::ContentLauncher::Structs::BrandingInformationStruct::Type;
+using Parameter           = chip::app::Clusters::ContentLauncher::Structs::ParameterStruct::DecodableType;
 
 /** @brief
  *    Defines methods for implementing application-specific logic for the Content Launcher Cluster.
@@ -40,11 +40,11 @@ using Parameter           = chip::app::Clusters::ContentLauncher::Structs::Param
 class Delegate
 {
 public:
-    virtual void HandleLaunchContent(CommandResponseHelper<Commands::LaunchResponse::Type> & helper,
+    virtual void HandleLaunchContent(CommandResponseHelper<Commands::LauncherResponse::Type> & helper,
                                      const DataModel::DecodableList<Parameter> & parameterList, bool autoplay,
                                      const CharSpan & data) = 0;
 
-    virtual void HandleLaunchUrl(CommandResponseHelper<Commands::LaunchResponse::Type> & helper, const CharSpan & contentUrl,
+    virtual void HandleLaunchUrl(CommandResponseHelper<Commands::LauncherResponse::Type> & helper, const CharSpan & contentUrl,
                                  const CharSpan & displayString, const BrandingInformation & brandingInformation) = 0;
 
     virtual CHIP_ERROR HandleGetAcceptHeaderList(app::AttributeValueEncoder & aEncoder) = 0;
diff --git a/src/app/clusters/content-launch-server/content-launch-server.cpp b/src/app/clusters/content-launch-server/content-launch-server.cpp
index e22b91760370f5..e7f6ef6dbb8d34 100644
--- a/src/app/clusters/content-launch-server/content-launch-server.cpp
+++ b/src/app/clusters/content-launch-server/content-launch-server.cpp
@@ -201,7 +201,7 @@ bool emberAfContentLauncherClusterLaunchContentCallback(CommandHandler * command
     auto & data                   = commandData.data;
     auto & decodableParameterList = commandData.search.parameterList;
 
-    app::CommandResponseHelper<Commands::LaunchResponse::Type> responder(commandObj, commandPath);
+    app::CommandResponseHelper<Commands::LauncherResponse::Type> responder(commandObj, commandPath);
 
     Delegate * delegate = GetDelegate(endpoint);
 
@@ -236,7 +236,7 @@ bool emberAfContentLauncherClusterLaunchURLCallback(CommandHandler * commandObj,
     auto & displayString       = commandData.displayString;
     auto & brandingInformation = commandData.brandingInformation;
 
-    app::CommandResponseHelper<Commands::LaunchResponse::Type> responder(commandObj, commandPath);
+    app::CommandResponseHelper<Commands::LauncherResponse::Type> responder(commandObj, commandPath);
 
     Delegate * delegate = GetDelegate(endpoint);
     VerifyOrExit(isDelegateNull(delegate, endpoint) != true && delegate->HasFeature(endpoint, ContentLauncherFeature::kURLPlayback),
diff --git a/src/app/tests/suites/TV_ContentLauncherCluster.yaml b/src/app/tests/suites/TV_ContentLauncherCluster.yaml
index 2ad51257be0c2f..cf59366304175b 100644
--- a/src/app/tests/suites/TV_ContentLauncherCluster.yaml
+++ b/src/app/tests/suites/TV_ContentLauncherCluster.yaml
@@ -51,13 +51,13 @@ tests:
               - name: "search"
                 value:
                     {
-                        parameterList:
+                        ParameterList:
                             [
                                 {
-                                    type: 1,
-                                    value: "exampleValue",
-                                    externalIDList:
-                                        [{ name: "name", value: "value" }],
+                                    Type: 1,
+                                    Value: "exampleValue",
+                                    ExternalIDList:
+                                        [{ Name: "name", Value: "value" }],
                                 },
                             ],
                     }
@@ -79,36 +79,36 @@ tests:
               - name: "brandingInformation"
                 value:
                     {
-                        providerName: "exampleName",
-                        background:
+                        ProviderName: "exampleName",
+                        Background:
                             {
-                                imageUrl: "exampleUrl",
-                                color: "exampleColor",
-                                size: { width: 0, height: 0, metric: 0 },
+                                ImageURL: "exampleUrl",
+                                Color: "exampleColor",
+                                Size: { Width: 0, Height: 0, Metric: 0 },
                             },
-                        logo:
+                        Logo:
                             {
-                                imageUrl: "exampleUrl",
-                                color: "exampleColor",
-                                size: { width: 0, height: 0, metric: 0 },
+                                ImageURL: "exampleUrl",
+                                Color: "exampleColor",
+                                Size: { Width: 0, Height: 0, Metric: 0 },
                             },
-                        progressBar:
+                        ProgressBar:
                             {
-                                imageUrl: "exampleUrl",
-                                color: "exampleColor",
-                                size: { width: 0, height: 0, metric: 0 },
+                                ImageURL: "exampleUrl",
+                                Color: "exampleColor",
+                                Size: { Width: 0, Height: 0, Metric: 0 },
                             },
-                        splash:
+                        Splash:
                             {
-                                imageUrl: "exampleUrl",
-                                color: "exampleColor",
-                                size: { width: 0, height: 0, metric: 0 },
+                                ImageURL: "exampleUrl",
+                                Color: "exampleColor",
+                                Size: { Width: 0, Height: 0, Metric: 0 },
                             },
-                        waterMark:
+                        WaterMark:
                             {
-                                imageUrl: "exampleUrl",
-                                color: "exampleColor",
-                                size: { width: 0, height: 0, metric: 0 },
+                                ImageURL: "exampleUrl",
+                                Color: "exampleColor",
+                                Size: { Width: 0, Height: 0, Metric: 0 },
                             },
                     }
       response:
diff --git a/src/app/zap-templates/zcl/data-model/chip/content-launch-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/content-launch-cluster.xml
index b6462ade457644..c568bf9d79e652 100644
--- a/src/app/zap-templates/zcl/data-model/chip/content-launch-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/content-launch-cluster.xml
@@ -28,85 +28,86 @@ limitations under the License.
     <attribute side="server" code="0x0000" define="CONTENT_LAUNCHER_ACCEPT_HEADER"                 type="ARRAY" entryType="CHAR_STRING" length="254" writable="false" optional="true">AcceptHeader</attribute>
     <attribute side="server" code="0x0001" define="CONTENT_LAUNCHER_SUPPORTED_STREAMING_PROTOCOLS" type="BITMAP32" default="0"                       writable="true"  optional="true">SupportedStreamingProtocols</attribute>
 
-    <command source="client" code="0x00" name="LaunchContent" response="LaunchResponse" optional="true">
+    <command source="client" code="0x00" name="LaunchContent" response="LauncherResponse" optional="true">
       <description>Upon receipt, this SHALL launch the specified content with optional search criteria.</description>
-      <arg name="search" type="ContentSearch"/>
-      <arg name="autoPlay" type="BOOLEAN"/>
-      <arg name="data" type="CHAR_STRING" optional="true"/>
+      <arg name="Search" type="ContentSearchStruct"/>
+      <arg name="AutoPlay" type="BOOLEAN"/>
+      <arg name="Data" type="CHAR_STRING" optional="true"/>
     </command>
 
-    <command source="client" code="0x01" name="LaunchURL" response="LaunchResponse" optional="true">
+    <command source="client" code="0x01" name="LaunchURL" response="LauncherResponse" optional="true">
       <description>Upon receipt, this SHALL launch content from the specified URL.</description>
-      <arg name="contentURL" type="CHAR_STRING"/>
-      <arg name="displayString" type="CHAR_STRING" optional="true"/>
-      <arg name="brandingInformation" type="BrandingInformation" optional="true"/>
+      <arg name="ContentURL" type="CHAR_STRING"/>
+      <arg name="DisplayString" type="CHAR_STRING" optional="true"/>
+      <arg name="BrandingInformation" type="BrandingInformationStruct" optional="true"/>
     </command>
 
-    <command source="server" code="0x02" name="LaunchResponse" optional="true" disableDefaultResponse="true">
+    <command source="server" code="0x02" name="LauncherResponse" optional="true" disableDefaultResponse="true">
       <description>This command SHALL be generated in response to LaunchContent command.</description>
-      <arg name="status" type="ContentLaunchStatusEnum"/>
-      <arg name="data" type="CHAR_STRING" optional="true"/>
+      <arg name="Status" type="ContentLaunchStatusEnum"/>
+      <arg name="Data" type="CHAR_STRING" optional="true"/>
     </command>
 
   </cluster>
 
-  <struct name="ContentSearch">
+  <struct name="ContentSearchStruct">
     <cluster code="0x050a"/>
-    <item name="parameterList" type="Parameter" array="true" optional="false"/>
+    <item name="ParameterList" type="ParameterStruct" array="true" optional="false"/>
   </struct>
 
-  <struct name="AdditionalInfo">
+  <struct name="AdditionalInfoStruct">
     <cluster code="0x050a"/>
-    <item name="name" type="CHAR_STRING"/>
-    <item name="value" type="CHAR_STRING"/>
+    <item name="Name" type="CHAR_STRING"/>
+    <item name="Value" type="CHAR_STRING"/>
   </struct>
 
   <enum name="MetricTypeEnum" type="ENUM8">
     <cluster code="0x050a"/>
-    <item name="PIXELS" value="0x00"/>
-    <item name="PERCENTAGE" value="0x01"/>
+    <item name="Pixels" value="0x00"/>
+    <item name="Percentage" value="0x01"/>
   </enum>
 
-  <struct name="Dimension">
+  <struct name="DimensionStruct">
     <cluster code="0x050a"/>
-    <item name="width" type="double" optional="false"/>
-    <item name="height" type="double" optional="false"/>
-    <item name="metric" type="MetricTypeEnum"/>
+    <item name="Width" type="double" optional="false"/>
+    <item name="Height" type="double" optional="false"/>
+    <item name="Metric" type="MetricTypeEnum"/>
   </struct>
 
-  <struct name="StyleInformation">
+  <struct name="StyleInformationStruct">
     <cluster code="0x050a"/>
-    <item name="imageUrl" type="CHAR_STRING" optional="true"/>
-    <item name="color" type="CHAR_STRING" optional="true"/>
-    <item name="size" type="Dimension" optional="true"/>
+    <item name="ImageURL" type="CHAR_STRING" optional="true"/>
+    <item name="Color" type="CHAR_STRING" optional="true"/>
+    <item name="Size" type="DimensionStruct" optional="true"/>
   </struct>
 
-  <struct name="BrandingInformation">
+  <struct name="BrandingInformationStruct">
     <cluster code="0x050a"/>
-    <item name="providerName" type="CHAR_STRING"/>
-    <item name="background" type="StyleInformation" optional="true"/>
-    <item name="logo" type="StyleInformation" optional="true"/>
-    <item name="progressBar" type="StyleInformation" optional="true"/>
-    <item name="splash" type="StyleInformation" optional="true"/>
-    <item name="waterMark" type="StyleInformation" optional="true"/>
+    <item name="ProviderName" type="CHAR_STRING"/>
+    <item name="Background" type="StyleInformationStruct" optional="true"/>
+    <item name="Logo" type="StyleInformationStruct" optional="true"/>
+    <item name="ProgressBar" type="StyleInformationStruct" optional="true"/>
+    <item name="Splash" type="StyleInformationStruct" optional="true"/>
+    <item name="WaterMark" type="StyleInformationStruct" optional="true"/>
   </struct>
 
 
   <enum name="ParameterEnum" type="ENUM8">
     <cluster code="0x050a"/>
-    <item name="actor" value="0x00"/>
-    <item name="channel" value="0x01"/>
-    <item name="character" value="0x02"/>
-    <item name="director" value="0x03"/>
-    <item name="event" value="0x04"/>
-    <item name="franchise" value="0x05"/>
-    <item name="genre" value="0x06"/>
-    <item name="league" value="0x07"/>
-    <item name="popularity" value="0x08"/>
-    <item name="provider" value="0x09"/>
-    <item name="sport" value="0x0A"/>
-    <item name="sportsTeam" value="0x00B"/>
-    <item name="type" value="0x0C"/>
+    <item name="Actor" value="0x00"/>
+    <item name="Channel" value="0x01"/>
+    <item name="Character" value="0x02"/>
+    <item name="Director" value="0x03"/>
+    <item name="Event" value="0x04"/>
+    <item name="Franchise" value="0x05"/>
+    <item name="Genre" value="0x06"/>
+    <item name="League" value="0x07"/>
+    <item name="Popularity" value="0x08"/>
+    <item name="Provider" value="0x09"/>
+    <item name="Sport" value="0x0A"/>
+    <item name="SportsTeam" value="0x00B"/>
+    <item name="Type" value="0x0C"/>
+    <item name="Video" value="0x0D"/>
   </enum>
 
   <enum name="ContentLaunchStatusEnum" type="ENUM8">
@@ -116,11 +117,11 @@ limitations under the License.
     <item name="authFailed" value="0x02"/>
   </enum>
 
-  <struct name="Parameter">
+  <struct name="ParameterStruct">
     <cluster code="0x050a"/>
-    <item name="type" type="ParameterEnum"/>
-    <item name="value" type="CHAR_STRING"/>
-    <item name="externalIDList" type="AdditionalInfo" array="true" optional="true"/>
+    <item name="Type" type="ParameterEnum"/>
+    <item name="Value" type="CHAR_STRING"/>
+    <item name="ExternalIDList" type="AdditionalInfoStruct" array="true" optional="true"/>
   </struct>
 
   <bitmap name="SupportedStreamingProtocol" type="BITMAP32">
diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter
index b248975f7e54dd..e95c38b705a924 100644
--- a/src/controller/data_model/controller-clusters.matter
+++ b/src/controller/data_model/controller-clusters.matter
@@ -3881,6 +3881,7 @@ client cluster ContentLauncher = 1290 {
     kSport = 10;
     kSportsTeam = 11;
     kType = 12;
+    kVideo = 13;
   }
 
   bitmap ContentLauncherFeature : BITMAP32 {
@@ -3893,37 +3894,37 @@ client cluster ContentLauncher = 1290 {
     kHls = 0x2;
   }
 
-  struct ContentSearch {
-    Parameter parameterList[] = 0;
+  struct ContentSearchStruct {
+    ParameterStruct parameterList[] = 0;
   }
 
-  struct Parameter {
+  struct ParameterStruct {
     ParameterEnum type = 0;
     char_string value = 1;
-    optional AdditionalInfo externalIDList[] = 2;
+    optional AdditionalInfoStruct externalIDList[] = 2;
   }
 
-  struct AdditionalInfo {
+  struct AdditionalInfoStruct {
     char_string name = 0;
     char_string value = 1;
   }
 
-  struct BrandingInformation {
+  struct BrandingInformationStruct {
     char_string providerName = 0;
-    optional StyleInformation background = 1;
-    optional StyleInformation logo = 2;
-    optional StyleInformation progressBar = 3;
-    optional StyleInformation splash = 4;
-    optional StyleInformation waterMark = 5;
+    optional StyleInformationStruct background = 1;
+    optional StyleInformationStruct logo = 2;
+    optional StyleInformationStruct progressBar = 3;
+    optional StyleInformationStruct splash = 4;
+    optional StyleInformationStruct waterMark = 5;
   }
 
-  struct StyleInformation {
-    optional char_string imageUrl = 0;
+  struct StyleInformationStruct {
+    optional char_string imageURL = 0;
     optional char_string color = 1;
-    optional Dimension size = 2;
+    optional DimensionStruct size = 2;
   }
 
-  struct Dimension {
+  struct DimensionStruct {
     double width = 0;
     double height = 1;
     MetricTypeEnum metric = 2;
@@ -3938,7 +3939,7 @@ client cluster ContentLauncher = 1290 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct LaunchContentRequest {
-    ContentSearch search = 0;
+    ContentSearchStruct search = 0;
     BOOLEAN autoPlay = 1;
     optional CHAR_STRING data = 2;
   }
@@ -3946,16 +3947,16 @@ client cluster ContentLauncher = 1290 {
   request struct LaunchURLRequest {
     CHAR_STRING contentURL = 0;
     optional CHAR_STRING displayString = 1;
-    optional BrandingInformation brandingInformation = 2;
+    optional BrandingInformationStruct brandingInformation = 2;
   }
 
-  response struct LaunchResponse = 2 {
+  response struct LauncherResponse = 2 {
     ContentLaunchStatusEnum status = 0;
     optional CHAR_STRING data = 1;
   }
 
-  command LaunchContent(LaunchContentRequest): LaunchResponse = 0;
-  command LaunchURL(LaunchURLRequest): LaunchResponse = 1;
+  command LaunchContent(LaunchContentRequest): LauncherResponse = 0;
+  command LaunchURL(LaunchURLRequest): LauncherResponse = 1;
 }
 
 client cluster AudioOutput = 1291 {
diff --git a/src/controller/data_model/controller-clusters.zap b/src/controller/data_model/controller-clusters.zap
index e6f739d98fdab0..f338ccc7199788 100644
--- a/src/controller/data_model/controller-clusters.zap
+++ b/src/controller/data_model/controller-clusters.zap
@@ -16537,7 +16537,7 @@
           "enabled": 0,
           "commands": [
             {
-              "name": "LaunchResponse",
+              "name": "LauncherResponse",
               "code": 2,
               "mfgCode": null,
               "source": "server",
diff --git a/src/controller/java/templates/ClusterInfo-java.zapt b/src/controller/java/templates/ClusterInfo-java.zapt
index 9521aca1198481..e022c7ac9259af 100644
--- a/src/controller/java/templates/ClusterInfo-java.zapt
+++ b/src/controller/java/templates/ClusterInfo-java.zapt
@@ -201,7 +201,7 @@ public class ClusterInfoMapping {
   }
   {{#chip_client_clusters}}
   {{#chip_cluster_responses}}
-      public static class Delegated{{asUpperCamelCase name}}Callback implements ChipClusters.{{asUpperCamelCase ../name}}Cluster.{{asUpperCamelCase name}}Callback, DelegatedClusterCallback {
+      public static class Delegated{{asUpperCamelCase ../name}}Cluster{{asUpperCamelCase name}}Callback implements ChipClusters.{{asUpperCamelCase ../name}}Cluster.{{asUpperCamelCase name}}Callback, DelegatedClusterCallback {
         private ClusterCommandCallback callback;
         @Override
         public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -327,7 +327,7 @@ public class ClusterInfoMapping {
            {{#if mustUseTimedInvoke}}, 10000{{/if}}
            );
          },
-         () -> new Delegated{{asUpperCamelCase responseName}}Callback(),
+         () -> new Delegated{{asUpperCamelCase ../name}}Cluster{{asUpperCamelCase responseName}}Callback(),
            {{asLowerCamelCase ../name}}{{asLowerCamelCase name}}CommandParams
        );
      {{else}}
diff --git a/src/controller/java/zap-generated/CHIPCallbackTypes.h b/src/controller/java/zap-generated/CHIPCallbackTypes.h
index 324a990836c2fb..0e23f45e9e3ec4 100644
--- a/src/controller/java/zap-generated/CHIPCallbackTypes.h
+++ b/src/controller/java/zap-generated/CHIPCallbackTypes.h
@@ -1652,8 +1652,8 @@ typedef void (*CHIPKeypadInputClusterFeatureMapAttributeCallbackType)(
     void *, chip::app::Clusters::KeypadInput::Attributes::FeatureMap::TypeInfo::DecodableArgType);
 typedef void (*CHIPKeypadInputClusterClusterRevisionAttributeCallbackType)(
     void *, chip::app::Clusters::KeypadInput::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
-typedef void (*CHIPContentLauncherClusterLaunchResponseCallbackType)(
-    void *, const chip::app::Clusters::ContentLauncher::Commands::LaunchResponse::DecodableType &);
+typedef void (*CHIPContentLauncherClusterLauncherResponseCallbackType)(
+    void *, const chip::app::Clusters::ContentLauncher::Commands::LauncherResponse::DecodableType &);
 
 typedef void (*CHIPContentLauncherClusterAcceptHeaderAttributeCallbackType)(
     void *, const chip::app::Clusters::ContentLauncher::Attributes::AcceptHeader::TypeInfo::DecodableType &);
diff --git a/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp b/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp
index b069454b598fd1..c4e378729f17ee 100644
--- a/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp
+++ b/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp
@@ -3528,8 +3528,8 @@ void CHIPKeypadInputClusterSendKeyResponseCallback::CallbackFn(
 
     env->CallVoidMethod(javaCallbackRef, javaMethod, Status);
 }
-CHIPContentLauncherClusterLaunchResponseCallback::CHIPContentLauncherClusterLaunchResponseCallback(jobject javaCallback) :
-    Callback::Callback<CHIPContentLauncherClusterLaunchResponseCallbackType>(CallbackFn, this)
+CHIPContentLauncherClusterLauncherResponseCallback::CHIPContentLauncherClusterLauncherResponseCallback(jobject javaCallback) :
+    Callback::Callback<CHIPContentLauncherClusterLauncherResponseCallbackType>(CallbackFn, this)
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -3545,7 +3545,7 @@ CHIPContentLauncherClusterLaunchResponseCallback::CHIPContentLauncherClusterLaun
     }
 }
 
-CHIPContentLauncherClusterLaunchResponseCallback::~CHIPContentLauncherClusterLaunchResponseCallback()
+CHIPContentLauncherClusterLauncherResponseCallback::~CHIPContentLauncherClusterLauncherResponseCallback()
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -3556,8 +3556,8 @@ CHIPContentLauncherClusterLaunchResponseCallback::~CHIPContentLauncherClusterLau
     env->DeleteGlobalRef(javaCallbackRef);
 };
 
-void CHIPContentLauncherClusterLaunchResponseCallback::CallbackFn(
-    void * context, const chip::app::Clusters::ContentLauncher::Commands::LaunchResponse::DecodableType & dataResponse)
+void CHIPContentLauncherClusterLauncherResponseCallback::CallbackFn(
+    void * context, const chip::app::Clusters::ContentLauncher::Commands::LauncherResponse::DecodableType & dataResponse)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -3567,9 +3567,10 @@ void CHIPContentLauncherClusterLaunchResponseCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv"));
 
-    std::unique_ptr<CHIPContentLauncherClusterLaunchResponseCallback, void (*)(CHIPContentLauncherClusterLaunchResponseCallback *)>
-        cppCallback(reinterpret_cast<CHIPContentLauncherClusterLaunchResponseCallback *>(context),
-                    chip::Platform::Delete<CHIPContentLauncherClusterLaunchResponseCallback>);
+    std::unique_ptr<CHIPContentLauncherClusterLauncherResponseCallback,
+                    void (*)(CHIPContentLauncherClusterLauncherResponseCallback *)>
+        cppCallback(reinterpret_cast<CHIPContentLauncherClusterLauncherResponseCallback *>(context),
+                    chip::Platform::Delete<CHIPContentLauncherClusterLauncherResponseCallback>);
     VerifyOrReturn(cppCallback != nullptr, ChipLogError(Zcl, "Error invoking Java callback: failed to cast native callback"));
 
     javaCallbackRef = cppCallback->javaCallbackRef;
@@ -3580,25 +3581,25 @@ void CHIPContentLauncherClusterLaunchResponseCallback::CallbackFn(
                                                   &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err)));
 
-    jobject status;
-    std::string statusClassName     = "java/lang/Integer";
-    std::string statusCtorSignature = "(I)V";
-    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(statusClassName.c_str(), statusCtorSignature.c_str(),
-                                                                  static_cast<uint8_t>(dataResponse.status), status);
-    jobject data;
+    jobject Status;
+    std::string StatusClassName     = "java/lang/Integer";
+    std::string StatusCtorSignature = "(I)V";
+    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(StatusClassName.c_str(), StatusCtorSignature.c_str(),
+                                                                  static_cast<uint8_t>(dataResponse.status), Status);
+    jobject Data;
     if (!dataResponse.data.HasValue())
     {
-        chip::JniReferences::GetInstance().CreateOptional(nullptr, data);
+        chip::JniReferences::GetInstance().CreateOptional(nullptr, Data);
     }
     else
     {
-        jobject dataInsideOptional;
-        dataInsideOptional =
+        jobject DataInsideOptional;
+        DataInsideOptional =
             env->NewStringUTF(std::string(dataResponse.data.Value().data(), dataResponse.data.Value().size()).c_str());
-        chip::JniReferences::GetInstance().CreateOptional(dataInsideOptional, data);
+        chip::JniReferences::GetInstance().CreateOptional(DataInsideOptional, Data);
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, status, data);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, Status, Data);
 }
 CHIPApplicationLauncherClusterLauncherResponseCallback::CHIPApplicationLauncherClusterLauncherResponseCallback(
     jobject javaCallback) :
diff --git a/src/controller/java/zap-generated/CHIPInvokeCallbacks.h b/src/controller/java/zap-generated/CHIPInvokeCallbacks.h
index 4605d5f20dbb1f..c2afb210443d7b 100644
--- a/src/controller/java/zap-generated/CHIPInvokeCallbacks.h
+++ b/src/controller/java/zap-generated/CHIPInvokeCallbacks.h
@@ -552,16 +552,16 @@ class CHIPKeypadInputClusterSendKeyResponseCallback : public Callback::Callback<
     jobject javaCallbackRef;
 };
 
-class CHIPContentLauncherClusterLaunchResponseCallback
-    : public Callback::Callback<CHIPContentLauncherClusterLaunchResponseCallbackType>
+class CHIPContentLauncherClusterLauncherResponseCallback
+    : public Callback::Callback<CHIPContentLauncherClusterLauncherResponseCallbackType>
 {
 public:
-    CHIPContentLauncherClusterLaunchResponseCallback(jobject javaCallback);
+    CHIPContentLauncherClusterLauncherResponseCallback(jobject javaCallback);
 
-    ~CHIPContentLauncherClusterLaunchResponseCallback();
+    ~CHIPContentLauncherClusterLauncherResponseCallback();
 
     static void CallbackFn(void * context,
-                           const chip::app::Clusters::ContentLauncher::Commands::LaunchResponse::DecodableType & data);
+                           const chip::app::Clusters::ContentLauncher::Commands::LauncherResponse::DecodableType & data);
 
 private:
     jobject javaCallbackRef;
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java
index 32555b323e8246..ec7c9833299c84 100644
--- a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java
+++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java
@@ -20584,16 +20584,16 @@ public ContentLauncherCluster(long devicePtr, int endpointId) {
     public native long initWithDevice(long devicePtr, int endpointId);
 
     public void launchContent(
-        LaunchResponseCallback callback,
-        ChipStructs.ContentLauncherClusterContentSearch search,
+        LauncherResponseCallback callback,
+        ChipStructs.ContentLauncherClusterContentSearchStruct search,
         Boolean autoPlay,
         Optional<String> data) {
       launchContent(chipClusterPtr, callback, search, autoPlay, data, null);
     }
 
     public void launchContent(
-        LaunchResponseCallback callback,
-        ChipStructs.ContentLauncherClusterContentSearch search,
+        LauncherResponseCallback callback,
+        ChipStructs.ContentLauncherClusterContentSearchStruct search,
         Boolean autoPlay,
         Optional<String> data,
         int timedInvokeTimeoutMs) {
@@ -20601,18 +20601,18 @@ public void launchContent(
     }
 
     public void launchURL(
-        LaunchResponseCallback callback,
+        LauncherResponseCallback callback,
         String contentURL,
         Optional<String> displayString,
-        Optional<ChipStructs.ContentLauncherClusterBrandingInformation> brandingInformation) {
+        Optional<ChipStructs.ContentLauncherClusterBrandingInformationStruct> brandingInformation) {
       launchURL(chipClusterPtr, callback, contentURL, displayString, brandingInformation, null);
     }
 
     public void launchURL(
-        LaunchResponseCallback callback,
+        LauncherResponseCallback callback,
         String contentURL,
         Optional<String> displayString,
-        Optional<ChipStructs.ContentLauncherClusterBrandingInformation> brandingInformation,
+        Optional<ChipStructs.ContentLauncherClusterBrandingInformationStruct> brandingInformation,
         int timedInvokeTimeoutMs) {
       launchURL(
           chipClusterPtr,
@@ -20625,21 +20625,21 @@ public void launchURL(
 
     private native void launchContent(
         long chipClusterPtr,
-        LaunchResponseCallback Callback,
-        ChipStructs.ContentLauncherClusterContentSearch search,
+        LauncherResponseCallback Callback,
+        ChipStructs.ContentLauncherClusterContentSearchStruct search,
         Boolean autoPlay,
         Optional<String> data,
         @Nullable Integer timedInvokeTimeoutMs);
 
     private native void launchURL(
         long chipClusterPtr,
-        LaunchResponseCallback Callback,
+        LauncherResponseCallback Callback,
         String contentURL,
         Optional<String> displayString,
-        Optional<ChipStructs.ContentLauncherClusterBrandingInformation> brandingInformation,
+        Optional<ChipStructs.ContentLauncherClusterBrandingInformationStruct> brandingInformation,
         @Nullable Integer timedInvokeTimeoutMs);
 
-    public interface LaunchResponseCallback {
+    public interface LauncherResponseCallback {
       void onSuccess(Integer status, Optional<String> data);
 
       void onError(Exception error);
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java
index ed78ef268319bd..9325e2240ce0b0 100644
--- a/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java
+++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java
@@ -1537,12 +1537,12 @@ public String toString() {
     }
   }
 
-  public static class ContentLauncherClusterDimension {
+  public static class ContentLauncherClusterDimensionStruct {
     public Double width;
     public Double height;
     public Integer metric;
 
-    public ContentLauncherClusterDimension(Double width, Double height, Integer metric) {
+    public ContentLauncherClusterDimensionStruct(Double width, Double height, Integer metric) {
       this.width = width;
       this.height = height;
       this.metric = metric;
@@ -1551,7 +1551,7 @@ public ContentLauncherClusterDimension(Double width, Double height, Integer metr
     @Override
     public String toString() {
       StringBuilder output = new StringBuilder();
-      output.append("ContentLauncherClusterDimension {\n");
+      output.append("ContentLauncherClusterDimensionStruct {\n");
       output.append("\twidth: ");
       output.append(width);
       output.append("\n");
@@ -1566,11 +1566,11 @@ public String toString() {
     }
   }
 
-  public static class ContentLauncherClusterAdditionalInfo {
+  public static class ContentLauncherClusterAdditionalInfoStruct {
     public String name;
     public String value;
 
-    public ContentLauncherClusterAdditionalInfo(String name, String value) {
+    public ContentLauncherClusterAdditionalInfoStruct(String name, String value) {
       this.name = name;
       this.value = value;
     }
@@ -1578,7 +1578,7 @@ public ContentLauncherClusterAdditionalInfo(String name, String value) {
     @Override
     public String toString() {
       StringBuilder output = new StringBuilder();
-      output.append("ContentLauncherClusterAdditionalInfo {\n");
+      output.append("ContentLauncherClusterAdditionalInfoStruct {\n");
       output.append("\tname: ");
       output.append(name);
       output.append("\n");
@@ -1590,15 +1590,17 @@ public String toString() {
     }
   }
 
-  public static class ContentLauncherClusterParameter {
+  public static class ContentLauncherClusterParameterStruct {
     public Integer type;
     public String value;
-    public Optional<ArrayList<ChipStructs.ContentLauncherClusterAdditionalInfo>> externalIDList;
+    public Optional<ArrayList<ChipStructs.ContentLauncherClusterAdditionalInfoStruct>>
+        externalIDList;
 
-    public ContentLauncherClusterParameter(
+    public ContentLauncherClusterParameterStruct(
         Integer type,
         String value,
-        Optional<ArrayList<ChipStructs.ContentLauncherClusterAdditionalInfo>> externalIDList) {
+        Optional<ArrayList<ChipStructs.ContentLauncherClusterAdditionalInfoStruct>>
+            externalIDList) {
       this.type = type;
       this.value = value;
       this.externalIDList = externalIDList;
@@ -1607,7 +1609,7 @@ public ContentLauncherClusterParameter(
     @Override
     public String toString() {
       StringBuilder output = new StringBuilder();
-      output.append("ContentLauncherClusterParameter {\n");
+      output.append("ContentLauncherClusterParameterStruct {\n");
       output.append("\ttype: ");
       output.append(type);
       output.append("\n");
@@ -1622,18 +1624,18 @@ public String toString() {
     }
   }
 
-  public static class ContentLauncherClusterContentSearch {
-    public ArrayList<ChipStructs.ContentLauncherClusterParameter> parameterList;
+  public static class ContentLauncherClusterContentSearchStruct {
+    public ArrayList<ChipStructs.ContentLauncherClusterParameterStruct> parameterList;
 
-    public ContentLauncherClusterContentSearch(
-        ArrayList<ChipStructs.ContentLauncherClusterParameter> parameterList) {
+    public ContentLauncherClusterContentSearchStruct(
+        ArrayList<ChipStructs.ContentLauncherClusterParameterStruct> parameterList) {
       this.parameterList = parameterList;
     }
 
     @Override
     public String toString() {
       StringBuilder output = new StringBuilder();
-      output.append("ContentLauncherClusterContentSearch {\n");
+      output.append("ContentLauncherClusterContentSearchStruct {\n");
       output.append("\tparameterList: ");
       output.append(parameterList);
       output.append("\n");
@@ -1642,16 +1644,16 @@ public String toString() {
     }
   }
 
-  public static class ContentLauncherClusterStyleInformation {
-    public Optional<String> imageUrl;
+  public static class ContentLauncherClusterStyleInformationStruct {
+    public Optional<String> imageURL;
     public Optional<String> color;
-    public Optional<ChipStructs.ContentLauncherClusterDimension> size;
+    public Optional<ChipStructs.ContentLauncherClusterDimensionStruct> size;
 
-    public ContentLauncherClusterStyleInformation(
-        Optional<String> imageUrl,
+    public ContentLauncherClusterStyleInformationStruct(
+        Optional<String> imageURL,
         Optional<String> color,
-        Optional<ChipStructs.ContentLauncherClusterDimension> size) {
-      this.imageUrl = imageUrl;
+        Optional<ChipStructs.ContentLauncherClusterDimensionStruct> size) {
+      this.imageURL = imageURL;
       this.color = color;
       this.size = size;
     }
@@ -1659,9 +1661,9 @@ public ContentLauncherClusterStyleInformation(
     @Override
     public String toString() {
       StringBuilder output = new StringBuilder();
-      output.append("ContentLauncherClusterStyleInformation {\n");
-      output.append("\timageUrl: ");
-      output.append(imageUrl);
+      output.append("ContentLauncherClusterStyleInformationStruct {\n");
+      output.append("\timageURL: ");
+      output.append(imageURL);
       output.append("\n");
       output.append("\tcolor: ");
       output.append(color);
@@ -1674,21 +1676,21 @@ public String toString() {
     }
   }
 
-  public static class ContentLauncherClusterBrandingInformation {
+  public static class ContentLauncherClusterBrandingInformationStruct {
     public String providerName;
-    public Optional<ChipStructs.ContentLauncherClusterStyleInformation> background;
-    public Optional<ChipStructs.ContentLauncherClusterStyleInformation> logo;
-    public Optional<ChipStructs.ContentLauncherClusterStyleInformation> progressBar;
-    public Optional<ChipStructs.ContentLauncherClusterStyleInformation> splash;
-    public Optional<ChipStructs.ContentLauncherClusterStyleInformation> waterMark;
+    public Optional<ChipStructs.ContentLauncherClusterStyleInformationStruct> background;
+    public Optional<ChipStructs.ContentLauncherClusterStyleInformationStruct> logo;
+    public Optional<ChipStructs.ContentLauncherClusterStyleInformationStruct> progressBar;
+    public Optional<ChipStructs.ContentLauncherClusterStyleInformationStruct> splash;
+    public Optional<ChipStructs.ContentLauncherClusterStyleInformationStruct> waterMark;
 
-    public ContentLauncherClusterBrandingInformation(
+    public ContentLauncherClusterBrandingInformationStruct(
         String providerName,
-        Optional<ChipStructs.ContentLauncherClusterStyleInformation> background,
-        Optional<ChipStructs.ContentLauncherClusterStyleInformation> logo,
-        Optional<ChipStructs.ContentLauncherClusterStyleInformation> progressBar,
-        Optional<ChipStructs.ContentLauncherClusterStyleInformation> splash,
-        Optional<ChipStructs.ContentLauncherClusterStyleInformation> waterMark) {
+        Optional<ChipStructs.ContentLauncherClusterStyleInformationStruct> background,
+        Optional<ChipStructs.ContentLauncherClusterStyleInformationStruct> logo,
+        Optional<ChipStructs.ContentLauncherClusterStyleInformationStruct> progressBar,
+        Optional<ChipStructs.ContentLauncherClusterStyleInformationStruct> splash,
+        Optional<ChipStructs.ContentLauncherClusterStyleInformationStruct> waterMark) {
       this.providerName = providerName;
       this.background = background;
       this.logo = logo;
@@ -1700,7 +1702,7 @@ public ContentLauncherClusterBrandingInformation(
     @Override
     public String toString() {
       StringBuilder output = new StringBuilder();
-      output.append("ContentLauncherClusterBrandingInformation {\n");
+      output.append("ContentLauncherClusterBrandingInformationStruct {\n");
       output.append("\tproviderName: ");
       output.append(providerName);
       output.append("\n");
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
index ab4f8ca3bd87f4..126eb19c10fa80 100644
--- a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
+++ b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
@@ -294,7 +294,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedAddGroupResponseCallback
+  public static class DelegatedGroupsClusterAddGroupResponseCallback
       implements ChipClusters.GroupsCluster.AddGroupResponseCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -319,7 +319,7 @@ public void onError(Exception error) {
     }
   }
 
-  public static class DelegatedViewGroupResponseCallback
+  public static class DelegatedGroupsClusterViewGroupResponseCallback
       implements ChipClusters.GroupsCluster.ViewGroupResponseCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -346,7 +346,7 @@ public void onError(Exception error) {
     }
   }
 
-  public static class DelegatedGetGroupMembershipResponseCallback
+  public static class DelegatedGroupsClusterGetGroupMembershipResponseCallback
       implements ChipClusters.GroupsCluster.GetGroupMembershipResponseCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
@@ -372,7 +372,7 @@ public void onError(Exception error) {
     }
   }
 
-  public static class DelegatedRemoveGroupResponseCallback
+  public static class DelegatedGroupsClusterRemoveGroupResponseCallback
       implements ChipClusters.GroupsCluster.RemoveGroupResponseCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -469,7 +469,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedAddSceneResponseCallback
+  public static class DelegatedScenesClusterAddSceneResponseCallback
       implements ChipClusters.ScenesCluster.AddSceneResponseCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -496,7 +496,7 @@ public void onError(Exception error) {
     }
   }
 
-  public static class DelegatedViewSceneResponseCallback
+  public static class DelegatedScenesClusterViewSceneResponseCallback
       implements ChipClusters.ScenesCluster.ViewSceneResponseCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -537,7 +537,7 @@ public void onError(Exception error) {
     }
   }
 
-  public static class DelegatedRemoveSceneResponseCallback
+  public static class DelegatedScenesClusterRemoveSceneResponseCallback
       implements ChipClusters.ScenesCluster.RemoveSceneResponseCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -564,7 +564,7 @@ public void onError(Exception error) {
     }
   }
 
-  public static class DelegatedRemoveAllScenesResponseCallback
+  public static class DelegatedScenesClusterRemoveAllScenesResponseCallback
       implements ChipClusters.ScenesCluster.RemoveAllScenesResponseCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
@@ -590,7 +590,7 @@ public void onError(Exception error) {
     }
   }
 
-  public static class DelegatedStoreSceneResponseCallback
+  public static class DelegatedScenesClusterStoreSceneResponseCallback
       implements ChipClusters.ScenesCluster.StoreSceneResponseCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -617,7 +617,7 @@ public void onError(Exception error) {
     }
   }
 
-  public static class DelegatedGetSceneMembershipResponseCallback
+  public static class DelegatedScenesClusterGetSceneMembershipResponseCallback
       implements ChipClusters.ScenesCluster.GetSceneMembershipResponseCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
@@ -1597,7 +1597,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedQueryImageResponseCallback
+  public static class DelegatedOtaSoftwareUpdateProviderClusterQueryImageResponseCallback
       implements ChipClusters.OtaSoftwareUpdateProviderCluster.QueryImageResponseCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
@@ -1650,7 +1650,7 @@ public void onError(Exception error) {
     }
   }
 
-  public static class DelegatedApplyUpdateResponseCallback
+  public static class DelegatedOtaSoftwareUpdateProviderClusterApplyUpdateResponseCallback
       implements ChipClusters.OtaSoftwareUpdateProviderCluster.ApplyUpdateResponseCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
@@ -2168,7 +2168,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedArmFailSafeResponseCallback
+  public static class DelegatedGeneralCommissioningClusterArmFailSafeResponseCallback
       implements ChipClusters.GeneralCommissioningCluster.ArmFailSafeResponseCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
@@ -2194,7 +2194,7 @@ public void onError(Exception error) {
     }
   }
 
-  public static class DelegatedSetRegulatoryConfigResponseCallback
+  public static class DelegatedGeneralCommissioningClusterSetRegulatoryConfigResponseCallback
       implements ChipClusters.GeneralCommissioningCluster.SetRegulatoryConfigResponseCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
@@ -2220,7 +2220,7 @@ public void onError(Exception error) {
     }
   }
 
-  public static class DelegatedCommissioningCompleteResponseCallback
+  public static class DelegatedGeneralCommissioningClusterCommissioningCompleteResponseCallback
       implements ChipClusters.GeneralCommissioningCluster.CommissioningCompleteResponseCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
@@ -2318,7 +2318,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedScanNetworksResponseCallback
+  public static class DelegatedNetworkCommissioningClusterScanNetworksResponseCallback
       implements ChipClusters.NetworkCommissioningCluster.ScanNetworksResponseCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
@@ -2356,7 +2356,7 @@ public void onError(Exception error) {
     }
   }
 
-  public static class DelegatedNetworkConfigResponseCallback
+  public static class DelegatedNetworkCommissioningClusterNetworkConfigResponseCallback
       implements ChipClusters.NetworkCommissioningCluster.NetworkConfigResponseCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
@@ -2388,7 +2388,7 @@ public void onError(Exception error) {
     }
   }
 
-  public static class DelegatedConnectNetworkResponseCallback
+  public static class DelegatedNetworkCommissioningClusterConnectNetworkResponseCallback
       implements ChipClusters.NetworkCommissioningCluster.ConnectNetworkResponseCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
@@ -2493,7 +2493,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedRetrieveLogsResponseCallback
+  public static class DelegatedDiagnosticLogsClusterRetrieveLogsResponseCallback
       implements ChipClusters.DiagnosticLogsCluster.RetrieveLogsResponseCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
@@ -3392,7 +3392,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedAttestationResponseCallback
+  public static class DelegatedOperationalCredentialsClusterAttestationResponseCallback
       implements ChipClusters.OperationalCredentialsCluster.AttestationResponseCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
@@ -3420,7 +3420,7 @@ public void onError(Exception error) {
     }
   }
 
-  public static class DelegatedCertificateChainResponseCallback
+  public static class DelegatedOperationalCredentialsClusterCertificateChainResponseCallback
       implements ChipClusters.OperationalCredentialsCluster.CertificateChainResponseCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
@@ -3445,7 +3445,7 @@ public void onError(Exception error) {
     }
   }
 
-  public static class DelegatedCSRResponseCallback
+  public static class DelegatedOperationalCredentialsClusterCSRResponseCallback
       implements ChipClusters.OperationalCredentialsCluster.CSRResponseCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
@@ -3473,7 +3473,7 @@ public void onError(Exception error) {
     }
   }
 
-  public static class DelegatedNOCResponseCallback
+  public static class DelegatedOperationalCredentialsClusterNOCResponseCallback
       implements ChipClusters.OperationalCredentialsCluster.NOCResponseCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
@@ -3656,7 +3656,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedKeySetReadResponseCallback
+  public static class DelegatedGroupKeyManagementClusterKeySetReadResponseCallback
       implements ChipClusters.GroupKeyManagementCluster.KeySetReadResponseCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
@@ -3680,7 +3680,7 @@ public void onError(Exception error) {
     }
   }
 
-  public static class DelegatedKeySetReadAllIndicesResponseCallback
+  public static class DelegatedGroupKeyManagementClusterKeySetReadAllIndicesResponseCallback
       implements ChipClusters.GroupKeyManagementCluster.KeySetReadAllIndicesResponseCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
@@ -4168,7 +4168,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedGetWeekDayScheduleResponseCallback
+  public static class DelegatedDoorLockClusterGetWeekDayScheduleResponseCallback
       implements ChipClusters.DoorLockCluster.GetWeekDayScheduleResponseCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
@@ -4220,7 +4220,7 @@ public void onError(Exception error) {
     }
   }
 
-  public static class DelegatedGetYearDayScheduleResponseCallback
+  public static class DelegatedDoorLockClusterGetYearDayScheduleResponseCallback
       implements ChipClusters.DoorLockCluster.GetYearDayScheduleResponseCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
@@ -4260,7 +4260,7 @@ public void onError(Exception error) {
     }
   }
 
-  public static class DelegatedGetHolidayScheduleResponseCallback
+  public static class DelegatedDoorLockClusterGetHolidayScheduleResponseCallback
       implements ChipClusters.DoorLockCluster.GetHolidayScheduleResponseCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
@@ -4301,7 +4301,7 @@ public void onError(Exception error) {
     }
   }
 
-  public static class DelegatedGetUserResponseCallback
+  public static class DelegatedDoorLockClusterGetUserResponseCallback
       implements ChipClusters.DoorLockCluster.GetUserResponseCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -4358,7 +4358,7 @@ public void onError(Exception error) {
     }
   }
 
-  public static class DelegatedSetCredentialResponseCallback
+  public static class DelegatedDoorLockClusterSetCredentialResponseCallback
       implements ChipClusters.DoorLockCluster.SetCredentialResponseCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
@@ -4388,7 +4388,7 @@ public void onError(Exception error) {
     }
   }
 
-  public static class DelegatedGetCredentialStatusResponseCallback
+  public static class DelegatedDoorLockClusterGetCredentialStatusResponseCallback
       implements ChipClusters.DoorLockCluster.GetCredentialStatusResponseCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
@@ -4721,7 +4721,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedGetWeeklyScheduleResponseCallback
+  public static class DelegatedThermostatClusterGetWeeklyScheduleResponseCallback
       implements ChipClusters.ThermostatCluster.GetWeeklyScheduleResponseCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
@@ -5489,7 +5489,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedChangeChannelResponseCallback
+  public static class DelegatedChannelClusterChangeChannelResponseCallback
       implements ChipClusters.ChannelCluster.ChangeChannelResponseCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
@@ -5612,7 +5612,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedNavigateTargetResponseCallback
+  public static class DelegatedTargetNavigatorClusterNavigateTargetResponseCallback
       implements ChipClusters.TargetNavigatorCluster.NavigateTargetResponseCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
@@ -5736,7 +5736,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedPlaybackResponseCallback
+  public static class DelegatedMediaPlaybackClusterPlaybackResponseCallback
       implements ChipClusters.MediaPlaybackCluster.PlaybackResponseCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
@@ -6004,7 +6004,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedSendKeyResponseCallback
+  public static class DelegatedKeypadInputClusterSendKeyResponseCallback
       implements ChipClusters.KeypadInputCluster.SendKeyResponseCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -6099,8 +6099,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedLaunchResponseCallback
-      implements ChipClusters.ContentLauncherCluster.LaunchResponseCallback,
+  public static class DelegatedContentLauncherClusterLauncherResponseCallback
+      implements ChipClusters.ContentLauncherCluster.LauncherResponseCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -6110,12 +6110,12 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(Integer status, Optional<String> data) {
+    public void onSuccess(Integer Status, Optional<String> Data) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "Integer");
-      responseValues.put(statusResponseValue, status);
-      CommandResponseInfo dataResponseValue = new CommandResponseInfo("data", "Optional<String>");
-      responseValues.put(dataResponseValue, data);
+      CommandResponseInfo StatusResponseValue = new CommandResponseInfo("Status", "Integer");
+      responseValues.put(StatusResponseValue, Status);
+      CommandResponseInfo DataResponseValue = new CommandResponseInfo("Data", "Optional<String>");
+      responseValues.put(DataResponseValue, Data);
       callback.onSuccess(responseValues);
     }
 
@@ -6320,7 +6320,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedLauncherResponseCallback
+  public static class DelegatedApplicationLauncherClusterLauncherResponseCallback
       implements ChipClusters.ApplicationLauncherCluster.LauncherResponseCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
@@ -6540,7 +6540,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedGetSetupPINResponseCallback
+  public static class DelegatedAccountLoginClusterGetSetupPINResponseCallback
       implements ChipClusters.AccountLoginCluster.GetSetupPINResponseCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
@@ -6807,7 +6807,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedTestSpecificResponseCallback
+  public static class DelegatedUnitTestingClusterTestSpecificResponseCallback
       implements ChipClusters.UnitTestingCluster.TestSpecificResponseCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
@@ -6832,7 +6832,7 @@ public void onError(Exception error) {
     }
   }
 
-  public static class DelegatedTestAddArgumentsResponseCallback
+  public static class DelegatedUnitTestingClusterTestAddArgumentsResponseCallback
       implements ChipClusters.UnitTestingCluster.TestAddArgumentsResponseCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
@@ -6857,7 +6857,7 @@ public void onError(Exception error) {
     }
   }
 
-  public static class DelegatedTestListInt8UReverseResponseCallback
+  public static class DelegatedUnitTestingClusterTestListInt8UReverseResponseCallback
       implements ChipClusters.UnitTestingCluster.TestListInt8UReverseResponseCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
@@ -6881,7 +6881,7 @@ public void onError(Exception error) {
     }
   }
 
-  public static class DelegatedTestEnumsResponseCallback
+  public static class DelegatedUnitTestingClusterTestEnumsResponseCallback
       implements ChipClusters.UnitTestingCluster.TestEnumsResponseCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
@@ -6907,7 +6907,7 @@ public void onError(Exception error) {
     }
   }
 
-  public static class DelegatedTestNullableOptionalResponseCallback
+  public static class DelegatedUnitTestingClusterTestNullableOptionalResponseCallback
       implements ChipClusters.UnitTestingCluster.TestNullableOptionalResponseCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
@@ -6945,7 +6945,7 @@ public void onError(Exception error) {
     }
   }
 
-  public static class DelegatedBooleanResponseCallback
+  public static class DelegatedUnitTestingClusterBooleanResponseCallback
       implements ChipClusters.UnitTestingCluster.BooleanResponseCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
@@ -6968,7 +6968,7 @@ public void onError(Exception error) {
     }
   }
 
-  public static class DelegatedSimpleStructResponseCallback
+  public static class DelegatedUnitTestingClusterSimpleStructResponseCallback
       implements ChipClusters.UnitTestingCluster.SimpleStructResponseCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
@@ -6992,7 +6992,7 @@ public void onError(Exception error) {
     }
   }
 
-  public static class DelegatedTestEmitTestEventResponseCallback
+  public static class DelegatedUnitTestingClusterTestEmitTestEventResponseCallback
       implements ChipClusters.UnitTestingCluster.TestEmitTestEventResponseCallback,
           DelegatedClusterCallback {
     private ClusterCommandCallback callback;
@@ -7752,7 +7752,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
                       (Integer) commandArguments.get("groupID"),
                       (String) commandArguments.get("groupName"));
             },
-            () -> new DelegatedAddGroupResponseCallback(),
+            () -> new DelegatedGroupsClusterAddGroupResponseCallback(),
             groupsaddGroupCommandParams);
     groupsClusterInteractionInfoMap.put("addGroup", groupsaddGroupInteractionInfo);
     Map<String, CommandParameterInfo> groupsviewGroupCommandParams =
@@ -7769,7 +7769,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
                       (ChipClusters.GroupsCluster.ViewGroupResponseCallback) callback,
                       (Integer) commandArguments.get("groupID"));
             },
-            () -> new DelegatedViewGroupResponseCallback(),
+            () -> new DelegatedGroupsClusterViewGroupResponseCallback(),
             groupsviewGroupCommandParams);
     groupsClusterInteractionInfoMap.put("viewGroup", groupsviewGroupInteractionInfo);
     Map<String, CommandParameterInfo> groupsgetGroupMembershipCommandParams =
@@ -7787,7 +7787,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
                       (ChipClusters.GroupsCluster.GetGroupMembershipResponseCallback) callback,
                       (ArrayList<Integer>) commandArguments.get("groupList"));
             },
-            () -> new DelegatedGetGroupMembershipResponseCallback(),
+            () -> new DelegatedGroupsClusterGetGroupMembershipResponseCallback(),
             groupsgetGroupMembershipCommandParams);
     groupsClusterInteractionInfoMap.put(
         "getGroupMembership", groupsgetGroupMembershipInteractionInfo);
@@ -7805,7 +7805,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
                       (ChipClusters.GroupsCluster.RemoveGroupResponseCallback) callback,
                       (Integer) commandArguments.get("groupID"));
             },
-            () -> new DelegatedRemoveGroupResponseCallback(),
+            () -> new DelegatedGroupsClusterRemoveGroupResponseCallback(),
             groupsremoveGroupCommandParams);
     groupsClusterInteractionInfoMap.put("removeGroup", groupsremoveGroupInteractionInfo);
     Map<String, CommandParameterInfo> groupsremoveAllGroupsCommandParams =
@@ -7878,7 +7878,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
                       (ArrayList<ChipStructs.ScenesClusterExtensionFieldSet>)
                           commandArguments.get("extensionFieldSets"));
             },
-            () -> new DelegatedAddSceneResponseCallback(),
+            () -> new DelegatedScenesClusterAddSceneResponseCallback(),
             scenesaddSceneCommandParams);
     scenesClusterInteractionInfoMap.put("addScene", scenesaddSceneInteractionInfo);
     Map<String, CommandParameterInfo> scenesviewSceneCommandParams =
@@ -7900,7 +7900,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
                       (Integer) commandArguments.get("groupId"),
                       (Integer) commandArguments.get("sceneId"));
             },
-            () -> new DelegatedViewSceneResponseCallback(),
+            () -> new DelegatedScenesClusterViewSceneResponseCallback(),
             scenesviewSceneCommandParams);
     scenesClusterInteractionInfoMap.put("viewScene", scenesviewSceneInteractionInfo);
     Map<String, CommandParameterInfo> scenesremoveSceneCommandParams =
@@ -7922,7 +7922,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
                       (Integer) commandArguments.get("groupId"),
                       (Integer) commandArguments.get("sceneId"));
             },
-            () -> new DelegatedRemoveSceneResponseCallback(),
+            () -> new DelegatedScenesClusterRemoveSceneResponseCallback(),
             scenesremoveSceneCommandParams);
     scenesClusterInteractionInfoMap.put("removeScene", scenesremoveSceneInteractionInfo);
     Map<String, CommandParameterInfo> scenesremoveAllScenesCommandParams =
@@ -7940,7 +7940,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
                       (ChipClusters.ScenesCluster.RemoveAllScenesResponseCallback) callback,
                       (Integer) commandArguments.get("groupId"));
             },
-            () -> new DelegatedRemoveAllScenesResponseCallback(),
+            () -> new DelegatedScenesClusterRemoveAllScenesResponseCallback(),
             scenesremoveAllScenesCommandParams);
     scenesClusterInteractionInfoMap.put("removeAllScenes", scenesremoveAllScenesInteractionInfo);
     Map<String, CommandParameterInfo> scenesstoreSceneCommandParams =
@@ -7962,7 +7962,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
                       (Integer) commandArguments.get("groupId"),
                       (Integer) commandArguments.get("sceneId"));
             },
-            () -> new DelegatedStoreSceneResponseCallback(),
+            () -> new DelegatedScenesClusterStoreSceneResponseCallback(),
             scenesstoreSceneCommandParams);
     scenesClusterInteractionInfoMap.put("storeScene", scenesstoreSceneInteractionInfo);
     Map<String, CommandParameterInfo> scenesrecallSceneCommandParams =
@@ -8008,7 +8008,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
                       (ChipClusters.ScenesCluster.GetSceneMembershipResponseCallback) callback,
                       (Integer) commandArguments.get("groupId"));
             },
-            () -> new DelegatedGetSceneMembershipResponseCallback(),
+            () -> new DelegatedScenesClusterGetSceneMembershipResponseCallback(),
             scenesgetSceneMembershipCommandParams);
     scenesClusterInteractionInfoMap.put(
         "getSceneMembership", scenesgetSceneMembershipInteractionInfo);
@@ -8786,7 +8786,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
                       (Optional<Boolean>) commandArguments.get("requestorCanConsent"),
                       (Optional<byte[]>) commandArguments.get("metadataForProvider"));
             },
-            () -> new DelegatedQueryImageResponseCallback(),
+            () -> new DelegatedOtaSoftwareUpdateProviderClusterQueryImageResponseCallback(),
             otaSoftwareUpdateProviderqueryImageCommandParams);
     otaSoftwareUpdateProviderClusterInteractionInfoMap.put(
         "queryImage", otaSoftwareUpdateProviderqueryImageInteractionInfo);
@@ -8813,7 +8813,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
                       (byte[]) commandArguments.get("updateToken"),
                       (Long) commandArguments.get("newVersion"));
             },
-            () -> new DelegatedApplyUpdateResponseCallback(),
+            () -> new DelegatedOtaSoftwareUpdateProviderClusterApplyUpdateResponseCallback(),
             otaSoftwareUpdateProviderapplyUpdateRequestCommandParams);
     otaSoftwareUpdateProviderClusterInteractionInfoMap.put(
         "applyUpdateRequest", otaSoftwareUpdateProviderapplyUpdateRequestInteractionInfo);
@@ -8937,7 +8937,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
                       (Integer) commandArguments.get("expiryLengthSeconds"),
                       (Long) commandArguments.get("breadcrumb"));
             },
-            () -> new DelegatedArmFailSafeResponseCallback(),
+            () -> new DelegatedGeneralCommissioningClusterArmFailSafeResponseCallback(),
             generalCommissioningarmFailSafeCommandParams);
     generalCommissioningClusterInteractionInfoMap.put(
         "armFailSafe", generalCommissioningarmFailSafeInteractionInfo);
@@ -8971,7 +8971,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
                       (String) commandArguments.get("countryCode"),
                       (Long) commandArguments.get("breadcrumb"));
             },
-            () -> new DelegatedSetRegulatoryConfigResponseCallback(),
+            () -> new DelegatedGeneralCommissioningClusterSetRegulatoryConfigResponseCallback(),
             generalCommissioningsetRegulatoryConfigCommandParams);
     generalCommissioningClusterInteractionInfoMap.put(
         "setRegulatoryConfig", generalCommissioningsetRegulatoryConfigInteractionInfo);
@@ -8986,7 +8986,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
                               .CommissioningCompleteResponseCallback)
                           callback);
             },
-            () -> new DelegatedCommissioningCompleteResponseCallback(),
+            () -> new DelegatedGeneralCommissioningClusterCommissioningCompleteResponseCallback(),
             generalCommissioningcommissioningCompleteCommandParams);
     generalCommissioningClusterInteractionInfoMap.put(
         "commissioningComplete", generalCommissioningcommissioningCompleteInteractionInfo);
@@ -9015,7 +9015,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
                       (Optional<byte[]>) commandArguments.get("ssid"),
                       (Optional<Long>) commandArguments.get("breadcrumb"));
             },
-            () -> new DelegatedScanNetworksResponseCallback(),
+            () -> new DelegatedNetworkCommissioningClusterScanNetworksResponseCallback(),
             networkCommissioningscanNetworksCommandParams);
     networkCommissioningClusterInteractionInfoMap.put(
         "scanNetworks", networkCommissioningscanNetworksInteractionInfo);
@@ -9047,7 +9047,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
                       (byte[]) commandArguments.get("credentials"),
                       (Optional<Long>) commandArguments.get("breadcrumb"));
             },
-            () -> new DelegatedNetworkConfigResponseCallback(),
+            () -> new DelegatedNetworkCommissioningClusterNetworkConfigResponseCallback(),
             networkCommissioningaddOrUpdateWiFiNetworkCommandParams);
     networkCommissioningClusterInteractionInfoMap.put(
         "addOrUpdateWiFiNetwork", networkCommissioningaddOrUpdateWiFiNetworkInteractionInfo);
@@ -9076,7 +9076,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
                       (byte[]) commandArguments.get("operationalDataset"),
                       (Optional<Long>) commandArguments.get("breadcrumb"));
             },
-            () -> new DelegatedNetworkConfigResponseCallback(),
+            () -> new DelegatedNetworkCommissioningClusterNetworkConfigResponseCallback(),
             networkCommissioningaddOrUpdateThreadNetworkCommandParams);
     networkCommissioningClusterInteractionInfoMap.put(
         "addOrUpdateThreadNetwork", networkCommissioningaddOrUpdateThreadNetworkInteractionInfo);
@@ -9102,7 +9102,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
                       (byte[]) commandArguments.get("networkID"),
                       (Optional<Long>) commandArguments.get("breadcrumb"));
             },
-            () -> new DelegatedNetworkConfigResponseCallback(),
+            () -> new DelegatedNetworkCommissioningClusterNetworkConfigResponseCallback(),
             networkCommissioningremoveNetworkCommandParams);
     networkCommissioningClusterInteractionInfoMap.put(
         "removeNetwork", networkCommissioningremoveNetworkInteractionInfo);
@@ -9128,7 +9128,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
                       (byte[]) commandArguments.get("networkID"),
                       (Optional<Long>) commandArguments.get("breadcrumb"));
             },
-            () -> new DelegatedConnectNetworkResponseCallback(),
+            () -> new DelegatedNetworkCommissioningClusterConnectNetworkResponseCallback(),
             networkCommissioningconnectNetworkCommandParams);
     networkCommissioningClusterInteractionInfoMap.put(
         "connectNetwork", networkCommissioningconnectNetworkInteractionInfo);
@@ -9160,7 +9160,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
                       (Integer) commandArguments.get("networkIndex"),
                       (Optional<Long>) commandArguments.get("breadcrumb"));
             },
-            () -> new DelegatedNetworkConfigResponseCallback(),
+            () -> new DelegatedNetworkCommissioningClusterNetworkConfigResponseCallback(),
             networkCommissioningreorderNetworkCommandParams);
     networkCommissioningClusterInteractionInfoMap.put(
         "reorderNetwork", networkCommissioningreorderNetworkInteractionInfo);
@@ -9196,7 +9196,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
                       (Integer) commandArguments.get("requestedProtocol"),
                       (byte[]) commandArguments.get("transferFileDesignator"));
             },
-            () -> new DelegatedRetrieveLogsResponseCallback(),
+            () -> new DelegatedDiagnosticLogsClusterRetrieveLogsResponseCallback(),
             diagnosticLogsretrieveLogsRequestCommandParams);
     diagnosticLogsClusterInteractionInfoMap.put(
         "retrieveLogsRequest", diagnosticLogsretrieveLogsRequestInteractionInfo);
@@ -9410,7 +9410,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
                           callback,
                       (byte[]) commandArguments.get("attestationNonce"));
             },
-            () -> new DelegatedAttestationResponseCallback(),
+            () -> new DelegatedOperationalCredentialsClusterAttestationResponseCallback(),
             operationalCredentialsattestationRequestCommandParams);
     operationalCredentialsClusterInteractionInfoMap.put(
         "attestationRequest", operationalCredentialsattestationRequestInteractionInfo);
@@ -9432,7 +9432,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
                           callback,
                       (Integer) commandArguments.get("certificateType"));
             },
-            () -> new DelegatedCertificateChainResponseCallback(),
+            () -> new DelegatedOperationalCredentialsClusterCertificateChainResponseCallback(),
             operationalCredentialscertificateChainRequestCommandParams);
     operationalCredentialsClusterInteractionInfoMap.put(
         "certificateChainRequest", operationalCredentialscertificateChainRequestInteractionInfo);
@@ -9457,7 +9457,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
                       (byte[]) commandArguments.get("CSRNonce"),
                       (Optional<Boolean>) commandArguments.get("isForUpdateNOC"));
             },
-            () -> new DelegatedCSRResponseCallback(),
+            () -> new DelegatedOperationalCredentialsClusterCSRResponseCallback(),
             operationalCredentialsCSRRequestCommandParams);
     operationalCredentialsClusterInteractionInfoMap.put(
         "CSRRequest", operationalCredentialsCSRRequestInteractionInfo);
@@ -9500,7 +9500,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
                       (Long) commandArguments.get("caseAdminSubject"),
                       (Integer) commandArguments.get("adminVendorId"));
             },
-            () -> new DelegatedNOCResponseCallback(),
+            () -> new DelegatedOperationalCredentialsClusterNOCResponseCallback(),
             operationalCredentialsaddNOCCommandParams);
     operationalCredentialsClusterInteractionInfoMap.put(
         "addNOC", operationalCredentialsaddNOCInteractionInfo);
@@ -9525,7 +9525,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
                       (byte[]) commandArguments.get("NOCValue"),
                       (Optional<byte[]>) commandArguments.get("ICACValue"));
             },
-            () -> new DelegatedNOCResponseCallback(),
+            () -> new DelegatedOperationalCredentialsClusterNOCResponseCallback(),
             operationalCredentialsupdateNOCCommandParams);
     operationalCredentialsClusterInteractionInfoMap.put(
         "updateNOC", operationalCredentialsupdateNOCInteractionInfo);
@@ -9544,7 +9544,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
                       (ChipClusters.OperationalCredentialsCluster.NOCResponseCallback) callback,
                       (String) commandArguments.get("label"));
             },
-            () -> new DelegatedNOCResponseCallback(),
+            () -> new DelegatedOperationalCredentialsClusterNOCResponseCallback(),
             operationalCredentialsupdateFabricLabelCommandParams);
     operationalCredentialsClusterInteractionInfoMap.put(
         "updateFabricLabel", operationalCredentialsupdateFabricLabelInteractionInfo);
@@ -9563,7 +9563,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
                       (ChipClusters.OperationalCredentialsCluster.NOCResponseCallback) callback,
                       (Integer) commandArguments.get("fabricIndex"));
             },
-            () -> new DelegatedNOCResponseCallback(),
+            () -> new DelegatedOperationalCredentialsClusterNOCResponseCallback(),
             operationalCredentialsremoveFabricCommandParams);
     operationalCredentialsClusterInteractionInfoMap.put(
         "removeFabric", operationalCredentialsremoveFabricInteractionInfo);
@@ -9622,7 +9622,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
                       (ChipClusters.GroupKeyManagementCluster.KeySetReadResponseCallback) callback,
                       (Integer) commandArguments.get("groupKeySetID"));
             },
-            () -> new DelegatedKeySetReadResponseCallback(),
+            () -> new DelegatedGroupKeyManagementClusterKeySetReadResponseCallback(),
             groupKeyManagementkeySetReadCommandParams);
     groupKeyManagementClusterInteractionInfoMap.put(
         "keySetRead", groupKeyManagementkeySetReadInteractionInfo);
@@ -9661,7 +9661,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
                           callback,
                       (ArrayList<Integer>) commandArguments.get("groupKeySetIDs"));
             },
-            () -> new DelegatedKeySetReadAllIndicesResponseCallback(),
+            () -> new DelegatedGroupKeyManagementClusterKeySetReadAllIndicesResponseCallback(),
             groupKeyManagementkeySetReadAllIndicesCommandParams);
     groupKeyManagementClusterInteractionInfoMap.put(
         "keySetReadAllIndices", groupKeyManagementkeySetReadAllIndicesInteractionInfo);
@@ -9830,7 +9830,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
                       (Integer) commandArguments.get("weekDayIndex"),
                       (Integer) commandArguments.get("userIndex"));
             },
-            () -> new DelegatedGetWeekDayScheduleResponseCallback(),
+            () -> new DelegatedDoorLockClusterGetWeekDayScheduleResponseCallback(),
             doorLockgetWeekDayScheduleCommandParams);
     doorLockClusterInteractionInfoMap.put(
         "getWeekDaySchedule", doorLockgetWeekDayScheduleInteractionInfo);
@@ -9917,7 +9917,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
                       (Integer) commandArguments.get("yearDayIndex"),
                       (Integer) commandArguments.get("userIndex"));
             },
-            () -> new DelegatedGetYearDayScheduleResponseCallback(),
+            () -> new DelegatedDoorLockClusterGetYearDayScheduleResponseCallback(),
             doorLockgetYearDayScheduleCommandParams);
     doorLockClusterInteractionInfoMap.put(
         "getYearDaySchedule", doorLockgetYearDayScheduleInteractionInfo);
@@ -9998,7 +9998,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
                       (ChipClusters.DoorLockCluster.GetHolidayScheduleResponseCallback) callback,
                       (Integer) commandArguments.get("holidayIndex"));
             },
-            () -> new DelegatedGetHolidayScheduleResponseCallback(),
+            () -> new DelegatedDoorLockClusterGetHolidayScheduleResponseCallback(),
             doorLockgetHolidayScheduleCommandParams);
     doorLockClusterInteractionInfoMap.put(
         "getHolidaySchedule", doorLockgetHolidayScheduleInteractionInfo);
@@ -10086,7 +10086,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
                       (ChipClusters.DoorLockCluster.GetUserResponseCallback) callback,
                       (Integer) commandArguments.get("userIndex"));
             },
-            () -> new DelegatedGetUserResponseCallback(),
+            () -> new DelegatedDoorLockClusterGetUserResponseCallback(),
             doorLockgetUserCommandParams);
     doorLockClusterInteractionInfoMap.put("getUser", doorLockgetUserInteractionInfo);
     Map<String, CommandParameterInfo> doorLockclearUserCommandParams =
@@ -10149,7 +10149,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
                       (Integer) commandArguments.get("userType"),
                       10000);
             },
-            () -> new DelegatedSetCredentialResponseCallback(),
+            () -> new DelegatedDoorLockClusterSetCredentialResponseCallback(),
             doorLocksetCredentialCommandParams);
     doorLockClusterInteractionInfoMap.put("setCredential", doorLocksetCredentialInteractionInfo);
     Map<String, CommandParameterInfo> doorLockgetCredentialStatusCommandParams =
@@ -10163,7 +10163,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
                       (ChipStructs.DoorLockClusterCredentialStruct)
                           commandArguments.get("credential"));
             },
-            () -> new DelegatedGetCredentialStatusResponseCallback(),
+            () -> new DelegatedDoorLockClusterGetCredentialStatusResponseCallback(),
             doorLockgetCredentialStatusCommandParams);
     doorLockClusterInteractionInfoMap.put(
         "getCredentialStatus", doorLockgetCredentialStatusInteractionInfo);
@@ -10422,7 +10422,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
                       (Integer) commandArguments.get("daysToReturn"),
                       (Integer) commandArguments.get("modeToReturn"));
             },
-            () -> new DelegatedGetWeeklyScheduleResponseCallback(),
+            () -> new DelegatedThermostatClusterGetWeeklyScheduleResponseCallback(),
             thermostatgetWeeklyScheduleCommandParams);
     thermostatClusterInteractionInfoMap.put(
         "getWeeklySchedule", thermostatgetWeeklyScheduleInteractionInfo);
@@ -11282,7 +11282,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
                       (ChipClusters.ChannelCluster.ChangeChannelResponseCallback) callback,
                       (String) commandArguments.get("match"));
             },
-            () -> new DelegatedChangeChannelResponseCallback(),
+            () -> new DelegatedChannelClusterChangeChannelResponseCallback(),
             channelchangeChannelCommandParams);
     channelClusterInteractionInfoMap.put("changeChannel", channelchangeChannelInteractionInfo);
     Map<String, CommandParameterInfo> channelchangeChannelByNumberCommandParams =
@@ -11349,7 +11349,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
                       (Integer) commandArguments.get("target"),
                       (Optional<String>) commandArguments.get("data"));
             },
-            () -> new DelegatedNavigateTargetResponseCallback(),
+            () -> new DelegatedTargetNavigatorClusterNavigateTargetResponseCallback(),
             targetNavigatornavigateTargetCommandParams);
     targetNavigatorClusterInteractionInfoMap.put(
         "navigateTarget", targetNavigatornavigateTargetInteractionInfo);
@@ -11363,7 +11363,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
               ((ChipClusters.MediaPlaybackCluster) cluster)
                   .play((ChipClusters.MediaPlaybackCluster.PlaybackResponseCallback) callback);
             },
-            () -> new DelegatedPlaybackResponseCallback(),
+            () -> new DelegatedMediaPlaybackClusterPlaybackResponseCallback(),
             mediaPlaybackplayCommandParams);
     mediaPlaybackClusterInteractionInfoMap.put("play", mediaPlaybackplayInteractionInfo);
     Map<String, CommandParameterInfo> mediaPlaybackpauseCommandParams =
@@ -11374,7 +11374,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
               ((ChipClusters.MediaPlaybackCluster) cluster)
                   .pause((ChipClusters.MediaPlaybackCluster.PlaybackResponseCallback) callback);
             },
-            () -> new DelegatedPlaybackResponseCallback(),
+            () -> new DelegatedMediaPlaybackClusterPlaybackResponseCallback(),
             mediaPlaybackpauseCommandParams);
     mediaPlaybackClusterInteractionInfoMap.put("pause", mediaPlaybackpauseInteractionInfo);
     Map<String, CommandParameterInfo> mediaPlaybackstopPlaybackCommandParams =
@@ -11386,7 +11386,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
                   .stopPlayback(
                       (ChipClusters.MediaPlaybackCluster.PlaybackResponseCallback) callback);
             },
-            () -> new DelegatedPlaybackResponseCallback(),
+            () -> new DelegatedMediaPlaybackClusterPlaybackResponseCallback(),
             mediaPlaybackstopPlaybackCommandParams);
     mediaPlaybackClusterInteractionInfoMap.put(
         "stopPlayback", mediaPlaybackstopPlaybackInteractionInfo);
@@ -11398,7 +11398,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
               ((ChipClusters.MediaPlaybackCluster) cluster)
                   .startOver((ChipClusters.MediaPlaybackCluster.PlaybackResponseCallback) callback);
             },
-            () -> new DelegatedPlaybackResponseCallback(),
+            () -> new DelegatedMediaPlaybackClusterPlaybackResponseCallback(),
             mediaPlaybackstartOverCommandParams);
     mediaPlaybackClusterInteractionInfoMap.put("startOver", mediaPlaybackstartOverInteractionInfo);
     Map<String, CommandParameterInfo> mediaPlaybackpreviousCommandParams =
@@ -11409,7 +11409,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
               ((ChipClusters.MediaPlaybackCluster) cluster)
                   .previous((ChipClusters.MediaPlaybackCluster.PlaybackResponseCallback) callback);
             },
-            () -> new DelegatedPlaybackResponseCallback(),
+            () -> new DelegatedMediaPlaybackClusterPlaybackResponseCallback(),
             mediaPlaybackpreviousCommandParams);
     mediaPlaybackClusterInteractionInfoMap.put("previous", mediaPlaybackpreviousInteractionInfo);
     Map<String, CommandParameterInfo> mediaPlaybacknextCommandParams =
@@ -11420,7 +11420,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
               ((ChipClusters.MediaPlaybackCluster) cluster)
                   .next((ChipClusters.MediaPlaybackCluster.PlaybackResponseCallback) callback);
             },
-            () -> new DelegatedPlaybackResponseCallback(),
+            () -> new DelegatedMediaPlaybackClusterPlaybackResponseCallback(),
             mediaPlaybacknextCommandParams);
     mediaPlaybackClusterInteractionInfoMap.put("next", mediaPlaybacknextInteractionInfo);
     Map<String, CommandParameterInfo> mediaPlaybackrewindCommandParams =
@@ -11431,7 +11431,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
               ((ChipClusters.MediaPlaybackCluster) cluster)
                   .rewind((ChipClusters.MediaPlaybackCluster.PlaybackResponseCallback) callback);
             },
-            () -> new DelegatedPlaybackResponseCallback(),
+            () -> new DelegatedMediaPlaybackClusterPlaybackResponseCallback(),
             mediaPlaybackrewindCommandParams);
     mediaPlaybackClusterInteractionInfoMap.put("rewind", mediaPlaybackrewindInteractionInfo);
     Map<String, CommandParameterInfo> mediaPlaybackfastForwardCommandParams =
@@ -11443,7 +11443,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
                   .fastForward(
                       (ChipClusters.MediaPlaybackCluster.PlaybackResponseCallback) callback);
             },
-            () -> new DelegatedPlaybackResponseCallback(),
+            () -> new DelegatedMediaPlaybackClusterPlaybackResponseCallback(),
             mediaPlaybackfastForwardCommandParams);
     mediaPlaybackClusterInteractionInfoMap.put(
         "fastForward", mediaPlaybackfastForwardInteractionInfo);
@@ -11463,7 +11463,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
                       (ChipClusters.MediaPlaybackCluster.PlaybackResponseCallback) callback,
                       (Long) commandArguments.get("deltaPositionMilliseconds"));
             },
-            () -> new DelegatedPlaybackResponseCallback(),
+            () -> new DelegatedMediaPlaybackClusterPlaybackResponseCallback(),
             mediaPlaybackskipForwardCommandParams);
     mediaPlaybackClusterInteractionInfoMap.put(
         "skipForward", mediaPlaybackskipForwardInteractionInfo);
@@ -11483,7 +11483,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
                       (ChipClusters.MediaPlaybackCluster.PlaybackResponseCallback) callback,
                       (Long) commandArguments.get("deltaPositionMilliseconds"));
             },
-            () -> new DelegatedPlaybackResponseCallback(),
+            () -> new DelegatedMediaPlaybackClusterPlaybackResponseCallback(),
             mediaPlaybackskipBackwardCommandParams);
     mediaPlaybackClusterInteractionInfoMap.put(
         "skipBackward", mediaPlaybackskipBackwardInteractionInfo);
@@ -11501,7 +11501,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
                       (ChipClusters.MediaPlaybackCluster.PlaybackResponseCallback) callback,
                       (Long) commandArguments.get("position"));
             },
-            () -> new DelegatedPlaybackResponseCallback(),
+            () -> new DelegatedMediaPlaybackClusterPlaybackResponseCallback(),
             mediaPlaybackseekCommandParams);
     mediaPlaybackClusterInteractionInfoMap.put("seek", mediaPlaybackseekInteractionInfo);
     commandMap.put("mediaPlayback", mediaPlaybackClusterInteractionInfoMap);
@@ -11596,7 +11596,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
                       (ChipClusters.KeypadInputCluster.SendKeyResponseCallback) callback,
                       (Integer) commandArguments.get("keyCode"));
             },
-            () -> new DelegatedSendKeyResponseCallback(),
+            () -> new DelegatedKeypadInputClusterSendKeyResponseCallback(),
             keypadInputsendKeyCommandParams);
     keypadInputClusterInteractionInfoMap.put("sendKey", keypadInputsendKeyInteractionInfo);
     commandMap.put("keypadInput", keypadInputClusterInteractionInfoMap);
@@ -11618,13 +11618,13 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
             (cluster, callback, commandArguments) -> {
               ((ChipClusters.ContentLauncherCluster) cluster)
                   .launchContent(
-                      (ChipClusters.ContentLauncherCluster.LaunchResponseCallback) callback,
-                      (ChipStructs.ContentLauncherClusterContentSearch)
+                      (ChipClusters.ContentLauncherCluster.LauncherResponseCallback) callback,
+                      (ChipStructs.ContentLauncherClusterContentSearchStruct)
                           commandArguments.get("search"),
                       (Boolean) commandArguments.get("autoPlay"),
                       (Optional<String>) commandArguments.get("data"));
             },
-            () -> new DelegatedLaunchResponseCallback(),
+            () -> new DelegatedContentLauncherClusterLauncherResponseCallback(),
             contentLauncherlaunchContentCommandParams);
     contentLauncherClusterInteractionInfoMap.put(
         "launchContent", contentLauncherlaunchContentInteractionInfo);
@@ -11645,13 +11645,13 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
             (cluster, callback, commandArguments) -> {
               ((ChipClusters.ContentLauncherCluster) cluster)
                   .launchURL(
-                      (ChipClusters.ContentLauncherCluster.LaunchResponseCallback) callback,
+                      (ChipClusters.ContentLauncherCluster.LauncherResponseCallback) callback,
                       (String) commandArguments.get("contentURL"),
                       (Optional<String>) commandArguments.get("displayString"),
-                      (Optional<ChipStructs.ContentLauncherClusterBrandingInformation>)
+                      (Optional<ChipStructs.ContentLauncherClusterBrandingInformationStruct>)
                           commandArguments.get("brandingInformation"));
             },
-            () -> new DelegatedLaunchResponseCallback(),
+            () -> new DelegatedContentLauncherClusterLauncherResponseCallback(),
             contentLauncherlaunchURLCommandParams);
     contentLauncherClusterInteractionInfoMap.put(
         "launchURL", contentLauncherlaunchURLInteractionInfo);
@@ -11720,7 +11720,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
                           commandArguments.get("application"),
                       (Optional<byte[]>) commandArguments.get("data"));
             },
-            () -> new DelegatedLauncherResponseCallback(),
+            () -> new DelegatedApplicationLauncherClusterLauncherResponseCallback(),
             applicationLauncherlaunchAppCommandParams);
     applicationLauncherClusterInteractionInfoMap.put(
         "launchApp", applicationLauncherlaunchAppInteractionInfo);
@@ -11735,7 +11735,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
                       (ChipStructs.ApplicationLauncherClusterApplication)
                           commandArguments.get("application"));
             },
-            () -> new DelegatedLauncherResponseCallback(),
+            () -> new DelegatedApplicationLauncherClusterLauncherResponseCallback(),
             applicationLauncherstopAppCommandParams);
     applicationLauncherClusterInteractionInfoMap.put(
         "stopApp", applicationLauncherstopAppInteractionInfo);
@@ -11750,7 +11750,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
                       (ChipStructs.ApplicationLauncherClusterApplication)
                           commandArguments.get("application"));
             },
-            () -> new DelegatedLauncherResponseCallback(),
+            () -> new DelegatedApplicationLauncherClusterLauncherResponseCallback(),
             applicationLauncherhideAppCommandParams);
     applicationLauncherClusterInteractionInfoMap.put(
         "hideApp", applicationLauncherhideAppInteractionInfo);
@@ -11774,7 +11774,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
                       (String) commandArguments.get("tempAccountIdentifier"),
                       10000);
             },
-            () -> new DelegatedGetSetupPINResponseCallback(),
+            () -> new DelegatedAccountLoginClusterGetSetupPINResponseCallback(),
             accountLogingetSetupPINCommandParams);
     accountLoginClusterInteractionInfoMap.put(
         "getSetupPIN", accountLogingetSetupPINInteractionInfo);
@@ -11902,7 +11902,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
                   .testSpecific(
                       (ChipClusters.UnitTestingCluster.TestSpecificResponseCallback) callback);
             },
-            () -> new DelegatedTestSpecificResponseCallback(),
+            () -> new DelegatedUnitTestingClusterTestSpecificResponseCallback(),
             unitTestingtestSpecificCommandParams);
     unitTestingClusterInteractionInfoMap.put(
         "testSpecific", unitTestingtestSpecificInteractionInfo);
@@ -11939,7 +11939,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
                       (Integer) commandArguments.get("arg1"),
                       (Integer) commandArguments.get("arg2"));
             },
-            () -> new DelegatedTestAddArgumentsResponseCallback(),
+            () -> new DelegatedUnitTestingClusterTestAddArgumentsResponseCallback(),
             unitTestingtestAddArgumentsCommandParams);
     unitTestingClusterInteractionInfoMap.put(
         "testAddArguments", unitTestingtestAddArgumentsInteractionInfo);
@@ -11953,7 +11953,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
                       (ChipClusters.UnitTestingCluster.BooleanResponseCallback) callback,
                       (ChipStructs.UnitTestingClusterSimpleStruct) commandArguments.get("arg1"));
             },
-            () -> new DelegatedBooleanResponseCallback(),
+            () -> new DelegatedUnitTestingClusterBooleanResponseCallback(),
             unitTestingtestStructArgumentRequestCommandParams);
     unitTestingClusterInteractionInfoMap.put(
         "testStructArgumentRequest", unitTestingtestStructArgumentRequestInteractionInfo);
@@ -11967,7 +11967,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
                       (ChipClusters.UnitTestingCluster.BooleanResponseCallback) callback,
                       (ChipStructs.UnitTestingClusterNestedStruct) commandArguments.get("arg1"));
             },
-            () -> new DelegatedBooleanResponseCallback(),
+            () -> new DelegatedUnitTestingClusterBooleanResponseCallback(),
             unitTestingtestNestedStructArgumentRequestCommandParams);
     unitTestingClusterInteractionInfoMap.put(
         "testNestedStructArgumentRequest",
@@ -11983,7 +11983,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
                       (ArrayList<ChipStructs.UnitTestingClusterSimpleStruct>)
                           commandArguments.get("arg1"));
             },
-            () -> new DelegatedBooleanResponseCallback(),
+            () -> new DelegatedUnitTestingClusterBooleanResponseCallback(),
             unitTestingtestListStructArgumentRequestCommandParams);
     unitTestingClusterInteractionInfoMap.put(
         "testListStructArgumentRequest", unitTestingtestListStructArgumentRequestInteractionInfo);
@@ -12002,7 +12002,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
                       (ChipClusters.UnitTestingCluster.BooleanResponseCallback) callback,
                       (ArrayList<Integer>) commandArguments.get("arg1"));
             },
-            () -> new DelegatedBooleanResponseCallback(),
+            () -> new DelegatedUnitTestingClusterBooleanResponseCallback(),
             unitTestingtestListInt8UArgumentRequestCommandParams);
     unitTestingClusterInteractionInfoMap.put(
         "testListInt8UArgumentRequest", unitTestingtestListInt8UArgumentRequestInteractionInfo);
@@ -12017,7 +12017,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
                       (ChipStructs.UnitTestingClusterNestedStructList)
                           commandArguments.get("arg1"));
             },
-            () -> new DelegatedBooleanResponseCallback(),
+            () -> new DelegatedUnitTestingClusterBooleanResponseCallback(),
             unitTestingtestNestedStructListArgumentRequestCommandParams);
     unitTestingClusterInteractionInfoMap.put(
         "testNestedStructListArgumentRequest",
@@ -12034,7 +12034,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
                       (ArrayList<ChipStructs.UnitTestingClusterNestedStructList>)
                           commandArguments.get("arg1"));
             },
-            () -> new DelegatedBooleanResponseCallback(),
+            () -> new DelegatedUnitTestingClusterBooleanResponseCallback(),
             unitTestingtestListNestedStructListArgumentRequestCommandParams);
     unitTestingClusterInteractionInfoMap.put(
         "testListNestedStructListArgumentRequest",
@@ -12055,7 +12055,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
                           callback,
                       (ArrayList<Integer>) commandArguments.get("arg1"));
             },
-            () -> new DelegatedTestListInt8UReverseResponseCallback(),
+            () -> new DelegatedUnitTestingClusterTestListInt8UReverseResponseCallback(),
             unitTestingtestListInt8UReverseRequestCommandParams);
     unitTestingClusterInteractionInfoMap.put(
         "testListInt8UReverseRequest", unitTestingtestListInt8UReverseRequestInteractionInfo);
@@ -12080,7 +12080,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
                       (Integer) commandArguments.get("arg1"),
                       (Integer) commandArguments.get("arg2"));
             },
-            () -> new DelegatedTestEnumsResponseCallback(),
+            () -> new DelegatedUnitTestingClusterTestEnumsResponseCallback(),
             unitTestingtestEnumsRequestCommandParams);
     unitTestingClusterInteractionInfoMap.put(
         "testEnumsRequest", unitTestingtestEnumsRequestInteractionInfo);
@@ -12100,7 +12100,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
                           callback,
                       (Optional<Integer>) commandArguments.get("arg1"));
             },
-            () -> new DelegatedTestNullableOptionalResponseCallback(),
+            () -> new DelegatedUnitTestingClusterTestNullableOptionalResponseCallback(),
             unitTestingtestNullableOptionalRequestCommandParams);
     unitTestingClusterInteractionInfoMap.put(
         "testNullableOptionalRequest", unitTestingtestNullableOptionalRequestInteractionInfo);
@@ -12114,7 +12114,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
                       (ChipClusters.UnitTestingCluster.SimpleStructResponseCallback) callback,
                       (ChipStructs.UnitTestingClusterSimpleStruct) commandArguments.get("arg1"));
             },
-            () -> new DelegatedSimpleStructResponseCallback(),
+            () -> new DelegatedUnitTestingClusterSimpleStructResponseCallback(),
             unitTestingsimpleStructEchoRequestCommandParams);
     unitTestingClusterInteractionInfoMap.put(
         "simpleStructEchoRequest", unitTestingsimpleStructEchoRequestInteractionInfo);
@@ -12177,7 +12177,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
                       (Integer) commandArguments.get("arg2"),
                       (Boolean) commandArguments.get("arg3"));
             },
-            () -> new DelegatedTestEmitTestEventResponseCallback(),
+            () -> new DelegatedUnitTestingClusterTestEmitTestEventResponseCallback(),
             unitTestingtestEmitTestEventRequestCommandParams);
     unitTestingClusterInteractionInfoMap.put(
         "testEmitTestEventRequest", unitTestingtestEmitTestEventRequestInteractionInfo);
diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py
index 778393a7ed66e2..5196cc458ac265 100644
--- a/src/controller/python/chip/clusters/Objects.py
+++ b/src/controller/python/chip/clusters/Objects.py
@@ -24182,11 +24182,12 @@ class ParameterEnum(MatterIntEnum):
             kSport = 0x0A
             kSportsTeam = 0x0B
             kType = 0x0C
+            kVideo = 0x0D
             # All received enum values that are not listed above will be mapped
             # to kUnknownEnumValue. This is a helper enum value that should only
             # be used by code to process how it handles receiving and unknown
             # enum value. This specific should never be transmitted.
-            kUnknownEnumValue = 13,
+            kUnknownEnumValue = 14,
 
 
     class Bitmaps:
@@ -24201,7 +24202,7 @@ class SupportedStreamingProtocol(IntFlag):
 
     class Structs:
         @dataclass
-        class Dimension(ClusterObject):
+        class DimensionStruct(ClusterObject):
             @ChipUtility.classproperty
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
@@ -24216,7 +24217,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
             metric: 'ContentLauncher.Enums.MetricTypeEnum' = 0
 
         @dataclass
-        class AdditionalInfo(ClusterObject):
+        class AdditionalInfoStruct(ClusterObject):
             @ChipUtility.classproperty
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
@@ -24229,66 +24230,66 @@ def descriptor(cls) -> ClusterObjectDescriptor:
             value: 'str' = ""
 
         @dataclass
-        class Parameter(ClusterObject):
+        class ParameterStruct(ClusterObject):
             @ChipUtility.classproperty
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields = [
                             ClusterObjectFieldDescriptor(Label="type", Tag=0, Type=ContentLauncher.Enums.ParameterEnum),
                             ClusterObjectFieldDescriptor(Label="value", Tag=1, Type=str),
-                            ClusterObjectFieldDescriptor(Label="externalIDList", Tag=2, Type=typing.Optional[typing.List[ContentLauncher.Structs.AdditionalInfo]]),
+                            ClusterObjectFieldDescriptor(Label="externalIDList", Tag=2, Type=typing.Optional[typing.List[ContentLauncher.Structs.AdditionalInfoStruct]]),
                     ])
 
             type: 'ContentLauncher.Enums.ParameterEnum' = 0
             value: 'str' = ""
-            externalIDList: 'typing.Optional[typing.List[ContentLauncher.Structs.AdditionalInfo]]' = None
+            externalIDList: 'typing.Optional[typing.List[ContentLauncher.Structs.AdditionalInfoStruct]]' = None
 
         @dataclass
-        class ContentSearch(ClusterObject):
+        class ContentSearchStruct(ClusterObject):
             @ChipUtility.classproperty
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields = [
-                            ClusterObjectFieldDescriptor(Label="parameterList", Tag=0, Type=typing.List[ContentLauncher.Structs.Parameter]),
+                            ClusterObjectFieldDescriptor(Label="parameterList", Tag=0, Type=typing.List[ContentLauncher.Structs.ParameterStruct]),
                     ])
 
-            parameterList: 'typing.List[ContentLauncher.Structs.Parameter]' = field(default_factory=lambda: [])
+            parameterList: 'typing.List[ContentLauncher.Structs.ParameterStruct]' = field(default_factory=lambda: [])
 
         @dataclass
-        class StyleInformation(ClusterObject):
+        class StyleInformationStruct(ClusterObject):
             @ChipUtility.classproperty
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields = [
-                            ClusterObjectFieldDescriptor(Label="imageUrl", Tag=0, Type=typing.Optional[str]),
+                            ClusterObjectFieldDescriptor(Label="imageURL", Tag=0, Type=typing.Optional[str]),
                             ClusterObjectFieldDescriptor(Label="color", Tag=1, Type=typing.Optional[str]),
-                            ClusterObjectFieldDescriptor(Label="size", Tag=2, Type=typing.Optional[ContentLauncher.Structs.Dimension]),
+                            ClusterObjectFieldDescriptor(Label="size", Tag=2, Type=typing.Optional[ContentLauncher.Structs.DimensionStruct]),
                     ])
 
-            imageUrl: 'typing.Optional[str]' = None
+            imageURL: 'typing.Optional[str]' = None
             color: 'typing.Optional[str]' = None
-            size: 'typing.Optional[ContentLauncher.Structs.Dimension]' = None
+            size: 'typing.Optional[ContentLauncher.Structs.DimensionStruct]' = None
 
         @dataclass
-        class BrandingInformation(ClusterObject):
+        class BrandingInformationStruct(ClusterObject):
             @ChipUtility.classproperty
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields = [
                             ClusterObjectFieldDescriptor(Label="providerName", Tag=0, Type=str),
-                            ClusterObjectFieldDescriptor(Label="background", Tag=1, Type=typing.Optional[ContentLauncher.Structs.StyleInformation]),
-                            ClusterObjectFieldDescriptor(Label="logo", Tag=2, Type=typing.Optional[ContentLauncher.Structs.StyleInformation]),
-                            ClusterObjectFieldDescriptor(Label="progressBar", Tag=3, Type=typing.Optional[ContentLauncher.Structs.StyleInformation]),
-                            ClusterObjectFieldDescriptor(Label="splash", Tag=4, Type=typing.Optional[ContentLauncher.Structs.StyleInformation]),
-                            ClusterObjectFieldDescriptor(Label="waterMark", Tag=5, Type=typing.Optional[ContentLauncher.Structs.StyleInformation]),
+                            ClusterObjectFieldDescriptor(Label="background", Tag=1, Type=typing.Optional[ContentLauncher.Structs.StyleInformationStruct]),
+                            ClusterObjectFieldDescriptor(Label="logo", Tag=2, Type=typing.Optional[ContentLauncher.Structs.StyleInformationStruct]),
+                            ClusterObjectFieldDescriptor(Label="progressBar", Tag=3, Type=typing.Optional[ContentLauncher.Structs.StyleInformationStruct]),
+                            ClusterObjectFieldDescriptor(Label="splash", Tag=4, Type=typing.Optional[ContentLauncher.Structs.StyleInformationStruct]),
+                            ClusterObjectFieldDescriptor(Label="waterMark", Tag=5, Type=typing.Optional[ContentLauncher.Structs.StyleInformationStruct]),
                     ])
 
             providerName: 'str' = ""
-            background: 'typing.Optional[ContentLauncher.Structs.StyleInformation]' = None
-            logo: 'typing.Optional[ContentLauncher.Structs.StyleInformation]' = None
-            progressBar: 'typing.Optional[ContentLauncher.Structs.StyleInformation]' = None
-            splash: 'typing.Optional[ContentLauncher.Structs.StyleInformation]' = None
-            waterMark: 'typing.Optional[ContentLauncher.Structs.StyleInformation]' = None
+            background: 'typing.Optional[ContentLauncher.Structs.StyleInformationStruct]' = None
+            logo: 'typing.Optional[ContentLauncher.Structs.StyleInformationStruct]' = None
+            progressBar: 'typing.Optional[ContentLauncher.Structs.StyleInformationStruct]' = None
+            splash: 'typing.Optional[ContentLauncher.Structs.StyleInformationStruct]' = None
+            waterMark: 'typing.Optional[ContentLauncher.Structs.StyleInformationStruct]' = None
 
 
 
@@ -24298,18 +24299,18 @@ class LaunchContent(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x050A
             command_id: typing.ClassVar[int] = 0x00000000
             is_client: typing.ClassVar[bool] = True
-            response_type: typing.ClassVar[str] = 'LaunchResponse'
+            response_type: typing.ClassVar[str] = 'LauncherResponse'
 
             @ChipUtility.classproperty
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields = [
-                            ClusterObjectFieldDescriptor(Label="search", Tag=0, Type=ContentLauncher.Structs.ContentSearch),
+                            ClusterObjectFieldDescriptor(Label="search", Tag=0, Type=ContentLauncher.Structs.ContentSearchStruct),
                             ClusterObjectFieldDescriptor(Label="autoPlay", Tag=1, Type=bool),
                             ClusterObjectFieldDescriptor(Label="data", Tag=2, Type=typing.Optional[str]),
                     ])
 
-            search: 'ContentLauncher.Structs.ContentSearch' = field(default_factory=lambda: ContentLauncher.Structs.ContentSearch())
+            search: 'ContentLauncher.Structs.ContentSearchStruct' = field(default_factory=lambda: ContentLauncher.Structs.ContentSearchStruct())
             autoPlay: 'bool' = False
             data: 'typing.Optional[str]' = None
 
@@ -24318,7 +24319,7 @@ class LaunchURL(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x050A
             command_id: typing.ClassVar[int] = 0x00000001
             is_client: typing.ClassVar[bool] = True
-            response_type: typing.ClassVar[str] = 'LaunchResponse'
+            response_type: typing.ClassVar[str] = 'LauncherResponse'
 
             @ChipUtility.classproperty
             def descriptor(cls) -> ClusterObjectDescriptor:
@@ -24326,15 +24327,15 @@ def descriptor(cls) -> ClusterObjectDescriptor:
                     Fields = [
                             ClusterObjectFieldDescriptor(Label="contentURL", Tag=0, Type=str),
                             ClusterObjectFieldDescriptor(Label="displayString", Tag=1, Type=typing.Optional[str]),
-                            ClusterObjectFieldDescriptor(Label="brandingInformation", Tag=2, Type=typing.Optional[ContentLauncher.Structs.BrandingInformation]),
+                            ClusterObjectFieldDescriptor(Label="brandingInformation", Tag=2, Type=typing.Optional[ContentLauncher.Structs.BrandingInformationStruct]),
                     ])
 
             contentURL: 'str' = ""
             displayString: 'typing.Optional[str]' = None
-            brandingInformation: 'typing.Optional[ContentLauncher.Structs.BrandingInformation]' = None
+            brandingInformation: 'typing.Optional[ContentLauncher.Structs.BrandingInformationStruct]' = None
 
         @dataclass
-        class LaunchResponse(ClusterCommand):
+        class LauncherResponse(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x050A
             command_id: typing.ClassVar[int] = 0x00000002
             is_client: typing.ClassVar[bool] = False
diff --git a/src/darwin/Framework/CHIP/templates/availability.yaml b/src/darwin/Framework/CHIP/templates/availability.yaml
index 42e5e2afb7b666..7dc7376f0506f7 100644
--- a/src/darwin/Framework/CHIP/templates/availability.yaml
+++ b/src/darwin/Framework/CHIP/templates/availability.yaml
@@ -4828,6 +4828,8 @@
               - RegisterClientMonitoring
               - UnregisterClientMonitoring
               - StayAwakeRequest
+          ContentLauncher:
+              - LauncherResponse
       command fields:
           UnitTesting:
               TestSpecificResponse:
@@ -5030,6 +5032,10 @@
           ColorControl:
               MoveToColorTemperature:
                   - colorTemperatureMireds
+          ContentLauncher:
+              LauncherResponse:
+                  - status
+                  - data
       structs:
           OTASoftwareUpdateRequestor:
               - ProviderLocation
@@ -5067,6 +5073,13 @@
           Channel:
               - ChannelInfoStruct
               - LineupInfoStruct
+          ContentLauncher:
+              - DimensionStruct
+              - AdditionalInfoStruct
+              - ParameterStruct
+              - ContentSearchStruct
+              - StyleInformationStruct
+              - BrandingInformationStruct
       struct fields:
           UnitTesting:
               SimpleStruct:
@@ -5209,6 +5222,34 @@
                   - lineupName
                   - postalCode
                   - lineupInfoType
+          ContentLauncher:
+              DimensionStruct:
+                  - width
+                  - height
+                  - metric
+              AdditionalInfoStruct:
+                  - name
+                  - value
+              ParameterStruct:
+                  - type
+                  - value
+                  - externalIDList
+              ContentSearchStruct:
+                  - parameterList
+              StyleInformationStruct:
+                  - imageURL
+                  - color
+                  - size
+                  # Member that is actually deprecated, but we effectively
+                  # introduced it in this release.
+                  - imageUrl
+              BrandingInformationStruct:
+                  - providerName
+                  - background
+                  - logo
+                  - progressBar
+                  - splash
+                  - waterMark
       events:
           OTASoftwareUpdateRequestor:
               - StateTransition
@@ -5541,6 +5582,12 @@
           Channel:
               LineupInfoTypeEnum:
                   - MSO
+          ContentLauncher:
+              MetricTypeEnum:
+                  - Pixels
+                  - Percentage
+              ParameterEnum:
+                  - Video
       bitmaps:
           UnitTesting:
               - Bitmap8MaskMap
@@ -5643,6 +5690,9 @@
               - Rssi
           GeneralDiagnostics:
               - BootReasons
+      commands:
+          ContentLauncher:
+              - LaunchResponse
       command fields:
           Groups:
               AddGroup:
@@ -5719,6 +5769,13 @@
           Channel:
               - ChannelInfo
               - LineupInfo
+          ContentLauncher:
+              - Dimension
+              - AdditionalInfo
+              - Parameter
+              - ContentSearch
+              - StyleInformation
+              - BrandingInformation
       struct fields:
           Descriptor:
               DeviceTypeStruct:
@@ -5728,6 +5785,9 @@
                   - vendorId
                   - fabricId
                   - nodeId
+          ContentLauncher:
+              StyleInformationStruct:
+                  - imageUrl
       event fields:
           Switch:
               MultiPressComplete:
@@ -5808,6 +5868,10 @@
           Channel:
               LineupInfoTypeEnum:
                   - Mso
+          ContentLauncher:
+              MetricTypeEnum:
+                  - PIXELS
+                  - PERCENTAGE
       bitmaps:
           DoorLock:
               - DlDaysMaskMap
@@ -5920,6 +5984,8 @@
       commands:
           OTASoftwareUpdateRequestor:
               AnnounceOTAProvider: AnnounceOtaProvider
+          ContentLauncher:
+              LauncherResponse: LaunchResponse
       command fields:
           OTASoftwareUpdateProvider:
               QueryImage:
@@ -5990,6 +6056,13 @@
           Channel:
               ChannelInfoStruct: ChannelInfo
               LineupInfoStruct: LineupInfo
+          ContentLauncher:
+              DimensionStruct: Dimension
+              AdditionalInfoStruct: AdditionalInfo
+              ParameterStruct: Parameter
+              ContentSearchStruct: ContentSearch
+              StyleInformationStruct: StyleInformation
+              BrandingInformationStruct: BrandingInformation
       struct fields:
           Descriptor:
               DeviceTypeStruct:
@@ -5999,6 +6072,9 @@
                   vendorID: vendorId
                   fabricID: fabricId
                   nodeID: nodeId
+          ContentLauncher:
+              StyleInformationStruct:
+                  imageURL: imageUrl
       event fields:
           Switch:
               MultiPressComplete:
@@ -6092,6 +6168,10 @@
           Channel:
               LineupInfoTypeEnum:
                   MSO: Mso
+          ContentLauncher:
+              MetricTypeEnum:
+                  Pixels: PIXELS
+                  Percentage: PERCENTAGE
       bitmaps:
           DoorLock:
               DaysMaskMap: DlDaysMaskMap
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h
index 16e875983f4402..f73ef9f2b38b12 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h
@@ -12964,7 +12964,7 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  * Upon receipt, this SHALL launch the specified content with optional search criteria.
  */
 - (void)launchContentWithParams:(MTRContentLauncherClusterLaunchContentParams *)params
-                     completion:(void (^)(MTRContentLauncherClusterLaunchResponseParams * _Nullable data,
+                     completion:(void (^)(MTRContentLauncherClusterLauncherResponseParams * _Nullable data,
                                     NSError * _Nullable error))completion MTR_NEWLY_AVAILABLE;
 /**
  * Command LaunchURL
@@ -12972,7 +12972,7 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  * Upon receipt, this SHALL launch content from the specified URL.
  */
 - (void)launchURLWithParams:(MTRContentLauncherClusterLaunchURLParams *)params
-                 completion:(void (^)(MTRContentLauncherClusterLaunchResponseParams * _Nullable data,
+                 completion:(void (^)(MTRContentLauncherClusterLauncherResponseParams * _Nullable data,
                                 NSError * _Nullable error))completion MTR_NEWLY_AVAILABLE;
 
 - (void)readAttributeAcceptHeaderWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
@@ -19162,8 +19162,14 @@ typedef NS_ENUM(uint8_t, MTRContentLauncherContentLaunchStatus) {
 } API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
 typedef NS_ENUM(uint8_t, MTRContentLauncherMetricType) {
-    MTRContentLauncherMetricTypePIXELS API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x00,
-    MTRContentLauncherMetricTypePERCENTAGE API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x01,
+    MTRContentLauncherMetricTypePixels MTR_NEWLY_AVAILABLE = 0x00,
+    MTRContentLauncherMetricTypePIXELS API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRContentLauncherMetricTypePixels")
+    = 0x00,
+    MTRContentLauncherMetricTypePercentage MTR_NEWLY_AVAILABLE = 0x01,
+    MTRContentLauncherMetricTypePERCENTAGE API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRContentLauncherMetricTypePercentage")
+    = 0x01,
 } API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
 typedef NS_ENUM(uint8_t, MTRContentLauncherParameter) {
@@ -19180,6 +19186,7 @@ typedef NS_ENUM(uint8_t, MTRContentLauncherParameter) {
     MTRContentLauncherParameterSport API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x0A,
     MTRContentLauncherParameterSportsTeam API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x0B,
     MTRContentLauncherParameterType API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x0C,
+    MTRContentLauncherParameterVideo MTR_NEWLY_AVAILABLE = 0x0D,
 } API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
 typedef NS_OPTIONS(uint32_t, MTRContentLauncherFeature) {
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm
index 207978a751f298..97a5f6db6b46b5 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm
@@ -88703,16 +88703,16 @@ - (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)en
 }
 
 - (void)launchContentWithParams:(MTRContentLauncherClusterLaunchContentParams *)params
-                     completion:(void (^)(MTRContentLauncherClusterLaunchResponseParams * _Nullable data,
+                     completion:(void (^)(MTRContentLauncherClusterLauncherResponseParams * _Nullable data,
                                     NSError * _Nullable error))completion
 {
     // Make a copy of params before we go async.
     params = [params copy];
-    auto * bridge = new MTRContentLauncherClusterLaunchResponseCallbackBridge(self.callbackQueue, completion,
+    auto * bridge = new MTRContentLauncherClusterLauncherResponseCallbackBridge(self.callbackQueue, completion,
         ^(ExchangeManager & exchangeManager, const SessionHandle & session,
-            ContentLauncherClusterLaunchResponseCallbackType successCb, MTRErrorCallback failureCb,
+            ContentLauncherClusterLauncherResponseCallbackType successCb, MTRErrorCallback failureCb,
             MTRCallbackBridgeBase * bridge) {
-            auto * typedBridge = static_cast<MTRContentLauncherClusterLaunchResponseCallbackBridge *>(bridge);
+            auto * typedBridge = static_cast<MTRContentLauncherClusterLauncherResponseCallbackBridge *>(bridge);
             Optional<uint16_t> timedInvokeTimeoutMs;
             Optional<Timeout> invokeTimeout;
             ListFreer listFreer;
@@ -88739,11 +88739,11 @@ - (void)launchContentWithParams:(MTRContentLauncherClusterLaunchContentParams *)
                     }
                     listFreer.add(listHolder_1);
                     for (size_t i_1 = 0; i_1 < params.search.parameterList.count; ++i_1) {
-                        if (![params.search.parameterList[i_1] isKindOfClass:[MTRContentLauncherClusterParameter class]]) {
+                        if (![params.search.parameterList[i_1] isKindOfClass:[MTRContentLauncherClusterParameterStruct class]]) {
                             // Wrong kind of value.
                             return CHIP_ERROR_INVALID_ARGUMENT;
                         }
-                        auto element_1 = (MTRContentLauncherClusterParameter *) params.search.parameterList[i_1];
+                        auto element_1 = (MTRContentLauncherClusterParameterStruct *) params.search.parameterList[i_1];
                         listHolder_1->mList[i_1].type
                             = static_cast<std::remove_reference_t<decltype(listHolder_1->mList[i_1].type)>>(
                                 element_1.type.unsignedCharValue);
@@ -88761,11 +88761,12 @@ - (void)launchContentWithParams:(MTRContentLauncherClusterLaunchContentParams *)
                                     listFreer.add(listHolder_4);
                                     for (size_t i_4 = 0; i_4 < element_1.externalIDList.count; ++i_4) {
                                         if (![element_1.externalIDList[i_4]
-                                                isKindOfClass:[MTRContentLauncherClusterAdditionalInfo class]]) {
+                                                isKindOfClass:[MTRContentLauncherClusterAdditionalInfoStruct class]]) {
                                             // Wrong kind of value.
                                             return CHIP_ERROR_INVALID_ARGUMENT;
                                         }
-                                        auto element_4 = (MTRContentLauncherClusterAdditionalInfo *) element_1.externalIDList[i_4];
+                                        auto element_4
+                                            = (MTRContentLauncherClusterAdditionalInfoStruct *) element_1.externalIDList[i_4];
                                         listHolder_4->mList[i_4].name = [self asCharSpan:element_4.name];
                                         listHolder_4->mList[i_4].value = [self asCharSpan:element_4.value];
                                     }
@@ -88794,16 +88795,16 @@ - (void)launchContentWithParams:(MTRContentLauncherClusterLaunchContentParams *)
 }
 
 - (void)launchURLWithParams:(MTRContentLauncherClusterLaunchURLParams *)params
-                 completion:
-                     (void (^)(MTRContentLauncherClusterLaunchResponseParams * _Nullable data, NSError * _Nullable error))completion
+                 completion:(void (^)(MTRContentLauncherClusterLauncherResponseParams * _Nullable data,
+                                NSError * _Nullable error))completion
 {
     // Make a copy of params before we go async.
     params = [params copy];
-    auto * bridge = new MTRContentLauncherClusterLaunchResponseCallbackBridge(self.callbackQueue, completion,
+    auto * bridge = new MTRContentLauncherClusterLauncherResponseCallbackBridge(self.callbackQueue, completion,
         ^(ExchangeManager & exchangeManager, const SessionHandle & session,
-            ContentLauncherClusterLaunchResponseCallbackType successCb, MTRErrorCallback failureCb,
+            ContentLauncherClusterLauncherResponseCallbackType successCb, MTRErrorCallback failureCb,
             MTRCallbackBridgeBase * bridge) {
-            auto * typedBridge = static_cast<MTRContentLauncherClusterLaunchResponseCallbackBridge *>(bridge);
+            auto * typedBridge = static_cast<MTRContentLauncherClusterLauncherResponseCallbackBridge *>(bridge);
             Optional<uint16_t> timedInvokeTimeoutMs;
             Optional<Timeout> invokeTimeout;
             ListFreer listFreer;
@@ -88830,9 +88831,9 @@ - (void)launchURLWithParams:(MTRContentLauncherClusterLaunchURLParams *)params
                 definedValue_0.providerName = [self asCharSpan:params.brandingInformation.providerName];
                 if (params.brandingInformation.background != nil) {
                     auto & definedValue_2 = definedValue_0.background.Emplace();
-                    if (params.brandingInformation.background.imageUrl != nil) {
-                        auto & definedValue_4 = definedValue_2.imageUrl.Emplace();
-                        definedValue_4 = [self asCharSpan:params.brandingInformation.background.imageUrl];
+                    if (params.brandingInformation.background.imageURL != nil) {
+                        auto & definedValue_4 = definedValue_2.imageURL.Emplace();
+                        definedValue_4 = [self asCharSpan:params.brandingInformation.background.imageURL];
                     }
                     if (params.brandingInformation.background.color != nil) {
                         auto & definedValue_4 = definedValue_2.color.Emplace();
@@ -88848,9 +88849,9 @@ - (void)launchURLWithParams:(MTRContentLauncherClusterLaunchURLParams *)params
                 }
                 if (params.brandingInformation.logo != nil) {
                     auto & definedValue_2 = definedValue_0.logo.Emplace();
-                    if (params.brandingInformation.logo.imageUrl != nil) {
-                        auto & definedValue_4 = definedValue_2.imageUrl.Emplace();
-                        definedValue_4 = [self asCharSpan:params.brandingInformation.logo.imageUrl];
+                    if (params.brandingInformation.logo.imageURL != nil) {
+                        auto & definedValue_4 = definedValue_2.imageURL.Emplace();
+                        definedValue_4 = [self asCharSpan:params.brandingInformation.logo.imageURL];
                     }
                     if (params.brandingInformation.logo.color != nil) {
                         auto & definedValue_4 = definedValue_2.color.Emplace();
@@ -88866,9 +88867,9 @@ - (void)launchURLWithParams:(MTRContentLauncherClusterLaunchURLParams *)params
                 }
                 if (params.brandingInformation.progressBar != nil) {
                     auto & definedValue_2 = definedValue_0.progressBar.Emplace();
-                    if (params.brandingInformation.progressBar.imageUrl != nil) {
-                        auto & definedValue_4 = definedValue_2.imageUrl.Emplace();
-                        definedValue_4 = [self asCharSpan:params.brandingInformation.progressBar.imageUrl];
+                    if (params.brandingInformation.progressBar.imageURL != nil) {
+                        auto & definedValue_4 = definedValue_2.imageURL.Emplace();
+                        definedValue_4 = [self asCharSpan:params.brandingInformation.progressBar.imageURL];
                     }
                     if (params.brandingInformation.progressBar.color != nil) {
                         auto & definedValue_4 = definedValue_2.color.Emplace();
@@ -88884,9 +88885,9 @@ - (void)launchURLWithParams:(MTRContentLauncherClusterLaunchURLParams *)params
                 }
                 if (params.brandingInformation.splash != nil) {
                     auto & definedValue_2 = definedValue_0.splash.Emplace();
-                    if (params.brandingInformation.splash.imageUrl != nil) {
-                        auto & definedValue_4 = definedValue_2.imageUrl.Emplace();
-                        definedValue_4 = [self asCharSpan:params.brandingInformation.splash.imageUrl];
+                    if (params.brandingInformation.splash.imageURL != nil) {
+                        auto & definedValue_4 = definedValue_2.imageURL.Emplace();
+                        definedValue_4 = [self asCharSpan:params.brandingInformation.splash.imageURL];
                     }
                     if (params.brandingInformation.splash.color != nil) {
                         auto & definedValue_4 = definedValue_2.color.Emplace();
@@ -88902,9 +88903,9 @@ - (void)launchURLWithParams:(MTRContentLauncherClusterLaunchURLParams *)params
                 }
                 if (params.brandingInformation.waterMark != nil) {
                     auto & definedValue_2 = definedValue_0.waterMark.Emplace();
-                    if (params.brandingInformation.waterMark.imageUrl != nil) {
-                        auto & definedValue_4 = definedValue_2.imageUrl.Emplace();
-                        definedValue_4 = [self asCharSpan:params.brandingInformation.waterMark.imageUrl];
+                    if (params.brandingInformation.waterMark.imageURL != nil) {
+                        auto & definedValue_4 = definedValue_2.imageURL.Emplace();
+                        definedValue_4 = [self asCharSpan:params.brandingInformation.waterMark.imageURL];
                     }
                     if (params.brandingInformation.waterMark.color != nil) {
                         auto & definedValue_4 = definedValue_2.color.Emplace();
@@ -89281,7 +89282,7 @@ - (void)launchContentWithParams:(MTRContentLauncherClusterLaunchContentParams *)
                                     NSError * _Nullable error))completionHandler
 {
     [self launchContentWithParams:params
-                       completion:^(MTRContentLauncherClusterLaunchResponseParams * _Nullable data, NSError * _Nullable error) {
+                       completion:^(MTRContentLauncherClusterLauncherResponseParams * _Nullable data, NSError * _Nullable error) {
                            // Cast is safe because subclass does not add any selectors.
                            completionHandler(static_cast<MTRContentLauncherClusterLaunchResponseParams *>(data), error);
                        }];
@@ -89291,7 +89292,7 @@ - (void)launchURLWithParams:(MTRContentLauncherClusterLaunchURLParams *)params
               (void (^)(MTRContentLauncherClusterLaunchResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self launchURLWithParams:params
-                   completion:^(MTRContentLauncherClusterLaunchResponseParams * _Nullable data, NSError * _Nullable error) {
+                   completion:^(MTRContentLauncherClusterLauncherResponseParams * _Nullable data, NSError * _Nullable error) {
                        // Cast is safe because subclass does not add any selectors.
                        completionHandler(static_cast<MTRContentLauncherClusterLaunchResponseParams *>(data), error);
                    }];
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h
index a545a67106e486..49e5bd8fa9936f 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h
@@ -107,8 +107,8 @@ typedef void (*MediaPlaybackClusterPlaybackResponseCallbackType)(
     void *, const chip::app::Clusters::MediaPlayback::Commands::PlaybackResponse::DecodableType &);
 typedef void (*KeypadInputClusterSendKeyResponseCallbackType)(
     void *, const chip::app::Clusters::KeypadInput::Commands::SendKeyResponse::DecodableType &);
-typedef void (*ContentLauncherClusterLaunchResponseCallbackType)(
-    void *, const chip::app::Clusters::ContentLauncher::Commands::LaunchResponse::DecodableType &);
+typedef void (*ContentLauncherClusterLauncherResponseCallbackType)(
+    void *, const chip::app::Clusters::ContentLauncher::Commands::LauncherResponse::DecodableType &);
 typedef void (*ApplicationLauncherClusterLauncherResponseCallbackType)(
     void *, const chip::app::Clusters::ApplicationLauncher::Commands::LauncherResponse::DecodableType &);
 typedef void (*AccountLoginClusterGetSetupPINResponseCallbackType)(
@@ -11419,18 +11419,19 @@ class MTRKeypadInputClusterSendKeyResponseCallbackBridge : public MTRCallbackBri
                             const chip::app::Clusters::KeypadInput::Commands::SendKeyResponse::DecodableType & data);
 };
 
-class MTRContentLauncherClusterLaunchResponseCallbackBridge
-    : public MTRCallbackBridge<ContentLauncherClusterLaunchResponseCallbackType>
+class MTRContentLauncherClusterLauncherResponseCallbackBridge
+    : public MTRCallbackBridge<ContentLauncherClusterLauncherResponseCallbackType>
 {
 public:
-    MTRContentLauncherClusterLaunchResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
-        MTRCallbackBridge<ContentLauncherClusterLaunchResponseCallbackType>(queue, handler, OnSuccessFn){};
+    MTRContentLauncherClusterLauncherResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
+        MTRCallbackBridge<ContentLauncherClusterLauncherResponseCallbackType>(queue, handler, OnSuccessFn){};
 
-    MTRContentLauncherClusterLaunchResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action) :
-        MTRCallbackBridge<ContentLauncherClusterLaunchResponseCallbackType>(queue, handler, action, OnSuccessFn){};
+    MTRContentLauncherClusterLauncherResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                            MTRActionBlock action) :
+        MTRCallbackBridge<ContentLauncherClusterLauncherResponseCallbackType>(queue, handler, action, OnSuccessFn){};
 
     static void OnSuccessFn(void * context,
-                            const chip::app::Clusters::ContentLauncher::Commands::LaunchResponse::DecodableType & data);
+                            const chip::app::Clusters::ContentLauncher::Commands::LauncherResponse::DecodableType & data);
 };
 
 class MTRApplicationLauncherClusterLauncherResponseCallbackBridge
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm
index e1403c04b5229d..e3df110bf64b3d 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm
@@ -12441,10 +12441,10 @@
     DispatchSuccess(context, response);
 };
 
-void MTRContentLauncherClusterLaunchResponseCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::Clusters::ContentLauncher::Commands::LaunchResponse::DecodableType & data)
+void MTRContentLauncherClusterLauncherResponseCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::Clusters::ContentLauncher::Commands::LauncherResponse::DecodableType & data)
 {
-    auto * response = [MTRContentLauncherClusterLaunchResponseParams new];
+    auto * response = [MTRContentLauncherClusterLauncherResponseParams new];
     {
         response.status = [NSNumber numberWithUnsignedChar:chip::to_underlying(data.status)];
     }
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h b/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h
index 174440d0c82f7f..105e5f182ebe4c 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h
@@ -6494,13 +6494,13 @@ typedef NS_ENUM(uint32_t, MTRCommandIDType) {
         MTR_NEWLY_DEPRECATED("Please use MTRCommandIDTypeClusterContentLauncherCommandLaunchURLID")
     = 0x00000001,
     MTRClusterContentLauncherCommandLaunchResponseID API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-        MTR_NEWLY_DEPRECATED("Please use MTRCommandIDTypeClusterContentLauncherCommandLaunchResponseID")
+        MTR_NEWLY_DEPRECATED("Please use MTRCommandIDTypeClusterContentLauncherCommandLauncherResponseID")
     = 0x00000002,
 
     // Cluster ContentLauncher commands
     MTRCommandIDTypeClusterContentLauncherCommandLaunchContentID MTR_NEWLY_AVAILABLE = 0x00000000,
     MTRCommandIDTypeClusterContentLauncherCommandLaunchURLID MTR_NEWLY_AVAILABLE = 0x00000001,
-    MTRCommandIDTypeClusterContentLauncherCommandLaunchResponseID MTR_NEWLY_AVAILABLE = 0x00000002,
+    MTRCommandIDTypeClusterContentLauncherCommandLauncherResponseID MTR_NEWLY_AVAILABLE = 0x00000002,
 
     // Cluster AudioOutput deprecated command id names
     MTRClusterAudioOutputCommandSelectOutputID API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h
index 8339e86709ddd0..03391c6f887fec 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h
@@ -5110,12 +5110,12 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 - (void)launchContentWithParams:(MTRContentLauncherClusterLaunchContentParams *)params
                  expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries
           expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs
-                     completion:(void (^)(MTRContentLauncherClusterLaunchResponseParams * _Nullable data,
+                     completion:(void (^)(MTRContentLauncherClusterLauncherResponseParams * _Nullable data,
                                     NSError * _Nullable error))completion MTR_NEWLY_AVAILABLE;
 - (void)launchURLWithParams:(MTRContentLauncherClusterLaunchURLParams *)params
              expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries
       expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs
-                 completion:(void (^)(MTRContentLauncherClusterLaunchResponseParams * _Nullable data,
+                 completion:(void (^)(MTRContentLauncherClusterLauncherResponseParams * _Nullable data,
                                 NSError * _Nullable error))completion MTR_NEWLY_AVAILABLE;
 
 - (NSDictionary<NSString *, id> *)readAttributeAcceptHeaderWithParams:(MTRReadParams * _Nullable)params
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm
index 6146420975da40..b89286c83d7908 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm
@@ -24506,7 +24506,7 @@ - (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpoi
 - (void)launchContentWithParams:(MTRContentLauncherClusterLaunchContentParams *)params
                  expectedValues:(NSArray<NSDictionary<NSString *, id> *> *)expectedValues
           expectedValueInterval:(NSNumber *)expectedValueIntervalMs
-                     completion:(void (^)(MTRContentLauncherClusterLaunchResponseParams * _Nullable data,
+                     completion:(void (^)(MTRContentLauncherClusterLauncherResponseParams * _Nullable data,
                                     NSError * _Nullable error))completion
 {
     NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex,
@@ -24523,7 +24523,7 @@ - (void)launchContentWithParams:(MTRContentLauncherClusterLaunchContentParams *)
         MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue);
         MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID
                                                                 controller:self.device.deviceController];
-        auto * bridge = new MTRContentLauncherClusterLaunchResponseCallbackBridge(
+        auto * bridge = new MTRContentLauncherClusterLauncherResponseCallbackBridge(
             self.device.queue,
             ^(id _Nullable value, NSError * _Nullable error) {
                 MTRClustersLogCompletion(logPrefix, value, error);
@@ -24533,9 +24533,9 @@ - (void)launchContentWithParams:(MTRContentLauncherClusterLaunchContentParams *)
                 [workItem endWork];
             },
             ^(ExchangeManager & exchangeManager, const SessionHandle & session,
-                ContentLauncherClusterLaunchResponseCallbackType successCb, MTRErrorCallback failureCb,
+                ContentLauncherClusterLauncherResponseCallbackType successCb, MTRErrorCallback failureCb,
                 MTRCallbackBridgeBase * bridge) {
-                auto * typedBridge = static_cast<MTRContentLauncherClusterLaunchResponseCallbackBridge *>(bridge);
+                auto * typedBridge = static_cast<MTRContentLauncherClusterLauncherResponseCallbackBridge *>(bridge);
                 Optional<uint16_t> timedInvokeTimeoutMs;
                 Optional<Timeout> invokeTimeout;
                 ListFreer listFreer;
@@ -24562,11 +24562,12 @@ - (void)launchContentWithParams:(MTRContentLauncherClusterLaunchContentParams *)
                         }
                         listFreer.add(listHolder_1);
                         for (size_t i_1 = 0; i_1 < params.search.parameterList.count; ++i_1) {
-                            if (![params.search.parameterList[i_1] isKindOfClass:[MTRContentLauncherClusterParameter class]]) {
+                            if (![params.search.parameterList[i_1]
+                                    isKindOfClass:[MTRContentLauncherClusterParameterStruct class]]) {
                                 // Wrong kind of value.
                                 return CHIP_ERROR_INVALID_ARGUMENT;
                             }
-                            auto element_1 = (MTRContentLauncherClusterParameter *) params.search.parameterList[i_1];
+                            auto element_1 = (MTRContentLauncherClusterParameterStruct *) params.search.parameterList[i_1];
                             listHolder_1->mList[i_1].type
                                 = static_cast<std::remove_reference_t<decltype(listHolder_1->mList[i_1].type)>>(
                                     element_1.type.unsignedCharValue);
@@ -24584,12 +24585,12 @@ - (void)launchContentWithParams:(MTRContentLauncherClusterLaunchContentParams *)
                                         listFreer.add(listHolder_4);
                                         for (size_t i_4 = 0; i_4 < element_1.externalIDList.count; ++i_4) {
                                             if (![element_1.externalIDList[i_4]
-                                                    isKindOfClass:[MTRContentLauncherClusterAdditionalInfo class]]) {
+                                                    isKindOfClass:[MTRContentLauncherClusterAdditionalInfoStruct class]]) {
                                                 // Wrong kind of value.
                                                 return CHIP_ERROR_INVALID_ARGUMENT;
                                             }
                                             auto element_4
-                                                = (MTRContentLauncherClusterAdditionalInfo *) element_1.externalIDList[i_4];
+                                                = (MTRContentLauncherClusterAdditionalInfoStruct *) element_1.externalIDList[i_4];
                                             listHolder_4->mList[i_4].name = [self asCharSpan:element_4.name];
                                             listHolder_4->mList[i_4].value = [self asCharSpan:element_4.value];
                                         }
@@ -24633,8 +24634,8 @@ - (void)launchContentWithParams:(MTRContentLauncherClusterLaunchContentParams *)
 - (void)launchURLWithParams:(MTRContentLauncherClusterLaunchURLParams *)params
              expectedValues:(NSArray<NSDictionary<NSString *, id> *> *)expectedValues
       expectedValueInterval:(NSNumber *)expectedValueIntervalMs
-                 completion:
-                     (void (^)(MTRContentLauncherClusterLaunchResponseParams * _Nullable data, NSError * _Nullable error))completion
+                 completion:(void (^)(MTRContentLauncherClusterLauncherResponseParams * _Nullable data,
+                                NSError * _Nullable error))completion
 {
     NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex,
                                      _endpoint, (unsigned int) MTRClusterIDTypeContentLauncherID,
@@ -24650,7 +24651,7 @@ - (void)launchURLWithParams:(MTRContentLauncherClusterLaunchURLParams *)params
         MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue);
         MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID
                                                                 controller:self.device.deviceController];
-        auto * bridge = new MTRContentLauncherClusterLaunchResponseCallbackBridge(
+        auto * bridge = new MTRContentLauncherClusterLauncherResponseCallbackBridge(
             self.device.queue,
             ^(id _Nullable value, NSError * _Nullable error) {
                 MTRClustersLogCompletion(logPrefix, value, error);
@@ -24660,9 +24661,9 @@ - (void)launchURLWithParams:(MTRContentLauncherClusterLaunchURLParams *)params
                 [workItem endWork];
             },
             ^(ExchangeManager & exchangeManager, const SessionHandle & session,
-                ContentLauncherClusterLaunchResponseCallbackType successCb, MTRErrorCallback failureCb,
+                ContentLauncherClusterLauncherResponseCallbackType successCb, MTRErrorCallback failureCb,
                 MTRCallbackBridgeBase * bridge) {
-                auto * typedBridge = static_cast<MTRContentLauncherClusterLaunchResponseCallbackBridge *>(bridge);
+                auto * typedBridge = static_cast<MTRContentLauncherClusterLauncherResponseCallbackBridge *>(bridge);
                 Optional<uint16_t> timedInvokeTimeoutMs;
                 Optional<Timeout> invokeTimeout;
                 ListFreer listFreer;
@@ -24689,9 +24690,9 @@ - (void)launchURLWithParams:(MTRContentLauncherClusterLaunchURLParams *)params
                     definedValue_0.providerName = [self asCharSpan:params.brandingInformation.providerName];
                     if (params.brandingInformation.background != nil) {
                         auto & definedValue_2 = definedValue_0.background.Emplace();
-                        if (params.brandingInformation.background.imageUrl != nil) {
-                            auto & definedValue_4 = definedValue_2.imageUrl.Emplace();
-                            definedValue_4 = [self asCharSpan:params.brandingInformation.background.imageUrl];
+                        if (params.brandingInformation.background.imageURL != nil) {
+                            auto & definedValue_4 = definedValue_2.imageURL.Emplace();
+                            definedValue_4 = [self asCharSpan:params.brandingInformation.background.imageURL];
                         }
                         if (params.brandingInformation.background.color != nil) {
                             auto & definedValue_4 = definedValue_2.color.Emplace();
@@ -24707,9 +24708,9 @@ - (void)launchURLWithParams:(MTRContentLauncherClusterLaunchURLParams *)params
                     }
                     if (params.brandingInformation.logo != nil) {
                         auto & definedValue_2 = definedValue_0.logo.Emplace();
-                        if (params.brandingInformation.logo.imageUrl != nil) {
-                            auto & definedValue_4 = definedValue_2.imageUrl.Emplace();
-                            definedValue_4 = [self asCharSpan:params.brandingInformation.logo.imageUrl];
+                        if (params.brandingInformation.logo.imageURL != nil) {
+                            auto & definedValue_4 = definedValue_2.imageURL.Emplace();
+                            definedValue_4 = [self asCharSpan:params.brandingInformation.logo.imageURL];
                         }
                         if (params.brandingInformation.logo.color != nil) {
                             auto & definedValue_4 = definedValue_2.color.Emplace();
@@ -24725,9 +24726,9 @@ - (void)launchURLWithParams:(MTRContentLauncherClusterLaunchURLParams *)params
                     }
                     if (params.brandingInformation.progressBar != nil) {
                         auto & definedValue_2 = definedValue_0.progressBar.Emplace();
-                        if (params.brandingInformation.progressBar.imageUrl != nil) {
-                            auto & definedValue_4 = definedValue_2.imageUrl.Emplace();
-                            definedValue_4 = [self asCharSpan:params.brandingInformation.progressBar.imageUrl];
+                        if (params.brandingInformation.progressBar.imageURL != nil) {
+                            auto & definedValue_4 = definedValue_2.imageURL.Emplace();
+                            definedValue_4 = [self asCharSpan:params.brandingInformation.progressBar.imageURL];
                         }
                         if (params.brandingInformation.progressBar.color != nil) {
                             auto & definedValue_4 = definedValue_2.color.Emplace();
@@ -24743,9 +24744,9 @@ - (void)launchURLWithParams:(MTRContentLauncherClusterLaunchURLParams *)params
                     }
                     if (params.brandingInformation.splash != nil) {
                         auto & definedValue_2 = definedValue_0.splash.Emplace();
-                        if (params.brandingInformation.splash.imageUrl != nil) {
-                            auto & definedValue_4 = definedValue_2.imageUrl.Emplace();
-                            definedValue_4 = [self asCharSpan:params.brandingInformation.splash.imageUrl];
+                        if (params.brandingInformation.splash.imageURL != nil) {
+                            auto & definedValue_4 = definedValue_2.imageURL.Emplace();
+                            definedValue_4 = [self asCharSpan:params.brandingInformation.splash.imageURL];
                         }
                         if (params.brandingInformation.splash.color != nil) {
                             auto & definedValue_4 = definedValue_2.color.Emplace();
@@ -24761,9 +24762,9 @@ - (void)launchURLWithParams:(MTRContentLauncherClusterLaunchURLParams *)params
                     }
                     if (params.brandingInformation.waterMark != nil) {
                         auto & definedValue_2 = definedValue_0.waterMark.Emplace();
-                        if (params.brandingInformation.waterMark.imageUrl != nil) {
-                            auto & definedValue_4 = definedValue_2.imageUrl.Emplace();
-                            definedValue_4 = [self asCharSpan:params.brandingInformation.waterMark.imageUrl];
+                        if (params.brandingInformation.waterMark.imageURL != nil) {
+                            auto & definedValue_4 = definedValue_2.imageURL.Emplace();
+                            definedValue_4 = [self asCharSpan:params.brandingInformation.waterMark.imageURL];
                         }
                         if (params.brandingInformation.waterMark.color != nil) {
                             auto & definedValue_4 = definedValue_2.color.Emplace();
@@ -24894,7 +24895,7 @@ - (void)launchContentWithParams:(MTRContentLauncherClusterLaunchContentParams *)
     [self launchContentWithParams:params
                    expectedValues:expectedDataValueDictionaries
             expectedValueInterval:expectedValueIntervalMs
-                       completion:^(MTRContentLauncherClusterLaunchResponseParams * _Nullable data, NSError * _Nullable error) {
+                       completion:^(MTRContentLauncherClusterLauncherResponseParams * _Nullable data, NSError * _Nullable error) {
                            // Cast is safe because subclass does not add any selectors.
                            completionHandler(static_cast<MTRContentLauncherClusterLaunchResponseParams *>(data), error);
                        }];
@@ -24908,7 +24909,7 @@ - (void)launchURLWithParams:(MTRContentLauncherClusterLaunchURLParams *)params
     [self launchURLWithParams:params
                expectedValues:expectedDataValueDictionaries
         expectedValueInterval:expectedValueIntervalMs
-                   completion:^(MTRContentLauncherClusterLaunchResponseParams * _Nullable data, NSError * _Nullable error) {
+                   completion:^(MTRContentLauncherClusterLauncherResponseParams * _Nullable data, NSError * _Nullable error) {
                        // Cast is safe because subclass does not add any selectors.
                        completionHandler(static_cast<MTRContentLauncherClusterLaunchResponseParams *>(data), error);
                    }];
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h
index 54d329af11ae72..1037a02486f9d8 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h
@@ -6184,7 +6184,7 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 @interface MTRContentLauncherClusterLaunchContentParams : NSObject <NSCopying>
 
 @property (nonatomic, copy)
-    MTRContentLauncherClusterContentSearch * _Nonnull search API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
+    MTRContentLauncherClusterContentSearchStruct * _Nonnull search API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
 @property (nonatomic, copy) NSNumber * _Nonnull autoPlay API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
@@ -6222,7 +6222,7 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @property (nonatomic, copy) NSString * _Nullable displayString API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
-@property (nonatomic, copy) MTRContentLauncherClusterBrandingInformation * _Nullable brandingInformation API_AVAILABLE(
+@property (nonatomic, copy) MTRContentLauncherClusterBrandingInformationStruct * _Nullable brandingInformation API_AVAILABLE(
     ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
@@ -6250,12 +6250,12 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 @property (nonatomic, copy, nullable) NSNumber * serverSideProcessingTimeout;
 @end
 
-API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRContentLauncherClusterLaunchResponseParams : NSObject <NSCopying>
+MTR_NEWLY_AVAILABLE
+@interface MTRContentLauncherClusterLauncherResponseParams : NSObject <NSCopying>
 
-@property (nonatomic, copy) NSNumber * _Nonnull status API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
+@property (nonatomic, copy) NSNumber * _Nonnull status MTR_NEWLY_AVAILABLE;
 
-@property (nonatomic, copy) NSString * _Nullable data API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
+@property (nonatomic, copy) NSString * _Nullable data MTR_NEWLY_AVAILABLE;
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -6274,6 +6274,11 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
     tvos(16.1)) MTR_NEWLY_DEPRECATED("Timed invoke does not make sense for server to client commands");
 @end
 
+API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+MTR_NEWLY_DEPRECATED("Please use MTRContentLauncherClusterLauncherResponseParams")
+@interface MTRContentLauncherClusterLaunchResponseParams : MTRContentLauncherClusterLauncherResponseParams
+@end
+
 API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 @interface MTRAudioOutputClusterSelectOutputParams : NSObject <NSCopying>
 
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm
index 6e0516dd06bf3f..933017ccb3ad54 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm
@@ -7015,7 +7015,7 @@ - (instancetype)init
 {
     if (self = [super init]) {
 
-        _search = [MTRContentLauncherClusterContentSearch new];
+        _search = [MTRContentLauncherClusterContentSearchStruct new];
 
         _autoPlay = @(0);
 
@@ -7084,7 +7084,7 @@ - (NSString *)description
 }
 
 @end
-@implementation MTRContentLauncherClusterLaunchResponseParams
+@implementation MTRContentLauncherClusterLauncherResponseParams
 - (instancetype)init
 {
     if (self = [super init]) {
@@ -7099,7 +7099,7 @@ - (instancetype)init
 
 - (id)copyWithZone:(NSZone * _Nullable)zone;
 {
-    auto other = [[MTRContentLauncherClusterLaunchResponseParams alloc] init];
+    auto other = [[MTRContentLauncherClusterLauncherResponseParams alloc] init];
 
     other.status = self.status;
     other.data = self.data;
@@ -7115,6 +7115,9 @@ - (NSString *)description
     return descriptionString;
 }
 
+@end
+
+@implementation MTRContentLauncherClusterLaunchResponseParams
 @end
 @implementation MTRAudioOutputClusterSelectOutputParams
 - (instancetype)init
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h
index 1d17ce7b828f04..d3d1062fc74d11 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h
@@ -829,52 +829,72 @@ MTR_NEWLY_DEPRECATED("Please use MTRMediaInputClusterInputInfoStruct")
 @interface MTRMediaInputClusterInputInfo : MTRMediaInputClusterInputInfoStruct
 @end
 
+MTR_NEWLY_AVAILABLE
+@interface MTRContentLauncherClusterDimensionStruct : NSObject <NSCopying>
+@property (nonatomic, copy) NSNumber * _Nonnull width MTR_NEWLY_AVAILABLE;
+@property (nonatomic, copy) NSNumber * _Nonnull height MTR_NEWLY_AVAILABLE;
+@property (nonatomic, copy) NSNumber * _Nonnull metric MTR_NEWLY_AVAILABLE;
+@end
+
 API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRContentLauncherClusterDimension : NSObject <NSCopying>
-@property (nonatomic, copy) NSNumber * _Nonnull width API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
-@property (nonatomic, copy) NSNumber * _Nonnull height API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
-@property (nonatomic, copy) NSNumber * _Nonnull metric API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
+MTR_NEWLY_DEPRECATED("Please use MTRContentLauncherClusterDimensionStruct")
+@interface MTRContentLauncherClusterDimension : MTRContentLauncherClusterDimensionStruct
+@end
+MTR_NEWLY_AVAILABLE
+@interface MTRContentLauncherClusterAdditionalInfoStruct : NSObject <NSCopying>
+@property (nonatomic, copy) NSString * _Nonnull name MTR_NEWLY_AVAILABLE;
+@property (nonatomic, copy) NSString * _Nonnull value MTR_NEWLY_AVAILABLE;
 @end
 
 API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRContentLauncherClusterAdditionalInfo : NSObject <NSCopying>
-@property (nonatomic, copy) NSString * _Nonnull name API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
-@property (nonatomic, copy) NSString * _Nonnull value API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
+MTR_NEWLY_DEPRECATED("Please use MTRContentLauncherClusterAdditionalInfoStruct")
+@interface MTRContentLauncherClusterAdditionalInfo : MTRContentLauncherClusterAdditionalInfoStruct
+@end
+MTR_NEWLY_AVAILABLE
+@interface MTRContentLauncherClusterParameterStruct : NSObject <NSCopying>
+@property (nonatomic, copy) NSNumber * _Nonnull type MTR_NEWLY_AVAILABLE;
+@property (nonatomic, copy) NSString * _Nonnull value MTR_NEWLY_AVAILABLE;
+@property (nonatomic, copy) NSArray * _Nullable externalIDList MTR_NEWLY_AVAILABLE;
 @end
 
 API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRContentLauncherClusterParameter : NSObject <NSCopying>
-@property (nonatomic, copy) NSNumber * _Nonnull type API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
-@property (nonatomic, copy) NSString * _Nonnull value API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
-@property (nonatomic, copy) NSArray * _Nullable externalIDList API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
+MTR_NEWLY_DEPRECATED("Please use MTRContentLauncherClusterParameterStruct")
+@interface MTRContentLauncherClusterParameter : MTRContentLauncherClusterParameterStruct
+@end
+MTR_NEWLY_AVAILABLE
+@interface MTRContentLauncherClusterContentSearchStruct : NSObject <NSCopying>
+@property (nonatomic, copy) NSArray * _Nonnull parameterList MTR_NEWLY_AVAILABLE;
 @end
 
 API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRContentLauncherClusterContentSearch : NSObject <NSCopying>
-@property (nonatomic, copy) NSArray * _Nonnull parameterList API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
+MTR_NEWLY_DEPRECATED("Please use MTRContentLauncherClusterContentSearchStruct")
+@interface MTRContentLauncherClusterContentSearch : MTRContentLauncherClusterContentSearchStruct
+@end
+MTR_NEWLY_AVAILABLE
+@interface MTRContentLauncherClusterStyleInformationStruct : NSObject <NSCopying>
+@property (nonatomic, copy) NSString * _Nullable imageURL MTR_NEWLY_AVAILABLE;
+@property (nonatomic, copy) NSString * _Nullable imageUrl MTR_NEWLY_AVAILABLE;
+@property (nonatomic, copy) NSString * _Nullable color MTR_NEWLY_AVAILABLE;
+@property (nonatomic, copy) MTRContentLauncherClusterDimensionStruct * _Nullable size MTR_NEWLY_AVAILABLE;
 @end
 
 API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRContentLauncherClusterStyleInformation : NSObject <NSCopying>
-@property (nonatomic, copy) NSString * _Nullable imageUrl API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
-@property (nonatomic, copy) NSString * _Nullable color API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
-@property (nonatomic, copy)
-    MTRContentLauncherClusterDimension * _Nullable size API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
+MTR_NEWLY_DEPRECATED("Please use MTRContentLauncherClusterStyleInformationStruct")
+@interface MTRContentLauncherClusterStyleInformation : MTRContentLauncherClusterStyleInformationStruct
+@end
+MTR_NEWLY_AVAILABLE
+@interface MTRContentLauncherClusterBrandingInformationStruct : NSObject <NSCopying>
+@property (nonatomic, copy) NSString * _Nonnull providerName MTR_NEWLY_AVAILABLE;
+@property (nonatomic, copy) MTRContentLauncherClusterStyleInformationStruct * _Nullable background MTR_NEWLY_AVAILABLE;
+@property (nonatomic, copy) MTRContentLauncherClusterStyleInformationStruct * _Nullable logo MTR_NEWLY_AVAILABLE;
+@property (nonatomic, copy) MTRContentLauncherClusterStyleInformationStruct * _Nullable progressBar MTR_NEWLY_AVAILABLE;
+@property (nonatomic, copy) MTRContentLauncherClusterStyleInformationStruct * _Nullable splash MTR_NEWLY_AVAILABLE;
+@property (nonatomic, copy) MTRContentLauncherClusterStyleInformationStruct * _Nullable waterMark MTR_NEWLY_AVAILABLE;
 @end
 
 API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRContentLauncherClusterBrandingInformation : NSObject <NSCopying>
-@property (nonatomic, copy) NSString * _Nonnull providerName API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
-@property (nonatomic, copy) MTRContentLauncherClusterStyleInformation * _Nullable background API_AVAILABLE(
-    ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
-@property (nonatomic, copy)
-    MTRContentLauncherClusterStyleInformation * _Nullable logo API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
-@property (nonatomic, copy) MTRContentLauncherClusterStyleInformation * _Nullable progressBar API_AVAILABLE(
-    ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
-@property (nonatomic, copy)
-    MTRContentLauncherClusterStyleInformation * _Nullable splash API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
-@property (nonatomic, copy)
-    MTRContentLauncherClusterStyleInformation * _Nullable waterMark API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
+MTR_NEWLY_DEPRECATED("Please use MTRContentLauncherClusterBrandingInformationStruct")
+@interface MTRContentLauncherClusterBrandingInformation : MTRContentLauncherClusterBrandingInformationStruct
 @end
 
 MTR_NEWLY_AVAILABLE
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm
index 266e00379f22fb..2a72744a7cefd0 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm
@@ -3423,7 +3423,7 @@ - (NSString *)description
 @implementation MTRMediaInputClusterInputInfo : MTRMediaInputClusterInputInfoStruct
 @end
 
-@implementation MTRContentLauncherClusterDimension
+@implementation MTRContentLauncherClusterDimensionStruct
 - (instancetype)init
 {
     if (self = [super init]) {
@@ -3439,7 +3439,7 @@ - (instancetype)init
 
 - (id)copyWithZone:(NSZone * _Nullable)zone
 {
-    auto other = [[MTRContentLauncherClusterDimension alloc] init];
+    auto other = [[MTRContentLauncherClusterDimensionStruct alloc] init];
 
     other.width = self.width;
     other.height = self.height;
@@ -3457,7 +3457,10 @@ - (NSString *)description
 
 @end
 
-@implementation MTRContentLauncherClusterAdditionalInfo
+@implementation MTRContentLauncherClusterDimension : MTRContentLauncherClusterDimensionStruct
+@end
+
+@implementation MTRContentLauncherClusterAdditionalInfoStruct
 - (instancetype)init
 {
     if (self = [super init]) {
@@ -3471,7 +3474,7 @@ - (instancetype)init
 
 - (id)copyWithZone:(NSZone * _Nullable)zone
 {
-    auto other = [[MTRContentLauncherClusterAdditionalInfo alloc] init];
+    auto other = [[MTRContentLauncherClusterAdditionalInfoStruct alloc] init];
 
     other.name = self.name;
     other.value = self.value;
@@ -3488,7 +3491,10 @@ - (NSString *)description
 
 @end
 
-@implementation MTRContentLauncherClusterParameter
+@implementation MTRContentLauncherClusterAdditionalInfo : MTRContentLauncherClusterAdditionalInfoStruct
+@end
+
+@implementation MTRContentLauncherClusterParameterStruct
 - (instancetype)init
 {
     if (self = [super init]) {
@@ -3504,7 +3510,7 @@ - (instancetype)init
 
 - (id)copyWithZone:(NSZone * _Nullable)zone
 {
-    auto other = [[MTRContentLauncherClusterParameter alloc] init];
+    auto other = [[MTRContentLauncherClusterParameterStruct alloc] init];
 
     other.type = self.type;
     other.value = self.value;
@@ -3522,7 +3528,10 @@ - (NSString *)description
 
 @end
 
-@implementation MTRContentLauncherClusterContentSearch
+@implementation MTRContentLauncherClusterParameter : MTRContentLauncherClusterParameterStruct
+@end
+
+@implementation MTRContentLauncherClusterContentSearchStruct
 - (instancetype)init
 {
     if (self = [super init]) {
@@ -3534,7 +3543,7 @@ - (instancetype)init
 
 - (id)copyWithZone:(NSZone * _Nullable)zone
 {
-    auto other = [[MTRContentLauncherClusterContentSearch alloc] init];
+    auto other = [[MTRContentLauncherClusterContentSearchStruct alloc] init];
 
     other.parameterList = self.parameterList;
 
@@ -3550,12 +3559,15 @@ - (NSString *)description
 
 @end
 
-@implementation MTRContentLauncherClusterStyleInformation
+@implementation MTRContentLauncherClusterContentSearch : MTRContentLauncherClusterContentSearchStruct
+@end
+
+@implementation MTRContentLauncherClusterStyleInformationStruct
 - (instancetype)init
 {
     if (self = [super init]) {
 
-        _imageUrl = nil;
+        _imageURL = nil;
 
         _color = nil;
 
@@ -3566,9 +3578,9 @@ - (instancetype)init
 
 - (id)copyWithZone:(NSZone * _Nullable)zone
 {
-    auto other = [[MTRContentLauncherClusterStyleInformation alloc] init];
+    auto other = [[MTRContentLauncherClusterStyleInformationStruct alloc] init];
 
-    other.imageUrl = self.imageUrl;
+    other.imageURL = self.imageURL;
     other.color = self.color;
     other.size = self.size;
 
@@ -3578,13 +3590,26 @@ - (id)copyWithZone:(NSZone * _Nullable)zone
 - (NSString *)description
 {
     NSString * descriptionString = [NSString
-        stringWithFormat:@"<%@: imageUrl:%@; color:%@; size:%@; >", NSStringFromClass([self class]), _imageUrl, _color, _size];
+        stringWithFormat:@"<%@: imageURL:%@; color:%@; size:%@; >", NSStringFromClass([self class]), _imageURL, _color, _size];
     return descriptionString;
 }
 
+- (void)setImageUrl:(NSString * _Nullable)imageUrl
+{
+    self.imageURL = imageUrl;
+}
+
+- (NSString * _Nullable)imageUrl
+{
+    return self.imageURL;
+}
+
 @end
 
-@implementation MTRContentLauncherClusterBrandingInformation
+@implementation MTRContentLauncherClusterStyleInformation : MTRContentLauncherClusterStyleInformationStruct
+@end
+
+@implementation MTRContentLauncherClusterBrandingInformationStruct
 - (instancetype)init
 {
     if (self = [super init]) {
@@ -3606,7 +3631,7 @@ - (instancetype)init
 
 - (id)copyWithZone:(NSZone * _Nullable)zone
 {
-    auto other = [[MTRContentLauncherClusterBrandingInformation alloc] init];
+    auto other = [[MTRContentLauncherClusterBrandingInformationStruct alloc] init];
 
     other.providerName = self.providerName;
     other.background = self.background;
@@ -3628,6 +3653,9 @@ - (NSString *)description
 
 @end
 
+@implementation MTRContentLauncherClusterBrandingInformation : MTRContentLauncherClusterBrandingInformationStruct
+@end
+
 @implementation MTRAudioOutputClusterOutputInfoStruct
 - (instancetype)init
 {
diff --git a/zzz_generated/app-common/app-common/zap-generated/callback.h b/zzz_generated/app-common/app-common/zap-generated/callback.h
index 859b2c5d130c49..614ffc4f060dde 100644
--- a/zzz_generated/app-common/app-common/zap-generated/callback.h
+++ b/zzz_generated/app-common/app-common/zap-generated/callback.h
@@ -8718,10 +8718,10 @@ bool emberAfContentLauncherClusterLaunchURLCallback(
     chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
     const chip::app::Clusters::ContentLauncher::Commands::LaunchURL::DecodableType & commandData);
 /**
- * @brief Content Launcher Cluster LaunchResponse Command callback (from server)
+ * @brief Content Launcher Cluster LauncherResponse Command callback (from server)
  */
-bool emberAfContentLauncherClusterLaunchResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
-                                                         uint8_t status, chip::CharSpan data);
+bool emberAfContentLauncherClusterLauncherResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
+                                                           uint8_t Status, chip::CharSpan Data);
 /**
  * @brief Audio Output Cluster SelectOutput Command callback (from client)
  */
diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h b/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h
index 961a9a172331ad..80d01abffd9bb2 100644
--- a/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h
+++ b/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h
@@ -2041,9 +2041,10 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(ContentLauncher::Parame
     case EnumType::kSport:
     case EnumType::kSportsTeam:
     case EnumType::kType:
+    case EnumType::kVideo:
         return val;
     default:
-        return static_cast<EnumType>(13);
+        return static_cast<EnumType>(14);
     }
 }
 
diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h b/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h
index 06216eea7929f9..aba44070a5c52c 100644
--- a/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h
+++ b/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h
@@ -2629,11 +2629,12 @@ enum class ParameterEnum : uint8_t
     kSport      = 0x0A,
     kSportsTeam = 0x0B,
     kType       = 0x0C,
+    kVideo      = 0x0D,
     // All received enum values that are not listed above will be mapped
     // to kUnknownEnumValue. This is a helper enum value that should only
     // be used by code to process how it handles receiving and unknown
     // enum value. This specific should never be transmitted.
-    kUnknownEnumValue = 13,
+    kUnknownEnumValue = 14,
 };
 
 // Bitmap for ContentLauncherFeature
diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp
index 626892f8205c2c..72342d41351b91 100644
--- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp
+++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp
@@ -16773,7 +16773,7 @@ namespace Events {} // namespace Events
 } // namespace KeypadInput
 namespace ContentLauncher {
 namespace Structs {
-namespace Dimension {
+namespace DimensionStruct {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
@@ -16820,8 +16820,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     return CHIP_NO_ERROR;
 }
 
-} // namespace Dimension
-namespace AdditionalInfo {
+} // namespace DimensionStruct
+namespace AdditionalInfoStruct {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
@@ -16864,8 +16864,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     return CHIP_NO_ERROR;
 }
 
-} // namespace AdditionalInfo
-namespace Parameter {
+} // namespace AdditionalInfoStruct
+namespace ParameterStruct {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
@@ -16912,8 +16912,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     return CHIP_NO_ERROR;
 }
 
-} // namespace Parameter
-namespace ContentSearch {
+} // namespace ParameterStruct
+namespace ContentSearchStruct {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
@@ -16952,13 +16952,13 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     return CHIP_NO_ERROR;
 }
 
-} // namespace ContentSearch
-namespace StyleInformation {
+} // namespace ContentSearchStruct
+namespace StyleInformationStruct {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kImageUrl)), imageUrl));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kImageURL)), imageURL));
     ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kColor)), color));
     ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kSize)), size));
     ReturnErrorOnFailure(writer.EndContainer(outer));
@@ -16980,8 +16980,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kImageUrl):
-            ReturnErrorOnFailure(DataModel::Decode(reader, imageUrl));
+        case to_underlying(Fields::kImageURL):
+            ReturnErrorOnFailure(DataModel::Decode(reader, imageURL));
             break;
         case to_underlying(Fields::kColor):
             ReturnErrorOnFailure(DataModel::Decode(reader, color));
@@ -17000,8 +17000,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     return CHIP_NO_ERROR;
 }
 
-} // namespace StyleInformation
-namespace BrandingInformation {
+} // namespace StyleInformationStruct
+namespace BrandingInformationStruct {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
@@ -17060,7 +17060,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     return CHIP_NO_ERROR;
 }
 
-} // namespace BrandingInformation
+} // namespace BrandingInformationStruct
 } // namespace Structs
 
 namespace Commands {
@@ -17155,7 +17155,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     return CHIP_NO_ERROR;
 }
 } // namespace LaunchURL.
-namespace LaunchResponse {
+namespace LauncherResponse {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
@@ -17195,7 +17195,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     ReturnErrorOnFailure(reader.ExitContainer(outer));
     return CHIP_NO_ERROR;
 }
-} // namespace LaunchResponse.
+} // namespace LauncherResponse.
 } // namespace Commands
 
 namespace Attributes {
diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h
index 8223fc23f24bc3..f04d76cca62d11 100644
--- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h
+++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h
@@ -22136,7 +22136,7 @@ struct TypeInfo
 } // namespace KeypadInput
 namespace ContentLauncher {
 namespace Structs {
-namespace Dimension {
+namespace DimensionStruct {
 enum class Fields
 {
     kWidth  = 0,
@@ -22160,8 +22160,8 @@ struct Type
 
 using DecodableType = Type;
 
-} // namespace Dimension
-namespace AdditionalInfo {
+} // namespace DimensionStruct
+namespace AdditionalInfoStruct {
 enum class Fields
 {
     kName  = 0,
@@ -22183,8 +22183,8 @@ struct Type
 
 using DecodableType = Type;
 
-} // namespace AdditionalInfo
-namespace Parameter {
+} // namespace AdditionalInfoStruct
+namespace ParameterStruct {
 enum class Fields
 {
     kType           = 0,
@@ -22197,7 +22197,7 @@ struct Type
 public:
     ParameterEnum type = static_cast<ParameterEnum>(0);
     chip::CharSpan value;
-    Optional<DataModel::List<const Structs::AdditionalInfo::Type>> externalIDList;
+    Optional<DataModel::List<const Structs::AdditionalInfoStruct::Type>> externalIDList;
 
     static constexpr bool kIsFabricScoped = false;
 
@@ -22209,15 +22209,15 @@ struct DecodableType
 public:
     ParameterEnum type = static_cast<ParameterEnum>(0);
     chip::CharSpan value;
-    Optional<DataModel::DecodableList<Structs::AdditionalInfo::DecodableType>> externalIDList;
+    Optional<DataModel::DecodableList<Structs::AdditionalInfoStruct::DecodableType>> externalIDList;
 
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 
     static constexpr bool kIsFabricScoped = false;
 };
 
-} // namespace Parameter
-namespace ContentSearch {
+} // namespace ParameterStruct
+namespace ContentSearchStruct {
 enum class Fields
 {
     kParameterList = 0,
@@ -22226,7 +22226,7 @@ enum class Fields
 struct Type
 {
 public:
-    DataModel::List<const Structs::Parameter::Type> parameterList;
+    DataModel::List<const Structs::ParameterStruct::Type> parameterList;
 
     static constexpr bool kIsFabricScoped = false;
 
@@ -22236,18 +22236,18 @@ struct Type
 struct DecodableType
 {
 public:
-    DataModel::DecodableList<Structs::Parameter::DecodableType> parameterList;
+    DataModel::DecodableList<Structs::ParameterStruct::DecodableType> parameterList;
 
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 
     static constexpr bool kIsFabricScoped = false;
 };
 
-} // namespace ContentSearch
-namespace StyleInformation {
+} // namespace ContentSearchStruct
+namespace StyleInformationStruct {
 enum class Fields
 {
-    kImageUrl = 0,
+    kImageURL = 0,
     kColor    = 1,
     kSize     = 2,
 };
@@ -22255,9 +22255,9 @@ enum class Fields
 struct Type
 {
 public:
-    Optional<chip::CharSpan> imageUrl;
+    Optional<chip::CharSpan> imageURL;
     Optional<chip::CharSpan> color;
-    Optional<Structs::Dimension::Type> size;
+    Optional<Structs::DimensionStruct::Type> size;
 
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 
@@ -22268,8 +22268,8 @@ struct Type
 
 using DecodableType = Type;
 
-} // namespace StyleInformation
-namespace BrandingInformation {
+} // namespace StyleInformationStruct
+namespace BrandingInformationStruct {
 enum class Fields
 {
     kProviderName = 0,
@@ -22284,11 +22284,11 @@ struct Type
 {
 public:
     chip::CharSpan providerName;
-    Optional<Structs::StyleInformation::Type> background;
-    Optional<Structs::StyleInformation::Type> logo;
-    Optional<Structs::StyleInformation::Type> progressBar;
-    Optional<Structs::StyleInformation::Type> splash;
-    Optional<Structs::StyleInformation::Type> waterMark;
+    Optional<Structs::StyleInformationStruct::Type> background;
+    Optional<Structs::StyleInformationStruct::Type> logo;
+    Optional<Structs::StyleInformationStruct::Type> progressBar;
+    Optional<Structs::StyleInformationStruct::Type> splash;
+    Optional<Structs::StyleInformationStruct::Type> waterMark;
 
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 
@@ -22299,7 +22299,7 @@ struct Type
 
 using DecodableType = Type;
 
-} // namespace BrandingInformation
+} // namespace BrandingInformationStruct
 } // namespace Structs
 
 namespace Commands {
@@ -22315,10 +22315,10 @@ struct Type;
 struct DecodableType;
 } // namespace LaunchURL
 
-namespace LaunchResponse {
+namespace LauncherResponse {
 struct Type;
 struct DecodableType;
-} // namespace LaunchResponse
+} // namespace LauncherResponse
 
 } // namespace Commands
 
@@ -22338,13 +22338,13 @@ struct Type
     static constexpr CommandId GetCommandId() { return Commands::LaunchContent::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::ContentLauncher::Id; }
 
-    Structs::ContentSearch::Type search;
+    Structs::ContentSearchStruct::Type search;
     bool autoPlay = static_cast<bool>(0);
     Optional<chip::CharSpan> data;
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
-    using ResponseType = Clusters::ContentLauncher::Commands::LaunchResponse::DecodableType;
+    using ResponseType = Clusters::ContentLauncher::Commands::LauncherResponse::DecodableType;
 
     static constexpr bool MustUseTimedInvoke() { return false; }
 };
@@ -22355,7 +22355,7 @@ struct DecodableType
     static constexpr CommandId GetCommandId() { return Commands::LaunchContent::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::ContentLauncher::Id; }
 
-    Structs::ContentSearch::DecodableType search;
+    Structs::ContentSearchStruct::DecodableType search;
     bool autoPlay = static_cast<bool>(0);
     Optional<chip::CharSpan> data;
     CHIP_ERROR Decode(TLV::TLVReader & reader);
@@ -22378,11 +22378,11 @@ struct Type
 
     chip::CharSpan contentURL;
     Optional<chip::CharSpan> displayString;
-    Optional<Structs::BrandingInformation::Type> brandingInformation;
+    Optional<Structs::BrandingInformationStruct::Type> brandingInformation;
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
-    using ResponseType = Clusters::ContentLauncher::Commands::LaunchResponse::DecodableType;
+    using ResponseType = Clusters::ContentLauncher::Commands::LauncherResponse::DecodableType;
 
     static constexpr bool MustUseTimedInvoke() { return false; }
 };
@@ -22395,11 +22395,11 @@ struct DecodableType
 
     chip::CharSpan contentURL;
     Optional<chip::CharSpan> displayString;
-    Optional<Structs::BrandingInformation::DecodableType> brandingInformation;
+    Optional<Structs::BrandingInformationStruct::DecodableType> brandingInformation;
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
 }; // namespace LaunchURL
-namespace LaunchResponse {
+namespace LauncherResponse {
 enum class Fields
 {
     kStatus = 0,
@@ -22410,7 +22410,7 @@ struct Type
 {
 public:
     // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return Commands::LaunchResponse::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::LauncherResponse::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::ContentLauncher::Id; }
 
     ContentLaunchStatusEnum status = static_cast<ContentLaunchStatusEnum>(0);
@@ -22426,14 +22426,14 @@ struct Type
 struct DecodableType
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::LaunchResponse::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::LauncherResponse::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::ContentLauncher::Id; }
 
     ContentLaunchStatusEnum status = static_cast<ContentLaunchStatusEnum>(0);
     Optional<chip::CharSpan> data;
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-}; // namespace LaunchResponse
+}; // namespace LauncherResponse
 } // namespace Commands
 
 namespace Attributes {
diff --git a/zzz_generated/app-common/app-common/zap-generated/ids/Commands.h b/zzz_generated/app-common/app-common/zap-generated/ids/Commands.h
index 3205ee2707acde..9c9e6f3473eaea 100644
--- a/zzz_generated/app-common/app-common/zap-generated/ids/Commands.h
+++ b/zzz_generated/app-common/app-common/zap-generated/ids/Commands.h
@@ -1004,9 +1004,9 @@ namespace LaunchURL {
 static constexpr CommandId Id = 0x00000001;
 } // namespace LaunchURL
 
-namespace LaunchResponse {
+namespace LauncherResponse {
 static constexpr CommandId Id = 0x00000002;
-} // namespace LaunchResponse
+} // namespace LauncherResponse
 
 } // namespace Commands
 } // namespace ContentLauncher
diff --git a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h
index f4cbb7a92db5dc..c4c6c77ff6a94f 100644
--- a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h
+++ b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h
@@ -6727,7 +6727,7 @@ class ContentLauncherLaunchContent : public ClusterCommand
 
 private:
     chip::app::Clusters::ContentLauncher::Commands::LaunchContent::Type mRequest;
-    TypedComplexArgument<chip::app::Clusters::ContentLauncher::Structs::ContentSearch::Type> mComplex_Search;
+    TypedComplexArgument<chip::app::Clusters::ContentLauncher::Structs::ContentSearchStruct::Type> mComplex_Search;
 };
 
 /*
@@ -6761,7 +6761,7 @@ class ContentLauncherLaunchURL : public ClusterCommand
 
 private:
     chip::app::Clusters::ContentLauncher::Commands::LaunchURL::Type mRequest;
-    TypedComplexArgument<chip::Optional<chip::app::Clusters::ContentLauncher::Structs::BrandingInformation::Type>>
+    TypedComplexArgument<chip::Optional<chip::app::Clusters::ContentLauncher::Structs::BrandingInformationStruct::Type>>
         mComplex_BrandingInformation;
 };
 
diff --git a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp
index 59df59c1eebdc7..b38f06ba93c3e0 100644
--- a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp
+++ b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp
@@ -137,13 +137,13 @@ void ComplexArgumentParser::Finalize(chip::app::Clusters::Actions::Structs::Acti
     ComplexArgumentParser::Finalize(request.state);
 }
 CHIP_ERROR ComplexArgumentParser::Setup(const char * label,
-                                        chip::app::Clusters::ContentLauncher::Structs::AdditionalInfo::Type & request,
+                                        chip::app::Clusters::ContentLauncher::Structs::AdditionalInfoStruct::Type & request,
                                         Json::Value & value)
 {
     VerifyOrReturnError(value.isObject(), CHIP_ERROR_INVALID_ARGUMENT);
 
-    ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("AdditionalInfo.name", "name", value.isMember("name")));
-    ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("AdditionalInfo.value", "value", value.isMember("value")));
+    ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("AdditionalInfoStruct.name", "name", value.isMember("name")));
+    ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("AdditionalInfoStruct.value", "value", value.isMember("value")));
 
     char labelWithMember[kMaxLabelLength];
     snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "name");
@@ -155,7 +155,7 @@ CHIP_ERROR ComplexArgumentParser::Setup(const char * label,
     return CHIP_NO_ERROR;
 }
 
-void ComplexArgumentParser::Finalize(chip::app::Clusters::ContentLauncher::Structs::AdditionalInfo::Type & request)
+void ComplexArgumentParser::Finalize(chip::app::Clusters::ContentLauncher::Structs::AdditionalInfoStruct::Type & request)
 {
     ComplexArgumentParser::Finalize(request.name);
     ComplexArgumentParser::Finalize(request.value);
@@ -349,12 +349,12 @@ void ComplexArgumentParser::Finalize(chip::app::Clusters::PowerSource::Structs::
     ComplexArgumentParser::Finalize(request.previous);
 }
 CHIP_ERROR ComplexArgumentParser::Setup(const char * label,
-                                        chip::app::Clusters::ContentLauncher::Structs::BrandingInformation::Type & request,
+                                        chip::app::Clusters::ContentLauncher::Structs::BrandingInformationStruct::Type & request,
                                         Json::Value & value)
 {
     VerifyOrReturnError(value.isObject(), CHIP_ERROR_INVALID_ARGUMENT);
 
-    ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("BrandingInformation.providerName", "providerName",
+    ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("BrandingInformationStruct.providerName", "providerName",
                                                                   value.isMember("providerName")));
 
     char labelWithMember[kMaxLabelLength];
@@ -394,7 +394,7 @@ CHIP_ERROR ComplexArgumentParser::Setup(const char * label,
     return CHIP_NO_ERROR;
 }
 
-void ComplexArgumentParser::Finalize(chip::app::Clusters::ContentLauncher::Structs::BrandingInformation::Type & request)
+void ComplexArgumentParser::Finalize(chip::app::Clusters::ContentLauncher::Structs::BrandingInformationStruct::Type & request)
 {
     ComplexArgumentParser::Finalize(request.providerName);
     ComplexArgumentParser::Finalize(request.background);
@@ -479,13 +479,13 @@ void ComplexArgumentParser::Finalize(chip::app::Clusters::Channel::Structs::Chan
     ComplexArgumentParser::Finalize(request.affiliateCallSign);
 }
 CHIP_ERROR ComplexArgumentParser::Setup(const char * label,
-                                        chip::app::Clusters::ContentLauncher::Structs::ContentSearch::Type & request,
+                                        chip::app::Clusters::ContentLauncher::Structs::ContentSearchStruct::Type & request,
                                         Json::Value & value)
 {
     VerifyOrReturnError(value.isObject(), CHIP_ERROR_INVALID_ARGUMENT);
 
-    ReturnErrorOnFailure(
-        ComplexArgumentParser::EnsureMemberExist("ContentSearch.parameterList", "parameterList", value.isMember("parameterList")));
+    ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("ContentSearchStruct.parameterList", "parameterList",
+                                                                  value.isMember("parameterList")));
 
     char labelWithMember[kMaxLabelLength];
     snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "parameterList");
@@ -494,7 +494,7 @@ CHIP_ERROR ComplexArgumentParser::Setup(const char * label,
     return CHIP_NO_ERROR;
 }
 
-void ComplexArgumentParser::Finalize(chip::app::Clusters::ContentLauncher::Structs::ContentSearch::Type & request)
+void ComplexArgumentParser::Finalize(chip::app::Clusters::ContentLauncher::Structs::ContentSearchStruct::Type & request)
 {
     ComplexArgumentParser::Finalize(request.parameterList);
 }
@@ -551,14 +551,14 @@ void ComplexArgumentParser::Finalize(chip::app::Clusters::Descriptor::Structs::D
     ComplexArgumentParser::Finalize(request.revision);
 }
 CHIP_ERROR ComplexArgumentParser::Setup(const char * label,
-                                        chip::app::Clusters::ContentLauncher::Structs::Dimension::Type & request,
+                                        chip::app::Clusters::ContentLauncher::Structs::DimensionStruct::Type & request,
                                         Json::Value & value)
 {
     VerifyOrReturnError(value.isObject(), CHIP_ERROR_INVALID_ARGUMENT);
 
-    ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("Dimension.width", "width", value.isMember("width")));
-    ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("Dimension.height", "height", value.isMember("height")));
-    ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("Dimension.metric", "metric", value.isMember("metric")));
+    ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("DimensionStruct.width", "width", value.isMember("width")));
+    ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("DimensionStruct.height", "height", value.isMember("height")));
+    ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("DimensionStruct.metric", "metric", value.isMember("metric")));
 
     char labelWithMember[kMaxLabelLength];
     snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "width");
@@ -573,7 +573,7 @@ CHIP_ERROR ComplexArgumentParser::Setup(const char * label,
     return CHIP_NO_ERROR;
 }
 
-void ComplexArgumentParser::Finalize(chip::app::Clusters::ContentLauncher::Structs::Dimension::Type & request)
+void ComplexArgumentParser::Finalize(chip::app::Clusters::ContentLauncher::Structs::DimensionStruct::Type & request)
 {
     ComplexArgumentParser::Finalize(request.width);
     ComplexArgumentParser::Finalize(request.height);
@@ -1553,13 +1553,13 @@ void ComplexArgumentParser::Finalize(chip::app::Clusters::AudioOutput::Structs::
     ComplexArgumentParser::Finalize(request.name);
 }
 CHIP_ERROR ComplexArgumentParser::Setup(const char * label,
-                                        chip::app::Clusters::ContentLauncher::Structs::Parameter::Type & request,
+                                        chip::app::Clusters::ContentLauncher::Structs::ParameterStruct::Type & request,
                                         Json::Value & value)
 {
     VerifyOrReturnError(value.isObject(), CHIP_ERROR_INVALID_ARGUMENT);
 
-    ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("Parameter.type", "type", value.isMember("type")));
-    ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("Parameter.value", "value", value.isMember("value")));
+    ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("ParameterStruct.type", "type", value.isMember("type")));
+    ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("ParameterStruct.value", "value", value.isMember("value")));
 
     char labelWithMember[kMaxLabelLength];
     snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "type");
@@ -1577,7 +1577,7 @@ CHIP_ERROR ComplexArgumentParser::Setup(const char * label,
     return CHIP_NO_ERROR;
 }
 
-void ComplexArgumentParser::Finalize(chip::app::Clusters::ContentLauncher::Structs::Parameter::Type & request)
+void ComplexArgumentParser::Finalize(chip::app::Clusters::ContentLauncher::Structs::ParameterStruct::Type & request)
 {
     ComplexArgumentParser::Finalize(request.type);
     ComplexArgumentParser::Finalize(request.value);
@@ -1813,16 +1813,16 @@ void ComplexArgumentParser::Finalize(chip::app::Clusters::UnitTesting::Structs::
     ComplexArgumentParser::Finalize(request.h);
 }
 CHIP_ERROR ComplexArgumentParser::Setup(const char * label,
-                                        chip::app::Clusters::ContentLauncher::Structs::StyleInformation::Type & request,
+                                        chip::app::Clusters::ContentLauncher::Structs::StyleInformationStruct::Type & request,
                                         Json::Value & value)
 {
     VerifyOrReturnError(value.isObject(), CHIP_ERROR_INVALID_ARGUMENT);
 
     char labelWithMember[kMaxLabelLength];
-    if (value.isMember("imageUrl"))
+    if (value.isMember("imageURL"))
     {
-        snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "imageUrl");
-        ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.imageUrl, value["imageUrl"]));
+        snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "imageURL");
+        ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.imageURL, value["imageURL"]));
     }
 
     if (value.isMember("color"))
@@ -1840,9 +1840,9 @@ CHIP_ERROR ComplexArgumentParser::Setup(const char * label,
     return CHIP_NO_ERROR;
 }
 
-void ComplexArgumentParser::Finalize(chip::app::Clusters::ContentLauncher::Structs::StyleInformation::Type & request)
+void ComplexArgumentParser::Finalize(chip::app::Clusters::ContentLauncher::Structs::StyleInformationStruct::Type & request)
 {
-    ComplexArgumentParser::Finalize(request.imageUrl);
+    ComplexArgumentParser::Finalize(request.imageURL);
     ComplexArgumentParser::Finalize(request.color);
     ComplexArgumentParser::Finalize(request.size);
 }
diff --git a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h
index 754e17ce83139d..be0a39f9e8655a 100644
--- a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h
+++ b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h
@@ -35,10 +35,10 @@ static CHIP_ERROR Setup(const char * label, chip::app::Clusters::Actions::Struct
                         Json::Value & value);
 
 static void Finalize(chip::app::Clusters::Actions::Structs::ActionStruct::Type & request);
-static CHIP_ERROR Setup(const char * label, chip::app::Clusters::ContentLauncher::Structs::AdditionalInfo::Type & request,
+static CHIP_ERROR Setup(const char * label, chip::app::Clusters::ContentLauncher::Structs::AdditionalInfoStruct::Type & request,
                         Json::Value & value);
 
-static void Finalize(chip::app::Clusters::ContentLauncher::Structs::AdditionalInfo::Type & request);
+static void Finalize(chip::app::Clusters::ContentLauncher::Structs::AdditionalInfoStruct::Type & request);
 static CHIP_ERROR Setup(const char * label, chip::app::Clusters::ApplicationLauncher::Structs::Application::Type & request,
                         Json::Value & value);
 
@@ -69,10 +69,11 @@ static CHIP_ERROR Setup(const char * label, chip::app::Clusters::PowerSource::St
                         Json::Value & value);
 
 static void Finalize(chip::app::Clusters::PowerSource::Structs::BatFaultChangeType::Type & request);
-static CHIP_ERROR Setup(const char * label, chip::app::Clusters::ContentLauncher::Structs::BrandingInformation::Type & request,
+static CHIP_ERROR Setup(const char * label,
+                        chip::app::Clusters::ContentLauncher::Structs::BrandingInformationStruct::Type & request,
                         Json::Value & value);
 
-static void Finalize(chip::app::Clusters::ContentLauncher::Structs::BrandingInformation::Type & request);
+static void Finalize(chip::app::Clusters::ContentLauncher::Structs::BrandingInformationStruct::Type & request);
 static CHIP_ERROR Setup(const char * label, chip::app::Clusters::BasicInformation::Structs::CapabilityMinimaStruct::Type & request,
                         Json::Value & value);
 
@@ -81,10 +82,10 @@ static CHIP_ERROR Setup(const char * label, chip::app::Clusters::Channel::Struct
                         Json::Value & value);
 
 static void Finalize(chip::app::Clusters::Channel::Structs::ChannelInfoStruct::Type & request);
-static CHIP_ERROR Setup(const char * label, chip::app::Clusters::ContentLauncher::Structs::ContentSearch::Type & request,
+static CHIP_ERROR Setup(const char * label, chip::app::Clusters::ContentLauncher::Structs::ContentSearchStruct::Type & request,
                         Json::Value & value);
 
-static void Finalize(chip::app::Clusters::ContentLauncher::Structs::ContentSearch::Type & request);
+static void Finalize(chip::app::Clusters::ContentLauncher::Structs::ContentSearchStruct::Type & request);
 static CHIP_ERROR Setup(const char * label, chip::app::Clusters::DoorLock::Structs::CredentialStruct::Type & request,
                         Json::Value & value);
 
@@ -93,10 +94,10 @@ static CHIP_ERROR Setup(const char * label, chip::app::Clusters::Descriptor::Str
                         Json::Value & value);
 
 static void Finalize(chip::app::Clusters::Descriptor::Structs::DeviceTypeStruct::Type & request);
-static CHIP_ERROR Setup(const char * label, chip::app::Clusters::ContentLauncher::Structs::Dimension::Type & request,
+static CHIP_ERROR Setup(const char * label, chip::app::Clusters::ContentLauncher::Structs::DimensionStruct::Type & request,
                         Json::Value & value);
 
-static void Finalize(chip::app::Clusters::ContentLauncher::Structs::Dimension::Type & request);
+static void Finalize(chip::app::Clusters::ContentLauncher::Structs::DimensionStruct::Type & request);
 static CHIP_ERROR Setup(const char * label, chip::app::Clusters::UnitTesting::Structs::DoubleNestedStructList::Type & request,
                         Json::Value & value);
 
@@ -186,10 +187,10 @@ static CHIP_ERROR Setup(const char * label, chip::app::Clusters::AudioOutput::St
                         Json::Value & value);
 
 static void Finalize(chip::app::Clusters::AudioOutput::Structs::OutputInfoStruct::Type & request);
-static CHIP_ERROR Setup(const char * label, chip::app::Clusters::ContentLauncher::Structs::Parameter::Type & request,
+static CHIP_ERROR Setup(const char * label, chip::app::Clusters::ContentLauncher::Structs::ParameterStruct::Type & request,
                         Json::Value & value);
 
-static void Finalize(chip::app::Clusters::ContentLauncher::Structs::Parameter::Type & request);
+static void Finalize(chip::app::Clusters::ContentLauncher::Structs::ParameterStruct::Type & request);
 static CHIP_ERROR Setup(const char * label, chip::app::Clusters::MediaPlayback::Structs::PlaybackPosition::Type & request,
                         Json::Value & value);
 
@@ -215,10 +216,10 @@ static CHIP_ERROR Setup(const char * label, chip::app::Clusters::UnitTesting::St
                         Json::Value & value);
 
 static void Finalize(chip::app::Clusters::UnitTesting::Structs::SimpleStruct::Type & request);
-static CHIP_ERROR Setup(const char * label, chip::app::Clusters::ContentLauncher::Structs::StyleInformation::Type & request,
+static CHIP_ERROR Setup(const char * label, chip::app::Clusters::ContentLauncher::Structs::StyleInformationStruct::Type & request,
                         Json::Value & value);
 
-static void Finalize(chip::app::Clusters::ContentLauncher::Structs::StyleInformation::Type & request);
+static void Finalize(chip::app::Clusters::ContentLauncher::Structs::StyleInformationStruct::Type & request);
 static CHIP_ERROR Setup(const char * label, chip::app::Clusters::AccessControl::Structs::Target::Type & request,
                         Json::Value & value);
 
diff --git a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp
index e19342c120e493..e00cb75950bde7 100644
--- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp
+++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp
@@ -151,8 +151,9 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
 
     return CHIP_NO_ERROR;
 }
-CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const chip::app::Clusters::ContentLauncher::Structs::AdditionalInfo::DecodableType & value)
+CHIP_ERROR
+DataModelLogger::LogValue(const char * label, size_t indent,
+                          const chip::app::Clusters::ContentLauncher::Structs::AdditionalInfoStruct::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     {
@@ -348,7 +349,7 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
 }
 CHIP_ERROR
 DataModelLogger::LogValue(const char * label, size_t indent,
-                          const chip::app::Clusters::ContentLauncher::Structs::BrandingInformation::DecodableType & value)
+                          const chip::app::Clusters::ContentLauncher::Structs::BrandingInformationStruct::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     {
@@ -476,8 +477,9 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
 
     return CHIP_NO_ERROR;
 }
-CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const chip::app::Clusters::ContentLauncher::Structs::ContentSearch::DecodableType & value)
+CHIP_ERROR
+DataModelLogger::LogValue(const char * label, size_t indent,
+                          const chip::app::Clusters::ContentLauncher::Structs::ContentSearchStruct::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     {
@@ -541,7 +543,7 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const chip::app::Clusters::ContentLauncher::Structs::Dimension::DecodableType & value)
+                                     const chip::app::Clusters::ContentLauncher::Structs::DimensionStruct::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     {
@@ -1646,7 +1648,7 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const chip::app::Clusters::ContentLauncher::Structs::Parameter::DecodableType & value)
+                                     const chip::app::Clusters::ContentLauncher::Structs::ParameterStruct::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     {
@@ -1944,15 +1946,16 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
 
     return CHIP_NO_ERROR;
 }
-CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const chip::app::Clusters::ContentLauncher::Structs::StyleInformation::DecodableType & value)
+CHIP_ERROR
+DataModelLogger::LogValue(const char * label, size_t indent,
+                          const chip::app::Clusters::ContentLauncher::Structs::StyleInformationStruct::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = LogValue("ImageUrl", indent + 1, value.imageUrl);
+        CHIP_ERROR err = LogValue("ImageURL", indent + 1, value.imageURL);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'ImageUrl'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'ImageURL'");
             return err;
         }
     }
@@ -4076,7 +4079,7 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const ContentLauncher::Commands::LaunchResponse::DecodableType & value)
+                                     const ContentLauncher::Commands::LauncherResponse::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status));
@@ -10472,10 +10475,10 @@ CHIP_ERROR DataModelLogger::LogCommand(const chip::app::ConcreteCommandPath & pa
     case ContentLauncher::Id: {
         switch (path.mCommandId)
         {
-        case ContentLauncher::Commands::LaunchResponse::Id: {
-            ContentLauncher::Commands::LaunchResponse::DecodableType value;
+        case ContentLauncher::Commands::LauncherResponse::Id: {
+            ContentLauncher::Commands::LauncherResponse::DecodableType value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("LaunchResponse", 1, value);
+            return DataModelLogger::LogValue("LauncherResponse", 1, value);
         }
         }
         break;
diff --git a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h
index 3feb91e099db25..ccdc7b796812a8 100644
--- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h
+++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h
@@ -27,7 +27,7 @@ static CHIP_ERROR LogValue(const char * label, size_t indent,
 static CHIP_ERROR LogValue(const char * label, size_t indent,
                            const chip::app::Clusters::Actions::Structs::ActionStruct::DecodableType & value);
 static CHIP_ERROR LogValue(const char * label, size_t indent,
-                           const chip::app::Clusters::ContentLauncher::Structs::AdditionalInfo::DecodableType & value);
+                           const chip::app::Clusters::ContentLauncher::Structs::AdditionalInfoStruct::DecodableType & value);
 static CHIP_ERROR LogValue(const char * label, size_t indent,
                            const chip::app::Clusters::ApplicationLauncher::Structs::Application::DecodableType & value);
 static CHIP_ERROR
@@ -44,19 +44,19 @@ static CHIP_ERROR LogValue(const char * label, size_t indent,
 static CHIP_ERROR LogValue(const char * label, size_t indent,
                            const chip::app::Clusters::PowerSource::Structs::BatFaultChangeType::DecodableType & value);
 static CHIP_ERROR LogValue(const char * label, size_t indent,
-                           const chip::app::Clusters::ContentLauncher::Structs::BrandingInformation::DecodableType & value);
+                           const chip::app::Clusters::ContentLauncher::Structs::BrandingInformationStruct::DecodableType & value);
 static CHIP_ERROR LogValue(const char * label, size_t indent,
                            const chip::app::Clusters::BasicInformation::Structs::CapabilityMinimaStruct::DecodableType & value);
 static CHIP_ERROR LogValue(const char * label, size_t indent,
                            const chip::app::Clusters::Channel::Structs::ChannelInfoStruct::DecodableType & value);
 static CHIP_ERROR LogValue(const char * label, size_t indent,
-                           const chip::app::Clusters::ContentLauncher::Structs::ContentSearch::DecodableType & value);
+                           const chip::app::Clusters::ContentLauncher::Structs::ContentSearchStruct::DecodableType & value);
 static CHIP_ERROR LogValue(const char * label, size_t indent,
                            const chip::app::Clusters::DoorLock::Structs::CredentialStruct::DecodableType & value);
 static CHIP_ERROR LogValue(const char * label, size_t indent,
                            const chip::app::Clusters::Descriptor::Structs::DeviceTypeStruct::DecodableType & value);
 static CHIP_ERROR LogValue(const char * label, size_t indent,
-                           const chip::app::Clusters::ContentLauncher::Structs::Dimension::DecodableType & value);
+                           const chip::app::Clusters::ContentLauncher::Structs::DimensionStruct::DecodableType & value);
 static CHIP_ERROR LogValue(const char * label, size_t indent,
                            const chip::app::Clusters::UnitTesting::Structs::DoubleNestedStructList::DecodableType & value);
 static CHIP_ERROR LogValue(const char * label, size_t indent,
@@ -104,7 +104,7 @@ LogValue(const char * label, size_t indent,
 static CHIP_ERROR LogValue(const char * label, size_t indent,
                            const chip::app::Clusters::AudioOutput::Structs::OutputInfoStruct::DecodableType & value);
 static CHIP_ERROR LogValue(const char * label, size_t indent,
-                           const chip::app::Clusters::ContentLauncher::Structs::Parameter::DecodableType & value);
+                           const chip::app::Clusters::ContentLauncher::Structs::ParameterStruct::DecodableType & value);
 static CHIP_ERROR LogValue(const char * label, size_t indent,
                            const chip::app::Clusters::MediaPlayback::Structs::PlaybackPosition::DecodableType & value);
 static CHIP_ERROR LogValue(const char * label, size_t indent,
@@ -118,7 +118,7 @@ static CHIP_ERROR LogValue(const char * label, size_t indent,
 static CHIP_ERROR LogValue(const char * label, size_t indent,
                            const chip::app::Clusters::UnitTesting::Structs::SimpleStruct::DecodableType & value);
 static CHIP_ERROR LogValue(const char * label, size_t indent,
-                           const chip::app::Clusters::ContentLauncher::Structs::StyleInformation::DecodableType & value);
+                           const chip::app::Clusters::ContentLauncher::Structs::StyleInformationStruct::DecodableType & value);
 static CHIP_ERROR LogValue(const char * label, size_t indent,
                            const chip::app::Clusters::AccessControl::Structs::Target::DecodableType & value);
 static CHIP_ERROR LogValue(const char * label, size_t indent,
@@ -361,7 +361,7 @@ static CHIP_ERROR LogValue(const char * label, size_t indent,
 static CHIP_ERROR LogValue(const char * label, size_t indent,
                            const chip::app::Clusters::KeypadInput::Commands::SendKeyResponse::DecodableType & value);
 static CHIP_ERROR LogValue(const char * label, size_t indent,
-                           const chip::app::Clusters::ContentLauncher::Commands::LaunchResponse::DecodableType & value);
+                           const chip::app::Clusters::ContentLauncher::Commands::LauncherResponse::DecodableType & value);
 static CHIP_ERROR LogValue(const char * label, size_t indent,
                            const chip::app::Clusters::ApplicationLauncher::Commands::LauncherResponse::DecodableType & value);
 static CHIP_ERROR LogValue(const char * label, size_t indent,
diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h
index d678f987dffc00..bb16d6ddd82251 100644
--- a/zzz_generated/chip-tool/zap-generated/test/Commands.h
+++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h
@@ -55427,7 +55427,7 @@ class TV_ContentLauncherClusterSuite : public TestCommand
         case 3:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::app::Clusters::ContentLauncher::Commands::LaunchResponse::DecodableType value;
+                chip::app::Clusters::ContentLauncher::Commands::LauncherResponse::DecodableType value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckValue("status", value.status, 0U));
                 VerifyOrReturn(CheckValuePresent("data", value.data));
@@ -55437,7 +55437,7 @@ class TV_ContentLauncherClusterSuite : public TestCommand
         case 4:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::app::Clusters::ContentLauncher::Commands::LaunchResponse::DecodableType value;
+                chip::app::Clusters::ContentLauncher::Commands::LauncherResponse::DecodableType value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckValue("status", value.status, 0U));
                 VerifyOrReturn(CheckValuePresent("data", value.data));
@@ -55488,7 +55488,7 @@ class TV_ContentLauncherClusterSuite : public TestCommand
             chip::app::Clusters::ContentLauncher::Commands::LaunchContent::Type value;
 
             {
-                auto * listHolder_1 = new ListHolder<chip::app::Clusters::ContentLauncher::Structs::Parameter::Type>(1);
+                auto * listHolder_1 = new ListHolder<chip::app::Clusters::ContentLauncher::Structs::ParameterStruct::Type>(1);
                 listFreer.add(listHolder_1);
 
                 listHolder_1->mList[0].type  = static_cast<chip::app::Clusters::ContentLauncher::ParameterEnum>(1);
@@ -55496,20 +55496,21 @@ class TV_ContentLauncherClusterSuite : public TestCommand
                 listHolder_1->mList[0].externalIDList.Emplace();
 
                 {
-                    auto * listHolder_4 = new ListHolder<chip::app::Clusters::ContentLauncher::Structs::AdditionalInfo::Type>(1);
+                    auto * listHolder_4 =
+                        new ListHolder<chip::app::Clusters::ContentLauncher::Structs::AdditionalInfoStruct::Type>(1);
                     listFreer.add(listHolder_4);
 
                     listHolder_4->mList[0].name  = chip::Span<const char>("namegarbage: not in length on purpose", 4);
                     listHolder_4->mList[0].value = chip::Span<const char>("valuegarbage: not in length on purpose", 5);
 
                     listHolder_1->mList[0].externalIDList.Value() =
-                        chip::app::DataModel::List<chip::app::Clusters::ContentLauncher::Structs::AdditionalInfo::Type>(
+                        chip::app::DataModel::List<chip::app::Clusters::ContentLauncher::Structs::AdditionalInfoStruct::Type>(
                             listHolder_4->mList, 1);
                 }
 
                 value.search.parameterList =
-                    chip::app::DataModel::List<chip::app::Clusters::ContentLauncher::Structs::Parameter::Type>(listHolder_1->mList,
-                                                                                                               1);
+                    chip::app::DataModel::List<chip::app::Clusters::ContentLauncher::Structs::ParameterStruct::Type>(
+                        listHolder_1->mList, 1);
             }
 
             value.autoPlay = true;
@@ -55533,8 +55534,8 @@ class TV_ContentLauncherClusterSuite : public TestCommand
                 chip::Span<const char>("exampleNamegarbage: not in length on purpose", 11);
             value.brandingInformation.Value().background.Emplace();
 
-            value.brandingInformation.Value().background.Value().imageUrl.Emplace();
-            value.brandingInformation.Value().background.Value().imageUrl.Value() =
+            value.brandingInformation.Value().background.Value().imageURL.Emplace();
+            value.brandingInformation.Value().background.Value().imageURL.Value() =
                 chip::Span<const char>("exampleUrlgarbage: not in length on purpose", 10);
             value.brandingInformation.Value().background.Value().color.Emplace();
             value.brandingInformation.Value().background.Value().color.Value() =
@@ -55548,8 +55549,8 @@ class TV_ContentLauncherClusterSuite : public TestCommand
 
             value.brandingInformation.Value().logo.Emplace();
 
-            value.brandingInformation.Value().logo.Value().imageUrl.Emplace();
-            value.brandingInformation.Value().logo.Value().imageUrl.Value() =
+            value.brandingInformation.Value().logo.Value().imageURL.Emplace();
+            value.brandingInformation.Value().logo.Value().imageURL.Value() =
                 chip::Span<const char>("exampleUrlgarbage: not in length on purpose", 10);
             value.brandingInformation.Value().logo.Value().color.Emplace();
             value.brandingInformation.Value().logo.Value().color.Value() =
@@ -55563,8 +55564,8 @@ class TV_ContentLauncherClusterSuite : public TestCommand
 
             value.brandingInformation.Value().progressBar.Emplace();
 
-            value.brandingInformation.Value().progressBar.Value().imageUrl.Emplace();
-            value.brandingInformation.Value().progressBar.Value().imageUrl.Value() =
+            value.brandingInformation.Value().progressBar.Value().imageURL.Emplace();
+            value.brandingInformation.Value().progressBar.Value().imageURL.Value() =
                 chip::Span<const char>("exampleUrlgarbage: not in length on purpose", 10);
             value.brandingInformation.Value().progressBar.Value().color.Emplace();
             value.brandingInformation.Value().progressBar.Value().color.Value() =
@@ -55578,8 +55579,8 @@ class TV_ContentLauncherClusterSuite : public TestCommand
 
             value.brandingInformation.Value().splash.Emplace();
 
-            value.brandingInformation.Value().splash.Value().imageUrl.Emplace();
-            value.brandingInformation.Value().splash.Value().imageUrl.Value() =
+            value.brandingInformation.Value().splash.Value().imageURL.Emplace();
+            value.brandingInformation.Value().splash.Value().imageURL.Value() =
                 chip::Span<const char>("exampleUrlgarbage: not in length on purpose", 10);
             value.brandingInformation.Value().splash.Value().color.Emplace();
             value.brandingInformation.Value().splash.Value().color.Value() =
@@ -55593,8 +55594,8 @@ class TV_ContentLauncherClusterSuite : public TestCommand
 
             value.brandingInformation.Value().waterMark.Emplace();
 
-            value.brandingInformation.Value().waterMark.Value().imageUrl.Emplace();
-            value.brandingInformation.Value().waterMark.Value().imageUrl.Value() =
+            value.brandingInformation.Value().waterMark.Value().imageURL.Emplace();
+            value.brandingInformation.Value().waterMark.Value().imageURL.Value() =
                 chip::Span<const char>("exampleUrlgarbage: not in length on purpose", 10);
             value.brandingInformation.Value().waterMark.Value().color.Emplace();
             value.brandingInformation.Value().waterMark.Value().color.Value() =
diff --git a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h
index 584d0117c276a1..88ed9aa788bcf7 100644
--- a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h
+++ b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h
@@ -72537,12 +72537,12 @@ class ContentLauncherLaunchContent : public ClusterCommand {
         __auto_type * params = [[MTRContentLauncherClusterLaunchContentParams alloc] init];
         params.timedInvokeTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.search = [MTRContentLauncherClusterContentSearch new];
+        params.search = [MTRContentLauncherClusterContentSearchStruct new];
         { // Scope for our temporary variables
             auto * array_1 = [NSMutableArray new];
             for (auto & entry_1 : mRequest.search.parameterList) {
-                MTRContentLauncherClusterParameter * newElement_1;
-                newElement_1 = [MTRContentLauncherClusterParameter new];
+                MTRContentLauncherClusterParameterStruct * newElement_1;
+                newElement_1 = [MTRContentLauncherClusterParameterStruct new];
                 newElement_1.type = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_1.type)];
                 newElement_1.value = [[NSString alloc] initWithBytes:entry_1.value.data()
                                                               length:entry_1.value.size()
@@ -72551,8 +72551,8 @@ class ContentLauncherLaunchContent : public ClusterCommand {
                     { // Scope for our temporary variables
                         auto * array_4 = [NSMutableArray new];
                         for (auto & entry_4 : entry_1.externalIDList.Value()) {
-                            MTRContentLauncherClusterAdditionalInfo * newElement_4;
-                            newElement_4 = [MTRContentLauncherClusterAdditionalInfo new];
+                            MTRContentLauncherClusterAdditionalInfoStruct * newElement_4;
+                            newElement_4 = [MTRContentLauncherClusterAdditionalInfoStruct new];
                             newElement_4.name = [[NSString alloc] initWithBytes:entry_4.name.data()
                                                                          length:entry_4.name.size()
                                                                        encoding:NSUTF8StringEncoding];
@@ -72582,8 +72582,8 @@ class ContentLauncherLaunchContent : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster launchContentWithParams:params
-                                  completion:^(
-                                      MTRContentLauncherClusterLaunchResponseParams * _Nullable values, NSError * _Nullable error) {
+                                  completion:^(MTRContentLauncherClusterLauncherResponseParams * _Nullable values,
+                                      NSError * _Nullable error) {
                                       NSLog(@"Values: %@", values);
                                       responsesNeeded--;
                                       if (error != nil) {
@@ -72600,7 +72600,7 @@ class ContentLauncherLaunchContent : public ClusterCommand {
 
 private:
     chip::app::Clusters::ContentLauncher::Commands::LaunchContent::Type mRequest;
-    TypedComplexArgument<chip::app::Clusters::ContentLauncher::Structs::ContentSearch::Type> mComplex_Search;
+    TypedComplexArgument<chip::app::Clusters::ContentLauncher::Structs::ContentSearchStruct::Type> mComplex_Search;
 };
 
 /*
@@ -72640,20 +72640,20 @@ class ContentLauncherLaunchURL : public ClusterCommand {
             params.displayString = nil;
         }
         if (mRequest.brandingInformation.HasValue()) {
-            params.brandingInformation = [MTRContentLauncherClusterBrandingInformation new];
+            params.brandingInformation = [MTRContentLauncherClusterBrandingInformationStruct new];
             params.brandingInformation.providerName =
                 [[NSString alloc] initWithBytes:mRequest.brandingInformation.Value().providerName.data()
                                          length:mRequest.brandingInformation.Value().providerName.size()
                                        encoding:NSUTF8StringEncoding];
             if (mRequest.brandingInformation.Value().background.HasValue()) {
-                params.brandingInformation.background = [MTRContentLauncherClusterStyleInformation new];
-                if (mRequest.brandingInformation.Value().background.Value().imageUrl.HasValue()) {
-                    params.brandingInformation.background.imageUrl = [[NSString alloc]
-                        initWithBytes:mRequest.brandingInformation.Value().background.Value().imageUrl.Value().data()
-                               length:mRequest.brandingInformation.Value().background.Value().imageUrl.Value().size()
+                params.brandingInformation.background = [MTRContentLauncherClusterStyleInformationStruct new];
+                if (mRequest.brandingInformation.Value().background.Value().imageURL.HasValue()) {
+                    params.brandingInformation.background.imageURL = [[NSString alloc]
+                        initWithBytes:mRequest.brandingInformation.Value().background.Value().imageURL.Value().data()
+                               length:mRequest.brandingInformation.Value().background.Value().imageURL.Value().size()
                              encoding:NSUTF8StringEncoding];
                 } else {
-                    params.brandingInformation.background.imageUrl = nil;
+                    params.brandingInformation.background.imageURL = nil;
                 }
                 if (mRequest.brandingInformation.Value().background.Value().color.HasValue()) {
                     params.brandingInformation.background.color =
@@ -72664,7 +72664,7 @@ class ContentLauncherLaunchURL : public ClusterCommand {
                     params.brandingInformation.background.color = nil;
                 }
                 if (mRequest.brandingInformation.Value().background.Value().size.HasValue()) {
-                    params.brandingInformation.background.size = [MTRContentLauncherClusterDimension new];
+                    params.brandingInformation.background.size = [MTRContentLauncherClusterDimensionStruct new];
                     params.brandingInformation.background.size.width =
                         [NSNumber numberWithDouble:mRequest.brandingInformation.Value().background.Value().size.Value().width];
                     params.brandingInformation.background.size.height =
@@ -72679,14 +72679,14 @@ class ContentLauncherLaunchURL : public ClusterCommand {
                 params.brandingInformation.background = nil;
             }
             if (mRequest.brandingInformation.Value().logo.HasValue()) {
-                params.brandingInformation.logo = [MTRContentLauncherClusterStyleInformation new];
-                if (mRequest.brandingInformation.Value().logo.Value().imageUrl.HasValue()) {
-                    params.brandingInformation.logo.imageUrl =
-                        [[NSString alloc] initWithBytes:mRequest.brandingInformation.Value().logo.Value().imageUrl.Value().data()
-                                                 length:mRequest.brandingInformation.Value().logo.Value().imageUrl.Value().size()
+                params.brandingInformation.logo = [MTRContentLauncherClusterStyleInformationStruct new];
+                if (mRequest.brandingInformation.Value().logo.Value().imageURL.HasValue()) {
+                    params.brandingInformation.logo.imageURL =
+                        [[NSString alloc] initWithBytes:mRequest.brandingInformation.Value().logo.Value().imageURL.Value().data()
+                                                 length:mRequest.brandingInformation.Value().logo.Value().imageURL.Value().size()
                                                encoding:NSUTF8StringEncoding];
                 } else {
-                    params.brandingInformation.logo.imageUrl = nil;
+                    params.brandingInformation.logo.imageURL = nil;
                 }
                 if (mRequest.brandingInformation.Value().logo.Value().color.HasValue()) {
                     params.brandingInformation.logo.color =
@@ -72697,7 +72697,7 @@ class ContentLauncherLaunchURL : public ClusterCommand {
                     params.brandingInformation.logo.color = nil;
                 }
                 if (mRequest.brandingInformation.Value().logo.Value().size.HasValue()) {
-                    params.brandingInformation.logo.size = [MTRContentLauncherClusterDimension new];
+                    params.brandingInformation.logo.size = [MTRContentLauncherClusterDimensionStruct new];
                     params.brandingInformation.logo.size.width =
                         [NSNumber numberWithDouble:mRequest.brandingInformation.Value().logo.Value().size.Value().width];
                     params.brandingInformation.logo.size.height =
@@ -72712,14 +72712,14 @@ class ContentLauncherLaunchURL : public ClusterCommand {
                 params.brandingInformation.logo = nil;
             }
             if (mRequest.brandingInformation.Value().progressBar.HasValue()) {
-                params.brandingInformation.progressBar = [MTRContentLauncherClusterStyleInformation new];
-                if (mRequest.brandingInformation.Value().progressBar.Value().imageUrl.HasValue()) {
-                    params.brandingInformation.progressBar.imageUrl = [[NSString alloc]
-                        initWithBytes:mRequest.brandingInformation.Value().progressBar.Value().imageUrl.Value().data()
-                               length:mRequest.brandingInformation.Value().progressBar.Value().imageUrl.Value().size()
+                params.brandingInformation.progressBar = [MTRContentLauncherClusterStyleInformationStruct new];
+                if (mRequest.brandingInformation.Value().progressBar.Value().imageURL.HasValue()) {
+                    params.brandingInformation.progressBar.imageURL = [[NSString alloc]
+                        initWithBytes:mRequest.brandingInformation.Value().progressBar.Value().imageURL.Value().data()
+                               length:mRequest.brandingInformation.Value().progressBar.Value().imageURL.Value().size()
                              encoding:NSUTF8StringEncoding];
                 } else {
-                    params.brandingInformation.progressBar.imageUrl = nil;
+                    params.brandingInformation.progressBar.imageURL = nil;
                 }
                 if (mRequest.brandingInformation.Value().progressBar.Value().color.HasValue()) {
                     params.brandingInformation.progressBar.color = [[NSString alloc]
@@ -72730,7 +72730,7 @@ class ContentLauncherLaunchURL : public ClusterCommand {
                     params.brandingInformation.progressBar.color = nil;
                 }
                 if (mRequest.brandingInformation.Value().progressBar.Value().size.HasValue()) {
-                    params.brandingInformation.progressBar.size = [MTRContentLauncherClusterDimension new];
+                    params.brandingInformation.progressBar.size = [MTRContentLauncherClusterDimensionStruct new];
                     params.brandingInformation.progressBar.size.width =
                         [NSNumber numberWithDouble:mRequest.brandingInformation.Value().progressBar.Value().size.Value().width];
                     params.brandingInformation.progressBar.size.height =
@@ -72745,14 +72745,14 @@ class ContentLauncherLaunchURL : public ClusterCommand {
                 params.brandingInformation.progressBar = nil;
             }
             if (mRequest.brandingInformation.Value().splash.HasValue()) {
-                params.brandingInformation.splash = [MTRContentLauncherClusterStyleInformation new];
-                if (mRequest.brandingInformation.Value().splash.Value().imageUrl.HasValue()) {
-                    params.brandingInformation.splash.imageUrl =
-                        [[NSString alloc] initWithBytes:mRequest.brandingInformation.Value().splash.Value().imageUrl.Value().data()
-                                                 length:mRequest.brandingInformation.Value().splash.Value().imageUrl.Value().size()
+                params.brandingInformation.splash = [MTRContentLauncherClusterStyleInformationStruct new];
+                if (mRequest.brandingInformation.Value().splash.Value().imageURL.HasValue()) {
+                    params.brandingInformation.splash.imageURL =
+                        [[NSString alloc] initWithBytes:mRequest.brandingInformation.Value().splash.Value().imageURL.Value().data()
+                                                 length:mRequest.brandingInformation.Value().splash.Value().imageURL.Value().size()
                                                encoding:NSUTF8StringEncoding];
                 } else {
-                    params.brandingInformation.splash.imageUrl = nil;
+                    params.brandingInformation.splash.imageURL = nil;
                 }
                 if (mRequest.brandingInformation.Value().splash.Value().color.HasValue()) {
                     params.brandingInformation.splash.color =
@@ -72763,7 +72763,7 @@ class ContentLauncherLaunchURL : public ClusterCommand {
                     params.brandingInformation.splash.color = nil;
                 }
                 if (mRequest.brandingInformation.Value().splash.Value().size.HasValue()) {
-                    params.brandingInformation.splash.size = [MTRContentLauncherClusterDimension new];
+                    params.brandingInformation.splash.size = [MTRContentLauncherClusterDimensionStruct new];
                     params.brandingInformation.splash.size.width =
                         [NSNumber numberWithDouble:mRequest.brandingInformation.Value().splash.Value().size.Value().width];
                     params.brandingInformation.splash.size.height =
@@ -72778,14 +72778,14 @@ class ContentLauncherLaunchURL : public ClusterCommand {
                 params.brandingInformation.splash = nil;
             }
             if (mRequest.brandingInformation.Value().waterMark.HasValue()) {
-                params.brandingInformation.waterMark = [MTRContentLauncherClusterStyleInformation new];
-                if (mRequest.brandingInformation.Value().waterMark.Value().imageUrl.HasValue()) {
-                    params.brandingInformation.waterMark.imageUrl = [[NSString alloc]
-                        initWithBytes:mRequest.brandingInformation.Value().waterMark.Value().imageUrl.Value().data()
-                               length:mRequest.brandingInformation.Value().waterMark.Value().imageUrl.Value().size()
+                params.brandingInformation.waterMark = [MTRContentLauncherClusterStyleInformationStruct new];
+                if (mRequest.brandingInformation.Value().waterMark.Value().imageURL.HasValue()) {
+                    params.brandingInformation.waterMark.imageURL = [[NSString alloc]
+                        initWithBytes:mRequest.brandingInformation.Value().waterMark.Value().imageURL.Value().data()
+                               length:mRequest.brandingInformation.Value().waterMark.Value().imageURL.Value().size()
                              encoding:NSUTF8StringEncoding];
                 } else {
-                    params.brandingInformation.waterMark.imageUrl = nil;
+                    params.brandingInformation.waterMark.imageURL = nil;
                 }
                 if (mRequest.brandingInformation.Value().waterMark.Value().color.HasValue()) {
                     params.brandingInformation.waterMark.color =
@@ -72796,7 +72796,7 @@ class ContentLauncherLaunchURL : public ClusterCommand {
                     params.brandingInformation.waterMark.color = nil;
                 }
                 if (mRequest.brandingInformation.Value().waterMark.Value().size.HasValue()) {
-                    params.brandingInformation.waterMark.size = [MTRContentLauncherClusterDimension new];
+                    params.brandingInformation.waterMark.size = [MTRContentLauncherClusterDimensionStruct new];
                     params.brandingInformation.waterMark.size.width =
                         [NSNumber numberWithDouble:mRequest.brandingInformation.Value().waterMark.Value().size.Value().width];
                     params.brandingInformation.waterMark.size.height =
@@ -72816,26 +72816,26 @@ class ContentLauncherLaunchURL : public ClusterCommand {
         uint16_t repeatCount = mRepeatCount.ValueOr(1);
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
-            [cluster
-                launchURLWithParams:params
-                         completion:^(MTRContentLauncherClusterLaunchResponseParams * _Nullable values, NSError * _Nullable error) {
-                             NSLog(@"Values: %@", values);
-                             responsesNeeded--;
-                             if (error != nil) {
-                                 mError = error;
-                                 LogNSError("Error", error);
-                             }
-                             if (responsesNeeded == 0) {
-                                 SetCommandExitStatus(mError);
-                             }
-                         }];
+            [cluster launchURLWithParams:params
+                              completion:^(
+                                  MTRContentLauncherClusterLauncherResponseParams * _Nullable values, NSError * _Nullable error) {
+                                  NSLog(@"Values: %@", values);
+                                  responsesNeeded--;
+                                  if (error != nil) {
+                                      mError = error;
+                                      LogNSError("Error", error);
+                                  }
+                                  if (responsesNeeded == 0) {
+                                      SetCommandExitStatus(mError);
+                                  }
+                              }];
         }
         return CHIP_NO_ERROR;
     }
 
 private:
     chip::app::Clusters::ContentLauncher::Commands::LaunchURL::Type mRequest;
-    TypedComplexArgument<chip::Optional<chip::app::Clusters::ContentLauncher::Structs::BrandingInformation::Type>>
+    TypedComplexArgument<chip::Optional<chip::app::Clusters::ContentLauncher::Structs::BrandingInformationStruct::Type>>
         mComplex_BrandingInformation;
 };
 
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 f3d5c39e4273a8..636757b9a45c6b 100644
--- a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h
+++ b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h
@@ -75964,41 +75964,41 @@ class TV_ContentLauncherCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[MTRContentLauncherClusterLaunchContentParams alloc] init];
-        params.search = [[MTRContentLauncherClusterContentSearch alloc] init];
+        params.search = [[MTRContentLauncherClusterContentSearchStruct alloc] init];
         {
             NSMutableArray * temp_1 = [[NSMutableArray alloc] init];
-            temp_1[0] = [[MTRContentLauncherClusterParameter alloc] init];
-            ((MTRContentLauncherClusterParameter *) temp_1[0]).type = [NSNumber numberWithUnsignedChar:1U];
-            ((MTRContentLauncherClusterParameter *) temp_1[0]).value = @"exampleValue";
+            temp_1[0] = [[MTRContentLauncherClusterParameterStruct alloc] init];
+            ((MTRContentLauncherClusterParameterStruct *) temp_1[0]).type = [NSNumber numberWithUnsignedChar:1U];
+            ((MTRContentLauncherClusterParameterStruct *) temp_1[0]).value = @"exampleValue";
             {
                 NSMutableArray * temp_4 = [[NSMutableArray alloc] init];
-                temp_4[0] = [[MTRContentLauncherClusterAdditionalInfo alloc] init];
-                ((MTRContentLauncherClusterAdditionalInfo *) temp_4[0]).name = @"name";
-                ((MTRContentLauncherClusterAdditionalInfo *) temp_4[0]).value = @"value";
+                temp_4[0] = [[MTRContentLauncherClusterAdditionalInfoStruct alloc] init];
+                ((MTRContentLauncherClusterAdditionalInfoStruct *) temp_4[0]).name = @"name";
+                ((MTRContentLauncherClusterAdditionalInfoStruct *) temp_4[0]).value = @"value";
 
-                ((MTRContentLauncherClusterParameter *) temp_1[0]).externalIDList = temp_4;
+                ((MTRContentLauncherClusterParameterStruct *) temp_1[0]).externalIDList = temp_4;
             }
 
-            ((MTRContentLauncherClusterContentSearch *) params.search).parameterList = temp_1;
+            ((MTRContentLauncherClusterContentSearchStruct *) params.search).parameterList = temp_1;
         }
 
         params.autoPlay = [NSNumber numberWithBool:true];
         params.data = @"exampleData";
         [cluster
             launchContentWithParams:params
-                         completion:^(MTRContentLauncherClusterLaunchResponseParams * _Nullable values, NSError * _Nullable err) {
+                         completion:^(MTRContentLauncherClusterLauncherResponseParams * _Nullable values, NSError * _Nullable err) {
                              NSLog(@"Launch Content Command Error: %@", err);
 
                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
                              {
                                  id actualValue = values.status;
-                                 VerifyOrReturn(CheckValue("status", actualValue, 0U));
+                                 VerifyOrReturn(CheckValue("Status", actualValue, 0U));
                              }
 
                              {
                                  id actualValue = values.data;
-                                 VerifyOrReturn(CheckValueAsString("data", actualValue, @"exampleData"));
+                                 VerifyOrReturn(CheckValueAsString("Data", actualValue, @"exampleData"));
                              }
 
                              NextTest();
@@ -76018,191 +76018,222 @@ class TV_ContentLauncherCluster : public TestCommandBridge {
         __auto_type * params = [[MTRContentLauncherClusterLaunchURLParams alloc] init];
         params.contentURL = @"exampleUrl";
         params.displayString = @"exampleDisplayString";
-        params.brandingInformation = [[MTRContentLauncherClusterBrandingInformation alloc] init];
-        ((MTRContentLauncherClusterBrandingInformation *) params.brandingInformation).providerName = @"exampleName";
-        ((MTRContentLauncherClusterBrandingInformation *) params.brandingInformation).background =
-            [[MTRContentLauncherClusterStyleInformation alloc] init];
-        ((MTRContentLauncherClusterStyleInformation *) ((MTRContentLauncherClusterBrandingInformation *) params.brandingInformation)
+        params.brandingInformation = [[MTRContentLauncherClusterBrandingInformationStruct alloc] init];
+        ((MTRContentLauncherClusterBrandingInformationStruct *) params.brandingInformation).providerName = @"exampleName";
+        ((MTRContentLauncherClusterBrandingInformationStruct *) params.brandingInformation).background =
+            [[MTRContentLauncherClusterStyleInformationStruct alloc] init];
+        ((MTRContentLauncherClusterStyleInformationStruct *) ((MTRContentLauncherClusterBrandingInformationStruct *)
+                                                                  params.brandingInformation)
                 .background)
-            .imageUrl
+            .imageURL
             = @"exampleUrl";
-        ((MTRContentLauncherClusterStyleInformation *) ((MTRContentLauncherClusterBrandingInformation *) params.brandingInformation)
+        ((MTRContentLauncherClusterStyleInformationStruct *) ((MTRContentLauncherClusterBrandingInformationStruct *)
+                                                                  params.brandingInformation)
                 .background)
             .color
             = @"exampleColor";
-        ((MTRContentLauncherClusterStyleInformation *) ((MTRContentLauncherClusterBrandingInformation *) params.brandingInformation)
+        ((MTRContentLauncherClusterStyleInformationStruct *) ((MTRContentLauncherClusterBrandingInformationStruct *)
+                                                                  params.brandingInformation)
                 .background)
             .size
-            = [[MTRContentLauncherClusterDimension alloc] init];
-        ((MTRContentLauncherClusterDimension *) ((MTRContentLauncherClusterStyleInformation *) ((MTRContentLauncherClusterBrandingInformation *)
-                                                                                                    params.brandingInformation)
-                                                     .background)
+            = [[MTRContentLauncherClusterDimensionStruct alloc] init];
+        ((MTRContentLauncherClusterDimensionStruct *) ((MTRContentLauncherClusterStyleInformationStruct *) ((MTRContentLauncherClusterBrandingInformationStruct *)
+                                                                                                                params
+                                                                                                                    .brandingInformation)
+                                                           .background)
                 .size)
             .width
             = [NSNumber numberWithDouble:0];
-        ((MTRContentLauncherClusterDimension *) ((MTRContentLauncherClusterStyleInformation *) ((MTRContentLauncherClusterBrandingInformation *)
-                                                                                                    params.brandingInformation)
-                                                     .background)
+        ((MTRContentLauncherClusterDimensionStruct *) ((MTRContentLauncherClusterStyleInformationStruct *) ((MTRContentLauncherClusterBrandingInformationStruct *)
+                                                                                                                params
+                                                                                                                    .brandingInformation)
+                                                           .background)
                 .size)
             .height
             = [NSNumber numberWithDouble:0];
-        ((MTRContentLauncherClusterDimension *) ((MTRContentLauncherClusterStyleInformation *) ((MTRContentLauncherClusterBrandingInformation *)
-                                                                                                    params.brandingInformation)
-                                                     .background)
+        ((MTRContentLauncherClusterDimensionStruct *) ((MTRContentLauncherClusterStyleInformationStruct *) ((MTRContentLauncherClusterBrandingInformationStruct *)
+                                                                                                                params
+                                                                                                                    .brandingInformation)
+                                                           .background)
                 .size)
             .metric
             = [NSNumber numberWithUnsignedChar:0U];
 
-        ((MTRContentLauncherClusterBrandingInformation *) params.brandingInformation).logo =
-            [[MTRContentLauncherClusterStyleInformation alloc] init];
-        ((MTRContentLauncherClusterStyleInformation *) ((MTRContentLauncherClusterBrandingInformation *) params.brandingInformation)
+        ((MTRContentLauncherClusterBrandingInformationStruct *) params.brandingInformation).logo =
+            [[MTRContentLauncherClusterStyleInformationStruct alloc] init];
+        ((MTRContentLauncherClusterStyleInformationStruct *) ((MTRContentLauncherClusterBrandingInformationStruct *)
+                                                                  params.brandingInformation)
                 .logo)
-            .imageUrl
+            .imageURL
             = @"exampleUrl";
-        ((MTRContentLauncherClusterStyleInformation *) ((MTRContentLauncherClusterBrandingInformation *) params.brandingInformation)
+        ((MTRContentLauncherClusterStyleInformationStruct *) ((MTRContentLauncherClusterBrandingInformationStruct *)
+                                                                  params.brandingInformation)
                 .logo)
             .color
             = @"exampleColor";
-        ((MTRContentLauncherClusterStyleInformation *) ((MTRContentLauncherClusterBrandingInformation *) params.brandingInformation)
+        ((MTRContentLauncherClusterStyleInformationStruct *) ((MTRContentLauncherClusterBrandingInformationStruct *)
+                                                                  params.brandingInformation)
                 .logo)
             .size
-            = [[MTRContentLauncherClusterDimension alloc] init];
-        ((MTRContentLauncherClusterDimension *) ((MTRContentLauncherClusterStyleInformation *) ((MTRContentLauncherClusterBrandingInformation *)
-                                                                                                    params.brandingInformation)
-                                                     .logo)
+            = [[MTRContentLauncherClusterDimensionStruct alloc] init];
+        ((MTRContentLauncherClusterDimensionStruct *) ((MTRContentLauncherClusterStyleInformationStruct *) ((MTRContentLauncherClusterBrandingInformationStruct *)
+                                                                                                                params
+                                                                                                                    .brandingInformation)
+                                                           .logo)
                 .size)
             .width
             = [NSNumber numberWithDouble:0];
-        ((MTRContentLauncherClusterDimension *) ((MTRContentLauncherClusterStyleInformation *) ((MTRContentLauncherClusterBrandingInformation *)
-                                                                                                    params.brandingInformation)
-                                                     .logo)
+        ((MTRContentLauncherClusterDimensionStruct *) ((MTRContentLauncherClusterStyleInformationStruct *) ((MTRContentLauncherClusterBrandingInformationStruct *)
+                                                                                                                params
+                                                                                                                    .brandingInformation)
+                                                           .logo)
                 .size)
             .height
             = [NSNumber numberWithDouble:0];
-        ((MTRContentLauncherClusterDimension *) ((MTRContentLauncherClusterStyleInformation *) ((MTRContentLauncherClusterBrandingInformation *)
-                                                                                                    params.brandingInformation)
-                                                     .logo)
+        ((MTRContentLauncherClusterDimensionStruct *) ((MTRContentLauncherClusterStyleInformationStruct *) ((MTRContentLauncherClusterBrandingInformationStruct *)
+                                                                                                                params
+                                                                                                                    .brandingInformation)
+                                                           .logo)
                 .size)
             .metric
             = [NSNumber numberWithUnsignedChar:0U];
 
-        ((MTRContentLauncherClusterBrandingInformation *) params.brandingInformation).progressBar =
-            [[MTRContentLauncherClusterStyleInformation alloc] init];
-        ((MTRContentLauncherClusterStyleInformation *) ((MTRContentLauncherClusterBrandingInformation *) params.brandingInformation)
+        ((MTRContentLauncherClusterBrandingInformationStruct *) params.brandingInformation).progressBar =
+            [[MTRContentLauncherClusterStyleInformationStruct alloc] init];
+        ((MTRContentLauncherClusterStyleInformationStruct *) ((MTRContentLauncherClusterBrandingInformationStruct *)
+                                                                  params.brandingInformation)
                 .progressBar)
-            .imageUrl
+            .imageURL
             = @"exampleUrl";
-        ((MTRContentLauncherClusterStyleInformation *) ((MTRContentLauncherClusterBrandingInformation *) params.brandingInformation)
+        ((MTRContentLauncherClusterStyleInformationStruct *) ((MTRContentLauncherClusterBrandingInformationStruct *)
+                                                                  params.brandingInformation)
                 .progressBar)
             .color
             = @"exampleColor";
-        ((MTRContentLauncherClusterStyleInformation *) ((MTRContentLauncherClusterBrandingInformation *) params.brandingInformation)
+        ((MTRContentLauncherClusterStyleInformationStruct *) ((MTRContentLauncherClusterBrandingInformationStruct *)
+                                                                  params.brandingInformation)
                 .progressBar)
             .size
-            = [[MTRContentLauncherClusterDimension alloc] init];
-        ((MTRContentLauncherClusterDimension *) ((MTRContentLauncherClusterStyleInformation *) ((MTRContentLauncherClusterBrandingInformation *)
-                                                                                                    params.brandingInformation)
-                                                     .progressBar)
+            = [[MTRContentLauncherClusterDimensionStruct alloc] init];
+        ((MTRContentLauncherClusterDimensionStruct *) ((MTRContentLauncherClusterStyleInformationStruct *) ((MTRContentLauncherClusterBrandingInformationStruct *)
+                                                                                                                params
+                                                                                                                    .brandingInformation)
+                                                           .progressBar)
                 .size)
             .width
             = [NSNumber numberWithDouble:0];
-        ((MTRContentLauncherClusterDimension *) ((MTRContentLauncherClusterStyleInformation *) ((MTRContentLauncherClusterBrandingInformation *)
-                                                                                                    params.brandingInformation)
-                                                     .progressBar)
+        ((MTRContentLauncherClusterDimensionStruct *) ((MTRContentLauncherClusterStyleInformationStruct *) ((MTRContentLauncherClusterBrandingInformationStruct *)
+                                                                                                                params
+                                                                                                                    .brandingInformation)
+                                                           .progressBar)
                 .size)
             .height
             = [NSNumber numberWithDouble:0];
-        ((MTRContentLauncherClusterDimension *) ((MTRContentLauncherClusterStyleInformation *) ((MTRContentLauncherClusterBrandingInformation *)
-                                                                                                    params.brandingInformation)
-                                                     .progressBar)
+        ((MTRContentLauncherClusterDimensionStruct *) ((MTRContentLauncherClusterStyleInformationStruct *) ((MTRContentLauncherClusterBrandingInformationStruct *)
+                                                                                                                params
+                                                                                                                    .brandingInformation)
+                                                           .progressBar)
                 .size)
             .metric
             = [NSNumber numberWithUnsignedChar:0U];
 
-        ((MTRContentLauncherClusterBrandingInformation *) params.brandingInformation).splash =
-            [[MTRContentLauncherClusterStyleInformation alloc] init];
-        ((MTRContentLauncherClusterStyleInformation *) ((MTRContentLauncherClusterBrandingInformation *) params.brandingInformation)
+        ((MTRContentLauncherClusterBrandingInformationStruct *) params.brandingInformation).splash =
+            [[MTRContentLauncherClusterStyleInformationStruct alloc] init];
+        ((MTRContentLauncherClusterStyleInformationStruct *) ((MTRContentLauncherClusterBrandingInformationStruct *)
+                                                                  params.brandingInformation)
                 .splash)
-            .imageUrl
+            .imageURL
             = @"exampleUrl";
-        ((MTRContentLauncherClusterStyleInformation *) ((MTRContentLauncherClusterBrandingInformation *) params.brandingInformation)
+        ((MTRContentLauncherClusterStyleInformationStruct *) ((MTRContentLauncherClusterBrandingInformationStruct *)
+                                                                  params.brandingInformation)
                 .splash)
             .color
             = @"exampleColor";
-        ((MTRContentLauncherClusterStyleInformation *) ((MTRContentLauncherClusterBrandingInformation *) params.brandingInformation)
+        ((MTRContentLauncherClusterStyleInformationStruct *) ((MTRContentLauncherClusterBrandingInformationStruct *)
+                                                                  params.brandingInformation)
                 .splash)
             .size
-            = [[MTRContentLauncherClusterDimension alloc] init];
-        ((MTRContentLauncherClusterDimension *) ((MTRContentLauncherClusterStyleInformation *) ((MTRContentLauncherClusterBrandingInformation *)
-                                                                                                    params.brandingInformation)
-                                                     .splash)
+            = [[MTRContentLauncherClusterDimensionStruct alloc] init];
+        ((MTRContentLauncherClusterDimensionStruct *) ((MTRContentLauncherClusterStyleInformationStruct *) ((MTRContentLauncherClusterBrandingInformationStruct *)
+                                                                                                                params
+                                                                                                                    .brandingInformation)
+                                                           .splash)
                 .size)
             .width
             = [NSNumber numberWithDouble:0];
-        ((MTRContentLauncherClusterDimension *) ((MTRContentLauncherClusterStyleInformation *) ((MTRContentLauncherClusterBrandingInformation *)
-                                                                                                    params.brandingInformation)
-                                                     .splash)
+        ((MTRContentLauncherClusterDimensionStruct *) ((MTRContentLauncherClusterStyleInformationStruct *) ((MTRContentLauncherClusterBrandingInformationStruct *)
+                                                                                                                params
+                                                                                                                    .brandingInformation)
+                                                           .splash)
                 .size)
             .height
             = [NSNumber numberWithDouble:0];
-        ((MTRContentLauncherClusterDimension *) ((MTRContentLauncherClusterStyleInformation *) ((MTRContentLauncherClusterBrandingInformation *)
-                                                                                                    params.brandingInformation)
-                                                     .splash)
+        ((MTRContentLauncherClusterDimensionStruct *) ((MTRContentLauncherClusterStyleInformationStruct *) ((MTRContentLauncherClusterBrandingInformationStruct *)
+                                                                                                                params
+                                                                                                                    .brandingInformation)
+                                                           .splash)
                 .size)
             .metric
             = [NSNumber numberWithUnsignedChar:0U];
 
-        ((MTRContentLauncherClusterBrandingInformation *) params.brandingInformation).waterMark =
-            [[MTRContentLauncherClusterStyleInformation alloc] init];
-        ((MTRContentLauncherClusterStyleInformation *) ((MTRContentLauncherClusterBrandingInformation *) params.brandingInformation)
+        ((MTRContentLauncherClusterBrandingInformationStruct *) params.brandingInformation).waterMark =
+            [[MTRContentLauncherClusterStyleInformationStruct alloc] init];
+        ((MTRContentLauncherClusterStyleInformationStruct *) ((MTRContentLauncherClusterBrandingInformationStruct *)
+                                                                  params.brandingInformation)
                 .waterMark)
-            .imageUrl
+            .imageURL
             = @"exampleUrl";
-        ((MTRContentLauncherClusterStyleInformation *) ((MTRContentLauncherClusterBrandingInformation *) params.brandingInformation)
+        ((MTRContentLauncherClusterStyleInformationStruct *) ((MTRContentLauncherClusterBrandingInformationStruct *)
+                                                                  params.brandingInformation)
                 .waterMark)
             .color
             = @"exampleColor";
-        ((MTRContentLauncherClusterStyleInformation *) ((MTRContentLauncherClusterBrandingInformation *) params.brandingInformation)
+        ((MTRContentLauncherClusterStyleInformationStruct *) ((MTRContentLauncherClusterBrandingInformationStruct *)
+                                                                  params.brandingInformation)
                 .waterMark)
             .size
-            = [[MTRContentLauncherClusterDimension alloc] init];
-        ((MTRContentLauncherClusterDimension *) ((MTRContentLauncherClusterStyleInformation *) ((MTRContentLauncherClusterBrandingInformation *)
-                                                                                                    params.brandingInformation)
-                                                     .waterMark)
+            = [[MTRContentLauncherClusterDimensionStruct alloc] init];
+        ((MTRContentLauncherClusterDimensionStruct *) ((MTRContentLauncherClusterStyleInformationStruct *) ((MTRContentLauncherClusterBrandingInformationStruct *)
+                                                                                                                params
+                                                                                                                    .brandingInformation)
+                                                           .waterMark)
                 .size)
             .width
             = [NSNumber numberWithDouble:0];
-        ((MTRContentLauncherClusterDimension *) ((MTRContentLauncherClusterStyleInformation *) ((MTRContentLauncherClusterBrandingInformation *)
-                                                                                                    params.brandingInformation)
-                                                     .waterMark)
+        ((MTRContentLauncherClusterDimensionStruct *) ((MTRContentLauncherClusterStyleInformationStruct *) ((MTRContentLauncherClusterBrandingInformationStruct *)
+                                                                                                                params
+                                                                                                                    .brandingInformation)
+                                                           .waterMark)
                 .size)
             .height
             = [NSNumber numberWithDouble:0];
-        ((MTRContentLauncherClusterDimension *) ((MTRContentLauncherClusterStyleInformation *) ((MTRContentLauncherClusterBrandingInformation *)
-                                                                                                    params.brandingInformation)
-                                                     .waterMark)
+        ((MTRContentLauncherClusterDimensionStruct *) ((MTRContentLauncherClusterStyleInformationStruct *) ((MTRContentLauncherClusterBrandingInformationStruct *)
+                                                                                                                params
+                                                                                                                    .brandingInformation)
+                                                           .waterMark)
                 .size)
             .metric
             = [NSNumber numberWithUnsignedChar:0U];
 
-        [cluster launchURLWithParams:params
-                          completion:^(MTRContentLauncherClusterLaunchResponseParams * _Nullable values, NSError * _Nullable err) {
-                              NSLog(@"Launch URL Command Error: %@", err);
+        [cluster
+            launchURLWithParams:params
+                     completion:^(MTRContentLauncherClusterLauncherResponseParams * _Nullable values, NSError * _Nullable err) {
+                         NSLog(@"Launch URL Command Error: %@", err);
 
-                              VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                         VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                              {
-                                  id actualValue = values.status;
-                                  VerifyOrReturn(CheckValue("status", actualValue, 0U));
-                              }
+                         {
+                             id actualValue = values.status;
+                             VerifyOrReturn(CheckValue("Status", actualValue, 0U));
+                         }
 
-                              {
-                                  id actualValue = values.data;
-                                  VerifyOrReturn(CheckValueAsString("data", actualValue, @"exampleData"));
-                              }
+                         {
+                             id actualValue = values.data;
+                             VerifyOrReturn(CheckValueAsString("Data", actualValue, @"exampleData"));
+                         }
 
-                              NextTest();
-                          }];
+                         NextTest();
+                     }];
 
         return CHIP_NO_ERROR;
     }