diff --git a/sdnc-a1-controller/northbound/README.md b/sdnc-a1-controller/northbound/README.md
index f5ae129..5b9fdfb 100644
--- a/sdnc-a1-controller/northbound/README.md
+++ b/sdnc-a1-controller/northbound/README.md
@@ -1,4 +1,4 @@
-This source repository contains the code for the SDN Controller northbound interface adaptors.
+This source repository contains the code for the SDN-A1 Controller northbound interface adaptors.
 To compile this code:
 
 1. Make sure your local Maven settings file ($HOME/.m2/settings.xml) contains references to the OpenECOMP repositories and OpenDaylight repositories.  See example-settings.xml for an example.
diff --git a/sdnc-a1-controller/northbound/features/features-sdnc-northbound/pom.xml b/sdnc-a1-controller/northbound/features/features-sdnc-a1-northbound/pom.xml
similarity index 80%
rename from sdnc-a1-controller/northbound/features/features-sdnc-northbound/pom.xml
rename to sdnc-a1-controller/northbound/features/features-sdnc-a1-northbound/pom.xml
index 6ab5343..49737bf 100644
--- a/sdnc-a1-controller/northbound/features/features-sdnc-northbound/pom.xml
+++ b/sdnc-a1-controller/northbound/features/features-sdnc-a1-northbound/pom.xml
@@ -17,17 +17,17 @@
         <relativePath/>
     </parent>
 
-    <groupId>org.onap.sdnc.northbound</groupId>
-    <artifactId>features-sdnc-northbound</artifactId>
+    <groupId>org.o-ran-sc.nonrtric.sdnc-a1.northbound</groupId>
+    <artifactId>features-sdnc-a1-northbound</artifactId>
     <version>1.7.3-SNAPSHOT</version>
     <packaging>feature</packaging>
 
-    <name>sdnc-northbound :: features :: ${project.artifactId}</name>
+    <name>sdnc-a1-northbound :: features :: ${project.artifactId}</name>
 
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>sdnc-northbound-all</artifactId>
+            <artifactId>sdnc-a1-northbound-all</artifactId>
             <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
diff --git a/sdnc-a1-controller/northbound/features/installer/pom.xml b/sdnc-a1-controller/northbound/features/installer/pom.xml
index ea67490..d2e7dcc 100755
--- a/sdnc-a1-controller/northbound/features/installer/pom.xml
+++ b/sdnc-a1-controller/northbound/features/installer/pom.xml
@@ -9,24 +9,24 @@
 		<relativePath/>
 	</parent>
 
-	<groupId>org.onap.sdnc.northbound</groupId>
-	<artifactId>sdnc-northbound-features-installer</artifactId>
+	<groupId>org.o-ran-sc.nonrtric.sdnc-a1.northbound</groupId>
+	<artifactId>sdnc-a1-northbound-features-installer</artifactId>
 	<version>1.7.3-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
-	<name>sdnc-northbound :: features :: ${project.artifactId}</name>
+	<name>sdnc-a1-northbound :: features :: ${project.artifactId}</name>
 
 	<properties>
-		<application.name>sdnc-northbound-all</application.name>
+		<application.name>sdnc-a1-northbound-all</application.name>
 		<features.boot>${application.name}</features.boot>
-		<features.repositories>mvn:org.onap.sdnc.northbound/${features.boot}/${project.version}/xml/features</features.repositories>
+		<features.repositories>mvn:org.o-ran-sc.nonrtric.sdnc-a1.northbound/${features.boot}/${project.version}/xml/features</features.repositories>
 		<include.transitive.dependencies>false</include.transitive.dependencies>
 	</properties>
 
 	<dependencies>
 
 		<dependency>
-			<groupId>org.onap.sdnc.northbound</groupId>
+			<groupId>org.o-ran-sc.nonrtric.sdnc-a1.northbound</groupId>
 			<artifactId>${application.name}</artifactId>
 			<version>${project.version}</version>
 			<type>xml</type>
@@ -98,7 +98,7 @@
 							<useRepositoryLayout>true</useRepositoryLayout>
 							<addParentPoms>false</addParentPoms>
 							<copyPom>false</copyPom>
-                             <includeGroupIds>org.onap.sdnc.northbound</includeGroupIds>
+                             <includeGroupIds>org.o-ran-sc.nonrtric.sdnc-a1.northbound</includeGroupIds>
 							<scope>provided</scope>
 						</configuration>
 					</execution>
diff --git a/sdnc-a1-controller/northbound/features/pom.xml b/sdnc-a1-controller/northbound/features/pom.xml
index 37336a2..43302a5 100755
--- a/sdnc-a1-controller/northbound/features/pom.xml
+++ b/sdnc-a1-controller/northbound/features/pom.xml
@@ -9,16 +9,16 @@
 		<relativePath/>
 	</parent>
 
-	<groupId>org.onap.sdnc.northbound</groupId>
+	<groupId>org.o-ran-sc.nonrtric.sdnc-a1.northbound</groupId>
 	<artifactId>sdnc-northbound-feature-aggregator</artifactId>
 	<version>1.7.3-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
-	<name>sdnc-northbound :: features</name>
+	<name>sdnc-a1-northbound :: features</name>
 
 	<modules>
-        <module>sdnc-northbound-all</module>
-        <module>features-sdnc-northbound</module>
+        <module>sdnc-a1-northbound-all</module>
+        <module>features-sdnc-a1-northbound</module>
         <module>installer</module>
     </modules>
 </project>
diff --git a/sdnc-a1-controller/northbound/features/sdnc-northbound-all/pom.xml b/sdnc-a1-controller/northbound/features/sdnc-a1-northbound-all/pom.xml
similarity index 88%
rename from sdnc-a1-controller/northbound/features/sdnc-northbound-all/pom.xml
rename to sdnc-a1-controller/northbound/features/sdnc-a1-northbound-all/pom.xml
index 5c5c9cd..b9a8332 100644
--- a/sdnc-a1-controller/northbound/features/sdnc-northbound-all/pom.xml
+++ b/sdnc-a1-controller/northbound/features/sdnc-a1-northbound-all/pom.xml
@@ -17,12 +17,12 @@
 		<relativePath/>
 	</parent>
 
-	<groupId>org.onap.sdnc.northbound</groupId>
-	<artifactId>sdnc-northbound-all</artifactId>
+	<groupId>org.o-ran-sc.nonrtric.sdnc-a1.northbound</groupId>
+	<artifactId>sdnc-a1-northbound-all</artifactId>
 	<version>1.7.3-SNAPSHOT</version>
 	<packaging>feature</packaging>
 
-	<name>sdnc-northbound :: features :: ${project.artifactId}</name>
+	<name>sdnc-a1-northbound :: features :: ${project.artifactId}</name>
 	<dependencyManagement>
 	    <dependencies>
 	    	<dependency>
diff --git a/sdnc-a1-controller/northbound/nonrt-ric-api/features/features-nonrt-ric-api/pom.xml b/sdnc-a1-controller/northbound/nonrt-ric-api/features/features-nonrt-ric-api/pom.xml
index 8a2a516..10b5d43 100644
--- a/sdnc-a1-controller/northbound/nonrt-ric-api/features/features-nonrt-ric-api/pom.xml
+++ b/sdnc-a1-controller/northbound/nonrt-ric-api/features/features-nonrt-ric-api/pom.xml
@@ -28,12 +28,12 @@
 		<relativePath/>
 	</parent>
 
-	<groupId>org.onap.sdnc.northbound</groupId>
+	<groupId>org.o-ran-sc.nonrtric.sdnc-a1.northbound</groupId>
 	<artifactId>features-nonrt-ric-api</artifactId>
 	<version>1.7.3-SNAPSHOT</version>
 	<packaging>feature</packaging>
 
-	<name>sdnc-northbound :: nonrt-ric-api :: ${project.artifactId}</name>
+	<name>sdnc-a1-northbound :: nonrt-ric-api :: ${project.artifactId}</name>
 
 	<dependencies>
 		<dependency>
diff --git a/sdnc-a1-controller/northbound/nonrt-ric-api/features/pom.xml b/sdnc-a1-controller/northbound/nonrt-ric-api/features/pom.xml
index 6bc57cd..a83de20 100644
--- a/sdnc-a1-controller/northbound/nonrt-ric-api/features/pom.xml
+++ b/sdnc-a1-controller/northbound/nonrt-ric-api/features/pom.xml
@@ -28,12 +28,12 @@
         <relativePath/>
     </parent>
 
-    <groupId>org.onap.sdnc.northbound</groupId>
+    <groupId>org.o-ran-sc.nonrtric.sdnc-a1.northbound</groupId>
     <artifactId>nonrt-ric-api-features</artifactId>
     <version>1.7.3-SNAPSHOT</version>
     <packaging>pom</packaging>
 
-    <name>sdnc-northbound :: nonrt-ric-api :: ${project.artifactId}</name>
+    <name>sdnc-a1-northbound :: nonrt-ric-api :: ${project.artifactId}</name>
 
     <modules>
         <module>sdnc-nonrt-ric-api</module>
diff --git a/sdnc-a1-controller/northbound/nonrt-ric-api/features/sdnc-nonrt-ric-api/pom.xml b/sdnc-a1-controller/northbound/nonrt-ric-api/features/sdnc-nonrt-ric-api/pom.xml
index d108043..f39d9ca 100644
--- a/sdnc-a1-controller/northbound/nonrt-ric-api/features/sdnc-nonrt-ric-api/pom.xml
+++ b/sdnc-a1-controller/northbound/nonrt-ric-api/features/sdnc-nonrt-ric-api/pom.xml
@@ -21,14 +21,6 @@
 <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">
     <modelVersion>4.0.0</modelVersion>
 
-    <repositories>
-	<repository>
-      	    <id>opendaylight-release</id>
-            <name>opendaylight-release</name>
-            <url>https://nexus.opendaylight.org/content/repositories/opendaylight.release/</url>
-    	</repository>
-    </repositories>
-
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>single-feature-parent</artifactId>
@@ -36,12 +28,12 @@
         <relativePath/>
     </parent>
 
-    <groupId>org.onap.sdnc.northbound</groupId>
+    <groupId>org.o-ran-sc.nonrtric.sdnc-a1.northbound</groupId>
     <artifactId>sdnc-nonrt-ric-api</artifactId>
     <version>1.7.3-SNAPSHOT</version>
     <packaging>feature</packaging>
 
-    <name>sdnc-northbound :: nonrt-ric-api :: ${project.artifactId}</name>
+    <name>sdnc-a1-northbound :: nonrt-ric-api :: ${project.artifactId}</name>
 
     <dependencies>
         <dependency>
diff --git a/sdnc-a1-controller/northbound/nonrt-ric-api/installer/pom.xml b/sdnc-a1-controller/northbound/nonrt-ric-api/installer/pom.xml
index 966686b..2532d11 100755
--- a/sdnc-a1-controller/northbound/nonrt-ric-api/installer/pom.xml
+++ b/sdnc-a1-controller/northbound/nonrt-ric-api/installer/pom.xml
@@ -28,24 +28,24 @@
 		<relativePath/>
 	</parent>
 
-	<groupId>org.onap.sdnc.northbound</groupId>
+	<groupId>org.o-ran-sc.nonrtric.sdnc-a1.northbound</groupId>
 	<artifactId>nonrt-ric-api-installer</artifactId>
 	<version>1.7.3-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
-	<name>sdnc-northbound :: nonrt-ric-api :: ${project.artifactId}</name>
+	<name>sdnc-a1-northbound :: nonrt-ric-api :: ${project.artifactId}</name>
 
 	<properties>
 		<application.name>sdnc-nonrt-ric-api</application.name>
 		<features.boot>${application.name}</features.boot>
-		<features.repositories>mvn:org.onap.sdnc.northbound/${application.name}/${project.version}/xml/features</features.repositories>
+		<features.repositories>mvn:org.o-ran-sc.nonrtric.sdnc-a1.northbound/${application.name}/${project.version}/xml/features</features.repositories>
 		<include.transitive.dependencies>false</include.transitive.dependencies>
 	</properties>
 
 	<dependencies>
 
 		<dependency>
-			<groupId>org.onap.sdnc.northbound</groupId>
+			<groupId>org.o-ran-sc.nonrtric.sdnc-a1.northbound</groupId>
 			<artifactId>${application.name}</artifactId>
 			<version>${project.version}</version>
 			<type>xml</type>
@@ -59,7 +59,7 @@
 		</dependency>
 
 		<dependency>
-			<groupId>org.onap.sdnc.northbound</groupId>
+			<groupId>org.o-ran-sc.nonrtric.sdnc-a1.northbound</groupId>
 			<artifactId>nonrt-ric-api-provider</artifactId>
 			<version>${project.version}</version>
 		</dependency>
@@ -123,7 +123,7 @@
 							<useRepositoryLayout>true</useRepositoryLayout>
 							<addParentPoms>false</addParentPoms>
 							<copyPom>false</copyPom>
-							<includeGroupIds>org.onap.sdnc.northbound</includeGroupIds>
+							<includeGroupIds>org.o-ran-sc.nonrtric.sdnc-a1.northbound</includeGroupIds>
 							<scope>provided</scope>
 						</configuration>
 					</execution>
diff --git a/sdnc-a1-controller/northbound/nonrt-ric-api/model/pom.xml b/sdnc-a1-controller/northbound/nonrt-ric-api/model/pom.xml
index ea5ed71..7d45eb5 100644
--- a/sdnc-a1-controller/northbound/nonrt-ric-api/model/pom.xml
+++ b/sdnc-a1-controller/northbound/nonrt-ric-api/model/pom.xml
@@ -36,20 +36,18 @@
         <relativePath/>
     </parent>
 
-    <groupId>org.onap.sdnc.northbound</groupId>
+    <groupId>org.o-ran-sc.nonrtric.sdnc-a1.northbound</groupId>
     <artifactId>nonrt-ric-api-model</artifactId>
     <version>1.7.3-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
-    <name>sdnc-northbound :: nonrt-ric-api :: ${project.artifactId}</name>
+    <name>sdnc-a1-northbound :: nonrt-ric-api :: ${project.artifactId}</name>
 
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
             <artifactId>rfc6991</artifactId>
         </dependency>
-
-        
     </dependencies>
 
     <build>
diff --git a/sdnc-a1-controller/northbound/nonrt-ric-api/model/src/main/yang/NONRT-RIC-API.yang b/sdnc-a1-controller/northbound/nonrt-ric-api/model/src/main/yang/NONRT-RIC-API.yang
index 1933660..34c0a72 100644
--- a/sdnc-a1-controller/northbound/nonrt-ric-api/model/src/main/yang/NONRT-RIC-API.yang
+++ b/sdnc-a1-controller/northbound/nonrt-ric-api/model/src/main/yang/NONRT-RIC-API.yang
@@ -19,7 +19,7 @@
 //
 module A1-ADAPTER-API {
 
-    namespace "org:onap:sdnc:northbound:a1-adapter";
+    namespace "org:o_ran_sc:nonrtric:sdnc_a1:northbound:a1-adapter";
 
     prefix a1-adapter-api;
 
diff --git a/sdnc-a1-controller/northbound/nonrt-ric-api/pom.xml b/sdnc-a1-controller/northbound/nonrt-ric-api/pom.xml
index 44b02e2..2868a0c 100644
--- a/sdnc-a1-controller/northbound/nonrt-ric-api/pom.xml
+++ b/sdnc-a1-controller/northbound/nonrt-ric-api/pom.xml
@@ -30,12 +30,12 @@
 		<relativePath />
 	</parent>
 
-	<groupId>org.onap.sdnc.northbound</groupId>
+	<groupId>org.o-ran-sc.nonrtric.sdnc-a1.northbound</groupId>
 	<artifactId>nonrt-ric-api</artifactId>
 	<version>1.7.3-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
-	<name>sdnc-northbound :: nonrt-ric-api</name>
+	<name>sdnc-a1-northbound :: nonrt-ric-api</name>
 
 	<properties>
 		<sonar-maven-plugin.version>3.7.0.1746</sonar-maven-plugin.version>
diff --git a/sdnc-a1-controller/northbound/nonrt-ric-api/provider/pom.xml b/sdnc-a1-controller/northbound/nonrt-ric-api/provider/pom.xml
index e3c7ab9..da53f92 100644
--- a/sdnc-a1-controller/northbound/nonrt-ric-api/provider/pom.xml
+++ b/sdnc-a1-controller/northbound/nonrt-ric-api/provider/pom.xml
@@ -38,12 +38,12 @@
         <relativePath/>
     </parent>
 
-    <groupId>org.onap.sdnc.northbound</groupId>
+    <groupId>org.o-ran-sc.nonrtric.sdnc-a1.northbound</groupId>
     <artifactId>nonrt-ric-api-provider</artifactId>
     <version>1.7.3-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
-    <name>sdnc-northbound :: nonrt-ric-api :: ${project.artifactId}</name>
+    <name>sdnc-a1-northbound :: nonrt-ric-api :: ${project.artifactId}</name>
 
     <build>
         <plugins>
@@ -93,7 +93,7 @@
 	</dependencyManagement>
     <dependencies>
         <dependency>
-            <groupId>org.onap.sdnc.northbound</groupId>
+            <groupId>org.o-ran-sc.nonrtric.sdnc-a1.northbound</groupId>
             <artifactId>nonrt-ric-api-model</artifactId>
             <version>${project.version}</version>
         </dependency>
diff --git a/sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/main/java/org/onap/sdnc/northbound/provider/NonrtRicApiProvider.java b/sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/main/java/org/o_ran_sc/nonrtric/sdnc_a1/northbound/provider/NonrtRicApiProvider.java
similarity index 80%
rename from sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/main/java/org/onap/sdnc/northbound/provider/NonrtRicApiProvider.java
rename to sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/main/java/org/o_ran_sc/nonrtric/sdnc_a1/northbound/provider/NonrtRicApiProvider.java
index 12704df..ac9181b 100644
--- a/sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/main/java/org/onap/sdnc/northbound/provider/NonrtRicApiProvider.java
+++ b/sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/main/java/org/o_ran_sc/nonrtric/sdnc_a1/northbound/provider/NonrtRicApiProvider.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.sdnc.northbound.provider;
+package org.o_ran_sc.nonrtric.sdnc_a1.northbound.provider;
 
 import com.google.common.util.concurrent.CheckedFuture;
 import com.google.common.util.concurrent.Futures;
@@ -26,31 +26,31 @@
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
-import org.onap.sdnc.northbound.restadapter.RestAdapter;
-import org.onap.sdnc.northbound.restadapter.RestAdapterImpl;
+import org.o_ran_sc.nonrtric.sdnc_a1.northbound.restadapter.RestAdapter;
+import org.o_ran_sc.nonrtric.sdnc_a1.northbound.restadapter.RestAdapterImpl;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService;
 import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException;
 import org.opendaylight.controller.sal.binding.api.BindingAwareBroker;
 import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry;
-import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.a1.adapter.rev200122.A1ADAPTERAPIService;
-import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.a1.adapter.rev200122.DeleteA1PolicyInput;
-import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.a1.adapter.rev200122.DeleteA1PolicyOutput;
-import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.a1.adapter.rev200122.DeleteA1PolicyOutputBuilder;
-import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.a1.adapter.rev200122.GetA1PolicyInput;
-import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.a1.adapter.rev200122.GetA1PolicyInputBuilder;
-import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.a1.adapter.rev200122.GetA1PolicyOutput;
-import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.a1.adapter.rev200122.GetA1PolicyOutputBuilder;
-import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.a1.adapter.rev200122.GetA1PolicyStatusInput;
-import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.a1.adapter.rev200122.GetA1PolicyStatusOutput;
-import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.a1.adapter.rev200122.GetA1PolicyStatusOutputBuilder;
-import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.a1.adapter.rev200122.GetA1PolicyTypeInput;
-import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.a1.adapter.rev200122.GetA1PolicyTypeOutput;
-import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.a1.adapter.rev200122.GetA1PolicyTypeOutputBuilder;
-import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.a1.adapter.rev200122.PutA1PolicyInput;
-import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.a1.adapter.rev200122.PutA1PolicyOutput;
-import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.a1.adapter.rev200122.PutA1PolicyOutputBuilder;
+import org.opendaylight.yang.gen.v1.org.o_ran_sc.nonrtric.sdnc_a1.northbound.a1.adapter.rev200122.A1ADAPTERAPIService;
+import org.opendaylight.yang.gen.v1.org.o_ran_sc.nonrtric.sdnc_a1.northbound.a1.adapter.rev200122.DeleteA1PolicyInput;
+import org.opendaylight.yang.gen.v1.org.o_ran_sc.nonrtric.sdnc_a1.northbound.a1.adapter.rev200122.DeleteA1PolicyOutput;
+import org.opendaylight.yang.gen.v1.org.o_ran_sc.nonrtric.sdnc_a1.northbound.a1.adapter.rev200122.DeleteA1PolicyOutputBuilder;
+import org.opendaylight.yang.gen.v1.org.o_ran_sc.nonrtric.sdnc_a1.northbound.a1.adapter.rev200122.GetA1PolicyInput;
+import org.opendaylight.yang.gen.v1.org.o_ran_sc.nonrtric.sdnc_a1.northbound.a1.adapter.rev200122.GetA1PolicyInputBuilder;
+import org.opendaylight.yang.gen.v1.org.o_ran_sc.nonrtric.sdnc_a1.northbound.a1.adapter.rev200122.GetA1PolicyOutput;
+import org.opendaylight.yang.gen.v1.org.o_ran_sc.nonrtric.sdnc_a1.northbound.a1.adapter.rev200122.GetA1PolicyOutputBuilder;
+import org.opendaylight.yang.gen.v1.org.o_ran_sc.nonrtric.sdnc_a1.northbound.a1.adapter.rev200122.GetA1PolicyStatusInput;
+import org.opendaylight.yang.gen.v1.org.o_ran_sc.nonrtric.sdnc_a1.northbound.a1.adapter.rev200122.GetA1PolicyStatusOutput;
+import org.opendaylight.yang.gen.v1.org.o_ran_sc.nonrtric.sdnc_a1.northbound.a1.adapter.rev200122.GetA1PolicyStatusOutputBuilder;
+import org.opendaylight.yang.gen.v1.org.o_ran_sc.nonrtric.sdnc_a1.northbound.a1.adapter.rev200122.GetA1PolicyTypeInput;
+import org.opendaylight.yang.gen.v1.org.o_ran_sc.nonrtric.sdnc_a1.northbound.a1.adapter.rev200122.GetA1PolicyTypeOutput;
+import org.opendaylight.yang.gen.v1.org.o_ran_sc.nonrtric.sdnc_a1.northbound.a1.adapter.rev200122.GetA1PolicyTypeOutputBuilder;
+import org.opendaylight.yang.gen.v1.org.o_ran_sc.nonrtric.sdnc_a1.northbound.a1.adapter.rev200122.PutA1PolicyInput;
+import org.opendaylight.yang.gen.v1.org.o_ran_sc.nonrtric.sdnc_a1.northbound.a1.adapter.rev200122.PutA1PolicyOutput;
+import org.opendaylight.yang.gen.v1.org.o_ran_sc.nonrtric.sdnc_a1.northbound.a1.adapter.rev200122.PutA1PolicyOutputBuilder;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Uri;
 import org.opendaylight.yangtools.yang.common.RpcResult;
 import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
diff --git a/sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/main/java/org/onap/sdnc/northbound/restadapter/RestAdapter.java b/sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/main/java/org/o_ran_sc/nonrtric/sdnc_a1/northbound/restadapter/RestAdapter.java
similarity index 96%
rename from sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/main/java/org/onap/sdnc/northbound/restadapter/RestAdapter.java
rename to sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/main/java/org/o_ran_sc/nonrtric/sdnc_a1/northbound/restadapter/RestAdapter.java
index a99edce..9cd40af 100644
--- a/sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/main/java/org/onap/sdnc/northbound/restadapter/RestAdapter.java
+++ b/sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/main/java/org/o_ran_sc/nonrtric/sdnc_a1/northbound/restadapter/RestAdapter.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.sdnc.northbound.restadapter;
+package org.o_ran_sc.nonrtric.sdnc_a1.northbound.restadapter;
 
 import org.springframework.http.ResponseEntity;
 
diff --git a/sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/main/java/org/onap/sdnc/northbound/restadapter/RestAdapterImpl.java b/sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/main/java/org/o_ran_sc/nonrtric/sdnc_a1/northbound/restadapter/RestAdapterImpl.java
similarity index 97%
rename from sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/main/java/org/onap/sdnc/northbound/restadapter/RestAdapterImpl.java
rename to sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/main/java/org/o_ran_sc/nonrtric/sdnc_a1/northbound/restadapter/RestAdapterImpl.java
index 9e9d28a..6580983 100644
--- a/sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/main/java/org/onap/sdnc/northbound/restadapter/RestAdapterImpl.java
+++ b/sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/main/java/org/o_ran_sc/nonrtric/sdnc_a1/northbound/restadapter/RestAdapterImpl.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.sdnc.northbound.restadapter;
+package org.o_ran_sc.nonrtric.sdnc_a1.northbound.restadapter;
 
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
diff --git a/sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/main/resources/OSGI-INF/blueprint/nonrt-ric-api-blueprint.xml b/sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/main/resources/OSGI-INF/blueprint/nonrt-ric-api-blueprint.xml
index 3f732ab..53c1509 100644
--- a/sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/main/resources/OSGI-INF/blueprint/nonrt-ric-api-blueprint.xml
+++ b/sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/main/resources/OSGI-INF/blueprint/nonrt-ric-api-blueprint.xml
@@ -34,7 +34,7 @@
                interface="org.opendaylight.controller.sal.binding.api.RpcProviderRegistry"
                odl:type="default" />
 
-    <bean id="provider" class="org.onap.sdnc.northbound.provider.NonrtRicApiProvider">
+    <bean id="provider" class="org.o_ran_sc.nonrtric.sdnc_a1.northbound.provider.NonrtRicApiProvider">
         <argument ref="dataBroker" />
         <argument ref="notificationService" />
         <argument ref="rpcRegistry" />
diff --git a/sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/main/resources/org/opendaylight/blueprint/nonrt-ric-api-blueprint.xml b/sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/main/resources/org/opendaylight/blueprint/nonrt-ric-api-blueprint.xml
index 3f732ab..53c1509 100644
--- a/sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/main/resources/org/opendaylight/blueprint/nonrt-ric-api-blueprint.xml
+++ b/sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/main/resources/org/opendaylight/blueprint/nonrt-ric-api-blueprint.xml
@@ -34,7 +34,7 @@
                interface="org.opendaylight.controller.sal.binding.api.RpcProviderRegistry"
                odl:type="default" />
 
-    <bean id="provider" class="org.onap.sdnc.northbound.provider.NonrtRicApiProvider">
+    <bean id="provider" class="org.o_ran_sc.nonrtric.sdnc_a1.northbound.provider.NonrtRicApiProvider">
         <argument ref="dataBroker" />
         <argument ref="notificationService" />
         <argument ref="rpcRegistry" />
diff --git a/sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/test/java/org/onap/sdnc/northbound/NonrtRicApiProviderTest.java b/sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/test/java/org/o_ran_sc/nonrtric/sdnc_a1/northbound/NonrtRicApiProviderTest.java
similarity index 81%
rename from sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/test/java/org/onap/sdnc/northbound/NonrtRicApiProviderTest.java
rename to sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/test/java/org/o_ran_sc/nonrtric/sdnc_a1/northbound/NonrtRicApiProviderTest.java
index 94b2f92..dd76a07 100644
--- a/sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/test/java/org/onap/sdnc/northbound/NonrtRicApiProviderTest.java
+++ b/sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/test/java/org/o_ran_sc/nonrtric/sdnc_a1/northbound/NonrtRicApiProviderTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.sdnc.northbound;
+package org.o_ran_sc.nonrtric.sdnc_a1.northbound;
 
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.when;
@@ -32,22 +32,22 @@
 import org.mockito.Mock;
 import org.mockito.internal.util.reflection.Whitebox;
 import org.mockito.runners.MockitoJUnitRunner;
-import org.onap.sdnc.northbound.provider.NonrtRicApiProvider;
-import org.onap.sdnc.northbound.restadapter.RestAdapter;
+import org.o_ran_sc.nonrtric.sdnc_a1.northbound.provider.NonrtRicApiProvider;
+import org.o_ran_sc.nonrtric.sdnc_a1.northbound.restadapter.RestAdapter;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService;
 import org.opendaylight.controller.md.sal.binding.test.AbstractConcurrentDataBrokerTest;
 import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry;
-import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.a1.adapter.rev200122.DeleteA1PolicyInputBuilder;
-import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.a1.adapter.rev200122.DeleteA1PolicyOutput;
-import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.a1.adapter.rev200122.GetA1PolicyInputBuilder;
-import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.a1.adapter.rev200122.GetA1PolicyOutput;
-import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.a1.adapter.rev200122.GetA1PolicyStatusInputBuilder;
-import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.a1.adapter.rev200122.GetA1PolicyStatusOutput;
-import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.a1.adapter.rev200122.GetA1PolicyTypeInputBuilder;
-import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.a1.adapter.rev200122.GetA1PolicyTypeOutput;
-import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.a1.adapter.rev200122.PutA1PolicyInputBuilder;
-import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.a1.adapter.rev200122.PutA1PolicyOutput;
+import org.opendaylight.yang.gen.v1.org.o_ran_sc.nonrtric.sdnc_a1.northbound.a1.adapter.rev200122.DeleteA1PolicyInputBuilder;
+import org.opendaylight.yang.gen.v1.org.o_ran_sc.nonrtric.sdnc_a1.northbound.a1.adapter.rev200122.DeleteA1PolicyOutput;
+import org.opendaylight.yang.gen.v1.org.o_ran_sc.nonrtric.sdnc_a1.northbound.a1.adapter.rev200122.GetA1PolicyInputBuilder;
+import org.opendaylight.yang.gen.v1.org.o_ran_sc.nonrtric.sdnc_a1.northbound.a1.adapter.rev200122.GetA1PolicyOutput;
+import org.opendaylight.yang.gen.v1.org.o_ran_sc.nonrtric.sdnc_a1.northbound.a1.adapter.rev200122.GetA1PolicyStatusInputBuilder;
+import org.opendaylight.yang.gen.v1.org.o_ran_sc.nonrtric.sdnc_a1.northbound.a1.adapter.rev200122.GetA1PolicyStatusOutput;
+import org.opendaylight.yang.gen.v1.org.o_ran_sc.nonrtric.sdnc_a1.northbound.a1.adapter.rev200122.GetA1PolicyTypeInputBuilder;
+import org.opendaylight.yang.gen.v1.org.o_ran_sc.nonrtric.sdnc_a1.northbound.a1.adapter.rev200122.GetA1PolicyTypeOutput;
+import org.opendaylight.yang.gen.v1.org.o_ran_sc.nonrtric.sdnc_a1.northbound.a1.adapter.rev200122.PutA1PolicyInputBuilder;
+import org.opendaylight.yang.gen.v1.org.o_ran_sc.nonrtric.sdnc_a1.northbound.a1.adapter.rev200122.PutA1PolicyOutput;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Uri;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/sdnc-a1-controller/northbound/pom.xml b/sdnc-a1-controller/northbound/pom.xml
index 162a423..6e0878c 100644
--- a/sdnc-a1-controller/northbound/pom.xml
+++ b/sdnc-a1-controller/northbound/pom.xml
@@ -36,8 +36,8 @@
 		<relativePath/>
 	</parent>
 
-	<groupId>org.onap.sdnc.northbound</groupId>
-	<artifactId>sdnc-northbound</artifactId>
+	<groupId>org.o-ran-sc.nonrtric.sdnc-a1.northbound</groupId>
+	<artifactId>sdnc-a1-northbound</artifactId>
 	<version>1.7.3-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
@@ -45,7 +45,7 @@
 		<sonar-maven-plugin.version>3.7.0.1746</sonar-maven-plugin.version>
 	</properties>
 
-	<name>sdnc-northbound</name>
+	<name>sdnc-a1-northbound</name>
 	<description>The SDN-C Northbound APIs repo contains code for northbound API adaptors, typically MD-SAL applications</description>
 	<url>https://wiki.onap.org</url>
 	<organization>
@@ -57,27 +57,6 @@
 		<module>nonrt-ric-api</module>
 	</modules>
 
-	<scm>
-		<connection>scm:git:ssh://git@${onap.git.host}/sdnc-northbound.git</connection>
-
-		<developerConnection>scm:git:ssh://${onap.git.host}:${onap.git.port}/${onap.git.project}/sdnc-northbound.git</developerConnection>
-		<url>${onap.git.protocol}://${onap.git.host}/projects/${onap.git.project}/repos/sdnc-northbound/browse</url>
-	</scm>
-	<issueManagement>
-		<system>JIRA</system>
-		<url>https://jira.onap.org/</url>
-	</issueManagement>
-	<ciManagement>
-		<system>Jenkins</system>
-		<url>https://jenkins.onap.org/</url>
-	</ciManagement>
-	<distributionManagement>
-		<site>
-			<id>sdnc-javadoc</id>
-			<url>dav:https://${onap.nexus.host}:${onap.nexus.port}/repository/sdn-c-javadoc/${project.artifactId}/${project.version}</url>
-		</site>
-	</distributionManagement>
-
 	<build>
 		<plugins>
 			<plugin>
diff --git a/sdnc-a1-controller/oam/README.md b/sdnc-a1-controller/oam/README.md
index 2cabf6b..7f74ef7 100644
--- a/sdnc-a1-controller/oam/README.md
+++ b/sdnc-a1-controller/oam/README.md
@@ -1,15 +1,4 @@
-This source repository contains the code for SDN Controller operations, administration and maintenance utilities. This code depends on the following, which should be downloaded and compiled first:
-
-1. org.openecomp.sdnc/sdnc-core
-2. org.openecomp.sdnc/sdnc-adaptors
-3. org.openecomp.sdnc/sdnc-northbound
-4. org.openecomp.sdnc/sdnc-plugins
-
-To compile this code:
-
-1. Make sure your local Maven settings file ($HOME/.m2/settings.xml) contains references to the OpenECOMP repositories and OpenDaylight repositories.  See example-settings.xml for an example.
-
-2. To compile, run "mvn clean install".
+This source repository contains the code for SDN-A1 Controller operations, administration and maintenance utilities. To compile, run "mvn clean install".
 
 ## License
 
diff --git a/sdnc-a1-controller/oam/installation/TagVersion.groovy b/sdnc-a1-controller/oam/installation/TagVersion.groovy
index 9daac31..551eb70 100644
--- a/sdnc-a1-controller/oam/installation/TagVersion.groovy
+++ b/sdnc-a1-controller/oam/installation/TagVersion.groovy
@@ -21,7 +21,7 @@
  *
  */
 
-package org.onap.sdnc.oam
+package org.o_ran_sc.nonrtric.sdnc_a1.oam
 
 
 def versionArray;
diff --git a/sdnc-a1-controller/oam/installation/pom.xml b/sdnc-a1-controller/oam/installation/pom.xml
index 76ff884..0b64bca 100644
--- a/sdnc-a1-controller/oam/installation/pom.xml
+++ b/sdnc-a1-controller/oam/installation/pom.xml
@@ -28,14 +28,14 @@
 
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
-    <groupId>org.onap.sdnc.oam</groupId>
+    <groupId>org.o-ran-sc.nonrtric.sdnc-a1.oam</groupId>
     <artifactId>installation</artifactId>
     <version>1.7.3-SNAPSHOT</version>
 
-    <name>sdnc-oam :: installation</name>
+    <name>sdnc-a1-oam :: installation</name>
     <description>Installs SDN-C on local file system</description>
 
     <modules>
-        <module>sdnc</module>
+        <module>sdnc-a1</module>
     </modules>
 </project>
diff --git a/sdnc-a1-controller/oam/installation/sdnc/pom.xml b/sdnc-a1-controller/oam/installation/sdnc-a1/pom.xml
similarity index 97%
rename from sdnc-a1-controller/oam/installation/sdnc/pom.xml
rename to sdnc-a1-controller/oam/installation/sdnc-a1/pom.xml
index 8525571..bf8bfe3 100644
--- a/sdnc-a1-controller/oam/installation/sdnc/pom.xml
+++ b/sdnc-a1-controller/oam/installation/sdnc-a1/pom.xml
@@ -28,11 +28,11 @@
 
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
-    <groupId>org.onap.sdnc.oam</groupId>
-    <artifactId>installation-sdnc</artifactId>
+    <groupId>org.o-ran-sc.nonrtric.sdnc-a1.oam</groupId>
+    <artifactId>installation-sdnc-a1</artifactId>
     <version>1.7.3-SNAPSHOT</version>
 
-    <name>sdnc-oam :: installation :: ${project.artifactId}</name>
+    <name>sdnc-a1-oam :: installation :: ${project.artifactId}</name>
     <description>Creates SDN Controller Docker container</description>
 
     <properties>
@@ -50,15 +50,15 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.onap.sdnc.northbound</groupId>
+            <groupId>org.o-ran-sc.nonrtric.sdnc-a1.northbound</groupId>
             <artifactId>nonrt-ric-api-installer</artifactId>
             <version>${sdnc.northbound.version}</version>
             <classifier>repo</classifier>
             <type>zip</type>
         </dependency>
         <dependency>
-            <groupId>org.onap.sdnc.northbound</groupId>
-            <artifactId>sdnc-northbound-features-installer</artifactId>
+            <groupId>org.o-ran-sc.nonrtric.sdnc-a1.northbound</groupId>
+            <artifactId>sdnc-a1-northbound-features-installer</artifactId>
             <version>${sdnc.northbound.version}</version>
             <classifier>repo</classifier>
             <type>zip</type>
diff --git a/sdnc-a1-controller/oam/installation/sdnc/src/main/docker/standalone.Dockerfile b/sdnc-a1-controller/oam/installation/sdnc-a1/src/main/docker/standalone.Dockerfile
similarity index 88%
rename from sdnc-a1-controller/oam/installation/sdnc/src/main/docker/standalone.Dockerfile
rename to sdnc-a1-controller/oam/installation/sdnc-a1/src/main/docker/standalone.Dockerfile
index 629732c..3077ee5 100755
--- a/sdnc-a1-controller/oam/installation/sdnc/src/main/docker/standalone.Dockerfile
+++ b/sdnc-a1-controller/oam/installation/sdnc-a1/src/main/docker/standalone.Dockerfile
@@ -20,7 +20,7 @@
 
 FROM nexus3.onap.org:10001/onap/ccsdk-odlsli-alpine-image:${ccsdk.docker.version}
 
-MAINTAINER SDN-C Team (sdnc@lists.onap.org)
+MAINTAINER O-RAN-SC NONRTRIC Team
 
 ENV JAVA_HOME /usr/lib/jvm/java-1.8-openjdk
 ENV ODL_HOME /opt/opendaylight
@@ -28,7 +28,7 @@
 ENV SDNC_STORE_DIR /opt/onap/sdnc/data/stores
 ENV SSL_CERTS_DIR /etc/ssl/certs
 ENV JAVA_SECURITY_DIR $SSL_CERTS_DIR/java
-ENV SDNC_NORTHBOUND_REPO mvn:org.onap.sdnc.northbound/sdnc-northbound-all/${sdnc.northbound.version}/xml/features
+ENV SDNC_NORTHBOUND_REPO mvn:org.o-ran-sc.nonrtric.sdnc-a1.northbound/sdnc-a1-northbound-all/${sdnc.northbound.version}/xml/features
 ENV SDNC_KEYSTORE ${sdnc.keystore}
 ENV SDNC_KEYPASS ${sdnc.keypass}
 ENV SDNC_SECUREPORT ${sdnc.secureport}
@@ -40,7 +40,7 @@
 # Add SDNC repositories to boot repositories
 RUN cp $ODL_HOME/etc/org.apache.karaf.features.cfg $ODL_HOME/etc/org.apache.karaf.features.cfg.orig
 RUN sed -i -e "\|featuresRepositories|s|$|,${SDNC_NORTHBOUND_REPO}|"  $ODL_HOME/etc/org.apache.karaf.features.cfg
-RUN sed -i -e "\|featuresBoot[^a-zA-Z]|s|$|,sdnc-northbound-all|"  $ODL_HOME/etc/org.apache.karaf.features.cfg
+RUN sed -i -e "\|featuresBoot[^a-zA-Z]|s|$|,sdnc-a1-northbound-all|"  $ODL_HOME/etc/org.apache.karaf.features.cfg
 RUN sed -i "s/odl-restconf-all/odl-restconf-all,odl-netconf-topology/g"  $ODL_HOME/etc/org.apache.karaf.features.cfg
 
 # Install ssl and java certificates
diff --git a/sdnc-a1-controller/oam/installation/sdnc/src/main/resources/sdnctl.dump b/sdnc-a1-controller/oam/installation/sdnc-a1/src/main/resources/sdnctl.dump
similarity index 100%
rename from sdnc-a1-controller/oam/installation/sdnc/src/main/resources/sdnctl.dump
rename to sdnc-a1-controller/oam/installation/sdnc-a1/src/main/resources/sdnctl.dump
diff --git a/sdnc-a1-controller/oam/installation/sdnc/src/main/resources/truststoreONAPall.jks b/sdnc-a1-controller/oam/installation/sdnc-a1/src/main/resources/truststoreONAPall.jks
similarity index 100%
rename from sdnc-a1-controller/oam/installation/sdnc/src/main/resources/truststoreONAPall.jks
rename to sdnc-a1-controller/oam/installation/sdnc-a1/src/main/resources/truststoreONAPall.jks
Binary files differ
diff --git a/sdnc-a1-controller/oam/installation/sdnc/src/main/scripts/addSdncKeyStore.sh b/sdnc-a1-controller/oam/installation/sdnc-a1/src/main/scripts/addSdncKeyStore.sh
similarity index 100%
rename from sdnc-a1-controller/oam/installation/sdnc/src/main/scripts/addSdncKeyStore.sh
rename to sdnc-a1-controller/oam/installation/sdnc-a1/src/main/scripts/addSdncKeyStore.sh
diff --git a/sdnc-a1-controller/oam/installation/sdnc/src/main/scripts/installCerts.py b/sdnc-a1-controller/oam/installation/sdnc-a1/src/main/scripts/installCerts.py
similarity index 100%
rename from sdnc-a1-controller/oam/installation/sdnc/src/main/scripts/installCerts.py
rename to sdnc-a1-controller/oam/installation/sdnc-a1/src/main/scripts/installCerts.py
diff --git a/sdnc-a1-controller/oam/installation/sdnc/src/main/scripts/installSdncDb.sh b/sdnc-a1-controller/oam/installation/sdnc-a1/src/main/scripts/installSdncDb.sh
similarity index 100%
rename from sdnc-a1-controller/oam/installation/sdnc/src/main/scripts/installSdncDb.sh
rename to sdnc-a1-controller/oam/installation/sdnc-a1/src/main/scripts/installSdncDb.sh
diff --git a/sdnc-a1-controller/oam/installation/sdnc/src/main/scripts/startODL.sh b/sdnc-a1-controller/oam/installation/sdnc-a1/src/main/scripts/startODL.sh
similarity index 96%
rename from sdnc-a1-controller/oam/installation/sdnc/src/main/scripts/startODL.sh
rename to sdnc-a1-controller/oam/installation/sdnc-a1/src/main/scripts/startODL.sh
index 9418984..1b8f519 100755
--- a/sdnc-a1-controller/oam/installation/sdnc/src/main/scripts/startODL.sh
+++ b/sdnc-a1-controller/oam/installation/sdnc-a1/src/main/scripts/startODL.sh
@@ -51,9 +51,9 @@
 
 if [ ! -f ${INSTALLED_DIR}/.installed ]
 then
-	echo "Installing SDN-C database"
+	echo "Installing SDNC-A1 database"
 	${SDNC_HOME}/bin/installSdncDb.sh
-	echo "Installing SDN-C keyStore"
+	echo "Installing SDNC-A1 keyStore"
 	${SDNC_HOME}/bin/addSdncKeyStore.sh
 
 	if [ -x ${SDNC_HOME}/svclogic/bin/install.sh ]
diff --git a/sdnc-a1-controller/oam/platform-logic/installer/pom.xml b/sdnc-a1-controller/oam/platform-logic/installer/pom.xml
index 668c5b0..77fb72c 100644
--- a/sdnc-a1-controller/oam/platform-logic/installer/pom.xml
+++ b/sdnc-a1-controller/oam/platform-logic/installer/pom.xml
@@ -28,12 +28,12 @@
 		<relativePath/>
 	</parent>
 
-	<groupId>org.onap.sdnc.oam</groupId>
+	<groupId>org.o-ran-sc.nonrtric.sdnc-a1.oam</groupId>
 	<artifactId>platform-logic-installer</artifactId>
 	<version>1.7.3-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
-	<name>sdnc-oam :: platform-logic :: ${project.artifactId}</name>
+	<name>sdnc-a1-oam :: platform-logic :: ${project.artifactId}</name>
 	<description>Contains platform-level service logic installer</description>
 
 	<build>
diff --git a/sdnc-a1-controller/oam/platform-logic/pom.xml b/sdnc-a1-controller/oam/platform-logic/pom.xml
index 2644861..c4f3e8f 100644
--- a/sdnc-a1-controller/oam/platform-logic/pom.xml
+++ b/sdnc-a1-controller/oam/platform-logic/pom.xml
@@ -28,12 +28,12 @@
         <relativePath/>
     </parent>
 
-    <groupId>org.onap.sdnc.oam</groupId>
+    <groupId>org.o-ran-sc.nonrtric.sdnc-a1.oam</groupId>
     <artifactId>platform-logic</artifactId>
     <version>1.7.3-SNAPSHOT</version>
     <packaging>pom</packaging>
 
-    <name>sdnc-oam :: platform-logic</name>
+    <name>sdnc-a1-oam :: platform-logic</name>
     <description>Contains platform-level service logic</description>
     <organization>
         <name>ONAP</name>
diff --git a/sdnc-a1-controller/oam/platform-logic/setup/pom.xml b/sdnc-a1-controller/oam/platform-logic/setup/pom.xml
index 68e506c..4b8b354 100644
--- a/sdnc-a1-controller/oam/platform-logic/setup/pom.xml
+++ b/sdnc-a1-controller/oam/platform-logic/setup/pom.xml
@@ -28,12 +28,12 @@
         <relativePath/>
     </parent>
 
-    <groupId>org.onap.sdnc.oam</groupId>
+    <groupId>org.o-ran-sc.nonrtric.sdnc-a1.oam</groupId>
 	<artifactId>platform-logic-setup</artifactId>
 	<version>1.7.3-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
-    <name>sdnc-oam :: platform-logic :: ${project.artifactId}</name>
+    <name>sdnc-a1-oam :: platform-logic :: ${project.artifactId}</name>
 	<description>Copies base ONAP platform-logic</description>
 
 	<build>
diff --git a/sdnc-a1-controller/oam/pom.xml b/sdnc-a1-controller/oam/pom.xml
index 6ac9f90..8cc1cab 100755
--- a/sdnc-a1-controller/oam/pom.xml
+++ b/sdnc-a1-controller/oam/pom.xml
@@ -27,12 +27,12 @@
 		<version>1.4.3</version>
 	</parent>
 
-	<groupId>org.onap.sdnc.oam</groupId>
-	<artifactId>sdnc-oam</artifactId>
+	<groupId>org.o-ran-sc.nonrtric.sdnc-a1.oam</groupId>
+	<artifactId>sdnc-a1-oam</artifactId>
 	<version>1.7.3-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
-	<name>sdnc-oam</name>
+	<name>sdnc-a1-oam</name>
 	<description>The SDN-C OAM component contains the components needed to operate, administer and maintain the SDN-C platform.</description>
 	<url>https://wiki.onap.org</url>
 	<organization>
@@ -43,27 +43,6 @@
 		<module>platform-logic</module>
 	</modules>
 
-	<scm>
-                <connection>scm:git:ssh://git@${onap.git.host}/sdnc-oam.git</connection>
-                <developerConnection>scm:git:ssh://${onap.git.host}:${onap.git.port}/${onap.git.project}/sdnc-oam.git</developerConnection>
-                <url>${onap.git.protocol}://${onap.git.host}/projects/${onap.git.project}/repos/sdnc-oam/browse</url>
-    		<tag>HEAD</tag>
- 	</scm>
-	<issueManagement>
-		<system>JIRA</system>
-		<url>https://jira.onap.org/</url>
-	</issueManagement>
-	<ciManagement>
-		<system>Jenkins</system>
-		<url>https://jenkins.onap.org/</url>
-	</ciManagement>
-	<distributionManagement>
-        <site>
-          <id>sdnc-javadoc</id>
-          <url>dav:https://${onap.nexus.host}:${onap.nexus.port}/repository/sdn-c-javadoc/${project.artifactId}/${project.version}</url>
-        </site>
-    </distributionManagement>
-
 	<build>
 		<plugins>
 			<plugin>
diff --git a/sdnc-a1-controller/pom.xml b/sdnc-a1-controller/pom.xml
index f2decfd..96ca1a5 100644
--- a/sdnc-a1-controller/pom.xml
+++ b/sdnc-a1-controller/pom.xml
@@ -23,12 +23,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>
 
-	<groupId>org.onap.sdnc</groupId>
-	<artifactId>sdnc</artifactId>
+	<groupId>org.o-ran-sc.nonrtric.sdnc-a1</groupId>
+	<artifactId>sdnc-a1</artifactId>
 	<version>1.7.4-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
-	<name>sdnc</name>
+	<name>sdnc-a1</name>
 
 	<properties>
 		<sonar-maven-plugin.version>3.7.0.1746</sonar-maven-plugin.version>