First part of onap rename

This is the first commit of the rename. This commit changes
refereces to org.openecomp.appc > org.onap.appc that occur within
files. The package folder structure is not changed in this commit.

Change-Id: Ic95d749eb99d8a6f4f2b9ee9b06eb41c5cfa7e1c
Signed-off-by: Patrick Brady <pb071s@att.com>
Issue-ID: APPC-13

246 files changed, 1191 insertions, 1191 deletions

diff --git a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/pom.xml b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/pom.xml
index 4e2577135..ef7896ae0 100644
--- a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/pom.xml
+++ b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/pom.xml
@@ -25,7 +25,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">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.openecomp.appc</groupId>
+		<groupId>org.onap.appc</groupId>
 		<artifactId>appc-ansible-adapter</artifactId>
 		<version>1.3.0-SNAPSHOT</version>
 	</parent>
@@ -54,7 +54,7 @@
 
 		<!-- http://mvnrepository.com/artifact/org.apache.httpcomponents/httpcore -->
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-common</artifactId>
 			<version>${project.version}</version>
 		</dependency>
@@ -195,8 +195,8 @@
 				<configuration>
 					<instructions>
 						<Bundle-SymbolicName>appc-ansible-adapter</Bundle-SymbolicName>
-						<Bundle-Activator>org.openecomp.appc.adapter.ansible.AnsibleActivator</Bundle-Activator>
-						<Export-Package>org.openecomp.appc.adapter.ansible</Export-Package>
+						<Bundle-Activator>org.onap.appc.adapter.ansible.AnsibleActivator</Bundle-Activator>
+						<Export-Package>org.onap.appc.adapter.ansible</Export-Package>
 						<Import-Package>org.onap.ccsdk.sli.core.sli.*,org.osgi.framework.*,org.slf4j.*, javax.net.*,javax.net.ssl.*,org.xml.sax.*,javax.xml.bind.*,javax.naming.*, javax.security.*</Import-Package>
 						<Embed-Dependency>*;scope=compile|runtime;artifactId=!sli-common|org.eclipse.osgi|slf4j-api|jcl-over-slf4j|mariadb-java-client|xml-apis</Embed-Dependency>
 						<Embed-Transitive>true</Embed-Transitive>
diff --git a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/AnsibleActivator.java b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/AnsibleActivator.java
index 865841db2..d76cd50f1 100644
--- a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/AnsibleActivator.java
+++ b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/AnsibleActivator.java
@@ -22,17 +22,17 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.ansible;
+package org.onap.appc.adapter.ansible;
 
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceRegistration;
 
-import org.openecomp.appc.Constants;
-import org.openecomp.appc.adapter.ansible.impl.AnsibleAdapterImpl;
-import org.openecomp.appc.configuration.Configuration;
-import org.openecomp.appc.configuration.ConfigurationFactory;
-import org.openecomp.appc.i18n.Msg;
+import org.onap.appc.Constants;
+import org.onap.appc.adapter.ansible.impl.AnsibleAdapterImpl;
+import org.onap.appc.configuration.Configuration;
+import org.onap.appc.configuration.ConfigurationFactory;
+import org.onap.appc.i18n.Msg;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 
diff --git a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/AnsibleAdapter.java b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/AnsibleAdapter.java
index da710f34f..7bff184bc 100644
--- a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/AnsibleAdapter.java
+++ b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/AnsibleAdapter.java
@@ -22,11 +22,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.ansible;
+package org.onap.appc.adapter.ansible;
 
 import java.util.Map;
 
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.exceptions.APPCException;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin;
 import org.onap.ccsdk.sli.core.sli.SvcLogicException;
diff --git a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/impl/AnsibleAdapterImpl.java b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/impl/AnsibleAdapterImpl.java
index 434fbe673..0b426bb26 100644
--- a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/impl/AnsibleAdapterImpl.java
+++ b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/impl/AnsibleAdapterImpl.java
@@ -22,16 +22,16 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.ansible.impl;
+package org.onap.appc.adapter.ansible.impl;
 
 import java.util.Map;
 import java.util.Properties;
 import java.lang.*;
     
 
-import org.openecomp.appc.configuration.Configuration;
-import org.openecomp.appc.configuration.ConfigurationFactory;
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.configuration.Configuration;
+import org.onap.appc.configuration.ConfigurationFactory;
+import org.onap.appc.exceptions.APPCException;
 
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.ccsdk.sli.core.sli.SvcLogicException;
@@ -44,12 +44,12 @@ import org.json.JSONException;
 
 
 
-import org.openecomp.appc.adapter.ansible.AnsibleAdapter;
+import org.onap.appc.adapter.ansible.AnsibleAdapter;
 
-import org.openecomp.appc.adapter.ansible.model.AnsibleResult;
-import org.openecomp.appc.adapter.ansible.model.AnsibleMessageParser;
-import org.openecomp.appc.adapter.ansible.model.AnsibleResultCodes;
-import org.openecomp.appc.adapter.ansible.model.AnsibleServerEmulator;
+import org.onap.appc.adapter.ansible.model.AnsibleResult;
+import org.onap.appc.adapter.ansible.model.AnsibleMessageParser;
+import org.onap.appc.adapter.ansible.model.AnsibleResultCodes;
+import org.onap.appc.adapter.ansible.model.AnsibleServerEmulator;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
@@ -166,7 +166,7 @@ public class AnsibleAdapterImpl implements AnsibleAdapter {
      * Returns the symbolic name of the adapter
      * 
      * @return The adapter name
-     * @see org.openecomp.appc.adapter.rest.AnsibleAdapter#getAdapterName()
+     * @see org.onap.appc.adapter.rest.AnsibleAdapter#getAdapterName()
      */
     @Override
     public String getAdapterName() {
@@ -184,8 +184,8 @@ public class AnsibleAdapterImpl implements AnsibleAdapter {
     private void doFailure(SvcLogicContext svcLogic,  int code, String message)  throws SvcLogicException {
 
 	svcLogic.setStatus(OUTCOME_FAILURE);
-	svcLogic.setAttribute("org.openecomp.appc.adapter.ansible.result.code",Integer.toString(code));
-	svcLogic.setAttribute("org.openecomp.appc.adapter.ansible.message",message);
+	svcLogic.setAttribute("org.onap.appc.adapter.ansible.result.code",Integer.toString(code));
+	svcLogic.setAttribute("org.onap.appc.adapter.ansible.message",message);
 	
 	throw new SvcLogicException("Ansible Adapter Error = " + message );
     }
@@ -204,7 +204,7 @@ public class AnsibleAdapterImpl implements AnsibleAdapter {
 
         // Create the http client instance
         // type of client is extracted from the property file parameter
-        // org.openecomp.appc.adapter.ansible.clientType
+        // org.onap.appc.adapter.ansible.clientType
         // It can be :
         //     1. TRUST_ALL  (trust all SSL certs). To be used ONLY in dev
         //     2. TRUST_CERT (trust only those whose certificates have been stored in the trustStore file)
@@ -212,7 +212,7 @@ public class AnsibleAdapterImpl implements AnsibleAdapter {
         //     revert. To be used in PROD
 
         try{
-            String clientType = props.getProperty("org.openecomp.appc.adapter.ansible.clientType");
+            String clientType = props.getProperty("org.onap.appc.adapter.ansible.clientType");
 	    logger.info("Ansible http client type set to " + clientType);
 
             if (clientType.equals("TRUST_ALL")){
@@ -221,8 +221,8 @@ public class AnsibleAdapterImpl implements AnsibleAdapter {
             }
             else if (clientType.equals("TRUST_CERT")){
                 // set path to keystore file
-                String trustStoreFile = props.getProperty("org.openecomp.appc.adapter.ansible.trustStore");
-                String key  = props.getProperty("org.openecomp.appc.adapter.ansible.trustStore.trustPasswd");
+                String trustStoreFile = props.getProperty("org.onap.appc.adapter.ansible.trustStore");
+                String key  = props.getProperty("org.onap.appc.adapter.ansible.trustStore.trustPasswd");
                 char [] trustStorePasswd = key.toCharArray();
                 String trustStoreType = "JKS";
                 logger.info("Creating http client with trustmanager from " + trustStoreFile);
@@ -251,9 +251,9 @@ public class AnsibleAdapterImpl implements AnsibleAdapter {
 
     // Public Method to post request to execute playbook. Posts the following back
     // to Svc context memory
-    //  org.openecomp.appc.adapter.ansible.req.code : 100 if successful
-    //  org.openecomp.appc.adapter.ansible.req.messge : any message
-    //  org.openecomp.appc.adapter.ansible.req.Id : a unique uuid to reference the request
+    //  org.onap.appc.adapter.ansible.req.code : 100 if successful
+    //  org.onap.appc.adapter.ansible.req.messge : any message
+    //  org.onap.appc.adapter.ansible.req.Id : a unique uuid to reference the request
 
     public void reqExec(Map <String, String> params, SvcLogicContext ctx) throws SvcLogicException {
 
@@ -329,9 +329,9 @@ public class AnsibleAdapterImpl implements AnsibleAdapter {
 	}
 
 
-	ctx.setAttribute("org.openecomp.appc.adapter.ansible.result.code", Integer.toString(code));
-	ctx.setAttribute("org.openecomp.appc.adapter.ansible.message", message );
-	ctx.setAttribute("org.openecomp.appc.adapter.ansible.Id", Id);
+	ctx.setAttribute("org.onap.appc.adapter.ansible.result.code", Integer.toString(code));
+	ctx.setAttribute("org.onap.appc.adapter.ansible.message", message );
+	ctx.setAttribute("org.onap.appc.adapter.ansible.Id", Id);
 	
     }
 
@@ -394,15 +394,15 @@ public class AnsibleAdapterImpl implements AnsibleAdapter {
 	}
 	else {
 	    logger.info(String.format("Ansible Request  %s finished with Result %s, Message = %s", params.get("Id"), OUTCOME_FAILURE, message));
-	    ctx.setAttribute("org.openecomp.appc.adapter.ansible.results", results);
+	    ctx.setAttribute("org.onap.appc.adapter.ansible.results", results);
 	    doFailure(ctx, code, message );
 	    return;	    
 	}
 	
       
-	ctx.setAttribute("org.openecomp.appc.adapter.ansible.result.code", Integer.toString(400));
-	ctx.setAttribute("org.openecomp.appc.adapter.ansible.message",message);
-	ctx.setAttribute("org.openecomp.appc.adapter.ansible.results", results);
+	ctx.setAttribute("org.onap.appc.adapter.ansible.result.code", Integer.toString(400));
+	ctx.setAttribute("org.onap.appc.adapter.ansible.message",message);
+	ctx.setAttribute("org.onap.appc.adapter.ansible.results", results);
 	ctx.setStatus(OUTCOME_SUCCESS);
     }
     
@@ -410,7 +410,7 @@ public class AnsibleAdapterImpl implements AnsibleAdapter {
     // Public method to get logs  from plyabook execution for a  specifcic request
     // It blocks till the Ansible Server responds or the session times out
     // very similar to reqExecResult
-    // logs are returned in the DG context variable org.openecomp.appc.adapter.ansible.log
+    // logs are returned in the DG context variable org.onap.appc.adapter.ansible.log
     
     public void reqExecLog(Map<String, String> params, SvcLogicContext ctx) throws SvcLogicException{
 
@@ -442,7 +442,7 @@ public class AnsibleAdapterImpl implements AnsibleAdapter {
 	    doFailure(ctx, AnsibleResultCodes.UNKNOWN_EXCEPTION.getValue(), "Exception encountered retreiving output : " + e.getMessage());
 	}
 	
-	ctx.setAttribute("org.openecomp.appc.adapter.ansible.log",message);
+	ctx.setAttribute("org.onap.appc.adapter.ansible.log",message);
 	ctx.setStatus(OUTCOME_SUCCESS);
     }
     
diff --git a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/impl/ConnectionBuilder.java b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/impl/ConnectionBuilder.java
index b3d1d4c02..e84a85a0c 100644
--- a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/impl/ConnectionBuilder.java
+++ b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/impl/ConnectionBuilder.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.ansible.impl;
+package org.onap.appc.adapter.ansible.impl;
 
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
@@ -56,9 +56,9 @@ import org.apache.http.conn.ssl.SSLContexts;
 import org.apache.http.conn.ssl.TrustSelfSignedStrategy;
 
 
-import org.openecomp.appc.exceptions.APPCException;
-import org.openecomp.appc.adapter.ansible.model.AnsibleResult;
-import org.openecomp.appc.adapter.ansible.model.AnsibleResultCodes;
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.adapter.ansible.model.AnsibleResult;
+import org.onap.appc.adapter.ansible.model.AnsibleResultCodes;
 
 
 /** 
diff --git a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/model/AnsibleMessageParser.java b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/model/AnsibleMessageParser.java
index a1798e164..6bebd73fe 100644
--- a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/model/AnsibleMessageParser.java
+++ b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/model/AnsibleMessageParser.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.ansible.model;
+package org.onap.appc.adapter.ansible.model;
 
 /**
  * This module imples the APP-C/Ansible Server interface
@@ -36,8 +36,8 @@ import com.google.common.base.Strings;
 import org.json.JSONObject;
 import org.json.JSONArray;
 import org.json.JSONException;
-import org.openecomp.appc.exceptions.APPCException;
-import org.openecomp.appc.adapter.ansible.model.AnsibleResult;
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.adapter.ansible.model.AnsibleResult;
 
 
 /**
diff --git a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/model/AnsibleResult.java b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/model/AnsibleResult.java
index 29228e574..a4bbcbef8 100644
--- a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/model/AnsibleResult.java
+++ b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/model/AnsibleResult.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.ansible.model;
+package org.onap.appc.adapter.ansible.model;
 
 
 /* Simple class to store code and message returned by POST/GET to an Ansible Server */
diff --git a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/model/AnsibleResultCodes.java b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/model/AnsibleResultCodes.java
index dbcdb75ee..986ad3e6a 100644
--- a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/model/AnsibleResultCodes.java
+++ b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/model/AnsibleResultCodes.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.ansible.model;
+package org.onap.appc.adapter.ansible.model;
 
 
 import java.util.*;
diff --git a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/model/AnsibleServerEmulator.java b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/model/AnsibleServerEmulator.java
index aabced364..c430743ad 100644
--- a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/model/AnsibleServerEmulator.java
+++ b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/openecomp/appc/adapter/ansible/model/AnsibleServerEmulator.java
@@ -30,7 +30,7 @@
    as a replacement for methods from ConnectionBuilder class
 */
 
-package org.openecomp.appc.adapter.ansible.model;
+package org.onap.appc.adapter.ansible.model;
 
 import java.util.*;
 import java.util.regex.Pattern;
@@ -40,8 +40,8 @@ import com.google.common.base.Strings;
 import org.json.JSONObject;
 import org.json.JSONArray;
 import org.json.JSONException;
-import org.openecomp.appc.exceptions.APPCException;
-import org.openecomp.appc.adapter.ansible.model.AnsibleResult;
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.adapter.ansible.model.AnsibleResult;
 
 public class AnsibleServerEmulator {
 
diff --git a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/resources/org/openecomp/appc/default.properties b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/resources/org/openecomp/appc/default.properties
index 0736b963a..d49c0396c 100644
--- a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/resources/org/openecomp/appc/default.properties
+++ b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/resources/org/openecomp/appc/default.properties
@@ -29,20 +29,20 @@
 #
 # Define the name and path of any user-provided configuration (bootstrap) file that can be loaded 
 # to supply configuration options 
-org.openecomp.appc.bootstrap.file=appc.properties
-org.openecomp.appc.bootstrap.path=${user.home},/opt/opendaylight/current/properties
+org.onap.appc.bootstrap.file=appc.properties
+org.onap.appc.bootstrap.path=${user.home},/opt/opendaylight/current/properties
 
 appc.application.name=APPC
 
 #
 # Define the message resource bundle name to be loaded 
-org.openecomp.appc.resources=org.openecomp/appc/i18n/MessageResources
+org.onap.appc.resources=org.onap/appc/i18n/MessageResources
 #
 # The name of the adapter.
-org.openecomp.appc.provider.adaptor.name=org.openecomp.appc.appc_ansible_adapter
+org.onap.appc.provider.adaptor.name=org.onap.appc.appc_ansible_adapter
 
 
 # Default truststore path and password
-org.openecomp.appc.adapter.ansible.trustStore=/opt/opendaylight/tls-client/mykeystore.js
-org.openecomp.appc.adapter.ansible.trustStore.trustPasswd=changeit
-org.openecomp.appc.adapter.ansible.clientType=DEFAULT
+org.onap.appc.adapter.ansible.trustStore=/opt/opendaylight/tls-client/mykeystore.js
+org.onap.appc.adapter.ansible.trustStore.trustPasswd=changeit
+org.onap.appc.adapter.ansible.clientType=DEFAULT
diff --git a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/test/java/org/openecomp/appc/adapter/ansible/impl/TestAnsibleAdapterImpl.java b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/test/java/org/openecomp/appc/adapter/ansible/impl/TestAnsibleAdapterImpl.java
index a4e49643a..88425700e 100644
--- a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/test/java/org/openecomp/appc/adapter/ansible/impl/TestAnsibleAdapterImpl.java
+++ b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/test/java/org/openecomp/appc/adapter/ansible/impl/TestAnsibleAdapterImpl.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.ansible.impl;
+package org.onap.appc.adapter.ansible.impl;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -42,15 +42,15 @@ import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Ignore;
 import org.junit.Test;
-import org.openecomp.appc.Constants;
-import org.openecomp.appc.configuration.ConfigurationFactory;
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.Constants;
+import org.onap.appc.configuration.ConfigurationFactory;
+import org.onap.appc.exceptions.APPCException;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.ccsdk.sli.core.sli.SvcLogicException;
 import org.slf4j.MDC;
 
-import org.openecomp.appc.adapter.ansible.AnsibleAdapter;
-import org.openecomp.appc.adapter.ansible.impl.AnsibleAdapterImpl;
+import org.onap.appc.adapter.ansible.AnsibleAdapter;
+import org.onap.appc.adapter.ansible.impl.AnsibleAdapterImpl;
 
 public class TestAnsibleAdapterImpl {
 
@@ -85,14 +85,14 @@ public class TestAnsibleAdapterImpl {
             try{
 		String Pending = "100";
 		adapter.reqExec(params, svcContext);
-		String status=svcContext.getAttribute("org.openecomp.appc.adapter.ansible.result.code");
-		TestId=svcContext.getAttribute("org.openecomp.appc.adapter.ansible.result.Id");
+		String status=svcContext.getAttribute("org.onap.appc.adapter.ansible.result.code");
+		TestId=svcContext.getAttribute("org.onap.appc.adapter.ansible.result.Id");
 		System.out.println("Comparing " + Pending + " and " + status);
 		assertEquals(Pending,status);
 	    }
 	    catch(SvcLogicException e){
-	        String message  =svcContext.getAttribute("org.openecomp.appc.adapter.ansible.result.message");	
-		String status=svcContext.getAttribute("org.openecomp.appc.adapter.ansible.result.code");
+	        String message  =svcContext.getAttribute("org.onap.appc.adapter.ansible.result.message");	
+		String status=svcContext.getAttribute("org.onap.appc.adapter.ansible.result.code");
 		fail(e.getMessage() + " Code = " + status);
 	    }
 	    catch(Exception e){
@@ -120,12 +120,12 @@ public class TestAnsibleAdapterImpl {
 
             try{
 		adapter.reqExecResult(params, svcContext);
-		String status=svcContext.getAttribute("org.openecomp.appc.adapter.ansible.result.code");
+		String status=svcContext.getAttribute("org.onap.appc.adapter.ansible.result.code");
 		assertEquals("400",status);
 	    }
 	    catch(SvcLogicException e){
-	        String message  = svcContext.getAttribute("org.openecomp.appc.adapter.ansible.result.message");	
-		String status=svcContext.getAttribute("org.openecomp.appc.adapter.ansible.result.code");
+	        String message  = svcContext.getAttribute("org.onap.appc.adapter.ansible.result.message");	
+		String status=svcContext.getAttribute("org.onap.appc.adapter.ansible.result.code");
 		fail(e.getMessage()  + " Code = " + status);
 	    }
 	    catch(Exception e){
diff --git a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/test/java/org/openecomp/appc/test/ExecutorHarness.java b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/test/java/org/openecomp/appc/test/ExecutorHarness.java
index 62470cc01..13b5fdfb3 100644
--- a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/test/java/org/openecomp/appc/test/ExecutorHarness.java
+++ b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/test/java/org/openecomp/appc/test/ExecutorHarness.java
@@ -23,7 +23,7 @@
  */
 
 
-package org.openecomp.appc.test;
+package org.onap.appc.test;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
@@ -32,7 +32,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.openecomp.appc.test.InterceptLogger;
+import org.onap.appc.test.InterceptLogger;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin;
 
diff --git a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/test/java/org/openecomp/appc/test/InterceptLogger.java b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/test/java/org/openecomp/appc/test/InterceptLogger.java
index 8a06b31be..b101ecee4 100644
--- a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/test/java/org/openecomp/appc/test/InterceptLogger.java
+++ b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/test/java/org/openecomp/appc/test/InterceptLogger.java
@@ -23,7 +23,7 @@
  */
 
 
-package org.openecomp.appc.test;
+package org.onap.appc.test;
 
 import java.text.MessageFormat;
 import java.util.ArrayList;
diff --git a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/test/resources/org/openecomp/appc/default.properties b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/test/resources/org/openecomp/appc/default.properties
index c781956d7..bb888132a 100644
--- a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/test/resources/org/openecomp/appc/default.properties
+++ b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/test/resources/org/openecomp/appc/default.properties
@@ -29,38 +29,38 @@
 #
 # Define the name and path of any user-provided configuration (bootstrap) file that can be loaded 
 # to supply configuration options 
-org.openecomp.appc.bootstrap.file=appc.properties
-org.openecomp.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
+org.onap.appc.bootstrap.file=appc.properties
+org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
 
 appc.application.name=APPC
 
 #
 # Define the message resource bundle name to be loaded 
-org.openecomp.appc.resources=org/openecomp/appc/i18n/MessageResources
+org.onap.appc.resources=org/onap/appc/i18n/MessageResources
 #
 # The name of the adapter.
-org.openecomp.appc.provider.adaptor.name=org.openecomp.appc.appc_provider_adapter
+org.onap.appc.provider.adaptor.name=org.onap.appc.appc_provider_adapter
 #
 # Set up the logging environment
 #
-org.openecomp.appc.logging.file=org/openecomp/appc/logback.xml
-org.openecomp.appc.logging.path=${user.home};etc;../etc
-org.openecomp.appc.logger=org.openecomp.appc
-org.openecomp.appc.security.logger=org.openecomp.appc.security
+org.onap.appc.logging.file=org/onap/appc/logback.xml
+org.onap.appc.logging.path=${user.home};etc;../etc
+org.onap.appc.logger=org.onap.appc
+org.onap.appc.security.logger=org.onap.appc.security
 #
 # The minimum and maximum provider/tenant context pool sizes.  Min=1 means that as soon 
 # as the provider/tenant is referenced a Context is opened and added to the pool.  Max=0 
 # means that the upper bound on the pool is unbounded. 
-org.openecomp.appc.provider.min.pool=1
-org.openecomp.appc.provider.max.pool=0
+org.onap.appc.provider.min.pool=1
+org.onap.appc.provider.max.pool=0
 
 #
 # The following properties are used to configure the retry logic for connection to the 
 # IaaS provider(s).  The retry delay property is the amount of time, in seconds, the
 # application waits between retry attempts.  The retry limit is the number of retries
 # that are allowed before the request is failed.
-org.openecomp.appc.provider.retry.delay = 30
-org.openecomp.appc.provider.retry.limit = 10
+org.onap.appc.provider.retry.delay = 30
+org.onap.appc.provider.retry.limit = 10
 
 #
 # The trusted hosts list for SSL access when a certificate is not provided.
@@ -70,12 +70,12 @@ provider.trusted.hosts=*
 # The amount of time, in seconds, to wait for a server state change (start->stop, stop->start, etc).
 # If the server does not change state to a valid state within the alloted time, the operation 
 # fails.
-org.openecomp.appc.server.state.change.timeout=300
+org.onap.appc.server.state.change.timeout=300
 #
 # The amount of time to wait, in seconds, between subsequent polls to the OpenStack provider 
 # to refresh the status of a resource we are waiting on.
 #
-org.openecomp.appc.openstack.poll.interval=20
+org.onap.appc.openstack.poll.interval=20
 #
 # The connection information to connect to the provider we are using.  These properties 
 # are "structured" properties, in that the name is a compound name, where the nodes 
diff --git a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-features/pom.xml b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-features/pom.xml
index 32511435d..16d41128d 100644
--- a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-features/pom.xml
+++ b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-features/pom.xml
@@ -26,7 +26,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>appc-ansible-adapter</artifactId>
-    <groupId>org.openecomp.appc</groupId>
+    <groupId>org.onap.appc</groupId>
     <version>1.3.0-SNAPSHOT</version>
   </parent>
   <artifactId>appc-ansible-adapter-features</artifactId>
@@ -36,7 +36,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.openecomp.appc</groupId>
+      <groupId>org.onap.appc</groupId>
       <artifactId>appc-ansible-adapter-bundle</artifactId>
       <version>${project.version}</version>
     </dependency>
diff --git a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-features/src/main/resources/features.xml b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-features/src/main/resources/features.xml
index 64587b5c2..69d3b9b07 100644
--- a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-features/src/main/resources/features.xml
+++ b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-features/src/main/resources/features.xml
@@ -33,8 +33,8 @@
     <feature name='appc-ansible-adapter' description="appc-ansible-adapter" version='${project.version}'>
         <feature version="${odl.mdsal.version}">odl-mdsal-broker</feature>
         <feature>sdnc-sli</feature>
-         <bundle dependency="true">mvn:org.openecomp.appc/appc-common/${project.version}</bundle>
-        <bundle>mvn:org.openecomp.appc/appc-ansible-adapter-bundle/${project.version}</bundle>
+         <bundle dependency="true">mvn:org.onap.appc/appc-common/${project.version}</bundle>
+        <bundle>mvn:org.onap.appc/appc-ansible-adapter-bundle/${project.version}</bundle>
     </feature>
 
 </features>
diff --git a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-installer/pom.xml b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-installer/pom.xml
index 29ccc06ca..75fde2a63 100644
--- a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-installer/pom.xml
+++ b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-installer/pom.xml
@@ -26,7 +26,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <artifactId>appc-ansible-adapter</artifactId>
-        <groupId>org.openecomp.appc</groupId>
+        <groupId>org.onap.appc</groupId>
         <version>1.3.0-SNAPSHOT</version>
     </parent>
     <artifactId>appc-ansible-adapter-installer</artifactId>
@@ -35,12 +35,12 @@
     <properties>
         <application.name>appc-ansible-adapter</application.name>
         <features.boot>appc-ansible-adapter</features.boot>
-        <features.repositories>mvn:org.openecomp.appc/appc-ansible-adapter-features/${project.version}/xml/features</features.repositories>
+        <features.repositories>mvn:org.onap.appc/appc-ansible-adapter-features/${project.version}/xml/features</features.repositories>
         <include.transitive.dependencies>false</include.transitive.dependencies>
     </properties>
     <dependencies>
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>appc-ansible-adapter-features</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
@@ -52,7 +52,7 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>appc-ansible-adapter-bundle</artifactId>
             <version>${project.version}</version>
         </dependency>
diff --git a/appc-adapters/appc-ansible-adapter/pom.xml b/appc-adapters/appc-ansible-adapter/pom.xml
index fd91e620a..c1766bd50 100644
--- a/appc-adapters/appc-ansible-adapter/pom.xml
+++ b/appc-adapters/appc-ansible-adapter/pom.xml
@@ -26,7 +26,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/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.openecomp.appc</groupId>
+    <groupId>org.onap.appc</groupId>
     <artifactId>appc-adapters</artifactId>
     <version>1.3.0-SNAPSHOT</version>
   </parent>
@@ -150,7 +150,7 @@
     <dependencies>
 
       <dependency>
-        <groupId>org.openecomp.appc</groupId>
+        <groupId>org.onap.appc</groupId>
         <artifactId>appc-ansible-adapter-features</artifactId>
         <classifier>features</classifier>
         <type>xml</type>
@@ -158,7 +158,7 @@
       </dependency>
 
       <dependency>
-        <groupId>org.openecomp.appc</groupId>
+        <groupId>org.onap.appc</groupId>
         <artifactId>appc-ansible-adapter-provider</artifactId>
         <version>${project.version}</version>
       </dependency>
diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/pom.xml b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/pom.xml
index 743a90ecc..8f2674d10 100644
--- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/pom.xml
+++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/pom.xml
@@ -27,7 +27,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-chef-adapter</artifactId>
         <version>1.3.0-SNAPSHOT</version>
     </parent>
@@ -78,7 +78,7 @@
             <version>1.55</version>
         </dependency>
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>appc-common</artifactId>
             <version>${project.version}</version>
         </dependency>
@@ -224,8 +224,8 @@
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>appc-chef-adapter</Bundle-SymbolicName>
-                        <Bundle-Activator>org.openecomp.appc.adapter.chef.ChefActivator</Bundle-Activator>
-                        <Export-Package>org.openecomp.appc.adapter.chef</Export-Package>
+                        <Bundle-Activator>org.onap.appc.adapter.chef.ChefActivator</Bundle-Activator>
+                        <Export-Package>org.onap.appc.adapter.chef</Export-Package>
                         <Import-Package>
                             org.onap.ccsdk.sli.core.sli.*,org.osgi.framework.*,org.slf4j.*,com.vmware.*,org.apache.xerces.*,javax.net.*,javax.net.ssl.*,org.xml.sax.*,javax.xml.bind.*,javax.naming.*
                         </Import-Package>
diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/ChefActivator.java b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/ChefActivator.java
index c6f4c6589..6c798b4b2 100644
--- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/ChefActivator.java
+++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/ChefActivator.java
@@ -22,13 +22,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.chef;
+package org.onap.appc.adapter.chef;
 
-import org.openecomp.appc.Constants;
-import org.openecomp.appc.adapter.chef.impl.ChefAdapterImpl;
-import org.openecomp.appc.configuration.Configuration;
-import org.openecomp.appc.configuration.ConfigurationFactory;
-import org.openecomp.appc.i18n.Msg;
+import org.onap.appc.Constants;
+import org.onap.appc.adapter.chef.impl.ChefAdapterImpl;
+import org.onap.appc.configuration.Configuration;
+import org.onap.appc.configuration.ConfigurationFactory;
+import org.onap.appc.i18n.Msg;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 import org.osgi.framework.BundleActivator;
diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/ChefAdapter.java b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/ChefAdapter.java
index 4793ee708..d11db1c14 100644
--- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/ChefAdapter.java
+++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/ChefAdapter.java
@@ -22,11 +22,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.chef;
+package org.onap.appc.adapter.chef;
 
 import java.util.Map;
 
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.exceptions.APPCException;
 import com.att.cdp.zones.model.Server;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin;
@@ -47,24 +47,24 @@ public interface ChefAdapter extends SvcLogicJavaPlugin {
      * correct provider support through the CDP IaaS abstraction layer and can be OpenStackProvider, BareMetalProvider,
      * or any other supported provider type.
      */
-    static final String PROPERTY_PROVIDER_TYPE = "org.openecomp.appc.provider.type";
+    static final String PROPERTY_PROVIDER_TYPE = "org.onap.appc.provider.type";
 
     /**
      * The adapter maintains a cache of providers organized by the name of the provider, not its type. This is
      * equivalent to the system or installation name. All regions within the same installation are assumed to be the
      * same type.
      */
-    static final String PROPERTY_PROVIDER_NAME = "org.openecomp.appc.provider.name";
+    static final String PROPERTY_PROVIDER_NAME = "org.onap.appc.provider.name";
 
     /**
      * The fully-qualified URL of the instance to be manipulated as it is known to the provider.
      */
-    static final String PROPERTY_INSTANCE_URL = "org.openecomp.appc.instance.url";
+    static final String PROPERTY_INSTANCE_URL = "org.onap.appc.instance.url";
 
     /**
      * The fully-qualified URL of the instance to be manipulated as it is known to the provider.
      */
-    static final String PROPERTY_IDENTITY_URL = "org.openecomp.appc.identity.url";
+    static final String PROPERTY_IDENTITY_URL = "org.onap.appc.identity.url";
 
     /**
      * This method is used to restart an existing virtual machine given the fully qualified URL of the machine.
@@ -73,11 +73,11 @@ public interface ChefAdapter extends SvcLogicJavaPlugin {
      * passed to the method are passed as properties in a map. This method expects the following properties to be
      * defined:
      * <dl>
-     * <dt>org.openecomp.appc.provider.type</dt>
+     * <dt>org.onap.appc.provider.type</dt>
      * <dd>The appropriate provider type, such as <code>OpenStackProvider</code>. This is used by the CDP IaaS
      * abstraction layer to dynamically load and open a connection to the appropriate provider type. All CDP supported
      * provider types are legal.</dd>
-     * <dt>org.openecomp.appc.instance.url</dt>
+     * <dt>org.onap.appc.instance.url</dt>
      * <dd>The fully qualified URL of the instance to be restarted, as it is known to the provider (i.e., the self-link
      * URL of the server)</dd>
      * </dl>
@@ -103,11 +103,11 @@ public interface ChefAdapter extends SvcLogicJavaPlugin {
      * passed to the method are passed as properties in a map. This method expects the following properties to be
      * defined:
      * <dl>
-     * <dt>org.openecomp.appc.provider.type</dt>
+     * <dt>org.onap.appc.provider.type</dt>
      * <dd>The appropriate provider type, such as <code>OpenStackProvider</code>. This is used by the CDP IaaS
      * abstraction layer to dynamically load and open a connection to the appropriate provider type. All CDP supported
      * provider types are legal.</dd>
-     * <dt>org.openecomp.appc.instance.url</dt>
+     * <dt>org.onap.appc.instance.url</dt>
      * <dd>The fully qualified URL of the instance to be stopped, as it is known to the provider (i.e., the self-link
      * URL of the server)</dd>
      * </dl>
@@ -133,11 +133,11 @@ public interface ChefAdapter extends SvcLogicJavaPlugin {
      * passed to the method are passed as properties in a map. This method expects the following properties to be
      * defined:
      * <dl>
-     * <dt>org.openecomp.appc.provider.type</dt>
+     * <dt>org.onap.appc.provider.type</dt>
      * <dd>The appropriate provider type, such as <code>OpenStackProvider</code>. This is used by the CDP IaaS
      * abstraction layer to dynamically load and open a connection to the appropriate provider type. All CDP supported
      * provider types are legal.</dd>
-     * <dt>org.openecomp.appc.instance.url</dt>
+     * <dt>org.onap.appc.instance.url</dt>
      * <dd>The fully qualified URL of the instance to be started, as it is known to the provider (i.e., the self-link
      * URL of the server)</dd>
      * </dl>
@@ -163,11 +163,11 @@ public interface ChefAdapter extends SvcLogicJavaPlugin {
      * passed to the method are passed as properties in a map. This method expects the following properties to be
      * defined:
      * <dl>
-     * <dt>org.openecomp.appc.provider.type</dt>
+     * <dt>org.onap.appc.provider.type</dt>
      * <dd>The appropriate provider type, such as <code>OpenStackProvider</code>. This is used by the CDP IaaS
      * abstraction layer to dynamically load and open a connection to the appropriate provider type. All CDP supported
      * provider types are legal.</dd>
-     * <dt>org.openecomp.appc.instance.url</dt>
+     * <dt>org.onap.appc.instance.url</dt>
      * <dd>The fully qualified URL of the instance to be rebuilt, as it is known to the provider (i.e., the self-link
      * URL of the server)</dd>
      * </dl>
diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/chefapi/ApiMethod.java b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/chefapi/ApiMethod.java
index de4f31a04..38c4dd354 100644
--- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/chefapi/ApiMethod.java
+++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/chefapi/ApiMethod.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.chef.chefapi;
+package org.onap.appc.adapter.chef.chefapi;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -33,7 +33,7 @@ import org.apache.http.Header;
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.methods.HttpRequestBase;
 import org.apache.http.util.EntityUtils;
-import org.openecomp.appc.adapter.chef.chefclient.Utils;
+import org.onap.appc.adapter.chef.chefclient.Utils;
 
 import org.apache.http.HttpEntity;
 import org.apache.http.impl.client.HttpClients;
diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/chefapi/Delete.java b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/chefapi/Delete.java
index 85206af36..5fa8a3fae 100644
--- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/chefapi/Delete.java
+++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/chefapi/Delete.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.chef.chefapi;
+package org.onap.appc.adapter.chef.chefapi;
 
 import org.apache.http.client.methods.HttpDelete;
 
diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/chefapi/Get.java b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/chefapi/Get.java
index 948bff6af..da37236a7 100644
--- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/chefapi/Get.java
+++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/chefapi/Get.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.chef.chefapi;
+package org.onap.appc.adapter.chef.chefapi;
 
 import org.apache.http.client.methods.HttpGet;
 
diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/chefapi/Post.java b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/chefapi/Post.java
index 5e00b09a4..3234eeefa 100644
--- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/chefapi/Post.java
+++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/chefapi/Post.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.chef.chefapi;
+package org.onap.appc.adapter.chef.chefapi;
 
 import org.apache.http.client.methods.*;
 import org.apache.http.entity.StringEntity;
diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/chefapi/Put.java b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/chefapi/Put.java
index fa57c1117..c96fc64d1 100644
--- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/chefapi/Put.java
+++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/chefapi/Put.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.chef.chefapi;
+package org.onap.appc.adapter.chef.chefapi;
 
 import org.apache.http.client.methods.*;
 import org.apache.http.entity.StringEntity;
diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/chefclient/ChefApiClient.java b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/chefclient/ChefApiClient.java
index 7aa63193b..d7080fc12 100644
--- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/chefclient/ChefApiClient.java
+++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/chefclient/ChefApiClient.java
@@ -22,9 +22,9 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.chef.chefclient;
+package org.onap.appc.adapter.chef.chefclient;
 import org.apache.http.client.methods.*;
-import org.openecomp.appc.adapter.chef.chefapi.*;
+import org.onap.appc.adapter.chef.chefapi.*;
 
 public class ChefApiClient {
     private String endpoint;
diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/chefclient/Utils.java b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/chefclient/Utils.java
index 393069dfd..71182c497 100644
--- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/chefclient/Utils.java
+++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/chefclient/Utils.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.chef.chefclient;
+package org.onap.appc.adapter.chef.chefclient;
 
 import java.io.BufferedReader;
 import java.io.FileReader;
diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/impl/ChefAdapterImpl.java b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/impl/ChefAdapterImpl.java
index ab853dcc4..824a6af95 100644
--- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/impl/ChefAdapterImpl.java
+++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/impl/ChefAdapterImpl.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.chef.impl;
+package org.onap.appc.adapter.chef.impl;
 
 import java.io.File;
 import java.util.Map;
@@ -34,12 +34,12 @@ import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.util.EntityUtils;
 import org.json.JSONObject;
-import org.openecomp.appc.Constants;
-import org.openecomp.appc.adapter.chef.ChefAdapter;
-import org.openecomp.appc.adapter.chef.chefapi.ApiMethod;
-import org.openecomp.appc.adapter.chef.chefclient.ChefApiClient;
-import org.openecomp.appc.configuration.Configuration;
-import org.openecomp.appc.configuration.ConfigurationFactory;
+import org.onap.appc.Constants;
+import org.onap.appc.adapter.chef.ChefAdapter;
+import org.onap.appc.adapter.chef.chefapi.ApiMethod;
+import org.onap.appc.adapter.chef.chefclient.ChefApiClient;
+import org.onap.appc.configuration.Configuration;
+import org.onap.appc.configuration.ConfigurationFactory;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 
 import com.att.eelf.configuration.EELFLogger;
@@ -69,7 +69,7 @@ public class ChefAdapterImpl implements ChefAdapter {
     private final EELFLogger logger = EELFManager.getInstance().getLogger(ChefAdapterImpl.class);
 
     private final String CANNOT_FIND_PRIVATE_KEY_STR = "Cannot find the private key in the APPC file system, please load the private key to ";
-    private final String CHEF_ACTION_STR = "org.openecomp.appc.instance.chefAction";
+    private final String CHEF_ACTION_STR = "org.onap.appc.instance.chefAction";
     private final String ORGANIZATIONS_STR = "/organizations/";
     /**
      * A reference to the adapter configuration object.
@@ -106,7 +106,7 @@ public class ChefAdapterImpl implements ChefAdapter {
      * Returns the symbolic name of the adapter
      *
      * @return The adapter name
-     * @see org.openecomp.appc.adapter.chef.ChefAdapter#getAdapterName()
+     * @see org.onap.appc.adapter.chef.ChefAdapter#getAdapterName()
      */
     @Override
     public String getAdapterName() {
@@ -119,12 +119,12 @@ public class ChefAdapterImpl implements ChefAdapter {
     @Override
     public void nodeObejctBuilder(Map<String, String> params, SvcLogicContext ctx) {
         logger.info("nodeObejctBuilder");
-        String name = params.get("org.openecomp.appc.instance.nodeobject.name");
-        String normal = params.get("org.openecomp.appc.instance.nodeobject.normal");
-        String overrides = params.get("org.openecomp.appc.instance.nodeobject.overrides");
-        String defaults = params.get("org.openecomp.appc.instance.nodeobject.defaults");
-        String runList = params.get("org.openecomp.appc.instance.nodeobject.run_list");
-        String chefEnvironment = params.get("org.openecomp.appc.instance.nodeobject.chef_environment");
+        String name = params.get("org.onap.appc.instance.nodeobject.name");
+        String normal = params.get("org.onap.appc.instance.nodeobject.normal");
+        String overrides = params.get("org.onap.appc.instance.nodeobject.overrides");
+        String defaults = params.get("org.onap.appc.instance.nodeobject.defaults");
+        String runList = params.get("org.onap.appc.instance.nodeobject.run_list");
+        String chefEnvironment = params.get("org.onap.appc.instance.nodeobject.chef_environment");
         String nodeObject = "{\"json_class\":\"Chef::Node\",\"default\":{" + defaults
                 + "},\"chef_type\":\"node\",\"run_list\":[" + runList + "],\"override\":{" + overrides
                 + "},\"normal\": {" + normal + "},\"automatic\":{},\"name\":\"" + name + "\",\"chef_environment\":\""
@@ -134,19 +134,19 @@ public class ChefAdapterImpl implements ChefAdapter {
         RequestContext rc = new RequestContext(ctx);
         rc.isAlive();
         SvcLogicContext svcLogic = rc.getSvcLogicContext();
-        svcLogic.setAttribute("org.openecomp.appc.chef.nodeObject", nodeObject);
+        svcLogic.setAttribute("org.onap.appc.chef.nodeObject", nodeObject);
     }
 
     /**
      * send get request to chef server
      */
     public void chefInfo(Map<String, String> params) {
-        clientName = params.get("org.openecomp.appc.instance.username");
-        serverAddress = params.get("org.openecomp.appc.instance.serverAddress");
-        organizations = params.get("org.openecomp.appc.instance.organizations");
+        clientName = params.get("org.onap.appc.instance.username");
+        serverAddress = params.get("org.onap.appc.instance.serverAddress");
+        organizations = params.get("org.onap.appc.instance.organizations");
         chefserver = "https://" + serverAddress + ORGANIZATIONS_STR + organizations;
-        if (params.containsKey("org.openecomp.appc.instance.pemPath")) {
-            clientPrivatekey = params.get("org.openecomp.appc.instance.pemPath");
+        if (params.containsKey("org.onap.appc.instance.pemPath")) {
+            clientPrivatekey = params.get("org.onap.appc.instance.pemPath");
         } else {
             clientPrivatekey = "/opt/app/bvc/chef/" + serverAddress + "/" + organizations + "/" + clientName + ".pem";
         }
@@ -159,9 +159,9 @@ public class ChefAdapterImpl implements ChefAdapter {
 
     @Override
     public void retrieveData(Map<String, String> params, SvcLogicContext ctx) {
-        String allConfigData = params.get("org.openecomp.appc.instance.allConfig");
-        String key = params.get("org.openecomp.appc.instance.key");
-        String dgContext = params.get("org.openecomp.appc.instance.dgContext");
+        String allConfigData = params.get("org.onap.appc.instance.allConfig");
+        String key = params.get("org.onap.appc.instance.key");
+        String dgContext = params.get("org.onap.appc.instance.dgContext");
         JSONObject josnConfig = new JSONObject(allConfigData);
 
         String contextData;
@@ -184,9 +184,9 @@ public class ChefAdapterImpl implements ChefAdapter {
     @Override
     public void combineStrings(Map<String, String> params, SvcLogicContext ctx) {
 
-        String string1 = params.get("org.openecomp.appc.instance.String1");
-        String string2 = params.get("org.openecomp.appc.instance.String2");
-        String dgContext = params.get("org.openecomp.appc.instance.dgContext");
+        String string1 = params.get("org.onap.appc.instance.String1");
+        String string2 = params.get("org.onap.appc.instance.String2");
+        String dgContext = params.get("org.onap.appc.instance.dgContext");
         String contextData = string1 + string2;
         RequestContext rc = new RequestContext(ctx);
         rc.isAlive();
@@ -226,7 +226,7 @@ public class ChefAdapterImpl implements ChefAdapter {
     public void chefPut(Map<String, String> params, SvcLogicContext ctx) {
         chefInfo(params);
         String chefAction = params.get(CHEF_ACTION_STR);
-        String chefNodeStr = params.get("org.openecomp.appc.instance.chefRequestBody");
+        String chefNodeStr = params.get("org.onap.appc.instance.chefRequestBody");
         RequestContext rc = new RequestContext(ctx);
         rc.isAlive();
         int code;
@@ -254,7 +254,7 @@ public class ChefAdapterImpl implements ChefAdapter {
         chefInfo(params);
         logger.info("chef Post method");
         logger.info(clientName + " " + clientPrivatekey + " " + chefserver + " " + organizations);
-        String chefNodeStr = params.get("org.openecomp.appc.instance.chefRequestBody");
+        String chefNodeStr = params.get("org.onap.appc.instance.chefRequestBody");
         String chefAction = params.get(CHEF_ACTION_STR);
 
         RequestContext rc = new RequestContext(ctx);
@@ -311,7 +311,7 @@ public class ChefAdapterImpl implements ChefAdapter {
     @Override
     public void trigger(Map<String, String> params, SvcLogicContext ctx) {
         logger.info("Run trigger method");
-        String tVmIp = params.get("org.openecomp.appc.instance.ip");
+        String tVmIp = params.get("org.onap.appc.instance.ip");
         RequestContext rc = new RequestContext(ctx);
         rc.isAlive();
 
@@ -332,9 +332,9 @@ public class ChefAdapterImpl implements ChefAdapter {
     @Override
     public void checkPushJob(Map<String, String> params, SvcLogicContext ctx) {
         chefInfo(params);
-        String jobID = params.get("org.openecomp.appc.instance.jobid");
-        int retryTimes = Integer.parseInt(params.get("org.openecomp.appc.instance.retryTimes"));
-        int retryInterval = Integer.parseInt(params.get("org.openecomp.appc.instance.retryInterval"));
+        String jobID = params.get("org.onap.appc.instance.jobid");
+        int retryTimes = Integer.parseInt(params.get("org.onap.appc.instance.retryTimes"));
+        int retryInterval = Integer.parseInt(params.get("org.onap.appc.instance.retryInterval"));
         String chefAction = "/pushy/jobs/" + jobID;
 
         RequestContext rc = new RequestContext(ctx);
@@ -362,15 +362,15 @@ public class ChefAdapterImpl implements ChefAdapter {
 
         }
         if ("complete".equals(status)) {
-            svcLogic.setAttribute("org.openecomp.appc.chefServerResult.code", "200");
-            svcLogic.setAttribute("org.openecomp.appc.chefServerResult.message", message);
+            svcLogic.setAttribute("org.onap.appc.chefServerResult.code", "200");
+            svcLogic.setAttribute("org.onap.appc.chefServerResult.message", message);
         } else {
             if ("running".equals(status)) {
-                svcLogic.setAttribute("org.openecomp.appc.chefServerResult.code", "202");
-                svcLogic.setAttribute("org.openecomp.appc.chefServerResult.message", "chef client runtime out");
+                svcLogic.setAttribute("org.onap.appc.chefServerResult.code", "202");
+                svcLogic.setAttribute("org.onap.appc.chefServerResult.message", "chef client runtime out");
             } else {
-                svcLogic.setAttribute("org.openecomp.appc.chefServerResult.code", "500");
-                svcLogic.setAttribute("org.openecomp.appc.chefServerResult.message", message);
+                svcLogic.setAttribute("org.onap.appc.chefServerResult.code", "500");
+                svcLogic.setAttribute("org.onap.appc.chefServerResult.message", message);
             }
         }
     }
@@ -378,7 +378,7 @@ public class ChefAdapterImpl implements ChefAdapter {
     @Override
     public void pushJob(Map<String, String> params, SvcLogicContext ctx) {
         chefInfo(params);
-        String pushRequest = params.get("org.openecomp.appc.instance.pushRequest");
+        String pushRequest = params.get("org.onap.appc.instance.pushRequest");
         String chefAction = "/pushy/jobs";
         RequestContext rc = new RequestContext(ctx);
         rc.isAlive();
@@ -393,7 +393,7 @@ public class ChefAdapterImpl implements ChefAdapter {
             int startIndex = message.indexOf("jobs") + 6;
             int endIndex = message.length() - 2;
             String jobID = message.substring(startIndex, endIndex);
-            svcLogic.setAttribute("org.openecomp.appc.jobID", jobID);
+            svcLogic.setAttribute("org.onap.appc.jobID", jobID);
             logger.info(jobID);
         }
         chefServerResult(rc, Integer.toString(code), message);
@@ -413,8 +413,8 @@ public class ChefAdapterImpl implements ChefAdapter {
             logger.info("Couldn't covert " + code + " to an Integer, defaulting status to 500", e);
             status = "500";
         }
-        svcLogic.setAttribute("org.openecomp.appc.chefAgent.code", status);
-        svcLogic.setAttribute("org.openecomp.appc.chefAgent.message", msg);
+        svcLogic.setAttribute("org.onap.appc.chefAgent.code", status);
+        svcLogic.setAttribute("org.onap.appc.chefAgent.message", msg);
     }
 
     /**
@@ -424,21 +424,21 @@ public class ChefAdapterImpl implements ChefAdapter {
      */
     private void doSuccess(RequestContext rc) {
         SvcLogicContext svcLogic = rc.getSvcLogicContext();
-        svcLogic.setAttribute("org.openecomp.appc.chefAgent.code", "200");
+        svcLogic.setAttribute("org.onap.appc.chefAgent.code", "200");
     }
 
     private void chefServerResult(RequestContext rc, String code, String message) {
         SvcLogicContext svcLogic = rc.getSvcLogicContext();
         svcLogic.setStatus(OUTCOME_SUCCESS);
-        svcLogic.setAttribute("org.openecomp.appc.chefServerResult.code", code);
-        svcLogic.setAttribute("org.openecomp.appc.chefServerResult.message", message);
+        svcLogic.setAttribute("org.onap.appc.chefServerResult.code", code);
+        svcLogic.setAttribute("org.onap.appc.chefServerResult.message", message);
     }
 
     private void chefClientResult(RequestContext rc, String code, String message) {
         SvcLogicContext svcLogic = rc.getSvcLogicContext();
         svcLogic.setStatus(OUTCOME_SUCCESS);
-        svcLogic.setAttribute("org.openecomp.appc.chefClientResult.code", code);
-        svcLogic.setAttribute("org.openecomp.appc.chefClientResult.message", message);
+        svcLogic.setAttribute("org.onap.appc.chefClientResult.code", code);
+        svcLogic.setAttribute("org.onap.appc.chefClientResult.message", message);
     }
 
     /**
diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/impl/RequestContext.java b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/impl/RequestContext.java
index a3ecf857c..3c0e00a6a 100644
--- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/impl/RequestContext.java
+++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/impl/RequestContext.java
@@ -22,11 +22,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.chef.impl;
+package org.onap.appc.adapter.chef.impl;
 
-import org.openecomp.appc.Constants;
-import org.openecomp.appc.configuration.Configuration;
-import org.openecomp.appc.configuration.ConfigurationFactory;
+import org.onap.appc.Constants;
+import org.onap.appc.configuration.Configuration;
+import org.onap.appc.configuration.ConfigurationFactory;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 
 /**
diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/resources/org/openecomp/appc/default.properties b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/resources/org/openecomp/appc/default.properties
index 6b3ca8d5a..c00220dd6 100644
--- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/resources/org/openecomp/appc/default.properties
+++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/resources/org/openecomp/appc/default.properties
@@ -29,38 +29,38 @@
 #
 # Define the name and path of any user-provided configuration (bootstrap) file that can be loaded 
 # to supply configuration options 
-org.openecomp.appc.bootstrap.file=appc.properties
-org.openecomp.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
+org.onap.appc.bootstrap.file=appc.properties
+org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
 
 appc.application.name=APPC
 
 #
 # Define the message resource bundle name to be loaded 
-org.openecomp.appc.resources=org/openecomp/appc/i18n/MessageResources
+org.onap.appc.resources=org/onap/appc/i18n/MessageResources
 #
 # The name of the adapter.
-org.openecomp.appc.provider.adaptor.name=org.openecomp.appc.appc_provider_adapter
+org.onap.appc.provider.adaptor.name=org.onap.appc.appc_provider_adapter
 #
 # Set up the logging environment
 #
-org.openecomp.appc.logging.file=org/openecomp/appc/logback.xml
-org.openecomp.appc.logging.path=${user.home};etc;../etc
-org.openecomp.appc.logger=org.openecomp.appc
-org.openecomp.appc.security.logger=org.openecomp.appc.security
+org.onap.appc.logging.file=org/onap/appc/logback.xml
+org.onap.appc.logging.path=${user.home};etc;../etc
+org.onap.appc.logger=org.onap.appc
+org.onap.appc.security.logger=org.onap.appc.security
 #
 # The minimum and maximum provider/tenant context pool sizes.  Min=1 means that as soon 
 # as the provider/tenant is referenced a Context is opened and added to the pool.  Max=0 
 # means that the upper bound on the pool is unbounded. 
-org.openecomp.appc.provider.min.pool=1
-org.openecomp.appc.provider.max.pool=0
+org.onap.appc.provider.min.pool=1
+org.onap.appc.provider.max.pool=0
 
 #
 # The following properties are used to configure the retry logic for connection to the 
 # IaaS provider(s).  The retry delay property is the amount of time, in seconds, the
 # application waits between retry attempts.  The retry limit is the number of retries
 # that are allowed before the request is failed.
-org.openecomp.appc.provider.retry.delay = 30
-org.openecomp.appc.provider.retry.limit = 10
+org.onap.appc.provider.retry.delay = 30
+org.onap.appc.provider.retry.limit = 10
 
 #
 # The trusted hosts list for SSL access when a certificate is not provided.
@@ -70,12 +70,12 @@ provider.trusted.hosts=*
 # The amount of time, in seconds, to wait for a server state change (start->stop, stop->start, etc).
 # If the server does not change state to a valid state within the alloted time, the operation 
 # fails.
-org.openecomp.appc.server.state.change.timeout=300
+org.onap.appc.server.state.change.timeout=300
 #
 # The amount of time to wait, in seconds, between subsequent polls to the OpenStack provider 
 # to refresh the status of a resource we are waiting on.
 #
-org.openecomp.appc.openstack.poll.interval=20
+org.onap.appc.openstack.poll.interval=20
 #
 # The connection information to connect to the provider we are using.  These properties 
 # are "structured" properties, in that the name is a compound name, where the nodes 
diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/java/org/openecomp/appc/adapter/chef/chefclient/TestChefApiClient.java b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/java/org/openecomp/appc/adapter/chef/chefclient/TestChefApiClient.java
index 3dc9ff20d..5ea152a8d 100644
--- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/java/org/openecomp/appc/adapter/chef/chefclient/TestChefApiClient.java
+++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/java/org/openecomp/appc/adapter/chef/chefclient/TestChefApiClient.java
@@ -1,4 +1,4 @@
-package org.openecomp.appc.adapter.chef.chefclient;
+package org.onap.appc.adapter.chef.chefclient;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -14,11 +14,11 @@ import java.util.regex.Pattern;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.openecomp.appc.adapter.chef.chefapi.ApiMethod;
-import org.openecomp.appc.adapter.chef.chefapi.Delete;
-import org.openecomp.appc.adapter.chef.chefapi.Get;
-import org.openecomp.appc.adapter.chef.chefapi.Post;
-import org.openecomp.appc.adapter.chef.chefapi.Put;
+import org.onap.appc.adapter.chef.chefapi.ApiMethod;
+import org.onap.appc.adapter.chef.chefapi.Delete;
+import org.onap.appc.adapter.chef.chefapi.Get;
+import org.onap.appc.adapter.chef.chefapi.Post;
+import org.onap.appc.adapter.chef.chefapi.Put;
 
 public class TestChefApiClient {
 
@@ -41,16 +41,16 @@ public class TestChefApiClient {
             fail("Could not initialize properties");
         }
         client = new ChefApiClient(
-                props.getProperty("org.openecomp.appc.adapter.chef.chefclient.userId"),
+                props.getProperty("org.onap.appc.adapter.chef.chefclient.userId"),
                 System.getProperty("user.dir") +
-                        props.getProperty("org.openecomp.appc.adapter.chef.chefclient.pemPath"),
-                props.getProperty("org.openecomp.appc.adapter.chef.chefclient.endPoint"),
-                props.getProperty("org.openecomp.appc.adapter.chef.chefclient.organizations"));
+                        props.getProperty("org.onap.appc.adapter.chef.chefclient.pemPath"),
+                props.getProperty("org.onap.appc.adapter.chef.chefclient.endPoint"),
+                props.getProperty("org.onap.appc.adapter.chef.chefclient.organizations"));
     }
 
     @Test
     public void testGet(){
-        Get get = client.get(props.getProperty("org.openecomp.appc.adapter.chef.chefclient.path"));
+        Get get = client.get(props.getProperty("org.onap.appc.adapter.chef.chefclient.path"));
         ApiMethod method = get.createRequest();
         String[] response = method.test.split("\n");
 
@@ -59,7 +59,7 @@ public class TestChefApiClient {
 
     @Test
     public void testPut(){
-        Put put = client.put(props.getProperty("org.openecomp.appc.adapter.chef.chefclient.path"));
+        Put put = client.put(props.getProperty("org.onap.appc.adapter.chef.chefclient.path"));
         ApiMethod method = put.createRequest();
         String[] response = method.test.split("\n");
 
@@ -68,7 +68,7 @@ public class TestChefApiClient {
 
     @Test
     public void testPost() {
-        Post post = client.post(props.getProperty("org.openecomp.appc.adapter.chef.chefclient.path"));
+        Post post = client.post(props.getProperty("org.onap.appc.adapter.chef.chefclient.path"));
         ApiMethod method = post.createRequest();
         String[] response = method.test.split("\n");
 
@@ -77,7 +77,7 @@ public class TestChefApiClient {
 
     @Test
     public void testDelete(){
-        Delete delete = client.delete(props.getProperty("org.openecomp.appc.adapter.chef.chefclient.path"));
+        Delete delete = client.delete(props.getProperty("org.onap.appc.adapter.chef.chefclient.path"));
         ApiMethod method = delete.createRequest();
         String[] response = method.test.split("\n");
 
diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/java/org/openecomp/appc/adapter/chef/impl/TestChefAdapterImpl.java b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/java/org/openecomp/appc/adapter/chef/impl/TestChefAdapterImpl.java
index bb63d342c..687ba8338 100644
--- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/java/org/openecomp/appc/adapter/chef/impl/TestChefAdapterImpl.java
+++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/java/org/openecomp/appc/adapter/chef/impl/TestChefAdapterImpl.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.chef.impl;
+package org.onap.appc.adapter.chef.impl;
 
 import static org.junit.Assert.assertEquals;
 
@@ -33,7 +33,7 @@ import java.util.Map;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.exceptions.APPCException;
 import com.att.cdp.exceptions.ZoneException;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 
@@ -49,7 +49,7 @@ public class TestChefAdapterImpl {
     public void setup() {
         adapter = new ChefAdapterImpl(Boolean.TRUE);
         params = new HashMap<>();
-        params.put("org.openecomp.appc.instance.pemPath",
+        params.put("org.onap.appc.instance.pemPath",
                 "/src/test/resources/testclient.pem");
     }
 
@@ -63,7 +63,7 @@ public class TestChefAdapterImpl {
     @Test
     public void testChefGetFail() throws IOException, IllegalStateException, IllegalArgumentException,
             ZoneException, APPCException {
-        params.put("org.openecomp.appc.instance.chefAction", "/nodes");
+        params.put("org.onap.appc.instance.chefAction", "/nodes");
 
         givenParams(params, "chefGet");
         thenResponseShouldFail();
@@ -72,10 +72,10 @@ public class TestChefAdapterImpl {
     @Test
     public void testChefPutFail() throws IOException, IllegalStateException, IllegalArgumentException,
             ZoneException, APPCException {
-        params.put("org.openecomp.appc.instance.chefAction", "/nodes/testnode");
-        params.put("org.openecomp.appc.instance.runList", "recipe[commandtest]");
-        params.put("org.openecomp.appc.instance.attributes", "");
-        params.put("org.openecomp.appc.instance.chefRequestBody", "Test Body");
+        params.put("org.onap.appc.instance.chefAction", "/nodes/testnode");
+        params.put("org.onap.appc.instance.runList", "recipe[commandtest]");
+        params.put("org.onap.appc.instance.attributes", "");
+        params.put("org.onap.appc.instance.chefRequestBody", "Test Body");
 
         givenParams(params, "chefPut");
         thenResponseShouldFail();
@@ -84,7 +84,7 @@ public class TestChefAdapterImpl {
     @Test
     public void testTriggerFail() throws IOException, IllegalStateException, IllegalArgumentException,
             ZoneException, APPCException {
-        params.put("org.openecomp.appc.instance.ip", "");
+        params.put("org.onap.appc.instance.ip", "");
 
         givenParams(params, "trigger");
         thenResponseShouldFail();
@@ -94,15 +94,15 @@ public class TestChefAdapterImpl {
         svcContext = new SvcLogicContext();
         if (method == "chefGet"){
             adapter.chefGet(adapterParams, svcContext);
-            getAttribute = "org.openecomp.appc.chefServerResult.code";
+            getAttribute = "org.onap.appc.chefServerResult.code";
         }
         if (method == "chefPut"){
             adapter.chefPut(adapterParams, svcContext);
-            getAttribute = "org.openecomp.appc.chefServerResult.code";
+            getAttribute = "org.onap.appc.chefServerResult.code";
         }
         if (method == "trigger"){
             adapter.trigger(adapterParams, svcContext);
-            getAttribute = "org.openecomp.appc.chefAgent.code";
+            getAttribute = "org.onap.appc.chefAgent.code";
         }
     }
 
diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/java/org/openecomp/appc/test/ExecutorHarness.java b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/java/org/openecomp/appc/test/ExecutorHarness.java
index 62470cc01..13b5fdfb3 100644
--- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/java/org/openecomp/appc/test/ExecutorHarness.java
+++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/java/org/openecomp/appc/test/ExecutorHarness.java
@@ -23,7 +23,7 @@
  */
 
 
-package org.openecomp.appc.test;
+package org.onap.appc.test;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
@@ -32,7 +32,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.openecomp.appc.test.InterceptLogger;
+import org.onap.appc.test.InterceptLogger;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin;
 
diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/java/org/openecomp/appc/test/InterceptLogger.java b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/java/org/openecomp/appc/test/InterceptLogger.java
index 8a06b31be..b101ecee4 100644
--- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/java/org/openecomp/appc/test/InterceptLogger.java
+++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/java/org/openecomp/appc/test/InterceptLogger.java
@@ -23,7 +23,7 @@
  */
 
 
-package org.openecomp.appc.test;
+package org.onap.appc.test;
 
 import java.text.MessageFormat;
 import java.util.ArrayList;
diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/resources/org/openecomp/appc/default.properties b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/resources/org/openecomp/appc/default.properties
index c781956d7..bb888132a 100644
--- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/resources/org/openecomp/appc/default.properties
+++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/resources/org/openecomp/appc/default.properties
@@ -29,38 +29,38 @@
 #
 # Define the name and path of any user-provided configuration (bootstrap) file that can be loaded 
 # to supply configuration options 
-org.openecomp.appc.bootstrap.file=appc.properties
-org.openecomp.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
+org.onap.appc.bootstrap.file=appc.properties
+org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
 
 appc.application.name=APPC
 
 #
 # Define the message resource bundle name to be loaded 
-org.openecomp.appc.resources=org/openecomp/appc/i18n/MessageResources
+org.onap.appc.resources=org/onap/appc/i18n/MessageResources
 #
 # The name of the adapter.
-org.openecomp.appc.provider.adaptor.name=org.openecomp.appc.appc_provider_adapter
+org.onap.appc.provider.adaptor.name=org.onap.appc.appc_provider_adapter
 #
 # Set up the logging environment
 #
-org.openecomp.appc.logging.file=org/openecomp/appc/logback.xml
-org.openecomp.appc.logging.path=${user.home};etc;../etc
-org.openecomp.appc.logger=org.openecomp.appc
-org.openecomp.appc.security.logger=org.openecomp.appc.security
+org.onap.appc.logging.file=org/onap/appc/logback.xml
+org.onap.appc.logging.path=${user.home};etc;../etc
+org.onap.appc.logger=org.onap.appc
+org.onap.appc.security.logger=org.onap.appc.security
 #
 # The minimum and maximum provider/tenant context pool sizes.  Min=1 means that as soon 
 # as the provider/tenant is referenced a Context is opened and added to the pool.  Max=0 
 # means that the upper bound on the pool is unbounded. 
-org.openecomp.appc.provider.min.pool=1
-org.openecomp.appc.provider.max.pool=0
+org.onap.appc.provider.min.pool=1
+org.onap.appc.provider.max.pool=0
 
 #
 # The following properties are used to configure the retry logic for connection to the 
 # IaaS provider(s).  The retry delay property is the amount of time, in seconds, the
 # application waits between retry attempts.  The retry limit is the number of retries
 # that are allowed before the request is failed.
-org.openecomp.appc.provider.retry.delay = 30
-org.openecomp.appc.provider.retry.limit = 10
+org.onap.appc.provider.retry.delay = 30
+org.onap.appc.provider.retry.limit = 10
 
 #
 # The trusted hosts list for SSL access when a certificate is not provided.
@@ -70,12 +70,12 @@ provider.trusted.hosts=*
 # The amount of time, in seconds, to wait for a server state change (start->stop, stop->start, etc).
 # If the server does not change state to a valid state within the alloted time, the operation 
 # fails.
-org.openecomp.appc.server.state.change.timeout=300
+org.onap.appc.server.state.change.timeout=300
 #
 # The amount of time to wait, in seconds, between subsequent polls to the OpenStack provider 
 # to refresh the status of a resource we are waiting on.
 #
-org.openecomp.appc.openstack.poll.interval=20
+org.onap.appc.openstack.poll.interval=20
 #
 # The connection information to connect to the provider we are using.  These properties 
 # are "structured" properties, in that the name is a compound name, where the nodes 
diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/resources/test.properties b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/resources/test.properties
index 4805e4316..2623f283a 100644
--- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/resources/test.properties
+++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/resources/test.properties
@@ -1,5 +1,5 @@
-org.openecomp.appc.adapter.chef.chefclient.userId=test
-org.openecomp.appc.adapter.chef.chefclient.pemPath=/src/test/resources/testclient.pem
-org.openecomp.appc.adapter.chef.chefclient.endPoint=http://test.com
-org.openecomp.appc.adapter.chef.chefclient.organizations=onap
-org.openecomp.appc.adapter.chef.chefclient.path=/test/path
+org.onap.appc.adapter.chef.chefclient.userId=test
+org.onap.appc.adapter.chef.chefclient.pemPath=/src/test/resources/testclient.pem
+org.onap.appc.adapter.chef.chefclient.endPoint=http://test.com
+org.onap.appc.adapter.chef.chefclient.organizations=onap
+org.onap.appc.adapter.chef.chefclient.path=/test/path
diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-features/pom.xml b/appc-adapters/appc-chef-adapter/appc-chef-adapter-features/pom.xml
index 8028ac163..98f78ffca 100644
--- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-features/pom.xml
+++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-features/pom.xml
@@ -28,7 +28,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <artifactId>appc-chef-adapter</artifactId>
-        <groupId>org.openecomp.appc</groupId>
+        <groupId>org.onap.appc</groupId>
         <version>1.3.0-SNAPSHOT</version>
     </parent>
 
@@ -42,7 +42,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>appc-chef-adapter-bundle</artifactId>
             <version>${project.version}</version>
         </dependency>
diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-features/src/main/resources/features.xml b/appc-adapters/appc-chef-adapter/appc-chef-adapter-features/src/main/resources/features.xml
index 81795cf70..e3cd710b6 100644
--- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-features/src/main/resources/features.xml
+++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-features/src/main/resources/features.xml
@@ -34,8 +34,8 @@
         <!-- Most applications will have a dependency on the ODL MD-SAL Broker -->
         <feature version="${odl.mdsal.version}">odl-mdsal-broker</feature>
         <feature>sdnc-sli</feature>
-        <bundle dependency="true">mvn:org.openecomp.appc/appc-common/${project.version}</bundle>
-        <bundle>mvn:org.openecomp.appc/appc-chef-adapter-bundle/${project.version}</bundle>
+        <bundle dependency="true">mvn:org.onap.appc/appc-common/${project.version}</bundle>
+        <bundle>mvn:org.onap.appc/appc-chef-adapter-bundle/${project.version}</bundle>
     </feature>
 
 </features>
diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-installer/pom.xml b/appc-adapters/appc-chef-adapter/appc-chef-adapter-installer/pom.xml
index 803117722..f272bd123 100644
--- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-installer/pom.xml
+++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-installer/pom.xml
@@ -28,7 +28,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <artifactId>appc-chef-adapter</artifactId>
-        <groupId>org.openecomp.appc</groupId>
+        <groupId>org.onap.appc</groupId>
         <version>1.3.0-SNAPSHOT</version>
     </parent>
     <artifactId>appc-chef-adapter-installer</artifactId>
@@ -38,14 +38,14 @@
         <application.name>appc-chef-adapter</application.name>
         <features.boot>appc-chef-adapter</features.boot>
         <features.repositories>
-            mvn:org.openecomp.appc/appc-chef-adapter-features/${project.version}/xml/features
+            mvn:org.onap.appc/appc-chef-adapter-features/${project.version}/xml/features
         </features.repositories>
         <include.transitive.dependencies>false</include.transitive.dependencies>
         <licenseDir>${project.parent.parent.parent.basedir}</licenseDir>
     </properties>
     <dependencies>
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>appc-chef-adapter-features</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
@@ -57,7 +57,7 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>appc-chef-adapter-bundle</artifactId>
             <version>${project.version}</version>
         </dependency>
diff --git a/appc-adapters/appc-chef-adapter/pom.xml b/appc-adapters/appc-chef-adapter/pom.xml
index 2905603b2..4a870aca4 100644
--- a/appc-adapters/appc-chef-adapter/pom.xml
+++ b/appc-adapters/appc-chef-adapter/pom.xml
@@ -27,7 +27,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.openecomp.appc</groupId>
+        <groupId>org.onap.appc</groupId>
         <artifactId>appc-adapters</artifactId>
         <version>1.3.0-SNAPSHOT</version>
     </parent>
@@ -131,7 +131,7 @@
     <dependencyManagement>
         <dependencies>
             <dependency>
-                <groupId>org.openecomp.appc</groupId>
+                <groupId>org.onap.appc</groupId>
                 <artifactId>appc-chef-adapter-features</artifactId>
                 <classifier>features</classifier>
                 <type>xml</type>
@@ -139,7 +139,7 @@
             </dependency>
 
             <dependency>
-                <groupId>org.openecomp.appc</groupId>
+                <groupId>org.onap.appc</groupId>
                 <artifactId>appc-chef-adapter-provider</artifactId>
                 <version>${project.version}</version>
             </dependency>
diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/pom.xml b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/pom.xml
index f03ff62be..cc9e040f9 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/pom.xml
+++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/pom.xml
@@ -2,7 +2,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">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.openecomp.appc</groupId>
+		<groupId>org.onap.appc</groupId>
 		<artifactId>appc-dmaap-adapter</artifactId>
 		<version>1.3.0-SNAPSHOT</version>
 	</parent>
@@ -13,17 +13,17 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-message-adapter-api</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-metric-bundle</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-common</artifactId>
 			<version>${project.version}</version>
 		</dependency>
@@ -153,10 +153,10 @@
 					<instructions>
 						<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
 						<Bundle-Version>${project.version}</Bundle-Version>
-						<!--<Bundle-SymbolicName>org.openecomp.appc.adapter.messaging.dmaap</Bundle-SymbolicName>-->
-						<Bundle-Activator>org.openecomp.appc.adapter.messaging.dmaap.AppcDmaapAdapterActivator</Bundle-Activator>
-						<Export-Package>org.openecomp.appc.adapter.messaging.*</Export-Package>
-						<Import-Package>!org.slf4j.event,org.openecomp.appc.adapter.message.*,org.openecomp.appc.metricservice.*,com.att.nsa.*,org.onap.ccsdk.sli.core.sli.*,org.osgi.framework.*,!org.osgi.service.event.*,org.osgi.service.*,org.osgi.util.*,org.slf4j.*,com.vmware.*,org.apache.xerces.*,javax.net.ssl.*,org.xml.sax.*,javax.xml.*,javax.naming.*,javax.crypto.*, com.sun.jersey.spi.container.servlet,org.eclipse.jetty.servlets</Import-Package>
+						<!--<Bundle-SymbolicName>org.onap.appc.adapter.messaging.dmaap</Bundle-SymbolicName>-->
+						<Bundle-Activator>org.onap.appc.adapter.messaging.dmaap.AppcDmaapAdapterActivator</Bundle-Activator>
+						<Export-Package>org.onap.appc.adapter.messaging.*</Export-Package>
+						<Import-Package>!org.slf4j.event,org.onap.appc.adapter.message.*,org.onap.appc.metricservice.*,com.att.nsa.*,org.onap.ccsdk.sli.core.sli.*,org.osgi.framework.*,!org.osgi.service.event.*,org.osgi.service.*,org.osgi.util.*,org.slf4j.*,com.vmware.*,org.apache.xerces.*,javax.net.ssl.*,org.xml.sax.*,javax.xml.*,javax.naming.*,javax.crypto.*, com.sun.jersey.spi.container.servlet,org.eclipse.jetty.servlets</Import-Package>
 						<Embed-Dependency>*;scope=compile|runtime;artifactId=!appc-metric-bundle|appc-message-adapter-api|sli-common|org.eclipse.osgi|slf4j-api|jcl-over-slf4j|mariadb-java-client|xml-apis|pax-*</Embed-Dependency>
 						<Embed-Transitive>true</Embed-Transitive>
 						<Bundle-Blueprint>OSGI-INF/blueprint/blueprint.xml</Bundle-Blueprint>
diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/openecomp/appc/adapter/messaging/dmaap/AppcDmaapAdapterActivator.java b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/openecomp/appc/adapter/messaging/dmaap/AppcDmaapAdapterActivator.java
index 03910222c..812f80121 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/openecomp/appc/adapter/messaging/dmaap/AppcDmaapAdapterActivator.java
+++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/openecomp/appc/adapter/messaging/dmaap/AppcDmaapAdapterActivator.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.messaging.dmaap;
+package org.onap.appc.adapter.messaging.dmaap;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/openecomp/appc/adapter/messaging/dmaap/http/CommonHttpClient.java b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/openecomp/appc/adapter/messaging/dmaap/http/CommonHttpClient.java
index cd42e9dc6..76b050d8e 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/openecomp/appc/adapter/messaging/dmaap/http/CommonHttpClient.java
+++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/openecomp/appc/adapter/messaging/dmaap/http/CommonHttpClient.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.messaging.dmaap.http;
+package org.onap.appc.adapter.messaging.dmaap.http;
 
 import java.net.URI;
 
diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/openecomp/appc/adapter/messaging/dmaap/http/HttpDmaapConsumerImpl.java b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/openecomp/appc/adapter/messaging/dmaap/http/HttpDmaapConsumerImpl.java
index cc775a803..df81e9718 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/openecomp/appc/adapter/messaging/dmaap/http/HttpDmaapConsumerImpl.java
+++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/openecomp/appc/adapter/messaging/dmaap/http/HttpDmaapConsumerImpl.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.messaging.dmaap.http;
+package org.onap.appc.adapter.messaging.dmaap.http;
 
 import java.net.URI;
 import java.util.ArrayList;
@@ -40,7 +40,7 @@ import org.apache.http.client.utils.URIBuilder;
 import org.apache.http.message.BasicNameValuePair;
 import org.apache.http.util.EntityUtils;
 import org.json.JSONArray;
-import org.openecomp.appc.adapter.message.Consumer;
+import org.onap.appc.adapter.message.Consumer;
 
 public class HttpDmaapConsumerImpl extends CommonHttpClient implements Consumer {
 
diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/openecomp/appc/adapter/messaging/dmaap/http/HttpDmaapProducerImpl.java b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/openecomp/appc/adapter/messaging/dmaap/http/HttpDmaapProducerImpl.java
index aeb248c9b..560c09be4 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/openecomp/appc/adapter/messaging/dmaap/http/HttpDmaapProducerImpl.java
+++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/openecomp/appc/adapter/messaging/dmaap/http/HttpDmaapProducerImpl.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.messaging.dmaap.http;
+package org.onap.appc.adapter.messaging.dmaap.http;
 
 import java.net.URI;
 import java.util.ArrayList;
@@ -37,7 +37,7 @@ import com.att.eelf.configuration.EELFManager;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.entity.StringEntity;
-import org.openecomp.appc.adapter.message.Producer;
+import org.onap.appc.adapter.message.Producer;
 
 public class HttpDmaapProducerImpl extends CommonHttpClient implements Producer {
 
diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/openecomp/appc/adapter/messaging/dmaap/impl/DmaapConsumerImpl.java b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/openecomp/appc/adapter/messaging/dmaap/impl/DmaapConsumerImpl.java
index 6ffd65b93..ddf630545 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/openecomp/appc/adapter/messaging/dmaap/impl/DmaapConsumerImpl.java
+++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/openecomp/appc/adapter/messaging/dmaap/impl/DmaapConsumerImpl.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.messaging.dmaap.impl;
+package org.onap.appc.adapter.messaging.dmaap.impl;
 
 import java.io.IOException;
 import java.util.*;
@@ -36,17 +36,17 @@ import com.att.eelf.configuration.EELFManager;
 import com.att.nsa.mr.client.MRClientFactory;
 import com.att.nsa.mr.client.MRConsumer;
 import org.apache.commons.lang3.StringUtils;
-import org.openecomp.appc.adapter.message.Consumer;
-import org.openecomp.appc.configuration.Configuration;
-import org.openecomp.appc.configuration.ConfigurationFactory;
-import org.openecomp.appc.metricservice.MetricRegistry;
-import org.openecomp.appc.metricservice.MetricService;
-import org.openecomp.appc.metricservice.impl.MetricServiceImpl;
-import org.openecomp.appc.metricservice.metric.Metric;
-import org.openecomp.appc.metricservice.metric.MetricType;
-import org.openecomp.appc.metricservice.metric.DmaapRequestCounterMetric;
-import org.openecomp.appc.metricservice.policy.PublishingPolicy;
-import org.openecomp.appc.metricservice.publisher.LogPublisher;
+import org.onap.appc.adapter.message.Consumer;
+import org.onap.appc.configuration.Configuration;
+import org.onap.appc.configuration.ConfigurationFactory;
+import org.onap.appc.metricservice.MetricRegistry;
+import org.onap.appc.metricservice.MetricService;
+import org.onap.appc.metricservice.impl.MetricServiceImpl;
+import org.onap.appc.metricservice.metric.Metric;
+import org.onap.appc.metricservice.metric.MetricType;
+import org.onap.appc.metricservice.metric.DmaapRequestCounterMetric;
+import org.onap.appc.metricservice.policy.PublishingPolicy;
+import org.onap.appc.metricservice.publisher.LogPublisher;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.FrameworkUtil;
 import org.osgi.framework.ServiceReference;
@@ -222,7 +222,7 @@ public class DmaapConsumerImpl implements Consumer {
 
         } else {
             LOG.info("Metric Service error from bundlecontext");
-            LOG.warn("Cannot find service reference for org.openecomp.appc.metricservice.MetricService");
+            LOG.warn("Cannot find service reference for org.onap.appc.metricservice.MetricService");
             return null;
 
         }
diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/openecomp/appc/adapter/messaging/dmaap/impl/DmaapProducerImpl.java b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/openecomp/appc/adapter/messaging/dmaap/impl/DmaapProducerImpl.java
index a3f9bd542..7ed06a9e3 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/openecomp/appc/adapter/messaging/dmaap/impl/DmaapProducerImpl.java
+++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/openecomp/appc/adapter/messaging/dmaap/impl/DmaapProducerImpl.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.messaging.dmaap.impl;
+package org.onap.appc.adapter.messaging.dmaap.impl;
 
 import java.io.*;
 import java.util.*;
@@ -37,17 +37,17 @@ import com.att.eelf.configuration.EELFManager;
 import com.att.nsa.mr.client.MRBatchingPublisher;
 import com.att.nsa.mr.client.MRClientFactory;
 import org.apache.commons.lang3.StringUtils;
-import org.openecomp.appc.adapter.message.Producer;
-import org.openecomp.appc.adapter.messaging.dmaap.impl.DmaapUtil;
-import org.openecomp.appc.configuration.Configuration;
-import org.openecomp.appc.configuration.ConfigurationFactory;
-import org.openecomp.appc.metricservice.MetricRegistry;
-import org.openecomp.appc.metricservice.MetricService;
-import org.openecomp.appc.metricservice.metric.Metric;
-import org.openecomp.appc.metricservice.metric.MetricType;
-import org.openecomp.appc.metricservice.metric.DmaapRequestCounterMetric;
-import org.openecomp.appc.metricservice.policy.PublishingPolicy;
-import org.openecomp.appc.metricservice.publisher.LogPublisher;
+import org.onap.appc.adapter.message.Producer;
+import org.onap.appc.adapter.messaging.dmaap.impl.DmaapUtil;
+import org.onap.appc.configuration.Configuration;
+import org.onap.appc.configuration.ConfigurationFactory;
+import org.onap.appc.metricservice.MetricRegistry;
+import org.onap.appc.metricservice.MetricService;
+import org.onap.appc.metricservice.metric.Metric;
+import org.onap.appc.metricservice.metric.MetricType;
+import org.onap.appc.metricservice.metric.DmaapRequestCounterMetric;
+import org.onap.appc.metricservice.policy.PublishingPolicy;
+import org.onap.appc.metricservice.publisher.LogPublisher;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.FrameworkUtil;
 import org.osgi.framework.ServiceReference;
@@ -211,7 +211,7 @@ public class DmaapProducerImpl implements Producer {
 
         } else {
             LOG.info("Metric Service error from bundlecontext");
-            LOG.warn("Cannot find service reference for org.openecomp.appc.metricservice.MetricService");
+            LOG.warn("Cannot find service reference for org.onap.appc.metricservice.MetricService");
             return null;
 
         }
diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/openecomp/appc/adapter/messaging/dmaap/impl/DmaapUtil.java b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/openecomp/appc/adapter/messaging/dmaap/impl/DmaapUtil.java
index ead13dd1b..da1b0fa38 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/openecomp/appc/adapter/messaging/dmaap/impl/DmaapUtil.java
+++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/openecomp/appc/adapter/messaging/dmaap/impl/DmaapUtil.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.messaging.dmaap.impl;
+package org.onap.appc.adapter.messaging.dmaap.impl;
 
 import java.io.File;
 import java.io.FileOutputStream;
diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/openecomp/appc/adapter/messaging/dmaap/impl/EventSenderDmaapImpl.java b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/openecomp/appc/adapter/messaging/dmaap/impl/EventSenderDmaapImpl.java
index ee491d227..bf7649026 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/openecomp/appc/adapter/messaging/dmaap/impl/EventSenderDmaapImpl.java
+++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/openecomp/appc/adapter/messaging/dmaap/impl/EventSenderDmaapImpl.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.messaging.dmaap.impl;
+package org.onap.appc.adapter.messaging.dmaap.impl;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
@@ -31,16 +31,16 @@ import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.openecomp.appc.adapter.message.EventSender;
-import org.openecomp.appc.adapter.message.MessageDestination;
-import org.openecomp.appc.adapter.message.Producer;
-import org.openecomp.appc.adapter.message.event.EventHeader;
-import org.openecomp.appc.adapter.message.event.EventMessage;
-import org.openecomp.appc.adapter.message.event.EventStatus;
-import org.openecomp.appc.adapter.messaging.dmaap.impl.DmaapProducerImpl;
-import org.openecomp.appc.configuration.Configuration;
-import org.openecomp.appc.configuration.ConfigurationFactory;
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.adapter.message.EventSender;
+import org.onap.appc.adapter.message.MessageDestination;
+import org.onap.appc.adapter.message.Producer;
+import org.onap.appc.adapter.message.event.EventHeader;
+import org.onap.appc.adapter.message.event.EventMessage;
+import org.onap.appc.adapter.message.event.EventStatus;
+import org.onap.appc.adapter.messaging.dmaap.impl.DmaapProducerImpl;
+import org.onap.appc.configuration.Configuration;
+import org.onap.appc.configuration.ConfigurationFactory;
+import org.onap.appc.exceptions.APPCException;
 
 public class EventSenderDmaapImpl implements EventSender
 {
diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/resources/OSGI-INF/blueprint/blueprint.xml
index 81300714f..063041832 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -27,10 +27,10 @@
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd">
-    <bean id="eventSenderBean" class="org.openecomp.appc.adapter.messaging.dmaap.impl.EventSenderDmaapImpl"
+    <bean id="eventSenderBean" class="org.onap.appc.adapter.messaging.dmaap.impl.EventSenderDmaapImpl"
           init-method="initialize" scope="singleton">
     </bean>
 
-    <service id="eventSenderService" interface="org.openecomp.appc.adapter.message.EventSender" ref="eventSenderBean" />
+    <service id="eventSenderService" interface="org.onap.appc.adapter.message.EventSender" ref="eventSenderBean" />
 
 </blueprint>
diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/resources/consumer.properties b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/resources/consumer.properties
index 169026aa6..39506fce1 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/resources/consumer.properties
+++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/resources/consumer.properties
@@ -40,7 +40,7 @@ contenttype =application/json
 authKey=01234567890abcde:01234567890abcdefghijklmn
 authDate=2016-02-18T13:57:37-0800
 host=127.0.0.1
-topic=org.openecomp.appc.UNIT-TEST
+topic=org.onap.appc.UNIT-TEST
 group=jmsgrp
 id=2
 timeout=15000
diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/resources/org/openecomp/appc/default.properties b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/resources/org/openecomp/appc/default.properties
index ed3c22430..280b85c00 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/resources/org/openecomp/appc/default.properties
+++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/resources/org/openecomp/appc/default.properties
@@ -24,5 +24,5 @@
 
 # ${user.home} usually goes to /root if instantiation uses the appc-docker approach
 
-org.openecomp.appc.bootstrap.file=appc.properties
-org.openecomp.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
+org.onap.appc.bootstrap.file=appc.properties
+org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/resources/producer.properties b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/resources/producer.properties
index 8050648f9..eb8417891 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/resources/producer.properties
+++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/resources/producer.properties
@@ -39,7 +39,7 @@ contenttype = application/json
 authKey=01234567890abcde:01234567890abcdefghijklmn
 authDate=2016-07-20T11:30:56-0700
 host=127.0.0.1
-topic=org.openecomp.appc.UNIT-TEST
+topic=org.onap.appc.UNIT-TEST
 partition=2
 maxBatchSize=100
 maxAgeMs=250
diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/java/org/openecomp/appc/adapter/messaging/dmaap/SimpleExamplePublisher.java b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/java/org/openecomp/appc/adapter/messaging/dmaap/SimpleExamplePublisher.java
index 2b8747a9b..8c07c0b4a 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/java/org/openecomp/appc/adapter/messaging/dmaap/SimpleExamplePublisher.java
+++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/java/org/openecomp/appc/adapter/messaging/dmaap/SimpleExamplePublisher.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.messaging.dmaap;
+package org.onap.appc.adapter.messaging.dmaap;
 
 import java.io.*;
 import java.util.List;
@@ -32,7 +32,7 @@ import java.util.concurrent.TimeUnit;
 
 import com.att.nsa.mr.client.MRConsumer;
 import org.json.JSONObject;
-import org.openecomp.appc.adapter.messaging.dmaap.impl.DmaapUtil;
+import org.onap.appc.adapter.messaging.dmaap.impl.DmaapUtil;
 
 import com.att.nsa.mr.client.MRBatchingPublisher;
 import com.att.nsa.mr.client.MRClientFactory;
@@ -51,7 +51,7 @@ public class SimpleExamplePublisher
 
         int i=0;
 
-        String topicProducerPropFileName = DmaapUtil.createProducerPropFile("org.openecomp.appc.UNIT-TEST", null);
+        String topicProducerPropFileName = DmaapUtil.createProducerPropFile("org.onap.appc.UNIT-TEST", null);
         while (i< msgCount)
         {
             publisher.publishMessage(topicProducerPropFileName,i);
@@ -93,7 +93,7 @@ public class SimpleExamplePublisher
 
         try
         {
-            String topic = "org.openecomp.appc.UNIT-TEST";
+            String topic = "org.onap.appc.UNIT-TEST";
             Properties props = new Properties();
             props.put("id", "1");
             props.put("group", "group1");
diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/java/org/openecomp/appc/adapter/messaging/dmaap/TestAppcDmaapAdapterActivator.java b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/java/org/openecomp/appc/adapter/messaging/dmaap/TestAppcDmaapAdapterActivator.java
index d588336a5..5473bf7e0 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/java/org/openecomp/appc/adapter/messaging/dmaap/TestAppcDmaapAdapterActivator.java
+++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/java/org/openecomp/appc/adapter/messaging/dmaap/TestAppcDmaapAdapterActivator.java
@@ -22,13 +22,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.messaging.dmaap;
+package org.onap.appc.adapter.messaging.dmaap;
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.fail;
 
 import org.junit.Test;
-import org.openecomp.appc.adapter.messaging.dmaap.AppcDmaapAdapterActivator;
+import org.onap.appc.adapter.messaging.dmaap.AppcDmaapAdapterActivator;
 
 public class TestAppcDmaapAdapterActivator {
 
diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/java/org/openecomp/appc/adapter/messaging/dmaap/TestDmaapConsuming.java b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/java/org/openecomp/appc/adapter/messaging/dmaap/TestDmaapConsuming.java
index 0bf305ce0..28c2bc4e2 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/java/org/openecomp/appc/adapter/messaging/dmaap/TestDmaapConsuming.java
+++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/java/org/openecomp/appc/adapter/messaging/dmaap/TestDmaapConsuming.java
@@ -22,17 +22,17 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.messaging.dmaap;
+package org.onap.appc.adapter.messaging.dmaap;
 
 
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.openecomp.appc.adapter.message.Consumer;
-import org.openecomp.appc.adapter.messaging.dmaap.http.HttpDmaapConsumerImpl;
-import org.openecomp.appc.adapter.messaging.dmaap.impl.DmaapConsumerImpl;
-import org.openecomp.appc.configuration.Configuration;
-import org.openecomp.appc.configuration.ConfigurationFactory;
+import org.onap.appc.adapter.message.Consumer;
+import org.onap.appc.adapter.messaging.dmaap.http.HttpDmaapConsumerImpl;
+import org.onap.appc.adapter.messaging.dmaap.impl.DmaapConsumerImpl;
+import org.onap.appc.configuration.Configuration;
+import org.onap.appc.configuration.ConfigurationFactory;
 import org.junit.Ignore;
 
 import java.util.Arrays;
@@ -41,7 +41,7 @@ import java.util.List;
 /**
  * Must have a DMaaP cluster or simulator up and running
  * Update the hostname, topic, client properties in
- * resources/org/openecomp/appc/default.properties
+ * resources/org/onap/appc/default.properties
  *
  */
 public class TestDmaapConsuming {
diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/java/org/openecomp/appc/adapter/messaging/dmaap/TestDmaapEventSender.java b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/java/org/openecomp/appc/adapter/messaging/dmaap/TestDmaapEventSender.java
index e12da25ef..bdc786337 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/java/org/openecomp/appc/adapter/messaging/dmaap/TestDmaapEventSender.java
+++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/java/org/openecomp/appc/adapter/messaging/dmaap/TestDmaapEventSender.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.messaging.dmaap;
+package org.onap.appc.adapter.messaging.dmaap;
 
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.junit.Assert;
@@ -31,16 +31,16 @@ import org.junit.Ignore;
 import org.junit.Test;
 import org.mockito.Matchers;
 import org.mockito.Mockito;
-import org.openecomp.appc.adapter.message.MessageDestination;
-import org.openecomp.appc.adapter.message.Producer;
-import org.openecomp.appc.adapter.message.event.EventHeader;
-import org.openecomp.appc.adapter.message.event.EventMessage;
-import org.openecomp.appc.adapter.message.event.EventStatus;
-import org.openecomp.appc.adapter.messaging.dmaap.impl.DmaapProducerImpl;
-import org.openecomp.appc.adapter.messaging.dmaap.impl.EventSenderDmaapImpl;
-import org.openecomp.appc.configuration.Configuration;
-import org.openecomp.appc.configuration.ConfigurationFactory;
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.adapter.message.MessageDestination;
+import org.onap.appc.adapter.message.Producer;
+import org.onap.appc.adapter.message.event.EventHeader;
+import org.onap.appc.adapter.message.event.EventMessage;
+import org.onap.appc.adapter.message.event.EventStatus;
+import org.onap.appc.adapter.messaging.dmaap.impl.DmaapProducerImpl;
+import org.onap.appc.adapter.messaging.dmaap.impl.EventSenderDmaapImpl;
+import org.onap.appc.configuration.Configuration;
+import org.onap.appc.configuration.ConfigurationFactory;
+import org.onap.appc.exceptions.APPCException;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/java/org/openecomp/appc/adapter/messaging/dmaap/TestDmaapProducing.java b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/java/org/openecomp/appc/adapter/messaging/dmaap/TestDmaapProducing.java
index dc80580aa..bdfa93726 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/java/org/openecomp/appc/adapter/messaging/dmaap/TestDmaapProducing.java
+++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/java/org/openecomp/appc/adapter/messaging/dmaap/TestDmaapProducing.java
@@ -22,18 +22,18 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.messaging.dmaap;
+package org.onap.appc.adapter.messaging.dmaap;
 
 
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Ignore;
 import org.junit.Test;
-import org.openecomp.appc.adapter.message.Producer;
-import org.openecomp.appc.adapter.messaging.dmaap.http.HttpDmaapProducerImpl;
-import org.openecomp.appc.adapter.messaging.dmaap.impl.DmaapProducerImpl;
-import org.openecomp.appc.configuration.Configuration;
-import org.openecomp.appc.configuration.ConfigurationFactory;
+import org.onap.appc.adapter.message.Producer;
+import org.onap.appc.adapter.messaging.dmaap.http.HttpDmaapProducerImpl;
+import org.onap.appc.adapter.messaging.dmaap.impl.DmaapProducerImpl;
+import org.onap.appc.configuration.Configuration;
+import org.onap.appc.configuration.ConfigurationFactory;
 
 import java.util.Arrays;
 import java.util.List;
@@ -41,7 +41,7 @@ import java.util.List;
 /**
  * Must have a DMaaP cluster or simulator up and running
  * Update the hostname, topic, client properties in
- * resources/org/openecomp/appc/default.properties
+ * resources/org/onap/appc/default.properties
  *
  */
 public class TestDmaapProducing {
diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/java/org/openecomp/appc/adapter/messaging/dmaap/impl/TestConsumerProducerImpl.java b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/java/org/openecomp/appc/adapter/messaging/dmaap/impl/TestConsumerProducerImpl.java
index 5af5e60ae..cb318dc4e 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/java/org/openecomp/appc/adapter/messaging/dmaap/impl/TestConsumerProducerImpl.java
+++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/java/org/openecomp/appc/adapter/messaging/dmaap/impl/TestConsumerProducerImpl.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.messaging.dmaap.impl;
+package org.onap.appc.adapter.messaging.dmaap.impl;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -34,12 +34,12 @@ import java.util.*;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
-import org.openecomp.appc.adapter.message.Consumer;
-import org.openecomp.appc.adapter.message.Producer;
-import org.openecomp.appc.adapter.messaging.dmaap.impl.DmaapConsumerImpl;
-import org.openecomp.appc.adapter.messaging.dmaap.impl.DmaapProducerImpl;
-import org.openecomp.appc.configuration.Configuration;
-import org.openecomp.appc.configuration.ConfigurationFactory;
+import org.onap.appc.adapter.message.Consumer;
+import org.onap.appc.adapter.message.Producer;
+import org.onap.appc.adapter.messaging.dmaap.impl.DmaapConsumerImpl;
+import org.onap.appc.adapter.messaging.dmaap.impl.DmaapProducerImpl;
+import org.onap.appc.configuration.Configuration;
+import org.onap.appc.configuration.ConfigurationFactory;
 
 public class TestConsumerProducerImpl {
 
diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/resources/org/openecomp/appc/default.properties b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/resources/org/openecomp/appc/default.properties
index 868e512a6..dd594515c 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/resources/org/openecomp/appc/default.properties
+++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/resources/org/openecomp/appc/default.properties
@@ -22,8 +22,8 @@
 # ============LICENSE_END=========================================================
 ###
 
-org.openecomp.appc.bootstrap.file=test.properties
-org.openecomp.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
+org.onap.appc.bootstrap.file=test.properties
+org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
 
 # Properties commented out below are provided in appc.properties
 #poolMembers=<DMAAP_IP>:3904
diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features/pom.xml b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features/pom.xml
index c937256d9..7870fcfe9 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features/pom.xml
+++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<artifactId>appc-dmaap-adapter</artifactId>
-		<groupId>org.openecomp.appc</groupId>
+		<groupId>org.onap.appc</groupId>
 		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>appc-dmaap-adapter-features</artifactId>
@@ -13,13 +13,13 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-dmaap-adapter-bundle</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-message-adapter-factory</artifactId>
 			<version>${project.version}</version>
 		</dependency>
diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features/src/main/resources/features.xml b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features/src/main/resources/features.xml
index afa1d31e3..576214089 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features/src/main/resources/features.xml
+++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features/src/main/resources/features.xml
@@ -36,9 +36,9 @@
 <!--         <feature version="${odl.mdsal.version}">odl-mdsal-broker</feature> -->
         <feature version="${odl.mdsal.version}">odl-mdsal-broker</feature>
 <!--         <feature version="${sdnctl.sli.version}">sdnc-sli</feature> -->
-        <bundle>mvn:org.openecomp.appc/appc-dmaap-adapter-bundle/${project.version}</bundle>
-        <bundle>mvn:org.openecomp.appc/appc-message-adapter-factory/${project.version}</bundle>
-        <bundle>mvn:org.openecomp.appc/appc-message-adapter-api/${project.version}</bundle>
+        <bundle>mvn:org.onap.appc/appc-dmaap-adapter-bundle/${project.version}</bundle>
+        <bundle>mvn:org.onap.appc/appc-message-adapter-factory/${project.version}</bundle>
+        <bundle>mvn:org.onap.appc/appc-message-adapter-api/${project.version}</bundle>
         
     </feature>
 
diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-installer/pom.xml b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-installer/pom.xml
index 6cf369b4e..4308cf77f 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-installer/pom.xml
+++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-installer/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>appc-dmaap-adapter</artifactId>
-    <groupId>org.openecomp.appc</groupId>
+    <groupId>org.onap.appc</groupId>
     <version>1.3.0-SNAPSHOT</version>
   </parent>
   <artifactId>appc-dmaap-adapter-installer</artifactId>
@@ -13,13 +13,13 @@
   <properties>
     <application.name>appc-dmaap-adapter</application.name>
     <features.boot>appc-dmaap-adapter</features.boot>
-    <features.repositories>mvn:org.openecomp.appc/appc-dmaap-adapter-features/${project.version}/xml/features</features.repositories>
+    <features.repositories>mvn:org.onap.appc/appc-dmaap-adapter-features/${project.version}/xml/features</features.repositories>
     <include.transitive.dependencies>false</include.transitive.dependencies>
   </properties>
 
   <dependencies>
     <dependency>
-      <groupId>org.openecomp.appc</groupId>
+      <groupId>org.onap.appc</groupId>
       <artifactId>appc-dmaap-adapter-features</artifactId>
       <version>${project.version}</version>
       <classifier>features</classifier>
@@ -33,17 +33,17 @@
     </dependency>
 
     <dependency>
-      <groupId>org.openecomp.appc</groupId>
+      <groupId>org.onap.appc</groupId>
       <artifactId>appc-dmaap-adapter-bundle</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.openecomp.appc</groupId>
+      <groupId>org.onap.appc</groupId>
       <artifactId>appc-message-adapter-api</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.openecomp.appc</groupId>
+      <groupId>org.onap.appc</groupId>
       <artifactId>appc-message-adapter-factory</artifactId>
       <version>${project.version}</version>
     </dependency>
diff --git a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/pom.xml b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/pom.xml
index f0f61f927..2056ed6b3 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/pom.xml
+++ b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/pom.xml
@@ -2,7 +2,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">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.openecomp.appc</groupId>
+		<groupId>org.onap.appc</groupId>
 		<artifactId>appc-dmaap-adapter</artifactId>
 		<version>1.3.0-SNAPSHOT</version>
 	</parent>
@@ -13,12 +13,12 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-metric-bundle</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-common</artifactId>
 			<version>${project.version}</version>
 		</dependency>
@@ -121,9 +121,9 @@
 					<instructions>
 						<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
 						<Bundle-Version>${project.version}</Bundle-Version>
-						<Export-Package>org.openecomp.appc.adapter.message.*</Export-Package>
-						<!--<Export-Serice>org.openecomp.appc.adapter.message.EventSender</Export-Serice>-->
-						<Import-Package>org.openecomp.appc.metricservice.*,com.att.nsa.*,org.onap.ccsdk.sli.core.sli.*,org.osgi.framework.*,!org.osgi.service.event.*,org.osgi.service.*,org.osgi.util.*,org.slf4j.*,com.vmware.*,org.apache.xerces.*,javax.net.ssl.*,org.xml.sax.*,javax.xml.*,javax.naming.*,javax.crypto.*, com.sun.jersey.spi.container.servlet,org.eclipse.jetty.servlets</Import-Package>
+						<Export-Package>org.onap.appc.adapter.message.*</Export-Package>
+						<!--<Export-Serice>org.onap.appc.adapter.message.EventSender</Export-Serice>-->
+						<Import-Package>org.onap.appc.metricservice.*,com.att.nsa.*,org.onap.ccsdk.sli.core.sli.*,org.osgi.framework.*,!org.osgi.service.event.*,org.osgi.service.*,org.osgi.util.*,org.slf4j.*,com.vmware.*,org.apache.xerces.*,javax.net.ssl.*,org.xml.sax.*,javax.xml.*,javax.naming.*,javax.crypto.*, com.sun.jersey.spi.container.servlet,org.eclipse.jetty.servlets</Import-Package>
 						<!--<Embed-Dependency>appc-common</Embed-Dependency>-->
 						<Embed-Dependency>*;scope=compile|runtime;artifactId=!appc-metric-bundle|sli-common|sli-provider|org.eclipse.osgi|slf4j-api|jcl-over-slf4j|mariadb-java-client|xml-apis|pax-*</Embed-Dependency>
 						<Embed-Transitive>true</Embed-Transitive>
diff --git a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/java/org/openecomp/appc/adapter/message/CallableConsumer.java b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/java/org/openecomp/appc/adapter/message/CallableConsumer.java
index 25555e3da..1f6bb50fc 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/java/org/openecomp/appc/adapter/message/CallableConsumer.java
+++ b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/java/org/openecomp/appc/adapter/message/CallableConsumer.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.message;
+package org.onap.appc.adapter.message;
 
 import java.util.List;
 import java.util.concurrent.Callable;
diff --git a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/java/org/openecomp/appc/adapter/message/Consumer.java b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/java/org/openecomp/appc/adapter/message/Consumer.java
index abd2babbd..92033064c 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/java/org/openecomp/appc/adapter/message/Consumer.java
+++ b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/java/org/openecomp/appc/adapter/message/Consumer.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.message;
+package org.onap.appc.adapter.message;
 
 import java.util.List;
 
diff --git a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/java/org/openecomp/appc/adapter/message/EventSender.java b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/java/org/openecomp/appc/adapter/message/EventSender.java
index 2b96396dd..962f14774 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/java/org/openecomp/appc/adapter/message/EventSender.java
+++ b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/java/org/openecomp/appc/adapter/message/EventSender.java
@@ -22,15 +22,15 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.message;
+package org.onap.appc.adapter.message;
 
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.exceptions.APPCException;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin;
 
 import java.util.Map;
 
-import org.openecomp.appc.adapter.message.event.EventMessage;
+import org.onap.appc.adapter.message.event.EventMessage;
 
 public interface EventSender  extends SvcLogicJavaPlugin{
     boolean sendEvent(MessageDestination destination, EventMessage msg);
diff --git a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/java/org/openecomp/appc/adapter/message/Manager.java b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/java/org/openecomp/appc/adapter/message/Manager.java
index 620543c45..aea2fddce 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/java/org/openecomp/appc/adapter/message/Manager.java
+++ b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/java/org/openecomp/appc/adapter/message/Manager.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.message;
+package org.onap.appc.adapter.message;
 
 import java.util.Set;
 
diff --git a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/java/org/openecomp/appc/adapter/message/MessageAdapterFactory.java b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/java/org/openecomp/appc/adapter/message/MessageAdapterFactory.java
index 89c88d172..d7507dc85 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/java/org/openecomp/appc/adapter/message/MessageAdapterFactory.java
+++ b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/java/org/openecomp/appc/adapter/message/MessageAdapterFactory.java
@@ -21,13 +21,13 @@
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.appc.adapter.message;
+package org.onap.appc.adapter.message;
 
 import java.util.Collection;
 import java.util.Set;
 
-import org.openecomp.appc.adapter.message.Consumer;
-import org.openecomp.appc.adapter.message.Producer;
+import org.onap.appc.adapter.message.Consumer;
+import org.onap.appc.adapter.message.Producer;
 
 public interface MessageAdapterFactory {
 	
diff --git a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/java/org/openecomp/appc/adapter/message/MessageDestination.java b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/java/org/openecomp/appc/adapter/message/MessageDestination.java
index 557d9b9ae..cb84b5c4c 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/java/org/openecomp/appc/adapter/message/MessageDestination.java
+++ b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/java/org/openecomp/appc/adapter/message/MessageDestination.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.message;
+package org.onap.appc.adapter.message;
 
 public enum MessageDestination {
     DCAE
diff --git a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/java/org/openecomp/appc/adapter/message/Producer.java b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/java/org/openecomp/appc/adapter/message/Producer.java
index 3911555cd..52ead0253 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/java/org/openecomp/appc/adapter/message/Producer.java
+++ b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/java/org/openecomp/appc/adapter/message/Producer.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.message;
+package org.onap.appc.adapter.message;
 
 public interface Producer {
 
diff --git a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/java/org/openecomp/appc/adapter/message/event/EventHeader.java b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/java/org/openecomp/appc/adapter/message/event/EventHeader.java
index 65cfb1a33..2c4ab1fbf 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/java/org/openecomp/appc/adapter/message/event/EventHeader.java
+++ b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/java/org/openecomp/appc/adapter/message/event/EventHeader.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.message.event;
+package org.onap.appc.adapter.message.event;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/java/org/openecomp/appc/adapter/message/event/EventMessage.java b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/java/org/openecomp/appc/adapter/message/event/EventMessage.java
index 75fe92729..d64d6d0ce 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/java/org/openecomp/appc/adapter/message/event/EventMessage.java
+++ b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/java/org/openecomp/appc/adapter/message/event/EventMessage.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.message.event;
+package org.onap.appc.adapter.message.event;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/java/org/openecomp/appc/adapter/message/event/EventStatus.java b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/java/org/openecomp/appc/adapter/message/event/EventStatus.java
index fd5788450..a5ac44e0b 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/java/org/openecomp/appc/adapter/message/event/EventStatus.java
+++ b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/java/org/openecomp/appc/adapter/message/event/EventStatus.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.message.event;
+package org.onap.appc.adapter.message.event;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/resources/org/openecomp/appc/default.properties b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/resources/org/openecomp/appc/default.properties
index 2505a41ce..a326faada 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/resources/org/openecomp/appc/default.properties
+++ b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/src/main/resources/org/openecomp/appc/default.properties
@@ -22,5 +22,5 @@
 # ============LICENSE_END=========================================================
 ###
 
-org.openecomp.appc.bootstrap.file=appc.properties
-org.openecomp.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
+org.onap.appc.bootstrap.file=appc.properties
+org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
diff --git a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-factory/pom.xml b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-factory/pom.xml
index b82040c1f..231b11bd7 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-factory/pom.xml
+++ b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-factory/pom.xml
@@ -2,7 +2,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">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.openecomp.appc</groupId>
+		<groupId>org.onap.appc</groupId>
 		<artifactId>appc-dmaap-adapter</artifactId>
 		<version>1.3.0-SNAPSHOT</version>
 	</parent>
@@ -13,20 +13,20 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-common</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-dmaap-adapter-bundle</artifactId>
 			<version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>appc-message-adapter-api</artifactId>
             <version>${project.version}</version>
             <scope>provided</scope>
@@ -130,10 +130,10 @@
 					<instructions>
 						<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
 						<Bundle-Version>${project.version}</Bundle-Version>
-						<Export-Package>org.openecomp.appc.adapter.factory</Export-Package>
-						<Bundle-Activator>org.openecomp.appc.adapter.factory.DmaapMessageAdapterFactoryActivator</Bundle-Activator>
-						<Export-Service>org.openecomp.appc.adapter.message.MessageAdapterFactory</Export-Service>
-						<Import-Package>org.openecomp.appc.adapter.messaging.*,org.openecomp.appc.adapter.message.*,org.openecomp.appc.metricservice.*,com.att.nsa.*org.onap.ccsdk.sli.core.sli.*,org.osgi.framework.*,!org.osgi.service.event.*,org.osgi.service.*,org.osgi.util.*,org.slf4j.*,com.vmware.*,org.apache.xerces.*,javax.net.ssl.*,org.xml.sax.*,javax.xml.*,javax.naming.*,javax.crypto.*, com.sun.jersey.spi.container.servlet,org.eclipse.jetty.servlets</Import-Package>
+						<Export-Package>org.onap.appc.adapter.factory</Export-Package>
+						<Bundle-Activator>org.onap.appc.adapter.factory.DmaapMessageAdapterFactoryActivator</Bundle-Activator>
+						<Export-Service>org.onap.appc.adapter.message.MessageAdapterFactory</Export-Service>
+						<Import-Package>org.onap.appc.adapter.messaging.*,org.onap.appc.adapter.message.*,org.onap.appc.metricservice.*,com.att.nsa.*org.onap.ccsdk.sli.core.sli.*,org.osgi.framework.*,!org.osgi.service.event.*,org.osgi.service.*,org.osgi.util.*,org.slf4j.*,com.vmware.*,org.apache.xerces.*,javax.net.ssl.*,org.xml.sax.*,javax.xml.*,javax.naming.*,javax.crypto.*, com.sun.jersey.spi.container.servlet,org.eclipse.jetty.servlets</Import-Package>
 						<Embed-Dependency>*;scope=compile|runtime;artifactId=!appc-metric-bundle|sli-common|org.eclipse.osgi|slf4j-api|jcl-over-slf4j|mariadb-java-client|xml-apis|pax-*</Embed-Dependency>
 						<Embed-Transitive>true</Embed-Transitive>
 						<Bundle-Blueprint>OSGI-INF/blueprint/blueprint.xml</Bundle-Blueprint>
diff --git a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-factory/src/main/java/org/openecomp/appc/adapter/factory/DmaapMessageAdapterFactoryActivator.java b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-factory/src/main/java/org/openecomp/appc/adapter/factory/DmaapMessageAdapterFactoryActivator.java
index 5d8c62d4f..1597c4256 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-factory/src/main/java/org/openecomp/appc/adapter/factory/DmaapMessageAdapterFactoryActivator.java
+++ b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-factory/src/main/java/org/openecomp/appc/adapter/factory/DmaapMessageAdapterFactoryActivator.java
@@ -21,9 +21,9 @@
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.appc.adapter.factory;
+package org.onap.appc.adapter.factory;
 
-import org.openecomp.appc.adapter.message.MessageAdapterFactory;
+import org.onap.appc.adapter.message.MessageAdapterFactory;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceRegistration;
diff --git a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-factory/src/main/java/org/openecomp/appc/adapter/factory/DmaapMessageAdapterFactoryImpl.java b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-factory/src/main/java/org/openecomp/appc/adapter/factory/DmaapMessageAdapterFactoryImpl.java
index d555f3952..19eb4cea8 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-factory/src/main/java/org/openecomp/appc/adapter/factory/DmaapMessageAdapterFactoryImpl.java
+++ b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-factory/src/main/java/org/openecomp/appc/adapter/factory/DmaapMessageAdapterFactoryImpl.java
@@ -22,20 +22,20 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.factory;
+package org.onap.appc.adapter.factory;
 
 import java.util.Collection;
 import java.util.Set;
 
-import org.openecomp.appc.adapter.message.Consumer;
-import org.openecomp.appc.adapter.message.MessageAdapterFactory;
-import org.openecomp.appc.adapter.message.Producer;
+import org.onap.appc.adapter.message.Consumer;
+import org.onap.appc.adapter.message.MessageAdapterFactory;
+import org.onap.appc.adapter.message.Producer;
 
-import org.openecomp.appc.adapter.messaging.dmaap.http.HttpDmaapConsumerImpl;
-import org.openecomp.appc.adapter.messaging.dmaap.http.HttpDmaapProducerImpl;
+import org.onap.appc.adapter.messaging.dmaap.http.HttpDmaapConsumerImpl;
+import org.onap.appc.adapter.messaging.dmaap.http.HttpDmaapProducerImpl;
 
-import org.openecomp.appc.adapter.messaging.dmaap.impl.DmaapConsumerImpl;
-import org.openecomp.appc.adapter.messaging.dmaap.impl.DmaapProducerImpl;
+import org.onap.appc.adapter.messaging.dmaap.impl.DmaapConsumerImpl;
+import org.onap.appc.adapter.messaging.dmaap.impl.DmaapProducerImpl;
 
 public class DmaapMessageAdapterFactoryImpl implements MessageAdapterFactory {
 
diff --git a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-factory/src/main/java/org/openecomp/appc/adapter/factory/MessageService.java b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-factory/src/main/java/org/openecomp/appc/adapter/factory/MessageService.java
index c96ec33fb..952f903b1 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-factory/src/main/java/org/openecomp/appc/adapter/factory/MessageService.java
+++ b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-factory/src/main/java/org/openecomp/appc/adapter/factory/MessageService.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.factory;
+package org.onap.appc.adapter.factory;
 /**
  * The message service types that are available. Only DMaaP available
  **/
diff --git a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-factory/src/main/resources/org/openecomp/appc/default.properties b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-factory/src/main/resources/org/openecomp/appc/default.properties
index 2505a41ce..a326faada 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-factory/src/main/resources/org/openecomp/appc/default.properties
+++ b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-factory/src/main/resources/org/openecomp/appc/default.properties
@@ -22,5 +22,5 @@
 # ============LICENSE_END=========================================================
 ###
 
-org.openecomp.appc.bootstrap.file=appc.properties
-org.openecomp.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
+org.onap.appc.bootstrap.file=appc.properties
+org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
diff --git a/appc-adapters/appc-dmaap-adapter/pom.xml b/appc-adapters/appc-dmaap-adapter/pom.xml
index 9cb74c4dc..0956ce175 100644
--- a/appc-adapters/appc-dmaap-adapter/pom.xml
+++ b/appc-adapters/appc-dmaap-adapter/pom.xml
@@ -2,7 +2,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/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.openecomp.appc</groupId>
+		<groupId>org.onap.appc</groupId>
 		<artifactId>appc-adapters</artifactId>
 		<version>1.3.0-SNAPSHOT</version>
 	</parent>
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/pom.xml b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/pom.xml
index 2fbd23398..fba72c9bc 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/pom.xml
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/pom.xml
@@ -2,7 +2,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">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.openecomp.appc</groupId>
+		<groupId>org.onap.appc</groupId>
 		<artifactId>appc-iaas-adapter</artifactId>
 		<version>1.3.0-SNAPSHOT</version>
 	</parent>
@@ -13,7 +13,7 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-common</artifactId>
 			<version>${project.version}</version>
 			<scope>compile</scope>
@@ -201,8 +201,8 @@
 				<configuration>
 					<instructions>
 						<Bundle-SymbolicName>appc-iaas-adapter</Bundle-SymbolicName>
-						<Bundle-Activator>org.openecomp.appc.adapter.iaas.AppcProviderAdapterActivator</Bundle-Activator>
-						<Export-Package>org.openecomp.appc.adapter.iaas,com.att.cdp.zones.model</Export-Package>
+						<Bundle-Activator>org.onap.appc.adapter.iaas.AppcProviderAdapterActivator</Bundle-Activator>
+						<Export-Package>org.onap.appc.adapter.iaas,com.att.cdp.zones.model</Export-Package>
                         <DynamicImport-Package>javax.*</DynamicImport-Package>
                         <Import-Package>org.onap.ccsdk.sli.core.sli.*,org.osgi.framework.*,org.slf4j.*,javax.net.ssl,org.xml.sax</Import-Package>
 <!--                         <Import-Package>org.onap.ccsdk.sli.core.sli.*,org.osgi.framework.*,org.slf4j.*,javax.ws.rs.*,javax.net.*,javax.xml.*,org.xml.*</Import-Package> -->
@@ -228,7 +228,7 @@
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-surefire-plugin</artifactId>
 						<configuration>
-							<excludedGroups>org.openecomp.appc.adapter.iaas.impl.TestProviderAdapterImpl</excludedGroups>
+							<excludedGroups>org.onap.appc.adapter.iaas.impl.TestProviderAdapterImpl</excludedGroups>
 						</configuration>
 					</plugin>
 				</plugins>
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/AppcProviderAdapterActivator.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/AppcProviderAdapterActivator.java
index f17584e2a..fbd650c39 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/AppcProviderAdapterActivator.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/AppcProviderAdapterActivator.java
@@ -22,13 +22,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.iaas;
+package org.onap.appc.adapter.iaas;
 
-import org.openecomp.appc.Constants;
-import org.openecomp.appc.adapter.iaas.impl.ProviderAdapterImpl;
-import org.openecomp.appc.configuration.Configuration;
-import org.openecomp.appc.configuration.ConfigurationFactory;
-import org.openecomp.appc.i18n.Msg;
+import org.onap.appc.Constants;
+import org.onap.appc.adapter.iaas.impl.ProviderAdapterImpl;
+import org.onap.appc.configuration.Configuration;
+import org.onap.appc.configuration.ConfigurationFactory;
+import org.onap.appc.i18n.Msg;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceRegistration;
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/ProviderAdapter.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/ProviderAdapter.java
index 06a190cf3..c14c936e0 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/ProviderAdapter.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/ProviderAdapter.java
@@ -22,11 +22,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.iaas;
+package org.onap.appc.adapter.iaas;
 
 import java.util.Map;
-import org.openecomp.appc.exceptions.APPCException;
-import org.openecomp.appc.exceptions.UnknownProviderException;
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.exceptions.UnknownProviderException;
 import com.att.cdp.zones.model.Image;
 import com.att.cdp.zones.model.Server;
 import com.att.cdp.zones.model.Stack;
@@ -49,47 +49,47 @@ public interface ProviderAdapter extends SvcLogicJavaPlugin {
      * correct provider support through the CDP IaaS abstraction layer and can be OpenStackProvider, BareMetalProvider,
      * or any other supported provider type.
      */
-    static final String PROPERTY_PROVIDER_TYPE = "org.openecomp.appc.provider.type";
+    static final String PROPERTY_PROVIDER_TYPE = "org.onap.appc.provider.type";
 
     /**
      * The adapter maintains a cache of providers organized by the name of the provider, not its type. This is
      * equivalent to the system or installation name. All regions within the same installation are assumed to be the
      * same type.
      */
-    static final String PROPERTY_PROVIDER_NAME = "org.openecomp.appc.provider.name";
+    static final String PROPERTY_PROVIDER_NAME = "org.onap.appc.provider.name";
 
     /**
      * The fully-qualified URL of the instance to be manipulated as it is known to the provider.
      */
-    static final String PROPERTY_INSTANCE_URL = "org.openecomp.appc.instance.url";
+    static final String PROPERTY_INSTANCE_URL = "org.onap.appc.instance.url";
 
     /**
      * The fully-qualified URL of the instance to be manipulated as it is known to the provider.
      */
-    static final String PROPERTY_IDENTITY_URL = "org.openecomp.appc.identity.url";
+    static final String PROPERTY_IDENTITY_URL = "org.onap.appc.identity.url";
 
     /**
      * The Rebuild VM flag is an optional payload parameter for the Evacuate API.
      */
-    static final String PROPERTY_REBUILD_VM = "org.openecomp.appc.rebuildvm";
+    static final String PROPERTY_REBUILD_VM = "org.onap.appc.rebuildvm";
 
     /**
      * The target host id is an optional payload parameter for the Evacuate API.
      */
-    static final String PROPERTY_TARGETHOST_ID = "org.openecomp.appc.targethost.id";
+    static final String PROPERTY_TARGETHOST_ID = "org.onap.appc.targethost.id";
 
     /**
      * heat stack id to perform operation on stack
      */
-    static final String PROPERTY_STACK_ID = "org.openecomp.appc.stack.id";
+    static final String PROPERTY_STACK_ID = "org.onap.appc.stack.id";
 
     static final String PROPERTY_SNAPSHOT_ID = "snapshot.id";
 
-    static final String PROPERTY_INPUT_SNAPSHOT_ID = "org.openecomp.appc.snapshot.id";
+    static final String PROPERTY_INPUT_SNAPSHOT_ID = "org.onap.appc.snapshot.id";
 
     static final String DG_OUTPUT_PARAM_NAMESPACE = "output.";
 
-    static final String SKIP_HYPERVISOR_CHECK = "org.openecomp.appc.skiphypervisorcheck";
+    static final String SKIP_HYPERVISOR_CHECK = "org.onap.appc.skiphypervisorcheck";
 
     /**
      * This method is used to restart an existing virtual machine given the fully qualified URL of the machine.
@@ -98,11 +98,11 @@ public interface ProviderAdapter extends SvcLogicJavaPlugin {
      * passed to the method are passed as properties in a map. This method expects the following properties to be
      * defined:
      * <dl>
-     * <dt>org.openecomp.appc.provider.type</dt>
+     * <dt>org.onap.appc.provider.type</dt>
      * <dd>The appropriate provider type, such as <code>OpenStackProvider</code>. This is used by the CDP IaaS
      * abstraction layer to dynamically load and open a connection to the appropriate provider type. All CDP supported
      * provider types are legal.</dd>
-     * <dt>org.openecomp.appc.instance.url</dt>
+     * <dt>org.onap.appc.instance.url</dt>
      * <dd>The fully qualified URL of the instance to be restarted, as it is known to the provider (i.e., the self-link
      * URL of the server)</dd>
      * </dl>
@@ -125,11 +125,11 @@ public interface ProviderAdapter extends SvcLogicJavaPlugin {
      * passed to the method are passed as properties in a map. This method expects the following properties to be
      * defined:
      * <dl>
-     * <dt>org.openecomp.appc.provider.type</dt>
+     * <dt>org.onap.appc.provider.type</dt>
      * <dd>The appropriate provider type, such as <code>OpenStackProvider</code>. This is used by the CDP IaaS
      * abstraction layer to dynamically load and open a connection to the appropriate provider type. All CDP supported
      * provider types are legal.</dd>
-     * <dt>org.openecomp.appc.instance.url</dt>
+     * <dt>org.onap.appc.instance.url</dt>
      * <dd>The fully qualified URL of the instance to be stopped, as it is known to the provider (i.e., the self-link
      * URL of the server)</dd>
      * </dl>
@@ -152,11 +152,11 @@ public interface ProviderAdapter extends SvcLogicJavaPlugin {
      * passed to the method are passed as properties in a map. This method expects the following properties to be
      * defined:
      * <dl>
-     * <dt>org.openecomp.appc.provider.type</dt>
+     * <dt>org.onap.appc.provider.type</dt>
      * <dd>The appropriate provider type, such as <code>OpenStackProvider</code>. This is used by the CDP IaaS
      * abstraction layer to dynamically load and open a connection to the appropriate provider type. All CDP supported
      * provider types are legal.</dd>
-     * <dt>org.openecomp.appc.instance.url</dt>
+     * <dt>org.onap.appc.instance.url</dt>
      * <dd>The fully qualified URL of the instance to be started, as it is known to the provider (i.e., the self-link
      * URL of the server)</dd>
      * </dl>
@@ -179,11 +179,11 @@ public interface ProviderAdapter extends SvcLogicJavaPlugin {
      * passed to the method are passed as properties in a map. This method expects the following properties to be
      * defined:
      * <dl>
-     * <dt>org.openecomp.appc.provider.type</dt>
+     * <dt>org.onap.appc.provider.type</dt>
      * <dd>The appropriate provider type, such as <code>OpenStackProvider</code>. This is used by the CDP IaaS
      * abstraction layer to dynamically load and open a connection to the appropriate provider type. All CDP supported
      * provider types are legal.</dd>
-     * <dt>org.openecomp.appc.instance.url</dt>
+     * <dt>org.onap.appc.instance.url</dt>
      * <dd>The fully qualified URL of the instance to be rebuilt, as it is known to the provider (i.e., the self-link
      * URL of the server)</dd>
      * </dl>
@@ -206,11 +206,11 @@ public interface ProviderAdapter extends SvcLogicJavaPlugin {
      * passed to the method are passed as properties in a map. This method expects the following properties to be
      * defined:
      * <dl>
-     * <dt>org.openecomp.appc.provider.type</dt>
+     * <dt>org.onap.appc.provider.type</dt>
      * <dd>The appropriate provider type, such as <code>OpenStackProvider</code>. This is used by the CDP IaaS
      * abstraction layer to dynamically load and open a connection to the appropriate provider type. All CDP supported
      * provider types are legal.</dd>
-     * <dt>org.openecomp.appc.instance.url</dt>
+     * <dt>org.onap.appc.instance.url</dt>
      * <dd>The fully qualified URL of the instance to be terminate, as it is known to the provider (i.e., the self-link
      * URL of the server)</dd>
      * </dl>
@@ -252,11 +252,11 @@ public interface ProviderAdapter extends SvcLogicJavaPlugin {
      * passed to the method are passed as properties in a map. This method expects the following properties to be
      * defined:
      * <dl>
-     * <dt>org.openecomp.appc.provider.type</dt>
+     * <dt>org.onap.appc.provider.type</dt>
      * <dd>The appropriate provider type, such as <code>OpenStackProvider</code>. This is used by the CDP IaaS
      * abstraction layer to dynamically load and open a connection to the appropriate provider type. All CDP supported
      * provider types are legal.</dd>
-     * <dt>org.openecomp.appc.instance.url</dt>
+     * <dt>org.onap.appc.instance.url</dt>
      * <dd>The fully qualified URL of the instance to be lookup, as it is known to the provider (i.e., the self-link URL
      * of the server)</dd>
      * </dl>
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/IdentityURL.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/IdentityURL.java
index 038b8de84..c98edc410 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/IdentityURL.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/IdentityURL.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.iaas.impl;
+package org.onap.appc.adapter.iaas.impl;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/ProviderAdapterImpl.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/ProviderAdapterImpl.java
index 95e8e27f4..ba6c8c678 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/ProviderAdapterImpl.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/ProviderAdapterImpl.java
@@ -23,20 +23,20 @@
  */
 
 
-package org.openecomp.appc.adapter.iaas.impl;
-
-import org.openecomp.appc.Constants;
-import org.openecomp.appc.adapter.iaas.ProviderAdapter;
-import org.openecomp.appc.adapter.iaas.provider.operation.api.IProviderOperation;
-import org.openecomp.appc.adapter.iaas.provider.operation.api.ProviderOperationFactory;
-import org.openecomp.appc.adapter.iaas.provider.operation.common.constants.Property;
-import org.openecomp.appc.adapter.iaas.provider.operation.common.enums.Operation;
-import org.openecomp.appc.adapter.iaas.provider.operation.impl.EvacuateServer;
-import org.openecomp.appc.configuration.Configuration;
-import org.openecomp.appc.configuration.ConfigurationFactory;
-import org.openecomp.appc.exceptions.APPCException;
-import org.openecomp.appc.util.StructuredPropertyHelper;
-import org.openecomp.appc.util.StructuredPropertyHelper.Node;
+package org.onap.appc.adapter.iaas.impl;
+
+import org.onap.appc.Constants;
+import org.onap.appc.adapter.iaas.ProviderAdapter;
+import org.onap.appc.adapter.iaas.provider.operation.api.IProviderOperation;
+import org.onap.appc.adapter.iaas.provider.operation.api.ProviderOperationFactory;
+import org.onap.appc.adapter.iaas.provider.operation.common.constants.Property;
+import org.onap.appc.adapter.iaas.provider.operation.common.enums.Operation;
+import org.onap.appc.adapter.iaas.provider.operation.impl.EvacuateServer;
+import org.onap.appc.configuration.Configuration;
+import org.onap.appc.configuration.ConfigurationFactory;
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.util.StructuredPropertyHelper;
+import org.onap.appc.util.StructuredPropertyHelper.Node;
 import com.att.cdp.zones.model.Image;
 import com.att.cdp.zones.model.Server;
 import com.att.cdp.zones.model.Stack;
@@ -269,7 +269,7 @@ public class ProviderAdapterImpl implements ProviderAdapter {
      * Returns the symbolic name of the adapter
      *
      * @return The adapter name
-     * @see org.openecomp.appc.adapter.iaas.ProviderAdapter#getAdapterName()
+     * @see org.onap.appc.adapter.iaas.ProviderAdapter#getAdapterName()
      */
     @Override
     public String getAdapterName() {
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/ProviderCache.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/ProviderCache.java
index bbf85a71a..5453a9ec1 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/ProviderCache.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/ProviderCache.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.iaas.impl;
+package org.onap.appc.adapter.iaas.impl;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/RequestContext.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/RequestContext.java
index cec09266a..ef237f96d 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/RequestContext.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/RequestContext.java
@@ -23,11 +23,11 @@
  */
 
 
-package org.openecomp.appc.adapter.iaas.impl;
+package org.onap.appc.adapter.iaas.impl;
 
-import org.openecomp.appc.Constants;
-import org.openecomp.appc.configuration.Configuration;
-import org.openecomp.appc.configuration.ConfigurationFactory;
+import org.onap.appc.Constants;
+import org.onap.appc.configuration.Configuration;
+import org.onap.appc.configuration.ConfigurationFactory;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 
 /**
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/RequestFailedException.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/RequestFailedException.java
index 614f4bb1e..13df3900c 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/RequestFailedException.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/RequestFailedException.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.iaas.impl;
+package org.onap.appc.adapter.iaas.impl;
 
 import org.glassfish.grizzly.http.util.HttpStatus;
 import com.att.cdp.zones.model.Server;
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/ServiceCatalog.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/ServiceCatalog.java
index b04814c32..c078eb7b3 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/ServiceCatalog.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/ServiceCatalog.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.iaas.impl;
+package org.onap.appc.adapter.iaas.impl;
 
 import java.util.HashSet;
 import java.util.List;
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/ServiceCatalogFactory.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/ServiceCatalogFactory.java
index c6624e8b1..4c759b2c6 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/ServiceCatalogFactory.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/ServiceCatalogFactory.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================

  */

 

-package org.openecomp.appc.adapter.iaas.impl;

+package org.onap.appc.adapter.iaas.impl;

 

 import java.util.Properties;

 

@@ -31,7 +31,7 @@ import com.att.eelf.configuration.EELFManager;
 

 public class ServiceCatalogFactory {

 	

-	private static EELFLogger logger= EELFManager.getInstance().getLogger(org.openecomp.appc.adapter.iaas.impl.ServiceCatalogFactory.class);

+	private static EELFLogger logger= EELFManager.getInstance().getLogger(org.onap.appc.adapter.iaas.impl.ServiceCatalogFactory.class);

 

     /**

      * This method accepts a fully qualified identity service URL and uses that to determine which version of the

diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/ServiceCatalogV2.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/ServiceCatalogV2.java
index 889035510..1e7112cd3 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/ServiceCatalogV2.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/ServiceCatalogV2.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================

  */

 

-package org.openecomp.appc.adapter.iaas.impl;

+package org.onap.appc.adapter.iaas.impl;

 

 import com.att.cdp.exceptions.ContextConnectionException;

 import com.att.cdp.exceptions.ZoneException;

diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/ServiceCatalogV3.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/ServiceCatalogV3.java
index 9cd67995e..b1c47e5d5 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/ServiceCatalogV3.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/ServiceCatalogV3.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================

  */

 

-package org.openecomp.appc.adapter.iaas.impl;

+package org.onap.appc.adapter.iaas.impl;

 

 import com.att.cdp.exceptions.ContextConnectionException;

 import com.att.cdp.exceptions.ZoneException;

diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/TenantCache.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/TenantCache.java
index ff349c76b..659202d1c 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/TenantCache.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/TenantCache.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.iaas.impl;
+package org.onap.appc.adapter.iaas.impl;
 
 import java.io.IOException;
 import java.util.HashMap;
@@ -30,14 +30,14 @@ import java.util.Map;
 import java.util.Properties;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import org.openecomp.appc.Constants;
-import org.openecomp.appc.configuration.Configuration;
-import org.openecomp.appc.configuration.ConfigurationFactory;
-import org.openecomp.appc.i18n.Msg;
-import org.openecomp.appc.pool.Allocator;
-import org.openecomp.appc.pool.Destructor;
-import org.openecomp.appc.pool.Pool;
-import org.openecomp.appc.pool.PoolSpecificationException;
+import org.onap.appc.Constants;
+import org.onap.appc.configuration.Configuration;
+import org.onap.appc.configuration.ConfigurationFactory;
+import org.onap.appc.i18n.Msg;
+import org.onap.appc.pool.Allocator;
+import org.onap.appc.pool.Destructor;
+import org.onap.appc.pool.Pool;
+import org.onap.appc.pool.PoolSpecificationException;
 import com.att.cdp.exceptions.ContextConnectionException;
 import com.att.cdp.exceptions.ZoneException;
 import com.att.cdp.zones.Context;
@@ -339,7 +339,7 @@ public class TenantCache implements Allocator<Context>, Destructor<Context> {
     }
 
     /**
-     * @see org.openecomp.appc.pool.Allocator#allocate(org.openecomp.appc.pool.Pool)
+     * @see org.onap.appc.pool.Allocator#allocate(org.onap.appc.pool.Pool)
      */
     @SuppressWarnings("unchecked")
     @Override
@@ -362,7 +362,7 @@ public class TenantCache implements Allocator<Context>, Destructor<Context> {
     }
 
     /**
-     * @see org.openecomp.appc.pool.Destructor#destroy(java.lang.Object, org.openecomp.appc.pool.Pool)
+     * @see org.onap.appc.pool.Destructor#destroy(java.lang.Object, org.onap.appc.pool.Pool)
      */
     @Override
     public void destroy(Context context, Pool<Context> pool) {
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/VMURL.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/VMURL.java
index 2860b5aea..777327cad 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/VMURL.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/impl/VMURL.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.iaas.impl;
+package org.onap.appc.adapter.iaas.impl;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/api/IProviderOperation.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/api/IProviderOperation.java
index 6a1459772..3417762d1 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/api/IProviderOperation.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/api/IProviderOperation.java
@@ -22,10 +22,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.iaas.provider.operation.api;
+package org.onap.appc.adapter.iaas.provider.operation.api;
 
-import org.openecomp.appc.adapter.iaas.impl.ProviderCache;
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.adapter.iaas.impl.ProviderCache;
+import org.onap.appc.exceptions.APPCException;
 import com.att.cdp.zones.model.ModelObject;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import java.util.Map;
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/api/ProviderOperationFactory.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/api/ProviderOperationFactory.java
index 39ef4a8ae..1eed4ef90 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/api/ProviderOperationFactory.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/api/ProviderOperationFactory.java
@@ -22,11 +22,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.iaas.provider.operation.api;
+package org.onap.appc.adapter.iaas.provider.operation.api;
 
-import org.openecomp.appc.adapter.iaas.provider.operation.impl.*;
-import org.openecomp.appc.adapter.iaas.provider.operation.common.enums.Operation;
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.adapter.iaas.provider.operation.impl.*;
+import org.onap.appc.adapter.iaas.provider.operation.common.enums.Operation;
+import org.onap.appc.exceptions.APPCException;
 import java.util.HashMap;
 import java.util.Map;
 
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/common/constants/Constants.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/common/constants/Constants.java
index 5100602de..503cb1ae8 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/common/constants/Constants.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/common/constants/Constants.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.iaas.provider.operation.common.constants;
+package org.onap.appc.adapter.iaas.provider.operation.common.constants;
 
 /**
  * @since September 26, 2016
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/common/constants/Property.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/common/constants/Property.java
index 23676a0c8..90532b92d 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/common/constants/Property.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/common/constants/Property.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.iaas.provider.operation.common.constants;
+package org.onap.appc.adapter.iaas.provider.operation.common.constants;
 
 /**
  * @since September 26, 2016
@@ -37,5 +37,5 @@ public class Property {
     public static final String PROVIDER_TENANT_PASSWORD = "password";
     public static final String PROVIDER_TENANT_USERID = "userid";
     public static final String PROVIDER_TYPE = "type";
-    public static final String SKIP_HYPERVISOR_CHECK = "org.openecomp.appc.iaas.skiphypervisorcheck";
+    public static final String SKIP_HYPERVISOR_CHECK = "org.onap.appc.iaas.skiphypervisorcheck";
 }
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/common/enums/Operation.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/common/enums/Operation.java
index 857c7a7f0..2f81fab9c 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/common/enums/Operation.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/common/enums/Operation.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.iaas.provider.operation.common.enums;
+package org.onap.appc.adapter.iaas.provider.operation.common.enums;
 
 /**
  * @since September 26, 2016
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/common/enums/Outcome.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/common/enums/Outcome.java
index c62c1b25d..972409174 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/common/enums/Outcome.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/common/enums/Outcome.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.iaas.provider.operation.common.enums;
+package org.onap.appc.adapter.iaas.provider.operation.common.enums;
 
 /**
  * @since September 26, 2016
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/CreateSnapshot.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/CreateSnapshot.java
index b4c55253d..5165b0ce0 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/CreateSnapshot.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/CreateSnapshot.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.iaas.provider.operation.impl;
+package org.onap.appc.adapter.iaas.provider.operation.impl;
 
 import com.att.cdp.exceptions.ContextConnectionException;
 import com.att.cdp.exceptions.ResourceNotFoundException;
@@ -38,26 +38,26 @@ import com.att.eelf.configuration.EELFManager;
 import com.att.eelf.i18n.EELFResourceManager;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.glassfish.grizzly.http.util.HttpStatus;
-import org.openecomp.appc.Constants;
-import org.openecomp.appc.adapter.iaas.ProviderAdapter;
-import org.openecomp.appc.adapter.iaas.impl.IdentityURL;
-import org.openecomp.appc.adapter.iaas.impl.RequestContext;
-import org.openecomp.appc.adapter.iaas.impl.RequestFailedException;
-import org.openecomp.appc.adapter.iaas.impl.VMURL;
-import org.openecomp.appc.adapter.iaas.provider.operation.common.enums.Operation;
-import org.openecomp.appc.adapter.iaas.provider.operation.impl.base.ProviderServerOperation;
-import org.openecomp.appc.configuration.Configuration;
-import org.openecomp.appc.configuration.ConfigurationFactory;
-import org.openecomp.appc.exceptions.APPCException;
-import org.openecomp.appc.i18n.Msg;
+import org.onap.appc.Constants;
+import org.onap.appc.adapter.iaas.ProviderAdapter;
+import org.onap.appc.adapter.iaas.impl.IdentityURL;
+import org.onap.appc.adapter.iaas.impl.RequestContext;
+import org.onap.appc.adapter.iaas.impl.RequestFailedException;
+import org.onap.appc.adapter.iaas.impl.VMURL;
+import org.onap.appc.adapter.iaas.provider.operation.common.enums.Operation;
+import org.onap.appc.adapter.iaas.provider.operation.impl.base.ProviderServerOperation;
+import org.onap.appc.configuration.Configuration;
+import org.onap.appc.configuration.ConfigurationFactory;
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.i18n.Msg;
 import org.slf4j.MDC;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Map;
 import java.util.TimeZone;
-import static org.openecomp.appc.adapter.iaas.provider.operation.common.constants.Constants.DATE_FORMAT;
-import static org.openecomp.appc.adapter.utils.Constants.ADAPTER_NAME;
+import static org.onap.appc.adapter.iaas.provider.operation.common.constants.Constants.DATE_FORMAT;
+import static org.onap.appc.adapter.utils.Constants.ADAPTER_NAME;
 
 public class CreateSnapshot extends ProviderServerOperation {
 
@@ -228,6 +228,6 @@ public class CreateSnapshot extends ProviderServerOperation {
         MDC.put("ElapsedTime", durationStr);
         MDC.put("TargetEntity", "cdp");
         MDC.put("TargetServiceName", "create snapshot");
-        MDC.put("ClassName", "org.openecomp.appc.adapter.iaas.provider.operation.impl.CreateSnapshot");
+        MDC.put("ClassName", "org.onap.appc.adapter.iaas.provider.operation.impl.CreateSnapshot");
     }
 }
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/EvacuateServer.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/EvacuateServer.java
index 45473e349..7ddcd37e6 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/EvacuateServer.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/EvacuateServer.java
@@ -22,21 +22,21 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.iaas.provider.operation.impl;
-
-import org.openecomp.appc.Constants;
-import org.openecomp.appc.adapter.iaas.ProviderAdapter;
-import org.openecomp.appc.adapter.iaas.impl.IdentityURL;
-import org.openecomp.appc.adapter.iaas.impl.ProviderAdapterImpl;
-import org.openecomp.appc.adapter.iaas.impl.RequestContext;
-import org.openecomp.appc.adapter.iaas.impl.RequestFailedException;
-import org.openecomp.appc.adapter.iaas.impl.VMURL;
-import org.openecomp.appc.adapter.iaas.provider.operation.common.enums.Operation;
-import org.openecomp.appc.adapter.iaas.provider.operation.impl.base.ProviderServerOperation;
-import org.openecomp.appc.configuration.Configuration;
-import org.openecomp.appc.configuration.ConfigurationFactory;
-import org.openecomp.appc.exceptions.APPCException;
-import org.openecomp.appc.i18n.Msg;
+package org.onap.appc.adapter.iaas.provider.operation.impl;
+
+import org.onap.appc.Constants;
+import org.onap.appc.adapter.iaas.ProviderAdapter;
+import org.onap.appc.adapter.iaas.impl.IdentityURL;
+import org.onap.appc.adapter.iaas.impl.ProviderAdapterImpl;
+import org.onap.appc.adapter.iaas.impl.RequestContext;
+import org.onap.appc.adapter.iaas.impl.RequestFailedException;
+import org.onap.appc.adapter.iaas.impl.VMURL;
+import org.onap.appc.adapter.iaas.provider.operation.common.enums.Operation;
+import org.onap.appc.adapter.iaas.provider.operation.impl.base.ProviderServerOperation;
+import org.onap.appc.configuration.Configuration;
+import org.onap.appc.configuration.ConfigurationFactory;
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.i18n.Msg;
 import com.att.cdp.exceptions.ContextConnectionException;
 import com.att.cdp.exceptions.ResourceNotFoundException;
 import com.att.cdp.exceptions.ZoneException;
@@ -62,7 +62,7 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.TimeZone;
-import static org.openecomp.appc.adapter.utils.Constants.ADAPTER_NAME;
+import static org.onap.appc.adapter.utils.Constants.ADAPTER_NAME;
 
 public class EvacuateServer extends ProviderServerOperation {
 
@@ -137,7 +137,7 @@ public class EvacuateServer extends ProviderServerOperation {
 
 
     /**
-     * @see org.openecomp.appc.adapter.iaas.ProviderAdapter#evacuateServer(java.util.Map,
+     * @see org.onap.appc.adapter.iaas.ProviderAdapter#evacuateServer(java.util.Map,
      *      org.openecomp.sdnc.sli.SvcLogicContext)
      */
     private Server evacuateServer(Map<String, String> params, SvcLogicContext ctx) throws APPCException {
@@ -233,17 +233,17 @@ public class EvacuateServer extends ProviderServerOperation {
                             // Check error code for rebuild errors. Evacuate had set it to 200 after
                             // a successful evacuate. Rebuild updates the error code.
                             String rebuildErrorCode =
-                                    ctx.getAttribute(org.openecomp.appc.Constants.ATTRIBUTE_ERROR_CODE);
+                                    ctx.getAttribute(org.onap.appc.Constants.ATTRIBUTE_ERROR_CODE);
                             if (rebuildErrorCode != null) {
                                 try {
                                     int error_code = Integer.parseInt(rebuildErrorCode);
                                     if (error_code != HttpStatus.OK_200.getStatusCode()) {
                                         logger.debug("Rebuild after evacuate failed - error code=" + error_code
                                                 + ", message=" + ctx.getAttribute(
-                                                        org.openecomp.appc.Constants.ATTRIBUTE_ERROR_MESSAGE));
+                                                        org.onap.appc.Constants.ATTRIBUTE_ERROR_MESSAGE));
                                         msg = EELFResourceManager.format(Msg.EVACUATE_SERVER_REBUILD_FAILED,
                                                 server.getName(), hypervisor, hypervisor_after_evacuate,
-                                                ctx.getAttribute(org.openecomp.appc.Constants.ATTRIBUTE_ERROR_MESSAGE));
+                                                ctx.getAttribute(org.onap.appc.Constants.ATTRIBUTE_ERROR_MESSAGE));
                                         logger.error(msg);
                                         metricsLogger.error(msg);
                                         ctx.setAttribute("EVACUATE_STATUS", "ERROR");
@@ -346,7 +346,7 @@ public class EvacuateServer extends ProviderServerOperation {
         MDC.put("ElapsedTime", durationStr);
         MDC.put("TargetEntity", "cdp");
         MDC.put("TargetServiceName", "evacuate server");
-        MDC.put("ClassName", "org.openecomp.appc.adapter.iaas.provider.operation.impl.EvacuateServer");
+        MDC.put("ClassName", "org.onap.appc.adapter.iaas.provider.operation.impl.EvacuateServer");
     }
 
     public void setProvideAdapterRef(ProviderAdapterImpl pai) {
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/LookupServer.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/LookupServer.java
index 4c5c61670..924322d1f 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/LookupServer.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/LookupServer.java
@@ -22,19 +22,19 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.iaas.provider.operation.impl;
+package org.onap.appc.adapter.iaas.provider.operation.impl;
 
-import org.openecomp.appc.Constants;
-import org.openecomp.appc.adapter.iaas.ProviderAdapter;
-import org.openecomp.appc.adapter.iaas.impl.RequestContext;
-import org.openecomp.appc.adapter.iaas.impl.RequestFailedException;
-import org.openecomp.appc.adapter.iaas.impl.VMURL;
-import org.openecomp.appc.adapter.iaas.provider.operation.common.enums.Operation;
-import org.openecomp.appc.adapter.iaas.provider.operation.impl.base.ProviderServerOperation;
-import org.openecomp.appc.configuration.Configuration;
-import org.openecomp.appc.configuration.ConfigurationFactory;
-import org.openecomp.appc.exceptions.APPCException;
-import org.openecomp.appc.i18n.Msg;
+import org.onap.appc.Constants;
+import org.onap.appc.adapter.iaas.ProviderAdapter;
+import org.onap.appc.adapter.iaas.impl.RequestContext;
+import org.onap.appc.adapter.iaas.impl.RequestFailedException;
+import org.onap.appc.adapter.iaas.impl.VMURL;
+import org.onap.appc.adapter.iaas.provider.operation.common.enums.Operation;
+import org.onap.appc.adapter.iaas.provider.operation.impl.base.ProviderServerOperation;
+import org.onap.appc.configuration.Configuration;
+import org.onap.appc.configuration.ConfigurationFactory;
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.i18n.Msg;
 import com.att.cdp.exceptions.ZoneException;
 import com.att.cdp.zones.Context;
 import com.att.cdp.zones.model.ModelObject;
@@ -46,7 +46,7 @@ import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.glassfish.grizzly.http.util.HttpStatus;
 import java.io.IOException;
 import java.util.Map;
-import static org.openecomp.appc.adapter.utils.Constants.ADAPTER_NAME;
+import static org.onap.appc.adapter.utils.Constants.ADAPTER_NAME;
 
 public class LookupServer extends ProviderServerOperation {
 
@@ -81,7 +81,7 @@ public class LookupServer extends ProviderServerOperation {
                     logger.debug(Msg.SERVER_FOUND, vm_url, context.getTenantName(), server.getStatus().toString());
                     ctx.setAttribute("serverFound", "success");
                     String msg = EELFResourceManager.format(Msg.SUCCESS_EVENT_MESSAGE, "LookupServer", vm_url);
-                    ctx.setAttribute(org.openecomp.appc.Constants.ATTRIBUTE_SUCCESS_MESSAGE, msg);
+                    ctx.setAttribute(org.onap.appc.Constants.ATTRIBUTE_SUCCESS_MESSAGE, msg);
                     doSuccess(rc);
                 }
             } catch (ZoneException e) {
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/MigrateServer.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/MigrateServer.java
index 919562cd5..b28918c09 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/MigrateServer.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/MigrateServer.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.iaas.provider.operation.impl;
+package org.onap.appc.adapter.iaas.provider.operation.impl;
 
 import com.att.cdp.exceptions.ContextConnectionException;
 import com.att.cdp.exceptions.ResourceNotFoundException;
@@ -35,19 +35,19 @@ import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 import com.att.eelf.i18n.EELFResourceManager;
 import org.glassfish.grizzly.http.util.HttpStatus;
-import org.openecomp.appc.Constants;
-import org.openecomp.appc.adapter.iaas.ProviderAdapter;
-import org.openecomp.appc.adapter.iaas.impl.IdentityURL;
-import org.openecomp.appc.adapter.iaas.impl.RequestContext;
-import org.openecomp.appc.adapter.iaas.impl.RequestFailedException;
-import org.openecomp.appc.adapter.iaas.impl.VMURL;
-import org.openecomp.appc.adapter.iaas.provider.operation.common.constants.Property;
-import org.openecomp.appc.adapter.iaas.provider.operation.common.enums.Operation;
-import org.openecomp.appc.adapter.iaas.provider.operation.impl.base.ProviderServerOperation;
-import org.openecomp.appc.configuration.Configuration;
-import org.openecomp.appc.configuration.ConfigurationFactory;
-import org.openecomp.appc.exceptions.APPCException;
-import org.openecomp.appc.i18n.Msg;
+import org.onap.appc.Constants;
+import org.onap.appc.adapter.iaas.ProviderAdapter;
+import org.onap.appc.adapter.iaas.impl.IdentityURL;
+import org.onap.appc.adapter.iaas.impl.RequestContext;
+import org.onap.appc.adapter.iaas.impl.RequestFailedException;
+import org.onap.appc.adapter.iaas.impl.VMURL;
+import org.onap.appc.adapter.iaas.provider.operation.common.constants.Property;
+import org.onap.appc.adapter.iaas.provider.operation.common.enums.Operation;
+import org.onap.appc.adapter.iaas.provider.operation.impl.base.ProviderServerOperation;
+import org.onap.appc.configuration.Configuration;
+import org.onap.appc.configuration.ConfigurationFactory;
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.i18n.Msg;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.slf4j.MDC;
 import java.text.DateFormat;
@@ -57,8 +57,8 @@ import java.util.Collection;
 import java.util.Date;
 import java.util.Map;
 import java.util.TimeZone;
-import static org.openecomp.appc.adapter.iaas.provider.operation.common.enums.Operation.MIGRATE_SERVICE;
-import static org.openecomp.appc.adapter.utils.Constants.ADAPTER_NAME;
+import static org.onap.appc.adapter.iaas.provider.operation.common.enums.Operation.MIGRATE_SERVICE;
+import static org.onap.appc.adapter.utils.Constants.ADAPTER_NAME;
 
 public class MigrateServer extends ProviderServerOperation {
 
@@ -153,7 +153,7 @@ public class MigrateServer extends ProviderServerOperation {
     }
 
     /**
-     * @see org.openecomp.appc.adapter.iaas.ProviderAdapter#migrateServer(java.util.Map,
+     * @see org.onap.appc.adapter.iaas.ProviderAdapter#migrateServer(java.util.Map,
      *      org.openecomp.sdnc.sli.SvcLogicContext)
      */
     private Server migrateServer(Map<String, String> params, SvcLogicContext ctx) throws APPCException {
@@ -235,6 +235,6 @@ public class MigrateServer extends ProviderServerOperation {
         MDC.put("ElapsedTime", durationStr);
         MDC.put("TargetEntity", "cdp");
         MDC.put("TargetServiceName", "migrate server");
-        MDC.put("ClassName", "org.openecomp.appc.adapter.iaas.provider.operation.impl.MigrateServer");
+        MDC.put("ClassName", "org.onap.appc.adapter.iaas.provider.operation.impl.MigrateServer");
     }
 }
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/RebuildServer.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/RebuildServer.java
index 9a185ffeb..a2b27f29a 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/RebuildServer.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/RebuildServer.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.iaas.provider.operation.impl;
+package org.onap.appc.adapter.iaas.provider.operation.impl;
 
 import com.att.cdp.exceptions.ContextConnectionException;
 import com.att.cdp.exceptions.ResourceNotFoundException;
@@ -39,20 +39,20 @@ import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 import com.att.eelf.i18n.EELFResourceManager;
 import org.glassfish.grizzly.http.util.HttpStatus;
-import org.openecomp.appc.Constants;
-import org.openecomp.appc.adapter.iaas.ProviderAdapter;
-import org.openecomp.appc.adapter.iaas.impl.IdentityURL;
-import org.openecomp.appc.adapter.iaas.impl.RequestContext;
-import org.openecomp.appc.adapter.iaas.impl.RequestFailedException;
-import org.openecomp.appc.adapter.iaas.impl.VMURL;
-import org.openecomp.appc.adapter.iaas.provider.operation.common.constants.Property;
-import org.openecomp.appc.adapter.iaas.provider.operation.common.enums.Operation;
-import org.openecomp.appc.adapter.iaas.provider.operation.common.enums.Outcome;
-import org.openecomp.appc.adapter.iaas.provider.operation.impl.base.ProviderServerOperation;
-import org.openecomp.appc.configuration.Configuration;
-import org.openecomp.appc.configuration.ConfigurationFactory;
-import org.openecomp.appc.exceptions.APPCException;
-import org.openecomp.appc.i18n.Msg;
+import org.onap.appc.Constants;
+import org.onap.appc.adapter.iaas.ProviderAdapter;
+import org.onap.appc.adapter.iaas.impl.IdentityURL;
+import org.onap.appc.adapter.iaas.impl.RequestContext;
+import org.onap.appc.adapter.iaas.impl.RequestFailedException;
+import org.onap.appc.adapter.iaas.impl.VMURL;
+import org.onap.appc.adapter.iaas.provider.operation.common.constants.Property;
+import org.onap.appc.adapter.iaas.provider.operation.common.enums.Operation;
+import org.onap.appc.adapter.iaas.provider.operation.common.enums.Outcome;
+import org.onap.appc.adapter.iaas.provider.operation.impl.base.ProviderServerOperation;
+import org.onap.appc.configuration.Configuration;
+import org.onap.appc.configuration.ConfigurationFactory;
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.i18n.Msg;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.slf4j.MDC;
 import java.text.DateFormat;
@@ -61,8 +61,8 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.TimeZone;
-import static org.openecomp.appc.adapter.iaas.provider.operation.common.enums.Operation.STOP_SERVICE;
-import static org.openecomp.appc.adapter.utils.Constants.ADAPTER_NAME;
+import static org.onap.appc.adapter.iaas.provider.operation.common.enums.Operation.STOP_SERVICE;
+import static org.onap.appc.adapter.utils.Constants.ADAPTER_NAME;
 
 public class RebuildServer extends ProviderServerOperation {
 
@@ -328,7 +328,7 @@ public class RebuildServer extends ProviderServerOperation {
     }
 
     /**
-     * @see org.openecomp.appc.adapter.iaas.ProviderAdapter#rebuildServer(java.util.Map,
+     * @see org.onap.appc.adapter.iaas.ProviderAdapter#rebuildServer(java.util.Map,
      *      org.openecomp.sdnc.sli.SvcLogicContext)
      */
     @SuppressWarnings("nls")
@@ -429,6 +429,6 @@ public class RebuildServer extends ProviderServerOperation {
         MDC.put("ElapsedTime", durationStr);
         MDC.put("TargetEntity", "cdp");
         MDC.put("TargetServiceName", "rebuild server");
-        MDC.put("ClassName", "org.openecomp.appc.adapter.iaas.provider.operation.impl.RebuildServer");
+        MDC.put("ClassName", "org.onap.appc.adapter.iaas.provider.operation.impl.RebuildServer");
     }
 }
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/RestartServer.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/RestartServer.java
index 7d191a3d9..cc30ca833 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/RestartServer.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/RestartServer.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.iaas.provider.operation.impl;
+package org.onap.appc.adapter.iaas.provider.operation.impl;
 
 import com.att.cdp.exceptions.ResourceNotFoundException;
 import com.att.cdp.exceptions.ZoneException;
@@ -33,17 +33,17 @@ import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 import com.att.eelf.i18n.EELFResourceManager;
 import org.glassfish.grizzly.http.util.HttpStatus;
-import org.openecomp.appc.Constants;
-import org.openecomp.appc.adapter.iaas.ProviderAdapter;
-import org.openecomp.appc.adapter.iaas.impl.IdentityURL;
-import org.openecomp.appc.adapter.iaas.impl.RequestContext;
-import org.openecomp.appc.adapter.iaas.impl.RequestFailedException;
-import org.openecomp.appc.adapter.iaas.impl.VMURL;
-import org.openecomp.appc.adapter.iaas.provider.operation.common.constants.Property;
-import org.openecomp.appc.adapter.iaas.provider.operation.common.enums.Outcome;
-import org.openecomp.appc.adapter.iaas.provider.operation.impl.base.ProviderServerOperation;
-import org.openecomp.appc.exceptions.UnknownProviderException;
-import org.openecomp.appc.i18n.Msg;
+import org.onap.appc.Constants;
+import org.onap.appc.adapter.iaas.ProviderAdapter;
+import org.onap.appc.adapter.iaas.impl.IdentityURL;
+import org.onap.appc.adapter.iaas.impl.RequestContext;
+import org.onap.appc.adapter.iaas.impl.RequestFailedException;
+import org.onap.appc.adapter.iaas.impl.VMURL;
+import org.onap.appc.adapter.iaas.provider.operation.common.constants.Property;
+import org.onap.appc.adapter.iaas.provider.operation.common.enums.Outcome;
+import org.onap.appc.adapter.iaas.provider.operation.impl.base.ProviderServerOperation;
+import org.onap.appc.exceptions.UnknownProviderException;
+import org.onap.appc.i18n.Msg;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.slf4j.MDC;
 import java.text.DateFormat;
@@ -51,8 +51,8 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Map;
 import java.util.TimeZone;
-import static org.openecomp.appc.adapter.iaas.provider.operation.common.enums.Operation.RESTART_SERVICE;
-import static org.openecomp.appc.adapter.utils.Constants.ADAPTER_NAME;
+import static org.onap.appc.adapter.iaas.provider.operation.common.enums.Operation.RESTART_SERVICE;
+import static org.onap.appc.adapter.utils.Constants.ADAPTER_NAME;
 
 public class RestartServer extends ProviderServerOperation {
 
@@ -176,7 +176,7 @@ public class RestartServer extends ProviderServerOperation {
      *
      * @throws UnknownProviderException If the provider cannot be found
      * @throws IllegalArgumentException if the expected argument(s) are not defined or are invalid
-     * @see org.openecomp.appc.adapter.iaas.ProviderAdapter#restartServer(java.util.Map,
+     * @see org.onap.appc.adapter.iaas.ProviderAdapter#restartServer(java.util.Map,
      *      org.openecomp.sdnc.sli.SvcLogicContext)
      */
     @SuppressWarnings("nls")
@@ -220,7 +220,7 @@ public class RestartServer extends ProviderServerOperation {
                     doSuccess(rc);
                     ctx.setAttribute("RESTART_STATUS", "SUCCESS");
                     String msg = EELFResourceManager.format(Msg.SUCCESS_EVENT_MESSAGE, "RestartServer", vm_url);
-                    ctx.setAttribute(org.openecomp.appc.Constants.ATTRIBUTE_SUCCESS_MESSAGE, msg);
+                    ctx.setAttribute(org.onap.appc.Constants.ATTRIBUTE_SUCCESS_MESSAGE, msg);
                 }
             } catch (RequestFailedException e) {
                 doFailure(rc, e.getStatus(), e.getMessage());
@@ -270,6 +270,6 @@ public class RestartServer extends ProviderServerOperation {
         MDC.put("ElapsedTime", durationStr);
         MDC.put("TargetEntity", "cdp");
         MDC.put("TargetServiceName", targetServiceName);
-        MDC.put("ClassName", "org.openecomp.appc.adapter.iaas.provider.operation.impl.RestartServer");
+        MDC.put("ClassName", "org.onap.appc.adapter.iaas.provider.operation.impl.RestartServer");
     }
 }
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/RestoreStack.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/RestoreStack.java
index 397f63a56..7eeb23783 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/RestoreStack.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/RestoreStack.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.iaas.provider.operation.impl;
+package org.onap.appc.adapter.iaas.provider.operation.impl;
 
 import com.att.cdp.exceptions.ResourceNotFoundException;
 import com.att.cdp.exceptions.ZoneException;
@@ -39,19 +39,19 @@ import com.att.eelf.i18n.EELFResourceManager;
 import com.woorea.openstack.base.client.OpenStackBaseException;
 import com.woorea.openstack.heat.Heat;
 import org.glassfish.grizzly.http.util.HttpStatus;
-import org.openecomp.appc.Constants;
-import org.openecomp.appc.adapter.iaas.ProviderAdapter;
-import org.openecomp.appc.adapter.iaas.impl.RequestContext;
-import org.openecomp.appc.adapter.iaas.impl.RequestFailedException;
-import org.openecomp.appc.adapter.iaas.provider.operation.common.enums.Operation;
-import org.openecomp.appc.adapter.iaas.provider.operation.impl.base.ProviderStackOperation;
-import org.openecomp.appc.adapter.openstack.heat.SnapshotResource;
-import org.openecomp.appc.adapter.openstack.heat.StackResource;
-import org.openecomp.appc.exceptions.APPCException;
-import org.openecomp.appc.i18n.Msg;
+import org.onap.appc.Constants;
+import org.onap.appc.adapter.iaas.ProviderAdapter;
+import org.onap.appc.adapter.iaas.impl.RequestContext;
+import org.onap.appc.adapter.iaas.impl.RequestFailedException;
+import org.onap.appc.adapter.iaas.provider.operation.common.enums.Operation;
+import org.onap.appc.adapter.iaas.provider.operation.impl.base.ProviderStackOperation;
+import org.onap.appc.adapter.openstack.heat.SnapshotResource;
+import org.onap.appc.adapter.openstack.heat.StackResource;
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.i18n.Msg;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import java.util.Map;
-import static org.openecomp.appc.adapter.utils.Constants.ADAPTER_NAME;
+import static org.onap.appc.adapter.utils.Constants.ADAPTER_NAME;
 
 public class RestoreStack extends ProviderStackOperation {
 
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/SnapshotStack.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/SnapshotStack.java
index 97ac5c80a..bf7ebc755 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/SnapshotStack.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/SnapshotStack.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.iaas.provider.operation.impl;
+package org.onap.appc.adapter.iaas.provider.operation.impl;
 
 import com.att.cdp.exceptions.ResourceNotFoundException;
 import com.att.cdp.exceptions.ZoneException;
@@ -39,18 +39,18 @@ import com.att.eelf.i18n.EELFResourceManager;
 import com.woorea.openstack.base.client.OpenStackBaseException;
 import com.woorea.openstack.heat.Heat;
 import org.glassfish.grizzly.http.util.HttpStatus;
-import org.openecomp.appc.Constants;
-import org.openecomp.appc.adapter.iaas.ProviderAdapter;
-import org.openecomp.appc.adapter.iaas.impl.RequestContext;
-import org.openecomp.appc.adapter.iaas.impl.RequestFailedException;
-import org.openecomp.appc.adapter.iaas.provider.operation.common.enums.Operation;
-import org.openecomp.appc.adapter.iaas.provider.operation.impl.base.ProviderStackOperation;
-import org.openecomp.appc.adapter.openstack.heat.SnapshotResource;
-import org.openecomp.appc.adapter.openstack.heat.StackResource;
-import org.openecomp.appc.adapter.openstack.heat.model.CreateSnapshotParams;
-import org.openecomp.appc.adapter.openstack.heat.model.Snapshot;
-import org.openecomp.appc.exceptions.APPCException;
-import org.openecomp.appc.i18n.Msg;
+import org.onap.appc.Constants;
+import org.onap.appc.adapter.iaas.ProviderAdapter;
+import org.onap.appc.adapter.iaas.impl.RequestContext;
+import org.onap.appc.adapter.iaas.impl.RequestFailedException;
+import org.onap.appc.adapter.iaas.provider.operation.common.enums.Operation;
+import org.onap.appc.adapter.iaas.provider.operation.impl.base.ProviderStackOperation;
+import org.onap.appc.adapter.openstack.heat.SnapshotResource;
+import org.onap.appc.adapter.openstack.heat.StackResource;
+import org.onap.appc.adapter.openstack.heat.model.CreateSnapshotParams;
+import org.onap.appc.adapter.openstack.heat.model.Snapshot;
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.i18n.Msg;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.slf4j.MDC;
 import java.text.DateFormat;
@@ -58,7 +58,7 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Map;
 import java.util.TimeZone;
-import static org.openecomp.appc.adapter.utils.Constants.ADAPTER_NAME;
+import static org.onap.appc.adapter.utils.Constants.ADAPTER_NAME;
 
 public class SnapshotStack extends ProviderStackOperation {
 
@@ -188,6 +188,6 @@ public class SnapshotStack extends ProviderStackOperation {
         MDC.put("ElapsedTime", durationStr);
         MDC.put("TargetEntity", "cdp");
         MDC.put("TargetServiceName", "snapshot stack");
-        MDC.put("ClassName", "org.openecomp.appc.adapter.iaas.provider.operation.impl.SnapshotStack");
+        MDC.put("ClassName", "org.onap.appc.adapter.iaas.provider.operation.impl.SnapshotStack");
     }
 }
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/StartServer.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/StartServer.java
index 09781a254..1dbeacbf3 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/StartServer.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/StartServer.java
@@ -22,18 +22,18 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.iaas.provider.operation.impl;
-
-import org.openecomp.appc.Constants;
-import org.openecomp.appc.adapter.iaas.ProviderAdapter;
-import org.openecomp.appc.adapter.iaas.impl.IdentityURL;
-import org.openecomp.appc.adapter.iaas.impl.RequestContext;
-import org.openecomp.appc.adapter.iaas.impl.RequestFailedException;
-import org.openecomp.appc.adapter.iaas.impl.VMURL;
-import org.openecomp.appc.adapter.iaas.provider.operation.common.enums.Operation;
-import org.openecomp.appc.adapter.iaas.provider.operation.impl.base.ProviderServerOperation;
-import org.openecomp.appc.exceptions.APPCException;
-import org.openecomp.appc.i18n.Msg;
+package org.onap.appc.adapter.iaas.provider.operation.impl;
+
+import org.onap.appc.Constants;
+import org.onap.appc.adapter.iaas.ProviderAdapter;
+import org.onap.appc.adapter.iaas.impl.IdentityURL;
+import org.onap.appc.adapter.iaas.impl.RequestContext;
+import org.onap.appc.adapter.iaas.impl.RequestFailedException;
+import org.onap.appc.adapter.iaas.impl.VMURL;
+import org.onap.appc.adapter.iaas.provider.operation.common.enums.Operation;
+import org.onap.appc.adapter.iaas.provider.operation.impl.base.ProviderServerOperation;
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.i18n.Msg;
 import com.att.cdp.exceptions.ResourceNotFoundException;
 import com.att.cdp.zones.Context;
 import com.att.cdp.zones.model.ModelObject;
@@ -44,15 +44,15 @@ import com.att.eelf.i18n.EELFResourceManager;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.glassfish.grizzly.http.util.HttpStatus;
 import java.util.Map;
-import static org.openecomp.appc.adapter.iaas.provider.operation.common.enums.Operation.START_SERVICE;
-import static org.openecomp.appc.adapter.utils.Constants.ADAPTER_NAME;
+import static org.onap.appc.adapter.iaas.provider.operation.common.enums.Operation.START_SERVICE;
+import static org.onap.appc.adapter.utils.Constants.ADAPTER_NAME;
 
 public class StartServer extends ProviderServerOperation {
 
     private static final EELFLogger logger = EELFManager.getInstance().getLogger(StartServer.class);
 
     /**
-     * @see org.openecomp.appc.adapter.iaas.ProviderAdapter#startServer(java.util.Map,
+     * @see org.onap.appc.adapter.iaas.ProviderAdapter#startServer(java.util.Map,
      *      org.openecomp.sdnc.sli.SvcLogicContext)
      */
     @SuppressWarnings("nls")
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/StopServer.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/StopServer.java
index 0587061c7..df836b77c 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/StopServer.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/StopServer.java
@@ -22,18 +22,18 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.iaas.provider.operation.impl;
-
-import org.openecomp.appc.Constants;
-import org.openecomp.appc.adapter.iaas.ProviderAdapter;
-import org.openecomp.appc.adapter.iaas.impl.IdentityURL;
-import org.openecomp.appc.adapter.iaas.impl.RequestContext;
-import org.openecomp.appc.adapter.iaas.impl.RequestFailedException;
-import org.openecomp.appc.adapter.iaas.impl.VMURL;
-import org.openecomp.appc.adapter.iaas.provider.operation.common.enums.Outcome;
-import org.openecomp.appc.adapter.iaas.provider.operation.impl.base.ProviderServerOperation;
-import org.openecomp.appc.exceptions.APPCException;
-import org.openecomp.appc.i18n.Msg;
+package org.onap.appc.adapter.iaas.provider.operation.impl;
+
+import org.onap.appc.Constants;
+import org.onap.appc.adapter.iaas.ProviderAdapter;
+import org.onap.appc.adapter.iaas.impl.IdentityURL;
+import org.onap.appc.adapter.iaas.impl.RequestContext;
+import org.onap.appc.adapter.iaas.impl.RequestFailedException;
+import org.onap.appc.adapter.iaas.impl.VMURL;
+import org.onap.appc.adapter.iaas.provider.operation.common.enums.Outcome;
+import org.onap.appc.adapter.iaas.provider.operation.impl.base.ProviderServerOperation;
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.i18n.Msg;
 import com.att.cdp.exceptions.ResourceNotFoundException;
 import com.att.cdp.zones.Context;
 import com.att.cdp.zones.model.ModelObject;
@@ -44,8 +44,8 @@ import com.att.eelf.i18n.EELFResourceManager;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.glassfish.grizzly.http.util.HttpStatus;
 import java.util.Map;
-import static org.openecomp.appc.adapter.iaas.provider.operation.common.enums.Operation.STOP_SERVICE;
-import static org.openecomp.appc.adapter.utils.Constants.ADAPTER_NAME;
+import static org.onap.appc.adapter.iaas.provider.operation.common.enums.Operation.STOP_SERVICE;
+import static org.onap.appc.adapter.utils.Constants.ADAPTER_NAME;
 
 public class StopServer extends ProviderServerOperation {
 
@@ -53,7 +53,7 @@ public class StopServer extends ProviderServerOperation {
     private static EELFLogger metricsLogger = EELFManager.getInstance().getMetricsLogger();
 
     /**
-     * @see org.openecomp.appc.adapter.iaas.ProviderAdapter#stopServer(java.util.Map,
+     * @see org.onap.appc.adapter.iaas.ProviderAdapter#stopServer(java.util.Map,
      *      org.openecomp.sdnc.sli.SvcLogicContext)
      */
     @SuppressWarnings("nls")
@@ -168,7 +168,7 @@ public class StopServer extends ProviderServerOperation {
                     doSuccess(rc);
                     ctx.setAttribute("STOP_STATUS", "SUCCESS");
                     msg = EELFResourceManager.format(Msg.SUCCESS_EVENT_MESSAGE, "StopServer", vm_url);
-                    ctx.setAttribute(org.openecomp.appc.Constants.ATTRIBUTE_SUCCESS_MESSAGE, msg);
+                    ctx.setAttribute(org.onap.appc.Constants.ATTRIBUTE_SUCCESS_MESSAGE, msg);
 
                 } else {
                     ctx.setAttribute("STOP_STATUS", "CONTEXT_NOT_FOUND");
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/TerminateServer.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/TerminateServer.java
index 51000601a..73385ee35 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/TerminateServer.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/TerminateServer.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.iaas.provider.operation.impl;
+package org.onap.appc.adapter.iaas.provider.operation.impl;
 
 import com.att.cdp.exceptions.ContextConnectionException;
 import com.att.cdp.exceptions.ResourceNotFoundException;
@@ -36,21 +36,21 @@ import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 import com.att.eelf.i18n.EELFResourceManager;
 import org.glassfish.grizzly.http.util.HttpStatus;
-import org.openecomp.appc.Constants;
-import org.openecomp.appc.adapter.iaas.ProviderAdapter;
-import org.openecomp.appc.adapter.iaas.impl.IdentityURL;
-import org.openecomp.appc.adapter.iaas.impl.RequestContext;
-import org.openecomp.appc.adapter.iaas.impl.RequestFailedException;
-import org.openecomp.appc.adapter.iaas.impl.VMURL;
-import org.openecomp.appc.adapter.iaas.provider.operation.common.enums.Outcome;
-import org.openecomp.appc.adapter.iaas.provider.operation.impl.base.ProviderServerOperation;
-import org.openecomp.appc.exceptions.UnknownProviderException;
-import org.openecomp.appc.i18n.Msg;
+import org.onap.appc.Constants;
+import org.onap.appc.adapter.iaas.ProviderAdapter;
+import org.onap.appc.adapter.iaas.impl.IdentityURL;
+import org.onap.appc.adapter.iaas.impl.RequestContext;
+import org.onap.appc.adapter.iaas.impl.RequestFailedException;
+import org.onap.appc.adapter.iaas.impl.VMURL;
+import org.onap.appc.adapter.iaas.provider.operation.common.enums.Outcome;
+import org.onap.appc.adapter.iaas.provider.operation.impl.base.ProviderServerOperation;
+import org.onap.appc.exceptions.UnknownProviderException;
+import org.onap.appc.i18n.Msg;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import java.util.Map;
-import static org.openecomp.appc.adapter.iaas.provider.operation.common.enums.Operation.RESTART_SERVICE;
-import static org.openecomp.appc.adapter.iaas.provider.operation.common.enums.Operation.TERMINATE_SERVICE;
-import static org.openecomp.appc.adapter.utils.Constants.ADAPTER_NAME;
+import static org.onap.appc.adapter.iaas.provider.operation.common.enums.Operation.RESTART_SERVICE;
+import static org.onap.appc.adapter.iaas.provider.operation.common.enums.Operation.TERMINATE_SERVICE;
+import static org.onap.appc.adapter.utils.Constants.ADAPTER_NAME;
 
 public class TerminateServer extends ProviderServerOperation {
 
@@ -173,7 +173,7 @@ public class TerminateServer extends ProviderServerOperation {
      *
      * @throws UnknownProviderException If the provider cannot be found
      * @throws IllegalArgumentException if the expected argument(s) are not defined or are invalid
-     * @see org.openecomp.appc.adapter.iaas.ProviderAdapter#terminateServer(java.util.Map,
+     * @see org.onap.appc.adapter.iaas.ProviderAdapter#terminateServer(java.util.Map,
      *      org.openecomp.sdnc.sli.SvcLogicContext)
      */
     @SuppressWarnings("nls")
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/TerminateStack.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/TerminateStack.java
index a9ee122db..1e3ce1e68 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/TerminateStack.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/TerminateStack.java
@@ -22,16 +22,16 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.iaas.provider.operation.impl;
+package org.onap.appc.adapter.iaas.provider.operation.impl;
 
-import org.openecomp.appc.Constants;
-import org.openecomp.appc.adapter.iaas.ProviderAdapter;
-import org.openecomp.appc.adapter.iaas.impl.RequestContext;
-import org.openecomp.appc.adapter.iaas.impl.RequestFailedException;
-import org.openecomp.appc.adapter.iaas.provider.operation.common.enums.Operation;
-import org.openecomp.appc.adapter.iaas.provider.operation.impl.base.ProviderStackOperation;
-import org.openecomp.appc.exceptions.APPCException;
-import org.openecomp.appc.i18n.Msg;
+import org.onap.appc.Constants;
+import org.onap.appc.adapter.iaas.ProviderAdapter;
+import org.onap.appc.adapter.iaas.impl.RequestContext;
+import org.onap.appc.adapter.iaas.impl.RequestFailedException;
+import org.onap.appc.adapter.iaas.provider.operation.common.enums.Operation;
+import org.onap.appc.adapter.iaas.provider.operation.impl.base.ProviderStackOperation;
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.i18n.Msg;
 import com.att.cdp.exceptions.ResourceNotFoundException;
 import com.att.cdp.exceptions.ZoneException;
 import com.att.cdp.zones.Context;
@@ -44,7 +44,7 @@ import com.att.eelf.i18n.EELFResourceManager;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.glassfish.grizzly.http.util.HttpStatus;
 import java.util.Map;
-import static org.openecomp.appc.adapter.utils.Constants.ADAPTER_NAME;
+import static org.onap.appc.adapter.utils.Constants.ADAPTER_NAME;
 
 public class TerminateStack extends ProviderStackOperation {
 
@@ -98,7 +98,7 @@ public class TerminateStack extends ProviderStackOperation {
                     context.close();
                     doSuccess(rc);
                     String msg = EELFResourceManager.format(Msg.SUCCESS_EVENT_MESSAGE, "TerminateStack", vm_url);
-                    ctx.setAttribute(org.openecomp.appc.Constants.ATTRIBUTE_SUCCESS_MESSAGE, msg);
+                    ctx.setAttribute(org.onap.appc.Constants.ATTRIBUTE_SUCCESS_MESSAGE, msg);
                 }
             } catch (ResourceNotFoundException e) {
                 String msg = EELFResourceManager.format(Msg.STACK_NOT_FOUND, e, vm_url);
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/VmStatuschecker.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/VmStatuschecker.java
index 8175a14f5..9185e35fc 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/VmStatuschecker.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/VmStatuschecker.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.iaas.provider.operation.impl;
+package org.onap.appc.adapter.iaas.provider.operation.impl;
 
 import com.att.cdp.exceptions.ResourceNotFoundException;
 import com.att.cdp.zones.Context;
@@ -32,23 +32,23 @@ import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 import com.att.eelf.i18n.EELFResourceManager;
 import org.glassfish.grizzly.http.util.HttpStatus;
-import org.openecomp.appc.Constants;
-import org.openecomp.appc.adapter.iaas.ProviderAdapter;
-import org.openecomp.appc.adapter.iaas.impl.IdentityURL;
-import org.openecomp.appc.adapter.iaas.impl.RequestContext;
-import org.openecomp.appc.adapter.iaas.impl.RequestFailedException;
-import org.openecomp.appc.adapter.iaas.impl.VMURL;
-import org.openecomp.appc.adapter.iaas.provider.operation.common.enums.Operation;
-import org.openecomp.appc.adapter.iaas.provider.operation.common.enums.Outcome;
-import org.openecomp.appc.adapter.iaas.provider.operation.impl.base.ProviderServerOperation;
-import org.openecomp.appc.configuration.Configuration;
-import org.openecomp.appc.configuration.ConfigurationFactory;
-import org.openecomp.appc.exceptions.UnknownProviderException;
-import org.openecomp.appc.i18n.Msg;
+import org.onap.appc.Constants;
+import org.onap.appc.adapter.iaas.ProviderAdapter;
+import org.onap.appc.adapter.iaas.impl.IdentityURL;
+import org.onap.appc.adapter.iaas.impl.RequestContext;
+import org.onap.appc.adapter.iaas.impl.RequestFailedException;
+import org.onap.appc.adapter.iaas.impl.VMURL;
+import org.onap.appc.adapter.iaas.provider.operation.common.enums.Operation;
+import org.onap.appc.adapter.iaas.provider.operation.common.enums.Outcome;
+import org.onap.appc.adapter.iaas.provider.operation.impl.base.ProviderServerOperation;
+import org.onap.appc.configuration.Configuration;
+import org.onap.appc.configuration.ConfigurationFactory;
+import org.onap.appc.exceptions.UnknownProviderException;
+import org.onap.appc.i18n.Msg;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import java.util.Map;
-import static org.openecomp.appc.adapter.iaas.provider.operation.common.enums.Operation.RESTART_SERVICE;
-import static org.openecomp.appc.adapter.utils.Constants.ADAPTER_NAME;
+import static org.onap.appc.adapter.iaas.provider.operation.common.enums.Operation.RESTART_SERVICE;
+import static org.onap.appc.adapter.utils.Constants.ADAPTER_NAME;
 
 public class VmStatuschecker extends ProviderServerOperation {
 
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/base/ProviderOperation.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/base/ProviderOperation.java
index 02226bbc9..2b50dbe8a 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/base/ProviderOperation.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/base/ProviderOperation.java
@@ -22,19 +22,19 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.iaas.provider.operation.impl.base;
-
-import org.openecomp.appc.adapter.iaas.ProviderAdapter;
-import org.openecomp.appc.adapter.iaas.impl.*;
-import org.openecomp.appc.adapter.iaas.provider.operation.api.IProviderOperation;
-import org.openecomp.appc.adapter.iaas.provider.operation.common.constants.Constants;
-import org.openecomp.appc.adapter.iaas.provider.operation.common.enums.Outcome;
-import org.openecomp.appc.configuration.Configuration;
-import org.openecomp.appc.configuration.ConfigurationFactory;
-import org.openecomp.appc.exceptions.APPCException;
-import org.openecomp.appc.i18n.Msg;
-import org.openecomp.appc.pool.Pool;
-import org.openecomp.appc.pool.PoolExtensionException;
+package org.onap.appc.adapter.iaas.provider.operation.impl.base;
+
+import org.onap.appc.adapter.iaas.ProviderAdapter;
+import org.onap.appc.adapter.iaas.impl.*;
+import org.onap.appc.adapter.iaas.provider.operation.api.IProviderOperation;
+import org.onap.appc.adapter.iaas.provider.operation.common.constants.Constants;
+import org.onap.appc.adapter.iaas.provider.operation.common.enums.Outcome;
+import org.onap.appc.configuration.Configuration;
+import org.onap.appc.configuration.ConfigurationFactory;
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.i18n.Msg;
+import org.onap.appc.pool.Pool;
+import org.onap.appc.pool.PoolExtensionException;
 import com.att.cdp.zones.Context;
 import com.att.cdp.zones.model.ModelObject;
 import com.att.cdp.zones.model.Server;
@@ -48,8 +48,8 @@ import java.net.URI;
 import java.util.Map;
 import java.util.Set;
 import java.util.regex.Pattern;
-import static org.openecomp.appc.adapter.iaas.provider.operation.common.constants.Constants.MDC_ADAPTER;
-import static org.openecomp.appc.adapter.iaas.provider.operation.common.constants.Constants.MDC_SERVICE;
+import static org.onap.appc.adapter.iaas.provider.operation.common.constants.Constants.MDC_ADAPTER;
+import static org.onap.appc.adapter.iaas.provider.operation.common.constants.Constants.MDC_SERVICE;
 import static com.att.eelf.configuration.Configuration.MDC_SERVICE_NAME;
 
 public abstract class ProviderOperation implements IProviderOperation {
@@ -110,7 +110,7 @@ public abstract class ProviderOperation implements IProviderOperation {
      */
     protected void logOperation(Msg msg, Map<String, String> params, SvcLogicContext context) {
 
-        String appName = configuration.getProperty(org.openecomp.appc.Constants.PROPERTY_APPLICATION_NAME);
+        String appName = configuration.getProperty(org.onap.appc.Constants.PROPERTY_APPLICATION_NAME);
         logger.info(msg, appName);
 
         debugParameters(params);
@@ -223,8 +223,8 @@ public abstract class ProviderOperation implements IProviderOperation {
             status = "500";
         }
         svcLogic.setStatus(Outcome.FAILURE.toString());
-        svcLogic.setAttribute(org.openecomp.appc.Constants.ATTRIBUTE_ERROR_CODE, status);
-        svcLogic.setAttribute(org.openecomp.appc.Constants.ATTRIBUTE_ERROR_MESSAGE, msg);
+        svcLogic.setAttribute(org.onap.appc.Constants.ATTRIBUTE_ERROR_CODE, status);
+        svcLogic.setAttribute(org.onap.appc.Constants.ATTRIBUTE_ERROR_MESSAGE, msg);
 
         if (null != cause)
             throw new APPCException(cause);
@@ -237,7 +237,7 @@ public abstract class ProviderOperation implements IProviderOperation {
     protected void doSuccess(RequestContext rc) {
         SvcLogicContext svcLogic = rc.getSvcLogicContext();
         svcLogic.setStatus(Outcome.SUCCESS.toString());
-        svcLogic.setAttribute(org.openecomp.appc.Constants.ATTRIBUTE_ERROR_CODE,
+        svcLogic.setAttribute(org.onap.appc.Constants.ATTRIBUTE_ERROR_CODE,
                 Integer.toString(HttpStatus.OK_200.getStatusCode()));
     }
 
@@ -317,7 +317,7 @@ public abstract class ProviderOperation implements IProviderOperation {
     protected Context getContext(RequestContext rc, String selfLinkURL, String providerName) {
         VMURL vm = VMURL.parseURL(selfLinkURL);
         IdentityURL ident = IdentityURL.parseURL(providerName);
-        String appName = configuration.getProperty(org.openecomp.appc.Constants.PROPERTY_APPLICATION_NAME);
+        String appName = configuration.getProperty(org.onap.appc.Constants.PROPERTY_APPLICATION_NAME);
 
         if (vm == null) {
             String msg = EELFResourceManager.format(Msg.INVALID_SELF_LINK_URL, appName, selfLinkURL);
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/base/ProviderServerOperation.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/base/ProviderServerOperation.java
index e503e05fd..9ef82aea2 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/base/ProviderServerOperation.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/base/ProviderServerOperation.java
@@ -22,11 +22,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.iaas.provider.operation.impl.base;
+package org.onap.appc.adapter.iaas.provider.operation.impl.base;
 
-import org.openecomp.appc.Constants;
-import org.openecomp.appc.adapter.iaas.impl.*;
-import org.openecomp.appc.i18n.Msg;
+import org.onap.appc.Constants;
+import org.onap.appc.adapter.iaas.impl.*;
+import org.onap.appc.i18n.Msg;
 import com.att.cdp.exceptions.ContextConnectionException;
 import com.att.cdp.exceptions.NotLoggedInException;
 import com.att.cdp.exceptions.TimeoutException;
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/base/ProviderStackOperation.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/base/ProviderStackOperation.java
index fa59ffbae..cbf620230 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/base/ProviderStackOperation.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/base/ProviderStackOperation.java
@@ -22,13 +22,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.iaas.provider.operation.impl.base;
+package org.onap.appc.adapter.iaas.provider.operation.impl.base;
 
-import org.openecomp.appc.Constants;
-import org.openecomp.appc.adapter.iaas.impl.RequestContext;
-import org.openecomp.appc.adapter.iaas.impl.RequestFailedException;
-import org.openecomp.appc.adapter.openstack.heat.StackResource;
-import org.openecomp.appc.i18n.Msg;
+import org.onap.appc.Constants;
+import org.onap.appc.adapter.iaas.impl.RequestContext;
+import org.onap.appc.adapter.iaas.impl.RequestFailedException;
+import org.onap.appc.adapter.openstack.heat.StackResource;
+import org.onap.appc.i18n.Msg;
 import com.att.cdp.exceptions.ContextConnectionException;
 import com.att.cdp.exceptions.ResourceNotFoundException;
 import com.att.cdp.exceptions.TimeoutException;
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/SnapshotResource.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/SnapshotResource.java
index 04468187c..549c7b93b 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/SnapshotResource.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/SnapshotResource.java
@@ -22,10 +22,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.openstack.heat;
+package org.onap.appc.adapter.openstack.heat;
 
-import org.openecomp.appc.adapter.openstack.heat.model.CreateSnapshotParams;
-import org.openecomp.appc.adapter.openstack.heat.model.Snapshot;
+import org.onap.appc.adapter.openstack.heat.model.CreateSnapshotParams;
+import org.onap.appc.adapter.openstack.heat.model.Snapshot;
 import com.woorea.openstack.base.client.Entity;
 import com.woorea.openstack.base.client.HttpMethod;
 import com.woorea.openstack.base.client.OpenStackClient;
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/StackResource.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/StackResource.java
index a559b04a8..5add047f7 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/StackResource.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/StackResource.java
@@ -22,10 +22,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.openstack.heat;
+package org.onap.appc.adapter.openstack.heat;
 
-import org.openecomp.appc.adapter.openstack.heat.model.CreateSnapshotParams;
-import org.openecomp.appc.adapter.openstack.heat.model.Snapshot;
+import org.onap.appc.adapter.openstack.heat.model.CreateSnapshotParams;
+import org.onap.appc.adapter.openstack.heat.model.Snapshot;
 import com.woorea.openstack.base.client.Entity;
 import com.woorea.openstack.base.client.HttpMethod;
 import com.woorea.openstack.base.client.OpenStackClient;
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/CreateSnapshotParams.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/CreateSnapshotParams.java
index 4d8901cf2..642b85367 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/CreateSnapshotParams.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/CreateSnapshotParams.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.openstack.heat.model;
+package org.onap.appc.adapter.openstack.heat.model;
 
 import javax.annotation.Generated;
 import com.fasterxml.jackson.annotation.JsonInclude;
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Data.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Data.java
index 3581818e0..df662013a 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Data.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Data.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.openstack.heat.model;
+package org.onap.appc.adapter.openstack.heat.model;
 
 import javax.annotation.Generated;
 import javax.validation.Valid;
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Environment.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Environment.java
index 10adaedbd..b5a9ddcad 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Environment.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Environment.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.openstack.heat.model;
+package org.onap.appc.adapter.openstack.heat.model;
 
 import javax.annotation.Generated;
 import javax.validation.Valid;
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Metadata.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Metadata.java
index b6402d7d1..08e44b725 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Metadata.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Metadata.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.openstack.heat.model;
+package org.onap.appc.adapter.openstack.heat.model;
 
 import javax.annotation.Generated;
 import com.fasterxml.jackson.annotation.JsonInclude;
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Parameters.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Parameters.java
index 480b74450..8adc97a4f 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Parameters.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Parameters.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.openstack.heat.model;
+package org.onap.appc.adapter.openstack.heat.model;
 
 import javax.annotation.Generated;
 import com.fasterxml.jackson.annotation.JsonInclude;
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Properties.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Properties.java
index 3be9461f4..0a7605268 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Properties.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Properties.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.openstack.heat.model;
+package org.onap.appc.adapter.openstack.heat.model;
 
 import javax.annotation.Generated;
 import com.fasterxml.jackson.annotation.JsonInclude;
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/ResourceData.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/ResourceData.java
index 8ac70e3ea..fea775c71 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/ResourceData.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/ResourceData.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.openstack.heat.model;
+package org.onap.appc.adapter.openstack.heat.model;
 
 import javax.annotation.Generated;
 import com.fasterxml.jackson.annotation.JsonInclude;
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/ResourceRegistry.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/ResourceRegistry.java
index c214c41ea..d15c1c339 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/ResourceRegistry.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/ResourceRegistry.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.openstack.heat.model;
+package org.onap.appc.adapter.openstack.heat.model;
 
 import javax.annotation.Generated;
 import javax.validation.Valid;
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Resources.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Resources.java
index 6545479c4..ffa9f0d1a 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Resources.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Resources.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.openstack.heat.model;
+package org.onap.appc.adapter.openstack.heat.model;
 
 import javax.annotation.Generated;
 import com.fasterxml.jackson.annotation.JsonInclude;
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Resources_.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Resources_.java
index cbacd77d9..e6889b0a7 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Resources_.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Resources_.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.openstack.heat.model;
+package org.onap.appc.adapter.openstack.heat.model;
 
 import javax.annotation.Generated;
 import javax.validation.Valid;
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Resources__.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Resources__.java
index b389c2d83..c34310556 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Resources__.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Resources__.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.openstack.heat.model;
+package org.onap.appc.adapter.openstack.heat.model;
 
 import javax.annotation.Generated;
 import javax.validation.Valid;
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Snapshot.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Snapshot.java
index 548035635..57c7d5439 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Snapshot.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Snapshot.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.openstack.heat.model;
+package org.onap.appc.adapter.openstack.heat.model;
 
 import javax.annotation.Generated;
 import javax.validation.Valid;
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/SnapshotDetails.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/SnapshotDetails.java
index 172072d5a..f121ddd70 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/SnapshotDetails.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/SnapshotDetails.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.openstack.heat.model;
+package org.onap.appc.adapter.openstack.heat.model;
 
 import javax.annotation.Generated;
 import javax.validation.Valid;
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/SnapshotRestoreResponse.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/SnapshotRestoreResponse.java
index 5e829bad9..482a29f3b 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/SnapshotRestoreResponse.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/SnapshotRestoreResponse.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.openstack.heat.model;
+package org.onap.appc.adapter.openstack.heat.model;
 
 import javax.annotation.Generated;
 import com.fasterxml.jackson.annotation.JsonInclude;
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Template.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Template.java
index fd762dc2a..310d711f5 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Template.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Template.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.openstack.heat.model;
+package org.onap.appc.adapter.openstack.heat.model;
 
 import javax.annotation.Generated;
 import javax.validation.Valid;
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Volume.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Volume.java
index 9173fe832..5943ba71b 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Volume.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Volume.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.openstack.heat.model;
+package org.onap.appc.adapter.openstack.heat.model;
 
 import javax.annotation.Generated;
 import javax.validation.Valid;
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Volume_.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Volume_.java
index abad08f98..a8df4a7dc 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Volume_.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/openstack/heat/model/Volume_.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.openstack.heat.model;
+package org.onap.appc.adapter.openstack.heat.model;
 
 import javax.annotation.Generated;
 import javax.validation.Valid;
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/utils/Constants.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/utils/Constants.java
index 9cde695d8..6b9602a62 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/utils/Constants.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/utils/Constants.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.utils;
+package org.onap.appc.adapter.utils;
 
 
 public class Constants {
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/resources/com/att/cdp/default.properties b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/resources/com/att/cdp/default.properties
index c91796a3d..ca971a33e 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/resources/com/att/cdp/default.properties
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/resources/com/att/cdp/default.properties
@@ -56,13 +56,13 @@ com.att.cdp.resources=com/att/cdp/StrategyServiceMessages
 #
 # Logger names used in the application 
 #
-com.att.cdp.logger=org.openecomp.appc
-com.att.cdp.security.logger=org.openecomp.appc.security
-com.att.cdp.perf.logger=org.openecomp.appc.perf
-com.att.cdp.gui.logger=org.openecomp.appc.gui
-com.att.cdp.server.logger=org.openecomp.appc.server
-com.att.cdp.coordinator.logger=org.openecomp.appc.coordinator
-com.att.cdp.policy.logger=org.openecomp.appc.policy
+com.att.cdp.logger=org.onap.appc
+com.att.cdp.security.logger=org.onap.appc.security
+com.att.cdp.perf.logger=org.onap.appc.perf
+com.att.cdp.gui.logger=org.onap.appc.gui
+com.att.cdp.server.logger=org.onap.appc.server
+com.att.cdp.coordinator.logger=org.onap.appc.coordinator
+com.att.cdp.policy.logger=org.onap.appc.policy
 
 #
 # This property allows to 'simulate' SSH processes within engine.
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/resources/org/openecomp/appc/default.properties b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/resources/org/openecomp/appc/default.properties
index 21f96d9ee..1ecb98c01 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/resources/org/openecomp/appc/default.properties
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/resources/org/openecomp/appc/default.properties
@@ -29,38 +29,38 @@
 #
 # Define the name and path of any user-provided configuration (bootstrap) file that can be loaded 
 # to supply configuration options 
-org.openecomp.appc.bootstrap.file=appc.properties
-org.openecomp.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
+org.onap.appc.bootstrap.file=appc.properties
+org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
 
 appc.application.name=APPC
 
 #
 # Define the message resource bundle name to be loaded 
-org.openecomp.appc.resources=org/openecomp/appc/i18n/MessageResources
+org.onap.appc.resources=org/onap/appc/i18n/MessageResources
 #
 # The name of the adapter.
-org.openecomp.appc.provider.adaptor.name=org.openecomp.appc.appc_provider_adapter
+org.onap.appc.provider.adaptor.name=org.onap.appc.appc_provider_adapter
 #
 # Set up the logging environment
 #
-org.openecomp.appc.logging.file=org/openecomp/appc/logback.xml
-org.openecomp.appc.logging.path=${user.home};etc;../etc
-org.openecomp.appc.logger=org.openecomp.appc
-org.openecomp.appc.security.logger=org.openecomp.appc.security
+org.onap.appc.logging.file=org/onap/appc/logback.xml
+org.onap.appc.logging.path=${user.home};etc;../etc
+org.onap.appc.logger=org.onap.appc
+org.onap.appc.security.logger=org.onap.appc.security
 #
 # The minimum and maximum provider/tenant context pool sizes.  Min=1 means that as soon 
 # as the provider/tenant is referenced a Context is opened and added to the pool.  Max=0 
 # means that the upper bound on the pool is unbounded. 
-org.openecomp.appc.provider.min.pool=1
-org.openecomp.appc.provider.max.pool=0
+org.onap.appc.provider.min.pool=1
+org.onap.appc.provider.max.pool=0
 
 #
 # The following properties are used to configure the retry logic for connection to the 
 # IaaS provider(s).  The retry delay property is the amount of time, in seconds, the
 # application waits between retry attempts.  The retry limit is the number of retries
 # that are allowed before the request is failed.
-org.openecomp.appc.provider.retry.delay = 30
-org.openecomp.appc.provider.retry.limit = 10
+org.onap.appc.provider.retry.delay = 30
+org.onap.appc.provider.retry.limit = 10
 
 #
 # The trusted hosts list for SSL access when a certificate is not provided.
@@ -70,18 +70,18 @@ provider.trusted.hosts=*
 # The amount of time, in seconds, to wait for a server state change (start->stop, stop->start, etc).
 # If the server does not change state to a valid state within the alloted time, the operation 
 # fails.
-org.openecomp.appc.server.state.change.timeout=300
+org.onap.appc.server.state.change.timeout=300
 #
 # The amount of time to wait, in seconds, between subsequent polls to the OpenStack provider 
 # to refresh the status of a resource we are waiting on.
 #
-org.openecomp.appc.openstack.poll.interval=20
+org.onap.appc.openstack.poll.interval=20
 
     #
      #The amount of time, in seconds, that the application waits for a change of state of a stacj to a known valid
      #sate before giving up and failing the request.
      #
-org.openecomp.appc.stack.state.change.timeout=100
+org.onap.appc.stack.state.change.timeout=100
 
 
 
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestIdentityUrl.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestIdentityUrl.java
index d7dc2a8dc..dac22eadb 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestIdentityUrl.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestIdentityUrl.java
@@ -23,7 +23,7 @@
  */
 
 
-package org.openecomp.appc.adapter.iaas.impl;
+package org.onap.appc.adapter.iaas.impl;
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
@@ -31,8 +31,8 @@ import static org.junit.Assert.assertTrue;
 import java.util.Properties;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.openecomp.appc.adapter.iaas.impl.IdentityURL;
-import org.openecomp.appc.configuration.ConfigurationFactory;
+import org.onap.appc.adapter.iaas.impl.IdentityURL;
+import org.onap.appc.configuration.ConfigurationFactory;
 
 public class TestIdentityUrl {
 
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestProviderAdapterImpl.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestProviderAdapterImpl.java
index cbca170e0..386c1115b 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestProviderAdapterImpl.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestProviderAdapterImpl.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.iaas.impl;
+package org.onap.appc.adapter.iaas.impl;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -41,16 +41,16 @@ import org.junit.BeforeClass;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
-import org.openecomp.appc.Constants;
-import org.openecomp.appc.adapter.iaas.ProviderAdapter;
-import org.openecomp.appc.adapter.iaas.impl.ProviderAdapterImpl;
-import org.openecomp.appc.adapter.iaas.impl.ProviderCache;
-import org.openecomp.appc.adapter.iaas.impl.ServiceCatalog;
-import org.openecomp.appc.adapter.iaas.impl.TenantCache;
-import org.openecomp.appc.adapter.iaas.impl.VMURL;
-import org.openecomp.appc.configuration.ConfigurationFactory;
-import org.openecomp.appc.exceptions.APPCException;
-import org.openecomp.appc.exceptions.UnknownProviderException;
+import org.onap.appc.Constants;
+import org.onap.appc.adapter.iaas.ProviderAdapter;
+import org.onap.appc.adapter.iaas.impl.ProviderAdapterImpl;
+import org.onap.appc.adapter.iaas.impl.ProviderCache;
+import org.onap.appc.adapter.iaas.impl.ServiceCatalog;
+import org.onap.appc.adapter.iaas.impl.TenantCache;
+import org.onap.appc.adapter.iaas.impl.VMURL;
+import org.onap.appc.configuration.ConfigurationFactory;
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.exceptions.UnknownProviderException;
 import com.att.cdp.exceptions.ZoneException;
 import com.att.cdp.zones.ComputeService;
 import com.att.cdp.zones.Context;
@@ -64,7 +64,7 @@ import com.woorea.openstack.keystone.model.Access.Service.Endpoint;
 /**
  * Test the ProviderAdapter implementation.
  */
-@Category(org.openecomp.appc.adapter.iaas.impl.TestProviderAdapterImpl.class)
+@Category(org.onap.appc.adapter.iaas.impl.TestProviderAdapterImpl.class)
 public class TestProviderAdapterImpl {
 
     @SuppressWarnings("nls")
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestProviderOperation.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestProviderOperation.java
index 56c67ddd9..c080cf953 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestProviderOperation.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestProviderOperation.java
@@ -22,20 +22,20 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.iaas.impl;
+package org.onap.appc.adapter.iaas.impl;
 
 import java.lang.reflect.Field;
 import java.util.Map;
-import org.openecomp.appc.adapter.iaas.provider.operation.impl.base.ProviderOperation;
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.adapter.iaas.provider.operation.impl.base.ProviderOperation;
+import org.onap.appc.exceptions.APPCException;
 import com.att.cdp.zones.model.ModelObject;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.slf4j.MDC;
-import org.openecomp.appc.configuration.ConfigurationFactory;
+import org.onap.appc.configuration.ConfigurationFactory;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
-import static org.openecomp.appc.adapter.iaas.provider.operation.common.constants.Constants.MDC_SERVICE;
+import static org.onap.appc.adapter.iaas.provider.operation.common.constants.Constants.MDC_SERVICE;
 
 /**
  * This class is used to test methods and functions of the adapter implementation that do not
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestRequestContext.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestRequestContext.java
index efb40dfac..7ea30635c 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestRequestContext.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestRequestContext.java
@@ -23,15 +23,15 @@
  */
 
 
-package org.openecomp.appc.adapter.iaas.impl;
+package org.onap.appc.adapter.iaas.impl;
 
 import static org.junit.Assert.*;
 import org.junit.Before;
 import org.junit.Test;
-import org.openecomp.appc.Constants;
-import org.openecomp.appc.adapter.iaas.impl.RequestContext;
-import org.openecomp.appc.configuration.Configuration;
-import org.openecomp.appc.configuration.ConfigurationFactory;
+import org.onap.appc.Constants;
+import org.onap.appc.adapter.iaas.impl.RequestContext;
+import org.onap.appc.configuration.Configuration;
+import org.onap.appc.configuration.ConfigurationFactory;
 
 /**
  * Test the RequestContext object
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestServiceCatalog.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestServiceCatalog.java
index be769a066..c1a41f209 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestServiceCatalog.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestServiceCatalog.java
@@ -24,7 +24,7 @@
 
 
 
-package org.openecomp.appc.adapter.iaas.impl;
+package org.onap.appc.adapter.iaas.impl;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -40,7 +40,7 @@ import org.junit.BeforeClass;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.mockito.Mockito;
-import org.openecomp.appc.configuration.ConfigurationFactory;
+import org.onap.appc.configuration.ConfigurationFactory;
 import com.att.cdp.exceptions.ZoneException;
 import com.woorea.openstack.keystone.model.Access.Service;
 
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestServiceCatalogFactory.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestServiceCatalogFactory.java
index e97e64d10..e974d27ba 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestServiceCatalogFactory.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestServiceCatalogFactory.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================

  */

 

-package org.openecomp.appc.adapter.iaas.impl;

+package org.onap.appc.adapter.iaas.impl;

 

 import java.util.Properties;

 import org.junit.Assert;

diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestServiceCatalogV2.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestServiceCatalogV2.java
index c26b3bee1..58b56e06f 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestServiceCatalogV2.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestServiceCatalogV2.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================

  */

 

-package org.openecomp.appc.adapter.iaas.impl;

+package org.onap.appc.adapter.iaas.impl;

 

 import static org.junit.Assert.assertEquals;

 import static org.junit.Assert.assertFalse;

@@ -36,7 +36,7 @@ import org.junit.Before;
 import org.junit.BeforeClass;

 import org.junit.Ignore;

 import org.junit.Test;

-import org.openecomp.appc.configuration.ConfigurationFactory;

+import org.onap.appc.configuration.ConfigurationFactory;

 

 /**

  * This class tests the service catalog against a known provider.

diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestServiceCatalogV3.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestServiceCatalogV3.java
index 14f44d10c..26a4d7dbf 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestServiceCatalogV3.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestServiceCatalogV3.java
@@ -24,7 +24,7 @@
 

 

 

-package org.openecomp.appc.adapter.iaas.impl;

+package org.onap.appc.adapter.iaas.impl;

 

 import static org.junit.Assert.assertEquals;

 import static org.junit.Assert.assertFalse;

@@ -38,7 +38,7 @@ import org.junit.Before;
 import org.junit.BeforeClass;

 import org.junit.Ignore;

 import org.junit.Test;

-import org.openecomp.appc.configuration.ConfigurationFactory;

+import org.onap.appc.configuration.ConfigurationFactory;

 

 /**

  * This class tests the service catalog against a known provider.

diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestVMURL.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestVMURL.java
index 5986fdd64..d433afb64 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestVMURL.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/adapter/iaas/impl/TestVMURL.java
@@ -24,7 +24,7 @@
 
 
 
-package org.openecomp.appc.adapter.iaas.impl;
+package org.onap.appc.adapter.iaas.impl;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -32,8 +32,8 @@ import static org.junit.Assert.assertNull;
 import java.util.Properties;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.openecomp.appc.adapter.iaas.impl.VMURL;
-import org.openecomp.appc.configuration.ConfigurationFactory;
+import org.onap.appc.adapter.iaas.impl.VMURL;
+import org.onap.appc.configuration.ConfigurationFactory;
 
 public class TestVMURL {
 
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/test/ExecutorHarness.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/test/ExecutorHarness.java
index a05474a34..7a03a8d84 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/test/ExecutorHarness.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/test/ExecutorHarness.java
@@ -24,7 +24,7 @@
 
 
 
-package org.openecomp.appc.test;
+package org.onap.appc.test;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
@@ -32,7 +32,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import org.openecomp.appc.test.InterceptLogger;
+import org.onap.appc.test.InterceptLogger;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin;
 
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/test/InterceptLogger.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/test/InterceptLogger.java
index efc84a1e4..6c81a6c6e 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/test/InterceptLogger.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/openecomp/appc/test/InterceptLogger.java
@@ -23,7 +23,7 @@
  */
 
 
-package org.openecomp.appc.test;
+package org.onap.appc.test;
 
 import java.text.MessageFormat;
 import java.util.ArrayList;
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/resources/org/openecomp/appc/default.properties b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/resources/org/openecomp/appc/default.properties
index 0c171a99c..d63c49143 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/resources/org/openecomp/appc/default.properties
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/resources/org/openecomp/appc/default.properties
@@ -29,38 +29,38 @@
 #
 # Define the name and path of any user-provided configuration (bootstrap) file that can be loaded 
 # to supply configuration options 
-org.openecomp.appc.bootstrap.file=appc.properties
-org.openecomp.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
+org.onap.appc.bootstrap.file=appc.properties
+org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
 
 appc.application.name=APPC
 
 #
 # Define the message resource bundle name to be loaded 
-org.openecomp.appc.resources=org/openecomp/appc/i18n/MessageResources
+org.onap.appc.resources=org/onap/appc/i18n/MessageResources
 #
 # The name of the adapter.
-org.openecomp.appc.provider.adaptor.name=org.openecomp.appc.appc_provider_adapter
+org.onap.appc.provider.adaptor.name=org.onap.appc.appc_provider_adapter
 #
 # Set up the logging environment
 #
-org.openecomp.appc.logging.file=org/openecomp/appc/logback.xml
-org.openecomp.appc.logging.path=${user.home};etc;../etc
-org.openecomp.appc.logger=org.openecomp.appc
-org.openecomp.appc.security.logger=org.openecomp.appc.security
+org.onap.appc.logging.file=org/onap/appc/logback.xml
+org.onap.appc.logging.path=${user.home};etc;../etc
+org.onap.appc.logger=org.onap.appc
+org.onap.appc.security.logger=org.onap.appc.security
 #
 # The minimum and maximum provider/tenant context pool sizes.  Min=1 means that as soon 
 # as the provider/tenant is referenced a Context is opened and added to the pool.  Max=0 
 # means that the upper bound on the pool is unbounded. 
-org.openecomp.appc.provider.min.pool=1
-org.openecomp.appc.provider.max.pool=0
+org.onap.appc.provider.min.pool=1
+org.onap.appc.provider.max.pool=0
 
 #
 # The following properties are used to configure the retry logic for connection to the 
 # IaaS provider(s).  The retry delay property is the amount of time, in seconds, the
 # application waits between retry attempts.  The retry limit is the number of retries
 # that are allowed before the request is failed.
-org.openecomp.appc.provider.retry.delay = 30
-org.openecomp.appc.provider.retry.limit = 10
+org.onap.appc.provider.retry.delay = 30
+org.onap.appc.provider.retry.limit = 10
 
 #
 # The trusted hosts list for SSL access when a certificate is not provided.
@@ -70,12 +70,12 @@ provider.trusted.hosts=*
 # The amount of time, in seconds, to wait for a server state change (start->stop, stop->start, etc).
 # If the server does not change state to a valid state within the alloted time, the operation 
 # fails.
-org.openecomp.appc.server.state.change.timeout=300
+org.onap.appc.server.state.change.timeout=300
 #
 # The amount of time to wait, in seconds, between subsequent polls to the OpenStack provider 
 # to refresh the status of a resource we are waiting on.
 #
-org.openecomp.appc.openstack.poll.interval=20
+org.onap.appc.openstack.poll.interval=20
 #
 # The connection information to connect to the provider we are using.  These properties 
 # are "structured" properties, in that the name is a compound name, where the nodes 
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-features/pom.xml b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-features/pom.xml
index b5bd687e8..2797bee68 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-features/pom.xml
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-features/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>appc-iaas-adapter</artifactId>
-    <groupId>org.openecomp.appc</groupId>
+    <groupId>org.onap.appc</groupId>
     <version>1.3.0-SNAPSHOT</version>
   </parent>
   <artifactId>appc-iaas-adapter-features</artifactId>
@@ -13,7 +13,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.openecomp.appc</groupId>
+      <groupId>org.onap.appc</groupId>
       <artifactId>appc-iaas-adapter-bundle</artifactId>
       <version>${project.version}</version>
     </dependency>
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-features/src/main/resources/features.xml b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-features/src/main/resources/features.xml
index 158d67b5a..7a081c0e2 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-features/src/main/resources/features.xml
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-features/src/main/resources/features.xml
@@ -38,7 +38,7 @@
 <!--         <feature>pax-jetty</feature> -->
         <feature version="${odl.mdsal.version}">odl-mdsal-broker</feature>
         <feature>sdnc-sli</feature>
-        <bundle>mvn:org.openecomp.appc/appc-iaas-adapter-bundle/${project.version}</bundle>
+        <bundle>mvn:org.onap.appc/appc-iaas-adapter-bundle/${project.version}</bundle>
 
     </feature>
 
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-installer/pom.xml b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-installer/pom.xml
index 60f4ca8ec..e28bb8128 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-installer/pom.xml
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-installer/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>appc-iaas-adapter</artifactId>
-    <groupId>org.openecomp.appc</groupId>
+    <groupId>org.onap.appc</groupId>
     <version>1.3.0-SNAPSHOT</version>
   </parent>
   <artifactId>appc-iaas-adapter-installer</artifactId>
@@ -13,13 +13,13 @@
   <properties>
     <application.name>appc-iaas-adapter</application.name>
     <features.boot>appc-iaas-adapter</features.boot>
-    <features.repositories>mvn:org.openecomp.appc/appc-iaas-adapter-features/${project.version}/xml/features</features.repositories>
+    <features.repositories>mvn:org.onap.appc/appc-iaas-adapter-features/${project.version}/xml/features</features.repositories>
     <include.transitive.dependencies>false</include.transitive.dependencies>
   </properties>
 
   <dependencies>
     <dependency>
-      <groupId>org.openecomp.appc</groupId>
+      <groupId>org.onap.appc</groupId>
       <artifactId>appc-iaas-adapter-features</artifactId>
       <classifier>features</classifier>
       <type>xml</type>
@@ -32,7 +32,7 @@
     </dependency>
 
     <dependency>
-      <groupId>org.openecomp.appc</groupId>
+      <groupId>org.onap.appc</groupId>
       <artifactId>appc-iaas-adapter-bundle</artifactId>
       <version>${project.version}</version>
     </dependency>
diff --git a/appc-adapters/appc-iaas-adapter/pom.xml b/appc-adapters/appc-iaas-adapter/pom.xml
index 3846612ed..ad3c0cf20 100644
--- a/appc-adapters/appc-iaas-adapter/pom.xml
+++ b/appc-adapters/appc-iaas-adapter/pom.xml
@@ -2,7 +2,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/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.openecomp.appc</groupId>
+    <groupId>org.onap.appc</groupId>
     <artifactId>appc-adapters</artifactId>
     <version>1.3.0-SNAPSHOT</version>
   </parent>
@@ -100,7 +100,7 @@
   <dependencyManagement>
     <dependencies>
       <dependency>
-        <groupId>org.openecomp.appc</groupId>
+        <groupId>org.onap.appc</groupId>
         <artifactId>appc-iaas-adapter-features</artifactId>
         <classifier>features</classifier>
         <type>xml</type>
@@ -108,7 +108,7 @@
       </dependency>
 
       <dependency>
-        <groupId>org.openecomp.appc</groupId>
+        <groupId>org.onap.appc</groupId>
         <artifactId>appc-iaas-adapter-provider</artifactId>
         <version>${project.version}</version>
       </dependency>
diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/pom.xml b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/pom.xml
index 1725489da..422c593e8 100644
--- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/pom.xml
+++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/pom.xml
@@ -2,7 +2,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">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.openecomp.appc</groupId>
+        <groupId>org.onap.appc</groupId>
         <artifactId>appc-netconf-adapter</artifactId>
         <version>1.3.0-SNAPSHOT</version>
     </parent>
@@ -18,7 +18,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>appc-common</artifactId>
             <version>${project.version}</version>
         </dependency>
@@ -166,10 +166,10 @@
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>appc-netconf-adapter</Bundle-SymbolicName>
-                        <Bundle-Activator>org.openecomp.appc.adapter.netconf.AppcNetconfAdapterActivator</Bundle-Activator>
-                        <Export-Package>org.openecomp.appc.adapter.netconf,org.openecomp.appc.adapter.netconf.dao,org.openecomp.appc.adapter.netconf.util,org.openecomp.appc.adapter.netconf.exception</Export-Package>
+                        <Bundle-Activator>org.onap.appc.adapter.netconf.AppcNetconfAdapterActivator</Bundle-Activator>
+                        <Export-Package>org.onap.appc.adapter.netconf,org.onap.appc.adapter.netconf.dao,org.onap.appc.adapter.netconf.util,org.onap.appc.adapter.netconf.exception</Export-Package>
                         <Import-Package>
-                            !org.slf4j.event,org.w3c.dom.*,com.sun.org.apache.xerces.*,javax.sql.*,javax.sql.rowset.*,javax.xml.*,org.openecomp.appc.adapter.messaging.*,javax.crypto.*,org.openecomp.appc.common.exception.*,org.mariadb.*,org.onap.ccsdk.sli.core.sli.*,org.onap.ccsdk.sli.core.dblib,org.osgi.framework.*,org.slf4j.*,com.vmware.*,org.apache.xerces.*,javax.net.*,javax.net.ssl.*,org.xml.sax.*,javax.xml.bind.*,javax.naming.*
+                            !org.slf4j.event,org.w3c.dom.*,com.sun.org.apache.xerces.*,javax.sql.*,javax.sql.rowset.*,javax.xml.*,org.onap.appc.adapter.messaging.*,javax.crypto.*,org.onap.appc.common.exception.*,org.mariadb.*,org.onap.ccsdk.sli.core.sli.*,org.onap.ccsdk.sli.core.dblib,org.osgi.framework.*,org.slf4j.*,com.vmware.*,org.apache.xerces.*,javax.net.*,javax.net.ssl.*,org.xml.sax.*,javax.xml.bind.*,javax.naming.*
                         </Import-Package>
                         <Embed-Dependency>*;scope=compile|runtime;artifactId=!dblib-provider|sli-common|org.eclipse.osgi|slf4j-api|jcl-over-slf4j|mariadb-java-client|xml-apis|appc-dmaap-adapter-bundle</Embed-Dependency>
                         <Embed-Transitive>true</Embed-Transitive>
diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/AppcNetconfAdapterActivator.java b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/AppcNetconfAdapterActivator.java
index c64fe8c80..bae220d13 100644
--- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/AppcNetconfAdapterActivator.java
+++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/AppcNetconfAdapterActivator.java
@@ -22,11 +22,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.netconf;
+package org.onap.appc.adapter.netconf;
 
-import org.openecomp.appc.adapter.netconf.internal.NetconfDataAccessServiceImpl;
+import org.onap.appc.adapter.netconf.internal.NetconfDataAccessServiceImpl;
 import org.onap.ccsdk.sli.core.dblib.DbLibService;
-import org.openecomp.appc.i18n.Msg;
+import org.onap.appc.i18n.Msg;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 import org.osgi.framework.BundleActivator;
diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/ConnectionDetails.java b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/ConnectionDetails.java
index a9a49aa9b..7536f9655 100644
--- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/ConnectionDetails.java
+++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/ConnectionDetails.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.netconf;
+package org.onap.appc.adapter.netconf;
 
 
 public class ConnectionDetails {
diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/MockOperationalStateValidatorImpl.java b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/MockOperationalStateValidatorImpl.java
index dd616694c..079ae76a4 100644
--- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/MockOperationalStateValidatorImpl.java
+++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/MockOperationalStateValidatorImpl.java
@@ -22,9 +22,9 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.netconf;
+package org.onap.appc.adapter.netconf;
 
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.exceptions.APPCException;
 
 
 public class MockOperationalStateValidatorImpl implements OperationalStateValidator {
diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/NetconfClient.java b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/NetconfClient.java
index 95b17ddc3..eaed60fc0 100644
--- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/NetconfClient.java
+++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/NetconfClient.java
@@ -22,9 +22,9 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.netconf;
+package org.onap.appc.adapter.netconf;
 
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.exceptions.APPCException;
 
 
 
diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/NetconfClientFactory.java b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/NetconfClientFactory.java
index aded8b643..45c8fb0ed 100644
--- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/NetconfClientFactory.java
+++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/NetconfClientFactory.java
@@ -22,10 +22,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.netconf;
+package org.onap.appc.adapter.netconf;
 
-import org.openecomp.appc.adapter.netconf.jsch.NetconfClientJsch;
-import org.openecomp.appc.adapter.netconf.odlconnector.NetconfClientRestconfImpl;
+import org.onap.appc.adapter.netconf.jsch.NetconfClientJsch;
+import org.onap.appc.adapter.netconf.odlconnector.NetconfClientRestconfImpl;
 
 
 public class NetconfClientFactory {
diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/NetconfClientRestconf.java b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/NetconfClientRestconf.java
index f28552a1c..a23a16797 100644
--- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/NetconfClientRestconf.java
+++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/NetconfClientRestconf.java
@@ -22,9 +22,9 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.netconf;
+package org.onap.appc.adapter.netconf;
 
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.exceptions.APPCException;
 
 
 
diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/NetconfClientType.java b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/NetconfClientType.java
index eddc40e46..bf7512456 100644
--- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/NetconfClientType.java
+++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/NetconfClientType.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.netconf;
+package org.onap.appc.adapter.netconf;
 
 
 public enum NetconfClientType {
diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/NetconfConnectionDetails.java b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/NetconfConnectionDetails.java
index bdf6e8f48..e7c0cc44d 100644
--- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/NetconfConnectionDetails.java
+++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/NetconfConnectionDetails.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.netconf;
+package org.onap.appc.adapter.netconf;
 
 import java.util.List;
 import java.util.Properties;
diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/NetconfDataAccessService.java b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/NetconfDataAccessService.java
index 2167c9289..f831541da 100644
--- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/NetconfDataAccessService.java
+++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/NetconfDataAccessService.java
@@ -22,9 +22,9 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.netconf;
+package org.onap.appc.adapter.netconf;
 
-import org.openecomp.appc.adapter.netconf.exception.DataAccessException;
+import org.onap.appc.adapter.netconf.exception.DataAccessException;
 import org.onap.ccsdk.sli.core.dblib.DbLibService;
 
 
diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/OperationalStateValidator.java b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/OperationalStateValidator.java
index 92d136398..ffa3862e8 100644
--- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/OperationalStateValidator.java
+++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/OperationalStateValidator.java
@@ -22,9 +22,9 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.netconf;
+package org.onap.appc.adapter.netconf;
 
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.exceptions.APPCException;
 
 
 public interface OperationalStateValidator {
diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/OperationalStateValidatorFactory.java b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/OperationalStateValidatorFactory.java
index b4954aaf5..37e96917d 100644
--- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/OperationalStateValidatorFactory.java
+++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/OperationalStateValidatorFactory.java
@@ -22,11 +22,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.netconf;
+package org.onap.appc.adapter.netconf;
 
 import org.apache.commons.lang3.NotImplementedException;
-import org.openecomp.appc.configuration.Configuration;
-import org.openecomp.appc.configuration.ConfigurationFactory;
+import org.onap.appc.configuration.Configuration;
+import org.onap.appc.configuration.ConfigurationFactory;
 
 public class OperationalStateValidatorFactory {
     protected static final Configuration configuration = ConfigurationFactory.getConfiguration();
diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/VNFOperationalStateValidatorImpl.java b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/VNFOperationalStateValidatorImpl.java
index 6bb3b57d3..4bb5ab238 100644
--- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/VNFOperationalStateValidatorImpl.java
+++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/VNFOperationalStateValidatorImpl.java
@@ -22,10 +22,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.netconf;
+package org.onap.appc.adapter.netconf;
 
 import org.apache.commons.lang3.StringUtils;
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.exceptions.APPCException;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/VnfType.java b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/VnfType.java
index 06d7bcb84..19edc2fd3 100644
--- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/VnfType.java
+++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/VnfType.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.netconf;
+package org.onap.appc.adapter.netconf;
 
 public enum VnfType {
     VNF("VNF"),
diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/exception/DataAccessException.java b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/exception/DataAccessException.java
index 7a62be6a5..0c4964da0 100644
--- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/exception/DataAccessException.java
+++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/exception/DataAccessException.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.netconf.exception;
+package org.onap.appc.adapter.netconf.exception;
 
 
 public class DataAccessException extends RuntimeException {
diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/exception/NetconfDAOException.java b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/exception/NetconfDAOException.java
index 3b0a28dbf..5ff1a331e 100644
--- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/exception/NetconfDAOException.java
+++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/exception/NetconfDAOException.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.netconf.exception;
+package org.onap.appc.adapter.netconf.exception;
 
 public class NetconfDAOException extends RuntimeException {
 
diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/internal/NetconfAdapter.java b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/internal/NetconfAdapter.java
index c7c70e4f3..2d8c6f417 100644
--- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/internal/NetconfAdapter.java
+++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/internal/NetconfAdapter.java
@@ -22,9 +22,9 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.netconf.internal;
+package org.onap.appc.adapter.netconf.internal;
 
-import org.openecomp.appc.configuration.ConfigurationFactory;
+import org.onap.appc.configuration.ConfigurationFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -46,7 +46,7 @@ public class NetconfAdapter {
     private InputStream in;
     // device output stream
     private OutputStream out;
-    private long maxWaitingTime = ConfigurationFactory.getConfiguration().getLongProperty("org.openecomp.appc.netconf.recv.timeout", MAX_WAITING_TIME);
+    private long maxWaitingTime = ConfigurationFactory.getConfiguration().getLongProperty("org.onap.appc.netconf.recv.timeout", MAX_WAITING_TIME);
 
     /**
      * Constructor.
diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/internal/NetconfAdapter2.java b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/internal/NetconfAdapter2.java
index a735222a9..928d77470 100644
--- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/internal/NetconfAdapter2.java
+++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/internal/NetconfAdapter2.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.netconf.internal;
+package org.onap.appc.adapter.netconf.internal;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/internal/NetconfConstMessages.java b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/internal/NetconfConstMessages.java
index e90b27b7d..c7ad9bc50 100644
--- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/internal/NetconfConstMessages.java
+++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/internal/NetconfConstMessages.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.netconf.internal;
+package org.onap.appc.adapter.netconf.internal;
 
 public class NetconfConstMessages {
 
diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/internal/NetconfDataAccessServiceImpl.java b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/internal/NetconfDataAccessServiceImpl.java
index a85ac13c8..f3cca8597 100644
--- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/internal/NetconfDataAccessServiceImpl.java
+++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/internal/NetconfDataAccessServiceImpl.java
@@ -22,15 +22,15 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.netconf.internal;
+package org.onap.appc.adapter.netconf.internal;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
-import org.openecomp.appc.adapter.netconf.ConnectionDetails;
-import org.openecomp.appc.adapter.netconf.NetconfConnectionDetails;
-import org.openecomp.appc.adapter.netconf.NetconfDataAccessService;
-import org.openecomp.appc.adapter.netconf.exception.DataAccessException;
-import org.openecomp.appc.adapter.netconf.util.Constants;
+import org.onap.appc.adapter.netconf.ConnectionDetails;
+import org.onap.appc.adapter.netconf.NetconfConnectionDetails;
+import org.onap.appc.adapter.netconf.NetconfDataAccessService;
+import org.onap.appc.adapter.netconf.exception.DataAccessException;
+import org.onap.appc.adapter.netconf.util.Constants;
 import org.onap.ccsdk.sli.core.dblib.DbLibService;
 
 import javax.sql.rowset.CachedRowSet;
diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/internal/NetconfMessage.java b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/internal/NetconfMessage.java
index 3bba628e5..700a51b9f 100644
--- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/internal/NetconfMessage.java
+++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/internal/NetconfMessage.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.netconf.internal;
+package org.onap.appc.adapter.netconf.internal;
 
 import java.io.ByteArrayOutputStream;
 
diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/jsch/JSchLogger.java b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/jsch/JSchLogger.java
index d9b3a9f5c..37bb3b2f2 100644
--- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/jsch/JSchLogger.java
+++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/jsch/JSchLogger.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.netconf.jsch;
+package org.onap.appc.adapter.netconf.jsch;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/jsch/NetconfClientJsch.java b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/jsch/NetconfClientJsch.java
index 96726f1dc..7b9d7a4ae 100644
--- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/jsch/NetconfClientJsch.java
+++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/jsch/NetconfClientJsch.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.netconf.jsch;
+package org.onap.appc.adapter.netconf.jsch;
 
 import com.jcraft.jsch.Channel;
 import com.jcraft.jsch.ChannelSubsystem;
@@ -33,13 +33,13 @@ import java.io.IOException;
 import java.util.List;
 import java.util.Properties;
 
-import org.openecomp.appc.adapter.netconf.NetconfClient;
-import org.openecomp.appc.adapter.netconf.NetconfConnectionDetails;
-import org.openecomp.appc.adapter.netconf.internal.NetconfAdapter;
-import org.openecomp.appc.adapter.netconf.internal.NetconfConstMessages;
-import org.openecomp.appc.encryption.EncryptionTool;
-import org.openecomp.appc.exceptions.APPCException;
-import org.openecomp.appc.i18n.Msg;
+import org.onap.appc.adapter.netconf.NetconfClient;
+import org.onap.appc.adapter.netconf.NetconfConnectionDetails;
+import org.onap.appc.adapter.netconf.internal.NetconfAdapter;
+import org.onap.appc.adapter.netconf.internal.NetconfConstMessages;
+import org.onap.appc.encryption.EncryptionTool;
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.i18n.Msg;
 import com.att.eelf.i18n.EELFResourceManager;
 
 /**
diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/odlconnector/NetconfClientRestconfImpl.java b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/odlconnector/NetconfClientRestconfImpl.java
index 1b67a1b33..bc89551a8 100644
--- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/odlconnector/NetconfClientRestconfImpl.java
+++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/odlconnector/NetconfClientRestconfImpl.java
@@ -22,15 +22,15 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.netconf.odlconnector;
+package org.onap.appc.adapter.netconf.odlconnector;
 
 import org.apache.http.HttpStatus;
-import org.openecomp.appc.adapter.netconf.NetconfClient;
-import org.openecomp.appc.adapter.netconf.NetconfClientRestconf;
-import org.openecomp.appc.adapter.netconf.NetconfConnectionDetails;
-import org.openecomp.appc.adapter.netconf.util.Constants;
-import org.openecomp.appc.exceptions.APPCException;
-import org.openecomp.appc.util.httpClient;
+import org.onap.appc.adapter.netconf.NetconfClient;
+import org.onap.appc.adapter.netconf.NetconfClientRestconf;
+import org.onap.appc.adapter.netconf.NetconfConnectionDetails;
+import org.onap.appc.adapter.netconf.util.Constants;
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.util.httpClient;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 
diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/util/Constants.java b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/util/Constants.java
index 21d3373db..e8b8e9378 100644
--- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/util/Constants.java
+++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/openecomp/appc/adapter/netconf/util/Constants.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.netconf.util;
+package org.onap.appc.adapter.netconf.util;
 
 public class Constants {
 
@@ -54,13 +54,13 @@ public class Constants {
     public static final String LOG_FIELD_NAME = "LOG";
 
     // input fields names
-    public static final String VNF_TYPE_FIELD_NAME = "org.openecomp.appc.vftype";
+    public static final String VNF_TYPE_FIELD_NAME = "org.onap.appc.vftype";
     public static final String TARGET_VNF_TYPE = "target-vnf-type";
     public static final String FILE_CONTENT_FIELD_NAME = "file-content";
     public static final String CONNECTION_DETAILS_FIELD_NAME = "connection-details";
     public static final String CONFIGURATION_FILE_FIELD_NAME = "configuration-file-name";
     public static final String VNF_HOST_IP_ADDRESS_FIELD_NAME = "vnf-host-ip-address";
-    public static final String DG_ERROR_FIELD_NAME = "org.openecomp.appc.dg.error";
+    public static final String DG_ERROR_FIELD_NAME = "org.onap.appc.dg.error";
     public static final String RESOURCEKEY = "resourceKey";
     public static final String ATTRIBUTE_ERROR_MESSAGE = "error-message";
     public static final String DG_OUTPUT_STATUS_MESSAGE = "output.status.message";
diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/resources/org/openecomp/appc/default.properties b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/resources/org/openecomp/appc/default.properties
index 70736798d..5e4516a3b 100644
--- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/resources/org/openecomp/appc/default.properties
+++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/resources/org/openecomp/appc/default.properties
@@ -22,14 +22,14 @@
 # ============LICENSE_END=========================================================
 ###
 
-org.openecomp.appc.bootstrap.file=appc.properties
-org.openecomp.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
+org.onap.appc.bootstrap.file=appc.properties
+org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
 
-org.openecomp.appc.netconf.db.jdbc.driver=netconfctl
-org.openecomp.appc.netconf.db.url.netconfctl=jdbc:mysql://127.0.0.1:3306/test
-org.openecomp.appc.netconf.db.user.netconfctl=test
-org.openecomp.appc.netconf.db.pass.netconfctl=123456
-org.openecomp.appc.netconf.recv.timeout=1800000
+org.onap.appc.netconf.db.jdbc.driver=netconfctl
+org.onap.appc.netconf.db.url.netconfctl=jdbc:mysql://127.0.0.1:3306/test
+org.onap.appc.netconf.db.user.netconfctl=test
+org.onap.appc.netconf.db.pass.netconfctl=123456
+org.onap.appc.netconf.recv.timeout=1800000
 
 ###																###
 ### Properties commented out below provided in appc.properties  ###
@@ -41,4 +41,4 @@ event.client.secret=64AG2hF4pYeG2pq7CT6XwUOT
 #restconf.user=<RESTCONF_USER>
 #restconf.pass=<RESTCONF_PASSWORD>
 
-org.openecomp.appc.adapter.netconf.VNFOperationalStateValidatorImpl-CONFIG_FILE=VnfGetOperationalStates
+org.onap.appc.adapter.netconf.VNFOperationalStateValidatorImpl-CONFIG_FILE=VnfGetOperationalStates
diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/test/java/OperationalStateValidatorTest.java b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/test/java/OperationalStateValidatorTest.java
index 8a6a794a5..11f6f818b 100644
--- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/test/java/OperationalStateValidatorTest.java
+++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/test/java/OperationalStateValidatorTest.java
@@ -22,11 +22,11 @@
  * ============LICENSE_END=========================================================
  */
 
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.exceptions.APPCException;
 import org.junit.Test;
-import org.openecomp.appc.adapter.netconf.OperationalStateValidator;
-import org.openecomp.appc.adapter.netconf.OperationalStateValidatorFactory;
-import org.openecomp.appc.adapter.netconf.VnfType;
+import org.onap.appc.adapter.netconf.OperationalStateValidator;
+import org.onap.appc.adapter.netconf.OperationalStateValidatorFactory;
+import org.onap.appc.adapter.netconf.VnfType;
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.fail;
@@ -39,9 +39,9 @@ public class OperationalStateValidatorTest {
         String validResponse = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
                 "<rpc-reply xmlns=\"urn:ietf:params:xml:ns:netconf:base:1.0\" message-id=\"101\">\n" +
                 "    <data>\n" +
-                "        <ManagedElement xmlns=\"urn:org:openecomp:appc:Test\">\n" +
+                "        <ManagedElement xmlns=\"urn:org:onap:appc:Test\">\n" +
                 "            <managedElementId>1</managedElementId>\n" +
-                "            <VnfFunction xmlns=\"urn:org:openecomp:appc:Test\">\n" +
+                "            <VnfFunction xmlns=\"urn:org:onap:appc:Test\">\n" +
                 "                <id>1</id>\n" +
                 "                <ProcessorManagement>\n" +
                 "                    <id>1</id>\n" +
@@ -102,9 +102,9 @@ public class OperationalStateValidatorTest {
         response = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
                 "<rpc-reply xmlns=\"urn:ietf:params:xml:ns:netconf:base:1.0\" message-id=\"101\">\n" +
                 "    <data>\n" +
-                "        <ManagedElement xmlns=\"urn:org:openecomp:appc:Test\">\n" +
+                "        <ManagedElement xmlns=\"urn:org:onap:appc:Test\">\n" +
                 "            <managedElementId>1</managedElementId>\n" +
-                "            <VnfFunction xmlns=\"urn:org:openecomp:appc:Test\">\n" +
+                "            <VnfFunction xmlns=\"urn:org:onap:appc:Test\">\n" +
                 "                <id>1</id>\n" +
                 "                <ProcessorManagement>\n" +
                 "                    <id>1</id>\n" +
diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/test/java/org/openecomp/appc/adapter/netconf/internal/TestNetconfAdapter.java b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/test/java/org/openecomp/appc/adapter/netconf/internal/TestNetconfAdapter.java
index f3b9d53b6..cb20cbdb5 100644
--- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/test/java/org/openecomp/appc/adapter/netconf/internal/TestNetconfAdapter.java
+++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/test/java/org/openecomp/appc/adapter/netconf/internal/TestNetconfAdapter.java
@@ -22,11 +22,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.netconf.internal;
+package org.onap.appc.adapter.netconf.internal;
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.openecomp.appc.adapter.netconf.internal.NetconfAdapter;
+import org.onap.appc.adapter.netconf.internal.NetconfAdapter;
 
 import java.io.IOException;
 import java.io.PipedInputStream;
diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/test/java/org/openecomp/appc/adapter/netconf/jsch/TestGetRunningConfig.java b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/test/java/org/openecomp/appc/adapter/netconf/jsch/TestGetRunningConfig.java
index b695b0448..b559bc749 100644
--- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/test/java/org/openecomp/appc/adapter/netconf/jsch/TestGetRunningConfig.java
+++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/test/java/org/openecomp/appc/adapter/netconf/jsch/TestGetRunningConfig.java
@@ -22,14 +22,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.netconf.jsch;
+package org.onap.appc.adapter.netconf.jsch;
 
 import java.util.Collections;
 import java.util.List;
 
-import org.openecomp.appc.adapter.netconf.NetconfConnectionDetails;
-import org.openecomp.appc.adapter.netconf.jsch.NetconfClientJsch;
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.adapter.netconf.NetconfConnectionDetails;
+import org.onap.appc.adapter.netconf.jsch.NetconfClientJsch;
+import org.onap.appc.exceptions.APPCException;
 
 public class TestGetRunningConfig {
 
@@ -37,7 +37,7 @@ public class TestGetRunningConfig {
     private static final String USER = "test";
     private static final String PSWD = "test123";
     private static final int PORT = 830;
-    private static final List<String> CAPABILITIES = Collections.singletonList("<capability>urn:org:openecomp:appc:capability:1.1.0</capability>");
+    private static final List<String> CAPABILITIES = Collections.singletonList("<capability>urn:org:onap:appc:capability:1.1.0</capability>");
 
     public static void main(String[] args) throws APPCException {
         try {
diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/test/java/org/openecomp/appc/adapter/netconf/jsch/TestModifyConfig.java b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/test/java/org/openecomp/appc/adapter/netconf/jsch/TestModifyConfig.java
index c4ee0e25a..809625333 100644
--- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/test/java/org/openecomp/appc/adapter/netconf/jsch/TestModifyConfig.java
+++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/test/java/org/openecomp/appc/adapter/netconf/jsch/TestModifyConfig.java
@@ -22,14 +22,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.netconf.jsch;
+package org.onap.appc.adapter.netconf.jsch;
 
 import java.util.Collections;
 import java.util.List;
 
-import org.openecomp.appc.adapter.netconf.NetconfConnectionDetails;
-import org.openecomp.appc.adapter.netconf.jsch.NetconfClientJsch;
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.adapter.netconf.NetconfConnectionDetails;
+import org.onap.appc.adapter.netconf.jsch.NetconfClientJsch;
+import org.onap.appc.exceptions.APPCException;
 
 public class TestModifyConfig {
 
@@ -37,7 +37,7 @@ public class TestModifyConfig {
     private static final String USER = "test";
     private static final String PSWD = "test123";
     private static final int PORT = 830;
-    private static final List<String> CAPABILITIES = Collections.singletonList("<capability>urn:org:openecomp:appc:capability:1.1.0</capability>");
+    private static final List<String> CAPABILITIES = Collections.singletonList("<capability>urn:org:onap:appc:capability:1.1.0</capability>");
     private static final String CONFIG =
             "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
             "<rpc xmlns=\"urn:ietf:params:xml:ns:netconf:base:1.0\" message-id=\"1\">\n" +
@@ -47,9 +47,9 @@ public class TestModifyConfig {
             "    </target>\n" +
             "    <default-operation>merge</default-operation>\n" +
             "    <config xmlns:xc=\"urn:ietf:params:xml:ns:netconf:base:1.0\">\n" +
-            "      <ManagedElement xmlns=\"urn:org.openecomp.appc:Test\">\n" +
+            "      <ManagedElement xmlns=\"urn:org.onap.appc:Test\">\n" +
             "        <managedElementId>1</managedElementId>\n" +
-            "        <VnfFunction xmlns=\"urn:org:openecomp:appc:VnfFunction\">\n" +
+            "        <VnfFunction xmlns=\"urn:org:onap:appc:VnfFunction\">\n" +
             "          <id>1</id>\n" +
             "          <Interfaces>\n" +
             "            <id>1</id>\n" +
diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/test/java/org/openecomp/appc/adapter/netconf/jsch/TestModifyConfigMock.java b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/test/java/org/openecomp/appc/adapter/netconf/jsch/TestModifyConfigMock.java
index 1a6a0e501..915721d51 100644
--- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/test/java/org/openecomp/appc/adapter/netconf/jsch/TestModifyConfigMock.java
+++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/test/java/org/openecomp/appc/adapter/netconf/jsch/TestModifyConfigMock.java
@@ -22,14 +22,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.netconf.jsch;
+package org.onap.appc.adapter.netconf.jsch;
 
 import java.util.Collections;
 import java.util.List;
 
-import org.openecomp.appc.adapter.netconf.NetconfConnectionDetails;
-import org.openecomp.appc.adapter.netconf.jsch.NetconfClientJsch;
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.adapter.netconf.NetconfConnectionDetails;
+import org.onap.appc.adapter.netconf.jsch.NetconfClientJsch;
+import org.onap.appc.exceptions.APPCException;
 
 public class TestModifyConfigMock {
 
@@ -37,7 +37,7 @@ public class TestModifyConfigMock {
     private static final String USER = "test";
     private static final String PSWD = "test123";
     private static final int PORT = 830;
-    private static final List<String> CAPABILITIES = Collections.singletonList("<capability>urn:org:openecomp:appc:capability:1.1.0</capability>");
+    private static final List<String> CAPABILITIES = Collections.singletonList("<capability>urn:org:onap:appc:capability:1.1.0</capability>");
     private static final String CONFIG =
             "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
             "<rpc xmlns=\"urn:ietf:params:xml:ns:netconf:base:1.0\" message-id=\"1\">\n" +
@@ -47,9 +47,9 @@ public class TestModifyConfigMock {
             "    </target>\n" +
             "    <default-operation>merge</default-operation>\n" +
             "    <config xmlns:xc=\"urn:ietf:params:xml:ns:netconf:base:1.0\">\n" +
-            "      <ManagedElement xmlns=\"urn:org.openecomp.appc:Test\">\n" +
+            "      <ManagedElement xmlns=\"urn:org.onap.appc:Test\">\n" +
             "        <managedElementId>1</managedElementId>\n" +
-            "        <VnfFunction xmlns=\"urn:org:openecomp:appc:VnfFunction\">\n" +
+            "        <VnfFunction xmlns=\"urn:org:onap:appc:VnfFunction\">\n" +
             "          <id>1</id>\n" +
             "          <Interfaces>\n" +
             "            <id>1</id>\n" +
diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/test/java/org/openecomp/appc/adapter/netconf/jsch/TestModifyConfigRouterMock.java b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/test/java/org/openecomp/appc/adapter/netconf/jsch/TestModifyConfigRouterMock.java
index eeaf2b21f..83e62bc9f 100644
--- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/test/java/org/openecomp/appc/adapter/netconf/jsch/TestModifyConfigRouterMock.java
+++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/test/java/org/openecomp/appc/adapter/netconf/jsch/TestModifyConfigRouterMock.java
@@ -22,14 +22,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.netconf.jsch;
+package org.onap.appc.adapter.netconf.jsch;
 
 import java.util.Collections;
 import java.util.List;
 
-import org.openecomp.appc.adapter.netconf.NetconfConnectionDetails;
-import org.openecomp.appc.adapter.netconf.jsch.NetconfClientJsch;
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.adapter.netconf.NetconfConnectionDetails;
+import org.onap.appc.adapter.netconf.jsch.NetconfClientJsch;
+import org.onap.appc.exceptions.APPCException;
 
 public class TestModifyConfigRouterMock {
 
diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/test/java/org/openecomp/appc/adapter/netconf/jsch/TestOperationalStates.java b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/test/java/org/openecomp/appc/adapter/netconf/jsch/TestOperationalStates.java
index d5eaaedf3..263dd5a8f 100644
--- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/test/java/org/openecomp/appc/adapter/netconf/jsch/TestOperationalStates.java
+++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/test/java/org/openecomp/appc/adapter/netconf/jsch/TestOperationalStates.java
@@ -22,14 +22,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.netconf.jsch;
+package org.onap.appc.adapter.netconf.jsch;
 
 import java.util.Collections;
 import java.util.List;
 
-import org.openecomp.appc.adapter.netconf.NetconfConnectionDetails;
-import org.openecomp.appc.adapter.netconf.jsch.NetconfClientJsch;
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.adapter.netconf.NetconfConnectionDetails;
+import org.onap.appc.adapter.netconf.jsch.NetconfClientJsch;
+import org.onap.appc.exceptions.APPCException;
 
 public class TestOperationalStates {
 
@@ -37,14 +37,14 @@ public class TestOperationalStates {
     private static final String USER = "test";
     private static final String PSWD = "test123";
     private static final int PORT = 830;
-    private static final List<String> CAPABILITIES = Collections.singletonList("<capability>urn:org:openecomp:appc:capability:1.1.0</capability>");
+    private static final List<String> CAPABILITIES = Collections.singletonList("<capability>urn:org:onap:appc:capability:1.1.0</capability>");
     private static final String GET_OPERATIONAL_STATES =
             "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
             "<rpc message-id=\"101\" xmlns=\"urn:ietf:params:xml:ns:netconf:base:1.0\">\n" +
             "       <get>\n" +
             "              <filter>\n" +
-            "                     <ManagedElement xmlns=\"urn:org:openecomp:appc:Test\">\n" +
-            "                           <VnfFunction xmlns=\"urn:org:openecomp:appc:Test\">\n" +
+            "                     <ManagedElement xmlns=\"urn:org:onap:appc:Test\">\n" +
+            "                           <VnfFunction xmlns=\"urn:org:onap:appc:Test\">\n" +
             "                                  <ProcessorManagement>\n" +
             "                                         <MatedPair>\n" +
             "                                                <operationalState/>\n" +
diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-features/pom.xml b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-features/pom.xml
index 2963fab97..c9faa98ff 100644
--- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-features/pom.xml
+++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-features/pom.xml
@@ -2,7 +2,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>
         <artifactId>appc-netconf-adapter</artifactId>
-        <groupId>org.openecomp.appc</groupId>
+        <groupId>org.onap.appc</groupId>
         <version>1.3.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -12,7 +12,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>appc-netconf-adapter-bundle</artifactId>
             <version>${project.version}</version>
         </dependency>
diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-features/src/main/resources/features.xml b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-features/src/main/resources/features.xml
index 9c878839a..61d9a0a1f 100644
--- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-features/src/main/resources/features.xml
+++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-features/src/main/resources/features.xml
@@ -33,10 +33,10 @@
     <feature name='appc-netconf-adapter' description="appc-netconf-adapter" version='${project.version}'>
         <!-- Most applications will have a dependency on the ODL MD-SAL Broker -->
         <feature version="${odl.mdsal.version}">odl-mdsal-broker</feature>
-<!--         <bundle>mvn:org.openecomp.appc/appc-dmaap-adapter-bundle/${project.version}</bundle> -->
-        <bundle dependency="true">mvn:org.openecomp.appc/appc-common/${project.version}</bundle>
+<!--         <bundle>mvn:org.onap.appc/appc-dmaap-adapter-bundle/${project.version}</bundle> -->
+        <bundle dependency="true">mvn:org.onap.appc/appc-common/${project.version}</bundle>
         <bundle start-level="75">mvn:org.onap.ccsdk.sli.core/dblib-provider/${sdnctl.dblib.version}</bundle>
-        <bundle start-level="83" start="true">mvn:org.openecomp.appc/appc-netconf-adapter-bundle/${project.version}</bundle>
+        <bundle start-level="83" start="true">mvn:org.onap.appc/appc-netconf-adapter-bundle/${project.version}</bundle>
     </feature>
 
 </features>
diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-installer/pom.xml b/appc-adapters/appc-netconf-adapter/appc-netconf-installer/pom.xml
index 687c6270b..27c129f86 100644
--- a/appc-adapters/appc-netconf-adapter/appc-netconf-installer/pom.xml
+++ b/appc-adapters/appc-netconf-adapter/appc-netconf-installer/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <artifactId>appc-netconf-adapter</artifactId>
-        <groupId>org.openecomp.appc</groupId>
+        <groupId>org.onap.appc</groupId>
         <version>1.3.0-SNAPSHOT</version>
     </parent>
     <artifactId>appc-netconf-adapter-installer</artifactId>
@@ -13,13 +13,13 @@
     <properties>
         <application.name>appc-netconf-adapter</application.name>
         <features.boot>appc-netconf-adapter</features.boot>
-        <features.repositories>mvn:org.openecomp.appc/appc-netconf-adapter-features/${project.version}/xml/features</features.repositories>
+        <features.repositories>mvn:org.onap.appc/appc-netconf-adapter-features/${project.version}/xml/features</features.repositories>
         <include.transitive.dependencies>false</include.transitive.dependencies>
     </properties>
 
     <dependencies>
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>appc-netconf-adapter-features</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
@@ -32,7 +32,7 @@
         </dependency>
 
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>appc-netconf-adapter-bundle</artifactId>
             <version>${project.version}</version>
         </dependency>
diff --git a/appc-adapters/appc-netconf-adapter/pom.xml b/appc-adapters/appc-netconf-adapter/pom.xml
index 53f3742d4..81e3765f8 100644
--- a/appc-adapters/appc-netconf-adapter/pom.xml
+++ b/appc-adapters/appc-netconf-adapter/pom.xml
@@ -2,7 +2,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>
         <artifactId>appc-adapters</artifactId>
-        <groupId>org.openecomp.appc</groupId>
+        <groupId>org.onap.appc</groupId>
         <version>1.3.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -103,14 +103,14 @@
     <dependencyManagement>
         <dependencies>
             <dependency>
-                <groupId>org.openecomp.appc</groupId>
+                <groupId>org.onap.appc</groupId>
                 <artifactId>appc-netconf-adapter-features</artifactId>
                 <classifier>features</classifier>
                 <type>xml</type>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.openecomp.appc</groupId>
+                <groupId>org.onap.appc</groupId>
                 <artifactId>appc-netconf-adapter-provider</artifactId>
                 <version>${project.version}</version>
             </dependency>
diff --git a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/pom.xml b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/pom.xml
index 29dc9820a..c8735640a 100644
--- a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/pom.xml
+++ b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/pom.xml
@@ -2,7 +2,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">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.openecomp.appc</groupId>
+		<groupId>org.onap.appc</groupId>
 		<artifactId>appc-rest-adapter</artifactId>
 		<version>1.3.0-SNAPSHOT</version>
 	</parent>
@@ -31,12 +31,12 @@
 			<artifactId>bcprov-jdk15on</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-common</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 			<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-common</artifactId>
 			<version>${project.version}</version>
 			<classifier>jar-with-dependencies</classifier>
@@ -194,8 +194,8 @@
 				<configuration>
 					<instructions>
 						<Bundle-SymbolicName>appc-rest-adapter</Bundle-SymbolicName>
-						<Bundle-Activator>org.openecomp.appc.adapter.rest.RestActivator</Bundle-Activator>
-						<Export-Package>org.openecomp.appc.adapter.rest</Export-Package>
+						<Bundle-Activator>org.onap.appc.adapter.rest.RestActivator</Bundle-Activator>
+						<Export-Package>org.onap.appc.adapter.rest</Export-Package>
 						<Import-Package>org.onap.ccsdk.sli.core.sli.*,org.osgi.framework.*,org.slf4j.*,com.vmware.*,org.apache.xerces.*,javax.net.*,javax.net.ssl.*,org.xml.sax.*,javax.xml.bind.*,javax.naming.*</Import-Package>
 						<Embed-Dependency>*;scope=compile|runtime;artifactId=!sli-common|org.eclipse.osgi|slf4j-api|jcl-over-slf4j|mariadb-java-client|xml-apis|jaxp-api</Embed-Dependency>
 						<Embed-Transitive>true</Embed-Transitive>
diff --git a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/java/org/openecomp/appc/adapter/rest/RequestFactory.java b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/java/org/openecomp/appc/adapter/rest/RequestFactory.java
index b273a5de4..685ae13a9 100644
--- a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/java/org/openecomp/appc/adapter/rest/RequestFactory.java
+++ b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/java/org/openecomp/appc/adapter/rest/RequestFactory.java
@@ -12,7 +12,7 @@
  *
  */
 
-package org.openecomp.appc.adapter.rest;
+package org.onap.appc.adapter.rest;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
diff --git a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/java/org/openecomp/appc/adapter/rest/RestActivator.java b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/java/org/openecomp/appc/adapter/rest/RestActivator.java
index 3cabd959d..3e224b923 100644
--- a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/java/org/openecomp/appc/adapter/rest/RestActivator.java
+++ b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/java/org/openecomp/appc/adapter/rest/RestActivator.java
@@ -22,13 +22,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.rest;
+package org.onap.appc.adapter.rest;
 
-import org.openecomp.appc.Constants;
-import org.openecomp.appc.adapter.rest.impl.RestAdapterImpl;
-import org.openecomp.appc.configuration.Configuration;
-import org.openecomp.appc.configuration.ConfigurationFactory;
-import org.openecomp.appc.i18n.Msg;
+import org.onap.appc.Constants;
+import org.onap.appc.adapter.rest.impl.RestAdapterImpl;
+import org.onap.appc.configuration.Configuration;
+import org.onap.appc.configuration.ConfigurationFactory;
+import org.onap.appc.i18n.Msg;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceRegistration;
diff --git a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/java/org/openecomp/appc/adapter/rest/RestAdapter.java b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/java/org/openecomp/appc/adapter/rest/RestAdapter.java
index 3acab7bc5..8542f105a 100644
--- a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/java/org/openecomp/appc/adapter/rest/RestAdapter.java
+++ b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/java/org/openecomp/appc/adapter/rest/RestAdapter.java
@@ -22,11 +22,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.rest;
+package org.onap.appc.adapter.rest;
 
 import java.util.Map;
 
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.exceptions.APPCException;
 import com.att.cdp.zones.model.Server;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin;
@@ -47,24 +47,24 @@ public interface RestAdapter extends SvcLogicJavaPlugin {
      * correct provider support through the CDP IaaS abstraction layer and can be OpenStackProvider, BareMetalProvider,
      * or any other supported provider type.
      */
-    static final String PROPERTY_PROVIDER_TYPE = "org.openecomp.appc.provider.type";
+    static final String PROPERTY_PROVIDER_TYPE = "org.onap.appc.provider.type";
 
     /**
      * The adapter maintains a cache of providers organized by the name of the provider, not its type. This is
      * equivalent to the system or installation name. All regions within the same installation are assumed to be the
      * same type.
      */
-    static final String PROPERTY_PROVIDER_NAME = "org.openecomp.appc.provider.name";
+    static final String PROPERTY_PROVIDER_NAME = "org.onap.appc.provider.name";
 
     /**
      * The fully-qualified URL of the instance to be manipulated as it is known to the provider.
      */
-    static final String PROPERTY_INSTANCE_URL = "org.openecomp.appc.instance.url";
+    static final String PROPERTY_INSTANCE_URL = "org.onap.appc.instance.url";
 
     /**
      * The fully-qualified URL of the instance to be manipulated as it is known to the provider.
      */
-    static final String PROPERTY_IDENTITY_URL = "org.openecomp.appc.identity.url";
+    static final String PROPERTY_IDENTITY_URL = "org.onap.appc.identity.url";
 
     /**
      * This method is used to restart an existing virtual machine given the fully qualified URL of the machine.
@@ -73,11 +73,11 @@ public interface RestAdapter extends SvcLogicJavaPlugin {
      * passed to the method are passed as properties in a map. This method expects the following properties to be
      * defined:
      * <dl>
-     * <dt>org.openecomp.appc.provider.type</dt>
+     * <dt>org.onap.appc.provider.type</dt>
      * <dd>The appropriate provider type, such as <code>OpenStackProvider</code>. This is used by the CDP IaaS
      * abstraction layer to dynamically load and open a connection to the appropriate provider type. All CDP supported
      * provider types are legal.</dd>
-     * <dt>org.openecomp.appc.instance.url</dt>
+     * <dt>org.onap.appc.instance.url</dt>
      * <dd>The fully qualified URL of the instance to be restarted, as it is known to the provider (i.e., the self-link
      * URL of the server)</dd>
      * </dl>
@@ -103,11 +103,11 @@ public interface RestAdapter extends SvcLogicJavaPlugin {
      * passed to the method are passed as properties in a map. This method expects the following properties to be
      * defined:
      * <dl>
-     * <dt>org.openecomp.appc.provider.type</dt>
+     * <dt>org.onap.appc.provider.type</dt>
      * <dd>The appropriate provider type, such as <code>OpenStackProvider</code>. This is used by the CDP IaaS
      * abstraction layer to dynamically load and open a connection to the appropriate provider type. All CDP supported
      * provider types are legal.</dd>
-     * <dt>org.openecomp.appc.instance.url</dt>
+     * <dt>org.onap.appc.instance.url</dt>
      * <dd>The fully qualified URL of the instance to be stopped, as it is known to the provider (i.e., the self-link
      * URL of the server)</dd>
      * </dl>
@@ -133,11 +133,11 @@ public interface RestAdapter extends SvcLogicJavaPlugin {
      * passed to the method are passed as properties in a map. This method expects the following properties to be
      * defined:
      * <dl>
-     * <dt>org.openecomp.appc.provider.type</dt>
+     * <dt>org.onap.appc.provider.type</dt>
      * <dd>The appropriate provider type, such as <code>OpenStackProvider</code>. This is used by the CDP IaaS
      * abstraction layer to dynamically load and open a connection to the appropriate provider type. All CDP supported
      * provider types are legal.</dd>
-     * <dt>org.openecomp.appc.instance.url</dt>
+     * <dt>org.onap.appc.instance.url</dt>
      * <dd>The fully qualified URL of the instance to be started, as it is known to the provider (i.e., the self-link
      * URL of the server)</dd>
      * </dl>
@@ -163,11 +163,11 @@ public interface RestAdapter extends SvcLogicJavaPlugin {
      * passed to the method are passed as properties in a map. This method expects the following properties to be
      * defined:
      * <dl>
-     * <dt>org.openecomp.appc.provider.type</dt>
+     * <dt>org.onap.appc.provider.type</dt>
      * <dd>The appropriate provider type, such as <code>OpenStackProvider</code>. This is used by the CDP IaaS
      * abstraction layer to dynamically load and open a connection to the appropriate provider type. All CDP supported
      * provider types are legal.</dd>
-     * <dt>org.openecomp.appc.instance.url</dt>
+     * <dt>org.onap.appc.instance.url</dt>
      * <dd>The fully qualified URL of the instance to be rebuilt, as it is known to the provider (i.e., the self-link
      * URL of the server)</dd>
      * </dl>
diff --git a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/java/org/openecomp/appc/adapter/rest/impl/RequestContext.java b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/java/org/openecomp/appc/adapter/rest/impl/RequestContext.java
index 38c1238cc..a3e6b1db4 100644
--- a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/java/org/openecomp/appc/adapter/rest/impl/RequestContext.java
+++ b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/java/org/openecomp/appc/adapter/rest/impl/RequestContext.java
@@ -24,11 +24,11 @@
 
 
 
-package org.openecomp.appc.adapter.rest.impl;
+package org.onap.appc.adapter.rest.impl;
 
-import org.openecomp.appc.Constants;
-import org.openecomp.appc.configuration.Configuration;
-import org.openecomp.appc.configuration.ConfigurationFactory;
+import org.onap.appc.Constants;
+import org.onap.appc.configuration.Configuration;
+import org.onap.appc.configuration.ConfigurationFactory;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 
 /**
diff --git a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/java/org/openecomp/appc/adapter/rest/impl/RequestFailedException.java b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/java/org/openecomp/appc/adapter/rest/impl/RequestFailedException.java
index 4fa3c7bf2..3d3f35985 100644
--- a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/java/org/openecomp/appc/adapter/rest/impl/RequestFailedException.java
+++ b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/java/org/openecomp/appc/adapter/rest/impl/RequestFailedException.java
@@ -24,7 +24,7 @@
 
 
 
-package org.openecomp.appc.adapter.rest.impl;
+package org.onap.appc.adapter.rest.impl;
 
 import org.glassfish.grizzly.http.util.HttpStatus;
 import com.att.cdp.zones.model.Server;
diff --git a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/java/org/openecomp/appc/adapter/rest/impl/RestAdapterImpl.java b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/java/org/openecomp/appc/adapter/rest/impl/RestAdapterImpl.java
index fae0bd955..bbb37f4cf 100644
--- a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/java/org/openecomp/appc/adapter/rest/impl/RestAdapterImpl.java
+++ b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/java/org/openecomp/appc/adapter/rest/impl/RestAdapterImpl.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.rest.impl;
+package org.onap.appc.adapter.rest.impl;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
@@ -39,11 +39,11 @@ import org.apache.http.impl.client.HttpClients;
 import org.apache.http.util.EntityUtils;
 import org.glassfish.grizzly.http.util.HttpStatus;
 import org.json.JSONObject;
-import org.openecomp.appc.Constants;
-import org.openecomp.appc.adapter.rest.RestAdapter;
-import org.openecomp.appc.adapter.rest.RequestFactory;
-import org.openecomp.appc.configuration.Configuration;
-import org.openecomp.appc.configuration.ConfigurationFactory;
+import org.onap.appc.Constants;
+import org.onap.appc.adapter.rest.RestAdapter;
+import org.onap.appc.adapter.rest.RequestFactory;
+import org.onap.appc.configuration.Configuration;
+import org.onap.appc.configuration.ConfigurationFactory;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 
 import java.util.Iterator;
@@ -91,7 +91,7 @@ public class RestAdapterImpl implements RestAdapter {
      * Returns the symbolic name of the adapter
      *
      * @return The adapter name
-     * @see org.openecomp.appc.adapter.rest.RestAdapter#getAdapterName()
+     * @see org.onap.appc.adapter.rest.RestAdapter#getAdapterName()
      */
     @Override
     public String getAdapterName() {
@@ -197,9 +197,9 @@ public class RestAdapterImpl implements RestAdapter {
     public HttpRequestBase createHttpRequest(String method, Map<String, String> params, RequestContext rc){
         HttpRequestBase httpRequest = null;
         try {
-            String tUrl = params.get("org.openecomp.appc.instance.URI");
-            String haveHeader = params.get("org.openecomp.appc.instance.haveHeader");
-            String headers = params.get("org.openecomp.appc.instance.headers");
+            String tUrl = params.get("org.onap.appc.instance.URI");
+            String haveHeader = params.get("org.onap.appc.instance.haveHeader");
+            String headers = params.get("org.onap.appc.instance.headers");
 
             Supplier<RequestFactory> requestFactory =  RequestFactory::new;
             httpRequest = requestFactory.get().getHttpRequest(method, tUrl);
@@ -213,8 +213,8 @@ public class RestAdapterImpl implements RestAdapter {
                     httpRequest.addHeader(String1, String2);
                 }
             }
-            if (params.containsKey("org.openecomp.appc.instance.requestBody")) {
-                String body = params.get("org.openecomp.appc.instance.requestBody");
+            if (params.containsKey("org.onap.appc.instance.requestBody")) {
+                String body = params.get("org.onap.appc.instance.requestBody");
                 StringEntity bodyParams = new StringEntity (body,"UTF-8");
                 if (method.equals("PUT")){
                     HttpPut httpPut = (HttpPut) httpRequest;
diff --git a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/resources/org/openecomp/appc/default.properties b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/resources/org/openecomp/appc/default.properties
index 6b3ca8d5a..c00220dd6 100644
--- a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/resources/org/openecomp/appc/default.properties
+++ b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/resources/org/openecomp/appc/default.properties
@@ -29,38 +29,38 @@
 #
 # Define the name and path of any user-provided configuration (bootstrap) file that can be loaded 
 # to supply configuration options 
-org.openecomp.appc.bootstrap.file=appc.properties
-org.openecomp.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
+org.onap.appc.bootstrap.file=appc.properties
+org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
 
 appc.application.name=APPC
 
 #
 # Define the message resource bundle name to be loaded 
-org.openecomp.appc.resources=org/openecomp/appc/i18n/MessageResources
+org.onap.appc.resources=org/onap/appc/i18n/MessageResources
 #
 # The name of the adapter.
-org.openecomp.appc.provider.adaptor.name=org.openecomp.appc.appc_provider_adapter
+org.onap.appc.provider.adaptor.name=org.onap.appc.appc_provider_adapter
 #
 # Set up the logging environment
 #
-org.openecomp.appc.logging.file=org/openecomp/appc/logback.xml
-org.openecomp.appc.logging.path=${user.home};etc;../etc
-org.openecomp.appc.logger=org.openecomp.appc
-org.openecomp.appc.security.logger=org.openecomp.appc.security
+org.onap.appc.logging.file=org/onap/appc/logback.xml
+org.onap.appc.logging.path=${user.home};etc;../etc
+org.onap.appc.logger=org.onap.appc
+org.onap.appc.security.logger=org.onap.appc.security
 #
 # The minimum and maximum provider/tenant context pool sizes.  Min=1 means that as soon 
 # as the provider/tenant is referenced a Context is opened and added to the pool.  Max=0 
 # means that the upper bound on the pool is unbounded. 
-org.openecomp.appc.provider.min.pool=1
-org.openecomp.appc.provider.max.pool=0
+org.onap.appc.provider.min.pool=1
+org.onap.appc.provider.max.pool=0
 
 #
 # The following properties are used to configure the retry logic for connection to the 
 # IaaS provider(s).  The retry delay property is the amount of time, in seconds, the
 # application waits between retry attempts.  The retry limit is the number of retries
 # that are allowed before the request is failed.
-org.openecomp.appc.provider.retry.delay = 30
-org.openecomp.appc.provider.retry.limit = 10
+org.onap.appc.provider.retry.delay = 30
+org.onap.appc.provider.retry.limit = 10
 
 #
 # The trusted hosts list for SSL access when a certificate is not provided.
@@ -70,12 +70,12 @@ provider.trusted.hosts=*
 # The amount of time, in seconds, to wait for a server state change (start->stop, stop->start, etc).
 # If the server does not change state to a valid state within the alloted time, the operation 
 # fails.
-org.openecomp.appc.server.state.change.timeout=300
+org.onap.appc.server.state.change.timeout=300
 #
 # The amount of time to wait, in seconds, between subsequent polls to the OpenStack provider 
 # to refresh the status of a resource we are waiting on.
 #
-org.openecomp.appc.openstack.poll.interval=20
+org.onap.appc.openstack.poll.interval=20
 #
 # The connection information to connect to the provider we are using.  These properties 
 # are "structured" properties, in that the name is a compound name, where the nodes 
diff --git a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/test/java/org/openecomp/appc/adapter/rest/impl/TestRestAdapterImpl.java b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/test/java/org/openecomp/appc/adapter/rest/impl/TestRestAdapterImpl.java
index 5c027f5bf..65ff0d8f4 100644
--- a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/test/java/org/openecomp/appc/adapter/rest/impl/TestRestAdapterImpl.java
+++ b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/test/java/org/openecomp/appc/adapter/rest/impl/TestRestAdapterImpl.java
@@ -24,7 +24,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.rest.impl;
+package org.onap.appc.adapter.rest.impl;
 
 import static org.junit.Assert.assertEquals;
 
@@ -42,7 +42,7 @@ import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.exceptions.APPCException;
 import com.att.cdp.exceptions.ZoneException;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 
@@ -71,8 +71,8 @@ public class TestRestAdapterImpl {
         ZoneException, APPCException {
 
         Map<String, String> params = new HashMap<>();
-        params.put("org.openecomp.appc.instance.URI", "http://example.com:8080/about/health");
-        params.put("org.openecomp.appc.instance.haveHeader","false");
+        params.put("org.onap.appc.instance.URI", "http://example.com:8080/about/health");
+        params.put("org.onap.appc.instance.haveHeader","false");
 
         HttpGet httpGet = ((HttpGet) givenParams(params, "GET"));
 
@@ -85,9 +85,9 @@ public class TestRestAdapterImpl {
         ZoneException, APPCException {    
 
         Map<String, String> params = new HashMap<>();
-        params.put("org.openecomp.appc.instance.URI", "http://example.com:8081/posttest");
-        params.put("org.openecomp.appc.instance.haveHeader","false");
-        params.put("org.openecomp.appc.instance.requestBody", "{\"name\":\"MyNode\", \"width\":200, \"height\":100}");
+        params.put("org.onap.appc.instance.URI", "http://example.com:8081/posttest");
+        params.put("org.onap.appc.instance.haveHeader","false");
+        params.put("org.onap.appc.instance.requestBody", "{\"name\":\"MyNode\", \"width\":200, \"height\":100}");
 
         HttpPost httpPost = ((HttpPost) givenParams(params, "POST"));
 
@@ -101,9 +101,9 @@ public class TestRestAdapterImpl {
         ZoneException, APPCException {    
 
         Map<String, String> params = new HashMap<>();
-        params.put("org.openecomp.appc.instance.URI", "http://example.com:8081/puttest");
-        params.put("org.openecomp.appc.instance.haveHeader","false");
-        params.put("org.openecomp.appc.instance.requestBody", "{\"name\":\"MyNode2\", \"width\":300, \"height\":300}");
+        params.put("org.onap.appc.instance.URI", "http://example.com:8081/puttest");
+        params.put("org.onap.appc.instance.haveHeader","false");
+        params.put("org.onap.appc.instance.requestBody", "{\"name\":\"MyNode2\", \"width\":300, \"height\":300}");
 
         HttpPut httpPut = ((HttpPut) givenParams(params, "PUT"));
         //Header headers[] = httpPut.getAllHeaders();
@@ -118,8 +118,8 @@ public class TestRestAdapterImpl {
         ZoneException, APPCException {    
 
         Map<String, String> params = new HashMap<>();
-        params.put("org.openecomp.appc.instance.URI", "http://example.com:8081/deletetest");
-        params.put("org.openecomp.appc.instance.haveHeader","false");
+        params.put("org.onap.appc.instance.URI", "http://example.com:8081/deletetest");
+        params.put("org.onap.appc.instance.haveHeader","false");
 
         HttpDelete httpDelete = ((HttpDelete) givenParams(params, "DELETE"));
 
diff --git a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/test/java/org/openecomp/appc/test/ExecutorHarness.java b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/test/java/org/openecomp/appc/test/ExecutorHarness.java
index a9da29b99..7e0154e68 100644
--- a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/test/java/org/openecomp/appc/test/ExecutorHarness.java
+++ b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/test/java/org/openecomp/appc/test/ExecutorHarness.java
@@ -23,7 +23,7 @@
  */
 
 
-package org.openecomp.appc.test;
+package org.onap.appc.test;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
@@ -32,7 +32,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.openecomp.appc.test.InterceptLogger;
+import org.onap.appc.test.InterceptLogger;
 
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin;
diff --git a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/test/java/org/openecomp/appc/test/InterceptLogger.java b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/test/java/org/openecomp/appc/test/InterceptLogger.java
index 6181726f7..c67f0cc8b 100644
--- a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/test/java/org/openecomp/appc/test/InterceptLogger.java
+++ b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/test/java/org/openecomp/appc/test/InterceptLogger.java
@@ -24,7 +24,7 @@
 
 
 
-package org.openecomp.appc.test;
+package org.onap.appc.test;
 
 import java.text.MessageFormat;
 import java.util.ArrayList;
diff --git a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/test/resources/org/openecomp/appc/default.properties b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/test/resources/org/openecomp/appc/default.properties
index 2726adc6d..84cd0beb6 100644
--- a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/test/resources/org/openecomp/appc/default.properties
+++ b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/test/resources/org/openecomp/appc/default.properties
@@ -29,38 +29,38 @@
 #
 # Define the name and path of any user-provided configuration (bootstrap) file that can be loaded 
 # to supply configuration options 
-org.openecomp.appc.bootstrap.file=appc.properties
-org.openecomp.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
+org.onap.appc.bootstrap.file=appc.properties
+org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
 
 appc.application.name=APPC
 
 #
 # Define the message resource bundle name to be loaded 
-org.openecomp.appc.resources=org/openecomp/appc/i18n/MessageResources
+org.onap.appc.resources=org/onap/appc/i18n/MessageResources
 #
 # The name of the adapter.
-org.openecomp.appc.provider.adaptor.name=org.openecomp.appc.appc_provider_adapter
+org.onap.appc.provider.adaptor.name=org.onap.appc.appc_provider_adapter
 #
 # Set up the logging environment
 #
-org.openecomp.appc.logging.file=org/openecomp/appc/logback.xml
-org.openecomp.appc.logging.path=${user.home};etc;../etc
-org.openecomp.appc.logger=org.openecomp.appc
-org.openecomp.appc.security.logger=org.openecomp.appc.security
+org.onap.appc.logging.file=org/onap/appc/logback.xml
+org.onap.appc.logging.path=${user.home};etc;../etc
+org.onap.appc.logger=org.onap.appc
+org.onap.appc.security.logger=org.onap.appc.security
 #
 # The minimum and maximum provider/tenant context pool sizes.  Min=1 means that as soon 
 # as the provider/tenant is referenced a Context is opened and added to the pool.  Max=0 
 # means that the upper bound on the pool is unbounded. 
-org.openecomp.appc.provider.min.pool=1
-org.openecomp.appc.provider.max.pool=0
+org.onap.appc.provider.min.pool=1
+org.onap.appc.provider.max.pool=0
 
 #
 # The following properties are used to configure the retry logic for connection to the 
 # IaaS provider(s).  The retry delay property is the amount of time, in seconds, the
 # application waits between retry attempts.  The retry limit is the number of retries
 # that are allowed before the request is failed.
-org.openecomp.appc.provider.retry.delay = 30
-org.openecomp.appc.provider.retry.limit = 10
+org.onap.appc.provider.retry.delay = 30
+org.onap.appc.provider.retry.limit = 10
 
 #
 # The trusted hosts list for SSL access when a certificate is not provided.
@@ -70,12 +70,12 @@ provider.trusted.hosts=*
 # The amount of time, in seconds, to wait for a server state change (start->stop, stop->start, etc).
 # If the server does not change state to a valid state within the alloted time, the operation 
 # fails.
-org.openecomp.appc.server.state.change.timeout=300
+org.onap.appc.server.state.change.timeout=300
 #
 # The amount of time to wait, in seconds, between subsequent polls to the OpenStack provider 
 # to refresh the status of a resource we are waiting on.
 #
-org.openecomp.appc.openstack.poll.interval=20
+org.onap.appc.openstack.poll.interval=20
 #
 # The connection information to connect to the provider we are using.  These properties 
 # are "structured" properties, in that the name is a compound name, where the nodes 
diff --git a/appc-adapters/appc-rest-adapter/appc-rest-adapter-features/pom.xml b/appc-adapters/appc-rest-adapter/appc-rest-adapter-features/pom.xml
index 39a6d2d13..9a0fd3cc1 100644
--- a/appc-adapters/appc-rest-adapter/appc-rest-adapter-features/pom.xml
+++ b/appc-adapters/appc-rest-adapter/appc-rest-adapter-features/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>appc-rest-adapter</artifactId>
-    <groupId>org.openecomp.appc</groupId>
+    <groupId>org.onap.appc</groupId>
     <version>1.3.0-SNAPSHOT</version>
   </parent>
   <artifactId>appc-rest-adapter-features</artifactId>
@@ -13,7 +13,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.openecomp.appc</groupId>
+      <groupId>org.onap.appc</groupId>
       <artifactId>appc-rest-adapter-bundle</artifactId>
       <version>${project.version}</version>
     </dependency>
diff --git a/appc-adapters/appc-rest-adapter/appc-rest-adapter-features/src/main/resources/features.xml b/appc-adapters/appc-rest-adapter/appc-rest-adapter-features/src/main/resources/features.xml
index 2148dbb16..8ab5825ac 100644
--- a/appc-adapters/appc-rest-adapter/appc-rest-adapter-features/src/main/resources/features.xml
+++ b/appc-adapters/appc-rest-adapter/appc-rest-adapter-features/src/main/resources/features.xml
@@ -34,7 +34,7 @@
         <!-- Most applications will have a dependency on the ODL MD-SAL Broker -->
         <feature version="${odl.mdsal.version}">odl-mdsal-broker</feature>
         <feature>sdnc-sli</feature>
-        <bundle>mvn:org.openecomp.appc/appc-rest-adapter-bundle/${project.version}</bundle>
+        <bundle>mvn:org.onap.appc/appc-rest-adapter-bundle/${project.version}</bundle>
     </feature>
 
 </features>
diff --git a/appc-adapters/appc-rest-adapter/appc-rest-adapter-installer/pom.xml b/appc-adapters/appc-rest-adapter/appc-rest-adapter-installer/pom.xml
index 9afb640b4..11a75d662 100644
--- a/appc-adapters/appc-rest-adapter/appc-rest-adapter-installer/pom.xml
+++ b/appc-adapters/appc-rest-adapter/appc-rest-adapter-installer/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>appc-rest-adapter</artifactId>
-    <groupId>org.openecomp.appc</groupId>
+    <groupId>org.onap.appc</groupId>
     <version>1.3.0-SNAPSHOT</version>
   </parent>
   <artifactId>appc-rest-adapter-installer</artifactId>
@@ -13,13 +13,13 @@
   <properties>
     <application.name>appc-rest-adapter</application.name>
     <features.boot>appc-rest-adapter</features.boot>
-    <features.repositories>mvn:org.openecomp.appc/appc-rest-adapter-features/${project.version}/xml/features</features.repositories>
+    <features.repositories>mvn:org.onap.appc/appc-rest-adapter-features/${project.version}/xml/features</features.repositories>
     <include.transitive.dependencies>false</include.transitive.dependencies>
   </properties>
 
   <dependencies>
     <dependency>
-      <groupId>org.openecomp.appc</groupId>
+      <groupId>org.onap.appc</groupId>
       <artifactId>appc-rest-adapter-features</artifactId>
       <classifier>features</classifier>
       <type>xml</type>
@@ -32,7 +32,7 @@
     </dependency>
 
     <dependency>
-      <groupId>org.openecomp.appc</groupId>
+      <groupId>org.onap.appc</groupId>
       <artifactId>appc-rest-adapter-bundle</artifactId>
       <version>${project.version}</version>
     </dependency>
diff --git a/appc-adapters/appc-rest-adapter/pom.xml b/appc-adapters/appc-rest-adapter/pom.xml
index 1d5a0177e..47841c151 100644
--- a/appc-adapters/appc-rest-adapter/pom.xml
+++ b/appc-adapters/appc-rest-adapter/pom.xml
@@ -2,7 +2,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/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.openecomp.appc</groupId>
+    <groupId>org.onap.appc</groupId>
     <artifactId>appc-adapters</artifactId>
     <version>1.3.0-SNAPSHOT</version>
   </parent>
@@ -100,7 +100,7 @@
   <dependencyManagement>
     <dependencies>
       <dependency>
-        <groupId>org.openecomp.appc</groupId>
+        <groupId>org.onap.appc</groupId>
         <artifactId>appc-rest-adapter-features</artifactId>
         <classifier>features</classifier>
         <type>xml</type>
@@ -108,7 +108,7 @@
       </dependency>
 
       <dependency>
-        <groupId>org.openecomp.appc</groupId>
+        <groupId>org.onap.appc</groupId>
         <artifactId>appc-rest-adapter-provider</artifactId>
         <version>${project.version}</version>
       </dependency>
diff --git a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/pom.xml b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/pom.xml
index 3f1256c2e..b5d60c11c 100644
--- a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/pom.xml
+++ b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/pom.xml
@@ -2,7 +2,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">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.openecomp.appc</groupId>
+		<groupId>org.onap.appc</groupId>
 		<artifactId>appc-rest-healthcheck-adapter</artifactId>
 		<version>1.3.0-SNAPSHOT</version>
 	</parent>
@@ -45,7 +45,7 @@
 			<version>1.47</version>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-common</artifactId>
 			<version>${project.version}</version>
 			<scope>compile</scope>
@@ -189,8 +189,8 @@
 				<configuration>
 					<instructions>
 						<Bundle-SymbolicName>appc-rest-healthcheck-adapter</Bundle-SymbolicName>
-						<Bundle-Activator>org.openecomp.appc.adapter.restHealthcheck.RestHealthcheckActivator</Bundle-Activator>
-						<Export-Package>org.openecomp.appc.adapter.restHealthcheck</Export-Package>
+						<Bundle-Activator>org.onap.appc.adapter.restHealthcheck.RestHealthcheckActivator</Bundle-Activator>
+						<Export-Package>org.onap.appc.adapter.restHealthcheck</Export-Package>
 						<Import-Package>org.onap.ccsdk.sli.core.sli.*,org.osgi.framework.*,org.slf4j.*,com.vmware.*,org.apache.xerces.*,javax.net.*,javax.net.ssl.*,org.xml.sax.*,javax.xml.bind.*,javax.naming.*,javax.security.auth.*
 						</Import-Package>
 						<Embed-Dependency>
diff --git a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/main/java/org/openecomp/appc/adapter/restHealthcheck/RestHealthcheckActivator.java b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/main/java/org/openecomp/appc/adapter/restHealthcheck/RestHealthcheckActivator.java
index facfb9c88..acd9d013b 100644
--- a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/main/java/org/openecomp/appc/adapter/restHealthcheck/RestHealthcheckActivator.java
+++ b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/main/java/org/openecomp/appc/adapter/restHealthcheck/RestHealthcheckActivator.java
@@ -22,13 +22,13 @@
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.appc.adapter.restHealthcheck;
+package org.onap.appc.adapter.restHealthcheck;
 
-import org.openecomp.appc.Constants;
-import org.openecomp.appc.adapter.restHealthcheck.impl.RestHealthcheckAdapterImpl;
-import org.openecomp.appc.configuration.Configuration;
-import org.openecomp.appc.configuration.ConfigurationFactory;
-import org.openecomp.appc.i18n.Msg;
+import org.onap.appc.Constants;
+import org.onap.appc.adapter.restHealthcheck.impl.RestHealthcheckAdapterImpl;
+import org.onap.appc.configuration.Configuration;
+import org.onap.appc.configuration.ConfigurationFactory;
+import org.onap.appc.i18n.Msg;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 import org.osgi.framework.BundleActivator;
diff --git a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/main/java/org/openecomp/appc/adapter/restHealthcheck/RestHealthcheckAdapter.java b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/main/java/org/openecomp/appc/adapter/restHealthcheck/RestHealthcheckAdapter.java
index 201315caa..6413ec415 100644
--- a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/main/java/org/openecomp/appc/adapter/restHealthcheck/RestHealthcheckAdapter.java
+++ b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/main/java/org/openecomp/appc/adapter/restHealthcheck/RestHealthcheckAdapter.java
@@ -21,11 +21,11 @@
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.appc.adapter.restHealthcheck;
+package org.onap.appc.adapter.restHealthcheck;
 
 import java.util.Map;
 
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.exceptions.APPCException;
 import com.att.cdp.zones.model.Server;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin;
@@ -34,15 +34,15 @@ import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin;
 public interface RestHealthcheckAdapter extends SvcLogicJavaPlugin {
 
 
-    static final String PROPERTY_PROVIDER_TYPE = "org.openecomp.appc.provider.type";
+    static final String PROPERTY_PROVIDER_TYPE = "org.onap.appc.provider.type";
 
 
-    static final String PROPERTY_PROVIDER_NAME = "org.openecomp.appc.provider.name";
+    static final String PROPERTY_PROVIDER_NAME = "org.onap.appc.provider.name";
 
-    static final String PROPERTY_INSTANCE_URL = "org.openecomp.appc.instance.url";
+    static final String PROPERTY_INSTANCE_URL = "org.onap.appc.instance.url";
 
 
-    static final String PROPERTY_IDENTITY_URL = "org.openecomp.appc.identity.url";
+    static final String PROPERTY_IDENTITY_URL = "org.onap.appc.identity.url";
 
     String getAdapterName();
 
diff --git a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/main/java/org/openecomp/appc/adapter/restHealthcheck/impl/RequestContext.java b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/main/java/org/openecomp/appc/adapter/restHealthcheck/impl/RequestContext.java
index b7bb47640..7114f5524 100644
--- a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/main/java/org/openecomp/appc/adapter/restHealthcheck/impl/RequestContext.java
+++ b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/main/java/org/openecomp/appc/adapter/restHealthcheck/impl/RequestContext.java
@@ -24,10 +24,10 @@
 
 
 
-package org.openecomp.appc.adapter.restHealthcheck.impl;
+package org.onap.appc.adapter.restHealthcheck.impl;
 
-import org.openecomp.appc.Constants;
-import org.openecomp.appc.configuration.Configuration;
+import org.onap.appc.Constants;
+import org.onap.appc.configuration.Configuration;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 
 public class RequestContext {
diff --git a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/main/java/org/openecomp/appc/adapter/restHealthcheck/impl/RequestFailedException.java b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/main/java/org/openecomp/appc/adapter/restHealthcheck/impl/RequestFailedException.java
index c3cdc5103..07ed295ef 100644
--- a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/main/java/org/openecomp/appc/adapter/restHealthcheck/impl/RequestFailedException.java
+++ b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/main/java/org/openecomp/appc/adapter/restHealthcheck/impl/RequestFailedException.java
@@ -24,7 +24,7 @@
 
 
 
-package org.openecomp.appc.adapter.restHealthcheck.impl;
+package org.onap.appc.adapter.restHealthcheck.impl;
 
 import org.glassfish.grizzly.http.util.HttpStatus;
 
diff --git a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/main/java/org/openecomp/appc/adapter/restHealthcheck/impl/RestHealthcheckAdapterImpl.java b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/main/java/org/openecomp/appc/adapter/restHealthcheck/impl/RestHealthcheckAdapterImpl.java
index 72c153cb5..37820a63d 100644
--- a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/main/java/org/openecomp/appc/adapter/restHealthcheck/impl/RestHealthcheckAdapterImpl.java
+++ b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/main/java/org/openecomp/appc/adapter/restHealthcheck/impl/RestHealthcheckAdapterImpl.java
@@ -22,17 +22,17 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.restHealthcheck.impl;
+package org.onap.appc.adapter.restHealthcheck.impl;
 
 import java.util.Map;
 import java.util.Properties;
 import org.apache.http.impl.client.CloseableHttpClient;
 
-import org.openecomp.appc.Constants;
-import org.openecomp.appc.adapter.restHealthcheck.RestHealthcheckAdapter;
-import org.openecomp.appc.configuration.Configuration;
-import org.openecomp.appc.pool.PoolExtensionException;
-import org.openecomp.appc.util.StructuredPropertyHelper;
+import org.onap.appc.Constants;
+import org.onap.appc.adapter.restHealthcheck.RestHealthcheckAdapter;
+import org.onap.appc.configuration.Configuration;
+import org.onap.appc.pool.PoolExtensionException;
+import org.onap.appc.util.StructuredPropertyHelper;
 
 
 import com.att.cdp.zones.ImageService;
diff --git a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/main/resources/org/openecomp/appc/default.properties b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/main/resources/org/openecomp/appc/default.properties
index d979ea86d..248aabbd8 100644
--- a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/main/resources/org/openecomp/appc/default.properties
+++ b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/main/resources/org/openecomp/appc/default.properties
@@ -29,38 +29,38 @@
 #
 # Define the name and path of any user-provided configuration (bootstrap) file that can be loaded 
 # to supply configuration options 
-org.openecomp.appc.bootstrap.file=appc.properties
-org.openecomp.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
+org.onap.appc.bootstrap.file=appc.properties
+org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
 
 appc.application.name=APPC
 
 #
 # Define the message resource bundle name to be loaded 
-org.openecomp.appc.resources=org/openecomp/appc/i18n/MessageResources
+org.onap.appc.resources=org/onap/appc/i18n/MessageResources
 #
 # The name of the adapter.
-org.openecomp.appc.provider.adaptor.name=org.openecomp.appc.appc_provider_adapter
+org.onap.appc.provider.adaptor.name=org.onap.appc.appc_provider_adapter
 #
 # Set up the logging environment
 #
-org.openecomp.appc.logging.file=org/openecomp/appc/logback.xml
-org.openecomp.appc.logging.path=${user.home};etc;../etc
-org.openecomp.appc.logger=org.openecomp.appc
-org.openecomp.appc.security.logger=org.openecomp.appc.security
+org.onap.appc.logging.file=org/onap/appc/logback.xml
+org.onap.appc.logging.path=${user.home};etc;../etc
+org.onap.appc.logger=org.onap.appc
+org.onap.appc.security.logger=org.onap.appc.security
 #
 # The minimum and maximum provider/tenant context pool sizes.  Min=1 means that as soon 
 # as the provider/tenant is referenced a Context is opened and added to the pool.  Max=0 
 # means that the upper bound on the pool is unbounded. 
-org.openecomp.appc.provider.min.pool=1
-org.openecomp.appc.provider.max.pool=0
+org.onap.appc.provider.min.pool=1
+org.onap.appc.provider.max.pool=0
 
 #
 # The following properties are used to configure the retry logic for connection to the 
 # IaaS provider(s).  The retry delay property is the amount of time, in seconds, the
 # application waits between retry attempts.  The retry limit is the number of retries
 # that are allowed before the request is failed.
-org.openecomp.appc.provider.retry.delay = 30
-org.openecomp.appc.provider.retry.limit = 10
+org.onap.appc.provider.retry.delay = 30
+org.onap.appc.provider.retry.limit = 10
 
 #
 # The trusted hosts list for SSL access when a certificate is not provided.
@@ -70,10 +70,10 @@ provider.trusted.hosts=*
 # The amount of time, in seconds, to wait for a server state change (start->stop, stop->start, etc).
 # If the server does not change state to a valid state within the alloted time, the operation 
 # fails.
-org.openecomp.appc.server.state.change.timeout=300
+org.onap.appc.server.state.change.timeout=300
 #
 # The amount of time to wait, in seconds, between subsequent polls to the OpenStack provider 
 # to refresh the status of a resource we are waiting on.
 #
-org.openecomp.appc.openstack.poll.interval=20
+org.onap.appc.openstack.poll.interval=20
 #
diff --git a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/test/java/org/openecomp/appc/adapter/restHealthcheck/impl/TestRestHealthcheckAdapterImpl.java b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/test/java/org/openecomp/appc/adapter/restHealthcheck/impl/TestRestHealthcheckAdapterImpl.java
index 106c44db9..e100a8a01 100644
--- a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/test/java/org/openecomp/appc/adapter/restHealthcheck/impl/TestRestHealthcheckAdapterImpl.java
+++ b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/test/java/org/openecomp/appc/adapter/restHealthcheck/impl/TestRestHealthcheckAdapterImpl.java
@@ -21,7 +21,7 @@
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.appc.adapter.restHealthcheck.impl;
+package org.onap.appc.adapter.restHealthcheck.impl;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -42,11 +42,11 @@ import org.junit.Ignore;
 import org.junit.Test;
 import org.slf4j.MDC;
 
-import org.openecomp.appc.Constants;
-import org.openecomp.appc.adapter.restHealthcheck.*;
-import org.openecomp.appc.configuration.ConfigurationFactory;
-import org.openecomp.appc.exceptions.APPCException;
-import org.openecomp.appc.exceptions.UnknownProviderException;
+import org.onap.appc.Constants;
+import org.onap.appc.adapter.restHealthcheck.*;
+import org.onap.appc.configuration.ConfigurationFactory;
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.exceptions.UnknownProviderException;
 import com.att.cdp.exceptions.ZoneException;
 import com.att.cdp.zones.ComputeService;
 import com.att.cdp.zones.Context;
diff --git a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/test/java/org/openecomp/appc/test/ExecutorHarness.java b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/test/java/org/openecomp/appc/test/ExecutorHarness.java
index a9da29b99..7e0154e68 100644
--- a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/test/java/org/openecomp/appc/test/ExecutorHarness.java
+++ b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/test/java/org/openecomp/appc/test/ExecutorHarness.java
@@ -23,7 +23,7 @@
  */
 
 
-package org.openecomp.appc.test;
+package org.onap.appc.test;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
@@ -32,7 +32,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.openecomp.appc.test.InterceptLogger;
+import org.onap.appc.test.InterceptLogger;
 
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin;
diff --git a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/test/java/org/openecomp/appc/test/InterceptLogger.java b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/test/java/org/openecomp/appc/test/InterceptLogger.java
index 6181726f7..c67f0cc8b 100644
--- a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/test/java/org/openecomp/appc/test/InterceptLogger.java
+++ b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/test/java/org/openecomp/appc/test/InterceptLogger.java
@@ -24,7 +24,7 @@
 
 
 
-package org.openecomp.appc.test;
+package org.onap.appc.test;
 
 import java.text.MessageFormat;
 import java.util.ArrayList;
diff --git a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/test/resources/org/openecomp/appc/default.properties b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/test/resources/org/openecomp/appc/default.properties
index 89078d15e..881ceab82 100644
--- a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/test/resources/org/openecomp/appc/default.properties
+++ b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/test/resources/org/openecomp/appc/default.properties
@@ -29,38 +29,38 @@
 #
 # Define the name and path of any user-provided configuration (bootstrap) file that can be loaded
 # to supply configuration options
-org.openecomp.appc.bootstrap.file=appc.properties
-org.openecomp.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
+org.onap.appc.bootstrap.file=appc.properties
+org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
 
 appc.application.name=APPC
 
 #
 # Define the message resource bundle name to be loaded
-org.openecomp.appc.resources=/opt/openecomp/appc/i18n/MessageResources
+org.onap.appc.resources=/opt/openecomp/appc/i18n/MessageResources
 #
 # The name of the adapter.
-org.openecomp.appc.provider.adaptor.name=org.openecomp.appc.appc_provider_adapter
+org.onap.appc.provider.adaptor.name=org.onap.appc.appc_provider_adapter
 #
 # Set up the logging environment
 #
-org.openecomp.appc.logging.file=/opt/openecomp/appc/logback.xml
-org.openecomp.appc.logging.path=${user.home};etc;../etc
-org.openecomp.appc.logger=org.openecomp.appc
-org.openecomp.appc.security.logger=org.openecomp.appc.security
+org.onap.appc.logging.file=/opt/openecomp/appc/logback.xml
+org.onap.appc.logging.path=${user.home};etc;../etc
+org.onap.appc.logger=org.onap.appc
+org.onap.appc.security.logger=org.onap.appc.security
 #
 # The minimum and maximum provider/tenant context pool sizes.  Min=1 means that as soon
 # as the provider/tenant is referenced a Context is opened and added to the pool.  Max=0
 # means that the upper bound on the pool is unbounded.
-org.openecomp.appc.provider.min.pool=1
-org.openecomp.appc.provider.max.pool=0
+org.onap.appc.provider.min.pool=1
+org.onap.appc.provider.max.pool=0
 
 #
 # The following properties are used to configure the retry logic for connection to the
 # IaaS provider(s).  The retry delay property is the amount of time, in seconds, the
 # application waits between retry attempts.  The retry limit is the number of retries
 # that are allowed before the request is failed.
-org.openecomp.appc.provider.retry.delay = 30
-org.openecomp.appc.provider.retry.limit = 10
+org.onap.appc.provider.retry.delay = 30
+org.onap.appc.provider.retry.limit = 10
 
 #
 # The trusted hosts list for SSL access when a certificate is not provided.
@@ -70,12 +70,12 @@ provider.trusted.hosts=*
 # The amount of time, in seconds, to wait for a server state change (start->stop, stop->start, etc).
 # If the server does not change state to a valid state within the alloted time, the operation
 # fails.
-org.openecomp.appc.server.state.change.timeout=300
+org.onap.appc.server.state.change.timeout=300
 #
 # The amount of time to wait, in seconds, between subsequent polls to the OpenStack provider
 # to refresh the status of a resource we are waiting on.
 #
-org.openecomp.appc.openstack.poll.interval=20
+org.onap.appc.openstack.poll.interval=20
 #
 # The connection information to connect to the provider we are using.  These properties
 # are "structured" properties, in that the name is a compound name, where the nodes
diff --git a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-features/pom.xml b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-features/pom.xml
index 023a5dfa0..f57a7e646 100644
--- a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-features/pom.xml
+++ b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-features/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>appc-rest-healthcheck-adapter</artifactId>
-    <groupId>org.openecomp.appc</groupId>
+    <groupId>org.onap.appc</groupId>
     <version>1.3.0-SNAPSHOT</version>
   </parent>
   <artifactId>appc-rest-healthcheck-adapter-features</artifactId>
@@ -13,7 +13,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.openecomp.appc</groupId>
+      <groupId>org.onap.appc</groupId>
       <artifactId>appc-rest-healthcheck-adapter-bundle</artifactId>
       <version>${project.version}</version>
     </dependency>
diff --git a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-features/src/main/resources/features.xml b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-features/src/main/resources/features.xml
index e60076de3..0b9d73601 100644
--- a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-features/src/main/resources/features.xml
+++ b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-features/src/main/resources/features.xml
@@ -34,7 +34,7 @@
         <!-- Most applications will have a dependency on the ODL MD-SAL Broker -->
         <feature version="${odl.mdsal.version}">odl-mdsal-broker</feature>
         <feature>sdnc-sli</feature>
-        <bundle>mvn:org.openecomp.appc/appc-rest-healthcheck-adapter-bundle/${project.version}</bundle>
+        <bundle>mvn:org.onap.appc/appc-rest-healthcheck-adapter-bundle/${project.version}</bundle>
     </feature>
 
 </features>
diff --git a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-installer/pom.xml b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-installer/pom.xml
index 04412b340..7b045584b 100644
--- a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-installer/pom.xml
+++ b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-installer/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <artifactId>appc-rest-healthcheck-adapter</artifactId>
-        <groupId>org.openecomp.appc</groupId>
+        <groupId>org.onap.appc</groupId>
         <version>1.3.0-SNAPSHOT</version>
     </parent>
     <artifactId>appc-rest-healthcheck-adapter-installer</artifactId>
@@ -12,12 +12,12 @@
     <properties>
         <application.name>appc-rest-healthcheck-adapter</application.name>
         <features.boot>appc-rest-healthcheck-adapter</features.boot>
-        <features.repositories>mvn:org.openecomp.appc/appc-rest-healthcheck-adapter-features/${project.version}/xml/features</features.repositories>
+        <features.repositories>mvn:org.onap.appc/appc-rest-healthcheck-adapter-features/${project.version}/xml/features</features.repositories>
         <include.transitive.dependencies>false</include.transitive.dependencies>
     </properties>
     <dependencies>
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>appc-rest-healthcheck-adapter-features</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
@@ -29,7 +29,7 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>appc-rest-healthcheck-adapter-bundle</artifactId>
             <version>${project.version}</version>
         </dependency>
diff --git a/appc-adapters/appc-rest-healthcheck-adapter/pom.xml b/appc-adapters/appc-rest-healthcheck-adapter/pom.xml
index 745bd7703..dc29ddbee 100644
--- a/appc-adapters/appc-rest-healthcheck-adapter/pom.xml
+++ b/appc-adapters/appc-rest-healthcheck-adapter/pom.xml
@@ -2,7 +2,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/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.openecomp.appc</groupId>
+    <groupId>org.onap.appc</groupId>
     <artifactId>appc-adapters</artifactId>
     <version>1.3.0-SNAPSHOT</version>
   </parent>
@@ -100,7 +100,7 @@
   <dependencyManagement>
     <dependencies>
       <dependency>
-        <groupId>org.openecomp.appc</groupId>
+        <groupId>org.onap.appc</groupId>
         <artifactId>appc-rest-healthcheck-adapter-features</artifactId>
         <classifier>features</classifier>
         <type>xml</type>
@@ -108,7 +108,7 @@
       </dependency>
 
       <dependency>
-        <groupId>org.openecomp.appc</groupId>
+        <groupId>org.onap.appc</groupId>
         <artifactId>appc-rest-healthcheck-adapter-provider</artifactId>
         <version>${project.version}</version>
       </dependency>
diff --git a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-api/pom.xml b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-api/pom.xml
index d6d321ddb..d35aeba70 100644
--- a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-api/pom.xml
+++ b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-api/pom.xml
@@ -2,7 +2,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">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.openecomp.appc</groupId>
+		<groupId>org.onap.appc</groupId>
 		<artifactId>appc-ssh-adapter</artifactId>
 		<version>1.3.0-SNAPSHOT</version>
 	</parent>
@@ -25,7 +25,7 @@
 				<extensions>true</extensions>
 				<configuration>
 					<instructions>
-						<Export-Package>org.openecomp.appc.adapter.ssh</Export-Package>
+						<Export-Package>org.onap.appc.adapter.ssh</Export-Package>
 						<Embed-Dependency>!dblib-provider</Embed-Dependency>
                         <Import-Package>!org.slf4j.impl,*;resolution:=optional</Import-Package>
 					</instructions>
diff --git a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-api/src/main/java/org/openecomp/appc/adapter/ssh/Constants.java b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-api/src/main/java/org/openecomp/appc/adapter/ssh/Constants.java
index 2fc01705d..d3ed28a75 100644
--- a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-api/src/main/java/org/openecomp/appc/adapter/ssh/Constants.java
+++ b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-api/src/main/java/org/openecomp/appc/adapter/ssh/Constants.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.ssh;
+package org.onap.appc.adapter.ssh;
 
 public class Constants {
 
@@ -49,8 +49,8 @@ public class Constants {
     // input fields names
     public static final String PAYLOAD = "payload";
 
-    public static final String CONNECTION_RETRY_DELAY = "org.openecomp.appc.ssh.connection.retry.delay";
-    public static final String CONNECTION_RETRY_COUNT = "org.openecomp.appc.ssh.connection.retry.count";
+    public static final String CONNECTION_RETRY_DELAY = "org.onap.appc.ssh.connection.retry.delay";
+    public static final String CONNECTION_RETRY_COUNT = "org.onap.appc.ssh.connection.retry.count";
     public static final int DEFAULT_CONNECTION_RETRY_DELAY = 60;
     public static final int DEFAULT_CONNECTION_RETRY_COUNT = 5;
 
diff --git a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-api/src/main/java/org/openecomp/appc/adapter/ssh/SshAdapter.java b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-api/src/main/java/org/openecomp/appc/adapter/ssh/SshAdapter.java
index ecfd0238a..768a7d317 100644
--- a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-api/src/main/java/org/openecomp/appc/adapter/ssh/SshAdapter.java
+++ b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-api/src/main/java/org/openecomp/appc/adapter/ssh/SshAdapter.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.ssh;
+package org.onap.appc.adapter.ssh;
 
 /**
  * Factory class for creating SshConnection instances.
diff --git a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-api/src/main/java/org/openecomp/appc/adapter/ssh/SshConnection.java b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-api/src/main/java/org/openecomp/appc/adapter/ssh/SshConnection.java
index 6d8acae6e..68d98575b 100644
--- a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-api/src/main/java/org/openecomp/appc/adapter/ssh/SshConnection.java
+++ b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-api/src/main/java/org/openecomp/appc/adapter/ssh/SshConnection.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.ssh;
+package org.onap.appc.adapter.ssh;
 
 import java.io.OutputStream;
 
diff --git a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-api/src/main/java/org/openecomp/appc/adapter/ssh/SshConnectionDetails.java b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-api/src/main/java/org/openecomp/appc/adapter/ssh/SshConnectionDetails.java
index 5e56003d8..de1b301bc 100644
--- a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-api/src/main/java/org/openecomp/appc/adapter/ssh/SshConnectionDetails.java
+++ b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-api/src/main/java/org/openecomp/appc/adapter/ssh/SshConnectionDetails.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.ssh;
+package org.onap.appc.adapter.ssh;
 
 /**
  * Provides details required for connecting to device.
diff --git a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-api/src/main/java/org/openecomp/appc/adapter/ssh/SshDataAccessException.java b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-api/src/main/java/org/openecomp/appc/adapter/ssh/SshDataAccessException.java
index 463dc7174..cb18375d4 100644
--- a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-api/src/main/java/org/openecomp/appc/adapter/ssh/SshDataAccessException.java
+++ b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-api/src/main/java/org/openecomp/appc/adapter/ssh/SshDataAccessException.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.ssh;
+package org.onap.appc.adapter.ssh;
 
 
 
diff --git a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-api/src/main/java/org/openecomp/appc/adapter/ssh/SshDataAccessService.java b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-api/src/main/java/org/openecomp/appc/adapter/ssh/SshDataAccessService.java
index 08d66aaa6..d932faa78 100644
--- a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-api/src/main/java/org/openecomp/appc/adapter/ssh/SshDataAccessService.java
+++ b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-api/src/main/java/org/openecomp/appc/adapter/ssh/SshDataAccessService.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.ssh;
+package org.onap.appc.adapter.ssh;
 
 import org.onap.ccsdk.sli.core.dblib.DbLibService;
 
diff --git a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-api/src/main/java/org/openecomp/appc/adapter/ssh/SshException.java b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-api/src/main/java/org/openecomp/appc/adapter/ssh/SshException.java
index 01e349028..6c906c7f7 100644
--- a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-api/src/main/java/org/openecomp/appc/adapter/ssh/SshException.java
+++ b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-api/src/main/java/org/openecomp/appc/adapter/ssh/SshException.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.ssh;
+package org.onap.appc.adapter.ssh;
 
 public class SshException extends RuntimeException {
 
diff --git a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-features/pom.xml b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-features/pom.xml
index f1ea1555e..51a643fc0 100644
--- a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-features/pom.xml
+++ b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-features/pom.xml
@@ -2,7 +2,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>
 		<artifactId>appc-ssh-adapter</artifactId>
-		<groupId>org.openecomp.appc</groupId>
+		<groupId>org.onap.appc</groupId>
 		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
@@ -12,13 +12,13 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-ssh-adapter-api</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-ssh-adapter-sshd</artifactId>
 			<version>${project.version}</version>
 		</dependency>
diff --git a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-features/src/main/resources/features.xml b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-features/src/main/resources/features.xml
index ec7096434..124346814 100644
--- a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-features/src/main/resources/features.xml
+++ b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-features/src/main/resources/features.xml
@@ -29,8 +29,8 @@
 		  xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
 	<feature name='appc-ssh-adapter' description="appc-ssh-adapter" version='${project.version}'>
 <!--         <feature version='${sdnctl.dblib.version}'>sdnc-dblib</feature> -->
-        <bundle dependency="true">mvn:org.openecomp.appc/appc-common/${project.version}</bundle>
-		<bundle>mvn:org.openecomp.appc/appc-ssh-adapter-api/${project.version}</bundle>
-		<bundle>mvn:org.openecomp.appc/appc-ssh-adapter-sshd/${project.version}</bundle>
+        <bundle dependency="true">mvn:org.onap.appc/appc-common/${project.version}</bundle>
+		<bundle>mvn:org.onap.appc/appc-ssh-adapter-api/${project.version}</bundle>
+		<bundle>mvn:org.onap.appc/appc-ssh-adapter-sshd/${project.version}</bundle>
 	</feature>
 </features>
diff --git a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/pom.xml b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/pom.xml
index 395dbfe4d..7fee5e54f 100644
--- a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/pom.xml
+++ b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/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-ssh-adapter</artifactId>
         <version>1.3.0-SNAPSHOT</version>
     </parent>
@@ -13,7 +13,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>appc-ssh-adapter-api</artifactId>
             <version>${project.version}</version>
             <scope>provided</scope>
@@ -33,7 +33,7 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>appc-common</artifactId>
             <version>${project.version}</version>
         </dependency>
@@ -51,8 +51,8 @@
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
-                        <Export-Service>org.openecomp.appc.adapter.ssh.SshAdapter</Export-Service>
-                        <Private-Package>org.openecomp.appc.adapter.ssh.impl.*</Private-Package>
+                        <Export-Service>org.onap.appc.adapter.ssh.SshAdapter</Export-Service>
+                        <Private-Package>org.onap.appc.adapter.ssh.impl.*</Private-Package>
                         <Import-Package>!org.apache.log,!org.apache.commons.logging,!groovy.lang,!javax.jms,!org.codehaus.commons.compiler,!org.codehaus.groovy.*,!org.codehaus.janino,!com.ibm.icu.*,!com.sun.faces.*,!org.jasypt.*,*</Import-Package>
                         <Embed-Dependency>!dblib-provider,jasypt,eelf-core,logback-core,logback-classic;scope=compile|runtime;inline=false</Embed-Dependency>
                         <Embed-Transitive>true</Embed-Transitive>
diff --git a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/src/main/java/org/openecomp/appc/adapter/ssh/sshd/SshAdapterSshd.java b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/src/main/java/org/openecomp/appc/adapter/ssh/sshd/SshAdapterSshd.java
index 4a277a013..a5bbe34e2 100644
--- a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/src/main/java/org/openecomp/appc/adapter/ssh/sshd/SshAdapterSshd.java
+++ b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/src/main/java/org/openecomp/appc/adapter/ssh/sshd/SshAdapterSshd.java
@@ -22,10 +22,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.ssh.sshd;
+package org.onap.appc.adapter.ssh.sshd;
 
-import org.openecomp.appc.adapter.ssh.SshAdapter;
-import org.openecomp.appc.adapter.ssh.SshConnection;
+import org.onap.appc.adapter.ssh.SshAdapter;
+import org.onap.appc.adapter.ssh.SshConnection;
 
 public class SshAdapterSshd implements SshAdapter {
 
diff --git a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/src/main/java/org/openecomp/appc/adapter/ssh/sshd/SshConnectionSshd.java b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/src/main/java/org/openecomp/appc/adapter/ssh/sshd/SshConnectionSshd.java
index fae4fd9fe..c35c58798 100644
--- a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/src/main/java/org/openecomp/appc/adapter/ssh/sshd/SshConnectionSshd.java
+++ b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/src/main/java/org/openecomp/appc/adapter/ssh/sshd/SshConnectionSshd.java
@@ -22,14 +22,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.ssh.sshd;
-
-import org.openecomp.appc.adapter.ssh.Constants;
-import org.openecomp.appc.adapter.ssh.SshConnection;
-import org.openecomp.appc.adapter.ssh.SshException;
-import org.openecomp.appc.encryption.EncryptionTool;
-import org.openecomp.appc.configuration.Configuration;
-import org.openecomp.appc.configuration.ConfigurationFactory;
+package org.onap.appc.adapter.ssh.sshd;
+
+import org.onap.appc.adapter.ssh.Constants;
+import org.onap.appc.adapter.ssh.SshConnection;
+import org.onap.appc.adapter.ssh.SshException;
+import org.onap.appc.encryption.EncryptionTool;
+import org.onap.appc.configuration.Configuration;
+import org.onap.appc.configuration.ConfigurationFactory;
 import org.apache.sshd.ClientChannel;
 import org.apache.sshd.ClientSession;
 import org.apache.sshd.SshClient;
diff --git a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/src/main/java/org/openecomp/appc/adapter/ssh/sshd/SshdDataAccessService.java b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/src/main/java/org/openecomp/appc/adapter/ssh/sshd/SshdDataAccessService.java
index 87d85faef..07a814083 100644
--- a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/src/main/java/org/openecomp/appc/adapter/ssh/sshd/SshdDataAccessService.java
+++ b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/src/main/java/org/openecomp/appc/adapter/ssh/sshd/SshdDataAccessService.java
@@ -22,14 +22,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.ssh.sshd;
+package org.onap.appc.adapter.ssh.sshd;
 
 import javax.sql.rowset.CachedRowSet;
 
-import org.openecomp.appc.adapter.ssh.Constants;
-import org.openecomp.appc.adapter.ssh.SshConnectionDetails;
-import org.openecomp.appc.adapter.ssh.SshDataAccessException;
-import org.openecomp.appc.adapter.ssh.SshDataAccessService;
+import org.onap.appc.adapter.ssh.Constants;
+import org.onap.appc.adapter.ssh.SshConnectionDetails;
+import org.onap.appc.adapter.ssh.SshDataAccessException;
+import org.onap.appc.adapter.ssh.SshDataAccessService;
 import org.onap.ccsdk.sli.core.dblib.DbLibService;
 
 import java.sql.SQLException;
diff --git a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/src/main/resources/OSGI-INF/blueprint/blueprint.xml
index 2482c6828..98867c614 100644
--- a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -28,14 +28,14 @@
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd">
 
-    <bean id="sshdBean" class="org.openecomp.appc.adapter.ssh.sshd.SshAdapterSshd" scope="singleton"/>
-    <service id="sshAdapter" interface="org.openecomp.appc.adapter.ssh.SshAdapter" ref="sshdBean"/>
+    <bean id="sshdBean" class="org.onap.appc.adapter.ssh.sshd.SshAdapterSshd" scope="singleton"/>
+    <service id="sshAdapter" interface="org.onap.appc.adapter.ssh.SshAdapter" ref="sshdBean"/>
 
     <reference id="dbLibServiceRef" availability="mandatory" activation="eager" interface="org.onap.ccsdk.sli.core.dblib.DbLibService" />
-    <bean id="sshdDAServiceBean" class="org.openecomp.appc.adapter.ssh.sshd.SshdDataAccessService" scope="singleton">
+    <bean id="sshdDAServiceBean" class="org.onap.appc.adapter.ssh.sshd.SshdDataAccessService" scope="singleton">
         <property name="dbLibService" ref="dbLibServiceRef" />
     </bean>
 
-    <service id="sshDAService" interface="org.openecomp.appc.adapter.ssh.SshDataAccessService" ref="sshdDAServiceBean"/>
+    <service id="sshDAService" interface="org.onap.appc.adapter.ssh.SshDataAccessService" ref="sshdDAServiceBean"/>
 
 </blueprint>
diff --git a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/src/test/java/org/openecomp/appc/adapter/ssh/sshd/SshAdapterSample.java b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/src/test/java/org/openecomp/appc/adapter/ssh/sshd/SshAdapterSample.java
index d7d45dc04..f79a81856 100644
--- a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/src/test/java/org/openecomp/appc/adapter/ssh/sshd/SshAdapterSample.java
+++ b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/src/test/java/org/openecomp/appc/adapter/ssh/sshd/SshAdapterSample.java
@@ -22,14 +22,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.ssh.sshd;
+package org.onap.appc.adapter.ssh.sshd;
 
 import java.io.ByteArrayOutputStream;
 import java.io.OutputStream;
 
-import org.openecomp.appc.adapter.ssh.SshAdapter;
-import org.openecomp.appc.adapter.ssh.SshConnection;
-import org.openecomp.appc.adapter.ssh.sshd.SshAdapterSshd;
+import org.onap.appc.adapter.ssh.SshAdapter;
+import org.onap.appc.adapter.ssh.SshConnection;
+import org.onap.appc.adapter.ssh.sshd.SshAdapterSshd;
 
 public class SshAdapterSample {
 
diff --git a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/src/test/java/org/openecomp/appc/adapter/ssh/sshd/SshAdapterTest.java b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/src/test/java/org/openecomp/appc/adapter/ssh/sshd/SshAdapterTest.java
index f35312fe0..12b2258d0 100644
--- a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/src/test/java/org/openecomp/appc/adapter/ssh/sshd/SshAdapterTest.java
+++ b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/src/test/java/org/openecomp/appc/adapter/ssh/sshd/SshAdapterTest.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.ssh.sshd;
+package org.onap.appc.adapter.ssh.sshd;
 
 import org.apache.sshd.SshServer;
 import org.apache.sshd.common.NamedFactory;
@@ -39,10 +39,10 @@ import org.apache.sshd.server.shell.ProcessShellFactory;
 import org.hamcrest.CoreMatchers;
 import org.junit.*;
 import org.junit.rules.ExpectedException;
-import org.openecomp.appc.adapter.ssh.SshAdapter;
-import org.openecomp.appc.adapter.ssh.SshConnection;
-import org.openecomp.appc.adapter.ssh.SshException;
-import org.openecomp.appc.adapter.ssh.sshd.SshAdapterSshd;
+import org.onap.appc.adapter.ssh.SshAdapter;
+import org.onap.appc.adapter.ssh.SshConnection;
+import org.onap.appc.adapter.ssh.SshException;
+import org.onap.appc.adapter.ssh.sshd.SshAdapterSshd;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
diff --git a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-tests/pom.xml b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-tests/pom.xml
index 704df4fed..c2a4dccc5 100644
--- a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-tests/pom.xml
+++ b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-tests/pom.xml
@@ -2,7 +2,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">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.openecomp.appc</groupId>
+		<groupId>org.onap.appc</groupId>
 		<artifactId>appc-ssh-adapter</artifactId>
 		<version>1.3.0-SNAPSHOT</version>
 	</parent>
@@ -10,7 +10,7 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-ssh-adapter-api</artifactId>
 			<version>${project.version}</version>
 		</dependency>
diff --git a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-tests/src/main/java/org/openecomp/appc/adapter/ssh/SshAdapterMock.java b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-tests/src/main/java/org/openecomp/appc/adapter/ssh/SshAdapterMock.java
index f0bc0284c..4b5cc4ef2 100644
--- a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-tests/src/main/java/org/openecomp/appc/adapter/ssh/SshAdapterMock.java
+++ b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-tests/src/main/java/org/openecomp/appc/adapter/ssh/SshAdapterMock.java
@@ -22,7 +22,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.ssh;
+package org.onap.appc.adapter.ssh;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-tests/src/main/java/org/openecomp/appc/adapter/ssh/SshConnectionMock.java b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-tests/src/main/java/org/openecomp/appc/adapter/ssh/SshConnectionMock.java
index caf40738c..f8fa1621e 100644
--- a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-tests/src/main/java/org/openecomp/appc/adapter/ssh/SshConnectionMock.java
+++ b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-tests/src/main/java/org/openecomp/appc/adapter/ssh/SshConnectionMock.java
@@ -22,14 +22,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.adapter.ssh;
+package org.onap.appc.adapter.ssh;
 
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.openecomp.appc.adapter.ssh.SshConnection;
+import org.onap.appc.adapter.ssh.SshConnection;
 
 public class SshConnectionMock implements SshConnection {
 
diff --git a/appc-adapters/appc-ssh-adapter/pom.xml b/appc-adapters/appc-ssh-adapter/pom.xml
index 1777b9b54..4f543bd1e 100644
--- a/appc-adapters/appc-ssh-adapter/pom.xml
+++ b/appc-adapters/appc-ssh-adapter/pom.xml
@@ -2,7 +2,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>
 		<artifactId>appc-adapters</artifactId>
-		<groupId>org.openecomp.appc</groupId>
+		<groupId>org.onap.appc</groupId>
 		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
diff --git a/appc-adapters/pom.xml b/appc-adapters/pom.xml
index 111f3b7ca..58733da1b 100644
--- a/appc-adapters/pom.xml
+++ b/appc-adapters/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">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.openecomp.appc</groupId>
+		<groupId>org.onap.appc</groupId>
 		<artifactId>appc</artifactId>
 		<version>1.3.0-SNAPSHOT</version>
 	</parent>