diff --git a/provision/compose/src/1000_namespace_service-cloud.yaml b/provision/compose/src/1000_namespace_service-solution.yaml
similarity index 64%
rename from provision/compose/src/1000_namespace_service-cloud.yaml
rename to provision/compose/src/1000_namespace_service-solution.yaml
index 7a50b766c..c2d722ba7 100644
--- a/provision/compose/src/1000_namespace_service-cloud.yaml
+++ b/provision/compose/src/1000_namespace_service-solution.yaml
@@ -1,3 +1,3 @@
 namespaces:
-  service-cloud:
+  service-solution:
     name: Service Cloud
diff --git a/provision/compose/src/1100_modules_service-cloud.yaml b/provision/compose/src/1100_modules_service-solution.yaml
similarity index 99%
rename from provision/compose/src/1100_modules_service-cloud.yaml
rename to provision/compose/src/1100_modules_service-solution.yaml
index bb125f6df..fbe23b83f 100644
--- a/provision/compose/src/1100_modules_service-cloud.yaml
+++ b/provision/compose/src/1100_modules_service-solution.yaml
@@ -1,4 +1,4 @@
-namespace: service-cloud
+namespace: service-solution
 modules:
   Account:
     name: Account
diff --git a/provision/compose/src/1200_charts_service-cloud.yaml b/provision/compose/src/1200_charts_service-solution.yaml
similarity index 99%
rename from provision/compose/src/1200_charts_service-cloud.yaml
rename to provision/compose/src/1200_charts_service-solution.yaml
index 1f25570c0..14af0623b 100644
--- a/provision/compose/src/1200_charts_service-cloud.yaml
+++ b/provision/compose/src/1200_charts_service-solution.yaml
@@ -1,4 +1,4 @@
-namespace: service-cloud
+namespace: service-solution
 charts:
   ActiveEntitlements:
     name: Number of active entitlements
diff --git a/provision/compose/src/1400_pages_service-cloud.yaml b/provision/compose/src/1400_pages_service-solution.yaml
similarity index 99%
rename from provision/compose/src/1400_pages_service-cloud.yaml
rename to provision/compose/src/1400_pages_service-solution.yaml
index 17917f934..f22beb67a 100644
--- a/provision/compose/src/1400_pages_service-cloud.yaml
+++ b/provision/compose/src/1400_pages_service-solution.yaml
@@ -1,4 +1,4 @@
-namespace: service-cloud
+namespace: service-solution
 pages:
   - handle: Home
     title: Home
@@ -227,11 +227,11 @@ pages:
             - enabled: true
               label: Add Update to this Case
               resourceType: compose:record
-              script: /client-scripts/compose/service-cloud/Case/AddUpdate.js:default
+              script: /client-scripts/compose/service-solution/Case/AddUpdate.js:default
             - enabled: true
               label: Create email for this Case
               resourceType: compose:record
-              script: /client-scripts/compose/service-cloud/Case/CreateEmail.js:default
+              script: /client-scripts/compose/service-solution/Case/CreateEmail.js:default
             sealed: false
           style:
             variants: {bodyBg: white, border: primary, headerBg: white, headerText: primary}
diff --git a/provision/compose/src/1500_record_settings_service-cloud.yaml b/provision/compose/src/1500_record_settings_service-solution.yaml
similarity index 99%
rename from provision/compose/src/1500_record_settings_service-cloud.yaml
rename to provision/compose/src/1500_record_settings_service-solution.yaml
index de85a97d1..69f635876 100644
--- a/provision/compose/src/1500_record_settings_service-cloud.yaml
+++ b/provision/compose/src/1500_record_settings_service-solution.yaml
@@ -1,4 +1,4 @@
-namespace: service-cloud
+namespace: service-solution
 records:
   Department:
   - values:
diff --git a/provision/update.sh b/provision/update.sh
index 35ee76fe7..7b74a81d4 100755
--- a/provision/update.sh
+++ b/provision/update.sh
@@ -37,11 +37,11 @@ copyExtConfig crm 1200_charts
 copyExtConfig crm 1400_pages
 copyExtConfig crm 1500_record_settings
 
-copyExtConfig service-cloud 1000_namespace
-copyExtConfig service-cloud 1100_modules
-copyExtConfig service-cloud 1200_charts
-copyExtConfig service-cloud 1400_pages
-copyExtConfig service-cloud 1500_record_settings
+copyExtConfig service-solution 1000_namespace
+copyExtConfig service-solution 1100_modules
+copyExtConfig service-solution 1200_charts
+copyExtConfig service-solution 1400_pages
+copyExtConfig service-solution 1500_record_settings
 
 cleanup
 
diff --git a/system/provision.go b/system/provision.go
index 0f5290d82..92342c2d7 100644
--- a/system/provision.go
+++ b/system/provision.go
@@ -126,7 +126,7 @@ func makeDefaultApplications(ctx context.Context, log *zap.Logger) error {
 				Listed: true,
 				Icon:   newIconUrl,
 				Logo:   newLogoUrl,
-				Url:    "/compose/ns/service-cloud/pages",
+				Url:    "/compose/ns/service-solution/pages",
 			},
 		},
 	}