60 files changed, 178 insertions, 177 deletions

diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAIClient.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/AAIClient.java
index 059212031..ba5ef587e 100644
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAIClient.java
+++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/AAIClient.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.sli.aai;
+package org.onap.ccsdk.sli.adaptors.aai;
 
 import java.io.IOException;
 import java.net.URL;
@@ -52,8 +52,8 @@ import org.openecomp.aai.inventory.v10.Vpe;
 import org.openecomp.aai.inventory.v10.VplsPe;
 import org.openecomp.aai.inventory.v10.VpnBinding;
 import org.openecomp.aai.inventory.v10.Vserver;
-import org.openecomp.sdnc.sli.aai.data.notify.NotifyEvent;
-import org.openecomp.sdnc.sli.aai.data.v1507.VServer;
+import org.onap.ccsdk.sli.adaptors.aai.data.notify.NotifyEvent;
+import org.onap.ccsdk.sli.adaptors.aai.data.v1507.VServer;
 
 import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.databind.JsonMappingException;
diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAIDeclarations.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/AAIDeclarations.java
index cee0847b0..3ba453d36 100644
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAIDeclarations.java
+++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/AAIDeclarations.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.sli.aai;
+package org.onap.ccsdk.sli.adaptors.aai;
 
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
@@ -65,15 +65,15 @@ import org.openecomp.aai.inventory.v10.ServiceInstance;
 import org.openecomp.aai.inventory.v10.Vlan;
 import org.openecomp.aai.inventory.v10.Vlans;
 import org.openecomp.aai.inventory.v10.Vserver;
-import org.openecomp.sdnc.sli.aai.AAIService.AAIRequestExecutor;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-import org.openecomp.sdnc.sli.aai.query.FormattedQueryResultList;
-import org.openecomp.sdnc.sli.aai.query.InstanceFilter;
-import org.openecomp.sdnc.sli.aai.query.InstanceFilters;
-import org.openecomp.sdnc.sli.aai.query.NamedQuery;
-import org.openecomp.sdnc.sli.aai.query.NamedQueryData;
-import org.openecomp.sdnc.sli.aai.query.QueryParameters;
-import org.openecomp.sdnc.sli.aai.query.Results;
+import org.onap.ccsdk.sli.adaptors.aai.AAIService.AAIRequestExecutor;
+import org.onap.ccsdk.sli.adaptors.aai.data.AAIDatum;
+import org.onap.ccsdk.sli.adaptors.aai.query.FormattedQueryResultList;
+import org.onap.ccsdk.sli.adaptors.aai.query.InstanceFilter;
+import org.onap.ccsdk.sli.adaptors.aai.query.InstanceFilters;
+import org.onap.ccsdk.sli.adaptors.aai.query.NamedQuery;
+import org.onap.ccsdk.sli.adaptors.aai.query.NamedQueryData;
+import org.onap.ccsdk.sli.adaptors.aai.query.QueryParameters;
+import org.onap.ccsdk.sli.adaptors.aai.query.Results;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -84,56 +84,56 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 
 public abstract class AAIDeclarations implements AAIClient {
 
-	public static final String TRUSTSTORE_PATH    = "org.openecomp.sdnc.sli.aai.ssl.trust";
-	public static final String TRUSTSTORE_PSSWD   = "org.openecomp.sdnc.sli.aai.ssl.trust.psswd";
-	public static final String KEYSTORE_PATH      = "org.openecomp.sdnc.sli.aai.ssl.key";
-	public static final String KEYSTORE_PSSWD     = "org.openecomp.sdnc.sli.aai.ssl.key.psswd";
+	public static final String TRUSTSTORE_PATH    = "org.onap.ccsdk.sli.adaptors.aai.ssl.trust";
+	public static final String TRUSTSTORE_PSSWD   = "org.onap.ccsdk.sli.adaptors.aai.ssl.trust.psswd";
+	public static final String KEYSTORE_PATH      = "org.onap.ccsdk.sli.adaptors.aai.ssl.key";
+	public static final String KEYSTORE_PSSWD     = "org.onap.ccsdk.sli.adaptors.aai.ssl.key.psswd";
 
-	public static final String APPLICATION_ID     = "org.openecomp.sdnc.sli.aai.application";
+	public static final String APPLICATION_ID     = "org.onap.ccsdk.sli.adaptors.aai.application";
 
-	public static final String CLIENT_NAME		  = "org.openecomp.sdnc.sli.aai.client.name";
-	public static final String CLIENT_PWWD		  = "org.openecomp.sdnc.sli.aai.client.psswd";
+	public static final String CLIENT_NAME		  = "org.onap.ccsdk.sli.adaptors.aai.client.name";
+	public static final String CLIENT_PWWD		  = "org.onap.ccsdk.sli.adaptors.aai.client.psswd";
 
 
 	public static final String CONNECTION_TIMEOUT = "connection.timeout";
 	public static final String READ_TIMEOUT 	  = "read.timeout";
 
-	public static final String TARGET_URI         = "org.openecomp.sdnc.sli.aai.uri";
+	public static final String TARGET_URI         = "org.onap.ccsdk.sli.adaptors.aai.uri";
 
 	// Availability zones query
-	public static final String QUERY_PATH         = "org.openecomp.sdnc.sli.aai.path.query";
+	public static final String QUERY_PATH         = "org.onap.ccsdk.sli.adaptors.aai.path.query";
 
 	// Update
-	public static final String UPDATE_PATH		  = "org.openecomp.sdnc.sli.aai.update";
+	public static final String UPDATE_PATH		  = "org.onap.ccsdk.sli.adaptors.aai.update";
 
 	// Service instance
-	public static final String SVC_INSTANCE_PATH  = "org.openecomp.sdnc.sli.aai.path.svcinst";
-	public static final String SVC_INST_QRY_PATH  = "org.openecomp.sdnc.sli.aai.path.svcinst.query";
+	public static final String SVC_INSTANCE_PATH  = "org.onap.ccsdk.sli.adaptors.aai.path.svcinst";
+	public static final String SVC_INST_QRY_PATH  = "org.onap.ccsdk.sli.adaptors.aai.path.svcinst.query";
 
 	// VServer
-	public static final String NETWORK_VSERVER_PATH  = "org.openecomp.sdnc.sli.aai.path.vserver";
+	public static final String NETWORK_VSERVER_PATH  = "org.onap.ccsdk.sli.adaptors.aai.path.vserver";
 
-	public static final String VNF_IMAGE_QUERY_PATH	  = "org.openecomp.sdnc.sli.aai.path.vnf.image.query";
+	public static final String VNF_IMAGE_QUERY_PATH	  = "org.onap.ccsdk.sli.adaptors.aai.path.vnf.image.query";
 
-	public static final String PARAM_SERVICE_TYPE     = "org.openecomp.sdnc.sli.aai.param.service.type";
-	public static final String CERTIFICATE_HOST_ERROR = "org.openecomp.sdnc.sli.aai.host.certificate.ignore";
+	public static final String PARAM_SERVICE_TYPE     = "org.onap.ccsdk.sli.adaptors.aai.param.service.type";
+	public static final String CERTIFICATE_HOST_ERROR = "org.onap.ccsdk.sli.adaptors.aai.host.certificate.ignore";
 
 	// UBB Notify
-	public static final String UBB_NOTIFY_PATH        = "org.openecomp.sdnc.sli.aai.path.notify";
-	public static final String SELFLINK_AVPN          = "org.openecomp.sdnc.sli.aai.notify.selflink.avpn";
-	public static final String SELFLINK_FQDN          = "org.openecomp.sdnc.sli.aai.notify.selflink.fqdn";
+	public static final String UBB_NOTIFY_PATH        = "org.onap.ccsdk.sli.adaptors.aai.path.notify";
+	public static final String SELFLINK_AVPN          = "org.onap.ccsdk.sli.adaptors.aai.notify.selflink.avpn";
+	public static final String SELFLINK_FQDN          = "org.onap.ccsdk.sli.adaptors.aai.notify.selflink.fqdn";
 
 	//Service
-	public static final String SERVICE_PATH	          = "org.openecomp.sdnc.sli.aai.path.service";
+	public static final String SERVICE_PATH	          = "org.onap.ccsdk.sli.adaptors.aai.path.service";
 
 	// P-Interfaces
-	public static final String P_INTERFACE_PATH       = "org.openecomp.sdnc.sli.aai.path.pserver.pinterface";
+	public static final String P_INTERFACE_PATH       = "org.onap.ccsdk.sli.adaptors.aai.path.pserver.pinterface";
 
 	// site-pair-sets
-	public static final String SITE_PAIR_SET_PATH     = "org.openecomp.sdnc.sli.aai.path.site.pair.set";
+	public static final String SITE_PAIR_SET_PATH     = "org.onap.ccsdk.sli.adaptors.aai.path.site.pair.set";
 
 	// node query (1602)
-	public static final String QUERY_NODES_PATH		  = "org.openecomp.sdnc.sli.aai.query.nodes";
+	public static final String QUERY_NODES_PATH		  = "org.onap.ccsdk.sli.adaptors.aai.query.nodes";
 
 
 	protected abstract Logger getLogger();
diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAIExecutorInterface.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/AAIExecutorInterface.java
index 5b94f258c..d315bad1c 100644
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAIExecutorInterface.java
+++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/AAIExecutorInterface.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.sli.aai;
+package org.onap.ccsdk.sli.adaptors.aai;
 
 public interface AAIExecutorInterface {
 	public Object get(AAIRequest request) throws AAIServiceException;
diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAIRequest.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/AAIRequest.java
index f806ef4ec..4f2181f6c 100644
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAIRequest.java
+++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/AAIRequest.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.sli.aai;
+package org.onap.ccsdk.sli.adaptors.aai;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -44,7 +44,7 @@ import java.util.TreeSet;
 
 import org.apache.commons.lang.StringUtils;
 import org.openecomp.aai.inventory.v10.GenericVnf;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
+import org.onap.ccsdk.sli.adaptors.aai.data.AAIDatum;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.FrameworkUtil;
@@ -59,7 +59,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 public abstract class AAIRequest {
 	protected static final Logger LOG = LoggerFactory.getLogger(AAIRequest.class);
 
-	protected static final String TARGET_URI = "org.openecomp.sdnc.sli.aai.uri";
+	protected static final String TARGET_URI = "org.onap.ccsdk.sli.adaptors.aai.uri";
 
 	protected static final String MASTER_REQUEST = "master-request";
 
diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAIService.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/AAIService.java
index 3f62374a7..c50178bc5 100644
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAIService.java
+++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/AAIService.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.sli.aai;
+package org.onap.ccsdk.sli.adaptors.aai;
 
 
 import java.io.BufferedReader;
@@ -98,13 +98,13 @@ import org.openecomp.aai.inventory.v10.Vpe;
 import org.openecomp.aai.inventory.v10.VplsPe;
 import org.openecomp.aai.inventory.v10.VpnBinding;
 import org.openecomp.aai.inventory.v10.Vserver;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-import org.openecomp.sdnc.sli.aai.data.ErrorResponse;
-import org.openecomp.sdnc.sli.aai.data.RequestError;
-import org.openecomp.sdnc.sli.aai.data.ResourceVersion;
-import org.openecomp.sdnc.sli.aai.data.ServiceException;
-import org.openecomp.sdnc.sli.aai.data.notify.NotifyEvent;
-import org.openecomp.sdnc.sli.aai.data.v1507.VServer;
+import org.onap.ccsdk.sli.adaptors.aai.data.AAIDatum;
+import org.onap.ccsdk.sli.adaptors.aai.data.ErrorResponse;
+import org.onap.ccsdk.sli.adaptors.aai.data.RequestError;
+import org.onap.ccsdk.sli.adaptors.aai.data.ResourceVersion;
+import org.onap.ccsdk.sli.adaptors.aai.data.ServiceException;
+import org.onap.ccsdk.sli.adaptors.aai.data.notify.NotifyEvent;
+import org.onap.ccsdk.sli.adaptors.aai.data.v1507.VServer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -455,7 +455,7 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe
 	}
 
 	/* (non-Javadoc)
-	 * @see org.openecomp.sdnc.sli.resource.aic.AnAIClient#requestSdnZoneQuery(java.lang.String, java.lang.String, java.lang.String)
+	 * @see org.onap.ccsdk.sli.adaptors.resource.aic.AnAIClient#requestSdnZoneQuery(java.lang.String, java.lang.String, java.lang.String)
 	 */
 	@Override
 	public Vce requestNetworkVceData(String vnf_id) throws AAIServiceException {
@@ -480,7 +480,7 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe
 
 
 	/* (non-Javadoc)
-	 * @see org.openecomp.sdnc.sli.resource.aic.AnAIClient#requestSdnZoneQuery(java.lang.String, java.lang.String, java.lang.String)
+	 * @see org.onap.ccsdk.sli.adaptors.resource.aic.AnAIClient#requestSdnZoneQuery(java.lang.String, java.lang.String, java.lang.String)
 	 */
 	@Override
 	public boolean deleteNetworkVceData(String vnf_id, String resourceVersion) throws AAIServiceException {
@@ -500,7 +500,7 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe
 	}
 
 	/* (non-Javadoc)
-	 * @see org.openecomp.sdnc.sli.resource.aic.AnAIClient#postNetworkVceData(java.lang.String, org.openecomp.sdnc.sli.resource.aic.aai.VCERequest)
+	 * @see org.onap.ccsdk.sli.adaptors.resource.aic.AnAIClient#postNetworkVceData(java.lang.String, org.onap.ccsdk.sli.adaptors.resource.aic.aai.VCERequest)
 	 */
 	@Override
 	public boolean postNetworkVceData(String vnf_id, Vce data) throws AAIServiceException {
@@ -1026,7 +1026,7 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.openecomp.sdnc.sli.aai.AAIClient#requestCtagPoolData(String)
+	 * @see org.onap.ccsdk.sli.adaptors.aai.AAIClient#requestCtagPoolData(String)
 	 */
 	@Override
 	public CtagPool requestCtagPoolData(String physical_location_id, String target_pe, String availability_zone_name)	throws AAIServiceException {
diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAIServiceActivator.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/AAIServiceActivator.java
index 288877388..45c3d3d20 100644
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAIServiceActivator.java
+++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/AAIServiceActivator.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.sli.aai;
+package org.onap.ccsdk.sli.adaptors.aai;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAIServiceException.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/AAIServiceException.java
index cda60a8c1..8d57db43a 100644
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAIServiceException.java
+++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/AAIServiceException.java
@@ -19,9 +19,9 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.sli.aai;
+package org.onap.ccsdk.sli.adaptors.aai;
 
-import org.openecomp.sdnc.sli.aai.data.ErrorResponse;
+import org.onap.ccsdk.sli.adaptors.aai.data.ErrorResponse;
 
 public class AAIServiceException extends Exception {
 
diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAITrinityService.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/AAITrinityService.java
index ed5295cfc..6fffc6e8f 100644
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAITrinityService.java
+++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/AAITrinityService.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.sli.aai;
+package org.onap.ccsdk.sli.adaptors.aai;
 
 import java.net.URL;
 
diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/CloudRegionRequest.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/CloudRegionRequest.java
index 08c86a27b..0de0d2bd0 100644
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/CloudRegionRequest.java
+++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/CloudRegionRequest.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.sli.aai;
+package org.onap.ccsdk.sli.adaptors.aai;
 
 import java.io.UnsupportedEncodingException;
 import java.net.MalformedURLException;
@@ -28,8 +28,8 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
 
+import org.onap.ccsdk.sli.adaptors.aai.data.AAIDatum;
 import org.openecomp.aai.inventory.v10.CloudRegion;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -37,7 +37,7 @@ import com.google.common.base.Joiner;
 
 public class CloudRegionRequest extends AAIRequest {
 
-	public static final String CLOUD_REGION_PATH	= "org.openecomp.sdnc.sli.aai.path.cloud.region";
+	public static final String CLOUD_REGION_PATH	= "org.onap.ccsdk.sli.adaptors.aai.path.cloud.region";
 	
 	private final String cloud_region_path;
 	
diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/CustomQueryRequest.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/CustomQueryRequest.java
index d61a4ea89..994f1b6bf 100644
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/CustomQueryRequest.java
+++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/CustomQueryRequest.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.sli.aai;
+package org.onap.ccsdk.sli.adaptors.aai;
 
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
@@ -27,9 +27,9 @@ import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Properties;
 
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-import org.openecomp.sdnc.sli.aai.query.FormattedQueryRequestData;
-import org.openecomp.sdnc.sli.aai.query.FormattedQueryResultList;
+import org.onap.ccsdk.sli.adaptors.aai.data.AAIDatum;
+import org.onap.ccsdk.sli.adaptors.aai.query.FormattedQueryRequestData;
+import org.onap.ccsdk.sli.adaptors.aai.query.FormattedQueryResultList;
 
 import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -39,7 +39,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 
 public class CustomQueryRequest extends AAIRequest {
 
-	public static final String GENERIC_SEARCH_PATH			= "org.openecomp.sdnc.sli.aai.query.generic";
+	public static final String GENERIC_SEARCH_PATH			= "org.onap.ccsdk.sli.adaptors.aai.query.generic";
 
 	private final String generic_search_path;
 
diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/EchoRequest.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/EchoRequest.java
index 7352c4022..86e2d5f5e 100644
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/EchoRequest.java
+++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/EchoRequest.java
@@ -19,14 +19,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.sli.aai;
+package org.onap.ccsdk.sli.adaptors.aai;
 
 import java.io.UnsupportedEncodingException;
 import java.net.MalformedURLException;
 import java.net.URL;
 
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-import org.openecomp.sdnc.sli.aai.data.EchoResponse;
+import org.onap.ccsdk.sli.adaptors.aai.data.AAIDatum;
+import org.onap.ccsdk.sli.adaptors.aai.data.EchoResponse;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/GenericQueryRequest.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/GenericQueryRequest.java
index 0f1dda0e5..476aed94a 100644
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/GenericQueryRequest.java
+++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/GenericQueryRequest.java
@@ -19,22 +19,22 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.sli.aai;
+package org.onap.ccsdk.sli.adaptors.aai;
 
 import java.io.UnsupportedEncodingException;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Properties;
 
+import org.onap.ccsdk.sli.adaptors.aai.data.AAIDatum;
 import org.openecomp.aai.inventory.v10.ResultData;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 public class GenericQueryRequest extends AAIRequest {
 
-	public static final String GENERIC_SEARCH_PATH			= "org.openecomp.sdnc.sli.aai.query.generic";
+	public static final String GENERIC_SEARCH_PATH			= "org.onap.ccsdk.sli.adaptors.aai.query.generic";
 	
 	private final String generic_search_path;
 	
diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/GenericRequest.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/GenericRequest.java
index 0da40abe9..427ea7e38 100644
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/GenericRequest.java
+++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/GenericRequest.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.sli.aai;
+package org.onap.ccsdk.sli.adaptors.aai;
 
 import java.io.UnsupportedEncodingException;
 import java.lang.reflect.Field;
@@ -31,9 +31,9 @@ import java.util.Set;
 
 import javax.xml.bind.annotation.XmlElement;
 
+import org.onap.ccsdk.sli.adaptors.aai.data.AAIDatum;
 import org.openecomp.aai.inventory.v10.L3Network;
 import org.openecomp.aai.inventory.v10.L3Networks;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/GenericVnfRequest.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/GenericVnfRequest.java
index f8c9a18bc..3915940f5 100644
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/GenericVnfRequest.java
+++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/GenericVnfRequest.java
@@ -19,15 +19,15 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.sli.aai;
+package org.onap.ccsdk.sli.adaptors.aai;
 
 import java.io.UnsupportedEncodingException;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Properties;
 
+import org.onap.ccsdk.sli.adaptors.aai.data.AAIDatum;
 import org.openecomp.aai.inventory.v10.GenericVnf;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -35,8 +35,8 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 public class GenericVnfRequest extends AAIRequest {
 
 	// tenant (1602)
-	public static final String GENERIC_VNF_PATH			= "org.openecomp.sdnc.sli.aai.path.generic.vnf";
-	public static final String GENERIC_VNF_QUERY_PATH	= "org.openecomp.sdnc.sli.aai.path.generic.vnf.query";
+	public static final String GENERIC_VNF_PATH			= "org.onap.ccsdk.sli.adaptors.aai.path.generic.vnf";
+	public static final String GENERIC_VNF_QUERY_PATH	= "org.onap.ccsdk.sli.adaptors.aai.path.generic.vnf.query";
 	
 	private final String generic_vnf_path;
 	private final String generic_vnf_query_path;
diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/L3InterfaceIpv4AddressListRequest.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/L3InterfaceIpv4AddressListRequest.java
index 762d43bb9..e1431bead 100644
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/L3InterfaceIpv4AddressListRequest.java
+++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/L3InterfaceIpv4AddressListRequest.java
@@ -19,15 +19,15 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.sli.aai;
+package org.onap.ccsdk.sli.adaptors.aai;
 
 import java.io.UnsupportedEncodingException;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Properties;
 
+import org.onap.ccsdk.sli.adaptors.aai.data.AAIDatum;
 import org.openecomp.aai.inventory.v10.L3InterfaceIpv4AddressList;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -60,8 +60,8 @@ public class L3InterfaceIpv4AddressListRequest extends AAIRequest {
 	 * aaiv7:inventory/network/pnfs/pnf/{pnf-name}/p-interfaces/p-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}/l3-interface-ipv4-address-list/{l3-interface-ipv4-address}
 	 */
 
-	public static final String L3_INTERFACE_IPV4_ADDRESS_LIST_PATH	=     "org.openecomp.sdnc.sli.aai.path.l3.interface.ipv4.address.list";
-	public static final String VLAN_L3_INTERFACE_IPV4_ADDRESS_LIST_PATH	= "org.openecomp.sdnc.sli.aai.path.vlan.l3.interface.ipv4.address.list";
+	public static final String L3_INTERFACE_IPV4_ADDRESS_LIST_PATH	=     "org.onap.ccsdk.sli.adaptors.aai.path.l3.interface.ipv4.address.list";
+	public static final String VLAN_L3_INTERFACE_IPV4_ADDRESS_LIST_PATH	= "org.onap.ccsdk.sli.adaptors.aai.path.vlan.l3.interface.ipv4.address.list";
 
 	private final String l3_interface_ipv4_address_list_path;
 	private final String vlan_l3_interface_ipv4_address_list_path;
@@ -178,7 +178,7 @@ public class L3InterfaceIpv4AddressListRequest extends AAIRequest {
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.openecomp.sdnc.sli.aai.PathConfigurator#configurePath(java.lang.String)
+	 * @see org.onap.ccsdk.sli.adaptors.aai.PathConfigurator#configurePath(java.lang.String)
 	 */
 //	@Override
 //	public void processRequestPathValues(Map<String, String> nameValues) {
diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/L3InterfaceIpv6AddressListRequest.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/L3InterfaceIpv6AddressListRequest.java
index b87f4079d..5cdc0de64 100644
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/L3InterfaceIpv6AddressListRequest.java
+++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/L3InterfaceIpv6AddressListRequest.java
@@ -19,15 +19,15 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.sli.aai;
+package org.onap.ccsdk.sli.adaptors.aai;
 
 import java.io.UnsupportedEncodingException;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Properties;
 
+import org.onap.ccsdk.sli.adaptors.aai.data.AAIDatum;
 import org.openecomp.aai.inventory.v10.L3InterfaceIpv6AddressList;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -60,8 +60,8 @@ public class L3InterfaceIpv6AddressListRequest extends AAIRequest {
 	 * aaiv7:inventory/network/pnfs/pnf/{pnf-name}/p-interfaces/p-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}/l3-interface-ipv6-address-list/{l3-interface-ipv6-address}
 	 */
 
-	public static final String L3_INTERFACE_IPV6_ADDRESS_LIST_PATH	= "org.openecomp.sdnc.sli.aai.path.l3.interface.ipv6.address.list";
-	public static final String VLAN_L3_INTERFACE_IPV6_ADDRESS_LIST_PATH	= "org.openecomp.sdnc.sli.aai.path.vlan.l3.interface.ipv6.address.list";
+	public static final String L3_INTERFACE_IPV6_ADDRESS_LIST_PATH	= "org.onap.ccsdk.sli.adaptors.aai.path.l3.interface.ipv6.address.list";
+	public static final String VLAN_L3_INTERFACE_IPV6_ADDRESS_LIST_PATH	= "org.onap.ccsdk.sli.adaptors.aai.path.vlan.l3.interface.ipv6.address.list";
 
 	private final String l3_interface_ipv6_address_list_path;
 	private final String vlan_l3_interface_ipv6_address_list_path;
diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/LInterfaceRequest.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/LInterfaceRequest.java
index 2553037d2..a9da4e45c 100644
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/LInterfaceRequest.java
+++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/LInterfaceRequest.java
@@ -19,15 +19,15 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.sli.aai;
+package org.onap.ccsdk.sli.adaptors.aai;
 
 import java.io.UnsupportedEncodingException;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Properties;
 
+import org.onap.ccsdk.sli.adaptors.aai.data.AAIDatum;
 import org.openecomp.aai.inventory.v10.LInterface;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -35,14 +35,14 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 public class LInterfaceRequest extends AAIRequest {
 
 	// tenant (1602)
-	public static final String LAGINTERFACE_LINTERFACE_PATH			= "org.openecomp.sdnc.sli.aai.path.lag.interface.l.interface";
-	public static final String LAGINTERFACE_LINTERFACE_QUERY_PATH	= "org.openecomp.sdnc.sli.aai.path.lag.interface.l.interface.query";
+	public static final String LAGINTERFACE_LINTERFACE_PATH			= "org.onap.ccsdk.sli.adaptors.aai.path.lag.interface.l.interface";
+	public static final String LAGINTERFACE_LINTERFACE_QUERY_PATH	= "org.onap.ccsdk.sli.adaptors.aai.path.lag.interface.l.interface.query";
 
-	public static final String P_INTERFACE_LINTERFACE_PATH			= "org.openecomp.sdnc.sli.aai.path.p.interface.l.interface";
-	public static final String P_INTERFACE_LINTERFACE_QUERY_PATH	= "org.openecomp.sdnc.sli.aai.path.p.interface.l.interface.query";
+	public static final String P_INTERFACE_LINTERFACE_PATH			= "org.onap.ccsdk.sli.adaptors.aai.path.p.interface.l.interface";
+	public static final String P_INTERFACE_LINTERFACE_QUERY_PATH	= "org.onap.ccsdk.sli.adaptors.aai.path.p.interface.l.interface.query";
 
-	public static final String LAGINTERFACE_LINTERFACE_PNF_PATH		= "org.openecomp.sdnc.sli.aai.path.lag.interface.l.interface.pnf";
-	public static final String P_INTERFACE_LINTERFACE_PNF_PATH		= "org.openecomp.sdnc.sli.aai.path.p.interface.l.interface.pnf";
+	public static final String LAGINTERFACE_LINTERFACE_PNF_PATH		= "org.onap.ccsdk.sli.adaptors.aai.path.lag.interface.l.interface.pnf";
+	public static final String P_INTERFACE_LINTERFACE_PNF_PATH		= "org.onap.ccsdk.sli.adaptors.aai.path.p.interface.l.interface.pnf";
 
 	private final String laginterface_linterface_path;
 	private final String laginterface_linterface_query_path;
diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/LagInterfacePnfRequest.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/LagInterfacePnfRequest.java
index 2c1036233..5f84553db 100644
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/LagInterfacePnfRequest.java
+++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/LagInterfacePnfRequest.java
@@ -19,15 +19,15 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.sli.aai;
+package org.onap.ccsdk.sli.adaptors.aai;
 
 import java.io.UnsupportedEncodingException;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Properties;
 
+import org.onap.ccsdk.sli.adaptors.aai.data.AAIDatum;
 import org.openecomp.aai.inventory.v10.LagInterface;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
 import org.slf4j.LoggerFactory;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -36,9 +36,9 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 public class LagInterfacePnfRequest extends AAIRequest {
 
 	// tenant (1602)
-	public static final String LAG_INTERFACE_PATH			= "org.openecomp.sdnc.sli.aai.path.pserver.pinterface";
-	public static final String LAG_INTERFACE_QUERY_PATH	= "org.openecomp.sdnc.sli.aai.path.pserver.pinterface.query";
-	public static final String PNF_PATH		  = "org.openecomp.sdnc.sli.aai.path.pnf";
+	public static final String LAG_INTERFACE_PATH			= "org.onap.ccsdk.sli.adaptors.aai.path.pserver.pinterface";
+	public static final String LAG_INTERFACE_QUERY_PATH	= "org.onap.ccsdk.sli.adaptors.aai.path.pserver.pinterface.query";
+	public static final String PNF_PATH		  = "org.onap.ccsdk.sli.adaptors.aai.path.pnf";
 
 	private final String lag_interface_path;
 	private final String lag_interface_query_path;
@@ -52,10 +52,10 @@ public class LagInterfacePnfRequest extends AAIRequest {
 	public LagInterfacePnfRequest() {
 		lag_interface_path = configProperties.getProperty(PNF_PATH) + "/lag-interfaces/lag-interface/{interface-name}";
 		lag_interface_query_path = configProperties.getProperty(LAG_INTERFACE_QUERY_PATH);
-		LoggerFactory.getLogger(LagInterfacePnfRequest.class).debug("org.openecomp.sdnc.sli.aai.path.pserver.pinterface=\t" + lag_interface_path);
-		LoggerFactory.getLogger(LagInterfacePnfRequest.class).debug("org.openecomp.sdnc.sli.aai.path.pserver.pinterface.query=\t" + lag_interface_query_path);
+		LoggerFactory.getLogger(LagInterfacePnfRequest.class).debug("org.onap.ccsdk.sli.adaptors.aai.path.pserver.pinterface=\t" + lag_interface_path);
+		LoggerFactory.getLogger(LagInterfacePnfRequest.class).debug("org.onap.ccsdk.sli.adaptors.aai.path.pserver.pinterface.query=\t" + lag_interface_query_path);
 		if(lag_interface_path == null) {
-			LoggerFactory.getLogger(LagInterfacePnfRequest.class).warn("org.openecomp.sdnc.sli.aai.path.pserver.pinterface PATH not found in aaiclient.properties");
+			LoggerFactory.getLogger(LagInterfacePnfRequest.class).warn("org.onap.ccsdk.sli.adaptors.aai.path.pserver.pinterface PATH not found in aaiclient.properties");
 		}
 	}
 
diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/NamedQueryRequest.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/NamedQueryRequest.java
index 4ee517458..e1528a617 100644
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/NamedQueryRequest.java
+++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/NamedQueryRequest.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.sli.aai;
+package org.onap.ccsdk.sli.adaptors.aai;
 
 import java.io.UnsupportedEncodingException;
 import java.net.MalformedURLException;
@@ -29,8 +29,8 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Properties;
 
+import org.onap.ccsdk.sli.adaptors.aai.data.AAIDatum;
 import org.openecomp.aai.inventory.v10.InventoryResponseItems;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
 
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -45,7 +45,7 @@ import com.fasterxml.jackson.module.jaxb.JaxbAnnotationIntrospector;
 
 public class NamedQueryRequest extends AAIRequest {
 
-	public static final String NAMED_SEARCH_PATH			= "org.openecomp.sdnc.sli.aai.query.named";
+	public static final String NAMED_SEARCH_PATH			= "org.onap.ccsdk.sli.adaptors.aai.query.named";
 
 	private final String named_search_path;
 
diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/NodesQueryRequest.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/NodesQueryRequest.java
index c4141876e..ba4da3d7e 100644
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/NodesQueryRequest.java
+++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/NodesQueryRequest.java
@@ -19,22 +19,22 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.sli.aai;
+package org.onap.ccsdk.sli.adaptors.aai;
 
 import java.io.UnsupportedEncodingException;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Properties;
 
+import org.onap.ccsdk.sli.adaptors.aai.data.AAIDatum;
 import org.openecomp.aai.inventory.v10.SearchResults;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 public class NodesQueryRequest extends AAIRequest {
 
-	public static final String NODES_SEARCH_PATH			= "org.openecomp.sdnc.sli.aai.query.nodes";
+	public static final String NODES_SEARCH_PATH			= "org.onap.ccsdk.sli.adaptors.aai.query.nodes";
 	
 	private final String nodes_search_path;
 	
diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/PInterfacePnfRequest.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/PInterfacePnfRequest.java
index 99bce9d15..ea669f232 100644
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/PInterfacePnfRequest.java
+++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/PInterfacePnfRequest.java
@@ -19,15 +19,15 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.sli.aai;
+package org.onap.ccsdk.sli.adaptors.aai;
 
 import java.io.UnsupportedEncodingException;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Properties;
 
+import org.onap.ccsdk.sli.adaptors.aai.data.AAIDatum;
 import org.openecomp.aai.inventory.v10.PInterface;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
 import org.slf4j.LoggerFactory;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -36,9 +36,9 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 public class PInterfacePnfRequest extends AAIRequest {
 
 	// tenant (1602)
-	public static final String PINTERFACE_PATH			= "org.openecomp.sdnc.sli.aai.path.pserver.pinterface";
-	public static final String PINTERFACE_QUERY_PATH	= "org.openecomp.sdnc.sli.aai.path.pserver.pinterface.query";
-	public static final String PNF_PATH		  = "org.openecomp.sdnc.sli.aai.path.pnf";
+	public static final String PINTERFACE_PATH			= "org.onap.ccsdk.sli.adaptors.aai.path.pserver.pinterface";
+	public static final String PINTERFACE_QUERY_PATH	= "org.onap.ccsdk.sli.adaptors.aai.path.pserver.pinterface.query";
+	public static final String PNF_PATH		  = "org.onap.ccsdk.sli.adaptors.aai.path.pnf";
 
 	private final String pinterface_path;
 	private final String pinterface_query_path;
@@ -52,10 +52,10 @@ public class PInterfacePnfRequest extends AAIRequest {
 	public PInterfacePnfRequest() {
 		pinterface_path = configProperties.getProperty(PNF_PATH) + "/p-interfaces/p-interface/{interface-name}";
 		pinterface_query_path = configProperties.getProperty(PINTERFACE_QUERY_PATH);
-		LoggerFactory.getLogger(PInterfacePnfRequest.class).debug("org.openecomp.sdnc.sli.aai.path.pserver.pinterface=\t" + pinterface_path);
-		LoggerFactory.getLogger(PInterfacePnfRequest.class).debug("org.openecomp.sdnc.sli.aai.path.pserver.pinterface.query=\t" + pinterface_query_path);
+		LoggerFactory.getLogger(PInterfacePnfRequest.class).debug("org.onap.ccsdk.sli.adaptors.aai.path.pserver.pinterface=\t" + pinterface_path);
+		LoggerFactory.getLogger(PInterfacePnfRequest.class).debug("org.onap.ccsdk.sli.adaptors.aai.path.pserver.pinterface.query=\t" + pinterface_query_path);
 		if(pinterface_path == null) {
-			LoggerFactory.getLogger(PInterfacePnfRequest.class).warn("org.openecomp.sdnc.sli.aai.path.pserver.pinterface PATH not found in aaiclient.properties");
+			LoggerFactory.getLogger(PInterfacePnfRequest.class).warn("org.onap.ccsdk.sli.adaptors.aai.path.pserver.pinterface PATH not found in aaiclient.properties");
 		}
 	}
 
diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/PInterfaceRequest.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/PInterfaceRequest.java
index a08a39298..378e125dd 100644
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/PInterfaceRequest.java
+++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/PInterfaceRequest.java
@@ -19,14 +19,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.sli.aai;
+package org.onap.ccsdk.sli.adaptors.aai;
 
 import java.io.UnsupportedEncodingException;
 import java.net.MalformedURLException;
 import java.net.URL;
 
+import org.onap.ccsdk.sli.adaptors.aai.data.AAIDatum;
 import org.openecomp.aai.inventory.v10.PInterface;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
 import org.slf4j.LoggerFactory;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -35,8 +35,8 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 public class PInterfaceRequest extends AAIRequest {
 
 	// tenant (1602)
-	public static final String PINTERFACE_PATH			= "org.openecomp.sdnc.sli.aai.path.pserver.pinterface";
-	public static final String PINTERFACE_QUERY_PATH	= "org.openecomp.sdnc.sli.aai.path.pserver.pinterface.query";
+	public static final String PINTERFACE_PATH			= "org.onap.ccsdk.sli.adaptors.aai.path.pserver.pinterface";
+	public static final String PINTERFACE_QUERY_PATH	= "org.onap.ccsdk.sli.adaptors.aai.path.pserver.pinterface.query";
 	
 	private final String pinterface_path;
 	private final String pinterface_query_path;
@@ -50,10 +50,10 @@ public class PInterfaceRequest extends AAIRequest {
 	public PInterfaceRequest() {
 		pinterface_path = configProperties.getProperty(PINTERFACE_PATH);
 		pinterface_query_path = configProperties.getProperty(PINTERFACE_QUERY_PATH);
-		LoggerFactory.getLogger(PInterfaceRequest.class).debug("org.openecomp.sdnc.sli.aai.path.pserver.pinterface=\t" + pinterface_path);
-		LoggerFactory.getLogger(PInterfaceRequest.class).debug("org.openecomp.sdnc.sli.aai.path.pserver.pinterface.query=\t" + pinterface_query_path);
+		LoggerFactory.getLogger(PInterfaceRequest.class).debug("org.onap.ccsdk.sli.adaptors.aai.path.pserver.pinterface=\t" + pinterface_path);
+		LoggerFactory.getLogger(PInterfaceRequest.class).debug("org.onap.ccsdk.sli.adaptors.aai.path.pserver.pinterface.query=\t" + pinterface_query_path);
 		if(pinterface_path == null) {
-			LoggerFactory.getLogger(PInterfaceRequest.class).warn("org.openecomp.sdnc.sli.aai.path.pserver.pinterface PATH not found in aaiclient.properties");
+			LoggerFactory.getLogger(PInterfaceRequest.class).warn("org.onap.ccsdk.sli.adaptors.aai.path.pserver.pinterface PATH not found in aaiclient.properties");
 		}
 	}
 
diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/PathRequest.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/PathRequest.java
index 0e110a110..a42e045bb 100644
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/PathRequest.java
+++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/PathRequest.java
@@ -19,13 +19,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.sli.aai;
+package org.onap.ccsdk.sli.adaptors.aai;
 
 import java.io.UnsupportedEncodingException;
 import java.net.MalformedURLException;
 import java.net.URL;
 
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
+import org.onap.ccsdk.sli.adaptors.aai.data.AAIDatum;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/PhysicalLinkRequest.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/PhysicalLinkRequest.java
index a03298ae8..4db95df1c 100644
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/PhysicalLinkRequest.java
+++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/PhysicalLinkRequest.java
@@ -19,14 +19,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.sli.aai;
+package org.onap.ccsdk.sli.adaptors.aai;
 
 import java.io.UnsupportedEncodingException;
 import java.net.MalformedURLException;
 import java.net.URL;
 
+import org.onap.ccsdk.sli.adaptors.aai.data.AAIDatum;
 import org.openecomp.aai.inventory.v10.PhysicalLink;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -34,8 +34,8 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 public class PhysicalLinkRequest extends AAIRequest {
 
 	// physical link
-	public static final String PHYSICAL_LINK_PATH		= "org.openecomp.sdnc.sli.aai.path.physical.link";
-	public static final String PHYSICAL_LINK_QUERY_PATH	= "org.openecomp.sdnc.sli.aai.path.physical.link.query";
+	public static final String PHYSICAL_LINK_PATH		= "org.onap.ccsdk.sli.adaptors.aai.path.physical.link";
+	public static final String PHYSICAL_LINK_QUERY_PATH	= "org.onap.ccsdk.sli.adaptors.aai.path.physical.link.query";
 	
 	private final String physical_link_path;
 	private final String physical_link_query_path;
diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/RelationshipRequest.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/RelationshipRequest.java
index f15cbb591..8c3d107cb 100644
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/RelationshipRequest.java
+++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/RelationshipRequest.java
@@ -19,14 +19,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.sli.aai;
+package org.onap.ccsdk.sli.adaptors.aai;
 
 import java.io.UnsupportedEncodingException;
 import java.net.MalformedURLException;
 import java.net.URL;
 
+import org.onap.ccsdk.sli.adaptors.aai.data.AAIDatum;
 import org.openecomp.aai.inventory.v10.RelationshipList;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -34,8 +34,8 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 public class RelationshipRequest extends AAIRequest {
 
 	// tenant (1602)
-	public static final String RELATIONSHIP_LIST_PATH		= "org.openecomp.sdnc.sli.aai.path.relationship.list";
-	public static final String RELATIONSHIP_LIST_QUERY_PATH	= "org.openecomp.sdnc.sli.aai.path.relationship.list.query";
+	public static final String RELATIONSHIP_LIST_PATH		= "org.onap.ccsdk.sli.adaptors.aai.path.relationship.list";
+	public static final String RELATIONSHIP_LIST_QUERY_PATH	= "org.onap.ccsdk.sli.adaptors.aai.path.relationship.list.query";
 	
 	private final String relationship_path;
 	private final String relationship_query_path;
diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/SelfLinkRequest.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/SelfLinkRequest.java
index 7c3076521..e4fd3d938 100644
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/SelfLinkRequest.java
+++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/SelfLinkRequest.java
@@ -19,13 +19,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.sli.aai;
+package org.onap.ccsdk.sli.adaptors.aai;
 
 import java.io.UnsupportedEncodingException;
 import java.net.MalformedURLException;
 import java.net.URL;
 
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
+import org.onap.ccsdk.sli.adaptors.aai.data.AAIDatum;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/SubInterfaceRequest.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/SubInterfaceRequest.java
index 1220ee9ac..3cbe187c0 100644
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/SubInterfaceRequest.java
+++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/SubInterfaceRequest.java
@@ -19,15 +19,15 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.sli.aai;
+package org.onap.ccsdk.sli.adaptors.aai;
 
 import java.io.UnsupportedEncodingException;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Properties;
 
+import org.onap.ccsdk.sli.adaptors.aai.data.AAIDatum;
 import org.openecomp.aai.inventory.v10.LInterface;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -35,11 +35,11 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 public class SubInterfaceRequest extends AAIRequest {
 
 	// tenant (1602)
-	public static final String PNF_LAGINTERFACE_SUBINTERFACE_PATH		= "org.openecomp.sdnc.sli.aai.path.pnf.lag.interface.subinterface";
-	public static final String PNF_LAGINTERFACE_SUBINTERFACE_QUERY_PATH	= "org.openecomp.sdnc.sli.aai.path.pnf.lag.interface.subinterface.query";
+	public static final String PNF_LAGINTERFACE_SUBINTERFACE_PATH		= "org.onap.ccsdk.sli.adaptors.aai.path.pnf.lag.interface.subinterface";
+	public static final String PNF_LAGINTERFACE_SUBINTERFACE_QUERY_PATH	= "org.onap.ccsdk.sli.adaptors.aai.path.pnf.lag.interface.subinterface.query";
 
-	public static final String PNF_P_INTERFACE_SUBINTERFACE_PATH		= "org.openecomp.sdnc.sli.aai.path.pnf.p.interface.l.interface";
-	public static final String PNF_P_INTERFACE_SUBINTERFACE_QUERY_PATH	= "org.openecomp.sdnc.sli.aai.path.pnf.p.interface.l.interface.query";
+	public static final String PNF_P_INTERFACE_SUBINTERFACE_PATH		= "org.onap.ccsdk.sli.adaptors.aai.path.pnf.p.interface.l.interface";
+	public static final String PNF_P_INTERFACE_SUBINTERFACE_QUERY_PATH	= "org.onap.ccsdk.sli.adaptors.aai.path.pnf.p.interface.l.interface.query";
 
 	private final String pnf_laginterface_subinterface_path;
 	private final String pnf_laginterface_subinterface_query_path;
diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/UpdateRequest.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/UpdateRequest.java
index 696f30bdb..705f53d28 100644
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/UpdateRequest.java
+++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/UpdateRequest.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.sli.aai;
+package org.onap.ccsdk.sli.adaptors.aai;
 
 import java.io.UnsupportedEncodingException;
 import java.net.MalformedURLException;
@@ -27,7 +27,7 @@ import java.net.URL;
 import java.util.Map;
 import java.util.Properties;
 
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
+import org.onap.ccsdk.sli.adaptors.aai.data.AAIDatum;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/AAIDatum.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/AAIDatum.java
index fe238026e..84323176b 100644
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/AAIDatum.java
+++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/AAIDatum.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.sli.aai.data;
+package org.onap.ccsdk.sli.adaptors.aai.data;
 
 public interface AAIDatum {
 
diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/EchoResponse.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/EchoResponse.java
index 1b9cb8d4a..576c15701 100644
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/EchoResponse.java
+++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/EchoResponse.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.sli.aai.data;
+package org.onap.ccsdk.sli.adaptors.aai.data;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/ErrorResponse.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/ErrorResponse.java
index be5368d1b..6a255fcf1 100644
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/ErrorResponse.java
+++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/ErrorResponse.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.sli.aai.data;
+package org.onap.ccsdk.sli.adaptors.aai.data;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/RequestError.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/RequestError.java
index df875f8c6..9bbca18f5 100644
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/RequestError.java
+++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/RequestError.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.sli.aai.data;
+package org.onap.ccsdk.sli.adaptors.aai.data;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/ResourceVersion.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/ResourceVersion.java
index 5ac06e6bd..f5901a8be 100644
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/ResourceVersion.java
+++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/ResourceVersion.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.sli.aai.data;
+package org.onap.ccsdk.sli.adaptors.aai.data;
 
 public interface ResourceVersion {
 
diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/ResponseMessage.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/ResponseMessage.java
index c1f9582af..db3778792 100644
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/ResponseMessage.java
+++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/ResponseMessage.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.sli.aai.data;
+package org.onap.ccsdk.sli.adaptors.aai.data;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/ResponseMessages.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/ResponseMessages.java
index 5af83aaeb..a23878084 100644
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/ResponseMessages.java
+++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/ResponseMessages.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.sli.aai.data;
+package org.onap.ccsdk.sli.adaptors.aai.data;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/ServiceException.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/ServiceException.java
index b02b448ee..b98d3d8fc 100644
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/ServiceException.java
+++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/ServiceException.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.sli.aai.data;
+package org.onap.ccsdk.sli.adaptors.aai.data;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/SubInterface.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/SubInterface.java
index a85e02196..f15507800 100644
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/SubInterface.java
+++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/SubInterface.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.sli.aai.data;
+package org.onap.ccsdk.sli.adaptors.aai.data;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/Variables.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/Variables.java
index 99c42aa3c..3b03ba472 100644
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/Variables.java
+++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/Variables.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.sli.aai.data;
+package org.onap.ccsdk.sli.adaptors.aai.data;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/notify/KeyDatum.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/notify/KeyDatum.java
index 80e633dde..641a8abde 100644
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/notify/KeyDatum.java
+++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/notify/KeyDatum.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.sli.aai.data.notify;
+package org.onap.ccsdk.sli.adaptors.aai.data.notify;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/notify/NotifyEvent.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/notify/NotifyEvent.java
index 1be171e03..d97b35239 100644
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/notify/NotifyEvent.java
+++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/notify/NotifyEvent.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.sli.aai.data.notify;
+package org.onap.ccsdk.sli.adaptors.aai.data.notify;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/v1507/Flavor.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/v1507/Flavor.java
index 69288c118..6ffc30c45 100644
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/v1507/Flavor.java
+++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/v1507/Flavor.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.sli.aai.data.v1507;
+package org.onap.ccsdk.sli.adaptors.aai.data.v1507;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/v1507/Host.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/v1507/Host.java
index e4a5720a6..7c171ebd9 100644
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/v1507/Host.java
+++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/v1507/Host.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.sli.aai.data.v1507;
+package org.onap.ccsdk.sli.adaptors.aai.data.v1507;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/v1507/Image.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/v1507/Image.java
index 19ae8749d..0e27c5418 100644
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/v1507/Image.java
+++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/v1507/Image.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.sli.aai.data.v1507;
+package org.onap.ccsdk.sli.adaptors.aai.data.v1507;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/v1507/IpAddress.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/v1507/IpAddress.java
index 1d29857a5..19a9bf6a9 100644
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/v1507/IpAddress.java
+++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/v1507/IpAddress.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.sli.aai.data.v1507;
+package org.onap.ccsdk.sli.adaptors.aai.data.v1507;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/v1507/Relationship.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/v1507/Relationship.java
index 623bd722a..8e04e35f5 100644
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/v1507/Relationship.java
+++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/v1507/Relationship.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.sli.aai.data.v1507;
+package org.onap.ccsdk.sli.adaptors.aai.data.v1507;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/v1507/RelationshipDatum.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/v1507/RelationshipDatum.java
index 9f44c1fac..1ac21640c 100644
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/v1507/RelationshipDatum.java
+++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/v1507/RelationshipDatum.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.sli.aai.data.v1507;
+package org.onap.ccsdk.sli.adaptors.aai.data.v1507;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/v1507/RelationshipList.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/v1507/RelationshipList.java
index 242b09119..3c46d21bd 100644
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/v1507/RelationshipList.java
+++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/v1507/RelationshipList.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.sli.aai.data.v1507;
+package org.onap.ccsdk.sli.adaptors.aai.data.v1507;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/v1507/VServer.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/v1507/VServer.java
index 6c975604d..45d725530 100644
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/v1507/VServer.java
+++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/v1507/VServer.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.sli.aai.data.v1507;
+package org.onap.ccsdk.sli.adaptors.aai.data.v1507;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/query/FormattedQueryRequestData.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/query/FormattedQueryRequestData.java
index 78d890aae..e533a164f 100644
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/query/FormattedQueryRequestData.java
+++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/query/FormattedQueryRequestData.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.sli.aai.query;
+package org.onap.ccsdk.sli.adaptors.aai.query;
 
 import java.util.List;
 
@@ -28,7 +28,7 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
+import org.onap.ccsdk.sli.adaptors.aai.data.AAIDatum;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/query/FormattedQueryResultList.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/query/FormattedQueryResultList.java
index 48b2a60b0..248cd9597 100644
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/query/FormattedQueryResultList.java
+++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/query/FormattedQueryResultList.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.sli.aai.query;
+package org.onap.ccsdk.sli.adaptors.aai.query;
 
 import java.util.List;
 
@@ -29,7 +29,7 @@ import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
+import org.onap.ccsdk.sli.adaptors.aai.data.AAIDatum;
 
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "", propOrder = {
diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/query/InstanceFilter.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/query/InstanceFilter.java
index 33f1fec2b..ccd637294 100644
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/query/InstanceFilter.java
+++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/query/InstanceFilter.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.sli.aai.query;
+package org.onap.ccsdk.sli.adaptors.aai.query;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/query/InstanceFilters.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/query/InstanceFilters.java
index d38beed04..265c1866c 100644
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/query/InstanceFilters.java
+++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/query/InstanceFilters.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.sli.aai.query;
+package org.onap.ccsdk.sli.adaptors.aai.query;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/query/NamedQuery.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/query/NamedQuery.java
index 5b20903df..65350c23d 100644
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/query/NamedQuery.java
+++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/query/NamedQuery.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.sli.aai.query;
+package org.onap.ccsdk.sli.adaptors.aai.query;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/query/NamedQueryData.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/query/NamedQueryData.java
index e8a775296..8188acf23 100644
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/query/NamedQueryData.java
+++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/query/NamedQueryData.java
@@ -19,13 +19,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.sli.aai.query;
+package org.onap.ccsdk.sli.adaptors.aai.query;
 
 import java.util.HashMap;
 import java.util.Map;
 import javax.annotation.Generated;
 
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
+import org.onap.ccsdk.sli.adaptors.aai.data.AAIDatum;
+
 import com.fasterxml.jackson.annotation.JsonAnyGetter;
 import com.fasterxml.jackson.annotation.JsonAnySetter;
 import com.fasterxml.jackson.annotation.JsonIgnore;
diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/query/QueryParameters.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/query/QueryParameters.java
index bb4498cf4..c6ddbcbca 100644
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/query/QueryParameters.java
+++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/query/QueryParameters.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.sli.aai.query;
+package org.onap.ccsdk.sli.adaptors.aai.query;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/query/Results.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/query/Results.java
index 2931a7e1d..ff2269a49 100644
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/query/Results.java
+++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/query/Results.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.sli.aai.query;
+package org.onap.ccsdk.sli.adaptors.aai.query;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/update/Action.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/update/Action.java
index 296a3713c..f3d509987 100644
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/update/Action.java
+++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/update/Action.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.sli.aai.update;
+package org.onap.ccsdk.sli.adaptors.aai.update;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/update/ActionDatum.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/update/ActionDatum.java
index 3dfb9c379..0cd70012f 100644
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/update/ActionDatum.java
+++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/update/ActionDatum.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.sli.aai.update;
+package org.onap.ccsdk.sli.adaptors.aai.update;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/update/Update.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/update/Update.java
index a092b6b9e..43f912dfa 100644
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/update/Update.java
+++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/update/Update.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.sli.aai.update;
+package org.onap.ccsdk.sli.adaptors.aai.update;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/update/UpdateNodeKey.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/update/UpdateNodeKey.java
index ffc5cc0d3..caa1de450 100644
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/update/UpdateNodeKey.java
+++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/update/UpdateNodeKey.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.sli.aai.update;
+package org.onap.ccsdk.sli.adaptors.aai.update;
 
 import java.util.HashMap;
 import java.util.Map;