diff --git a/sandbox/sca-cloud-tutorial/store-appengine-webapp/src/store.composite b/sandbox/sca-cloud-tutorial/store-appengine-webapp/src/store.composite
index 6b659f2876..8705f9a52a 100644
--- a/sandbox/sca-cloud-tutorial/store-appengine-webapp/src/store.composite
+++ b/sandbox/sca-cloud-tutorial/store-appengine-webapp/src/store.composite
@@ -36,7 +36,7 @@
 		</reference>
 		<reference name="vegetablesCatalog">
 		    <interface.java interface="services.Catalog"/>
-			<tuscany:binding.jsonrpc uri="http://tuscany.figueiredos.com/store-catalog-ibmcloud-2x-webapp/Catalog"/>
+			<tuscany:binding.jsonrpc uri="http://tuscany.figueiredos.com/store-catalog-ibmcloud-webapp/Catalog"/>
 		</reference>		
 		<reference name="currencyConverter" target="CurrencyConverter" />
 	</component>
diff --git a/sandbox/sca-cloud-tutorial/store-catalog-appengine-webapp/war/index.html b/sandbox/sca-cloud-tutorial/store-catalog-appengine-webapp/war/index.html
index d1efe02bd6..7169029f5d 100644
--- a/sandbox/sca-cloud-tutorial/store-catalog-appengine-webapp/war/index.html
+++ b/sandbox/sca-cloud-tutorial/store-catalog-appengine-webapp/war/index.html
@@ -28,6 +28,6 @@
 <h2>Tuscany Store Catalog Service</h2>
 </br>
 </br>
-Catalog Service Definition available at : <a href="http://tuscany-store-catalog.appspot.com/Catalog?smd">http://tuscany-store-catalog.appspot.com/Catalog?smd</a>
+Catalog Service Definition available at : <a href="Catalog?smd">Store Catalog Service - JSON-RPC SMD</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/sandbox/sca-cloud-tutorial/store-catalog-ibmcloud-webapp/pom.xml b/sandbox/sca-cloud-tutorial/store-catalog-ibmcloud-webapp/pom.xml
index 8f4ad9a709..81e0fc5a75 100644
--- a/sandbox/sca-cloud-tutorial/store-catalog-ibmcloud-webapp/pom.xml
+++ b/sandbox/sca-cloud-tutorial/store-catalog-ibmcloud-webapp/pom.xml
@@ -25,7 +25,7 @@
         <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
-    <artifactId>store-catalog-ibmcloud-2x-webapp</artifactId>
+    <artifactId>store-catalog-ibmcloud-webapp</artifactId>
     <packaging>war</packaging>
     <name>Apache Tuscany SCA Store Catalog as WebApp</name>
 
diff --git a/sandbox/sca-cloud-tutorial/store-catalog-ibmcloud-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/sandbox/sca-cloud-tutorial/store-catalog-ibmcloud-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
index 25d42aac24..bf5f07f42c 100644
--- a/sandbox/sca-cloud-tutorial/store-catalog-ibmcloud-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
+++ b/sandbox/sca-cloud-tutorial/store-catalog-ibmcloud-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
@@ -32,7 +32,7 @@
 	<dep:environment>
 		<dep:moduleId>
 			<dep:groupId>org.apache.tuscany</dep:groupId>
-			<dep:artifactId>store-catalog-ibmcloud-2x-webapp</dep:artifactId>
+			<dep:artifactId>store-catalog-ibmcloud-webapp</dep:artifactId>
 			<dep:version>1.0</dep:version>
 			<dep:type>car</dep:type>
 		</dep:moduleId>
@@ -46,5 +46,5 @@
 		</dep:hidden-classes>		
 		
 	</dep:environment>
-	<web:context-root>/store-catalog-ibmcloud-2x-webapp</web:context-root>
+	<web:context-root>/store-catalog-ibmcloud-webapp</web:context-root>
 </web:web-app>
diff --git a/sandbox/sca-cloud-tutorial/store-catalog-ibmcloud-webapp/src/main/webapp/WEB-INF/web.xml b/sandbox/sca-cloud-tutorial/store-catalog-ibmcloud-webapp/src/main/webapp/WEB-INF/web.xml
index 266c70089a..a6b97503a5 100644
--- a/sandbox/sca-cloud-tutorial/store-catalog-ibmcloud-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sandbox/sca-cloud-tutorial/store-catalog-ibmcloud-webapp/src/main/webapp/WEB-INF/web.xml
@@ -18,7 +18,7 @@
     * under the License.    
 -->
 <web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" id="WebApp_ID" version="2.5">
-  <display-name>store-catalog-ibmcloud-2x-webapp</display-name>
+  <display-name>store-catalog-ibmcloud-webapp</display-name>
 
   <filter>
     <filter-name>tuscany</filter-name> 
diff --git a/sandbox/sca-cloud-tutorial/store-catalog-ibmcloud-webapp/src/main/webapp/index.html b/sandbox/sca-cloud-tutorial/store-catalog-ibmcloud-webapp/src/main/webapp/index.html
index c431aca044..db5fbebe4c 100644
--- a/sandbox/sca-cloud-tutorial/store-catalog-ibmcloud-webapp/src/main/webapp/index.html
+++ b/sandbox/sca-cloud-tutorial/store-catalog-ibmcloud-webapp/src/main/webapp/index.html
@@ -9,6 +9,6 @@
 <h2>Tuscany Store Catalog Service</h2>
 </br>
 </br>
-Catalog Service Definition available at : <a href="Catalog?smd">JSON-RPC SMD</a>
+Catalog Service Definition available at : <a href="Catalog?smd">Store Catalog Service - JSON-RPC SMD</a>
 </body>
 </html>
\ No newline at end of file