diff --git a/.github/workflows/sync-react-samples.yml b/.github/workflows/sync-react-samples.yml
index 3cddd8c..1c41de8 100644
--- a/.github/workflows/sync-react-samples.yml
+++ b/.github/workflows/sync-react-samples.yml
@@ -47,7 +47,7 @@ jobs:
       - name: Read current synced B2E version
         id: current-version-b2e
         run: |
-          VERSION_FILE="samples/webapp-template-app-react-sample-b2e-experimental/.version"
+          VERSION_FILE="samples/ui-bundle-template-app-react-sample-b2e/.version"
           if [ -f "$VERSION_FILE" ]; then
             CURRENT=$(cat "$VERSION_FILE" | tr -d '[:space:]')
             echo "current=$CURRENT" >> $GITHUB_OUTPUT
@@ -69,7 +69,7 @@ jobs:
       - name: Read current synced B2X version
         id: current-version-b2x
         run: |
-          VERSION_FILE="samples/webapp-template-app-react-sample-b2x-experimental/.version"
+          VERSION_FILE="samples/ui-bundle-template-app-react-sample-b2x/.version"
           if [ -f "$VERSION_FILE" ]; then
             CURRENT=$(cat "$VERSION_FILE" | tr -d '[:space:]')
             echo "current=$CURRENT" >> $GITHUB_OUTPUT
diff --git a/README.md b/README.md
index eba39ff..1e38753 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ afv-library/
 │   ├── generating-flow/
 │   └── ...
 ├── samples/              # Synced sample apps (e.g. from npm)
-│   └── webapp-template-app-react-sample-b2e-experimental/
+│   └── ui-bundle-template-app-react-sample-b2e/
 │   └── ...
 ├── scripts/              
 │   └── ...
@@ -30,7 +30,7 @@ Browse the repository and copy/paste any rule or skill directly into Agentforce
 
 ## Samples
 
-The `samples/` folder contains synced sample apps. For example, `samples/webapp-template-app-react-sample-b2e-experimental/` is kept in sync with the npm package `@salesforce/ui-bundle-template-app-react-sample-b2e` (nightly and on manual trigger via GitHub Actions). To run the same sync locally from the repo root:
+The `samples/` folder contains synced sample apps. For example, `samples/ui-bundle-template-app-react-sample-b2e/` is kept in sync with the npm package `@salesforce/ui-bundle-template-app-react-sample-b2e` (nightly and on manual trigger via GitHub Actions). To run the same sync locally from the repo root:
 
 ```bash
 npm install
diff --git a/samples/README.md b/samples/README.md
index fb1fef3..4c2ab83 100644
--- a/samples/README.md
+++ b/samples/README.md
@@ -2,9 +2,9 @@
 
 Sample apps and templates synced into this repo for reference and reuse.
 
-## webapp-template-app-react-sample-b2e-experimental
+## ui-bundle-template-app-react-sample-b2e
 
-Source is synced from the npm package [@salesforce/ui-bundle-template-app-react-sample-b2e](https://www.npmjs.com/package/@salesforce/ui-bundle-template-app-react-sample-b2e). Only the package's source (no `node_modules`) is copied into `samples/webapp-template-app-react-sample-b2e-experimental/`.
+Source is synced from the npm package [@salesforce/ui-bundle-template-app-react-sample-b2e](https://www.npmjs.com/package/@salesforce/ui-bundle-template-app-react-sample-b2e). Only the package's source (no `node_modules`) is copied into `samples/ui-bundle-template-app-react-sample-b2e/`.
 
 ### How it's updated
 
@@ -16,15 +16,15 @@ Source is synced from the npm package [@salesforce/ui-bundle-template-app-react-
   npm run sync-react-b2e-sample
   ```
 
-  This installs the package into root `node_modules` and copies its source into `samples/webapp-template-app-react-sample-b2e-experimental/`, and updates `.version` in that folder.
+  This installs the package into root `node_modules` and copies its source into `samples/ui-bundle-template-app-react-sample-b2e/`, and updates `.version` in that folder.
 
 ### Version tracking
 
-The file `samples/webapp-template-app-react-sample-b2e-experimental/.version` stores the last-synced npm version. The Action compares it to the latest on npm and only creates a PR when they differ.
+The file `samples/ui-bundle-template-app-react-sample-b2e/.version` stores the last-synced npm version. The Action compares it to the latest on npm and only creates a PR when they differ.
 
-## webapp-template-app-react-sample-b2x-experimental
+## ui-bundle-template-app-react-sample-b2x
 
-Source is synced from the npm package [@salesforce/ui-bundle-template-app-react-sample-b2x](https://www.npmjs.com/package/@salesforce/ui-bundle-template-app-react-sample-b2x). Only the package's source (no `node_modules`) is copied into `samples/webapp-template-app-react-sample-b2x-experimental/`.
+Source is synced from the npm package [@salesforce/ui-bundle-template-app-react-sample-b2x](https://www.npmjs.com/package/@salesforce/ui-bundle-template-app-react-sample-b2x). Only the package's source (no `node_modules`) is copied into `samples/ui-bundle-template-app-react-sample-b2x/`.
 
 ### How it's updated
 
@@ -36,11 +36,11 @@ Source is synced from the npm package [@salesforce/ui-bundle-template-app-react-
   npm run sync-react-b2x-sample
   ```
 
-  This installs the package into root `node_modules` and copies its source into `samples/webapp-template-app-react-sample-b2x-experimental/`, and updates `.version` in that folder.
+  This installs the package into root `node_modules` and copies its source into `samples/ui-bundle-template-app-react-sample-b2x/`, and updates `.version` in that folder.
 
 ### Version tracking
 
-The file `samples/webapp-template-app-react-sample-b2x-experimental/.version` stores the last-synced npm version. The Action compares it to the latest on npm and only creates a PR when they differ.
+The file `samples/ui-bundle-template-app-react-sample-b2x/.version` stores the last-synced npm version. The Action compares it to the latest on npm and only creates a PR when they differ.
 
 ## native-mobile-rental-tenant-app
 
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/.forceignore b/samples/ui-bundle-template-app-react-sample-b2e/.forceignore
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/.forceignore
rename to samples/ui-bundle-template-app-react-sample-b2e/.forceignore
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/.husky/pre-commit b/samples/ui-bundle-template-app-react-sample-b2e/.husky/pre-commit
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/.husky/pre-commit
rename to samples/ui-bundle-template-app-react-sample-b2e/.husky/pre-commit
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/.prettierignore b/samples/ui-bundle-template-app-react-sample-b2e/.prettierignore
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/.prettierignore
rename to samples/ui-bundle-template-app-react-sample-b2e/.prettierignore
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/.prettierrc b/samples/ui-bundle-template-app-react-sample-b2e/.prettierrc
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/.prettierrc
rename to samples/ui-bundle-template-app-react-sample-b2e/.prettierrc
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/.version b/samples/ui-bundle-template-app-react-sample-b2e/.version
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/.version
rename to samples/ui-bundle-template-app-react-sample-b2e/.version
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/AGENT.md b/samples/ui-bundle-template-app-react-sample-b2e/AGENT.md
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/AGENT.md
rename to samples/ui-bundle-template-app-react-sample-b2e/AGENT.md
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/CHANGELOG.md b/samples/ui-bundle-template-app-react-sample-b2e/CHANGELOG.md
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/CHANGELOG.md
rename to samples/ui-bundle-template-app-react-sample-b2e/CHANGELOG.md
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/LICENSE.txt b/samples/ui-bundle-template-app-react-sample-b2e/LICENSE.txt
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/LICENSE.txt
rename to samples/ui-bundle-template-app-react-sample-b2e/LICENSE.txt
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/README.md b/samples/ui-bundle-template-app-react-sample-b2e/README.md
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/README.md
rename to samples/ui-bundle-template-app-react-sample-b2e/README.md
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/config/project-scratch-def.json b/samples/ui-bundle-template-app-react-sample-b2e/config/project-scratch-def.json
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/config/project-scratch-def.json
rename to samples/ui-bundle-template-app-react-sample-b2e/config/project-scratch-def.json
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/eslint.config.js b/samples/ui-bundle-template-app-react-sample-b2e/eslint.config.js
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/eslint.config.js
rename to samples/ui-bundle-template-app-react-sample-b2e/eslint.config.js
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/classes/MaintenanceRequestTriggerHandler.cls b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/classes/MaintenanceRequestTriggerHandler.cls
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/classes/MaintenanceRequestTriggerHandler.cls
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/classes/MaintenanceRequestTriggerHandler.cls
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/classes/MaintenanceRequestTriggerHandler.cls-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/classes/MaintenanceRequestTriggerHandler.cls-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/classes/MaintenanceRequestTriggerHandler.cls-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/classes/MaintenanceRequestTriggerHandler.cls-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/classes/MaintenanceRequestTriggerHandler_Test.cls b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/classes/MaintenanceRequestTriggerHandler_Test.cls
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/classes/MaintenanceRequestTriggerHandler_Test.cls
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/classes/MaintenanceRequestTriggerHandler_Test.cls
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/classes/MaintenanceRequestTriggerHandler_Test.cls-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/classes/MaintenanceRequestTriggerHandler_Test.cls-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/classes/MaintenanceRequestTriggerHandler_Test.cls-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/classes/MaintenanceRequestTriggerHandler_Test.cls-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/classes/TenantTriggerHandler.cls b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/classes/TenantTriggerHandler.cls
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/classes/TenantTriggerHandler.cls
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/classes/TenantTriggerHandler.cls
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/classes/TenantTriggerHandler.cls-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/classes/TenantTriggerHandler.cls-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/classes/TenantTriggerHandler.cls-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/classes/TenantTriggerHandler.cls-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/classes/TenantTriggerHandler_Test.cls b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/classes/TenantTriggerHandler_Test.cls
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/classes/TenantTriggerHandler_Test.cls
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/classes/TenantTriggerHandler_Test.cls
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/classes/TenantTriggerHandler_Test.cls-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/classes/TenantTriggerHandler_Test.cls-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/classes/TenantTriggerHandler_Test.cls-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/classes/TenantTriggerHandler_Test.cls-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/cspTrustedSites/GitHub_Avatars.cspTrustedSite-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/cspTrustedSites/GitHub_Avatars.cspTrustedSite-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/cspTrustedSites/GitHub_Avatars.cspTrustedSite-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/cspTrustedSites/GitHub_Avatars.cspTrustedSite-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/cspTrustedSites/Google_Fonts.cspTrustedSite-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/cspTrustedSites/Google_Fonts.cspTrustedSite-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/cspTrustedSites/Google_Fonts.cspTrustedSite-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/cspTrustedSites/Google_Fonts.cspTrustedSite-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/cspTrustedSites/Google_Fonts_Static.cspTrustedSite-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/cspTrustedSites/Google_Fonts_Static.cspTrustedSite-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/cspTrustedSites/Google_Fonts_Static.cspTrustedSite-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/cspTrustedSites/Google_Fonts_Static.cspTrustedSite-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/cspTrustedSites/OpenStreetMap_Nominatim.cspTrustedSite-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/cspTrustedSites/OpenStreetMap_Nominatim.cspTrustedSite-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/cspTrustedSites/OpenStreetMap_Nominatim.cspTrustedSite-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/cspTrustedSites/OpenStreetMap_Nominatim.cspTrustedSite-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/cspTrustedSites/OpenStreetMap_Tiles.cspTrustedSite-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/cspTrustedSites/OpenStreetMap_Tiles.cspTrustedSite-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/cspTrustedSites/OpenStreetMap_Tiles.cspTrustedSite-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/cspTrustedSites/OpenStreetMap_Tiles.cspTrustedSite-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/cspTrustedSites/Open_Meteo_API.cspTrustedSite-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/cspTrustedSites/Open_Meteo_API.cspTrustedSite-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/cspTrustedSites/Open_Meteo_API.cspTrustedSite-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/cspTrustedSites/Open_Meteo_API.cspTrustedSite-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/cspTrustedSites/Pexels_Images.cspTrustedSite-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/cspTrustedSites/Pexels_Images.cspTrustedSite-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/cspTrustedSites/Pexels_Images.cspTrustedSite-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/cspTrustedSites/Pexels_Images.cspTrustedSite-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/cspTrustedSites/Pexels_Videos.cspTrustedSite-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/cspTrustedSites/Pexels_Videos.cspTrustedSite-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/cspTrustedSites/Pexels_Videos.cspTrustedSite-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/cspTrustedSites/Pexels_Videos.cspTrustedSite-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/cspTrustedSites/Unsplash_Images.cspTrustedSite-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/cspTrustedSites/Unsplash_Images.cspTrustedSite-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/cspTrustedSites/Unsplash_Images.cspTrustedSite-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/cspTrustedSites/Unsplash_Images.cspTrustedSite-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/data/Agent__c.json b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/data/Agent__c.json
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/data/Agent__c.json
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/data/Agent__c.json
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/data/Application__c.json b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/data/Application__c.json
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/data/Application__c.json
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/data/Application__c.json
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/data/Contact.json b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/data/Contact.json
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/data/Contact.json
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/data/Contact.json
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/data/KPI_Snapshot__c.json b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/data/KPI_Snapshot__c.json
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/data/KPI_Snapshot__c.json
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/data/KPI_Snapshot__c.json
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/data/Lease__c.json b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/data/Lease__c.json
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/data/Lease__c.json
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/data/Lease__c.json
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/data/Maintenance_Request__c.json b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/data/Maintenance_Request__c.json
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/data/Maintenance_Request__c.json
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/data/Maintenance_Request__c.json
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/data/Maintenance_Worker__c.json b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/data/Maintenance_Worker__c.json
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/data/Maintenance_Worker__c.json
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/data/Maintenance_Worker__c.json
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/data/Notification__c.json b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/data/Notification__c.json
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/data/Notification__c.json
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/data/Notification__c.json
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/data/Payment__c.json b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/data/Payment__c.json
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/data/Payment__c.json
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/data/Payment__c.json
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/data/Property_Cost__c.json b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/data/Property_Cost__c.json
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/data/Property_Cost__c.json
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/data/Property_Cost__c.json
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/data/Property_Feature__c.json b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/data/Property_Feature__c.json
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/data/Property_Feature__c.json
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/data/Property_Feature__c.json
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/data/Property_Image__c.json b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/data/Property_Image__c.json
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/data/Property_Image__c.json
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/data/Property_Image__c.json
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/data/Property_Listing__c.json b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/data/Property_Listing__c.json
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/data/Property_Listing__c.json
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/data/Property_Listing__c.json
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/data/Property_Management_Company__c.json b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/data/Property_Management_Company__c.json
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/data/Property_Management_Company__c.json
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/data/Property_Management_Company__c.json
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/data/Property_Owner__c.json b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/data/Property_Owner__c.json
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/data/Property_Owner__c.json
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/data/Property_Owner__c.json
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/data/Property_Sale__c.json b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/data/Property_Sale__c.json
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/data/Property_Sale__c.json
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/data/Property_Sale__c.json
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/data/Property__c.json b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/data/Property__c.json
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/data/Property__c.json
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/data/Property__c.json
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/data/Tenant__c.json b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/data/Tenant__c.json
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/data/Tenant__c.json
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/data/Tenant__c.json
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/data/data-plan.json b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/data/data-plan.json
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/data/data-plan.json
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/data/data-plan.json
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/data/prepare-import-unique-fields.js b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/data/prepare-import-unique-fields.js
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/data/prepare-import-unique-fields.js
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/data/prepare-import-unique-fields.js
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/layouts/Application__c-Application Layout.layout-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/layouts/Application__c-Application Layout.layout-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/layouts/Application__c-Application Layout.layout-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/layouts/Application__c-Application Layout.layout-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/layouts/KPI_Snapshot__c-KPI Snapshot Layout.layout-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/layouts/KPI_Snapshot__c-KPI Snapshot Layout.layout-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/layouts/KPI_Snapshot__c-KPI Snapshot Layout.layout-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/layouts/KPI_Snapshot__c-KPI Snapshot Layout.layout-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/layouts/Lease__c-Lease Layout.layout-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/layouts/Lease__c-Lease Layout.layout-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/layouts/Lease__c-Lease Layout.layout-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/layouts/Lease__c-Lease Layout.layout-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/layouts/Maintenance_Request__c-Maintenance Request Layout.layout-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/layouts/Maintenance_Request__c-Maintenance Request Layout.layout-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/layouts/Maintenance_Request__c-Maintenance Request Layout.layout-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/layouts/Maintenance_Request__c-Maintenance Request Layout.layout-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/layouts/Maintenance_Worker__c-Maintenance Worker Layout.layout-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/layouts/Maintenance_Worker__c-Maintenance Worker Layout.layout-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/layouts/Maintenance_Worker__c-Maintenance Worker Layout.layout-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/layouts/Maintenance_Worker__c-Maintenance Worker Layout.layout-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/layouts/Payment__c-Payment Layout.layout-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/layouts/Payment__c-Payment Layout.layout-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/layouts/Payment__c-Payment Layout.layout-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/layouts/Payment__c-Payment Layout.layout-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/layouts/Property_Cost__c-Property Cost Layout.layout-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/layouts/Property_Cost__c-Property Cost Layout.layout-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/layouts/Property_Cost__c-Property Cost Layout.layout-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/layouts/Property_Cost__c-Property Cost Layout.layout-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/layouts/Property_Feature__c-Property Feature Layout.layout-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/layouts/Property_Feature__c-Property Feature Layout.layout-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/layouts/Property_Feature__c-Property Feature Layout.layout-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/layouts/Property_Feature__c-Property Feature Layout.layout-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/layouts/Property_Image__c-Property Image Layout.layout-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/layouts/Property_Image__c-Property Image Layout.layout-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/layouts/Property_Image__c-Property Image Layout.layout-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/layouts/Property_Image__c-Property Image Layout.layout-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/layouts/Property_Listing__c-Property Listing Layout.layout-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/layouts/Property_Listing__c-Property Listing Layout.layout-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/layouts/Property_Listing__c-Property Listing Layout.layout-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/layouts/Property_Listing__c-Property Listing Layout.layout-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/layouts/Property_Management_Company__c-Property Management Company Layout.layout-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/layouts/Property_Management_Company__c-Property Management Company Layout.layout-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/layouts/Property_Management_Company__c-Property Management Company Layout.layout-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/layouts/Property_Management_Company__c-Property Management Company Layout.layout-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/layouts/Property_Owner__c-Property Owner Layout.layout-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/layouts/Property_Owner__c-Property Owner Layout.layout-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/layouts/Property_Owner__c-Property Owner Layout.layout-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/layouts/Property_Owner__c-Property Owner Layout.layout-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/layouts/Property_Sale__c-Property Sale Layout.layout-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/layouts/Property_Sale__c-Property Sale Layout.layout-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/layouts/Property_Sale__c-Property Sale Layout.layout-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/layouts/Property_Sale__c-Property Sale Layout.layout-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/layouts/Property__c-Property Layout.layout-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/layouts/Property__c-Property Layout.layout-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/layouts/Property__c-Property Layout.layout-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/layouts/Property__c-Property Layout.layout-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/layouts/Tenant__c-Tenant Layout.layout-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/layouts/Tenant__c-Tenant Layout.layout-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/layouts/Tenant__c-Tenant Layout.layout-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/layouts/Tenant__c-Tenant Layout.layout-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Agent__c/Agent__c.object-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Agent__c/Agent__c.object-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Agent__c/Agent__c.object-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Agent__c/Agent__c.object-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Agent__c/fields/Agent_Type__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Agent__c/fields/Agent_Type__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Agent__c/fields/Agent_Type__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Agent__c/fields/Agent_Type__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Agent__c/fields/Availability__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Agent__c/fields/Availability__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Agent__c/fields/Availability__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Agent__c/fields/Availability__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Agent__c/fields/Emergency_Alt__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Agent__c/fields/Emergency_Alt__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Agent__c/fields/Emergency_Alt__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Agent__c/fields/Emergency_Alt__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Agent__c/fields/Language__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Agent__c/fields/Language__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Agent__c/fields/Language__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Agent__c/fields/Language__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Agent__c/fields/License_Expiry__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Agent__c/fields/License_Expiry__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Agent__c/fields/License_Expiry__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Agent__c/fields/License_Expiry__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Agent__c/fields/License_Number__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Agent__c/fields/License_Number__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Agent__c/fields/License_Number__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Agent__c/fields/License_Number__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Agent__c/fields/Office_Location__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Agent__c/fields/Office_Location__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Agent__c/fields/Office_Location__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Agent__c/fields/Office_Location__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Agent__c/fields/Territory__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Agent__c/fields/Territory__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Agent__c/fields/Territory__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Agent__c/fields/Territory__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Application__c/Application__c.object-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Application__c/Application__c.object-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Application__c/Application__c.object-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Application__c/Application__c.object-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Application__c/fields/Employment__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Application__c/fields/Employment__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Application__c/fields/Employment__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Application__c/fields/Employment__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Application__c/fields/Property__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Application__c/fields/Property__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Application__c/fields/Property__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Application__c/fields/Property__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Application__c/fields/References__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Application__c/fields/References__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Application__c/fields/References__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Application__c/fields/References__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Application__c/fields/Start_Date__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Application__c/fields/Start_Date__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Application__c/fields/Start_Date__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Application__c/fields/Start_Date__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Application__c/fields/Status__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Application__c/fields/Status__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Application__c/fields/Status__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Application__c/fields/Status__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Application__c/fields/User__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Application__c/fields/User__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Application__c/fields/User__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Application__c/fields/User__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/KPI_Snapshot__c/KPI_Snapshot__c.object-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/KPI_Snapshot__c/KPI_Snapshot__c.object-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/KPI_Snapshot__c/KPI_Snapshot__c.object-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/KPI_Snapshot__c/KPI_Snapshot__c.object-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/KPI_Snapshot__c/fields/Previous_Month_Sales__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/KPI_Snapshot__c/fields/Previous_Month_Sales__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/KPI_Snapshot__c/fields/Previous_Month_Sales__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/KPI_Snapshot__c/fields/Previous_Month_Sales__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/KPI_Snapshot__c/fields/Sales_MoM_Change__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/KPI_Snapshot__c/fields/Sales_MoM_Change__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/KPI_Snapshot__c/fields/Sales_MoM_Change__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/KPI_Snapshot__c/fields/Sales_MoM_Change__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/KPI_Snapshot__c/fields/Snapshot_Date__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/KPI_Snapshot__c/fields/Snapshot_Date__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/KPI_Snapshot__c/fields/Snapshot_Date__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/KPI_Snapshot__c/fields/Snapshot_Date__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/KPI_Snapshot__c/fields/Total_Properties__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/KPI_Snapshot__c/fields/Total_Properties__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/KPI_Snapshot__c/fields/Total_Properties__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/KPI_Snapshot__c/fields/Total_Properties__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/KPI_Snapshot__c/fields/Total_Sales_Amount__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/KPI_Snapshot__c/fields/Total_Sales_Amount__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/KPI_Snapshot__c/fields/Total_Sales_Amount__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/KPI_Snapshot__c/fields/Total_Sales_Amount__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/KPI_Snapshot__c/fields/Total_Sales_Count__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/KPI_Snapshot__c/fields/Total_Sales_Count__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/KPI_Snapshot__c/fields/Total_Sales_Count__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/KPI_Snapshot__c/fields/Total_Sales_Count__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/KPI_Snapshot__c/fields/Units_Available__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/KPI_Snapshot__c/fields/Units_Available__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/KPI_Snapshot__c/fields/Units_Available__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/KPI_Snapshot__c/fields/Units_Available__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/KPI_Snapshot__c/fields/Units_Occupied__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/KPI_Snapshot__c/fields/Units_Occupied__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/KPI_Snapshot__c/fields/Units_Occupied__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/KPI_Snapshot__c/fields/Units_Occupied__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Lease__c/Lease__c.object-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Lease__c/Lease__c.object-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Lease__c/Lease__c.object-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Lease__c/Lease__c.object-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Lease__c/fields/End_Date__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Lease__c/fields/End_Date__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Lease__c/fields/End_Date__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Lease__c/fields/End_Date__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Lease__c/fields/Lease_Status__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Lease__c/fields/Lease_Status__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Lease__c/fields/Lease_Status__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Lease__c/fields/Lease_Status__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Lease__c/fields/Monthly_Rent__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Lease__c/fields/Monthly_Rent__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Lease__c/fields/Monthly_Rent__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Lease__c/fields/Monthly_Rent__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Lease__c/fields/Property__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Lease__c/fields/Property__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Lease__c/fields/Property__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Lease__c/fields/Property__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Lease__c/fields/Security_Deposit__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Lease__c/fields/Security_Deposit__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Lease__c/fields/Security_Deposit__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Lease__c/fields/Security_Deposit__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Lease__c/fields/Start_Date__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Lease__c/fields/Start_Date__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Lease__c/fields/Start_Date__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Lease__c/fields/Start_Date__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Lease__c/fields/Tenant__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Lease__c/fields/Tenant__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Lease__c/fields/Tenant__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Lease__c/fields/Tenant__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Lease__c/validationRules/End_Date_After_Start_Date.validationRule-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Lease__c/validationRules/End_Date_After_Start_Date.validationRule-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Lease__c/validationRules/End_Date_After_Start_Date.validationRule-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Lease__c/validationRules/End_Date_After_Start_Date.validationRule-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Maintenance_Request__c/Maintenance_Request__c.object-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Maintenance_Request__c/Maintenance_Request__c.object-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Maintenance_Request__c/Maintenance_Request__c.object-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Maintenance_Request__c/Maintenance_Request__c.object-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Maintenance_Request__c/fields/Actual_Cost__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Maintenance_Request__c/fields/Actual_Cost__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Maintenance_Request__c/fields/Actual_Cost__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Maintenance_Request__c/fields/Actual_Cost__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Maintenance_Request__c/fields/Assigned_Worker__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Maintenance_Request__c/fields/Assigned_Worker__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Maintenance_Request__c/fields/Assigned_Worker__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Maintenance_Request__c/fields/Assigned_Worker__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Maintenance_Request__c/fields/Completed__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Maintenance_Request__c/fields/Completed__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Maintenance_Request__c/fields/Completed__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Maintenance_Request__c/fields/Completed__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Maintenance_Request__c/fields/Description__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Maintenance_Request__c/fields/Description__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Maintenance_Request__c/fields/Description__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Maintenance_Request__c/fields/Description__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Maintenance_Request__c/fields/Est_Cost__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Maintenance_Request__c/fields/Est_Cost__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Maintenance_Request__c/fields/Est_Cost__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Maintenance_Request__c/fields/Est_Cost__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Maintenance_Request__c/fields/Priority__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Maintenance_Request__c/fields/Priority__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Maintenance_Request__c/fields/Priority__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Maintenance_Request__c/fields/Priority__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Maintenance_Request__c/fields/Property__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Maintenance_Request__c/fields/Property__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Maintenance_Request__c/fields/Property__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Maintenance_Request__c/fields/Property__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Maintenance_Request__c/fields/Scheduled__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Maintenance_Request__c/fields/Scheduled__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Maintenance_Request__c/fields/Scheduled__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Maintenance_Request__c/fields/Scheduled__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Maintenance_Request__c/fields/Status__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Maintenance_Request__c/fields/Status__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Maintenance_Request__c/fields/Status__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Maintenance_Request__c/fields/Status__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Maintenance_Request__c/fields/Tenant_Home__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Maintenance_Request__c/fields/Tenant_Home__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Maintenance_Request__c/fields/Tenant_Home__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Maintenance_Request__c/fields/Tenant_Home__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Maintenance_Request__c/fields/Type__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Maintenance_Request__c/fields/Type__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Maintenance_Request__c/fields/Type__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Maintenance_Request__c/fields/Type__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Maintenance_Request__c/fields/User__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Maintenance_Request__c/fields/User__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Maintenance_Request__c/fields/User__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Maintenance_Request__c/fields/User__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Maintenance_Worker__c/Maintenance_Worker__c.object-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Maintenance_Worker__c/Maintenance_Worker__c.object-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Maintenance_Worker__c/Maintenance_Worker__c.object-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Maintenance_Worker__c/Maintenance_Worker__c.object-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Maintenance_Worker__c/fields/Certifications__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Maintenance_Worker__c/fields/Certifications__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Maintenance_Worker__c/fields/Certifications__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Maintenance_Worker__c/fields/Certifications__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Maintenance_Worker__c/fields/Employment_Type__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Maintenance_Worker__c/fields/Employment_Type__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Maintenance_Worker__c/fields/Employment_Type__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Maintenance_Worker__c/fields/Employment_Type__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Maintenance_Worker__c/fields/Hourly_Rate__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Maintenance_Worker__c/fields/Hourly_Rate__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Maintenance_Worker__c/fields/Hourly_Rate__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Maintenance_Worker__c/fields/Hourly_Rate__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Maintenance_Worker__c/fields/IsActive__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Maintenance_Worker__c/fields/IsActive__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Maintenance_Worker__c/fields/IsActive__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Maintenance_Worker__c/fields/IsActive__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Maintenance_Worker__c/fields/Location__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Maintenance_Worker__c/fields/Location__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Maintenance_Worker__c/fields/Location__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Maintenance_Worker__c/fields/Location__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Maintenance_Worker__c/fields/Phone__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Maintenance_Worker__c/fields/Phone__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Maintenance_Worker__c/fields/Phone__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Maintenance_Worker__c/fields/Phone__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Maintenance_Worker__c/fields/Rating__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Maintenance_Worker__c/fields/Rating__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Maintenance_Worker__c/fields/Rating__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Maintenance_Worker__c/fields/Rating__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Maintenance_Worker__c/fields/Type__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Maintenance_Worker__c/fields/Type__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Maintenance_Worker__c/fields/Type__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Maintenance_Worker__c/fields/Type__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Notification__c/Notification__c.object-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Notification__c/Notification__c.object-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Notification__c/Notification__c.object-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Notification__c/Notification__c.object-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Notification__c/fields/Is_Read__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Notification__c/fields/Is_Read__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Notification__c/fields/Is_Read__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Notification__c/fields/Is_Read__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Notification__c/fields/Message__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Notification__c/fields/Message__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Notification__c/fields/Message__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Notification__c/fields/Message__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Notification__c/fields/Priority__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Notification__c/fields/Priority__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Notification__c/fields/Priority__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Notification__c/fields/Priority__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Notification__c/fields/Related_Object_Type__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Notification__c/fields/Related_Object_Type__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Notification__c/fields/Related_Object_Type__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Notification__c/fields/Related_Object_Type__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Notification__c/fields/Related_Record_Id__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Notification__c/fields/Related_Record_Id__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Notification__c/fields/Related_Record_Id__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Notification__c/fields/Related_Record_Id__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Notification__c/fields/Title__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Notification__c/fields/Title__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Notification__c/fields/Title__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Notification__c/fields/Title__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Notification__c/fields/Type__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Notification__c/fields/Type__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Notification__c/fields/Type__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Notification__c/fields/Type__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Notification__c/fields/User__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Notification__c/fields/User__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Notification__c/fields/User__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Notification__c/fields/User__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Payment__c/Payment__c.object-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Payment__c/Payment__c.object-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Payment__c/Payment__c.object-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Payment__c/Payment__c.object-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Payment__c/fields/Amount__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Payment__c/fields/Amount__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Payment__c/fields/Amount__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Payment__c/fields/Amount__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Payment__c/fields/Lease__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Payment__c/fields/Lease__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Payment__c/fields/Lease__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Payment__c/fields/Lease__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Payment__c/fields/Notes__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Payment__c/fields/Notes__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Payment__c/fields/Notes__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Payment__c/fields/Notes__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Payment__c/fields/Payment_Date__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Payment__c/fields/Payment_Date__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Payment__c/fields/Payment_Date__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Payment__c/fields/Payment_Date__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Payment__c/fields/Payment_Method__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Payment__c/fields/Payment_Method__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Payment__c/fields/Payment_Method__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Payment__c/fields/Payment_Method__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Payment__c/fields/Payment_Status__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Payment__c/fields/Payment_Status__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Payment__c/fields/Payment_Status__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Payment__c/fields/Payment_Status__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property_Cost__c/Property_Cost__c.object-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property_Cost__c/Property_Cost__c.object-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property_Cost__c/Property_Cost__c.object-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property_Cost__c/Property_Cost__c.object-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property_Cost__c/fields/Cost_Amount__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property_Cost__c/fields/Cost_Amount__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property_Cost__c/fields/Cost_Amount__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property_Cost__c/fields/Cost_Amount__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property_Cost__c/fields/Cost_Category__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property_Cost__c/fields/Cost_Category__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property_Cost__c/fields/Cost_Category__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property_Cost__c/fields/Cost_Category__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property_Cost__c/fields/Cost_Date__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property_Cost__c/fields/Cost_Date__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property_Cost__c/fields/Cost_Date__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property_Cost__c/fields/Cost_Date__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property_Cost__c/fields/Description__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property_Cost__c/fields/Description__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property_Cost__c/fields/Description__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property_Cost__c/fields/Description__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property_Cost__c/fields/Property__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property_Cost__c/fields/Property__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property_Cost__c/fields/Property__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property_Cost__c/fields/Property__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property_Cost__c/fields/Vendor__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property_Cost__c/fields/Vendor__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property_Cost__c/fields/Vendor__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property_Cost__c/fields/Vendor__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property_Cost__c/validationRules/Cost_Amount_Limit.validationRule-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property_Cost__c/validationRules/Cost_Amount_Limit.validationRule-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property_Cost__c/validationRules/Cost_Amount_Limit.validationRule-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property_Cost__c/validationRules/Cost_Amount_Limit.validationRule-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property_Feature__c/Property_Feature__c.object-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property_Feature__c/Property_Feature__c.object-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property_Feature__c/Property_Feature__c.object-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property_Feature__c/Property_Feature__c.object-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property_Feature__c/fields/Description__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property_Feature__c/fields/Description__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property_Feature__c/fields/Description__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property_Feature__c/fields/Description__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property_Feature__c/fields/Display_on_Listing__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property_Feature__c/fields/Display_on_Listing__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property_Feature__c/fields/Display_on_Listing__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property_Feature__c/fields/Display_on_Listing__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property_Feature__c/fields/Feature_Category__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property_Feature__c/fields/Feature_Category__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property_Feature__c/fields/Feature_Category__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property_Feature__c/fields/Feature_Category__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property_Feature__c/fields/Property__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property_Feature__c/fields/Property__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property_Feature__c/fields/Property__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property_Feature__c/fields/Property__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property_Image__c/Property_Image__c.object-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property_Image__c/Property_Image__c.object-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property_Image__c/Property_Image__c.object-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property_Image__c/Property_Image__c.object-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property_Image__c/fields/Alt_Text__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property_Image__c/fields/Alt_Text__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property_Image__c/fields/Alt_Text__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property_Image__c/fields/Alt_Text__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property_Image__c/fields/Display_Order__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property_Image__c/fields/Display_Order__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property_Image__c/fields/Display_Order__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property_Image__c/fields/Display_Order__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property_Image__c/fields/Image_Type__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property_Image__c/fields/Image_Type__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property_Image__c/fields/Image_Type__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property_Image__c/fields/Image_Type__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property_Image__c/fields/Image_URL__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property_Image__c/fields/Image_URL__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property_Image__c/fields/Image_URL__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property_Image__c/fields/Image_URL__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property_Image__c/fields/Property__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property_Image__c/fields/Property__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property_Image__c/fields/Property__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property_Image__c/fields/Property__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property_Listing__c/Property_Listing__c.object-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property_Listing__c/Property_Listing__c.object-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property_Listing__c/Property_Listing__c.object-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property_Listing__c/Property_Listing__c.object-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property_Listing__c/fields/Display_Order__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property_Listing__c/fields/Display_Order__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property_Listing__c/fields/Display_Order__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property_Listing__c/fields/Display_Order__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property_Listing__c/fields/Featured__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property_Listing__c/fields/Featured__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property_Listing__c/fields/Featured__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property_Listing__c/fields/Featured__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property_Listing__c/fields/Listing_Price__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property_Listing__c/fields/Listing_Price__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property_Listing__c/fields/Listing_Price__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property_Listing__c/fields/Listing_Price__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property_Listing__c/fields/Listing_Status__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property_Listing__c/fields/Listing_Status__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property_Listing__c/fields/Listing_Status__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property_Listing__c/fields/Listing_Status__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property_Listing__c/fields/Marketing_Description__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property_Listing__c/fields/Marketing_Description__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property_Listing__c/fields/Marketing_Description__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property_Listing__c/fields/Marketing_Description__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property_Listing__c/fields/Property__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property_Listing__c/fields/Property__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property_Listing__c/fields/Property__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property_Listing__c/fields/Property__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property_Listing__c/fields/Short_Description__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property_Listing__c/fields/Short_Description__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property_Listing__c/fields/Short_Description__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property_Listing__c/fields/Short_Description__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property_Management_Company__c/Property_Management_Company__c.object-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property_Management_Company__c/Property_Management_Company__c.object-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property_Management_Company__c/Property_Management_Company__c.object-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property_Management_Company__c/Property_Management_Company__c.object-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property_Management_Company__c/fields/Active__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property_Management_Company__c/fields/Active__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property_Management_Company__c/fields/Active__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property_Management_Company__c/fields/Active__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property_Management_Company__c/fields/Company_Code__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property_Management_Company__c/fields/Company_Code__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property_Management_Company__c/fields/Company_Code__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property_Management_Company__c/fields/Company_Code__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property_Management_Company__c/fields/Email__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property_Management_Company__c/fields/Email__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property_Management_Company__c/fields/Email__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property_Management_Company__c/fields/Email__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property_Management_Company__c/fields/Phone__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property_Management_Company__c/fields/Phone__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property_Management_Company__c/fields/Phone__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property_Management_Company__c/fields/Phone__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property_Management_Company__c/fields/Primary_Contact__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property_Management_Company__c/fields/Primary_Contact__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property_Management_Company__c/fields/Primary_Contact__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property_Management_Company__c/fields/Primary_Contact__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property_Owner__c/Property_Owner__c.object-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property_Owner__c/Property_Owner__c.object-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property_Owner__c/Property_Owner__c.object-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property_Owner__c/Property_Owner__c.object-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property_Owner__c/fields/Address__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property_Owner__c/fields/Address__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property_Owner__c/fields/Address__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property_Owner__c/fields/Address__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property_Owner__c/fields/Email__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property_Owner__c/fields/Email__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property_Owner__c/fields/Email__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property_Owner__c/fields/Email__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property_Owner__c/fields/Phone__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property_Owner__c/fields/Phone__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property_Owner__c/fields/Phone__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property_Owner__c/fields/Phone__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property_Sale__c/Property_Sale__c.object-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property_Sale__c/Property_Sale__c.object-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property_Sale__c/Property_Sale__c.object-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property_Sale__c/Property_Sale__c.object-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property_Sale__c/fields/Buyer_Tenant__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property_Sale__c/fields/Buyer_Tenant__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property_Sale__c/fields/Buyer_Tenant__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property_Sale__c/fields/Buyer_Tenant__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property_Sale__c/fields/Payment_Method__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property_Sale__c/fields/Payment_Method__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property_Sale__c/fields/Payment_Method__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property_Sale__c/fields/Payment_Method__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property_Sale__c/fields/Property__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property_Sale__c/fields/Property__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property_Sale__c/fields/Property__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property_Sale__c/fields/Property__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property_Sale__c/fields/Reference_Number__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property_Sale__c/fields/Reference_Number__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property_Sale__c/fields/Reference_Number__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property_Sale__c/fields/Reference_Number__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property_Sale__c/fields/Sale_Amount__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property_Sale__c/fields/Sale_Amount__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property_Sale__c/fields/Sale_Amount__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property_Sale__c/fields/Sale_Amount__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property_Sale__c/fields/Sale_Date__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property_Sale__c/fields/Sale_Date__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property_Sale__c/fields/Sale_Date__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property_Sale__c/fields/Sale_Date__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property_Sale__c/fields/Sale_Status__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property_Sale__c/fields/Sale_Status__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property_Sale__c/fields/Sale_Status__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property_Sale__c/fields/Sale_Status__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property_Sale__c/fields/Sale_Type__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property_Sale__c/fields/Sale_Type__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property_Sale__c/fields/Sale_Type__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property_Sale__c/fields/Sale_Type__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property__c/Property__c.object-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property__c/Property__c.object-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property__c/Property__c.object-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property__c/Property__c.object-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property__c/fields/Address__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property__c/fields/Address__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property__c/fields/Address__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property__c/fields/Address__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property__c/fields/Agent__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property__c/fields/Agent__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property__c/fields/Agent__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property__c/fields/Agent__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property__c/fields/Available_Date__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property__c/fields/Available_Date__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property__c/fields/Available_Date__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property__c/fields/Available_Date__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property__c/fields/Bathrooms__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property__c/fields/Bathrooms__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property__c/fields/Bathrooms__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property__c/fields/Bathrooms__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property__c/fields/Bedrooms__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property__c/fields/Bedrooms__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property__c/fields/Bedrooms__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property__c/fields/Bedrooms__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property__c/fields/Coordinates__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property__c/fields/Coordinates__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property__c/fields/Coordinates__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property__c/fields/Coordinates__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property__c/fields/Deposit__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property__c/fields/Deposit__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property__c/fields/Deposit__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property__c/fields/Deposit__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property__c/fields/Description__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property__c/fields/Description__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property__c/fields/Description__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property__c/fields/Description__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property__c/fields/Features__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property__c/fields/Features__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property__c/fields/Features__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property__c/fields/Features__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property__c/fields/Hero_Image__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property__c/fields/Hero_Image__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property__c/fields/Hero_Image__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property__c/fields/Hero_Image__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property__c/fields/Lease_Term__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property__c/fields/Lease_Term__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property__c/fields/Lease_Term__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property__c/fields/Lease_Term__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property__c/fields/Monthly_Rent__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property__c/fields/Monthly_Rent__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property__c/fields/Monthly_Rent__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property__c/fields/Monthly_Rent__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property__c/fields/Parking__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property__c/fields/Parking__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property__c/fields/Parking__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property__c/fields/Parking__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property__c/fields/Pet_Friendly__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property__c/fields/Pet_Friendly__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property__c/fields/Pet_Friendly__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property__c/fields/Pet_Friendly__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property__c/fields/Sq_Ft__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property__c/fields/Sq_Ft__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property__c/fields/Sq_Ft__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property__c/fields/Sq_Ft__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property__c/fields/Status__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property__c/fields/Status__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property__c/fields/Status__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property__c/fields/Status__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property__c/fields/Tour_URL__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property__c/fields/Tour_URL__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property__c/fields/Tour_URL__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property__c/fields/Tour_URL__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property__c/fields/Type__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property__c/fields/Type__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property__c/fields/Type__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property__c/fields/Type__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property__c/fields/Utilities__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property__c/fields/Utilities__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property__c/fields/Utilities__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property__c/fields/Utilities__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property__c/fields/Year_Built__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property__c/fields/Year_Built__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property__c/fields/Year_Built__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Property__c/fields/Year_Built__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Tenant__c/Tenant__c.object-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Tenant__c/Tenant__c.object-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Tenant__c/Tenant__c.object-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Tenant__c/Tenant__c.object-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Tenant__c/fields/End_Date__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Tenant__c/fields/End_Date__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Tenant__c/fields/End_Date__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Tenant__c/fields/End_Date__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Tenant__c/fields/Property__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Tenant__c/fields/Property__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Tenant__c/fields/Property__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Tenant__c/fields/Property__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Tenant__c/fields/Start_Date__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Tenant__c/fields/Start_Date__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Tenant__c/fields/Start_Date__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Tenant__c/fields/Start_Date__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Tenant__c/fields/Status__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Tenant__c/fields/Status__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Tenant__c/fields/Status__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Tenant__c/fields/Status__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Tenant__c/fields/User_Status__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Tenant__c/fields/User_Status__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Tenant__c/fields/User_Status__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Tenant__c/fields/User_Status__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Tenant__c/fields/User__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Tenant__c/fields/User__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Tenant__c/fields/User__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/objects/Tenant__c/fields/User__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/permissionsets/Property_Management_Access.permissionset-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/permissionsets/Property_Management_Access.permissionset-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/permissionsets/Property_Management_Access.permissionset-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/permissionsets/Property_Management_Access.permissionset-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/permissionsets/Tenant_Maintenance_Access.permissionset-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/permissionsets/Tenant_Maintenance_Access.permissionset-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/permissionsets/Tenant_Maintenance_Access.permissionset-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/permissionsets/Tenant_Maintenance_Access.permissionset-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/triggers/MaintenanceRequestTrigger.trigger b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/triggers/MaintenanceRequestTrigger.trigger
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/triggers/MaintenanceRequestTrigger.trigger
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/triggers/MaintenanceRequestTrigger.trigger
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/triggers/MaintenanceRequestTrigger.trigger-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/triggers/MaintenanceRequestTrigger.trigger-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/triggers/MaintenanceRequestTrigger.trigger-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/triggers/MaintenanceRequestTrigger.trigger-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/triggers/TenantTrigger.trigger b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/triggers/TenantTrigger.trigger
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/triggers/TenantTrigger.trigger
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/triggers/TenantTrigger.trigger
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/triggers/TenantTrigger.trigger-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/triggers/TenantTrigger.trigger-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/triggers/TenantTrigger.trigger-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/triggers/TenantTrigger.trigger-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/.forceignore b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/.forceignore
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/.forceignore
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/.forceignore
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/.graphqlrc.yml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/.graphqlrc.yml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/.graphqlrc.yml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/.graphqlrc.yml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/.prettierignore b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/.prettierignore
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/.prettierignore
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/.prettierignore
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/.prettierrc b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/.prettierrc
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/.prettierrc
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/.prettierrc
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/CHANGELOG.md b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/CHANGELOG.md
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/CHANGELOG.md
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/CHANGELOG.md
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/README.md b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/README.md
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/README.md
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/README.md
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/codegen.yml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/codegen.yml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/codegen.yml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/codegen.yml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/components.json b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/components.json
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/components.json
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/components.json
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/e2e/app.spec.ts b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/e2e/app.spec.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/e2e/app.spec.ts
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/e2e/app.spec.ts
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/eslint.config.js b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/eslint.config.js
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/eslint.config.js
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/eslint.config.js
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/index.html b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/index.html
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/index.html
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/index.html
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/package.json b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/package.json
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/package.json
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/package.json
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/playwright.config.ts b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/playwright.config.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/playwright.config.ts
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/playwright.config.ts
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/propertymanagementapp.uibundle-meta.xml b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/propertymanagementapp.uibundle-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/propertymanagementapp.uibundle-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/propertymanagementapp.uibundle-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/scripts/get-graphql-schema.mjs b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/scripts/get-graphql-schema.mjs
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/scripts/get-graphql-schema.mjs
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/scripts/get-graphql-schema.mjs
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/scripts/rewrite-e2e-assets.mjs b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/scripts/rewrite-e2e-assets.mjs
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/scripts/rewrite-e2e-assets.mjs
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/scripts/rewrite-e2e-assets.mjs
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/api/applications/applicationSearchService.ts b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/api/applications/applicationSearchService.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/api/applications/applicationSearchService.ts
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/api/applications/applicationSearchService.ts
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/api/applications/applications.ts b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/api/applications/applications.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/api/applications/applications.ts
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/api/applications/applications.ts
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/api/applications/query/applicationForApproval.graphql b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/api/applications/query/applicationForApproval.graphql
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/api/applications/query/applicationForApproval.graphql
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/api/applications/query/applicationForApproval.graphql
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/api/applications/query/distinctApplicationStatus.graphql b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/api/applications/query/distinctApplicationStatus.graphql
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/api/applications/query/distinctApplicationStatus.graphql
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/api/applications/query/distinctApplicationStatus.graphql
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/api/applications/query/existingTenant.graphql b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/api/applications/query/existingTenant.graphql
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/api/applications/query/existingTenant.graphql
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/api/applications/query/existingTenant.graphql
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/api/applications/query/getApplications.graphql b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/api/applications/query/getApplications.graphql
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/api/applications/query/getApplications.graphql
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/api/applications/query/getApplications.graphql
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/api/applications/query/searchApplications.graphql b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/api/applications/query/searchApplications.graphql
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/api/applications/query/searchApplications.graphql
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/api/applications/query/searchApplications.graphql
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/api/applications/query/updateApplicationStatus.graphql b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/api/applications/query/updateApplicationStatus.graphql
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/api/applications/query/updateApplicationStatus.graphql
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/api/applications/query/updateApplicationStatus.graphql
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/api/applications/query/userByContact.graphql b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/api/applications/query/userByContact.graphql
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/api/applications/query/userByContact.graphql
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/api/applications/query/userByContact.graphql
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/api/dashboard/dashboard.ts b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/api/dashboard/dashboard.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/api/dashboard/dashboard.ts
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/api/dashboard/dashboard.ts
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/api/dashboard/query/getDashboardMetrics.graphql b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/api/dashboard/query/getDashboardMetrics.graphql
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/api/dashboard/query/getDashboardMetrics.graphql
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/api/dashboard/query/getDashboardMetrics.graphql
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/api/dashboard/query/getOpenApplications.graphql b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/api/dashboard/query/getOpenApplications.graphql
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/api/dashboard/query/getOpenApplications.graphql
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/api/dashboard/query/getOpenApplications.graphql
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/api/dashboard/query/getUserInfo.graphql b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/api/dashboard/query/getUserInfo.graphql
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/api/dashboard/query/getUserInfo.graphql
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/api/dashboard/query/getUserInfo.graphql
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/api/graphql-operations-types.ts b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/api/graphql-operations-types.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/api/graphql-operations-types.ts
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/api/graphql-operations-types.ts
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/api/graphqlClient.ts b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/api/graphqlClient.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/api/graphqlClient.ts
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/api/graphqlClient.ts
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/api/maintenanceRequests/maintenanceRequestSearchService.ts b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/api/maintenanceRequests/maintenanceRequestSearchService.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/api/maintenanceRequests/maintenanceRequestSearchService.ts
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/api/maintenanceRequests/maintenanceRequestSearchService.ts
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/api/maintenanceRequests/maintenanceRequests.ts b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/api/maintenanceRequests/maintenanceRequests.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/api/maintenanceRequests/maintenanceRequests.ts
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/api/maintenanceRequests/maintenanceRequests.ts
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/api/maintenanceRequests/query/distinctMaintenanceRequestPriority.graphql b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/api/maintenanceRequests/query/distinctMaintenanceRequestPriority.graphql
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/api/maintenanceRequests/query/distinctMaintenanceRequestPriority.graphql
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/api/maintenanceRequests/query/distinctMaintenanceRequestPriority.graphql
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/api/maintenanceRequests/query/distinctMaintenanceRequestStatus.graphql b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/api/maintenanceRequests/query/distinctMaintenanceRequestStatus.graphql
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/api/maintenanceRequests/query/distinctMaintenanceRequestStatus.graphql
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/api/maintenanceRequests/query/distinctMaintenanceRequestStatus.graphql
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/api/maintenanceRequests/query/distinctMaintenanceRequestType.graphql b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/api/maintenanceRequests/query/distinctMaintenanceRequestType.graphql
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/api/maintenanceRequests/query/distinctMaintenanceRequestType.graphql
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/api/maintenanceRequests/query/distinctMaintenanceRequestType.graphql
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/api/maintenanceRequests/query/getAllMaintenanceRequests.graphql b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/api/maintenanceRequests/query/getAllMaintenanceRequests.graphql
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/api/maintenanceRequests/query/getAllMaintenanceRequests.graphql
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/api/maintenanceRequests/query/getAllMaintenanceRequests.graphql
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/api/maintenanceRequests/query/getMaintenanceRequests.graphql b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/api/maintenanceRequests/query/getMaintenanceRequests.graphql
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/api/maintenanceRequests/query/getMaintenanceRequests.graphql
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/api/maintenanceRequests/query/getMaintenanceRequests.graphql
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/api/maintenanceRequests/query/searchMaintenanceRequests.graphql b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/api/maintenanceRequests/query/searchMaintenanceRequests.graphql
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/api/maintenanceRequests/query/searchMaintenanceRequests.graphql
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/api/maintenanceRequests/query/searchMaintenanceRequests.graphql
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/api/maintenanceRequests/query/updateMaintenanceStatus.graphql b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/api/maintenanceRequests/query/updateMaintenanceStatus.graphql
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/api/maintenanceRequests/query/updateMaintenanceStatus.graphql
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/api/maintenanceRequests/query/updateMaintenanceStatus.graphql
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/api/maintenanceWorkers/maintenanceWorkerSearchService.ts b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/api/maintenanceWorkers/maintenanceWorkerSearchService.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/api/maintenanceWorkers/maintenanceWorkerSearchService.ts
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/api/maintenanceWorkers/maintenanceWorkerSearchService.ts
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/api/maintenanceWorkers/query/distinctMaintenanceWorkerEmploymentType.graphql b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/api/maintenanceWorkers/query/distinctMaintenanceWorkerEmploymentType.graphql
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/api/maintenanceWorkers/query/distinctMaintenanceWorkerEmploymentType.graphql
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/api/maintenanceWorkers/query/distinctMaintenanceWorkerEmploymentType.graphql
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/api/maintenanceWorkers/query/searchMaintenanceWorkers.graphql b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/api/maintenanceWorkers/query/searchMaintenanceWorkers.graphql
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/api/maintenanceWorkers/query/searchMaintenanceWorkers.graphql
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/api/maintenanceWorkers/query/searchMaintenanceWorkers.graphql
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/api/properties/properties.ts b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/api/properties/properties.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/api/properties/properties.ts
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/api/properties/properties.ts
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/api/properties/propertySearchService.ts b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/api/properties/propertySearchService.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/api/properties/propertySearchService.ts
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/api/properties/propertySearchService.ts
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/api/properties/query/distinctPropertyStatus.graphql b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/api/properties/query/distinctPropertyStatus.graphql
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/api/properties/query/distinctPropertyStatus.graphql
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/api/properties/query/distinctPropertyStatus.graphql
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/api/properties/query/distinctPropertyType.graphql b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/api/properties/query/distinctPropertyType.graphql
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/api/properties/query/distinctPropertyType.graphql
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/api/properties/query/distinctPropertyType.graphql
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/api/properties/query/getProperties.graphql b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/api/properties/query/getProperties.graphql
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/api/properties/query/getProperties.graphql
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/api/properties/query/getProperties.graphql
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/api/properties/query/searchProperties.graphql b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/api/properties/query/searchProperties.graphql
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/api/properties/query/searchProperties.graphql
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/api/properties/query/searchProperties.graphql
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/app.tsx b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/app.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/app.tsx
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/app.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/appLayout.tsx b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/appLayout.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/appLayout.tsx
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/appLayout.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/assets/icons/appliances.svg b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/assets/icons/appliances.svg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/assets/icons/appliances.svg
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/assets/icons/appliances.svg
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/assets/icons/book.svg b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/assets/icons/book.svg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/assets/icons/book.svg
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/assets/icons/book.svg
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/assets/icons/copy.svg b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/assets/icons/copy.svg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/assets/icons/copy.svg
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/assets/icons/copy.svg
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/assets/icons/dashboard.svg b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/assets/icons/dashboard.svg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/assets/icons/dashboard.svg
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/assets/icons/dashboard.svg
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/assets/icons/downgraph.svg b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/assets/icons/downgraph.svg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/assets/icons/downgraph.svg
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/assets/icons/downgraph.svg
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/assets/icons/electrical.svg b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/assets/icons/electrical.svg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/assets/icons/electrical.svg
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/assets/icons/electrical.svg
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/assets/icons/files.svg b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/assets/icons/files.svg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/assets/icons/files.svg
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/assets/icons/files.svg
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/assets/icons/hvac.svg b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/assets/icons/hvac.svg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/assets/icons/hvac.svg
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/assets/icons/hvac.svg
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/assets/icons/maintenance-worker.svg b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/assets/icons/maintenance-worker.svg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/assets/icons/maintenance-worker.svg
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/assets/icons/maintenance-worker.svg
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/assets/icons/maintenance.svg b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/assets/icons/maintenance.svg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/assets/icons/maintenance.svg
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/assets/icons/maintenance.svg
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/assets/icons/pest.svg b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/assets/icons/pest.svg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/assets/icons/pest.svg
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/assets/icons/pest.svg
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/assets/icons/plumbing.svg b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/assets/icons/plumbing.svg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/assets/icons/plumbing.svg
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/assets/icons/plumbing.svg
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/assets/icons/properties.svg b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/assets/icons/properties.svg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/assets/icons/properties.svg
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/assets/icons/properties.svg
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/assets/icons/rocket.svg b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/assets/icons/rocket.svg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/assets/icons/rocket.svg
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/assets/icons/rocket.svg
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/assets/icons/star.svg b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/assets/icons/star.svg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/assets/icons/star.svg
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/assets/icons/star.svg
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/assets/icons/support.svg b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/assets/icons/support.svg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/assets/icons/support.svg
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/assets/icons/support.svg
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/assets/icons/upgraph.svg b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/assets/icons/upgraph.svg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/assets/icons/upgraph.svg
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/assets/icons/upgraph.svg
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/assets/icons/users.svg b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/assets/icons/users.svg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/assets/icons/users.svg
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/assets/icons/users.svg
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/assets/icons/zen-logo.svg b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/assets/icons/zen-logo.svg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/assets/icons/zen-logo.svg
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/assets/icons/zen-logo.svg
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/assets/images/codey-1.png b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/assets/images/codey-1.png
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/assets/images/codey-1.png
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/assets/images/codey-1.png
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/assets/images/codey-2.png b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/assets/images/codey-2.png
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/assets/images/codey-2.png
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/assets/images/codey-2.png
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/assets/images/codey-3.png b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/assets/images/codey-3.png
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/assets/images/codey-3.png
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/assets/images/codey-3.png
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/assets/images/vibe-codey.svg b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/assets/images/vibe-codey.svg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/assets/images/vibe-codey.svg
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/assets/images/vibe-codey.svg
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/components/AgentforceConversationClient.tsx b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/components/AgentforceConversationClient.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/components/AgentforceConversationClient.tsx
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/components/AgentforceConversationClient.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/components/alerts/status-alert.tsx b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/components/alerts/status-alert.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/components/alerts/status-alert.tsx
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/components/alerts/status-alert.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/components/applications/ApplicationDetailsModal.tsx b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/components/applications/ApplicationDetailsModal.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/components/applications/ApplicationDetailsModal.tsx
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/components/applications/ApplicationDetailsModal.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/components/dashboard/GlobalSearchBar.tsx b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/components/dashboard/GlobalSearchBar.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/components/dashboard/GlobalSearchBar.tsx
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/components/dashboard/GlobalSearchBar.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/components/dashboard/IssuesDonutChart.tsx b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/components/dashboard/IssuesDonutChart.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/components/dashboard/IssuesDonutChart.tsx
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/components/dashboard/IssuesDonutChart.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/components/dashboard/MaintenanceTable.tsx b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/components/dashboard/MaintenanceTable.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/components/dashboard/MaintenanceTable.tsx
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/components/dashboard/MaintenanceTable.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/components/dashboard/StatCard.tsx b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/components/dashboard/StatCard.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/components/dashboard/StatCard.tsx
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/components/dashboard/StatCard.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/components/layout/FilterRow.tsx b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/components/layout/FilterRow.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/components/layout/FilterRow.tsx
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/components/layout/FilterRow.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/components/layout/PageContainer.tsx b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/components/layout/PageContainer.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/components/layout/PageContainer.tsx
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/components/layout/PageContainer.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/components/layout/PageHeader.tsx b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/components/layout/PageHeader.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/components/layout/PageHeader.tsx
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/components/layout/PageHeader.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/components/layout/TopBar.tsx b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/components/layout/TopBar.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/components/layout/TopBar.tsx
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/components/layout/TopBar.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/components/layout/VerticalNav.tsx b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/components/layout/VerticalNav.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/components/layout/VerticalNav.tsx
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/components/layout/VerticalNav.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/components/layouts/card-layout.tsx b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/components/layouts/card-layout.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/components/layouts/card-layout.tsx
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/components/layouts/card-layout.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/components/maintenanceRequests/MaintenanceDetailsModal.tsx b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/components/maintenanceRequests/MaintenanceDetailsModal.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/components/maintenanceRequests/MaintenanceDetailsModal.tsx
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/components/maintenanceRequests/MaintenanceDetailsModal.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/components/maintenanceRequests/MaintenanceRequestCard.tsx b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/components/maintenanceRequests/MaintenanceRequestCard.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/components/maintenanceRequests/MaintenanceRequestCard.tsx
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/components/maintenanceRequests/MaintenanceRequestCard.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/components/maintenanceWorkers/WorkerDetailsModal.tsx b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/components/maintenanceWorkers/WorkerDetailsModal.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/components/maintenanceWorkers/WorkerDetailsModal.tsx
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/components/maintenanceWorkers/WorkerDetailsModal.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/components/properties/PropertyCard.tsx b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/components/properties/PropertyCard.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/components/properties/PropertyCard.tsx
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/components/properties/PropertyCard.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/components/properties/PropertyDetailsModal.tsx b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/components/properties/PropertyDetailsModal.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/components/properties/PropertyDetailsModal.tsx
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/components/properties/PropertyDetailsModal.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/components/shared/ObjectSearchErrorState.tsx b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/components/shared/ObjectSearchErrorState.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/components/shared/ObjectSearchErrorState.tsx
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/components/shared/ObjectSearchErrorState.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/components/shared/UserAvatar.tsx b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/components/shared/UserAvatar.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/components/shared/UserAvatar.tsx
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/components/shared/UserAvatar.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/components/ui/alert.tsx b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/components/ui/alert.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/components/ui/alert.tsx
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/components/ui/alert.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/components/ui/badge.tsx b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/components/ui/badge.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/components/ui/badge.tsx
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/components/ui/badge.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/components/ui/breadcrumb.tsx b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/components/ui/breadcrumb.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/components/ui/breadcrumb.tsx
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/components/ui/breadcrumb.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/components/ui/button.tsx b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/components/ui/button.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/components/ui/button.tsx
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/components/ui/button.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/components/ui/calendar.tsx b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/components/ui/calendar.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/components/ui/calendar.tsx
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/components/ui/calendar.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/components/ui/card.tsx b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/components/ui/card.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/components/ui/card.tsx
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/components/ui/card.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/components/ui/checkbox.tsx b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/components/ui/checkbox.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/components/ui/checkbox.tsx
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/components/ui/checkbox.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/components/ui/collapsible.tsx b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/components/ui/collapsible.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/components/ui/collapsible.tsx
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/components/ui/collapsible.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/components/ui/datePicker.tsx b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/components/ui/datePicker.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/components/ui/datePicker.tsx
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/components/ui/datePicker.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/components/ui/dialog.tsx b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/components/ui/dialog.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/components/ui/dialog.tsx
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/components/ui/dialog.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/components/ui/field.tsx b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/components/ui/field.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/components/ui/field.tsx
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/components/ui/field.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/components/ui/index.ts b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/components/ui/index.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/components/ui/index.ts
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/components/ui/index.ts
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/components/ui/input.tsx b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/components/ui/input.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/components/ui/input.tsx
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/components/ui/input.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/components/ui/label.tsx b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/components/ui/label.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/components/ui/label.tsx
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/components/ui/label.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/components/ui/pagination.tsx b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/components/ui/pagination.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/components/ui/pagination.tsx
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/components/ui/pagination.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/components/ui/popover.tsx b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/components/ui/popover.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/components/ui/popover.tsx
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/components/ui/popover.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/components/ui/select.tsx b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/components/ui/select.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/components/ui/select.tsx
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/components/ui/select.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/components/ui/separator.tsx b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/components/ui/separator.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/components/ui/separator.tsx
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/components/ui/separator.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/components/ui/skeleton.tsx b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/components/ui/skeleton.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/components/ui/skeleton.tsx
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/components/ui/skeleton.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/components/ui/sonner.tsx b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/components/ui/sonner.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/components/ui/sonner.tsx
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/components/ui/sonner.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/components/ui/spinner.tsx b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/components/ui/spinner.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/components/ui/spinner.tsx
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/components/ui/spinner.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/components/ui/table.tsx b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/components/ui/table.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/components/ui/table.tsx
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/components/ui/table.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/components/ui/tabs.tsx b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/components/ui/tabs.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/components/ui/tabs.tsx
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/components/ui/tabs.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/__examples__/api/accountSearchService.ts b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/__examples__/api/accountSearchService.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/__examples__/api/accountSearchService.ts
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/__examples__/api/accountSearchService.ts
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/__examples__/api/query/distinctAccountIndustries.graphql b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/__examples__/api/query/distinctAccountIndustries.graphql
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/__examples__/api/query/distinctAccountIndustries.graphql
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/__examples__/api/query/distinctAccountIndustries.graphql
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/__examples__/api/query/distinctAccountTypes.graphql b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/__examples__/api/query/distinctAccountTypes.graphql
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/__examples__/api/query/distinctAccountTypes.graphql
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/__examples__/api/query/distinctAccountTypes.graphql
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/__examples__/api/query/getAccountDetail.graphql b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/__examples__/api/query/getAccountDetail.graphql
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/__examples__/api/query/getAccountDetail.graphql
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/__examples__/api/query/getAccountDetail.graphql
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/__examples__/api/query/searchAccounts.graphql b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/__examples__/api/query/searchAccounts.graphql
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/__examples__/api/query/searchAccounts.graphql
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/__examples__/api/query/searchAccounts.graphql
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/__examples__/pages/AccountObjectDetailPage.tsx b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/__examples__/pages/AccountObjectDetailPage.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/__examples__/pages/AccountObjectDetailPage.tsx
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/__examples__/pages/AccountObjectDetailPage.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/__examples__/pages/AccountSearch.tsx b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/__examples__/pages/AccountSearch.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/__examples__/pages/AccountSearch.tsx
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/__examples__/pages/AccountSearch.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/__examples__/pages/Home.tsx b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/__examples__/pages/Home.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/__examples__/pages/Home.tsx
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/__examples__/pages/Home.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/api/objectSearchService.ts b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/api/objectSearchService.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/api/objectSearchService.ts
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/api/objectSearchService.ts
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/components/ActiveFilters.tsx b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/components/ActiveFilters.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/components/ActiveFilters.tsx
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/components/ActiveFilters.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/components/FilterContext.tsx b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/components/FilterContext.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/components/FilterContext.tsx
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/components/FilterContext.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/components/ObjectBreadcrumb.tsx b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/components/ObjectBreadcrumb.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/components/ObjectBreadcrumb.tsx
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/components/ObjectBreadcrumb.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/components/PaginationControls.tsx b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/components/PaginationControls.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/components/PaginationControls.tsx
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/components/PaginationControls.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/components/SearchBar.tsx b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/components/SearchBar.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/components/SearchBar.tsx
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/components/SearchBar.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/components/SortControl.tsx b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/components/SortControl.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/components/SortControl.tsx
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/components/SortControl.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/components/filters/BooleanFilter.tsx b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/components/filters/BooleanFilter.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/components/filters/BooleanFilter.tsx
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/components/filters/BooleanFilter.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/components/filters/DateFilter.tsx b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/components/filters/DateFilter.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/components/filters/DateFilter.tsx
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/components/filters/DateFilter.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/components/filters/DateRangeFilter.tsx b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/components/filters/DateRangeFilter.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/components/filters/DateRangeFilter.tsx
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/components/filters/DateRangeFilter.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/components/filters/FilterFieldWrapper.tsx b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/components/filters/FilterFieldWrapper.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/components/filters/FilterFieldWrapper.tsx
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/components/filters/FilterFieldWrapper.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/components/filters/MultiSelectFilter.tsx b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/components/filters/MultiSelectFilter.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/components/filters/MultiSelectFilter.tsx
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/components/filters/MultiSelectFilter.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/components/filters/NumericRangeFilter.tsx b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/components/filters/NumericRangeFilter.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/components/filters/NumericRangeFilter.tsx
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/components/filters/NumericRangeFilter.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/components/filters/SearchFilter.tsx b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/components/filters/SearchFilter.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/components/filters/SearchFilter.tsx
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/components/filters/SearchFilter.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/components/filters/SelectFilter.tsx b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/components/filters/SelectFilter.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/components/filters/SelectFilter.tsx
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/components/filters/SelectFilter.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/components/filters/TextFilter.tsx b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/components/filters/TextFilter.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/components/filters/TextFilter.tsx
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/components/filters/TextFilter.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/hooks/useAsyncData.ts b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/hooks/useAsyncData.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/hooks/useAsyncData.ts
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/hooks/useAsyncData.ts
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/hooks/useCachedAsyncData.ts b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/hooks/useCachedAsyncData.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/hooks/useCachedAsyncData.ts
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/hooks/useCachedAsyncData.ts
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/hooks/useDebouncedCallback.ts b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/hooks/useDebouncedCallback.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/hooks/useDebouncedCallback.ts
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/hooks/useDebouncedCallback.ts
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/hooks/useObjectSearchParams.ts b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/hooks/useObjectSearchParams.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/hooks/useObjectSearchParams.ts
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/hooks/useObjectSearchParams.ts
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/utils/debounce.ts b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/utils/debounce.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/utils/debounce.ts
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/utils/debounce.ts
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/utils/fieldUtils.ts b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/utils/fieldUtils.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/utils/fieldUtils.ts
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/utils/fieldUtils.ts
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/utils/filterUtils.ts b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/utils/filterUtils.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/utils/filterUtils.ts
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/utils/filterUtils.ts
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/utils/sortUtils.ts b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/utils/sortUtils.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/utils/sortUtils.ts
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/features/object-search/utils/sortUtils.ts
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/index.ts b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/index.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/index.ts
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/index.ts
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/lib/constants.ts b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/lib/constants.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/lib/constants.ts
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/lib/constants.ts
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/lib/filterUtils.ts b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/lib/filterUtils.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/lib/filterUtils.ts
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/lib/filterUtils.ts
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/lib/routeConfig.ts b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/lib/routeConfig.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/lib/routeConfig.ts
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/lib/routeConfig.ts
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/lib/utils.ts b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/lib/utils.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/lib/utils.ts
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/lib/utils.ts
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/navigationMenu.tsx b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/navigationMenu.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/navigationMenu.tsx
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/navigationMenu.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/pages/ApplicationSearch.tsx b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/pages/ApplicationSearch.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/pages/ApplicationSearch.tsx
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/pages/ApplicationSearch.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/pages/Home.tsx b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/pages/Home.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/pages/Home.tsx
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/pages/Home.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/pages/MaintenanceRequestSearch.tsx b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/pages/MaintenanceRequestSearch.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/pages/MaintenanceRequestSearch.tsx
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/pages/MaintenanceRequestSearch.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/pages/MaintenanceWorkerSearch.tsx b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/pages/MaintenanceWorkerSearch.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/pages/MaintenanceWorkerSearch.tsx
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/pages/MaintenanceWorkerSearch.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/pages/NotFound.tsx b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/pages/NotFound.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/pages/NotFound.tsx
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/pages/NotFound.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/pages/PropertySearch.tsx b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/pages/PropertySearch.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/pages/PropertySearch.tsx
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/pages/PropertySearch.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/pages/TestAccPage.tsx b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/pages/TestAccPage.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/pages/TestAccPage.tsx
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/pages/TestAccPage.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/router-utils.tsx b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/router-utils.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/router-utils.tsx
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/router-utils.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/routes.tsx b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/routes.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/routes.tsx
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/routes.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/styles/global.css b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/styles/global.css
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/styles/global.css
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/styles/global.css
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/types/conversation.ts b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/types/conversation.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/src/types/conversation.ts
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/src/types/conversation.ts
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/tsconfig.json b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/tsconfig.json
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/tsconfig.json
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/tsconfig.json
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/tsconfig.node.json b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/tsconfig.node.json
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/tsconfig.node.json
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/tsconfig.node.json
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/ui-bundle.json b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/ui-bundle.json
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/ui-bundle.json
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/ui-bundle.json
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/vite-env.d.ts b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/vite-env.d.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/vite-env.d.ts
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/vite-env.d.ts
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/vite.config.ts b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/vite.config.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/vite.config.ts
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/vite.config.ts
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/vitest-env.d.ts b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/vitest-env.d.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/vitest-env.d.ts
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/vitest-env.d.ts
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/vitest.config.ts b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/vitest.config.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/vitest.config.ts
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/vitest.config.ts
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/vitest.setup.ts b/samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/vitest.setup.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/uiBundles/propertymanagementapp/vitest.setup.ts
rename to samples/ui-bundle-template-app-react-sample-b2e/force-app/main/default/uiBundles/propertymanagementapp/vitest.setup.ts
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/jest.config.js b/samples/ui-bundle-template-app-react-sample-b2e/jest.config.js
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/jest.config.js
rename to samples/ui-bundle-template-app-react-sample-b2e/jest.config.js
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/package-lock.json b/samples/ui-bundle-template-app-react-sample-b2e/package-lock.json
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/package-lock.json
rename to samples/ui-bundle-template-app-react-sample-b2e/package-lock.json
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/package.json b/samples/ui-bundle-template-app-react-sample-b2e/package.json
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/package.json
rename to samples/ui-bundle-template-app-react-sample-b2e/package.json
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/scripts/apex/hello.apex b/samples/ui-bundle-template-app-react-sample-b2e/scripts/apex/hello.apex
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/scripts/apex/hello.apex
rename to samples/ui-bundle-template-app-react-sample-b2e/scripts/apex/hello.apex
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/scripts/graphql-search.sh b/samples/ui-bundle-template-app-react-sample-b2e/scripts/graphql-search.sh
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/scripts/graphql-search.sh
rename to samples/ui-bundle-template-app-react-sample-b2e/scripts/graphql-search.sh
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/scripts/prepare-import-unique-fields.js b/samples/ui-bundle-template-app-react-sample-b2e/scripts/prepare-import-unique-fields.js
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/scripts/prepare-import-unique-fields.js
rename to samples/ui-bundle-template-app-react-sample-b2e/scripts/prepare-import-unique-fields.js
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/scripts/setup-cli.mjs b/samples/ui-bundle-template-app-react-sample-b2e/scripts/setup-cli.mjs
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/scripts/setup-cli.mjs
rename to samples/ui-bundle-template-app-react-sample-b2e/scripts/setup-cli.mjs
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/scripts/sf-project-setup.mjs b/samples/ui-bundle-template-app-react-sample-b2e/scripts/sf-project-setup.mjs
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/scripts/sf-project-setup.mjs
rename to samples/ui-bundle-template-app-react-sample-b2e/scripts/sf-project-setup.mjs
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/scripts/soql/account.soql b/samples/ui-bundle-template-app-react-sample-b2e/scripts/soql/account.soql
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/scripts/soql/account.soql
rename to samples/ui-bundle-template-app-react-sample-b2e/scripts/soql/account.soql
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/sfdx-project.json b/samples/ui-bundle-template-app-react-sample-b2e/sfdx-project.json
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/sfdx-project.json
rename to samples/ui-bundle-template-app-react-sample-b2e/sfdx-project.json
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/.forceignore b/samples/ui-bundle-template-app-react-sample-b2x/.forceignore
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/.forceignore
rename to samples/ui-bundle-template-app-react-sample-b2x/.forceignore
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/.husky/pre-commit b/samples/ui-bundle-template-app-react-sample-b2x/.husky/pre-commit
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/.husky/pre-commit
rename to samples/ui-bundle-template-app-react-sample-b2x/.husky/pre-commit
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/.prettierignore b/samples/ui-bundle-template-app-react-sample-b2x/.prettierignore
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/.prettierignore
rename to samples/ui-bundle-template-app-react-sample-b2x/.prettierignore
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/.prettierrc b/samples/ui-bundle-template-app-react-sample-b2x/.prettierrc
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/.prettierrc
rename to samples/ui-bundle-template-app-react-sample-b2x/.prettierrc
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/.version b/samples/ui-bundle-template-app-react-sample-b2x/.version
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/.version
rename to samples/ui-bundle-template-app-react-sample-b2x/.version
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/AGENT.md b/samples/ui-bundle-template-app-react-sample-b2x/AGENT.md
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/AGENT.md
rename to samples/ui-bundle-template-app-react-sample-b2x/AGENT.md
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/CHANGELOG.md b/samples/ui-bundle-template-app-react-sample-b2x/CHANGELOG.md
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/CHANGELOG.md
rename to samples/ui-bundle-template-app-react-sample-b2x/CHANGELOG.md
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/LICENSE.txt b/samples/ui-bundle-template-app-react-sample-b2x/LICENSE.txt
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/LICENSE.txt
rename to samples/ui-bundle-template-app-react-sample-b2x/LICENSE.txt
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/README.md b/samples/ui-bundle-template-app-react-sample-b2x/README.md
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/README.md
rename to samples/ui-bundle-template-app-react-sample-b2x/README.md
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/config/project-scratch-def.json b/samples/ui-bundle-template-app-react-sample-b2x/config/project-scratch-def.json
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/config/project-scratch-def.json
rename to samples/ui-bundle-template-app-react-sample-b2x/config/project-scratch-def.json
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/eslint.config.js b/samples/ui-bundle-template-app-react-sample-b2x/eslint.config.js
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/eslint.config.js
rename to samples/ui-bundle-template-app-react-sample-b2x/eslint.config.js
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/classes/MaintenanceRequestTriggerHandler.cls b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/classes/MaintenanceRequestTriggerHandler.cls
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/classes/MaintenanceRequestTriggerHandler.cls
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/classes/MaintenanceRequestTriggerHandler.cls
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/classes/MaintenanceRequestTriggerHandler.cls-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/classes/MaintenanceRequestTriggerHandler.cls-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/classes/MaintenanceRequestTriggerHandler.cls-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/classes/MaintenanceRequestTriggerHandler.cls-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/classes/MaintenanceRequestTriggerHandler_Test.cls b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/classes/MaintenanceRequestTriggerHandler_Test.cls
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/classes/MaintenanceRequestTriggerHandler_Test.cls
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/classes/MaintenanceRequestTriggerHandler_Test.cls
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/classes/MaintenanceRequestTriggerHandler_Test.cls-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/classes/MaintenanceRequestTriggerHandler_Test.cls-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/classes/MaintenanceRequestTriggerHandler_Test.cls-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/classes/MaintenanceRequestTriggerHandler_Test.cls-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/classes/TenantTriggerHandler.cls b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/classes/TenantTriggerHandler.cls
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/classes/TenantTriggerHandler.cls
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/classes/TenantTriggerHandler.cls
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/classes/TenantTriggerHandler.cls-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/classes/TenantTriggerHandler.cls-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/classes/TenantTriggerHandler.cls-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/classes/TenantTriggerHandler.cls-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/classes/TenantTriggerHandler_Test.cls b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/classes/TenantTriggerHandler_Test.cls
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/classes/TenantTriggerHandler_Test.cls
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/classes/TenantTriggerHandler_Test.cls
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/classes/TenantTriggerHandler_Test.cls-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/classes/TenantTriggerHandler_Test.cls-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/classes/TenantTriggerHandler_Test.cls-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/classes/TenantTriggerHandler_Test.cls-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/classes/UIBundleAuthUtils.cls b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/classes/UIBundleAuthUtils.cls
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/classes/UIBundleAuthUtils.cls
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/classes/UIBundleAuthUtils.cls
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/classes/UIBundleAuthUtils.cls-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/classes/UIBundleAuthUtils.cls-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/classes/UIBundleAuthUtils.cls-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/classes/UIBundleAuthUtils.cls-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/classes/UIBundleChangePassword.cls b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/classes/UIBundleChangePassword.cls
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/classes/UIBundleChangePassword.cls
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/classes/UIBundleChangePassword.cls
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/classes/UIBundleChangePassword.cls-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/classes/UIBundleChangePassword.cls-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/classes/UIBundleChangePassword.cls-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/classes/UIBundleChangePassword.cls-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/classes/UIBundleForgotPassword.cls b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/classes/UIBundleForgotPassword.cls
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/classes/UIBundleForgotPassword.cls
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/classes/UIBundleForgotPassword.cls
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/classes/UIBundleForgotPassword.cls-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/classes/UIBundleForgotPassword.cls-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/classes/UIBundleForgotPassword.cls-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/classes/UIBundleForgotPassword.cls-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/classes/UIBundleLogin.cls b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/classes/UIBundleLogin.cls
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/classes/UIBundleLogin.cls
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/classes/UIBundleLogin.cls
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/classes/UIBundleLogin.cls-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/classes/UIBundleLogin.cls-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/classes/UIBundleLogin.cls-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/classes/UIBundleLogin.cls-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/classes/UIBundleRegistration.cls b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/classes/UIBundleRegistration.cls
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/classes/UIBundleRegistration.cls
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/classes/UIBundleRegistration.cls
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/classes/UIBundleRegistration.cls-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/classes/UIBundleRegistration.cls-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/classes/UIBundleRegistration.cls-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/classes/UIBundleRegistration.cls-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/cspTrustedSites/GitHub_Avatars.cspTrustedSite-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/cspTrustedSites/GitHub_Avatars.cspTrustedSite-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/cspTrustedSites/GitHub_Avatars.cspTrustedSite-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/cspTrustedSites/GitHub_Avatars.cspTrustedSite-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/cspTrustedSites/Google_Fonts.cspTrustedSite-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/cspTrustedSites/Google_Fonts.cspTrustedSite-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/cspTrustedSites/Google_Fonts.cspTrustedSite-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/cspTrustedSites/Google_Fonts.cspTrustedSite-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/cspTrustedSites/Google_Fonts_Static.cspTrustedSite-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/cspTrustedSites/Google_Fonts_Static.cspTrustedSite-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/cspTrustedSites/Google_Fonts_Static.cspTrustedSite-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/cspTrustedSites/Google_Fonts_Static.cspTrustedSite-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/cspTrustedSites/OpenStreetMap_Nominatim.cspTrustedSite-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/cspTrustedSites/OpenStreetMap_Nominatim.cspTrustedSite-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/cspTrustedSites/OpenStreetMap_Nominatim.cspTrustedSite-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/cspTrustedSites/OpenStreetMap_Nominatim.cspTrustedSite-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/cspTrustedSites/OpenStreetMap_Tiles.cspTrustedSite-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/cspTrustedSites/OpenStreetMap_Tiles.cspTrustedSite-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/cspTrustedSites/OpenStreetMap_Tiles.cspTrustedSite-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/cspTrustedSites/OpenStreetMap_Tiles.cspTrustedSite-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/cspTrustedSites/Open_Meteo_API.cspTrustedSite-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/cspTrustedSites/Open_Meteo_API.cspTrustedSite-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/cspTrustedSites/Open_Meteo_API.cspTrustedSite-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/cspTrustedSites/Open_Meteo_API.cspTrustedSite-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/cspTrustedSites/Pexels_Images.cspTrustedSite-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/cspTrustedSites/Pexels_Images.cspTrustedSite-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/cspTrustedSites/Pexels_Images.cspTrustedSite-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/cspTrustedSites/Pexels_Images.cspTrustedSite-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/cspTrustedSites/Pexels_Videos.cspTrustedSite-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/cspTrustedSites/Pexels_Videos.cspTrustedSite-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/cspTrustedSites/Pexels_Videos.cspTrustedSite-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/cspTrustedSites/Pexels_Videos.cspTrustedSite-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/cspTrustedSites/Unsplash_Images.cspTrustedSite-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/cspTrustedSites/Unsplash_Images.cspTrustedSite-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/cspTrustedSites/Unsplash_Images.cspTrustedSite-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/cspTrustedSites/Unsplash_Images.cspTrustedSite-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/data/Agent__c.json b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/data/Agent__c.json
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/data/Agent__c.json
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/data/Agent__c.json
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/data/Application__c.json b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/data/Application__c.json
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/data/Application__c.json
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/data/Application__c.json
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/data/Contact.json b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/data/Contact.json
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/data/Contact.json
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/data/Contact.json
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/data/KPI_Snapshot__c.json b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/data/KPI_Snapshot__c.json
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/data/KPI_Snapshot__c.json
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/data/KPI_Snapshot__c.json
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/data/Lease__c.json b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/data/Lease__c.json
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/data/Lease__c.json
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/data/Lease__c.json
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/data/Maintenance_Request__c.json b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/data/Maintenance_Request__c.json
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/data/Maintenance_Request__c.json
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/data/Maintenance_Request__c.json
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/data/Maintenance_Worker__c.json b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/data/Maintenance_Worker__c.json
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/data/Maintenance_Worker__c.json
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/data/Maintenance_Worker__c.json
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/data/Notification__c.json b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/data/Notification__c.json
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/data/Notification__c.json
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/data/Notification__c.json
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/data/Payment__c.json b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/data/Payment__c.json
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/data/Payment__c.json
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/data/Payment__c.json
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/data/Property_Cost__c.json b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/data/Property_Cost__c.json
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/data/Property_Cost__c.json
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/data/Property_Cost__c.json
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/data/Property_Feature__c.json b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/data/Property_Feature__c.json
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/data/Property_Feature__c.json
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/data/Property_Feature__c.json
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/data/Property_Image__c.json b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/data/Property_Image__c.json
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/data/Property_Image__c.json
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/data/Property_Image__c.json
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/data/Property_Listing__c.json b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/data/Property_Listing__c.json
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/data/Property_Listing__c.json
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/data/Property_Listing__c.json
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/data/Property_Management_Company__c.json b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/data/Property_Management_Company__c.json
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/data/Property_Management_Company__c.json
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/data/Property_Management_Company__c.json
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/data/Property_Owner__c.json b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/data/Property_Owner__c.json
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/data/Property_Owner__c.json
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/data/Property_Owner__c.json
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/data/Property_Sale__c.json b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/data/Property_Sale__c.json
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/data/Property_Sale__c.json
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/data/Property_Sale__c.json
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/data/Property__c.json b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/data/Property__c.json
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/data/Property__c.json
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/data/Property__c.json
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/data/Tenant__c.json b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/data/Tenant__c.json
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/data/Tenant__c.json
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/data/Tenant__c.json
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/data/data-plan.json b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/data/data-plan.json
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/data/data-plan.json
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/data/data-plan.json
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/data/prepare-import-unique-fields.js b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/data/prepare-import-unique-fields.js
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/data/prepare-import-unique-fields.js
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/data/prepare-import-unique-fields.js
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/digitalExperienceConfigs/propertyrentalapp1.digitalExperienceConfig-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/digitalExperienceConfigs/propertyrentalapp1.digitalExperienceConfig-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/digitalExperienceConfigs/propertyrentalapp1.digitalExperienceConfig-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/digitalExperienceConfigs/propertyrentalapp1.digitalExperienceConfig-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/digitalExperiences/site/propertyrentalapp1/propertyrentalapp1.digitalExperience-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/digitalExperiences/site/propertyrentalapp1/propertyrentalapp1.digitalExperience-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/digitalExperiences/site/propertyrentalapp1/propertyrentalapp1.digitalExperience-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/digitalExperiences/site/propertyrentalapp1/propertyrentalapp1.digitalExperience-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/digitalExperiences/site/propertyrentalapp1/sfdc_cms__site/propertyrentalapp1/_meta.json b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/digitalExperiences/site/propertyrentalapp1/sfdc_cms__site/propertyrentalapp1/_meta.json
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/digitalExperiences/site/propertyrentalapp1/sfdc_cms__site/propertyrentalapp1/_meta.json
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/digitalExperiences/site/propertyrentalapp1/sfdc_cms__site/propertyrentalapp1/_meta.json
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/digitalExperiences/site/propertyrentalapp1/sfdc_cms__site/propertyrentalapp1/content.json b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/digitalExperiences/site/propertyrentalapp1/sfdc_cms__site/propertyrentalapp1/content.json
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/digitalExperiences/site/propertyrentalapp1/sfdc_cms__site/propertyrentalapp1/content.json
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/digitalExperiences/site/propertyrentalapp1/sfdc_cms__site/propertyrentalapp1/content.json
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/layouts/Application__c-Application Layout.layout-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/layouts/Application__c-Application Layout.layout-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/layouts/Application__c-Application Layout.layout-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/layouts/Application__c-Application Layout.layout-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/layouts/KPI_Snapshot__c-KPI Snapshot Layout.layout-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/layouts/KPI_Snapshot__c-KPI Snapshot Layout.layout-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/layouts/KPI_Snapshot__c-KPI Snapshot Layout.layout-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/layouts/KPI_Snapshot__c-KPI Snapshot Layout.layout-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/layouts/Lease__c-Lease Layout.layout-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/layouts/Lease__c-Lease Layout.layout-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/layouts/Lease__c-Lease Layout.layout-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/layouts/Lease__c-Lease Layout.layout-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/layouts/Maintenance_Request__c-Maintenance Request Layout.layout-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/layouts/Maintenance_Request__c-Maintenance Request Layout.layout-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/layouts/Maintenance_Request__c-Maintenance Request Layout.layout-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/layouts/Maintenance_Request__c-Maintenance Request Layout.layout-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/layouts/Maintenance_Worker__c-Maintenance Worker Layout.layout-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/layouts/Maintenance_Worker__c-Maintenance Worker Layout.layout-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/layouts/Maintenance_Worker__c-Maintenance Worker Layout.layout-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/layouts/Maintenance_Worker__c-Maintenance Worker Layout.layout-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/layouts/Payment__c-Payment Layout.layout-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/layouts/Payment__c-Payment Layout.layout-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/layouts/Payment__c-Payment Layout.layout-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/layouts/Payment__c-Payment Layout.layout-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/layouts/Property_Cost__c-Property Cost Layout.layout-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/layouts/Property_Cost__c-Property Cost Layout.layout-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/layouts/Property_Cost__c-Property Cost Layout.layout-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/layouts/Property_Cost__c-Property Cost Layout.layout-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/layouts/Property_Feature__c-Property Feature Layout.layout-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/layouts/Property_Feature__c-Property Feature Layout.layout-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/layouts/Property_Feature__c-Property Feature Layout.layout-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/layouts/Property_Feature__c-Property Feature Layout.layout-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/layouts/Property_Image__c-Property Image Layout.layout-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/layouts/Property_Image__c-Property Image Layout.layout-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/layouts/Property_Image__c-Property Image Layout.layout-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/layouts/Property_Image__c-Property Image Layout.layout-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/layouts/Property_Listing__c-Property Listing Layout.layout-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/layouts/Property_Listing__c-Property Listing Layout.layout-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/layouts/Property_Listing__c-Property Listing Layout.layout-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/layouts/Property_Listing__c-Property Listing Layout.layout-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/layouts/Property_Management_Company__c-Property Management Company Layout.layout-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/layouts/Property_Management_Company__c-Property Management Company Layout.layout-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/layouts/Property_Management_Company__c-Property Management Company Layout.layout-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/layouts/Property_Management_Company__c-Property Management Company Layout.layout-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/layouts/Property_Owner__c-Property Owner Layout.layout-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/layouts/Property_Owner__c-Property Owner Layout.layout-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/layouts/Property_Owner__c-Property Owner Layout.layout-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/layouts/Property_Owner__c-Property Owner Layout.layout-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/layouts/Property_Sale__c-Property Sale Layout.layout-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/layouts/Property_Sale__c-Property Sale Layout.layout-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/layouts/Property_Sale__c-Property Sale Layout.layout-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/layouts/Property_Sale__c-Property Sale Layout.layout-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/layouts/Property__c-Property Layout.layout-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/layouts/Property__c-Property Layout.layout-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/layouts/Property__c-Property Layout.layout-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/layouts/Property__c-Property Layout.layout-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/layouts/Tenant__c-Tenant Layout.layout-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/layouts/Tenant__c-Tenant Layout.layout-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/layouts/Tenant__c-Tenant Layout.layout-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/layouts/Tenant__c-Tenant Layout.layout-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/networks/propertyrentalapp.network-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/networks/propertyrentalapp.network-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/networks/propertyrentalapp.network-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/networks/propertyrentalapp.network-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Agent__c/Agent__c.object-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Agent__c/Agent__c.object-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Agent__c/Agent__c.object-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Agent__c/Agent__c.object-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Agent__c/fields/Agent_Type__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Agent__c/fields/Agent_Type__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Agent__c/fields/Agent_Type__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Agent__c/fields/Agent_Type__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Agent__c/fields/Availability__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Agent__c/fields/Availability__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Agent__c/fields/Availability__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Agent__c/fields/Availability__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Agent__c/fields/Emergency_Alt__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Agent__c/fields/Emergency_Alt__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Agent__c/fields/Emergency_Alt__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Agent__c/fields/Emergency_Alt__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Agent__c/fields/Language__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Agent__c/fields/Language__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Agent__c/fields/Language__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Agent__c/fields/Language__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Agent__c/fields/License_Expiry__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Agent__c/fields/License_Expiry__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Agent__c/fields/License_Expiry__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Agent__c/fields/License_Expiry__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Agent__c/fields/License_Number__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Agent__c/fields/License_Number__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Agent__c/fields/License_Number__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Agent__c/fields/License_Number__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Agent__c/fields/Office_Location__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Agent__c/fields/Office_Location__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Agent__c/fields/Office_Location__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Agent__c/fields/Office_Location__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Agent__c/fields/Territory__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Agent__c/fields/Territory__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Agent__c/fields/Territory__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Agent__c/fields/Territory__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Application__c/Application__c.object-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Application__c/Application__c.object-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Application__c/Application__c.object-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Application__c/Application__c.object-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Application__c/fields/Employment__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Application__c/fields/Employment__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Application__c/fields/Employment__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Application__c/fields/Employment__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Application__c/fields/Property__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Application__c/fields/Property__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Application__c/fields/Property__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Application__c/fields/Property__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Application__c/fields/References__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Application__c/fields/References__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Application__c/fields/References__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Application__c/fields/References__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Application__c/fields/Start_Date__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Application__c/fields/Start_Date__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Application__c/fields/Start_Date__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Application__c/fields/Start_Date__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Application__c/fields/Status__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Application__c/fields/Status__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Application__c/fields/Status__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Application__c/fields/Status__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Application__c/fields/User__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Application__c/fields/User__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Application__c/fields/User__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Application__c/fields/User__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/KPI_Snapshot__c/KPI_Snapshot__c.object-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/KPI_Snapshot__c/KPI_Snapshot__c.object-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/KPI_Snapshot__c/KPI_Snapshot__c.object-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/KPI_Snapshot__c/KPI_Snapshot__c.object-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/KPI_Snapshot__c/fields/Previous_Month_Sales__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/KPI_Snapshot__c/fields/Previous_Month_Sales__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/KPI_Snapshot__c/fields/Previous_Month_Sales__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/KPI_Snapshot__c/fields/Previous_Month_Sales__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/KPI_Snapshot__c/fields/Sales_MoM_Change__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/KPI_Snapshot__c/fields/Sales_MoM_Change__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/KPI_Snapshot__c/fields/Sales_MoM_Change__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/KPI_Snapshot__c/fields/Sales_MoM_Change__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/KPI_Snapshot__c/fields/Snapshot_Date__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/KPI_Snapshot__c/fields/Snapshot_Date__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/KPI_Snapshot__c/fields/Snapshot_Date__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/KPI_Snapshot__c/fields/Snapshot_Date__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/KPI_Snapshot__c/fields/Total_Properties__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/KPI_Snapshot__c/fields/Total_Properties__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/KPI_Snapshot__c/fields/Total_Properties__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/KPI_Snapshot__c/fields/Total_Properties__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/KPI_Snapshot__c/fields/Total_Sales_Amount__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/KPI_Snapshot__c/fields/Total_Sales_Amount__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/KPI_Snapshot__c/fields/Total_Sales_Amount__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/KPI_Snapshot__c/fields/Total_Sales_Amount__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/KPI_Snapshot__c/fields/Total_Sales_Count__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/KPI_Snapshot__c/fields/Total_Sales_Count__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/KPI_Snapshot__c/fields/Total_Sales_Count__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/KPI_Snapshot__c/fields/Total_Sales_Count__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/KPI_Snapshot__c/fields/Units_Available__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/KPI_Snapshot__c/fields/Units_Available__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/KPI_Snapshot__c/fields/Units_Available__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/KPI_Snapshot__c/fields/Units_Available__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/KPI_Snapshot__c/fields/Units_Occupied__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/KPI_Snapshot__c/fields/Units_Occupied__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/KPI_Snapshot__c/fields/Units_Occupied__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/KPI_Snapshot__c/fields/Units_Occupied__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Lease__c/Lease__c.object-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Lease__c/Lease__c.object-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Lease__c/Lease__c.object-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Lease__c/Lease__c.object-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Lease__c/fields/End_Date__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Lease__c/fields/End_Date__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Lease__c/fields/End_Date__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Lease__c/fields/End_Date__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Lease__c/fields/Lease_Status__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Lease__c/fields/Lease_Status__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Lease__c/fields/Lease_Status__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Lease__c/fields/Lease_Status__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Lease__c/fields/Monthly_Rent__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Lease__c/fields/Monthly_Rent__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Lease__c/fields/Monthly_Rent__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Lease__c/fields/Monthly_Rent__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Lease__c/fields/Property__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Lease__c/fields/Property__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Lease__c/fields/Property__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Lease__c/fields/Property__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Lease__c/fields/Security_Deposit__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Lease__c/fields/Security_Deposit__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Lease__c/fields/Security_Deposit__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Lease__c/fields/Security_Deposit__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Lease__c/fields/Start_Date__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Lease__c/fields/Start_Date__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Lease__c/fields/Start_Date__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Lease__c/fields/Start_Date__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Lease__c/fields/Tenant__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Lease__c/fields/Tenant__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Lease__c/fields/Tenant__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Lease__c/fields/Tenant__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Lease__c/validationRules/End_Date_After_Start_Date.validationRule-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Lease__c/validationRules/End_Date_After_Start_Date.validationRule-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Lease__c/validationRules/End_Date_After_Start_Date.validationRule-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Lease__c/validationRules/End_Date_After_Start_Date.validationRule-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Maintenance_Request__c/Maintenance_Request__c.object-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Maintenance_Request__c/Maintenance_Request__c.object-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Maintenance_Request__c/Maintenance_Request__c.object-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Maintenance_Request__c/Maintenance_Request__c.object-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Maintenance_Request__c/fields/Actual_Cost__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Maintenance_Request__c/fields/Actual_Cost__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Maintenance_Request__c/fields/Actual_Cost__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Maintenance_Request__c/fields/Actual_Cost__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Maintenance_Request__c/fields/Assigned_Worker__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Maintenance_Request__c/fields/Assigned_Worker__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Maintenance_Request__c/fields/Assigned_Worker__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Maintenance_Request__c/fields/Assigned_Worker__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Maintenance_Request__c/fields/Completed__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Maintenance_Request__c/fields/Completed__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Maintenance_Request__c/fields/Completed__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Maintenance_Request__c/fields/Completed__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Maintenance_Request__c/fields/Description__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Maintenance_Request__c/fields/Description__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Maintenance_Request__c/fields/Description__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Maintenance_Request__c/fields/Description__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Maintenance_Request__c/fields/Est_Cost__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Maintenance_Request__c/fields/Est_Cost__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Maintenance_Request__c/fields/Est_Cost__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Maintenance_Request__c/fields/Est_Cost__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Maintenance_Request__c/fields/Priority__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Maintenance_Request__c/fields/Priority__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Maintenance_Request__c/fields/Priority__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Maintenance_Request__c/fields/Priority__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Maintenance_Request__c/fields/Property__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Maintenance_Request__c/fields/Property__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Maintenance_Request__c/fields/Property__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Maintenance_Request__c/fields/Property__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Maintenance_Request__c/fields/Scheduled__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Maintenance_Request__c/fields/Scheduled__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Maintenance_Request__c/fields/Scheduled__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Maintenance_Request__c/fields/Scheduled__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Maintenance_Request__c/fields/Status__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Maintenance_Request__c/fields/Status__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Maintenance_Request__c/fields/Status__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Maintenance_Request__c/fields/Status__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Maintenance_Request__c/fields/Tenant_Home__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Maintenance_Request__c/fields/Tenant_Home__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Maintenance_Request__c/fields/Tenant_Home__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Maintenance_Request__c/fields/Tenant_Home__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Maintenance_Request__c/fields/Type__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Maintenance_Request__c/fields/Type__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Maintenance_Request__c/fields/Type__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Maintenance_Request__c/fields/Type__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Maintenance_Request__c/fields/User__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Maintenance_Request__c/fields/User__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Maintenance_Request__c/fields/User__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Maintenance_Request__c/fields/User__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Maintenance_Worker__c/Maintenance_Worker__c.object-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Maintenance_Worker__c/Maintenance_Worker__c.object-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Maintenance_Worker__c/Maintenance_Worker__c.object-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Maintenance_Worker__c/Maintenance_Worker__c.object-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Maintenance_Worker__c/fields/Certifications__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Maintenance_Worker__c/fields/Certifications__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Maintenance_Worker__c/fields/Certifications__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Maintenance_Worker__c/fields/Certifications__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Maintenance_Worker__c/fields/Employment_Type__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Maintenance_Worker__c/fields/Employment_Type__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Maintenance_Worker__c/fields/Employment_Type__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Maintenance_Worker__c/fields/Employment_Type__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Maintenance_Worker__c/fields/Hourly_Rate__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Maintenance_Worker__c/fields/Hourly_Rate__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Maintenance_Worker__c/fields/Hourly_Rate__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Maintenance_Worker__c/fields/Hourly_Rate__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Maintenance_Worker__c/fields/IsActive__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Maintenance_Worker__c/fields/IsActive__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Maintenance_Worker__c/fields/IsActive__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Maintenance_Worker__c/fields/IsActive__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Maintenance_Worker__c/fields/Location__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Maintenance_Worker__c/fields/Location__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Maintenance_Worker__c/fields/Location__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Maintenance_Worker__c/fields/Location__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Maintenance_Worker__c/fields/Phone__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Maintenance_Worker__c/fields/Phone__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Maintenance_Worker__c/fields/Phone__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Maintenance_Worker__c/fields/Phone__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Maintenance_Worker__c/fields/Rating__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Maintenance_Worker__c/fields/Rating__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Maintenance_Worker__c/fields/Rating__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Maintenance_Worker__c/fields/Rating__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Maintenance_Worker__c/fields/Type__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Maintenance_Worker__c/fields/Type__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Maintenance_Worker__c/fields/Type__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Maintenance_Worker__c/fields/Type__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Notification__c/Notification__c.object-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Notification__c/Notification__c.object-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Notification__c/Notification__c.object-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Notification__c/Notification__c.object-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Notification__c/fields/Is_Read__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Notification__c/fields/Is_Read__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Notification__c/fields/Is_Read__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Notification__c/fields/Is_Read__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Notification__c/fields/Message__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Notification__c/fields/Message__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Notification__c/fields/Message__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Notification__c/fields/Message__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Notification__c/fields/Priority__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Notification__c/fields/Priority__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Notification__c/fields/Priority__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Notification__c/fields/Priority__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Notification__c/fields/Related_Object_Type__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Notification__c/fields/Related_Object_Type__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Notification__c/fields/Related_Object_Type__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Notification__c/fields/Related_Object_Type__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Notification__c/fields/Related_Record_Id__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Notification__c/fields/Related_Record_Id__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Notification__c/fields/Related_Record_Id__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Notification__c/fields/Related_Record_Id__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Notification__c/fields/Title__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Notification__c/fields/Title__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Notification__c/fields/Title__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Notification__c/fields/Title__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Notification__c/fields/Type__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Notification__c/fields/Type__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Notification__c/fields/Type__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Notification__c/fields/Type__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Notification__c/fields/User__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Notification__c/fields/User__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Notification__c/fields/User__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Notification__c/fields/User__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Payment__c/Payment__c.object-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Payment__c/Payment__c.object-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Payment__c/Payment__c.object-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Payment__c/Payment__c.object-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Payment__c/fields/Amount__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Payment__c/fields/Amount__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Payment__c/fields/Amount__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Payment__c/fields/Amount__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Payment__c/fields/Lease__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Payment__c/fields/Lease__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Payment__c/fields/Lease__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Payment__c/fields/Lease__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Payment__c/fields/Notes__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Payment__c/fields/Notes__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Payment__c/fields/Notes__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Payment__c/fields/Notes__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Payment__c/fields/Payment_Date__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Payment__c/fields/Payment_Date__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Payment__c/fields/Payment_Date__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Payment__c/fields/Payment_Date__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Payment__c/fields/Payment_Method__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Payment__c/fields/Payment_Method__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Payment__c/fields/Payment_Method__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Payment__c/fields/Payment_Method__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Payment__c/fields/Payment_Status__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Payment__c/fields/Payment_Status__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Payment__c/fields/Payment_Status__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Payment__c/fields/Payment_Status__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property_Cost__c/Property_Cost__c.object-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property_Cost__c/Property_Cost__c.object-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property_Cost__c/Property_Cost__c.object-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property_Cost__c/Property_Cost__c.object-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property_Cost__c/fields/Cost_Amount__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property_Cost__c/fields/Cost_Amount__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property_Cost__c/fields/Cost_Amount__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property_Cost__c/fields/Cost_Amount__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property_Cost__c/fields/Cost_Category__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property_Cost__c/fields/Cost_Category__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property_Cost__c/fields/Cost_Category__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property_Cost__c/fields/Cost_Category__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property_Cost__c/fields/Cost_Date__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property_Cost__c/fields/Cost_Date__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property_Cost__c/fields/Cost_Date__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property_Cost__c/fields/Cost_Date__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property_Cost__c/fields/Description__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property_Cost__c/fields/Description__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property_Cost__c/fields/Description__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property_Cost__c/fields/Description__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property_Cost__c/fields/Property__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property_Cost__c/fields/Property__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property_Cost__c/fields/Property__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property_Cost__c/fields/Property__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property_Cost__c/fields/Vendor__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property_Cost__c/fields/Vendor__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property_Cost__c/fields/Vendor__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property_Cost__c/fields/Vendor__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property_Cost__c/validationRules/Cost_Amount_Limit.validationRule-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property_Cost__c/validationRules/Cost_Amount_Limit.validationRule-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property_Cost__c/validationRules/Cost_Amount_Limit.validationRule-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property_Cost__c/validationRules/Cost_Amount_Limit.validationRule-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property_Feature__c/Property_Feature__c.object-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property_Feature__c/Property_Feature__c.object-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property_Feature__c/Property_Feature__c.object-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property_Feature__c/Property_Feature__c.object-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property_Feature__c/fields/Description__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property_Feature__c/fields/Description__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property_Feature__c/fields/Description__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property_Feature__c/fields/Description__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property_Feature__c/fields/Display_on_Listing__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property_Feature__c/fields/Display_on_Listing__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property_Feature__c/fields/Display_on_Listing__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property_Feature__c/fields/Display_on_Listing__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property_Feature__c/fields/Feature_Category__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property_Feature__c/fields/Feature_Category__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property_Feature__c/fields/Feature_Category__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property_Feature__c/fields/Feature_Category__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property_Feature__c/fields/Property__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property_Feature__c/fields/Property__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property_Feature__c/fields/Property__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property_Feature__c/fields/Property__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property_Image__c/Property_Image__c.object-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property_Image__c/Property_Image__c.object-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property_Image__c/Property_Image__c.object-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property_Image__c/Property_Image__c.object-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property_Image__c/fields/Alt_Text__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property_Image__c/fields/Alt_Text__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property_Image__c/fields/Alt_Text__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property_Image__c/fields/Alt_Text__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property_Image__c/fields/Display_Order__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property_Image__c/fields/Display_Order__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property_Image__c/fields/Display_Order__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property_Image__c/fields/Display_Order__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property_Image__c/fields/Image_Type__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property_Image__c/fields/Image_Type__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property_Image__c/fields/Image_Type__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property_Image__c/fields/Image_Type__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property_Image__c/fields/Image_URL__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property_Image__c/fields/Image_URL__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property_Image__c/fields/Image_URL__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property_Image__c/fields/Image_URL__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property_Image__c/fields/Property__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property_Image__c/fields/Property__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property_Image__c/fields/Property__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property_Image__c/fields/Property__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property_Listing__c/Property_Listing__c.object-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property_Listing__c/Property_Listing__c.object-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property_Listing__c/Property_Listing__c.object-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property_Listing__c/Property_Listing__c.object-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property_Listing__c/fields/Display_Order__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property_Listing__c/fields/Display_Order__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property_Listing__c/fields/Display_Order__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property_Listing__c/fields/Display_Order__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property_Listing__c/fields/Featured__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property_Listing__c/fields/Featured__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property_Listing__c/fields/Featured__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property_Listing__c/fields/Featured__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property_Listing__c/fields/Listing_Price__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property_Listing__c/fields/Listing_Price__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property_Listing__c/fields/Listing_Price__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property_Listing__c/fields/Listing_Price__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property_Listing__c/fields/Listing_Status__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property_Listing__c/fields/Listing_Status__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property_Listing__c/fields/Listing_Status__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property_Listing__c/fields/Listing_Status__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property_Listing__c/fields/Marketing_Description__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property_Listing__c/fields/Marketing_Description__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property_Listing__c/fields/Marketing_Description__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property_Listing__c/fields/Marketing_Description__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property_Listing__c/fields/Property__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property_Listing__c/fields/Property__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property_Listing__c/fields/Property__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property_Listing__c/fields/Property__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property_Listing__c/fields/Short_Description__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property_Listing__c/fields/Short_Description__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property_Listing__c/fields/Short_Description__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property_Listing__c/fields/Short_Description__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property_Management_Company__c/Property_Management_Company__c.object-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property_Management_Company__c/Property_Management_Company__c.object-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property_Management_Company__c/Property_Management_Company__c.object-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property_Management_Company__c/Property_Management_Company__c.object-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property_Management_Company__c/fields/Active__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property_Management_Company__c/fields/Active__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property_Management_Company__c/fields/Active__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property_Management_Company__c/fields/Active__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property_Management_Company__c/fields/Company_Code__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property_Management_Company__c/fields/Company_Code__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property_Management_Company__c/fields/Company_Code__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property_Management_Company__c/fields/Company_Code__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property_Management_Company__c/fields/Email__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property_Management_Company__c/fields/Email__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property_Management_Company__c/fields/Email__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property_Management_Company__c/fields/Email__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property_Management_Company__c/fields/Phone__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property_Management_Company__c/fields/Phone__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property_Management_Company__c/fields/Phone__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property_Management_Company__c/fields/Phone__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property_Management_Company__c/fields/Primary_Contact__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property_Management_Company__c/fields/Primary_Contact__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property_Management_Company__c/fields/Primary_Contact__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property_Management_Company__c/fields/Primary_Contact__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property_Owner__c/Property_Owner__c.object-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property_Owner__c/Property_Owner__c.object-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property_Owner__c/Property_Owner__c.object-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property_Owner__c/Property_Owner__c.object-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property_Owner__c/fields/Address__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property_Owner__c/fields/Address__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property_Owner__c/fields/Address__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property_Owner__c/fields/Address__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property_Owner__c/fields/Email__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property_Owner__c/fields/Email__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property_Owner__c/fields/Email__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property_Owner__c/fields/Email__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property_Owner__c/fields/Phone__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property_Owner__c/fields/Phone__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property_Owner__c/fields/Phone__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property_Owner__c/fields/Phone__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property_Sale__c/Property_Sale__c.object-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property_Sale__c/Property_Sale__c.object-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property_Sale__c/Property_Sale__c.object-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property_Sale__c/Property_Sale__c.object-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property_Sale__c/fields/Buyer_Tenant__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property_Sale__c/fields/Buyer_Tenant__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property_Sale__c/fields/Buyer_Tenant__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property_Sale__c/fields/Buyer_Tenant__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property_Sale__c/fields/Payment_Method__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property_Sale__c/fields/Payment_Method__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property_Sale__c/fields/Payment_Method__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property_Sale__c/fields/Payment_Method__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property_Sale__c/fields/Property__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property_Sale__c/fields/Property__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property_Sale__c/fields/Property__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property_Sale__c/fields/Property__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property_Sale__c/fields/Reference_Number__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property_Sale__c/fields/Reference_Number__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property_Sale__c/fields/Reference_Number__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property_Sale__c/fields/Reference_Number__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property_Sale__c/fields/Sale_Amount__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property_Sale__c/fields/Sale_Amount__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property_Sale__c/fields/Sale_Amount__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property_Sale__c/fields/Sale_Amount__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property_Sale__c/fields/Sale_Date__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property_Sale__c/fields/Sale_Date__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property_Sale__c/fields/Sale_Date__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property_Sale__c/fields/Sale_Date__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property_Sale__c/fields/Sale_Status__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property_Sale__c/fields/Sale_Status__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property_Sale__c/fields/Sale_Status__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property_Sale__c/fields/Sale_Status__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property_Sale__c/fields/Sale_Type__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property_Sale__c/fields/Sale_Type__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property_Sale__c/fields/Sale_Type__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property_Sale__c/fields/Sale_Type__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property__c/Property__c.object-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property__c/Property__c.object-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property__c/Property__c.object-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property__c/Property__c.object-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property__c/fields/Address__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property__c/fields/Address__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property__c/fields/Address__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property__c/fields/Address__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property__c/fields/Agent__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property__c/fields/Agent__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property__c/fields/Agent__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property__c/fields/Agent__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property__c/fields/Available_Date__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property__c/fields/Available_Date__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property__c/fields/Available_Date__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property__c/fields/Available_Date__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property__c/fields/Bathrooms__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property__c/fields/Bathrooms__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property__c/fields/Bathrooms__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property__c/fields/Bathrooms__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property__c/fields/Bedrooms__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property__c/fields/Bedrooms__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property__c/fields/Bedrooms__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property__c/fields/Bedrooms__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property__c/fields/Coordinates__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property__c/fields/Coordinates__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property__c/fields/Coordinates__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property__c/fields/Coordinates__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property__c/fields/Deposit__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property__c/fields/Deposit__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property__c/fields/Deposit__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property__c/fields/Deposit__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property__c/fields/Description__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property__c/fields/Description__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property__c/fields/Description__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property__c/fields/Description__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property__c/fields/Features__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property__c/fields/Features__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property__c/fields/Features__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property__c/fields/Features__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property__c/fields/Hero_Image__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property__c/fields/Hero_Image__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property__c/fields/Hero_Image__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property__c/fields/Hero_Image__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property__c/fields/Lease_Term__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property__c/fields/Lease_Term__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property__c/fields/Lease_Term__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property__c/fields/Lease_Term__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property__c/fields/Monthly_Rent__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property__c/fields/Monthly_Rent__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property__c/fields/Monthly_Rent__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property__c/fields/Monthly_Rent__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property__c/fields/Parking__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property__c/fields/Parking__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property__c/fields/Parking__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property__c/fields/Parking__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property__c/fields/Pet_Friendly__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property__c/fields/Pet_Friendly__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property__c/fields/Pet_Friendly__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property__c/fields/Pet_Friendly__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property__c/fields/Sq_Ft__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property__c/fields/Sq_Ft__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property__c/fields/Sq_Ft__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property__c/fields/Sq_Ft__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property__c/fields/Status__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property__c/fields/Status__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property__c/fields/Status__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property__c/fields/Status__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property__c/fields/Tour_URL__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property__c/fields/Tour_URL__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property__c/fields/Tour_URL__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property__c/fields/Tour_URL__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property__c/fields/Type__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property__c/fields/Type__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property__c/fields/Type__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property__c/fields/Type__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property__c/fields/Utilities__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property__c/fields/Utilities__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property__c/fields/Utilities__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property__c/fields/Utilities__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property__c/fields/Year_Built__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property__c/fields/Year_Built__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property__c/fields/Year_Built__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Property__c/fields/Year_Built__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Tenant__c/Tenant__c.object-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Tenant__c/Tenant__c.object-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Tenant__c/Tenant__c.object-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Tenant__c/Tenant__c.object-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Tenant__c/fields/End_Date__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Tenant__c/fields/End_Date__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Tenant__c/fields/End_Date__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Tenant__c/fields/End_Date__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Tenant__c/fields/Property__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Tenant__c/fields/Property__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Tenant__c/fields/Property__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Tenant__c/fields/Property__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Tenant__c/fields/Start_Date__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Tenant__c/fields/Start_Date__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Tenant__c/fields/Start_Date__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Tenant__c/fields/Start_Date__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Tenant__c/fields/Status__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Tenant__c/fields/Status__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Tenant__c/fields/Status__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Tenant__c/fields/Status__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Tenant__c/fields/User_Status__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Tenant__c/fields/User_Status__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Tenant__c/fields/User_Status__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Tenant__c/fields/User_Status__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Tenant__c/fields/User__c.field-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Tenant__c/fields/User__c.field-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Tenant__c/fields/User__c.field-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/objects/Tenant__c/fields/User__c.field-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/package.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/package.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/package.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/package.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/permissionsets/Property_Management_Access.permissionset-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/permissionsets/Property_Management_Access.permissionset-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/permissionsets/Property_Management_Access.permissionset-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/permissionsets/Property_Management_Access.permissionset-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/permissionsets/Tenant_Maintenance_Access.permissionset-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/permissionsets/Tenant_Maintenance_Access.permissionset-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/permissionsets/Tenant_Maintenance_Access.permissionset-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/permissionsets/Tenant_Maintenance_Access.permissionset-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/sites/propertyrentalapp.site-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/sites/propertyrentalapp.site-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/sites/propertyrentalapp.site-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/sites/propertyrentalapp.site-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/triggers/MaintenanceRequestTrigger.trigger b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/triggers/MaintenanceRequestTrigger.trigger
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/triggers/MaintenanceRequestTrigger.trigger
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/triggers/MaintenanceRequestTrigger.trigger
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/triggers/MaintenanceRequestTrigger.trigger-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/triggers/MaintenanceRequestTrigger.trigger-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/triggers/MaintenanceRequestTrigger.trigger-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/triggers/MaintenanceRequestTrigger.trigger-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/triggers/TenantTrigger.trigger b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/triggers/TenantTrigger.trigger
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/triggers/TenantTrigger.trigger
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/triggers/TenantTrigger.trigger
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/triggers/TenantTrigger.trigger-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/triggers/TenantTrigger.trigger-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/triggers/TenantTrigger.trigger-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/triggers/TenantTrigger.trigger-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/.forceignore b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/.forceignore
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/.forceignore
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/.forceignore
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/.graphqlrc.yml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/.graphqlrc.yml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/.graphqlrc.yml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/.graphqlrc.yml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/.prettierignore b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/.prettierignore
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/.prettierignore
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/.prettierignore
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/.prettierrc b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/.prettierrc
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/.prettierrc
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/.prettierrc
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/CHANGELOG.md b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/CHANGELOG.md
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/CHANGELOG.md
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/CHANGELOG.md
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/README.md b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/README.md
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/README.md
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/README.md
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/codegen.yml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/codegen.yml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/codegen.yml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/codegen.yml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/components.json b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/components.json
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/components.json
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/components.json
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/e2e/app.spec.ts b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/e2e/app.spec.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/e2e/app.spec.ts
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/e2e/app.spec.ts
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/eslint.config.js b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/eslint.config.js
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/eslint.config.js
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/eslint.config.js
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/index.html b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/index.html
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/index.html
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/index.html
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/package.json b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/package.json
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/package.json
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/package.json
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/playwright.config.ts b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/playwright.config.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/playwright.config.ts
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/playwright.config.ts
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/propertyrentalapp.uibundle-meta.xml b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/propertyrentalapp.uibundle-meta.xml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/propertyrentalapp.uibundle-meta.xml
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/propertyrentalapp.uibundle-meta.xml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/scripts/get-graphql-schema.mjs b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/scripts/get-graphql-schema.mjs
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/scripts/get-graphql-schema.mjs
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/scripts/get-graphql-schema.mjs
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/scripts/rewrite-e2e-assets.mjs b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/scripts/rewrite-e2e-assets.mjs
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/scripts/rewrite-e2e-assets.mjs
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/scripts/rewrite-e2e-assets.mjs
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/api/applications/applicationApi.ts b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/api/applications/applicationApi.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/api/applications/applicationApi.ts
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/api/applications/applicationApi.ts
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/api/graphql-operations-types.ts b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/api/graphql-operations-types.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/api/graphql-operations-types.ts
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/api/graphql-operations-types.ts
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/api/graphqlClient.ts b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/api/graphqlClient.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/api/graphqlClient.ts
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/api/graphqlClient.ts
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/api/leads/leadApi.ts b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/api/leads/leadApi.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/api/leads/leadApi.ts
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/api/leads/leadApi.ts
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/api/maintenanceRequests/maintenanceRequestApi.ts b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/api/maintenanceRequests/maintenanceRequestApi.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/api/maintenanceRequests/maintenanceRequestApi.ts
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/api/maintenanceRequests/maintenanceRequestApi.ts
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/api/maintenanceRequests/query/maintenanceRequests.graphql b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/api/maintenanceRequests/query/maintenanceRequests.graphql
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/api/maintenanceRequests/query/maintenanceRequests.graphql
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/api/maintenanceRequests/query/maintenanceRequests.graphql
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/api/properties/propertyDetailGraphQL.ts b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/api/properties/propertyDetailGraphQL.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/api/properties/propertyDetailGraphQL.ts
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/api/properties/propertyDetailGraphQL.ts
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/api/properties/propertyNodeUtils.ts b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/api/properties/propertyNodeUtils.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/api/properties/propertyNodeUtils.ts
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/api/properties/propertyNodeUtils.ts
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/api/properties/propertySearchService.ts b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/api/properties/propertySearchService.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/api/properties/propertySearchService.ts
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/api/properties/propertySearchService.ts
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/api/properties/query/distinctPropertyStatus.graphql b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/api/properties/query/distinctPropertyStatus.graphql
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/api/properties/query/distinctPropertyStatus.graphql
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/api/properties/query/distinctPropertyStatus.graphql
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/api/properties/query/distinctPropertyType.graphql b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/api/properties/query/distinctPropertyType.graphql
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/api/properties/query/distinctPropertyType.graphql
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/api/properties/query/distinctPropertyType.graphql
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/api/properties/query/listingById.graphql b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/api/properties/query/listingById.graphql
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/api/properties/query/listingById.graphql
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/api/properties/query/listingById.graphql
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/api/properties/query/propertyAddressesByIds.graphql b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/api/properties/query/propertyAddressesByIds.graphql
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/api/properties/query/propertyAddressesByIds.graphql
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/api/properties/query/propertyAddressesByIds.graphql
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/api/properties/query/propertyDetailById.graphql b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/api/properties/query/propertyDetailById.graphql
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/api/properties/query/propertyDetailById.graphql
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/api/properties/query/propertyDetailById.graphql
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/api/properties/query/searchProperties.graphql b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/api/properties/query/searchProperties.graphql
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/api/properties/query/searchProperties.graphql
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/api/properties/query/searchProperties.graphql
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/api/query/tenantAccess.graphql b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/api/query/tenantAccess.graphql
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/api/query/tenantAccess.graphql
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/api/query/tenantAccess.graphql
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/api/tenantApi.ts b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/api/tenantApi.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/api/tenantApi.ts
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/api/tenantApi.ts
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/app.tsx b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/app.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/app.tsx
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/app.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/appLayout.tsx b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/appLayout.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/appLayout.tsx
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/appLayout.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/assets/icons/appliances.svg b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/assets/icons/appliances.svg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/assets/icons/appliances.svg
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/assets/icons/appliances.svg
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/assets/icons/book.svg b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/assets/icons/book.svg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/assets/icons/book.svg
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/assets/icons/book.svg
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/assets/icons/copy.svg b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/assets/icons/copy.svg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/assets/icons/copy.svg
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/assets/icons/copy.svg
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/assets/icons/electrical.svg b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/assets/icons/electrical.svg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/assets/icons/electrical.svg
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/assets/icons/electrical.svg
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/assets/icons/hvac.svg b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/assets/icons/hvac.svg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/assets/icons/hvac.svg
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/assets/icons/hvac.svg
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/assets/icons/pest.svg b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/assets/icons/pest.svg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/assets/icons/pest.svg
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/assets/icons/pest.svg
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/assets/icons/plumbing.svg b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/assets/icons/plumbing.svg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/assets/icons/plumbing.svg
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/assets/icons/plumbing.svg
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/assets/icons/rocket.svg b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/assets/icons/rocket.svg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/assets/icons/rocket.svg
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/assets/icons/rocket.svg
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/assets/icons/star.svg b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/assets/icons/star.svg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/assets/icons/star.svg
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/assets/icons/star.svg
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/assets/icons/zen-logo.svg b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/assets/icons/zen-logo.svg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/assets/icons/zen-logo.svg
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/assets/icons/zen-logo.svg
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/assets/images/codey-1.png b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/assets/images/codey-1.png
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/assets/images/codey-1.png
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/assets/images/codey-1.png
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/assets/images/codey-2.png b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/assets/images/codey-2.png
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/assets/images/codey-2.png
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/assets/images/codey-2.png
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/assets/images/codey-3.png b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/assets/images/codey-3.png
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/assets/images/codey-3.png
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/assets/images/codey-3.png
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/assets/images/vibe-codey.svg b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/assets/images/vibe-codey.svg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/assets/images/vibe-codey.svg
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/assets/images/vibe-codey.svg
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/components/SkeletonPrimitives.tsx b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/components/SkeletonPrimitives.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/components/SkeletonPrimitives.tsx
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/components/SkeletonPrimitives.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/components/alerts/status-alert.tsx b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/components/alerts/status-alert.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/components/alerts/status-alert.tsx
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/components/alerts/status-alert.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/components/dashboard/WeatherWidget.tsx b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/components/dashboard/WeatherWidget.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/components/dashboard/WeatherWidget.tsx
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/components/dashboard/WeatherWidget.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/components/layout/TopBar.tsx b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/components/layout/TopBar.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/components/layout/TopBar.tsx
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/components/layout/TopBar.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/components/layout/VerticalNav.tsx b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/components/layout/VerticalNav.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/components/layout/VerticalNav.tsx
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/components/layout/VerticalNav.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/components/layouts/card-layout.tsx b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/components/layouts/card-layout.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/components/layouts/card-layout.tsx
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/components/layouts/card-layout.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/components/maintenanceRequests/MaintenanceRequestIcon.tsx b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/components/maintenanceRequests/MaintenanceRequestIcon.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/components/maintenanceRequests/MaintenanceRequestIcon.tsx
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/components/maintenanceRequests/MaintenanceRequestIcon.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/components/maintenanceRequests/MaintenanceRequestList.tsx b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/components/maintenanceRequests/MaintenanceRequestList.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/components/maintenanceRequests/MaintenanceRequestList.tsx
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/components/maintenanceRequests/MaintenanceRequestList.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/components/maintenanceRequests/MaintenanceRequestListItem.tsx b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/components/maintenanceRequests/MaintenanceRequestListItem.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/components/maintenanceRequests/MaintenanceRequestListItem.tsx
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/components/maintenanceRequests/MaintenanceRequestListItem.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/components/maintenanceRequests/MaintenanceSummaryDetailsModal.tsx b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/components/maintenanceRequests/MaintenanceSummaryDetailsModal.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/components/maintenanceRequests/MaintenanceSummaryDetailsModal.tsx
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/components/maintenanceRequests/MaintenanceSummaryDetailsModal.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/components/maintenanceRequests/StatusBadge.tsx b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/components/maintenanceRequests/StatusBadge.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/components/maintenanceRequests/StatusBadge.tsx
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/components/maintenanceRequests/StatusBadge.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/components/properties/PropertyListingCard.tsx b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/components/properties/PropertyListingCard.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/components/properties/PropertyListingCard.tsx
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/components/properties/PropertyListingCard.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/components/properties/PropertyMap.tsx b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/components/properties/PropertyMap.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/components/properties/PropertyMap.tsx
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/components/properties/PropertyMap.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/components/properties/PropertySearchFilters.tsx b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/components/properties/PropertySearchFilters.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/components/properties/PropertySearchFilters.tsx
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/components/properties/PropertySearchFilters.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/alert.tsx b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/alert.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/alert.tsx
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/alert.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/badge.tsx b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/badge.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/badge.tsx
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/badge.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/breadcrumb.tsx b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/breadcrumb.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/breadcrumb.tsx
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/breadcrumb.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/button.tsx b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/button.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/button.tsx
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/button.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/calendar.tsx b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/calendar.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/calendar.tsx
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/calendar.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/card.tsx b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/card.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/card.tsx
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/card.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/checkbox.tsx b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/checkbox.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/checkbox.tsx
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/checkbox.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/collapsible.tsx b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/collapsible.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/collapsible.tsx
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/collapsible.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/datePicker.tsx b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/datePicker.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/datePicker.tsx
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/datePicker.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/dialog.tsx b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/dialog.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/dialog.tsx
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/dialog.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/field.tsx b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/field.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/field.tsx
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/field.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/index.ts b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/index.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/index.ts
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/index.ts
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/input.tsx b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/input.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/input.tsx
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/input.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/label.tsx b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/label.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/label.tsx
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/label.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/pagination.tsx b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/pagination.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/pagination.tsx
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/pagination.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/popover.tsx b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/popover.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/popover.tsx
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/popover.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/select.tsx b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/select.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/select.tsx
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/select.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/separator.tsx b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/separator.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/separator.tsx
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/separator.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/skeleton.tsx b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/skeleton.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/skeleton.tsx
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/skeleton.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/sonner.tsx b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/sonner.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/sonner.tsx
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/sonner.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/spinner.tsx b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/spinner.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/spinner.tsx
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/spinner.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/table.tsx b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/table.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/table.tsx
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/table.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/tabs.tsx b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/tabs.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/tabs.tsx
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/tabs.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/api/userProfileApi.ts b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/api/userProfileApi.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/api/userProfileApi.ts
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/api/userProfileApi.ts
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/authHelpers.ts b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/authHelpers.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/authHelpers.ts
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/authHelpers.ts
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/authenticationConfig.ts b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/authenticationConfig.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/authenticationConfig.ts
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/authenticationConfig.ts
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/context/AuthContext.tsx b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/context/AuthContext.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/context/AuthContext.tsx
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/context/AuthContext.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/footers/footer-link.tsx b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/footers/footer-link.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/footers/footer-link.tsx
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/footers/footer-link.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/forms/auth-form.tsx b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/forms/auth-form.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/forms/auth-form.tsx
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/forms/auth-form.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/forms/submit-button.tsx b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/forms/submit-button.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/forms/submit-button.tsx
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/forms/submit-button.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/hooks/form.tsx b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/hooks/form.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/hooks/form.tsx
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/hooks/form.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/hooks/useCountdownTimer.ts b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/hooks/useCountdownTimer.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/hooks/useCountdownTimer.ts
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/hooks/useCountdownTimer.ts
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/hooks/useRetryWithBackoff.ts b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/hooks/useRetryWithBackoff.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/hooks/useRetryWithBackoff.ts
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/hooks/useRetryWithBackoff.ts
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/layout/card-skeleton.tsx b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/layout/card-skeleton.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/layout/card-skeleton.tsx
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/layout/card-skeleton.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/layout/centered-page-layout.tsx b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/layout/centered-page-layout.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/layout/centered-page-layout.tsx
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/layout/centered-page-layout.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/layouts/AuthAppLayout.tsx b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/layouts/AuthAppLayout.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/layouts/AuthAppLayout.tsx
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/layouts/AuthAppLayout.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/layouts/TenantRoute.tsx b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/layouts/TenantRoute.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/layouts/TenantRoute.tsx
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/layouts/TenantRoute.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/layouts/authenticationRouteLayout.tsx b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/layouts/authenticationRouteLayout.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/layouts/authenticationRouteLayout.tsx
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/layouts/authenticationRouteLayout.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/layouts/privateRouteLayout.tsx b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/layouts/privateRouteLayout.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/layouts/privateRouteLayout.tsx
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/layouts/privateRouteLayout.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/pages/ChangePassword.tsx b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/pages/ChangePassword.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/pages/ChangePassword.tsx
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/pages/ChangePassword.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/pages/ForgotPassword.tsx b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/pages/ForgotPassword.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/pages/ForgotPassword.tsx
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/pages/ForgotPassword.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/pages/Login.tsx b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/pages/Login.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/pages/Login.tsx
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/pages/Login.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/pages/Profile.tsx b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/pages/Profile.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/pages/Profile.tsx
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/pages/Profile.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/pages/Register.tsx b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/pages/Register.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/pages/Register.tsx
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/pages/Register.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/pages/ResetPassword.tsx b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/pages/ResetPassword.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/pages/ResetPassword.tsx
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/pages/ResetPassword.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/sessionTimeout/SessionTimeoutValidator.tsx b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/sessionTimeout/SessionTimeoutValidator.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/sessionTimeout/SessionTimeoutValidator.tsx
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/sessionTimeout/SessionTimeoutValidator.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/sessionTimeout/sessionTimeService.ts b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/sessionTimeout/sessionTimeService.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/sessionTimeout/sessionTimeService.ts
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/sessionTimeout/sessionTimeService.ts
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/sessionTimeout/sessionTimeoutConfig.ts b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/sessionTimeout/sessionTimeoutConfig.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/sessionTimeout/sessionTimeoutConfig.ts
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/sessionTimeout/sessionTimeoutConfig.ts
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/utils/helpers.ts b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/utils/helpers.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/utils/helpers.ts
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/utils/helpers.ts
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/__examples__/api/accountSearchService.ts b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/__examples__/api/accountSearchService.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/__examples__/api/accountSearchService.ts
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/__examples__/api/accountSearchService.ts
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/__examples__/api/query/distinctAccountIndustries.graphql b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/__examples__/api/query/distinctAccountIndustries.graphql
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/__examples__/api/query/distinctAccountIndustries.graphql
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/__examples__/api/query/distinctAccountIndustries.graphql
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/__examples__/api/query/distinctAccountTypes.graphql b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/__examples__/api/query/distinctAccountTypes.graphql
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/__examples__/api/query/distinctAccountTypes.graphql
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/__examples__/api/query/distinctAccountTypes.graphql
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/__examples__/api/query/getAccountDetail.graphql b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/__examples__/api/query/getAccountDetail.graphql
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/__examples__/api/query/getAccountDetail.graphql
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/__examples__/api/query/getAccountDetail.graphql
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/__examples__/api/query/searchAccounts.graphql b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/__examples__/api/query/searchAccounts.graphql
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/__examples__/api/query/searchAccounts.graphql
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/__examples__/api/query/searchAccounts.graphql
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/__examples__/pages/AccountObjectDetailPage.tsx b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/__examples__/pages/AccountObjectDetailPage.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/__examples__/pages/AccountObjectDetailPage.tsx
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/__examples__/pages/AccountObjectDetailPage.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/__examples__/pages/AccountSearch.tsx b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/__examples__/pages/AccountSearch.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/__examples__/pages/AccountSearch.tsx
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/__examples__/pages/AccountSearch.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/__examples__/pages/Home.tsx b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/__examples__/pages/Home.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/__examples__/pages/Home.tsx
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/__examples__/pages/Home.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/api/objectSearchService.ts b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/api/objectSearchService.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/api/objectSearchService.ts
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/api/objectSearchService.ts
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/components/ActiveFilters.tsx b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/components/ActiveFilters.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/components/ActiveFilters.tsx
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/components/ActiveFilters.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/components/FilterContext.tsx b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/components/FilterContext.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/components/FilterContext.tsx
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/components/FilterContext.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/components/ObjectBreadcrumb.tsx b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/components/ObjectBreadcrumb.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/components/ObjectBreadcrumb.tsx
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/components/ObjectBreadcrumb.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/components/PaginationControls.tsx b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/components/PaginationControls.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/components/PaginationControls.tsx
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/components/PaginationControls.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/components/SearchBar.tsx b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/components/SearchBar.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/components/SearchBar.tsx
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/components/SearchBar.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/components/SortControl.tsx b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/components/SortControl.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/components/SortControl.tsx
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/components/SortControl.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/components/filters/BooleanFilter.tsx b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/components/filters/BooleanFilter.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/components/filters/BooleanFilter.tsx
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/components/filters/BooleanFilter.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/components/filters/DateFilter.tsx b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/components/filters/DateFilter.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/components/filters/DateFilter.tsx
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/components/filters/DateFilter.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/components/filters/DateRangeFilter.tsx b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/components/filters/DateRangeFilter.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/components/filters/DateRangeFilter.tsx
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/components/filters/DateRangeFilter.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/components/filters/FilterFieldWrapper.tsx b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/components/filters/FilterFieldWrapper.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/components/filters/FilterFieldWrapper.tsx
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/components/filters/FilterFieldWrapper.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/components/filters/MultiSelectFilter.tsx b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/components/filters/MultiSelectFilter.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/components/filters/MultiSelectFilter.tsx
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/components/filters/MultiSelectFilter.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/components/filters/NumericRangeFilter.tsx b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/components/filters/NumericRangeFilter.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/components/filters/NumericRangeFilter.tsx
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/components/filters/NumericRangeFilter.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/components/filters/SearchFilter.tsx b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/components/filters/SearchFilter.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/components/filters/SearchFilter.tsx
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/components/filters/SearchFilter.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/components/filters/SelectFilter.tsx b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/components/filters/SelectFilter.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/components/filters/SelectFilter.tsx
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/components/filters/SelectFilter.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/components/filters/TextFilter.tsx b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/components/filters/TextFilter.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/components/filters/TextFilter.tsx
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/components/filters/TextFilter.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/hooks/useAsyncData.ts b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/hooks/useAsyncData.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/hooks/useAsyncData.ts
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/hooks/useAsyncData.ts
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/hooks/useCachedAsyncData.ts b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/hooks/useCachedAsyncData.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/hooks/useCachedAsyncData.ts
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/hooks/useCachedAsyncData.ts
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/hooks/useDebouncedCallback.ts b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/hooks/useDebouncedCallback.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/hooks/useDebouncedCallback.ts
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/hooks/useDebouncedCallback.ts
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/hooks/useObjectSearchParams.ts b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/hooks/useObjectSearchParams.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/hooks/useObjectSearchParams.ts
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/hooks/useObjectSearchParams.ts
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/utils/debounce.ts b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/utils/debounce.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/utils/debounce.ts
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/utils/debounce.ts
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/utils/fieldUtils.ts b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/utils/fieldUtils.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/utils/fieldUtils.ts
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/utils/fieldUtils.ts
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/utils/filterUtils.ts b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/utils/filterUtils.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/utils/filterUtils.ts
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/utils/filterUtils.ts
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/utils/sortUtils.ts b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/utils/sortUtils.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/utils/sortUtils.ts
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/utils/sortUtils.ts
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/hooks/useGeocode.ts b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/hooks/useGeocode.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/hooks/useGeocode.ts
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/hooks/useGeocode.ts
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/hooks/useMaintenanceRequests.ts b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/hooks/useMaintenanceRequests.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/hooks/useMaintenanceRequests.ts
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/hooks/useMaintenanceRequests.ts
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/hooks/usePropertyDetail.ts b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/hooks/usePropertyDetail.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/hooks/usePropertyDetail.ts
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/hooks/usePropertyDetail.ts
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/hooks/usePropertyMapMarkers.ts b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/hooks/usePropertyMapMarkers.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/hooks/usePropertyMapMarkers.ts
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/hooks/usePropertyMapMarkers.ts
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/hooks/useTenantAccess.ts b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/hooks/useTenantAccess.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/hooks/useTenantAccess.ts
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/hooks/useTenantAccess.ts
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/hooks/useWeather.ts b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/hooks/useWeather.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/hooks/useWeather.ts
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/hooks/useWeather.ts
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/lib/utils.ts b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/lib/utils.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/lib/utils.ts
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/lib/utils.ts
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/navigationMenu.tsx b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/navigationMenu.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/navigationMenu.tsx
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/navigationMenu.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/pages/Application.tsx b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/pages/Application.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/pages/Application.tsx
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/pages/Application.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/pages/Contact.tsx b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/pages/Contact.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/pages/Contact.tsx
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/pages/Contact.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/pages/Dashboard.tsx b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/pages/Dashboard.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/pages/Dashboard.tsx
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/pages/Dashboard.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/pages/Home.tsx b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/pages/Home.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/pages/Home.tsx
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/pages/Home.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/pages/Maintenance.tsx b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/pages/Maintenance.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/pages/Maintenance.tsx
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/pages/Maintenance.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/pages/NotFound.tsx b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/pages/NotFound.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/pages/NotFound.tsx
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/pages/NotFound.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/pages/PropertyDetails.tsx b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/pages/PropertyDetails.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/pages/PropertyDetails.tsx
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/pages/PropertyDetails.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/pages/PropertySearch.tsx b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/pages/PropertySearch.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/pages/PropertySearch.tsx
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/pages/PropertySearch.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/pages/PropertySearchPlaceholder.tsx b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/pages/PropertySearchPlaceholder.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/pages/PropertySearchPlaceholder.tsx
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/pages/PropertySearchPlaceholder.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-01.jpg b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-01.jpg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-01.jpg
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-01.jpg
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-02.jpg b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-02.jpg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-02.jpg
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-02.jpg
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-03.jpg b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-03.jpg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-03.jpg
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-03.jpg
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-04.jpg b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-04.jpg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-04.jpg
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-04.jpg
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-05.jpg b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-05.jpg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-05.jpg
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-05.jpg
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-06.jpg b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-06.jpg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-06.jpg
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-06.jpg
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-07.jpg b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-07.jpg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-07.jpg
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-07.jpg
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-08.jpg b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-08.jpg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-08.jpg
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-08.jpg
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-09.jpg b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-09.jpg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-09.jpg
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-09.jpg
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-10.jpg b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-10.jpg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-10.jpg
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-10.jpg
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-11.jpg b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-11.jpg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-11.jpg
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-11.jpg
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-12.jpg b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-12.jpg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-12.jpg
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-12.jpg
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-13.jpg b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-13.jpg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-13.jpg
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-13.jpg
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-14.jpg b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-14.jpg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-14.jpg
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-14.jpg
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-15.jpg b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-15.jpg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-15.jpg
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-15.jpg
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-16.jpg b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-16.jpg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-16.jpg
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-16.jpg
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-17.jpg b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-17.jpg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-17.jpg
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-17.jpg
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-18.jpg b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-18.jpg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-18.jpg
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-18.jpg
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-19.jpg b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-19.jpg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-19.jpg
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-19.jpg
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-20.jpg b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-20.jpg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-20.jpg
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-20.jpg
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-21.jpg b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-21.jpg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-21.jpg
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-21.jpg
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-22.jpg b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-22.jpg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-22.jpg
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-22.jpg
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-23.jpg b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-23.jpg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-23.jpg
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-23.jpg
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-24.jpg b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-24.jpg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-24.jpg
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-24.jpg
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-25.jpg b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-25.jpg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-25.jpg
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/public/property-25.jpg
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/router-utils.tsx b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/router-utils.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/router-utils.tsx
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/router-utils.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/routes.tsx b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/routes.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/routes.tsx
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/routes.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/styles/global.css b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/styles/global.css
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/styles/global.css
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/styles/global.css
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/types/leaflet.d.ts b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/types/leaflet.d.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/types/leaflet.d.ts
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/types/leaflet.d.ts
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/types/searchResults.ts b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/types/searchResults.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/types/searchResults.ts
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/types/searchResults.ts
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/utils/geocode.ts b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/utils/geocode.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/utils/geocode.ts
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/utils/geocode.ts
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/utils/propertyListingPaginationUtils.ts b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/utils/propertyListingPaginationUtils.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/src/utils/propertyListingPaginationUtils.ts
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/src/utils/propertyListingPaginationUtils.ts
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/tsconfig.json b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/tsconfig.json
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/tsconfig.json
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/tsconfig.json
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/tsconfig.node.json b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/tsconfig.node.json
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/tsconfig.node.json
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/tsconfig.node.json
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/ui-bundle.json b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/ui-bundle.json
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/ui-bundle.json
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/ui-bundle.json
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/vite-env.d.ts b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/vite-env.d.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/vite-env.d.ts
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/vite-env.d.ts
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/vite.config.ts b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/vite.config.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/vite.config.ts
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/vite.config.ts
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/vitest-env.d.ts b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/vitest-env.d.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/vitest-env.d.ts
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/vitest-env.d.ts
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/vitest.config.ts b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/vitest.config.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/vitest.config.ts
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/vitest.config.ts
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/vitest.setup.ts b/samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/vitest.setup.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/uiBundles/propertyrentalapp/vitest.setup.ts
rename to samples/ui-bundle-template-app-react-sample-b2x/force-app/main/default/uiBundles/propertyrentalapp/vitest.setup.ts
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/jest.config.js b/samples/ui-bundle-template-app-react-sample-b2x/jest.config.js
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/jest.config.js
rename to samples/ui-bundle-template-app-react-sample-b2x/jest.config.js
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/package-lock.json b/samples/ui-bundle-template-app-react-sample-b2x/package-lock.json
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/package-lock.json
rename to samples/ui-bundle-template-app-react-sample-b2x/package-lock.json
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/package.json b/samples/ui-bundle-template-app-react-sample-b2x/package.json
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/package.json
rename to samples/ui-bundle-template-app-react-sample-b2x/package.json
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/scripts/apex/hello.apex b/samples/ui-bundle-template-app-react-sample-b2x/scripts/apex/hello.apex
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/scripts/apex/hello.apex
rename to samples/ui-bundle-template-app-react-sample-b2x/scripts/apex/hello.apex
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/scripts/graphql-search.sh b/samples/ui-bundle-template-app-react-sample-b2x/scripts/graphql-search.sh
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/scripts/graphql-search.sh
rename to samples/ui-bundle-template-app-react-sample-b2x/scripts/graphql-search.sh
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/scripts/prepare-import-unique-fields.js b/samples/ui-bundle-template-app-react-sample-b2x/scripts/prepare-import-unique-fields.js
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/scripts/prepare-import-unique-fields.js
rename to samples/ui-bundle-template-app-react-sample-b2x/scripts/prepare-import-unique-fields.js
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/scripts/setup-cli.mjs b/samples/ui-bundle-template-app-react-sample-b2x/scripts/setup-cli.mjs
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/scripts/setup-cli.mjs
rename to samples/ui-bundle-template-app-react-sample-b2x/scripts/setup-cli.mjs
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/scripts/sf-project-setup.mjs b/samples/ui-bundle-template-app-react-sample-b2x/scripts/sf-project-setup.mjs
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/scripts/sf-project-setup.mjs
rename to samples/ui-bundle-template-app-react-sample-b2x/scripts/sf-project-setup.mjs
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/scripts/soql/account.soql b/samples/ui-bundle-template-app-react-sample-b2x/scripts/soql/account.soql
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/scripts/soql/account.soql
rename to samples/ui-bundle-template-app-react-sample-b2x/scripts/soql/account.soql
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/sfdx-project.json b/samples/ui-bundle-template-app-react-sample-b2x/sfdx-project.json
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/sfdx-project.json
rename to samples/ui-bundle-template-app-react-sample-b2x/sfdx-project.json
diff --git a/scripts/sync-react-b2e-sample.js b/scripts/sync-react-b2e-sample.js
index 68c1a1b..cee5f65 100644
--- a/scripts/sync-react-b2e-sample.js
+++ b/scripts/sync-react-b2e-sample.js
@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 /**
  * Syncs source from @salesforce/ui-bundle-template-app-react-sample-b2e
- * into samples/webapp-template-app-react-sample-b2e-experimental/.
+ * into samples/ui-bundle-template-app-react-sample-b2e/.
  * Run from repo root after npm install. Same flow used locally and in CI.
  */
 
@@ -9,7 +9,7 @@ const fs = require('fs');
 const path = require('path');
 
 const PACKAGE_NAME = '@salesforce/ui-bundle-template-app-react-sample-b2e';
-const SAMPLE_DIR = path.join(process.cwd(), 'samples', 'webapp-template-app-react-sample-b2e-experimental');
+const SAMPLE_DIR = path.join(process.cwd(), 'samples', 'ui-bundle-template-app-react-sample-b2e');
 
 const pkgRoot = path.join(process.cwd(), 'node_modules', PACKAGE_NAME.replace('/', path.sep));
 
diff --git a/scripts/sync-react-b2x-sample.js b/scripts/sync-react-b2x-sample.js
index 135fff0..4b3f161 100644
--- a/scripts/sync-react-b2x-sample.js
+++ b/scripts/sync-react-b2x-sample.js
@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 /**
  * Syncs source from @salesforce/ui-bundle-template-app-react-sample-b2x
- * into samples/webapp-template-app-react-sample-b2x-experimental/.
+ * into samples/ui-bundle-template-app-react-sample-b2x/.
  * Run from repo root after npm install. Same flow used locally and in CI.
  */
 
@@ -9,7 +9,7 @@ const fs = require('fs');
 const path = require('path');
 
 const PACKAGE_NAME = '@salesforce/ui-bundle-template-app-react-sample-b2x';
-const SAMPLE_DIR = path.join(process.cwd(), 'samples', 'webapp-template-app-react-sample-b2x-experimental');
+const SAMPLE_DIR = path.join(process.cwd(), 'samples', 'ui-bundle-template-app-react-sample-b2x');
 
 const pkgRoot = path.join(process.cwd(), 'node_modules', PACKAGE_NAME.replace('/', path.sep));