diff --git a/adapters/mso-adapter-utils/pom.xml b/adapters/mso-adapter-utils/pom.xml
index f80bfeb..62e7153 100644
--- a/adapters/mso-adapter-utils/pom.xml
+++ b/adapters/mso-adapter-utils/pom.xml
@@ -2,11 +2,11 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.openecomp.mso</groupId>
+		<groupId>org.openecomp.so</groupId>
 		<artifactId>adapters</artifactId>
 		<version>1.1.0-SNAPSHOT</version>
 	</parent>
-	<groupId>org.openecomp.mso.adapters</groupId>
+	<groupId>org.openecomp.so.adapters</groupId>
 	<artifactId>mso-adapter-utils</artifactId>
 	<name>mso-adapter-utils</name>
 	<description>Common MSO utilities, including Openstack client wrappers.</description>
@@ -44,32 +44,32 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>org.openecomp.mso.libs.openstack-java-sdk</groupId>
+			<groupId>org.openecomp.so.libs.openstack-java-sdk</groupId>
 			<artifactId>keystone-client</artifactId>
 			<version>${openstack.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.mso.libs.openstack-java-sdk</groupId>
+			<groupId>org.openecomp.so.libs.openstack-java-sdk</groupId>
 			<artifactId>heat-client</artifactId>
 			<version>${openstack.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.mso.libs.openstack-java-sdk</groupId>
+			<groupId>org.openecomp.so.libs.openstack-java-sdk</groupId>
 			<artifactId>quantum-client</artifactId>
 			<version>${openstack.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.mso.libs.openstack-java-sdk.client-connectors</groupId>
+			<groupId>org.openecomp.so.libs.openstack-java-sdk.client-connectors</groupId>
 			<artifactId>http-connector</artifactId>
 			<version>${openstack.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.mso</groupId>
+			<groupId>org.openecomp.so</groupId>
 			<artifactId>common</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.mso</groupId>
+			<groupId>org.openecomp.so</groupId>
 			<artifactId>mso-catalog-db</artifactId>
 			<version>${project.version}</version>
 		</dependency>
diff --git a/adapters/mso-adapters-rest-interface/pom.xml b/adapters/mso-adapters-rest-interface/pom.xml
index 8619f4b..b83d6f8 100644
--- a/adapters/mso-adapters-rest-interface/pom.xml
+++ b/adapters/mso-adapters-rest-interface/pom.xml
@@ -2,11 +2,11 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.openecomp.mso</groupId>
+		<groupId>org.openecomp.so</groupId>
 		<artifactId>adapters</artifactId>
 		<version>1.1.0-SNAPSHOT</version>
 	</parent>
-	<groupId>org.openecomp.mso.adapters</groupId>
+	<groupId>org.openecomp.so.adapters</groupId>
 	<artifactId>mso-adapters-rest-interface</artifactId>
 	<packaging>jar</packaging>
 	<name>mso-adapters-rest-interface</name>
@@ -44,7 +44,7 @@
     		<version>3.0.19.Final</version>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.mso.adapters</groupId>
+			<groupId>org.openecomp.so.adapters</groupId>
 			<artifactId>mso-adapter-utils</artifactId>
 			<version>${project.version}</version>
 		</dependency>
diff --git a/adapters/mso-catalog-db-adapter/pom.xml b/adapters/mso-catalog-db-adapter/pom.xml
index e7c4b53..4459660 100644
--- a/adapters/mso-catalog-db-adapter/pom.xml
+++ b/adapters/mso-catalog-db-adapter/pom.xml
@@ -2,12 +2,12 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.openecomp.mso</groupId>
+		<groupId>org.openecomp.so</groupId>
 		<artifactId>adapters</artifactId>
 		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 
-	<groupId>org.openecomp.mso.adapters</groupId>
+	<groupId>org.openecomp.so.adapters</groupId>
 	<artifactId>mso-catalog-db-adapter</artifactId>
 	<packaging>war</packaging>
 
@@ -65,7 +65,7 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>org.openecomp.mso</groupId>
+			<groupId>org.openecomp.so</groupId>
 			<artifactId>mso-catalog-db</artifactId>
 			<version>${project.version}</version>
 		</dependency>
@@ -95,7 +95,7 @@
 			<version>3.0.16.Final</version>
 		</dependency>
 		<!--<dependency>
-			<groupId>org.openecomp.mso</groupId>
+			<groupId>org.openecomp.so</groupId>
 			<artifactId>status-control</artifactId>
 			<version>${project.version}</version>
 		</dependency>-->
diff --git a/adapters/mso-network-adapter-async-client/pom.xml b/adapters/mso-network-adapter-async-client/pom.xml
index 7fad404..6e0c9bf 100644
--- a/adapters/mso-network-adapter-async-client/pom.xml
+++ b/adapters/mso-network-adapter-async-client/pom.xml
@@ -2,11 +2,11 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.openecomp.mso</groupId>
+		<groupId>org.openecomp.so</groupId>
 		<artifactId>adapters</artifactId>
 		<version>1.1.0-SNAPSHOT</version>
 	</parent>
-	<groupId>org.openecomp.mso.adapters</groupId>
+	<groupId>org.openecomp.so.adapters</groupId>
 	<artifactId>mso-network-adapter-async-client</artifactId>
 	<packaging>jar</packaging>
 	<name>mso-network-adapter-async-client</name>
diff --git a/adapters/mso-network-adapter/pom.xml b/adapters/mso-network-adapter/pom.xml
index 207d58a..94e5759 100644
--- a/adapters/mso-network-adapter/pom.xml
+++ b/adapters/mso-network-adapter/pom.xml
@@ -2,11 +2,11 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.openecomp.mso</groupId>
+		<groupId>org.openecomp.so</groupId>
 		<artifactId>adapters</artifactId>
 		<version>1.1.0-SNAPSHOT</version>
 	</parent>
-	<groupId>org.openecomp.mso.adapters</groupId>
+	<groupId>org.openecomp.so.adapters</groupId>
 	<artifactId>mso-network-adapter</artifactId>
 	<packaging>war</packaging>
 	<name>mso-network-adapter</name>
@@ -53,7 +53,7 @@
 						<version>2.2.7</version>
 					</dependency>
 					<dependency>
-						<groupId>org.openecomp.mso.adapters</groupId>
+						<groupId>org.openecomp.so.adapters</groupId>
 						<artifactId>mso-adapter-utils</artifactId>
 						<version>${project.version}</version>
 					</dependency>
@@ -106,17 +106,17 @@
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.mso.adapters</groupId>
+			<groupId>org.openecomp.so.adapters</groupId>
 			<artifactId>mso-adapter-utils</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.mso.adapters</groupId>
+			<groupId>org.openecomp.so.adapters</groupId>
 			<artifactId>mso-network-adapter-async-client</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.mso.adapters</groupId>
+			<groupId>org.openecomp.so.adapters</groupId>
 			<artifactId>mso-adapters-rest-interface</artifactId>
 			<version>${project.version}</version>
 		</dependency>
@@ -145,7 +145,7 @@
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.mso</groupId>
+			<groupId>org.openecomp.so</groupId>
 			<artifactId>status-control</artifactId>
 			<version>${project.version}</version>
 		</dependency>
diff --git a/adapters/mso-requests-db-adapter/pom.xml b/adapters/mso-requests-db-adapter/pom.xml
index c1f7848..c3ed987 100644
--- a/adapters/mso-requests-db-adapter/pom.xml
+++ b/adapters/mso-requests-db-adapter/pom.xml
@@ -2,12 +2,12 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.openecomp.mso</groupId>
+		<groupId>org.openecomp.so</groupId>
 		<artifactId>adapters</artifactId>
 		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 
-	<groupId>org.openecomp.mso.adapters</groupId>
+	<groupId>org.openecomp.so.adapters</groupId>
 	<artifactId>mso-requests-db-adapter</artifactId>
 	<packaging>war</packaging>
 
@@ -15,7 +15,7 @@
 	<dependencies>
 
 		<dependency>
-			<groupId>org.openecomp.mso</groupId>
+			<groupId>org.openecomp.so</groupId>
 			<artifactId>mso-requests-db</artifactId>
 			<version>${project.version}</version>
 		</dependency>
@@ -40,7 +40,7 @@
 			</exclusions>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.mso</groupId>
+			<groupId>org.openecomp.so</groupId>
 			<artifactId>status-control</artifactId>
 			<version>${project.version}</version>
 		</dependency>
@@ -85,7 +85,7 @@
 						<version>2.2.7</version>
 					</dependency>
 					<dependency>
-						<groupId>org.openecomp.mso.adapters</groupId>
+						<groupId>org.openecomp.so.adapters</groupId>
 						<artifactId>mso-adapter-utils</artifactId>
 						<version>${project.version}</version>
 					</dependency>
diff --git a/adapters/mso-sdnc-adapter/pom.xml b/adapters/mso-sdnc-adapter/pom.xml
index f439459..7c1ba1a 100644
--- a/adapters/mso-sdnc-adapter/pom.xml
+++ b/adapters/mso-sdnc-adapter/pom.xml
@@ -2,11 +2,11 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.openecomp.mso</groupId>
+		<groupId>org.openecomp.so</groupId>
 		<artifactId>adapters</artifactId>
 		<version>1.1.0-SNAPSHOT</version>
 	</parent>
-	<groupId>org.openecomp.mso.adapters</groupId>
+	<groupId>org.openecomp.so.adapters</groupId>
 	<artifactId>mso-sdnc-adapter</artifactId>
 	<packaging>war</packaging>
 	<name>mso-sdnc-adapter</name>
@@ -67,7 +67,7 @@
 	</build>
 	<dependencies>
 		<dependency>
-			<groupId>org.openecomp.mso.adapters</groupId>
+			<groupId>org.openecomp.so.adapters</groupId>
 			<artifactId>mso-adapter-utils</artifactId>
 			<version>${project.version}</version>
 
@@ -91,12 +91,12 @@
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.mso</groupId>
+			<groupId>org.openecomp.so</groupId>
 			<artifactId>status-control</artifactId>
 			<version>${project.version}</version>
 		</dependency>
         <dependency>
-            <groupId>org.openecomp.mso.adapters</groupId>
+            <groupId>org.openecomp.so.adapters</groupId>
             <artifactId>mso-adapters-rest-interface</artifactId>
             <version>${project.version}</version>
         </dependency>
diff --git a/adapters/mso-tenant-adapter/pom.xml b/adapters/mso-tenant-adapter/pom.xml
index d57529c..3ceb853 100644
--- a/adapters/mso-tenant-adapter/pom.xml
+++ b/adapters/mso-tenant-adapter/pom.xml
@@ -2,11 +2,11 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.openecomp.mso</groupId>
+		<groupId>org.openecomp.so</groupId>
 		<artifactId>adapters</artifactId>
 		<version>1.1.0-SNAPSHOT</version>
 	</parent>
-	<groupId>org.openecomp.mso.adapters</groupId>
+	<groupId>org.openecomp.so.adapters</groupId>
 	<artifactId>mso-tenant-adapter</artifactId>
 	<packaging>war</packaging>
 	<name>mso-tenant-adapter</name>
@@ -72,7 +72,7 @@
 						<version>2.2.7</version>
 					</dependency>
 					<dependency>
-						<groupId>org.openecomp.mso.adapters</groupId>
+						<groupId>org.openecomp.so.adapters</groupId>
 						<artifactId>mso-adapter-utils</artifactId>
 						<version>${project.version}</version>
 					</dependency>
@@ -119,12 +119,12 @@
 	</build>
 	<dependencies>
 		<dependency>
-			<groupId>org.openecomp.mso.adapters</groupId>
+			<groupId>org.openecomp.so.adapters</groupId>
 			<artifactId>mso-adapter-utils</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.mso.adapters</groupId>
+			<groupId>org.openecomp.so.adapters</groupId>
 			<artifactId>mso-adapters-rest-interface</artifactId>
 			<version>${project.version}</version>
 		</dependency>
@@ -147,7 +147,7 @@
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.mso</groupId>
+			<groupId>org.openecomp.so</groupId>
 			<artifactId>status-control</artifactId>
 			<version>${project.version}</version>
 		</dependency>
diff --git a/adapters/mso-vnf-adapter-async-client/pom.xml b/adapters/mso-vnf-adapter-async-client/pom.xml
index 27e555b..c42c002 100644
--- a/adapters/mso-vnf-adapter-async-client/pom.xml
+++ b/adapters/mso-vnf-adapter-async-client/pom.xml
@@ -2,11 +2,11 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.openecomp.mso</groupId>
+		<groupId>org.openecomp.so</groupId>
 		<artifactId>adapters</artifactId>
 		<version>1.1.0-SNAPSHOT</version>
 	</parent>
-	<groupId>org.openecomp.mso.adapters</groupId>
+	<groupId>org.openecomp.so.adapters</groupId>
 	<artifactId>mso-vnf-adapter-async-client</artifactId>
 	<packaging>jar</packaging>
 	<name>mso-vnf-adapter-async-client</name>
diff --git a/adapters/mso-vnf-adapter/pom.xml b/adapters/mso-vnf-adapter/pom.xml
index ced5c3a..ba0c87a 100644
--- a/adapters/mso-vnf-adapter/pom.xml
+++ b/adapters/mso-vnf-adapter/pom.xml
@@ -2,11 +2,11 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.openecomp.mso</groupId>
+		<groupId>org.openecomp.so</groupId>
 		<artifactId>adapters</artifactId>
 		<version>1.1.0-SNAPSHOT</version>
 	</parent>
-	<groupId>org.openecomp.mso.adapters</groupId>
+	<groupId>org.openecomp.so.adapters</groupId>
 	<artifactId>mso-vnf-adapter</artifactId>
 	<packaging>war</packaging>
 	<name>mso-vnf-adapter</name>
@@ -56,7 +56,7 @@
 				</executions>
 				<dependencies>
 					<dependency>
-						<groupId>org.openecomp.mso.adapters</groupId>
+						<groupId>org.openecomp.so.adapters</groupId>
 						<artifactId>mso-adapter-utils</artifactId>
 						<version>${project.version}</version>
 					</dependency>
@@ -107,17 +107,17 @@
 	</build>
 	<dependencies>
 		<dependency>
-			<groupId>org.openecomp.mso.adapters</groupId>
+			<groupId>org.openecomp.so.adapters</groupId>
 			<artifactId>mso-adapter-utils</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.mso.adapters</groupId>
+			<groupId>org.openecomp.so.adapters</groupId>
 			<artifactId>mso-adapters-rest-interface</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.mso.adapters</groupId>
+			<groupId>org.openecomp.so.adapters</groupId>
 			<artifactId>mso-vnf-adapter-async-client</artifactId>
 			<version>${project.version}</version>
 		</dependency>
@@ -140,13 +140,13 @@
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.mso</groupId>
+			<groupId>org.openecomp.so</groupId>
 			<artifactId>status-control</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 
 		<!-- <dependency> -->
-		<!-- <groupId>org.openecomp.mso</groupId> -->
+		<!-- <groupId>org.openecomp.so</groupId> -->
 		<!-- <artifactId>mso-catalog-db</artifactId> -->
 		<!-- <version>${project.version}</version> -->
 		<!-- </dependency> -->
diff --git a/adapters/mso-workflow-message-adapter/pom.xml b/adapters/mso-workflow-message-adapter/pom.xml
index bde619f..5ee3fbf 100644
--- a/adapters/mso-workflow-message-adapter/pom.xml
+++ b/adapters/mso-workflow-message-adapter/pom.xml
@@ -2,11 +2,11 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.openecomp.mso</groupId>
+		<groupId>org.openecomp.so</groupId>
 		<artifactId>adapters</artifactId>
 		<version>1.1.0-SNAPSHOT</version>
 	</parent>
-	<groupId>org.openecomp.mso.adapters</groupId>
+	<groupId>org.openecomp.so.adapters</groupId>
 	<artifactId>mso-workflow-message-adapter</artifactId>
 	<packaging>war</packaging>
 	<name>mso-workflow-message-adapter</name>
@@ -29,12 +29,12 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>org.openecomp.mso.adapters</groupId>
+			<groupId>org.openecomp.so.adapters</groupId>
 			<artifactId>mso-adapter-utils</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.mso.adapters</groupId>
+			<groupId>org.openecomp.so.adapters</groupId>
 			<artifactId>mso-adapters-rest-interface</artifactId>
 			<version>${project.version}</version>
 		</dependency>
@@ -62,7 +62,7 @@
 			<version>4.5.2</version>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.mso</groupId>
+			<groupId>org.openecomp.so</groupId>
 			<artifactId>status-control</artifactId>
 			<version>${project.version}</version>
 		</dependency>
diff --git a/adapters/pom.xml b/adapters/pom.xml
index a96b04a..b3d607c 100644
--- a/adapters/pom.xml
+++ b/adapters/pom.xml
@@ -3,11 +3,11 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.openecomp</groupId>
-		<artifactId>mso</artifactId>
+		<artifactId>so</artifactId>
 		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 
-	<groupId>org.openecomp.mso</groupId>
+	<groupId>org.openecomp.so</groupId>
 	<artifactId>adapters</artifactId>
 	<name>MSO Adapters</name>
 	<description>Adapters for MSO</description>
diff --git a/asdc-controller/pom.xml b/asdc-controller/pom.xml
index e0a620f..830cfd1 100644
--- a/asdc-controller/pom.xml
+++ b/asdc-controller/pom.xml
@@ -3,11 +3,11 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.openecomp</groupId>
-		<artifactId>mso</artifactId>
+		<artifactId>so</artifactId>
 		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 
-	<groupId>org.openecomp.mso</groupId>
+	<groupId>org.openecomp.so</groupId>
 	<artifactId>asdc-controller</artifactId>
 	<name>asdc-controller</name>
 	<description>ASDC CLient and Controller</description>
@@ -47,7 +47,7 @@
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.mso</groupId>
+			<groupId>org.openecomp.so</groupId>
 			<artifactId>mso-catalog-db</artifactId>
 			<version>${project.version}</version>
 		</dependency>
@@ -91,7 +91,7 @@
 		</dependency>
 
 		<dependency>
-			<groupId>org.openecomp.mso</groupId>
+			<groupId>org.openecomp.so</groupId>
 			<artifactId>common</artifactId>
 			<version>${project.version}</version>
 		</dependency>
@@ -109,7 +109,7 @@
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.mso</groupId>
+			<groupId>org.openecomp.so</groupId>
 			<artifactId>status-control</artifactId>
 			<version>${project.version}</version>
 		</dependency>
diff --git a/bpmn/MSOCockpit/pom.xml b/bpmn/MSOCockpit/pom.xml
index 165c528..5fa9e7e 100644
--- a/bpmn/MSOCockpit/pom.xml
+++ b/bpmn/MSOCockpit/pom.xml
@@ -1,13 +1,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<parent>
-		<groupId>org.openecomp.mso</groupId>
+		<groupId>org.openecomp.so</groupId>
 		<artifactId>bpmn</artifactId>
 		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.openecomp.mso</groupId>
+	<groupId>org.openecomp.so</groupId>
 	<artifactId>MSOCockpit</artifactId>
 	<packaging>pom</packaging>
 	<name>MSOCockpit</name>
@@ -47,17 +47,17 @@
 		</dependency>
 		
 		<dependency>
-			<groupId>org.openecomp.mso</groupId>
+			<groupId>org.openecomp.so</groupId>
 			<artifactId>common</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.mso</groupId>
+			<groupId>org.openecomp.so</groupId>
 			<artifactId>cockpit-urnmap-plugin</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.mso</groupId>
+			<groupId>org.openecomp.so</groupId>
 			<artifactId>MSOCoreBPMN</artifactId>
 			<version>${project.version}</version>
 		</dependency>
diff --git a/bpmn/MSOCommonBPMN/pom.xml b/bpmn/MSOCommonBPMN/pom.xml
index e35c874..3452fe3 100644
--- a/bpmn/MSOCommonBPMN/pom.xml
+++ b/bpmn/MSOCommonBPMN/pom.xml
@@ -3,7 +3,7 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.openecomp.mso</groupId>
+		<groupId>org.openecomp.so</groupId>
     	<artifactId>bpmn</artifactId>
     	<version>1.1.0-SNAPSHOT</version>
   	</parent>
@@ -296,13 +296,13 @@
 			<version>3.4</version>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.mso</groupId>
+			<groupId>org.openecomp.so</groupId>
 			<artifactId>MSOCoreBPMN</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<!-- unit test utilities -->
-			<groupId>org.openecomp.mso</groupId>
+			<groupId>org.openecomp.so</groupId>
 			<artifactId>MSOCoreBPMN</artifactId>
 			<version>${project.version}</version>
 			<classifier>tests</classifier>
@@ -320,14 +320,14 @@
     	<version>4.3.2.RELEASE</version>
 	</dependency>
 	<dependency>
-		<groupId>org.openecomp.mso</groupId>
+		<groupId>org.openecomp.so</groupId>
 		<artifactId>MSOMockServer</artifactId>
 		<version>${project.version}</version>
 		<classifier>classes</classifier>
 		<scope>test</scope>
 	</dependency>
 	<dependency>
-	  <groupId>org.openecomp.mso</groupId>
+	  <groupId>org.openecomp.so</groupId>
   	  <artifactId>MSORESTClient</artifactId>
   	  <version>${project.version}</version>
 	</dependency>
diff --git a/bpmn/MSOCoreBPMN/pom.xml b/bpmn/MSOCoreBPMN/pom.xml
index bdc2671..29ea1b6 100644
--- a/bpmn/MSOCoreBPMN/pom.xml
+++ b/bpmn/MSOCoreBPMN/pom.xml
@@ -2,12 +2,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <groupId>org.openecomp.mso</groupId>
+        <groupId>org.openecomp.so</groupId>
         <artifactId>bpmn</artifactId>
         <version>1.1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.openecomp.mso</groupId>
+    <groupId>org.openecomp.so</groupId>
     <artifactId>MSOCoreBPMN</artifactId>
     <packaging>jar</packaging>
 
@@ -134,7 +134,7 @@
             <artifactId>Saxon-HE</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.openecomp.mso</groupId>
+            <groupId>org.openecomp.so</groupId>
             <artifactId>common</artifactId>
             <version>${project.version}</version>
         </dependency>
@@ -169,7 +169,7 @@
             <version>1.6</version>
         </dependency>
         <dependency>
-            <groupId>org.openecomp.mso</groupId>
+            <groupId>org.openecomp.so</groupId>
             <artifactId>status-control</artifactId>
             <version>${project.version}</version>
         </dependency>
diff --git a/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/PropertyConfigurationTest.java b/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/PropertyConfigurationTest.java
index fa0f8d8..50b9a53 100644
--- a/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/PropertyConfigurationTest.java
+++ b/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/PropertyConfigurationTest.java
@@ -105,30 +105,4 @@
 		Assert.assertEquals("testValue", props.get("testKey"));
 		props.put("newKey", "newvalue");
 	}
-	
-	@Test
-	public void testNotAllowedPropertyReloading() throws IOException {
-		Path msoConfigPath = Paths.get(System.getProperty("mso.config.path"));
-		Path backupPropFilePath = msoConfigPath.resolve("backup-" + PropertyConfiguration.MSO_BPMN_PROPERTIES);
-
-		try {
-			// Create a new file... a backup file
-			Files.createFile(backupPropFilePath);
-
-			// Load properties
-			PropertyConfiguration propertyConfiguration = PropertyConfiguration.getInstance();
-			Map<String,String> props = propertyConfiguration.getProperties(PropertyConfiguration.MSO_BPMN_PROPERTIES);
-			Assert.assertNotNull(props);
-			Assert.assertEquals("testValue", props.get("testKey"));
-
-			// Update the backup file
-			Path bpmnPropertiesSourcePath = Paths.get("src", "test", "resources", "mso.bpmn.properties");
-			Files.copy(bpmnPropertiesSourcePath, backupPropFilePath, StandardCopyOption.REPLACE_EXISTING);
-
-			// Cache size should remain the same
-			Assert.assertEquals(1, PropertyConfiguration.getInstance().cacheSize());
-		} finally {
-			backupPropFilePath.toFile().delete();
-		}
-	}
 }
diff --git a/bpmn/MSOInfrastructureBPMN/pom.xml b/bpmn/MSOInfrastructureBPMN/pom.xml
index ca9ce57..5c0eff9 100644
--- a/bpmn/MSOInfrastructureBPMN/pom.xml
+++ b/bpmn/MSOInfrastructureBPMN/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<parent>
-		<groupId>org.openecomp.mso</groupId>
+		<groupId>org.openecomp.so</groupId>
 		<artifactId>bpmn</artifactId>
 		<version>1.1.0-SNAPSHOT</version>
 	</parent>
@@ -282,17 +282,17 @@
 			<version>3.4</version>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.mso</groupId>
+			<groupId>org.openecomp.so</groupId>
 			<artifactId>MSOCoreBPMN</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.mso</groupId>
+			<groupId>org.openecomp.so</groupId>
 			<artifactId>MSOCommonBPMN</artifactId>
 			<version>${project.version}</version>
 	    </dependency>
 		<dependency>
-			<groupId>org.openecomp.mso</groupId>
+			<groupId>org.openecomp.so</groupId>
 			<artifactId>MSOCommonBPMN</artifactId>
 			<version>${project.version}</version>
 			<classifier>tests</classifier>
@@ -300,7 +300,7 @@
 		</dependency>
 		<dependency>
 			<!-- unit test utilities -->
-			<groupId>org.openecomp.mso</groupId>
+			<groupId>org.openecomp.so</groupId>
 			<artifactId>MSOCoreBPMN</artifactId>
 			<version>${project.version}</version>
 			<classifier>tests</classifier>
@@ -318,14 +318,14 @@
     	<version>4.3.2.RELEASE</version>
 	</dependency>
 	<dependency>
-		<groupId>org.openecomp.mso</groupId>
+		<groupId>org.openecomp.so</groupId>
 		<artifactId>MSOMockServer</artifactId>
 		<version>${project.version}</version>
 		<scope>test</scope>
 		<classifier>classes</classifier>
 	</dependency>
 	<dependency>
-	  <groupId>org.openecomp.mso</groupId>
+	  <groupId>org.openecomp.so</groupId>
   	  <artifactId>MSORESTClient</artifactId>
   	  <version>${project.version}</version>
 	</dependency>
diff --git a/bpmn/MSOMockServer/pom.xml b/bpmn/MSOMockServer/pom.xml
index 268f392..34f7a23 100644
--- a/bpmn/MSOMockServer/pom.xml
+++ b/bpmn/MSOMockServer/pom.xml
@@ -1,12 +1,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<parent>
-        <groupId>org.openecomp.mso</groupId>
+        <groupId>org.openecomp.so</groupId>
         <artifactId>bpmn</artifactId>
 		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.openecomp.mso</groupId>
+	<groupId>org.openecomp.so</groupId>
 	<artifactId>MSOMockServer</artifactId>
 	<packaging>war</packaging>
 
diff --git a/bpmn/MSORESTClient/pom.xml b/bpmn/MSORESTClient/pom.xml
index 2c89908..e17a58f 100644
--- a/bpmn/MSORESTClient/pom.xml
+++ b/bpmn/MSORESTClient/pom.xml
@@ -4,12 +4,12 @@
 	<modelVersion>4.0.0</modelVersion>
 	
 	<parent>
-		<groupId>org.openecomp.mso</groupId>
+		<groupId>org.openecomp.so</groupId>
         <artifactId>bpmn</artifactId>
 		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 	
-	<groupId>org.openecomp.mso</groupId>
+	<groupId>org.openecomp.so</groupId>
 	<artifactId>MSORESTClient</artifactId>
 	
 	<packaging>jar</packaging>
diff --git a/bpmn/MSOURN-plugin/pom.xml b/bpmn/MSOURN-plugin/pom.xml
index ac75b53..a8b198d 100644
--- a/bpmn/MSOURN-plugin/pom.xml
+++ b/bpmn/MSOURN-plugin/pom.xml
@@ -3,12 +3,12 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.openecomp.mso</groupId>
+		<groupId>org.openecomp.so</groupId>
 		<artifactId>bpmn</artifactId>
 		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 
-	<groupId>org.openecomp.mso</groupId>
+	<groupId>org.openecomp.so</groupId>
 	<artifactId>cockpit-urnmap-plugin</artifactId>
 
 	<packaging>jar</packaging>
@@ -56,7 +56,7 @@
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.mso</groupId>
+			<groupId>org.openecomp.so</groupId>
 			<artifactId>common</artifactId>
 			<version>${project.version}</version>
 			<scope>compile</scope>
diff --git a/bpmn/pom.xml b/bpmn/pom.xml
index ed062ba..c7b914a 100644
--- a/bpmn/pom.xml
+++ b/bpmn/pom.xml
@@ -4,11 +4,11 @@
 
 	<parent>
 		<groupId>org.openecomp</groupId>
-		<artifactId>mso</artifactId>
+		<artifactId>so</artifactId>
 		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 
-	<groupId>org.openecomp.mso</groupId>
+	<groupId>org.openecomp.so</groupId>
 	<artifactId>bpmn</artifactId>
 	<name>BPMN Subsystem</name>
 	<description>BPMN Subsystem for MSO</description>
diff --git a/common/pom.xml b/common/pom.xml
index 3bacaf0..6427afe 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -3,11 +3,11 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.openecomp</groupId>
-        <artifactId>mso</artifactId>
+        <artifactId>so</artifactId>
         <version>1.1.0-SNAPSHOT</version>
     </parent>
 
-    <groupId>org.openecomp.mso</groupId>
+    <groupId>org.openecomp.so</groupId>
     <artifactId>common</artifactId>
     <name>MSO Common classes</name>
     <description>MSO Common classes:- Logger</description>
@@ -205,7 +205,7 @@
 			</executions>
 			<dependencies>
 				<dependency>
-					<groupId>org.openecomp.mso</groupId>
+					<groupId>org.openecomp.so</groupId>
 					<artifactId>common</artifactId>
 					<version>${project.version}</version>
 				</dependency>
diff --git a/mso-api-handlers/mso-api-handler-common/pom.xml b/mso-api-handlers/mso-api-handler-common/pom.xml
index e11fbb8..9159bb2 100644
--- a/mso-api-handlers/mso-api-handler-common/pom.xml
+++ b/mso-api-handlers/mso-api-handler-common/pom.xml
@@ -3,13 +3,13 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.openecomp.mso</groupId>
+		<groupId>org.openecomp.so</groupId>
 		<artifactId>mso-api-handlers</artifactId>
 		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 
 
-	<groupId>org.openecomp.mso</groupId>
+	<groupId>org.openecomp.so</groupId>
 	<artifactId>mso-api-handler-common</artifactId>
 
 	<name>ECOMP MSO API Handler common</name>
@@ -73,13 +73,13 @@
 		</dependency>
 
 		<dependency>
-			<groupId>org.openecomp.mso</groupId>
+			<groupId>org.openecomp.so</groupId>
 			<artifactId>mso-catalog-db</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 
 		<dependency>
-			<groupId>org.openecomp.mso</groupId>
+			<groupId>org.openecomp.so</groupId>
 			<artifactId>mso-requests-db</artifactId>
 			<version>${project.version}</version>
 		</dependency>
diff --git a/mso-api-handlers/mso-api-handler-infra/pom.xml b/mso-api-handlers/mso-api-handler-infra/pom.xml
index 71f8249..2eb5f1e 100644
--- a/mso-api-handlers/mso-api-handler-infra/pom.xml
+++ b/mso-api-handlers/mso-api-handler-infra/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.openecomp.mso</groupId>
+		<groupId>org.openecomp.so</groupId>
 		<artifactId>mso-api-handlers</artifactId>
 		<version>1.1.0-SNAPSHOT</version>
 	</parent>
@@ -68,22 +68,22 @@
 		</dependency>
 
 		<dependency>
- 			<groupId>org.openecomp.mso</groupId>
+ 			<groupId>org.openecomp.so</groupId>
  			<artifactId>mso-catalog-db</artifactId>
  			<version>${project.version}</version>
  		</dependency>
  		<dependency>
-			<groupId>org.openecomp.mso</groupId>
+			<groupId>org.openecomp.so</groupId>
 			<artifactId>mso-requests-db</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.mso</groupId>
+			<groupId>org.openecomp.so</groupId>
 			<artifactId>mso-api-handler-common</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.mso</groupId>
+			<groupId>org.openecomp.so</groupId>
 			<artifactId>status-control</artifactId>
 			<version>${project.version}</version>
 		</dependency>
diff --git a/mso-api-handlers/mso-requests-db/pom.xml b/mso-api-handlers/mso-requests-db/pom.xml
index 63520f0..ef69e8a 100644
--- a/mso-api-handlers/mso-requests-db/pom.xml
+++ b/mso-api-handlers/mso-requests-db/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
  	<parent>
-		<groupId>org.openecomp.mso</groupId>
+		<groupId>org.openecomp.so</groupId>
 		<artifactId>mso-api-handlers</artifactId>
 		<version>1.1.0-SNAPSHOT</version>
 	</parent>
@@ -97,7 +97,7 @@
 			<version>1.0.0.Final</version>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.mso</groupId>
+			<groupId>org.openecomp.so</groupId>
 			<artifactId>common</artifactId>
 			<version>${project.version}</version>
 		</dependency>
diff --git a/mso-api-handlers/pom.xml b/mso-api-handlers/pom.xml
index 23f7be3..ab6d726 100644
--- a/mso-api-handlers/pom.xml
+++ b/mso-api-handlers/pom.xml
@@ -3,11 +3,11 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.openecomp</groupId>
-		<artifactId>mso</artifactId>
+		<artifactId>so</artifactId>
 		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 
-	<groupId>org.openecomp.mso</groupId>
+	<groupId>org.openecomp.so</groupId>
 	<artifactId>mso-api-handlers</artifactId>
 	<name>API Handler</name>
 	<description>API Handler for MSO</description>
diff --git a/mso-catalog-db/pom.xml b/mso-catalog-db/pom.xml
index 38af3ec..4b3b841 100644
--- a/mso-catalog-db/pom.xml
+++ b/mso-catalog-db/pom.xml
@@ -3,11 +3,11 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.openecomp</groupId>
-		<artifactId>mso</artifactId>
+		<artifactId>so</artifactId>
 		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 
-	<groupId>org.openecomp.mso</groupId>
+	<groupId>org.openecomp.so</groupId>
 	<artifactId>mso-catalog-db</artifactId>
 	<name>mso-catalog-db</name>
 	<description>MSO Catalog Database definition and Hibernate objects</description>
@@ -164,7 +164,7 @@
              <scope>test</scope>
         </dependency>
 		<dependency>
-			<groupId>org.openecomp.mso</groupId>
+			<groupId>org.openecomp.so</groupId>
 			<artifactId>common</artifactId>
 			<version>${project.version}</version>
 		</dependency>
diff --git a/packages/arquillian-unit-tests/pom.xml b/packages/arquillian-unit-tests/pom.xml
index 9ec7a0a..a557f56 100644
--- a/packages/arquillian-unit-tests/pom.xml
+++ b/packages/arquillian-unit-tests/pom.xml
@@ -2,12 +2,12 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.openecomp.mso</groupId>
+		<groupId>org.openecomp.so</groupId>
 		<artifactId>packages</artifactId>
 		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 
-	<groupId>org.openecomp.mso.packages</groupId>
+	<groupId>org.openecomp.so.packages</groupId>
 	<name>Arquillian Unit Testing on MSO</name>
 	<artifactId>arquillian-unit-tests</artifactId>
 
@@ -225,7 +225,7 @@
 		</dependency>
 
 		<dependency>
-			<groupId>org.openecomp.mso</groupId>
+			<groupId>org.openecomp.so</groupId>
 			<artifactId>asdc-controller</artifactId>
 			<version>${project.version}</version>
 			<scope>test</scope>
@@ -233,7 +233,7 @@
 		</dependency>
 
 		<!-- <dependency>
-            <groupId>org.openecomp.mso.adapters</groupId>
+            <groupId>org.openecomp.so.adapters</groupId>
             <artifactId>mso-appc-adapter</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
@@ -255,7 +255,7 @@
 		</dependency>
 
 		<dependency>
-			<groupId>org.openecomp.mso</groupId>
+			<groupId>org.openecomp.so</groupId>
 			<artifactId>mso-catalog-db</artifactId>
 			<version>${project.version}</version>
 			<scope>test</scope>
diff --git a/packages/deliveries/pom.xml b/packages/deliveries/pom.xml
index a67e0a3..e083a28 100644
--- a/packages/deliveries/pom.xml
+++ b/packages/deliveries/pom.xml
@@ -2,12 +2,12 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.openecomp.mso</groupId>
+		<groupId>org.openecomp.so</groupId>
 		<artifactId>packages</artifactId>
 		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 
-	<groupId>org.openecomp.mso.packages</groupId>
+	<groupId>org.openecomp.so.packages</groupId>
 	<artifactId>mso-deliveries</artifactId>
 	<packaging>pom</packaging>
 
diff --git a/packages/docker/pom.xml b/packages/docker/pom.xml
index 5f271a9..ab5a353 100644
--- a/packages/docker/pom.xml
+++ b/packages/docker/pom.xml
@@ -3,13 +3,13 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.openecomp.mso</groupId>
+		<groupId>org.openecomp.so</groupId>
 		<artifactId>packages</artifactId>
 		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 
 	<packaging>pom</packaging>
-	<groupId>org.openecomp.mso</groupId>
+	<groupId>org.openecomp.so</groupId>
 	<artifactId>docker</artifactId>
 
 	<name>MSO Docker Deliveries</name>
diff --git a/packages/pom.xml b/packages/pom.xml
index 92d8c3e..34863d6 100644
--- a/packages/pom.xml
+++ b/packages/pom.xml
@@ -2,12 +2,12 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>mso</artifactId>
+		<artifactId>so</artifactId>
 		<groupId>org.openecomp</groupId>
 		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 
-	<groupId>org.openecomp.mso</groupId>
+	<groupId>org.openecomp.so</groupId>
 	<artifactId>packages</artifactId>
 	<packaging>pom</packaging>
 	<name>MSO Packages</name>
diff --git a/pom.xml b/pom.xml
index ced3cdd..5b7ab42 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
 	 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.openecomp</groupId>
-	<artifactId>mso</artifactId>
+	<artifactId>so</artifactId>
 	<packaging>pom</packaging>
 	<version>1.1.0-SNAPSHOT</version>
 	<name>MSO main project</name>
@@ -38,7 +38,7 @@
 		<org.apache.maven.user-settings></org.apache.maven.user-settings>
 		<!-- this is used for Chef mso-code cookbook -->
 		<swm.version>2.19.3-1</swm.version>
-		<openstack.version>1.1.0</openstack.version>
+		<openstack.version>1.1.0-SNAPSHOT</openstack.version>
 		<evosuiteVersion>1.0.4-alpha2</evosuiteVersion>
 		<nexusproxy>https://nexus.onap.org</nexusproxy>
 		<snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
diff --git a/status-control/pom.xml b/status-control/pom.xml
index 212d5ee..37ae251 100644
--- a/status-control/pom.xml
+++ b/status-control/pom.xml
@@ -5,11 +5,11 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.openecomp</groupId>
-        <artifactId>mso</artifactId>
+        <artifactId>so</artifactId>
         <version>1.1.0-SNAPSHOT</version>
     </parent>
 
-    <groupId>org.openecomp.mso</groupId>
+    <groupId>org.openecomp.so</groupId>
     <artifactId>status-control</artifactId>
     <name>MSO Status Control module</name>
     <description>Contains classes to update and query the MSO status per site</description>
@@ -22,17 +22,17 @@
              <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.openecomp.mso</groupId>
+            <groupId>org.openecomp.so</groupId>
             <artifactId>common</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.openecomp.mso</groupId>
+            <groupId>org.openecomp.so</groupId>
             <artifactId>mso-catalog-db</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.openecomp.mso</groupId>
+            <groupId>org.openecomp.so</groupId>
             <artifactId>mso-requests-db</artifactId>
             <version>${project.version}</version>
         </dependency>