diff --git a/appc-outbound/appc-aai-client/provider/pom.xml b/appc-outbound/appc-aai-client/provider/pom.xml
index b5db224..3484e4b 100755
--- a/appc-outbound/appc-aai-client/provider/pom.xml
+++ b/appc-outbound/appc-aai-client/provider/pom.xml
@@ -3,7 +3,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>
 	<parent>
-		<groupId>org.openecomp.appc</groupId>
+		<groupId>org.onap.appc</groupId>
 		<artifactId>appc-aai-client</artifactId>
 		<version>1.3.0-SNAPSHOT</version>
 	</parent>
@@ -107,9 +107,9 @@
 				<extensions>true</extensions>
 				<configuration>
 					<instructions>
-						<Bundle-SymbolicName>org.openecomp.appc.aai.client</Bundle-SymbolicName>
-						<Bundle-Activator>org.openecomp.appc.aai.client.AppcAaiClientActivator</Bundle-Activator>
-						<Export-Package>org.openecomp.appc.aai.client</Export-Package>
+						<Bundle-SymbolicName>org.onap.appc.aai.client</Bundle-SymbolicName>
+						<Bundle-Activator>org.onap.appc.aai.client.AppcAaiClientActivator</Bundle-Activator>
+						<Export-Package>org.onap.appc.aai.client</Export-Package>
 						<Import-Package>*</Import-Package>
 						<DynamicImport-Package>*</DynamicImport-Package>
 					</instructions>
diff --git a/appc-outbound/appc-aai-client/provider/src/main/java/org/openecomp/appc/aai/client/AppcAaiClientActivator.java b/appc-outbound/appc-aai-client/provider/src/main/java/org/openecomp/appc/aai/client/AppcAaiClientActivator.java
index f3cf70f..ab66af5 100644
--- a/appc-outbound/appc-aai-client/provider/src/main/java/org/openecomp/appc/aai/client/AppcAaiClientActivator.java
+++ b/appc-outbound/appc-aai-client/provider/src/main/java/org/openecomp/appc/aai/client/AppcAaiClientActivator.java
@@ -22,12 +22,12 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.aai.client;
+package org.onap.appc.aai.client;
 
 import java.util.LinkedList;
 import java.util.List;
 
-import org.openecomp.appc.aai.client.node.AAIResourceNode;
+import org.onap.appc.aai.client.node.AAIResourceNode;
 
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
diff --git a/appc-outbound/appc-aai-client/provider/src/main/java/org/openecomp/appc/aai/client/AppcAaiClientConstant.java b/appc-outbound/appc-aai-client/provider/src/main/java/org/openecomp/appc/aai/client/AppcAaiClientConstant.java
index 7521d76..7724888 100644
--- a/appc-outbound/appc-aai-client/provider/src/main/java/org/openecomp/appc/aai/client/AppcAaiClientConstant.java
+++ b/appc-outbound/appc-aai-client/provider/src/main/java/org/openecomp/appc/aai/client/AppcAaiClientConstant.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.aai.client;
+package org.onap.appc.aai.client;
 
 public class AppcAaiClientConstant {
 
diff --git a/appc-outbound/appc-aai-client/provider/src/main/java/org/openecomp/appc/aai/client/aai/AaiService.java b/appc-outbound/appc-aai-client/provider/src/main/java/org/openecomp/appc/aai/client/aai/AaiService.java
index 5078b37..f03e7f3 100644
--- a/appc-outbound/appc-aai-client/provider/src/main/java/org/openecomp/appc/aai/client/aai/AaiService.java
+++ b/appc-outbound/appc-aai-client/provider/src/main/java/org/openecomp/appc/aai/client/aai/AaiService.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.aai.client.aai;
+package org.onap.appc.aai.client.aai;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -33,7 +33,7 @@
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.ccsdk.sli.core.sli.SvcLogicResource;
 
-import org.openecomp.appc.aai.client.AppcAaiClientConstant;
+import org.onap.appc.aai.client.AppcAaiClientConstant;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 import org.onap.ccsdk.sli.adaptors.aai.AAIClient;
diff --git a/appc-outbound/appc-aai-client/provider/src/main/java/org/openecomp/appc/aai/client/node/AAIResourceNode.java b/appc-outbound/appc-aai-client/provider/src/main/java/org/openecomp/appc/aai/client/node/AAIResourceNode.java
index a651438..2505083 100644
--- a/appc-outbound/appc-aai-client/provider/src/main/java/org/openecomp/appc/aai/client/node/AAIResourceNode.java
+++ b/appc-outbound/appc-aai-client/provider/src/main/java/org/openecomp/appc/aai/client/node/AAIResourceNode.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.aai.client.node;
+package org.onap.appc.aai.client.node;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -35,8 +35,8 @@
 
 import org.apache.commons.lang3.StringUtils;
 
-import org.openecomp.appc.aai.client.AppcAaiClientConstant;
-import org.openecomp.appc.aai.client.aai.AaiService;
+import org.onap.appc.aai.client.AppcAaiClientConstant;
+import org.onap.appc.aai.client.aai.AaiService;
 
 
 import com.att.eelf.configuration.EELFLogger;
diff --git a/appc-outbound/appc-aai-client/provider/src/test/java/org/openecomp/appc/aai/client/aai/MockAaiService.java b/appc-outbound/appc-aai-client/provider/src/test/java/org/openecomp/appc/aai/client/aai/MockAaiService.java
index b330cdb..724c8bf 100644
--- a/appc-outbound/appc-aai-client/provider/src/test/java/org/openecomp/appc/aai/client/aai/MockAaiService.java
+++ b/appc-outbound/appc-aai-client/provider/src/test/java/org/openecomp/appc/aai/client/aai/MockAaiService.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.aai.client.aai;
+package org.onap.appc.aai.client.aai;
 import static org.junit.Assert.assertEquals;
 
 import static org.junit.Assert.fail;
diff --git a/appc-outbound/appc-aai-client/provider/src/test/java/org/openecomp/appc/aai/client/aai/TestAaiService.java b/appc-outbound/appc-aai-client/provider/src/test/java/org/openecomp/appc/aai/client/aai/TestAaiService.java
index 050d5bf..aa80708 100644
--- a/appc-outbound/appc-aai-client/provider/src/test/java/org/openecomp/appc/aai/client/aai/TestAaiService.java
+++ b/appc-outbound/appc-aai-client/provider/src/test/java/org/openecomp/appc/aai/client/aai/TestAaiService.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.aai.client.aai;
+package org.onap.appc.aai.client.aai;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/appc-outbound/appc-aai-client/provider/src/test/java/org/openecomp/appc/aai/client/node/MockAaiService.java b/appc-outbound/appc-aai-client/provider/src/test/java/org/openecomp/appc/aai/client/node/MockAaiService.java
index 29f77a9..2e03e6b 100644
--- a/appc-outbound/appc-aai-client/provider/src/test/java/org/openecomp/appc/aai/client/node/MockAaiService.java
+++ b/appc-outbound/appc-aai-client/provider/src/test/java/org/openecomp/appc/aai/client/node/MockAaiService.java
@@ -23,16 +23,16 @@
  */
 
 
-package org.openecomp.appc.aai.client.node;
+package org.onap.appc.aai.client.node;
 import static junit.framework.Assert.assertEquals;
 
 import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.commons.lang3.StringUtils;
-import org.openecomp.appc.aai.client.AppcAaiClientConstant;
-//import org.openecomp.appc.aai.client.aai.AAIClientMock;
-import org.openecomp.appc.aai.client.aai.AaiService;
+import org.onap.appc.aai.client.AppcAaiClientConstant;
+//import org.onap.appc.aai.client.aai.AAIClientMock;
+import org.onap.appc.aai.client.aai.AaiService;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
diff --git a/appc-outbound/appc-aai-client/provider/src/test/java/org/openecomp/appc/aai/client/node/TestAAIResourceNode.java b/appc-outbound/appc-aai-client/provider/src/test/java/org/openecomp/appc/aai/client/node/TestAAIResourceNode.java
index 9653af1..6b05c08 100644
--- a/appc-outbound/appc-aai-client/provider/src/test/java/org/openecomp/appc/aai/client/node/TestAAIResourceNode.java
+++ b/appc-outbound/appc-aai-client/provider/src/test/java/org/openecomp/appc/aai/client/node/TestAAIResourceNode.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.aai.client.node;
+package org.onap.appc.aai.client.node;
 
 import static org.junit.Assert.*;
 
@@ -39,9 +39,9 @@
 import org.apache.commons.io.IOUtils;
 import org.junit.Assert;
 import org.junit.Test;
-import org.openecomp.appc.aai.client.AppcAaiClientConstant;
-import org.openecomp.appc.aai.client.aai.AaiService;
-import org.openecomp.appc.aai.client.aai.TestAaiService;
+import org.onap.appc.aai.client.AppcAaiClientConstant;
+import org.onap.appc.aai.client.aai.AaiService;
+import org.onap.appc.aai.client.aai.TestAaiService;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;