diff --git a/samples/native-mobile-rental-tenant-app/force-app/main/default/digitalExperiences/experiencecontainer/rentalApp/experience__camaAppMetadata/appMetadata/content.json b/samples/native-mobile-rental-tenant-app/force-app/main/default/digitalExperiences/experiencecontainer/rentalApp/experience__camaAppMetadata/appMetadata/content.json
index 3875791..87fab5b 100644
--- a/samples/native-mobile-rental-tenant-app/force-app/main/default/digitalExperiences/experiencecontainer/rentalApp/experience__camaAppMetadata/appMetadata/content.json
+++ b/samples/native-mobile-rental-tenant-app/force-app/main/default/digitalExperiences/experiencecontainer/rentalApp/experience__camaAppMetadata/appMetadata/content.json
@@ -3,22 +3,22 @@
   "title": "App Metadata",
   "contentBody": {
     "version": "1.0.0",
-    "name": "Homestead",
+    "name": "RentalApp",
     "description": "Mobile application for managing property rentals, tenant information, lease agreements, and maintenance requests.",
-    "url": "http://login.test1.pc-rnd.salesforce.com/",
+    "url": "https://login.test1.pc-rnd.salesforce.com",
     "templateID": "1",
     "tabs": [
       {
         "id": "home",
         "label": "Home",
         "icon": "house.fill",
-        "screenAPIName": "uem_homesteadHome"
+        "screenAPIName": "homeScreen"
       },
       {
         "id": "calendar",
         "label": "Calendar",
         "icon": "calendar",
-        "screenAPIName": "calendar"
+        "screenAPIName": "calendarScreen"
       }
     ],
     "toolbarActions": {
@@ -36,7 +36,7 @@
         "onSurface3": "#747474"
       },
       "cornerRadius": {
-        "radiusBorderCircle": "12"
+        "radiusBorderCircle": 12
       }
     }
   },
diff --git a/samples/native-mobile-rental-tenant-app/force-app/main/default/digitalExperiences/experiencecontainer/rentalApp/experience__camaECDefinition/rentalApp/_meta.json b/samples/native-mobile-rental-tenant-app/force-app/main/default/digitalExperiences/experiencecontainer/rentalApp/experience__camaECDefinition/rentalApp/_meta.json
new file mode 100644
index 0000000..b04fbca
--- /dev/null
+++ b/samples/native-mobile-rental-tenant-app/force-app/main/default/digitalExperiences/experiencecontainer/rentalApp/experience__camaECDefinition/rentalApp/_meta.json
@@ -0,0 +1,5 @@
+{
+  "apiName": "rentalApp",
+  "type": "experience__camaECDefinition",
+  "path": "rentalApp"
+}
diff --git a/samples/native-mobile-rental-tenant-app/force-app/main/default/digitalExperiences/experiencecontainer/rentalApp/experience__camaECDefinition/rentalApp/content.json b/samples/native-mobile-rental-tenant-app/force-app/main/default/digitalExperiences/experiencecontainer/rentalApp/experience__camaECDefinition/rentalApp/content.json
new file mode 100644
index 0000000..8cdeaa0
--- /dev/null
+++ b/samples/native-mobile-rental-tenant-app/force-app/main/default/digitalExperiences/experiencecontainer/rentalApp/experience__camaECDefinition/rentalApp/content.json
@@ -0,0 +1,6 @@
+{
+  "type": "experience__camaECDefinition",
+  "title": "CAMA EC Definition",
+  "contentBody": {},
+  "urlName": "cama-ec-definition"
+}
diff --git a/samples/native-mobile-rental-tenant-app/force-app/main/default/digitalExperiences/experiencecontainer/rentalApp/experience__camaScreen/calendar/_meta.json b/samples/native-mobile-rental-tenant-app/force-app/main/default/digitalExperiences/experiencecontainer/rentalApp/experience__camaScreen/calendar/_meta.json
deleted file mode 100644
index a1fdbb0..0000000
--- a/samples/native-mobile-rental-tenant-app/force-app/main/default/digitalExperiences/experiencecontainer/rentalApp/experience__camaScreen/calendar/_meta.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "apiName": "calendar",
-  "type": "experience__camaScreen",
-  "path": "calendar"
-}
diff --git a/samples/native-mobile-rental-tenant-app/force-app/main/default/digitalExperiences/experiencecontainer/rentalApp/experience__camaScreen/calendarScreen/_meta.json b/samples/native-mobile-rental-tenant-app/force-app/main/default/digitalExperiences/experiencecontainer/rentalApp/experience__camaScreen/calendarScreen/_meta.json
new file mode 100644
index 0000000..f20d2a9
--- /dev/null
+++ b/samples/native-mobile-rental-tenant-app/force-app/main/default/digitalExperiences/experiencecontainer/rentalApp/experience__camaScreen/calendarScreen/_meta.json
@@ -0,0 +1,5 @@
+{
+  "apiName": "calendarScreen",
+  "type": "experience__camaScreen",
+  "path": "calendarScreen"
+}
diff --git a/samples/native-mobile-rental-tenant-app/force-app/main/default/digitalExperiences/experiencecontainer/rentalApp/experience__camaScreen/calendar/content.json b/samples/native-mobile-rental-tenant-app/force-app/main/default/digitalExperiences/experiencecontainer/rentalApp/experience__camaScreen/calendarScreen/content.json
similarity index 83%
rename from samples/native-mobile-rental-tenant-app/force-app/main/default/digitalExperiences/experiencecontainer/rentalApp/experience__camaScreen/calendar/content.json
rename to samples/native-mobile-rental-tenant-app/force-app/main/default/digitalExperiences/experiencecontainer/rentalApp/experience__camaScreen/calendarScreen/content.json
index 9c570ea..3fc962f 100644
--- a/samples/native-mobile-rental-tenant-app/force-app/main/default/digitalExperiences/experiencecontainer/rentalApp/experience__camaScreen/calendar/content.json
+++ b/samples/native-mobile-rental-tenant-app/force-app/main/default/digitalExperiences/experiencecontainer/rentalApp/experience__camaScreen/calendarScreen/content.json
@@ -19,8 +19,8 @@
       }
     },
     "target": "native__calendar",
-    "apiName": "calendar",
-    "id": "calendar-home-001"
+    "apiName": "calendarScreen",
+    "id": "calendar-001"
   },
-  "urlName": "calendar"
+  "urlName": "calendar-screen"
 }
diff --git a/samples/native-mobile-rental-tenant-app/force-app/main/default/digitalExperiences/experiencecontainer/rentalApp/experience__camaScreen/home/_meta.json b/samples/native-mobile-rental-tenant-app/force-app/main/default/digitalExperiences/experiencecontainer/rentalApp/experience__camaScreen/home/_meta.json
deleted file mode 100644
index de3486a..0000000
--- a/samples/native-mobile-rental-tenant-app/force-app/main/default/digitalExperiences/experiencecontainer/rentalApp/experience__camaScreen/home/_meta.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "apiName": "home",
-  "type": "experience__camaScreen",
-  "path": "home"
-}
diff --git a/samples/native-mobile-rental-tenant-app/force-app/main/default/digitalExperiences/experiencecontainer/rentalApp/experience__camaScreen/homeScreen/_meta.json b/samples/native-mobile-rental-tenant-app/force-app/main/default/digitalExperiences/experiencecontainer/rentalApp/experience__camaScreen/homeScreen/_meta.json
new file mode 100644
index 0000000..c2d0d5d
--- /dev/null
+++ b/samples/native-mobile-rental-tenant-app/force-app/main/default/digitalExperiences/experiencecontainer/rentalApp/experience__camaScreen/homeScreen/_meta.json
@@ -0,0 +1,5 @@
+{
+  "apiName": "homeScreen",
+  "type": "experience__camaScreen",
+  "path": "homeScreen"
+}
diff --git a/samples/native-mobile-rental-tenant-app/force-app/main/default/digitalExperiences/experiencecontainer/rentalApp/experience__camaScreen/home/content.json b/samples/native-mobile-rental-tenant-app/force-app/main/default/digitalExperiences/experiencecontainer/rentalApp/experience__camaScreen/homeScreen/content.json
similarity index 99%
rename from samples/native-mobile-rental-tenant-app/force-app/main/default/digitalExperiences/experiencecontainer/rentalApp/experience__camaScreen/home/content.json
rename to samples/native-mobile-rental-tenant-app/force-app/main/default/digitalExperiences/experiencecontainer/rentalApp/experience__camaScreen/homeScreen/content.json
index ff2da6b..34688b4 100644
--- a/samples/native-mobile-rental-tenant-app/force-app/main/default/digitalExperiences/experiencecontainer/rentalApp/experience__camaScreen/home/content.json
+++ b/samples/native-mobile-rental-tenant-app/force-app/main/default/digitalExperiences/experiencecontainer/rentalApp/experience__camaScreen/homeScreen/content.json
@@ -1,6 +1,6 @@
 {
   "type": "experience__camaScreen",
-  "title": "Home",
+  "title": "Home Screen",
   "contentBody": {
     "view": {
       "definition": "builder/screen",
@@ -734,9 +734,9 @@
         }
       }
     },
-    "target": "native__homesteadHome",
-    "apiName": "uem_homesteadHome",
-    "id": "homestead-app-home"
+    "target": "native__home",
+    "apiName": "homeScreen",
+    "id": "home-001"
   },
-  "urlName": "home"
+  "urlName": "home-screen"
 }
diff --git a/samples/native-mobile-rental-tenant-app/force-app/main/default/digitalExperiences/experiencecontainer/rentalApp/sfdc_cms__languageSettings/languages/_meta.json b/samples/native-mobile-rental-tenant-app/force-app/main/default/digitalExperiences/experiencecontainer/rentalApp/sfdc_cms__languageSettings/languages/_meta.json
index d0381dc..bbc8af8 100644
--- a/samples/native-mobile-rental-tenant-app/force-app/main/default/digitalExperiences/experiencecontainer/rentalApp/sfdc_cms__languageSettings/languages/_meta.json
+++ b/samples/native-mobile-rental-tenant-app/force-app/main/default/digitalExperiences/experiencecontainer/rentalApp/sfdc_cms__languageSettings/languages/_meta.json
@@ -1,5 +1,5 @@
 {
-  "apiName" : "languages",
-  "type" : "sfdc_cms__languageSettings",
-  "path" : "_settings"
-}
\ No newline at end of file
+  "apiName": "languages",
+  "type": "sfdc_cms__languageSettings",
+  "path": "_settings"
+}
diff --git a/samples/native-mobile-rental-tenant-app/force-app/main/default/digitalExperiences/experiencecontainer/rentalApp/sfdc_cms__languageSettings/languages/content.json b/samples/native-mobile-rental-tenant-app/force-app/main/default/digitalExperiences/experiencecontainer/rentalApp/sfdc_cms__languageSettings/languages/content.json
index 7016c4e..98aef00 100644
--- a/samples/native-mobile-rental-tenant-app/force-app/main/default/digitalExperiences/experiencecontainer/rentalApp/sfdc_cms__languageSettings/languages/content.json
+++ b/samples/native-mobile-rental-tenant-app/force-app/main/default/digitalExperiences/experiencecontainer/rentalApp/sfdc_cms__languageSettings/languages/content.json
@@ -1,14 +1,16 @@
 {
-  "type" : "sfdc_cms__languageSettings",
-  "title" : "LanguageContent",
-  "contentBody" : {
-    "languages" : [ {
-      "locale" : "en_US",
-      "label" : "English (US)",
-      "isActive" : true,
-      "isAuthoringOnly" : false
-    } ],
-    "defaultLocale" : "en_US"
+  "type": "sfdc_cms__languageSettings",
+  "title": "LanguageContent",
+  "contentBody": {
+    "languages": [
+      {
+        "locale": "en_US",
+        "label": "English (US)",
+        "isActive": true,
+        "isAuthoringOnly": false
+      }
+    ],
+    "defaultLocale": "en_US"
   },
-  "urlName" : "languagecontent"
-}
\ No newline at end of file
+  "urlName": "languagecontent"
+}