[Silabs] Rename examples folder (#26766)

* rename build scripts

* Rename Lighting-silabs

* Rename light-switch-app

* Rename Lock-app

* rename thermostat

* rename silabs chef

* Fix build CI

* fix doc

* fix doc

* regen matter

* fix ci

---------

Co-authored-by: Andrei Litvin <andy314@gmail.com>
diff --git a/.github/workflows/examples-efr32.yaml b/.github/workflows/examples-efr32.yaml
index 17e0b56..d8961dd 100644
--- a/.github/workflows/examples-efr32.yaml
+++ b/.github/workflows/examples-efr32.yaml
@@ -87,7 +87,7 @@
       - name: Test SLC gen
         timeout-minutes: 30
         run: |
-          scripts/examples/gn_efr32_example.sh examples/lighting-app/silabs/efr32 ./out/light-app BRD4187C --slc_generate --docker
+          scripts/examples/gn_silabs_example.sh examples/lighting-app/silabs ./out/light-app BRD4187C --slc_generate --docker
           rm -rf ./out/
       - name: Build some BRD4187C variants
         timeout-minutes: 90
@@ -120,7 +120,7 @@
       - name: Build example EFR32+WF200 WiFi Lock app for BRD4161A
         timeout-minutes: 15
         run: |
-          scripts/examples/gn_efr32_example.sh examples/lock-app/silabs/efr32/ out/lock_app_wifi_wf200 BRD4161A is_debug=false chip_logging=false --wifi wf200 --docker
+          scripts/examples/gn_silabs_example.sh examples/lock-app/silabs out/lock_app_wifi_wf200 BRD4161A is_debug=false chip_logging=false --wifi wf200 --docker
           .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py efr32 BRD4161A+wf200 lock-app \
             out/lock_app_wifi_wf200/BRD4161A/matter-silabs-lock-example.out /tmp/bloat_reports/
       - name: Clean out build output
@@ -128,7 +128,7 @@
       - name: Build example EFR32+RS9116 WiFi Lighting app for BRD4161A
         timeout-minutes: 15
         run: |
-          scripts/examples/gn_efr32_example.sh examples/lighting-app/silabs/efr32/ out/lighting_app_wifi_rs9116 BRD4161A --wifi rs9116 --docker
+          scripts/examples/gn_silabs_example.sh examples/lighting-app/silabs out/lighting_app_wifi_rs9116 BRD4161A --wifi rs9116 --docker
           .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py efr32 BRD4161A+rs9116 lighting-app \
             out/lighting_app_wifi_rs9116/BRD4161A/matter-silabs-lighting-example.out /tmp/bloat_reports/
       - name: Clean out build output
diff --git a/.github/workflows/release_artifacts.yaml b/.github/workflows/release_artifacts.yaml
index 314600d..fc371f6 100644
--- a/.github/workflows/release_artifacts.yaml
+++ b/.github/workflows/release_artifacts.yaml
@@ -124,7 +124,7 @@
                       .environment/pigweed-venv/*.log
 
             - name: Build example EFR32 Lock App
-              run: scripts/examples/gn_efr32_example.sh examples/lock-app/efr32/
+              run: scripts/examples/gn_silabs_example.sh examples/lock-app/efr32/
                   out/lock_app_debug $SILABS_BOARD
 
             - name: Upload artifact
diff --git a/docs/guides/darwin.md b/docs/guides/darwin.md
index b83a943..197023c 100644
--- a/docs/guides/darwin.md
+++ b/docs/guides/darwin.md
@@ -252,7 +252,7 @@
 ##### Guides
 
 -   [Bouffalo Lab](/examples/lighting-app/bouffalolab/README.md)
--   [EFR32 Window Covering](/examples/window-app/silabs/efr32/README.md)
+-   [EFR32 Window Covering](/examples/window-app/silabs/README.md)
 -   [ESP32 All Clusters](/examples/all-clusters-app/esp32/README.md)
 -   [ESP32 Lighting](/examples/lighting-app/esp32/README.md)
 -   [ESP32 Temperature Sensor](/examples/temperature-measurement-app/esp32/README.md)
diff --git a/examples/chef/chef.py b/examples/chef/chef.py
index 516d51e..b663a49 100755
--- a/examples/chef/chef.py
+++ b/examples/chef/chef.py
@@ -662,7 +662,7 @@
                 shell.run_cmd(f"rm -rf out/{options.sample_device_type_name}")
             efr32_cmd_args = []
             efr32_cmd_args.append(
-                f'{_REPO_BASE_PATH}/scripts/examples/gn_efr32_example.sh')
+                f'{_REPO_BASE_PATH}/scripts/examples/gn_silabs_example.sh')
             efr32_cmd_args.append('./')
             efr32_cmd_args.append(f'out/{options.sample_device_type_name}')
             efr32_cmd_args.append(f'{silabs_board}')
diff --git a/examples/chef/efr32/.gn b/examples/chef/silabs/.gn
similarity index 100%
rename from examples/chef/efr32/.gn
rename to examples/chef/silabs/.gn
diff --git a/examples/chef/efr32/BUILD.gn b/examples/chef/silabs/BUILD.gn
similarity index 100%
rename from examples/chef/efr32/BUILD.gn
rename to examples/chef/silabs/BUILD.gn
diff --git a/examples/chef/efr32/args.gni b/examples/chef/silabs/args.gni
similarity index 100%
rename from examples/chef/efr32/args.gni
rename to examples/chef/silabs/args.gni
diff --git a/examples/chef/efr32/build_for_wifi_args.gni b/examples/chef/silabs/build_for_wifi_args.gni
similarity index 100%
rename from examples/chef/efr32/build_for_wifi_args.gni
rename to examples/chef/silabs/build_for_wifi_args.gni
diff --git a/examples/chef/efr32/build_for_wifi_gnfile.gn b/examples/chef/silabs/build_for_wifi_gnfile.gn
similarity index 100%
rename from examples/chef/efr32/build_for_wifi_gnfile.gn
rename to examples/chef/silabs/build_for_wifi_gnfile.gn
diff --git a/examples/chef/efr32/build_overrides b/examples/chef/silabs/build_overrides
similarity index 100%
rename from examples/chef/efr32/build_overrides
rename to examples/chef/silabs/build_overrides
diff --git a/examples/chef/efr32/include/AppConfig.h b/examples/chef/silabs/include/AppConfig.h
similarity index 100%
rename from examples/chef/efr32/include/AppConfig.h
rename to examples/chef/silabs/include/AppConfig.h
diff --git a/examples/chef/efr32/include/AppEvent.h b/examples/chef/silabs/include/AppEvent.h
similarity index 100%
rename from examples/chef/efr32/include/AppEvent.h
rename to examples/chef/silabs/include/AppEvent.h
diff --git a/examples/chef/efr32/include/AppTask.h b/examples/chef/silabs/include/AppTask.h
similarity index 100%
rename from examples/chef/efr32/include/AppTask.h
rename to examples/chef/silabs/include/AppTask.h
diff --git a/examples/chef/efr32/include/CHIPProjectConfig.h b/examples/chef/silabs/include/CHIPProjectConfig.h
similarity index 100%
rename from examples/chef/efr32/include/CHIPProjectConfig.h
rename to examples/chef/silabs/include/CHIPProjectConfig.h
diff --git a/examples/chef/efr32/include/LightingManager.h b/examples/chef/silabs/include/LightingManager.h
similarity index 100%
rename from examples/chef/efr32/include/LightingManager.h
rename to examples/chef/silabs/include/LightingManager.h
diff --git a/examples/chef/efr32/src/AppTask.cpp b/examples/chef/silabs/src/AppTask.cpp
similarity index 100%
rename from examples/chef/efr32/src/AppTask.cpp
rename to examples/chef/silabs/src/AppTask.cpp
diff --git a/examples/chef/efr32/src/LightingManager.cpp b/examples/chef/silabs/src/LightingManager.cpp
similarity index 100%
rename from examples/chef/efr32/src/LightingManager.cpp
rename to examples/chef/silabs/src/LightingManager.cpp
diff --git a/examples/chef/efr32/src/ZclCallbacks.cpp b/examples/chef/silabs/src/ZclCallbacks.cpp
similarity index 100%
rename from examples/chef/efr32/src/ZclCallbacks.cpp
rename to examples/chef/silabs/src/ZclCallbacks.cpp
diff --git a/examples/chef/efr32/third_party/connectedhomeip b/examples/chef/silabs/third_party/connectedhomeip
similarity index 100%
rename from examples/chef/efr32/third_party/connectedhomeip
rename to examples/chef/silabs/third_party/connectedhomeip
diff --git a/examples/chef/efr32/with_pw_rpc.gni b/examples/chef/silabs/with_pw_rpc.gni
similarity index 100%
rename from examples/chef/efr32/with_pw_rpc.gni
rename to examples/chef/silabs/with_pw_rpc.gni
diff --git a/examples/light-switch-app/silabs/efr32/.gn b/examples/light-switch-app/silabs/.gn
similarity index 100%
rename from examples/light-switch-app/silabs/efr32/.gn
rename to examples/light-switch-app/silabs/.gn
diff --git a/examples/light-switch-app/silabs/efr32/BUILD.gn b/examples/light-switch-app/silabs/BUILD.gn
similarity index 92%
rename from examples/light-switch-app/silabs/efr32/BUILD.gn
rename to examples/light-switch-app/silabs/BUILD.gn
index f735164..0707f6d 100644
--- a/examples/light-switch-app/silabs/efr32/BUILD.gn
+++ b/examples/light-switch-app/silabs/BUILD.gn
@@ -31,7 +31,7 @@
 
 assert(current_os == "freertos")
 
-silabs_project_dir = "${chip_root}/examples/light-switch-app/silabs/efr32"
+silabs_project_dir = "${chip_root}/examples/light-switch-app/silabs"
 examples_common_plat_dir = "${chip_root}/examples/platform/silabs"
 
 if (wifi_soc) {
@@ -80,7 +80,6 @@
     ]
 
     include_dirs = [
-      "${chip_root}/examples/light-switch-app/silabs/common",
       "${chip_root}/src/platform/silabs/efr32",
       "${silabs_project_dir}/include",
       "${examples_plat_dir}",
@@ -114,17 +113,14 @@
 
 silabs_executable("light_switch_app") {
   output_name = "matter-silabs-light-switch-example.out"
-  include_dirs = [
-    "include",
-    "${chip_root}/examples/light-switch-app/silabs/common/",
-  ]
+  include_dirs = [ "include" ]
   defines = []
 
   sources = [
-    "${chip_root}/examples/light-switch-app/silabs/common/BindingHandler.cpp",
-    "${chip_root}/examples/light-switch-app/silabs/common/LightSwitchMgr.cpp",
     "${examples_common_plat_dir}/main.cpp",
     "src/AppTask.cpp",
+    "src/BindingHandler.cpp",
+    "src/LightSwitchMgr.cpp",
     "src/ZclCallbacks.cpp",
   ]
 
@@ -140,9 +136,7 @@
   }
 
   if (chip_build_libshell) {
-    sources += [
-      "${chip_root}/examples/light-switch-app/silabs/common/ShellCommands.cpp",
-    ]
+    sources += [ "src/ShellCommands.cpp" ]
   }
 
   if (chip_enable_pw_rpc) {
diff --git a/examples/light-switch-app/silabs/efr32/README.md b/examples/light-switch-app/silabs/README.md
similarity index 92%
rename from examples/light-switch-app/silabs/efr32/README.md
rename to examples/light-switch-app/silabs/README.md
index a5f71d1..9ca79a8 100644
--- a/examples/light-switch-app/silabs/efr32/README.md
+++ b/examples/light-switch-app/silabs/README.md
@@ -106,7 +106,7 @@
 *   Build the example application:
 
           cd ~/connectedhomeip
-          ./scripts/examples/gn_efr32_example.sh ./examples/light-switch-app/silabs/efr32/ ./out/light-switch-app BRD4187C
+          ./scripts/examples/gn_silabs_example.sh ./examples/light-switch-app/silabs/efr32/ ./out/light-switch-app BRD4187C
 
 -   To delete generated executable, libraries and object files use:
 
@@ -129,11 +129,11 @@
 
 *   Build the example with Matter shell
 
-          ./scripts/examples/gn_efr32_example.sh examples/light-switch-app/silabs/efr32/ out/light-switch-app BRD4187C chip_build_libshell=true
+          ./scripts/examples/gn_silabs_example.sh examples/light-switch-app/silabs/efr32/ out/light-switch-app BRD4187C chip_build_libshell=true
 
 *   Build the example as Sleepy End Device (SED)
 
-          $ ./scripts/examples/gn_efr32_example.sh ./examples/light-switch-app/silabs/efr32/ ./out/light-switch-app_SED BRD4187C --sed
+          $ ./scripts/examples/gn_silabs_example.sh ./examples/light-switch-app/silabs/efr32/ ./out/light-switch-app_SED BRD4187C --sed
 
     or use gn as previously mentioned but adding the following arguments:
 
@@ -141,7 +141,7 @@
 
 *   Build the example with pigweed RCP
 
-          $ ./scripts/examples/gn_efr32_example.sh examples/light-switch-app/silabs/efr32/ out/light-switch-app_rpc BRD4187C 'import("//with_pw_rpc.gni")'
+          $ ./scripts/examples/gn_silabs_example.sh examples/light-switch-app/silabs/efr32/ out/light-switch-app_rpc BRD4187C 'import("//with_pw_rpc.gni")'
 
     or use GN/Ninja Directly
 
@@ -155,7 +155,7 @@
 For more build options, help is provided when running the build script without
 arguments
 
-    ./scripts/examples/gn_efr32_example.sh
+    ./scripts/examples/gn_silabs_example.sh
 
 ## Flashing the Application
 
@@ -243,7 +243,7 @@
 
 -   For this example to work, it is necessary to have a second efr32 device
     running the
-    [lighting app example](https://github.com/project-chip/connectedhomeip/blob/master/examples/lighting-app/silabs/efr32/README.md)
+    [lighting app example](https://github.com/project-chip/connectedhomeip/blob/master/examples/lighting-app/silabs/README.md)
     commissioned on the same openthread network
 
 -   User interface : **LCD** The LCD on Silabs WSTK shows a QR Code. This QR
@@ -409,7 +409,7 @@
 
 For the description of Software Update process with EFR32 example applications
 see
-[EFR32 OTA Software Update](../../../../docs/guides/silabs_efr32_software_update.md)
+[EFR32 OTA Software Update](../../../docs/guides/silabs_efr32_software_update.md)
 
 ## Building options
 
@@ -421,19 +421,19 @@
 
 chip_progress_logging, chip_detail_logging, chip_automation_logging
 
-    $ ./scripts/examples/gn_efr32_example.sh ./examples/light-switch-app/silabs/efr32 ./out/light-switch-app BRD4164A "chip_detail_logging=false chip_automation_logging=false chip_progress_logging=false"
+    $ ./scripts/examples/gn_silabs_example.sh ./examples/light-switch-app/silabs/efr32 ./out/light-switch-app BRD4164A "chip_detail_logging=false chip_automation_logging=false chip_progress_logging=false"
 
 ### Debug build / release build
 
 is_debug
 
-    $ ./scripts/examples/gn_efr32_example.sh ./examples/light-switch-app/silabs/efr32 ./out/light-switch-app BRD4164A "is_debug=false"
+    $ ./scripts/examples/gn_silabs_example.sh ./examples/light-switch-app/silabs/efr32 ./out/light-switch-app BRD4164A "is_debug=false"
 
 ### Disabling LCD
 
 show_qr_code
 
-    $ ./scripts/examples/gn_efr32_example.sh ./examples/light-switch-app/silabs/efr32 ./out/light-switch-app BRD4164A "show_qr_code=false"
+    $ ./scripts/examples/gn_silabs_example.sh ./examples/light-switch-app/silabs/efr32 ./out/light-switch-app BRD4164A "show_qr_code=false"
 
 ### KVS maximum entry count
 
@@ -442,4 +442,4 @@
     Set the maximum Kvs entries that can be stored in NVM (Default 75)
     Thresholds: 30 <= kvs_max_entries <= 255
 
-    $ ./scripts/examples/gn_efr32_example.sh ./examples/light-switch-app/silabs/efr32 ./out/light-switch-app BRD4164A kvs_max_entries=50
+    $ ./scripts/examples/gn_silabs_example.sh ./examples/light-switch-app/silabs/efr32 ./out/light-switch-app BRD4164A kvs_max_entries=50
diff --git a/examples/light-switch-app/silabs/efr32/build_for_wifi_args.gni b/examples/light-switch-app/silabs/build_for_wifi_args.gni
similarity index 100%
rename from examples/light-switch-app/silabs/efr32/build_for_wifi_args.gni
rename to examples/light-switch-app/silabs/build_for_wifi_args.gni
diff --git a/examples/light-switch-app/silabs/efr32/build_for_wifi_gnfile.gn b/examples/light-switch-app/silabs/build_for_wifi_gnfile.gn
similarity index 100%
rename from examples/light-switch-app/silabs/efr32/build_for_wifi_gnfile.gn
rename to examples/light-switch-app/silabs/build_for_wifi_gnfile.gn
diff --git a/examples/chef/efr32/build_overrides b/examples/light-switch-app/silabs/build_overrides
similarity index 100%
copy from examples/chef/efr32/build_overrides
copy to examples/light-switch-app/silabs/build_overrides
diff --git a/examples/light-switch-app/silabs/efr32/build_overrides b/examples/light-switch-app/silabs/efr32/build_overrides
deleted file mode 120000
index 995884e..0000000
--- a/examples/light-switch-app/silabs/efr32/build_overrides
+++ /dev/null
@@ -1 +0,0 @@
-../../../build_overrides
\ No newline at end of file
diff --git a/examples/light-switch-app/silabs/efr32/third_party/connectedhomeip b/examples/light-switch-app/silabs/efr32/third_party/connectedhomeip
deleted file mode 120000
index 5930783..0000000
--- a/examples/light-switch-app/silabs/efr32/third_party/connectedhomeip
+++ /dev/null
@@ -1 +0,0 @@
-../../../../..
\ No newline at end of file
diff --git a/examples/light-switch-app/silabs/efr32/include/AppConfig.h b/examples/light-switch-app/silabs/include/AppConfig.h
similarity index 100%
rename from examples/light-switch-app/silabs/efr32/include/AppConfig.h
rename to examples/light-switch-app/silabs/include/AppConfig.h
diff --git a/examples/light-switch-app/silabs/efr32/include/AppEvent.h b/examples/light-switch-app/silabs/include/AppEvent.h
similarity index 100%
rename from examples/light-switch-app/silabs/efr32/include/AppEvent.h
rename to examples/light-switch-app/silabs/include/AppEvent.h
diff --git a/examples/light-switch-app/silabs/efr32/include/AppTask.h b/examples/light-switch-app/silabs/include/AppTask.h
similarity index 100%
rename from examples/light-switch-app/silabs/efr32/include/AppTask.h
rename to examples/light-switch-app/silabs/include/AppTask.h
diff --git a/examples/light-switch-app/silabs/common/BindingHandler.h b/examples/light-switch-app/silabs/include/BindingHandler.h
similarity index 100%
rename from examples/light-switch-app/silabs/common/BindingHandler.h
rename to examples/light-switch-app/silabs/include/BindingHandler.h
diff --git a/examples/light-switch-app/silabs/efr32/include/CHIPProjectConfig.h b/examples/light-switch-app/silabs/include/CHIPProjectConfig.h
similarity index 100%
rename from examples/light-switch-app/silabs/efr32/include/CHIPProjectConfig.h
rename to examples/light-switch-app/silabs/include/CHIPProjectConfig.h
diff --git a/examples/light-switch-app/silabs/common/LightSwitchMgr.h b/examples/light-switch-app/silabs/include/LightSwitchMgr.h
similarity index 100%
rename from examples/light-switch-app/silabs/common/LightSwitchMgr.h
rename to examples/light-switch-app/silabs/include/LightSwitchMgr.h
diff --git a/examples/light-switch-app/silabs/common/ShellCommands.h b/examples/light-switch-app/silabs/include/ShellCommands.h
similarity index 100%
rename from examples/light-switch-app/silabs/common/ShellCommands.h
rename to examples/light-switch-app/silabs/include/ShellCommands.h
diff --git a/examples/light-switch-app/silabs/efr32/openthread.gn b/examples/light-switch-app/silabs/openthread.gn
similarity index 100%
rename from examples/light-switch-app/silabs/efr32/openthread.gn
rename to examples/light-switch-app/silabs/openthread.gn
diff --git a/examples/light-switch-app/silabs/efr32/openthread.gni b/examples/light-switch-app/silabs/openthread.gni
similarity index 100%
rename from examples/light-switch-app/silabs/efr32/openthread.gni
rename to examples/light-switch-app/silabs/openthread.gni
diff --git a/examples/light-switch-app/silabs/efr32/src/AppTask.cpp b/examples/light-switch-app/silabs/src/AppTask.cpp
similarity index 100%
rename from examples/light-switch-app/silabs/efr32/src/AppTask.cpp
rename to examples/light-switch-app/silabs/src/AppTask.cpp
diff --git a/examples/light-switch-app/silabs/common/BindingHandler.cpp b/examples/light-switch-app/silabs/src/BindingHandler.cpp
similarity index 100%
rename from examples/light-switch-app/silabs/common/BindingHandler.cpp
rename to examples/light-switch-app/silabs/src/BindingHandler.cpp
diff --git a/examples/light-switch-app/silabs/common/LightSwitchMgr.cpp b/examples/light-switch-app/silabs/src/LightSwitchMgr.cpp
similarity index 100%
rename from examples/light-switch-app/silabs/common/LightSwitchMgr.cpp
rename to examples/light-switch-app/silabs/src/LightSwitchMgr.cpp
diff --git a/examples/light-switch-app/silabs/common/ShellCommands.cpp b/examples/light-switch-app/silabs/src/ShellCommands.cpp
similarity index 100%
rename from examples/light-switch-app/silabs/common/ShellCommands.cpp
rename to examples/light-switch-app/silabs/src/ShellCommands.cpp
diff --git a/examples/light-switch-app/silabs/efr32/src/ZclCallbacks.cpp b/examples/light-switch-app/silabs/src/ZclCallbacks.cpp
similarity index 100%
rename from examples/light-switch-app/silabs/efr32/src/ZclCallbacks.cpp
rename to examples/light-switch-app/silabs/src/ZclCallbacks.cpp
diff --git a/examples/chef/efr32/third_party/connectedhomeip b/examples/light-switch-app/silabs/third_party/connectedhomeip
similarity index 100%
copy from examples/chef/efr32/third_party/connectedhomeip
copy to examples/light-switch-app/silabs/third_party/connectedhomeip
diff --git a/examples/lighting-app/silabs/efr32/.gn b/examples/lighting-app/silabs/.gn
similarity index 100%
rename from examples/lighting-app/silabs/efr32/.gn
rename to examples/lighting-app/silabs/.gn
diff --git a/examples/lighting-app/silabs/efr32/BUILD.gn b/examples/lighting-app/silabs/BUILD.gn
similarity index 98%
rename from examples/lighting-app/silabs/efr32/BUILD.gn
rename to examples/lighting-app/silabs/BUILD.gn
index 3202237..a9687bb 100644
--- a/examples/lighting-app/silabs/efr32/BUILD.gn
+++ b/examples/lighting-app/silabs/BUILD.gn
@@ -31,7 +31,7 @@
 
 assert(current_os == "freertos")
 
-silabs_project_dir = "${chip_root}/examples/lighting-app/silabs/efr32"
+silabs_project_dir = "${chip_root}/examples/lighting-app/silabs"
 examples_common_plat_dir = "${chip_root}/examples/platform/silabs"
 
 if (wifi_soc) {
diff --git a/examples/lighting-app/silabs/efr32/README.md b/examples/lighting-app/silabs/README.md
similarity index 92%
rename from examples/lighting-app/silabs/efr32/README.md
rename to examples/lighting-app/silabs/README.md
index d429367..4d7c873 100644
--- a/examples/lighting-app/silabs/efr32/README.md
+++ b/examples/lighting-app/silabs/README.md
@@ -102,7 +102,7 @@
 *   Build the example application:
 
           cd ~/connectedhomeip
-          ./scripts/examples/gn_efr32_example.sh ./examples/lighting-app/silabs/efr32/ ./out/lighting-app BRD4187C
+          ./scripts/examples/gn_silabs_example.sh ./examples/lighting-app/silabs/efr32/ ./out/lighting-app BRD4187C
 
 -   To delete generated executable, libraries and object files use:
 
@@ -125,7 +125,7 @@
 
 *   Build the example as Sleepy End Device (SED)
 
-          $ ./scripts/examples/gn_efr32_example.sh ./examples/lighting-app/silabs/efr32/ ./out/lighting-app_SED BRD4187C --sed
+          $ ./scripts/examples/gn_silabs_example.sh ./examples/lighting-app/silabs/efr32/ ./out/lighting-app_SED BRD4187C --sed
 
     or use gn as previously mentioned but adding the following arguments:
 
@@ -133,7 +133,7 @@
 
 *   Build the example with pigweed RPC
 
-          $ ./scripts/examples/gn_efr32_example.sh examples/lighting-app/silabs/efr32/ out/lighting_app_rpc BRD4187C 'import("//with_pw_rpc.gni")'
+          $ ./scripts/examples/gn_silabs_example.sh examples/lighting-app/silabs/efr32/ out/lighting_app_rpc BRD4187C 'import("//with_pw_rpc.gni")'
 
     or use GN/Ninja Directly
 
@@ -149,7 +149,7 @@
 For more build options, help is provided when running the build script without
 arguments
 
-         ./scripts/examples/gn_efr32_example.sh
+         ./scripts/examples/gn_silabs_example.sh
 
 ## Flashing the Application
 
@@ -348,13 +348,13 @@
 
 For the description of Software Update process with EFR32 example applications
 see
-[EFR32 OTA Software Update](../../../../docs/guides/silabs_efr32_software_update.md)
+[EFR32 OTA Software Update](../../../docs/guides/silabs_efr32_software_update.md)
 
 ## Group Communication (Multicast)
 
 With this lighting example you can also use group communication to send Lighting
 commands to multiples devices at once. Please refer to the
-[chip-tool documentation](../../../chip-tool/README.md) _Configuring the server
+[chip-tool documentation](../../chip-tool/README.md) _Configuring the server
 side for Group Commands_ and _Using the Client to Send Group (Multicast) Matter
 Commands_
 
@@ -369,19 +369,19 @@
 
 `chip_progress_logging, chip_detail_logging, chip_automation_logging`
 
-    $ ./scripts/examples/gn_efr32_example.sh ./examples/lighting-app/silabs/efr32 ./out/lighting-app BRD4164A "chip_detail_logging=false chip_automation_logging=false chip_progress_logging=false"
+    $ ./scripts/examples/gn_silabs_example.sh ./examples/lighting-app/silabs/efr32 ./out/lighting-app BRD4164A "chip_detail_logging=false chip_automation_logging=false chip_progress_logging=false"
 
 ### Debug build / release build
 
 `is_debug`
 
-    $ ./scripts/examples/gn_efr32_example.sh ./examples/lighting-app/silabs/efr32 ./out/lighting-app BRD4164A "is_debug=false"
+    $ ./scripts/examples/gn_silabs_example.sh ./examples/lighting-app/silabs/efr32 ./out/lighting-app BRD4164A "is_debug=false"
 
 ### Disabling LCD
 
 `show_qr_code`
 
-    $ ./scripts/examples/gn_efr32_example.sh ./examples/lighting-app/silabs/efr32 ./out/lighting-app BRD4164A "show_qr_code=false"
+    $ ./scripts/examples/gn_silabs_example.sh ./examples/lighting-app/silabs/efr32 ./out/lighting-app BRD4164A "show_qr_code=false"
 
 ### KVS maximum entry count
 
@@ -390,4 +390,4 @@
     Set the maximum Kvs entries that can be stored in NVM (Default 75)
     Thresholds: 30 <= kvs_max_entries <= 255
 
-    $ ./scripts/examples/gn_efr32_example.sh ./examples/lighting-app/silabs/efr32 ./out/lighting-app BRD4164A kvs_max_entries=50
+    $ ./scripts/examples/gn_silabs_example.sh ./examples/lighting-app/silabs/efr32 ./out/lighting-app BRD4164A kvs_max_entries=50
diff --git a/examples/lighting-app/silabs/SiWx917/args.gni b/examples/lighting-app/silabs/SiWx917/args.gni
deleted file mode 100644
index 7157754..0000000
--- a/examples/lighting-app/silabs/SiWx917/args.gni
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright (c) 2020 Project CHIP Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-import("//build_overrides/chip.gni")
-import("${chip_root}/config/standalone/args.gni")
-
-silabs_sdk_target = get_label_info(":sdk", "label_no_toolchain")
-import("${chip_root}/src/platform/silabs/args.gni")
-
-app_data_model = "${chip_root}/examples/lighting-app/silabs/SiWx917/data_model:silabs-lighting"
-chip_enable_ota_requestor = true
diff --git a/examples/lighting-app/silabs/SiWx917/with_pw_rpc.gni b/examples/lighting-app/silabs/SiWx917/with_pw_rpc.gni
deleted file mode 100644
index a2f5570..0000000
--- a/examples/lighting-app/silabs/SiWx917/with_pw_rpc.gni
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright (c) 2021 Project CHIP Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# add this gni as import in your build args to use pigweed in the example
-# 'import("//with_pw_rpc.gni")'
-
-import("//build_overrides/chip.gni")
-import("${chip_root}/config/efr32/lib/pw_rpc/pw_rpc.gni")
-import("${chip_root}/examples/platform/silabs/SiWx917/args.gni")
-
-silabs_sdk_target = get_label_info(":sdk", "label_no_toolchain")
-
-app_data_model = "${chip_root}/examples/lighting-app/lighting-common"
-chip_enable_pw_rpc = true
-chip_enable_openthread = true
-chip_build_pw_trace_lib = true
-
-cpp_standard = "gnu++17"
-
-# Light app on EFR enables tracing server
-pw_trace_BACKEND = "$dir_pw_trace_tokenized"
diff --git a/examples/lighting-app/silabs/efr32/build_for_wifi_args.gni b/examples/lighting-app/silabs/build_for_wifi_args.gni
similarity index 91%
rename from examples/lighting-app/silabs/efr32/build_for_wifi_args.gni
rename to examples/lighting-app/silabs/build_for_wifi_args.gni
index 08cb8f3..bbb57ae 100644
--- a/examples/lighting-app/silabs/efr32/build_for_wifi_args.gni
+++ b/examples/lighting-app/silabs/build_for_wifi_args.gni
@@ -20,4 +20,4 @@
 
 chip_enable_ota_requestor = true
 app_data_model =
-    "${chip_root}/examples/lighting-app/silabs/efr32/data_model:silabs-lighting"
+    "${chip_root}/examples/lighting-app/silabs/data_model:silabs-lighting"
diff --git a/examples/lighting-app/silabs/efr32/build_for_wifi_gnfile.gn b/examples/lighting-app/silabs/build_for_wifi_gnfile.gn
similarity index 100%
rename from examples/lighting-app/silabs/efr32/build_for_wifi_gnfile.gn
rename to examples/lighting-app/silabs/build_for_wifi_gnfile.gn
diff --git a/examples/chef/efr32/build_overrides b/examples/lighting-app/silabs/build_overrides
similarity index 100%
copy from examples/chef/efr32/build_overrides
copy to examples/lighting-app/silabs/build_overrides
diff --git a/examples/lighting-app/silabs/efr32/data_model/BUILD.gn b/examples/lighting-app/silabs/data_model/BUILD.gn
similarity index 100%
rename from examples/lighting-app/silabs/efr32/data_model/BUILD.gn
rename to examples/lighting-app/silabs/data_model/BUILD.gn
diff --git a/examples/lighting-app/silabs/efr32/data_model/lighting-thread-app.matter b/examples/lighting-app/silabs/data_model/lighting-thread-app.matter
similarity index 100%
rename from examples/lighting-app/silabs/efr32/data_model/lighting-thread-app.matter
rename to examples/lighting-app/silabs/data_model/lighting-thread-app.matter
diff --git a/examples/lighting-app/silabs/efr32/data_model/lighting-thread-app.zap b/examples/lighting-app/silabs/data_model/lighting-thread-app.zap
similarity index 99%
rename from examples/lighting-app/silabs/efr32/data_model/lighting-thread-app.zap
rename to examples/lighting-app/silabs/data_model/lighting-thread-app.zap
index 5ca225a..4129c58 100644
--- a/examples/lighting-app/silabs/efr32/data_model/lighting-thread-app.zap
+++ b/examples/lighting-app/silabs/data_model/lighting-thread-app.zap
@@ -18,7 +18,7 @@
   "package": [
     {
       "pathRelativity": "relativeToZap",
-      "path": "../../../../../src/app/zap-templates/zcl/zcl.json",
+      "path": "../../../../src/app/zap-templates/zcl/zcl.json",
       "type": "zcl-properties",
       "category": "matter",
       "version": 1,
@@ -26,7 +26,7 @@
     },
     {
       "pathRelativity": "relativeToZap",
-      "path": "../../../../../src/app/zap-templates/app-templates.json",
+      "path": "../../../../src/app/zap-templates/app-templates.json",
       "type": "gen-templates-json",
       "version": "chip-v1"
     }
diff --git a/examples/lighting-app/silabs/efr32/data_model/lighting-wifi-app.matter b/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter
similarity index 100%
rename from examples/lighting-app/silabs/efr32/data_model/lighting-wifi-app.matter
rename to examples/lighting-app/silabs/data_model/lighting-wifi-app.matter
diff --git a/examples/lighting-app/silabs/efr32/data_model/lighting-wifi-app.zap b/examples/lighting-app/silabs/data_model/lighting-wifi-app.zap
similarity index 99%
rename from examples/lighting-app/silabs/efr32/data_model/lighting-wifi-app.zap
rename to examples/lighting-app/silabs/data_model/lighting-wifi-app.zap
index c769ae5..e0b17ec 100644
--- a/examples/lighting-app/silabs/efr32/data_model/lighting-wifi-app.zap
+++ b/examples/lighting-app/silabs/data_model/lighting-wifi-app.zap
@@ -18,7 +18,7 @@
   "package": [
     {
       "pathRelativity": "relativeToZap",
-      "path": "../../../../../src/app/zap-templates/zcl/zcl.json",
+      "path": "../../../../src/app/zap-templates/zcl/zcl.json",
       "type": "zcl-properties",
       "category": "matter",
       "version": 1,
@@ -26,7 +26,7 @@
     },
     {
       "pathRelativity": "relativeToZap",
-      "path": "../../../../../src/app/zap-templates/app-templates.json",
+      "path": "../../../../src/app/zap-templates/app-templates.json",
       "type": "gen-templates-json",
       "version": "chip-v1"
     }
diff --git a/examples/lighting-app/silabs/efr32/build_overrides b/examples/lighting-app/silabs/efr32/build_overrides
deleted file mode 120000
index 995884e..0000000
--- a/examples/lighting-app/silabs/efr32/build_overrides
+++ /dev/null
@@ -1 +0,0 @@
-../../../build_overrides
\ No newline at end of file
diff --git a/examples/lighting-app/silabs/efr32/third_party/connectedhomeip b/examples/lighting-app/silabs/efr32/third_party/connectedhomeip
deleted file mode 120000
index 5930783..0000000
--- a/examples/lighting-app/silabs/efr32/third_party/connectedhomeip
+++ /dev/null
@@ -1 +0,0 @@
-../../../../..
\ No newline at end of file
diff --git a/examples/lighting-app/silabs/efr32/include/AppConfig.h b/examples/lighting-app/silabs/include/AppConfig.h
similarity index 100%
rename from examples/lighting-app/silabs/efr32/include/AppConfig.h
rename to examples/lighting-app/silabs/include/AppConfig.h
diff --git a/examples/lighting-app/silabs/efr32/include/AppEvent.h b/examples/lighting-app/silabs/include/AppEvent.h
similarity index 100%
rename from examples/lighting-app/silabs/efr32/include/AppEvent.h
rename to examples/lighting-app/silabs/include/AppEvent.h
diff --git a/examples/lighting-app/silabs/efr32/include/AppTask.h b/examples/lighting-app/silabs/include/AppTask.h
similarity index 100%
rename from examples/lighting-app/silabs/efr32/include/AppTask.h
rename to examples/lighting-app/silabs/include/AppTask.h
diff --git a/examples/lighting-app/silabs/efr32/include/CHIPProjectConfig.h b/examples/lighting-app/silabs/include/CHIPProjectConfig.h
similarity index 100%
rename from examples/lighting-app/silabs/efr32/include/CHIPProjectConfig.h
rename to examples/lighting-app/silabs/include/CHIPProjectConfig.h
diff --git a/examples/lighting-app/silabs/efr32/include/LightingManager.h b/examples/lighting-app/silabs/include/LightingManager.h
similarity index 100%
rename from examples/lighting-app/silabs/efr32/include/LightingManager.h
rename to examples/lighting-app/silabs/include/LightingManager.h
diff --git a/examples/lighting-app/silabs/efr32/openthread.gn b/examples/lighting-app/silabs/openthread.gn
similarity index 100%
rename from examples/lighting-app/silabs/efr32/openthread.gn
rename to examples/lighting-app/silabs/openthread.gn
diff --git a/examples/lighting-app/silabs/efr32/openthread.gni b/examples/lighting-app/silabs/openthread.gni
similarity index 92%
rename from examples/lighting-app/silabs/efr32/openthread.gni
rename to examples/lighting-app/silabs/openthread.gni
index e7783cb..71fa327 100644
--- a/examples/lighting-app/silabs/efr32/openthread.gni
+++ b/examples/lighting-app/silabs/openthread.gni
@@ -19,7 +19,7 @@
 silabs_sdk_target = get_label_info(":sdk", "label_no_toolchain")
 
 app_data_model =
-    "${chip_root}/examples/lighting-app/silabs/efr32/data_model:silabs-lighting"
+    "${chip_root}/examples/lighting-app/silabs/data_model:silabs-lighting"
 chip_enable_ota_requestor = true
 chip_enable_openthread = true
 
diff --git a/examples/lighting-app/silabs/efr32/src/AppTask.cpp b/examples/lighting-app/silabs/src/AppTask.cpp
similarity index 100%
rename from examples/lighting-app/silabs/efr32/src/AppTask.cpp
rename to examples/lighting-app/silabs/src/AppTask.cpp
diff --git a/examples/lighting-app/silabs/efr32/src/LightingManager.cpp b/examples/lighting-app/silabs/src/LightingManager.cpp
similarity index 100%
rename from examples/lighting-app/silabs/efr32/src/LightingManager.cpp
rename to examples/lighting-app/silabs/src/LightingManager.cpp
diff --git a/examples/lighting-app/silabs/efr32/src/ZclCallbacks.cpp b/examples/lighting-app/silabs/src/ZclCallbacks.cpp
similarity index 100%
rename from examples/lighting-app/silabs/efr32/src/ZclCallbacks.cpp
rename to examples/lighting-app/silabs/src/ZclCallbacks.cpp
diff --git a/examples/chef/efr32/third_party/connectedhomeip b/examples/lighting-app/silabs/third_party/connectedhomeip
similarity index 100%
copy from examples/chef/efr32/third_party/connectedhomeip
copy to examples/lighting-app/silabs/third_party/connectedhomeip
diff --git a/examples/lighting-app/silabs/efr32/with_pw_rpc.gni b/examples/lighting-app/silabs/with_pw_rpc.gni
similarity index 100%
rename from examples/lighting-app/silabs/efr32/with_pw_rpc.gni
rename to examples/lighting-app/silabs/with_pw_rpc.gni
diff --git a/examples/lock-app/silabs/efr32/.gn b/examples/lock-app/silabs/.gn
similarity index 100%
rename from examples/lock-app/silabs/efr32/.gn
rename to examples/lock-app/silabs/.gn
diff --git a/examples/lock-app/silabs/efr32/BUILD.gn b/examples/lock-app/silabs/BUILD.gn
similarity index 98%
rename from examples/lock-app/silabs/efr32/BUILD.gn
rename to examples/lock-app/silabs/BUILD.gn
index ab1479d..7e50ac8 100644
--- a/examples/lock-app/silabs/efr32/BUILD.gn
+++ b/examples/lock-app/silabs/BUILD.gn
@@ -31,7 +31,7 @@
 
 assert(current_os == "freertos")
 
-silabs_project_dir = "${chip_root}/examples/lock-app/silabs/efr32"
+silabs_project_dir = "${chip_root}/examples/lock-app/silabs"
 examples_common_plat_dir = "${chip_root}/examples/platform/silabs"
 
 if (wifi_soc) {
diff --git a/examples/lock-app/silabs/efr32/README.md b/examples/lock-app/silabs/README.md
similarity index 93%
rename from examples/lock-app/silabs/efr32/README.md
rename to examples/lock-app/silabs/README.md
index 46d6f87..2d6cb87 100644
--- a/examples/lock-app/silabs/efr32/README.md
+++ b/examples/lock-app/silabs/README.md
@@ -102,7 +102,7 @@
 
           ```
           cd ~/connectedhomeip
-          ./scripts/examples/gn_efr32_example.sh ./examples/lock-app/silabs/efr32/ ./out/lock_app BRD4187C
+          ./scripts/examples/gn_silabs_example.sh ./examples/lock-app/silabs/efr32/ ./out/lock_app BRD4187C
           ```
 
 -   To delete generated executable, libraries and object files use:
@@ -133,7 +133,7 @@
 *   Build the example as Sleepy End Device (SED)
 
           ```
-          $ ./scripts/examples/gn_efr32_example.sh ./examples/lock-app/silabs/efr32/ ./out/lock-app_SED BRD4187C --sed
+          $ ./scripts/examples/gn_silabs_example.sh ./examples/lock-app/silabs/efr32/ ./out/lock-app_SED BRD4187C --sed
           ```
 
     or use gn as previously mentioned but adding the following arguments:
@@ -145,7 +145,7 @@
 *   Build the example with pigweed RCP
 
           ```
-          $ ./scripts/examples/gn_efr32_example.sh examples/lock-app/silabs/efr32/ out/lock_app_rpc BRD4187C 'import("//with_pw_rpc.gni")'
+          $ ./scripts/examples/gn_silabs_example.sh examples/lock-app/silabs/efr32/ out/lock_app_rpc BRD4187C 'import("//with_pw_rpc.gni")'
           ```
 
     or use GN/Ninja Directly
@@ -163,7 +163,7 @@
 arguments
 
          ```
-         ./scripts/examples/gn_efr32_example.sh
+         ./scripts/examples/gn_silabs_example.sh
          ```
 
 ## Flashing the Application
@@ -380,7 +380,7 @@
 
 For the description of Software Update process with EFR32 example applications
 see
-[EFR32 OTA Software Update](../../../../docs/guides/silabs_efr32_software_update.md)
+[EFR32 OTA Software Update](../../../docs/guides/silabs_efr32_software_update.md)
 
 ## Building options
 
@@ -393,7 +393,7 @@
 `chip_progress_logging, chip_detail_logging, chip_automation_logging`
 
     ```
-    $ ./scripts/examples/gn_efr32_example.sh ./examples/lock-app/silabs/efr32 ./out/lock-app BRD4164A "chip_detail_logging=false chip_automation_logging=false chip_progress_logging=false"
+    $ ./scripts/examples/gn_silabs_example.sh ./examples/lock-app/silabs/efr32 ./out/lock-app BRD4164A "chip_detail_logging=false chip_automation_logging=false chip_progress_logging=false"
     ```
 
 ### Debug build / release build
@@ -401,7 +401,7 @@
 `is_debug`
 
     ```
-    $ ./scripts/examples/gn_efr32_example.sh ./examples/lock-app/silabs/efr32 ./out/lock-app BRD4164A "is_debug=false"
+    $ ./scripts/examples/gn_silabs_example.sh ./examples/lock-app/silabs/efr32 ./out/lock-app BRD4164A "is_debug=false"
     ```
 
 ### Disabling LCD
@@ -409,7 +409,7 @@
 `show_qr_code`
 
     ```
-    $ ./scripts/examples/gn_efr32_example.sh ./examples/lock-app/silabs/efr32 ./out/lock-app BRD4164A "show_qr_code=false"
+    $ ./scripts/examples/gn_silabs_example.sh ./examples/lock-app/silabs/efr32 ./out/lock-app BRD4164A "show_qr_code=false"
     ```
 
 ### KVS maximum entry count
@@ -420,5 +420,5 @@
     Set the maximum Kvs entries that can be stored in NVM (Default 75)
     Thresholds: 30 <= kvs_max_entries <= 255
 
-    $ ./scripts/examples/gn_efr32_example.sh ./examples/lock-app/silabs/efr32 ./out/lock-app BRD4164A kvs_max_entries=50
+    $ ./scripts/examples/gn_silabs_example.sh ./examples/lock-app/silabs/efr32 ./out/lock-app BRD4164A kvs_max_entries=50
     ```
diff --git a/examples/lock-app/silabs/efr32/args.gni b/examples/lock-app/silabs/args.gni
similarity index 100%
rename from examples/lock-app/silabs/efr32/args.gni
rename to examples/lock-app/silabs/args.gni
diff --git a/examples/lock-app/silabs/efr32/build_for_wifi_args.gni b/examples/lock-app/silabs/build_for_wifi_args.gni
similarity index 100%
rename from examples/lock-app/silabs/efr32/build_for_wifi_args.gni
rename to examples/lock-app/silabs/build_for_wifi_args.gni
diff --git a/examples/lock-app/silabs/efr32/build_for_wifi_gnfile.gn b/examples/lock-app/silabs/build_for_wifi_gnfile.gn
similarity index 100%
rename from examples/lock-app/silabs/efr32/build_for_wifi_gnfile.gn
rename to examples/lock-app/silabs/build_for_wifi_gnfile.gn
diff --git a/examples/chef/efr32/build_overrides b/examples/lock-app/silabs/build_overrides
similarity index 100%
copy from examples/chef/efr32/build_overrides
copy to examples/lock-app/silabs/build_overrides
diff --git a/examples/lock-app/silabs/efr32/build_overrides b/examples/lock-app/silabs/efr32/build_overrides
deleted file mode 120000
index 995884e..0000000
--- a/examples/lock-app/silabs/efr32/build_overrides
+++ /dev/null
@@ -1 +0,0 @@
-../../../build_overrides
\ No newline at end of file
diff --git a/examples/lock-app/silabs/efr32/third_party/connectedhomeip b/examples/lock-app/silabs/efr32/third_party/connectedhomeip
deleted file mode 120000
index 5930783..0000000
--- a/examples/lock-app/silabs/efr32/third_party/connectedhomeip
+++ /dev/null
@@ -1 +0,0 @@
-../../../../..
\ No newline at end of file
diff --git a/examples/lock-app/silabs/efr32/include/AppConfig.h b/examples/lock-app/silabs/include/AppConfig.h
similarity index 100%
rename from examples/lock-app/silabs/efr32/include/AppConfig.h
rename to examples/lock-app/silabs/include/AppConfig.h
diff --git a/examples/lock-app/silabs/efr32/include/AppEvent.h b/examples/lock-app/silabs/include/AppEvent.h
similarity index 100%
rename from examples/lock-app/silabs/efr32/include/AppEvent.h
rename to examples/lock-app/silabs/include/AppEvent.h
diff --git a/examples/lock-app/silabs/efr32/include/AppTask.h b/examples/lock-app/silabs/include/AppTask.h
similarity index 100%
rename from examples/lock-app/silabs/efr32/include/AppTask.h
rename to examples/lock-app/silabs/include/AppTask.h
diff --git a/examples/lock-app/silabs/efr32/include/CHIPProjectConfig.h b/examples/lock-app/silabs/include/CHIPProjectConfig.h
similarity index 100%
rename from examples/lock-app/silabs/efr32/include/CHIPProjectConfig.h
rename to examples/lock-app/silabs/include/CHIPProjectConfig.h
diff --git a/examples/lock-app/silabs/efr32/include/EventHandlerLibShell.h b/examples/lock-app/silabs/include/EventHandlerLibShell.h
similarity index 100%
rename from examples/lock-app/silabs/efr32/include/EventHandlerLibShell.h
rename to examples/lock-app/silabs/include/EventHandlerLibShell.h
diff --git a/examples/lock-app/silabs/efr32/include/LockManager.h b/examples/lock-app/silabs/include/LockManager.h
similarity index 100%
rename from examples/lock-app/silabs/efr32/include/LockManager.h
rename to examples/lock-app/silabs/include/LockManager.h
diff --git a/examples/lock-app/silabs/efr32/openthread.gn b/examples/lock-app/silabs/openthread.gn
similarity index 100%
rename from examples/lock-app/silabs/efr32/openthread.gn
rename to examples/lock-app/silabs/openthread.gn
diff --git a/examples/lock-app/silabs/efr32/openthread.gni b/examples/lock-app/silabs/openthread.gni
similarity index 100%
rename from examples/lock-app/silabs/efr32/openthread.gni
rename to examples/lock-app/silabs/openthread.gni
diff --git a/examples/lock-app/silabs/efr32/src/AppTask.cpp b/examples/lock-app/silabs/src/AppTask.cpp
similarity index 100%
rename from examples/lock-app/silabs/efr32/src/AppTask.cpp
rename to examples/lock-app/silabs/src/AppTask.cpp
diff --git a/examples/lock-app/silabs/efr32/src/EventHandlerLibShell.cpp b/examples/lock-app/silabs/src/EventHandlerLibShell.cpp
similarity index 100%
rename from examples/lock-app/silabs/efr32/src/EventHandlerLibShell.cpp
rename to examples/lock-app/silabs/src/EventHandlerLibShell.cpp
diff --git a/examples/lock-app/silabs/efr32/src/LockManager.cpp b/examples/lock-app/silabs/src/LockManager.cpp
similarity index 100%
rename from examples/lock-app/silabs/efr32/src/LockManager.cpp
rename to examples/lock-app/silabs/src/LockManager.cpp
diff --git a/examples/lock-app/silabs/efr32/src/ZclCallbacks.cpp b/examples/lock-app/silabs/src/ZclCallbacks.cpp
similarity index 100%
rename from examples/lock-app/silabs/efr32/src/ZclCallbacks.cpp
rename to examples/lock-app/silabs/src/ZclCallbacks.cpp
diff --git a/examples/chef/efr32/third_party/connectedhomeip b/examples/lock-app/silabs/third_party/connectedhomeip
similarity index 100%
copy from examples/chef/efr32/third_party/connectedhomeip
copy to examples/lock-app/silabs/third_party/connectedhomeip
diff --git a/examples/lock-app/silabs/efr32/with_pw_rpc.gni b/examples/lock-app/silabs/with_pw_rpc.gni
similarity index 100%
rename from examples/lock-app/silabs/efr32/with_pw_rpc.gni
rename to examples/lock-app/silabs/with_pw_rpc.gni
diff --git a/examples/thermostat/silabs/efr32/.gn b/examples/thermostat/silabs/.gn
similarity index 100%
rename from examples/thermostat/silabs/efr32/.gn
rename to examples/thermostat/silabs/.gn
diff --git a/examples/thermostat/silabs/efr32/BUILD.gn b/examples/thermostat/silabs/BUILD.gn
similarity index 98%
rename from examples/thermostat/silabs/efr32/BUILD.gn
rename to examples/thermostat/silabs/BUILD.gn
index 92063a3..684ab73 100644
--- a/examples/thermostat/silabs/efr32/BUILD.gn
+++ b/examples/thermostat/silabs/BUILD.gn
@@ -31,7 +31,7 @@
 
 assert(current_os == "freertos")
 
-silabs_project_dir = "${chip_root}/examples/thermostat/silabs/efr32"
+silabs_project_dir = "${chip_root}/examples/thermostat/silabs"
 examples_common_plat_dir = "${chip_root}/examples/platform/silabs"
 
 if (wifi_soc) {
diff --git a/examples/thermostat/silabs/efr32/README.md b/examples/thermostat/silabs/README.md
similarity index 91%
rename from examples/thermostat/silabs/efr32/README.md
rename to examples/thermostat/silabs/README.md
index 6cd6a3d..6dc53dc 100644
--- a/examples/thermostat/silabs/efr32/README.md
+++ b/examples/thermostat/silabs/README.md
@@ -106,7 +106,7 @@
 *   Build the example application:
 
           cd ~/connectedhomeip
-          ./scripts/examples/gn_efr32_example.sh ./examples/thermostat/silabs/efr32/ ./out/thermostat-app BRD4187C
+          ./scripts/examples/gn_silabs_example.sh ./examples/thermostat/silabs/efr32/ ./out/thermostat-app BRD4187C
 
 -   To delete generated executable, libraries and object files use:
 
@@ -129,11 +129,11 @@
 
 *   Build the example with Matter shell
 
-          ./scripts/examples/gn_efr32_example.sh examples/thermostat/silabs/efr32/ out/thermostat-app BRD4187C chip_build_libshell=true
+          ./scripts/examples/gn_silabs_example.sh examples/thermostat/silabs/efr32/ out/thermostat-app BRD4187C chip_build_libshell=true
 
 *   Build the example as Sleepy End Device (SED)
 
-          $ ./scripts/examples/gn_efr32_example.sh ./examples/thermostat/silabs/efr32/ ./out/thermostat-app_SED BRD4187C --sed
+          $ ./scripts/examples/gn_silabs_example.sh ./examples/thermostat/silabs/efr32/ ./out/thermostat-app_SED BRD4187C --sed
 
     or use gn as previously mentioned but adding the following arguments:
 
@@ -141,7 +141,7 @@
 
 *   Build the example with pigweed RCP
 
-          $ ./scripts/examples/gn_efr32_example.sh examples/thermostat/silabs/efr32/ out/thermostat-app_rpc BRD4187C 'import("//with_pw_rpc.gni")'
+          $ ./scripts/examples/gn_silabs_example.sh examples/thermostat/silabs/efr32/ out/thermostat-app_rpc BRD4187C 'import("//with_pw_rpc.gni")'
 
     or use GN/Ninja Directly
 
@@ -155,7 +155,7 @@
 For more build options, help is provided when running the build script without
 arguments
 
-    ./scripts/examples/gn_efr32_example.sh
+    ./scripts/examples/gn_silabs_example.sh
 
 ## Flashing the Application
 
@@ -232,7 +232,7 @@
 
 -   For this example to work, it is necessary to have a second efr32 device
     running the
-    [thermostat app example](https://github.com/project-chip/connectedhomeip/blob/master/examples/thermostat/silabs/efr32/README.md)
+    [thermostat app example](https://github.com/project-chip/connectedhomeip/blob/master/examples/thermostat/silabs/README.md)
     commissioned on the same openthread network
 
 -   User interface : **LCD** The LCD on Silabs WSTK shows a QR Code. This QR
@@ -341,7 +341,7 @@
 
 For the description of Software Update process with EFR32 example applications
 see
-[EFR32 OTA Software Update](../../../../docs/guides/silabs_efr32_software_update.md)
+[EFR32 OTA Software Update](../../../docs/guides/silabs_efr32_software_update.md)
 
 ## Building options
 
@@ -353,19 +353,19 @@
 
 chip_progress_logging, chip_detail_logging, chip_automation_logging
 
-    $ ./scripts/examples/gn_efr32_example.sh ./examples/thermostat/silabs/efr32 ./out/thermostat-app BRD4164A "chip_detail_logging=false chip_automation_logging=false chip_progress_logging=false"
+    $ ./scripts/examples/gn_silabs_example.sh ./examples/thermostat/silabs/efr32 ./out/thermostat-app BRD4164A "chip_detail_logging=false chip_automation_logging=false chip_progress_logging=false"
 
 ### Debug build / release build
 
 is_debug
 
-    $ ./scripts/examples/gn_efr32_example.sh ./examples/thermostat/silabs/efr32 ./out/thermostat-app BRD4164A "is_debug=false"
+    $ ./scripts/examples/gn_silabs_example.sh ./examples/thermostat/silabs/efr32 ./out/thermostat-app BRD4164A "is_debug=false"
 
 ### Disabling LCD
 
 show_qr_code
 
-    $ ./scripts/examples/gn_efr32_example.sh ./examples/thermostat/silabs/efr32 ./out/thermostat-app BRD4164A "show_qr_code=false"
+    $ ./scripts/examples/gn_silabs_example.sh ./examples/thermostat/silabs/efr32 ./out/thermostat-app BRD4164A "show_qr_code=false"
 
 ### KVS maximum entry count
 
@@ -374,4 +374,4 @@
     Set the maximum Kvs entries that can be stored in NVM (Default 75)
     Thresholds: 30 <= kvs_max_entries <= 255
 
-    $ ./scripts/examples/gn_efr32_example.sh ./examples/thermostat/silabs/efr32 ./out/thermostat-app BRD4164A kvs_max_entries=50
+    $ ./scripts/examples/gn_silabs_example.sh ./examples/thermostat/silabs/efr32 ./out/thermostat-app BRD4164A kvs_max_entries=50
diff --git a/examples/thermostat/silabs/efr32/build_for_wifi_args.gni b/examples/thermostat/silabs/build_for_wifi_args.gni
similarity index 100%
rename from examples/thermostat/silabs/efr32/build_for_wifi_args.gni
rename to examples/thermostat/silabs/build_for_wifi_args.gni
diff --git a/examples/thermostat/silabs/efr32/build_for_wifi_gnfile.gn b/examples/thermostat/silabs/build_for_wifi_gnfile.gn
similarity index 100%
rename from examples/thermostat/silabs/efr32/build_for_wifi_gnfile.gn
rename to examples/thermostat/silabs/build_for_wifi_gnfile.gn
diff --git a/examples/chef/efr32/build_overrides b/examples/thermostat/silabs/build_overrides
similarity index 100%
copy from examples/chef/efr32/build_overrides
copy to examples/thermostat/silabs/build_overrides
diff --git a/examples/thermostat/silabs/efr32/build_overrides b/examples/thermostat/silabs/efr32/build_overrides
deleted file mode 120000
index 995884e..0000000
--- a/examples/thermostat/silabs/efr32/build_overrides
+++ /dev/null
@@ -1 +0,0 @@
-../../../build_overrides
\ No newline at end of file
diff --git a/examples/thermostat/silabs/efr32/third_party/connectedhomeip b/examples/thermostat/silabs/efr32/third_party/connectedhomeip
deleted file mode 120000
index 5930783..0000000
--- a/examples/thermostat/silabs/efr32/third_party/connectedhomeip
+++ /dev/null
@@ -1 +0,0 @@
-../../../../..
\ No newline at end of file
diff --git a/examples/thermostat/silabs/efr32/include/AppConfig.h b/examples/thermostat/silabs/include/AppConfig.h
similarity index 100%
rename from examples/thermostat/silabs/efr32/include/AppConfig.h
rename to examples/thermostat/silabs/include/AppConfig.h
diff --git a/examples/thermostat/silabs/efr32/include/AppEvent.h b/examples/thermostat/silabs/include/AppEvent.h
similarity index 100%
rename from examples/thermostat/silabs/efr32/include/AppEvent.h
rename to examples/thermostat/silabs/include/AppEvent.h
diff --git a/examples/thermostat/silabs/efr32/include/AppTask.h b/examples/thermostat/silabs/include/AppTask.h
similarity index 100%
rename from examples/thermostat/silabs/efr32/include/AppTask.h
rename to examples/thermostat/silabs/include/AppTask.h
diff --git a/examples/thermostat/silabs/efr32/include/CHIPProjectConfig.h b/examples/thermostat/silabs/include/CHIPProjectConfig.h
similarity index 100%
rename from examples/thermostat/silabs/efr32/include/CHIPProjectConfig.h
rename to examples/thermostat/silabs/include/CHIPProjectConfig.h
diff --git a/examples/thermostat/silabs/efr32/include/SensorManager.h b/examples/thermostat/silabs/include/SensorManager.h
similarity index 100%
rename from examples/thermostat/silabs/efr32/include/SensorManager.h
rename to examples/thermostat/silabs/include/SensorManager.h
diff --git a/examples/thermostat/silabs/efr32/include/TemperatureManager.h b/examples/thermostat/silabs/include/TemperatureManager.h
similarity index 100%
rename from examples/thermostat/silabs/efr32/include/TemperatureManager.h
rename to examples/thermostat/silabs/include/TemperatureManager.h
diff --git a/examples/thermostat/silabs/efr32/include/ThermostatIcons.h b/examples/thermostat/silabs/include/ThermostatIcons.h
similarity index 100%
rename from examples/thermostat/silabs/efr32/include/ThermostatIcons.h
rename to examples/thermostat/silabs/include/ThermostatIcons.h
diff --git a/examples/thermostat/silabs/efr32/include/ThermostatUI.h b/examples/thermostat/silabs/include/ThermostatUI.h
similarity index 100%
rename from examples/thermostat/silabs/efr32/include/ThermostatUI.h
rename to examples/thermostat/silabs/include/ThermostatUI.h
diff --git a/examples/thermostat/silabs/efr32/openthread.gn b/examples/thermostat/silabs/openthread.gn
similarity index 100%
rename from examples/thermostat/silabs/efr32/openthread.gn
rename to examples/thermostat/silabs/openthread.gn
diff --git a/examples/thermostat/silabs/efr32/openthread.gni b/examples/thermostat/silabs/openthread.gni
similarity index 100%
rename from examples/thermostat/silabs/efr32/openthread.gni
rename to examples/thermostat/silabs/openthread.gni
diff --git a/examples/thermostat/silabs/efr32/src/AppTask.cpp b/examples/thermostat/silabs/src/AppTask.cpp
similarity index 100%
rename from examples/thermostat/silabs/efr32/src/AppTask.cpp
rename to examples/thermostat/silabs/src/AppTask.cpp
diff --git a/examples/thermostat/silabs/efr32/src/SensorManager.cpp b/examples/thermostat/silabs/src/SensorManager.cpp
similarity index 100%
rename from examples/thermostat/silabs/efr32/src/SensorManager.cpp
rename to examples/thermostat/silabs/src/SensorManager.cpp
diff --git a/examples/thermostat/silabs/efr32/src/TemperatureManager.cpp b/examples/thermostat/silabs/src/TemperatureManager.cpp
similarity index 100%
rename from examples/thermostat/silabs/efr32/src/TemperatureManager.cpp
rename to examples/thermostat/silabs/src/TemperatureManager.cpp
diff --git a/examples/thermostat/silabs/efr32/src/ThermostatUI.cpp b/examples/thermostat/silabs/src/ThermostatUI.cpp
similarity index 100%
rename from examples/thermostat/silabs/efr32/src/ThermostatUI.cpp
rename to examples/thermostat/silabs/src/ThermostatUI.cpp
diff --git a/examples/thermostat/silabs/efr32/src/ZclCallbacks.cpp b/examples/thermostat/silabs/src/ZclCallbacks.cpp
similarity index 100%
rename from examples/thermostat/silabs/efr32/src/ZclCallbacks.cpp
rename to examples/thermostat/silabs/src/ZclCallbacks.cpp
diff --git a/examples/chef/efr32/third_party/connectedhomeip b/examples/thermostat/silabs/third_party/connectedhomeip
similarity index 100%
copy from examples/chef/efr32/third_party/connectedhomeip
copy to examples/thermostat/silabs/third_party/connectedhomeip
diff --git a/examples/window-app/silabs/efr32/.gn b/examples/window-app/silabs/.gn
similarity index 100%
rename from examples/window-app/silabs/efr32/.gn
rename to examples/window-app/silabs/.gn
diff --git a/examples/window-app/silabs/efr32/BUILD.gn b/examples/window-app/silabs/BUILD.gn
similarity index 98%
rename from examples/window-app/silabs/efr32/BUILD.gn
rename to examples/window-app/silabs/BUILD.gn
index ac16344..3536280 100644
--- a/examples/window-app/silabs/efr32/BUILD.gn
+++ b/examples/window-app/silabs/BUILD.gn
@@ -24,7 +24,7 @@
 assert(current_os == "freertos")
 
 project_dir = "${chip_root}/examples/window-app"
-silabs_project_dir = "${project_dir}/silabs/efr32"
+silabs_project_dir = "${project_dir}/silabs"
 examples_common_plat_dir = "${chip_root}/examples/platform/silabs"
 
 if (wifi_soc) {
diff --git a/examples/window-app/silabs/efr32/README.md b/examples/window-app/silabs/README.md
similarity index 92%
rename from examples/window-app/silabs/efr32/README.md
rename to examples/window-app/silabs/README.md
index 29ef7d7..6152acb 100644
--- a/examples/window-app/silabs/efr32/README.md
+++ b/examples/window-app/silabs/README.md
@@ -99,7 +99,7 @@
 *   Build the example application:
 
           cd ~/connectedhomeip
-          ./scripts/examples/gn_efr32_example.sh ./examples/window-app/silabs/efr32/ ./out/window-app BRD4187C
+          ./scripts/examples/gn_silabs_example.sh ./examples/window-app/silabs/efr32/ ./out/window-app BRD4187C
 
 -   To delete generated executable, libraries and object files use:
 
@@ -122,7 +122,7 @@
 
 *   Build the example as Sleepy End Device (SED)
 
-          $ ./scripts/examples/gn_efr32_example.sh ./examples/window-app/silabs/efr32/ ./out/window-app_SED BRD4187C --sed
+          $ ./scripts/examples/gn_silabs_example.sh ./examples/window-app/silabs/efr32/ ./out/window-app_SED BRD4187C --sed
 
     or use gn as previously mentioned but adding the following arguments:
 
@@ -130,7 +130,7 @@
 
 *   Build the example with pigweed RCP
 
-          $ ./scripts/examples/gn_efr32_example.sh examples/window-app/silabs/efr32/ out/window_app_rpc BRD4187C 'import("//with_pw_rpc.gni")'
+          $ ./scripts/examples/gn_silabs_example.sh examples/window-app/silabs/efr32/ out/window_app_rpc BRD4187C 'import("//with_pw_rpc.gni")'
 
     or use GN/Ninja Directly
 
@@ -144,7 +144,7 @@
 For more build options, help is provided when running the build script without
 arguments
 
-         ./scripts/examples/gn_efr32_example.sh
+         ./scripts/examples/gn_silabs_example.sh
 
 ## Flashing the Application
 
@@ -341,7 +341,7 @@
 
 For the description of Software Update process with EFR32 example applications
 see
-[EFR32 OTA Software Update](../../../../docs/guides/silabs_efr32_software_update.md)
+[EFR32 OTA Software Update](../../../docs/guides/silabs_efr32_software_update.md)
 
 ## Building options
 
@@ -353,19 +353,19 @@
 
 chip_progress_logging, chip_detail_logging, chip_automation_logging
 
-    $ ./scripts/examples/gn_efr32_example.sh ./examples/window-app/silabs/efr32 ./out/window-app BRD4164A "chip_detail_logging=false chip_automation_logging=false chip_progress_logging=false"
+    $ ./scripts/examples/gn_silabs_example.sh ./examples/window-app/silabs/efr32 ./out/window-app BRD4164A "chip_detail_logging=false chip_automation_logging=false chip_progress_logging=false"
 
 ### Debug build / release build
 
 is_debug
 
-    $ ./scripts/examples/gn_efr32_example.sh ./examples/window-app/silabs/efr32 ./out/window-app BRD4164A "is_debug=false"
+    $ ./scripts/examples/gn_silabs_example.sh ./examples/window-app/silabs/efr32 ./out/window-app BRD4164A "is_debug=false"
 
 ### Disabling LCD
 
 show_qr_code
 
-    $ ./scripts/examples/gn_efr32_example.sh ./examples/window-app/silabs/efr32 ./out/window-app BRD4164A "show_qr_code=false"
+    $ ./scripts/examples/gn_silabs_example.sh ./examples/window-app/silabs/efr32 ./out/window-app BRD4164A "show_qr_code=false"
 
 ### KVS maximum entry count
 
@@ -374,4 +374,4 @@
     Set the maximum Kvs entries that can be stored in NVM (Default 75)
     Thresholds: 30 <= kvs_max_entries <= 255
 
-    $ ./scripts/examples/gn_efr32_example.sh ./examples/window-app/silabs/efr32 ./out/window-app BRD4164A kvs_max_entries=50
+    $ ./scripts/examples/gn_silabs_example.sh ./examples/window-app/silabs/efr32 ./out/window-app BRD4164A kvs_max_entries=50
diff --git a/examples/window-app/silabs/efr32/args.gni b/examples/window-app/silabs/args.gni
similarity index 100%
rename from examples/window-app/silabs/efr32/args.gni
rename to examples/window-app/silabs/args.gni
diff --git a/examples/window-app/silabs/efr32/build_for_wifi_args.gni b/examples/window-app/silabs/build_for_wifi_args.gni
similarity index 100%
rename from examples/window-app/silabs/efr32/build_for_wifi_args.gni
rename to examples/window-app/silabs/build_for_wifi_args.gni
diff --git a/examples/window-app/silabs/efr32/build_for_wifi_gnfile.gn b/examples/window-app/silabs/build_for_wifi_gnfile.gn
similarity index 100%
rename from examples/window-app/silabs/efr32/build_for_wifi_gnfile.gn
rename to examples/window-app/silabs/build_for_wifi_gnfile.gn
diff --git a/examples/chef/efr32/build_overrides b/examples/window-app/silabs/build_overrides
similarity index 100%
copy from examples/chef/efr32/build_overrides
copy to examples/window-app/silabs/build_overrides
diff --git a/examples/window-app/silabs/efr32/build_overrides b/examples/window-app/silabs/efr32/build_overrides
deleted file mode 120000
index 995884e..0000000
--- a/examples/window-app/silabs/efr32/build_overrides
+++ /dev/null
@@ -1 +0,0 @@
-../../../build_overrides
\ No newline at end of file
diff --git a/examples/window-app/silabs/efr32/third_party/connectedhomeip b/examples/window-app/silabs/efr32/third_party/connectedhomeip
deleted file mode 120000
index 5930783..0000000
--- a/examples/window-app/silabs/efr32/third_party/connectedhomeip
+++ /dev/null
@@ -1 +0,0 @@
-../../../../..
\ No newline at end of file
diff --git a/examples/window-app/silabs/efr32/include/AppConfig.h b/examples/window-app/silabs/include/AppConfig.h
similarity index 100%
rename from examples/window-app/silabs/efr32/include/AppConfig.h
rename to examples/window-app/silabs/include/AppConfig.h
diff --git a/examples/window-app/silabs/efr32/include/CHIPProjectConfig.h b/examples/window-app/silabs/include/CHIPProjectConfig.h
similarity index 100%
rename from examples/window-app/silabs/efr32/include/CHIPProjectConfig.h
rename to examples/window-app/silabs/include/CHIPProjectConfig.h
diff --git a/examples/window-app/silabs/efr32/include/LcdPainter.h b/examples/window-app/silabs/include/LcdPainter.h
similarity index 100%
rename from examples/window-app/silabs/efr32/include/LcdPainter.h
rename to examples/window-app/silabs/include/LcdPainter.h
diff --git a/examples/window-app/silabs/efr32/include/WindowAppImpl.h b/examples/window-app/silabs/include/WindowAppImpl.h
similarity index 100%
rename from examples/window-app/silabs/efr32/include/WindowAppImpl.h
rename to examples/window-app/silabs/include/WindowAppImpl.h
diff --git a/examples/window-app/silabs/efr32/openthread.gn b/examples/window-app/silabs/openthread.gn
similarity index 100%
rename from examples/window-app/silabs/efr32/openthread.gn
rename to examples/window-app/silabs/openthread.gn
diff --git a/examples/window-app/silabs/efr32/openthread.gni b/examples/window-app/silabs/openthread.gni
similarity index 100%
rename from examples/window-app/silabs/efr32/openthread.gni
rename to examples/window-app/silabs/openthread.gni
diff --git a/examples/window-app/silabs/efr32/src/LcdPainter.cpp b/examples/window-app/silabs/src/LcdPainter.cpp
similarity index 100%
rename from examples/window-app/silabs/efr32/src/LcdPainter.cpp
rename to examples/window-app/silabs/src/LcdPainter.cpp
diff --git a/examples/window-app/silabs/efr32/src/WindowAppImpl.cpp b/examples/window-app/silabs/src/WindowAppImpl.cpp
similarity index 100%
rename from examples/window-app/silabs/efr32/src/WindowAppImpl.cpp
rename to examples/window-app/silabs/src/WindowAppImpl.cpp
diff --git a/examples/window-app/silabs/efr32/src/main.cpp b/examples/window-app/silabs/src/main.cpp
similarity index 100%
rename from examples/window-app/silabs/efr32/src/main.cpp
rename to examples/window-app/silabs/src/main.cpp
diff --git a/examples/chef/efr32/third_party/connectedhomeip b/examples/window-app/silabs/third_party/connectedhomeip
similarity index 100%
copy from examples/chef/efr32/third_party/connectedhomeip
copy to examples/window-app/silabs/third_party/connectedhomeip
diff --git a/scripts/build/builders/efr32.py b/scripts/build/builders/efr32.py
index 32edf5b..e0058ed 100644
--- a/scripts/build/builders/efr32.py
+++ b/scripts/build/builders/efr32.py
@@ -78,7 +78,7 @@
         if self == Efr32App.UNIT_TEST:
             return os.path.join(root, 'src', 'test_driver', 'efr32')
         else:
-            return os.path.join(root, 'examples', self.ExampleName(), 'silabs/efr32')
+            return os.path.join(root, 'examples', self.ExampleName(), 'silabs')
 
 
 class Efr32Board(Enum):
diff --git a/scripts/build/testdata/dry_run_efr32-brd4161a-light-rpc-no-version.txt b/scripts/build/testdata/dry_run_efr32-brd4161a-light-rpc-no-version.txt
index d48088b..309cdd4 100644
--- a/scripts/build/testdata/dry_run_efr32-brd4161a-light-rpc-no-version.txt
+++ b/scripts/build/testdata/dry_run_efr32-brd4161a-light-rpc-no-version.txt
@@ -2,7 +2,7 @@
 cd "{root}"
 
 # Generating efr32-brd4161a-light-rpc-no-version
-gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/lighting-app/silabs/efr32 '--args=silabs_board="BRD4161A" is_debug=false import("//with_pw_rpc.gni")' {out}/efr32-brd4161a-light-rpc-no-version
+gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/lighting-app/silabs '--args=silabs_board="BRD4161A" is_debug=false import("//with_pw_rpc.gni")' {out}/efr32-brd4161a-light-rpc-no-version
 
 # Building efr32-brd4161a-light-rpc-no-version
 ninja -C {out}/efr32-brd4161a-light-rpc-no-version
diff --git a/scripts/examples/gn_efr32_example.sh b/scripts/examples/gn_silabs_example.sh
similarity index 98%
rename from scripts/examples/gn_efr32_example.sh
rename to scripts/examples/gn_silabs_example.sh
index 4b00c3a..25d181e 100755
--- a/scripts/examples/gn_efr32_example.sh
+++ b/scripts/examples/gn_silabs_example.sh
@@ -40,7 +40,7 @@
 DOTFILE=".gn"
 
 SILABS_THREAD_TARGET=\""../silabs:ot-efr32-cert"\"
-USAGE="./scripts/examples/gn_efr32_example.sh <AppRootFolder> <outputFolder> <silabs_board_name> [<Build options>]"
+USAGE="./scripts/examples/gn_silabs_example.sh <AppRootFolder> <outputFolder> <silabs_board_name> [<Build options>]"
 
 if [ "$#" == "0" ]; then
     echo "Build script for EFR32 Matter apps