27 files changed, 69 insertions, 69 deletions
diff --git a/PolicyEngineUtils/pom.xml b/PolicyEngineUtils/pom.xml
index 98eae1e3c..af2664305 100644
--- a/PolicyEngineUtils/pom.xml
+++ b/PolicyEngineUtils/pom.xml
@@ -1,6 +1,6 @@
 <!--
   ============LICENSE_START=======================================================
-  ECOMP Policy Engine
+  ONAP Policy Engine
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
   ================================================================================
@@ -21,25 +21,25 @@
 	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.policy.engine</groupId>
+		<groupId>org.onap.policy.engine</groupId>
 		<artifactId>PolicyEngineSuite</artifactId>
 		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>PolicyEngineUtils</artifactId>
 	<dependencies>
 		<dependency>
-			<groupId>org.openecomp.policy.common</groupId>
+			<groupId>org.onap.policy.common</groupId>
 			<artifactId>integrity-monitor</artifactId>
 			<version>${common-modules.version}</version> 
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.policy.common</groupId>
+			<groupId>org.onap.policy.common</groupId>
 			<artifactId>integrity-audit</artifactId>
 			<version>${common-modules.version}</version> 
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.policy.common</groupId>
-			<artifactId>ECOMP-Logging</artifactId>
+			<groupId>org.onap.policy.common</groupId>
+			<artifactId>ONAP-Logging</artifactId>
 			<version>${common-modules.version}</version>
 			<exclusions>
 				<exclusion>
diff --git a/PolicyEngineUtils/src/main/java/org/openecomp/policy/api/LoadedPolicy.java b/PolicyEngineUtils/src/main/java/org/onap/policy/api/LoadedPolicy.java
index 574580bac..25636fb45 100644
--- a/PolicyEngineUtils/src/main/java/org/openecomp/policy/api/LoadedPolicy.java
+++ b/PolicyEngineUtils/src/main/java/org/onap/policy/api/LoadedPolicy.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.api;
+package org.onap.policy.api;
 
 import java.util.Map;
 /**
@@ -49,7 +49,7 @@ public interface LoadedPolicy {
 	public Map<String, String> getMatches();
 	
 	/**
-	 * Gets the <code>UpdateType</code> of {@link org.openecomp.policy.api.UpdateType} received.
+	 * Gets the <code>UpdateType</code> of {@link org.onap.policy.api.UpdateType} received.
 	 * 
 	 * @return <code>UpdateType</code> associated with this <code>PDPNotification</code>
 	 */
diff --git a/PolicyEngineUtils/src/main/java/org/openecomp/policy/api/NotificationHandler.java b/PolicyEngineUtils/src/main/java/org/onap/policy/api/NotificationHandler.java
index 9661b72f1..6484a9d7e 100644
--- a/PolicyEngineUtils/src/main/java/org/openecomp/policy/api/NotificationHandler.java
+++ b/PolicyEngineUtils/src/main/java/org/onap/policy/api/NotificationHandler.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.api;
+package org.onap.policy.api;
 /**
  * Defines the methods which need to run when an Event or Notification is received.
  *  
@@ -28,7 +28,7 @@ public interface NotificationHandler {
 	/**
 	 * <code>notificationReceived</code> method will be triggered automatically whenever a Notification is received by the PEP.
 	 * 
-	 * @param notification <code>PDPNotification</code> of {@link org.openecomp.policy.api.PDPNotification} is the object that has information of the notification.
+	 * @param notification <code>PDPNotification</code> of {@link org.onap.policy.api.PDPNotification} is the object that has information of the notification.
 	 */
 	public void notificationReceived(PDPNotification notification);
 }
diff --git a/PolicyEngineUtils/src/main/java/org/openecomp/policy/api/NotificationType.java b/PolicyEngineUtils/src/main/java/org/onap/policy/api/NotificationType.java
index 8bd5bc8db..730ad022d 100644
--- a/PolicyEngineUtils/src/main/java/org/openecomp/policy/api/NotificationType.java
+++ b/PolicyEngineUtils/src/main/java/org/onap/policy/api/NotificationType.java
@@ -18,11 +18,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.api;
+package org.onap.policy.api;
 
 /**
  * Enumeration of the Update Type that has occurred in the <code>PDPNotification</code> of 
- * {@link org.openecomp.policy.api.PDPNotification}
+ * {@link org.onap.policy.api.PDPNotification}
  * 
  * @version 0.1
  */
diff --git a/PolicyEngineUtils/src/main/java/org/openecomp/policy/api/PDPNotification.java b/PolicyEngineUtils/src/main/java/org/onap/policy/api/PDPNotification.java
index 18da617cf..a88ec06cb 100644
--- a/PolicyEngineUtils/src/main/java/org/openecomp/policy/api/PDPNotification.java
+++ b/PolicyEngineUtils/src/main/java/org/onap/policy/api/PDPNotification.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.api;
+package org.onap.policy.api;
 
 import java.util.Collection;
 
@@ -29,21 +29,21 @@ import java.util.Collection;
  */
 public interface PDPNotification {
 	/**
-	 * Gets the <code>Collection</code> of {@link org.openecomp.policy.api.RemovedPolicy} objects received. 
+	 * Gets the <code>Collection</code> of {@link org.onap.policy.api.RemovedPolicy} objects received. 
 	 * 
 	 * @return the <code>Collection</code> which consists of <code>RemovedPolicy</code> objects.
 	 */
 	public Collection<RemovedPolicy> getRemovedPolicies();
 	
 	/**
-	 * Gets the <code>Collection</code> of {@link org.openecomp.policy.api.LoadedPolicy} objects receieved.
+	 * Gets the <code>Collection</code> of {@link org.onap.policy.api.LoadedPolicy} objects receieved.
 	 *
 	 * @return the <code>Collection</code> which consists of <code>UpdatedPolicy</code> objects.
 	 */
 	public Collection<LoadedPolicy> getLoadedPolicies();
 	
 	/**
-	 * Gets the <code>NotificationType</code> of {@link org.openecomp.policy.api.NotificationType} received.
+	 * Gets the <code>NotificationType</code> of {@link org.onap.policy.api.NotificationType} received.
 	 * 
 	 * @return <code>NotificationType</code> associated with this <code>PDPNotification</code>
 	 */
diff --git a/PolicyEngineUtils/src/main/java/org/openecomp/policy/api/PEDependency.java b/PolicyEngineUtils/src/main/java/org/onap/policy/api/PEDependency.java
index 214174197..d722f1696 100644
--- a/PolicyEngineUtils/src/main/java/org/openecomp/policy/api/PEDependency.java
+++ b/PolicyEngineUtils/src/main/java/org/onap/policy/api/PEDependency.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.api;
+package org.onap.policy.api;
 
 import org.apache.maven.model.Dependency;
 import org.apache.maven.model.Exclusion;
diff --git a/PolicyEngineUtils/src/main/java/org/openecomp/policy/api/RemovedPolicy.java b/PolicyEngineUtils/src/main/java/org/onap/policy/api/RemovedPolicy.java
index b94fdce42..f26c1499a 100644
--- a/PolicyEngineUtils/src/main/java/org/openecomp/policy/api/RemovedPolicy.java
+++ b/PolicyEngineUtils/src/main/java/org/onap/policy/api/RemovedPolicy.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.api;
+package org.onap.policy.api;
 /**
  * <code>RemovedPolicy</code> defines the Policy that has been removed 
  * 
diff --git a/PolicyEngineUtils/src/main/java/org/openecomp/policy/api/UpdateType.java b/PolicyEngineUtils/src/main/java/org/onap/policy/api/UpdateType.java
index d48121b69..deeecddd0 100644
--- a/PolicyEngineUtils/src/main/java/org/openecomp/policy/api/UpdateType.java
+++ b/PolicyEngineUtils/src/main/java/org/onap/policy/api/UpdateType.java
@@ -18,11 +18,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.api;
+package org.onap.policy.api;
 
 /**
  * Enumeration of the Update Type that has occurred in the <code>UpdatedPolicy</code> of 
- * {@link org.openecomp.policy.api.LoadedPolicy}
+ * {@link org.onap.policy.api.LoadedPolicy}
  * 
  * @version 0.1
  */
diff --git a/PolicyEngineUtils/src/main/java/org/openecomp/policy/jpa/BackUpMonitorEntity.java b/PolicyEngineUtils/src/main/java/org/onap/policy/jpa/BackUpMonitorEntity.java
index 731cfc7f7..f2e7f3ff8 100644
--- a/PolicyEngineUtils/src/main/java/org/openecomp/policy/jpa/BackUpMonitorEntity.java
+++ b/PolicyEngineUtils/src/main/java/org/onap/policy/jpa/BackUpMonitorEntity.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.jpa;
+package org.onap.policy.jpa;
 
 import java.io.Serializable;
 import java.util.Date;
diff --git a/PolicyEngineUtils/src/main/java/org/openecomp/policy/std/NotificationStore.java b/PolicyEngineUtils/src/main/java/org/onap/policy/std/NotificationStore.java
index 2f3a72946..8a401c4cc 100644
--- a/PolicyEngineUtils/src/main/java/org/openecomp/policy/std/NotificationStore.java
+++ b/PolicyEngineUtils/src/main/java/org/onap/policy/std/NotificationStore.java
@@ -18,17 +18,17 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.std;
+package org.onap.policy.std;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Iterator;
 
-import org.openecomp.policy.api.LoadedPolicy;
-import org.openecomp.policy.api.NotificationType;
-import org.openecomp.policy.api.PDPNotification;
-import org.openecomp.policy.api.RemovedPolicy;
+import org.onap.policy.api.LoadedPolicy;
+import org.onap.policy.api.NotificationType;
+import org.onap.policy.api.PDPNotification;
+import org.onap.policy.api.RemovedPolicy;
 
 
 /*
diff --git a/PolicyEngineUtils/src/main/java/org/openecomp/policy/std/StdLoadedPolicy.java b/PolicyEngineUtils/src/main/java/org/onap/policy/std/StdLoadedPolicy.java
index e11ec8ce7..c1f4fed7f 100644
--- a/PolicyEngineUtils/src/main/java/org/openecomp/policy/std/StdLoadedPolicy.java
+++ b/PolicyEngineUtils/src/main/java/org/onap/policy/std/StdLoadedPolicy.java
@@ -18,12 +18,12 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.std;
+package org.onap.policy.std;
 
 import java.util.Map;
 
-import org.openecomp.policy.api.LoadedPolicy;
-import org.openecomp.policy.api.UpdateType;
+import org.onap.policy.api.LoadedPolicy;
+import org.onap.policy.api.UpdateType;
 
 public class StdLoadedPolicy implements LoadedPolicy{
 	private String policyName = null;
diff --git a/PolicyEngineUtils/src/main/java/org/openecomp/policy/std/StdPDPNotification.java b/PolicyEngineUtils/src/main/java/org/onap/policy/std/StdPDPNotification.java
index 6a6bf23e5..fe7807185 100644
--- a/PolicyEngineUtils/src/main/java/org/openecomp/policy/std/StdPDPNotification.java
+++ b/PolicyEngineUtils/src/main/java/org/onap/policy/std/StdPDPNotification.java
@@ -18,15 +18,15 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.std;
+package org.onap.policy.std;
 
 import java.util.Collection;
 import java.util.HashSet;
 
-import org.openecomp.policy.api.LoadedPolicy;
-import org.openecomp.policy.api.NotificationType;
-import org.openecomp.policy.api.PDPNotification;
-import org.openecomp.policy.api.RemovedPolicy;
+import org.onap.policy.api.LoadedPolicy;
+import org.onap.policy.api.NotificationType;
+import org.onap.policy.api.PDPNotification;
+import org.onap.policy.api.RemovedPolicy;
 
 public class StdPDPNotification implements PDPNotification{
 	private Collection<StdRemovedPolicy> removedPolicies = null;
diff --git a/PolicyEngineUtils/src/main/java/org/openecomp/policy/std/StdRemovedPolicy.java b/PolicyEngineUtils/src/main/java/org/onap/policy/std/StdRemovedPolicy.java
index 665f3c584..bdce33a3b 100644
--- a/PolicyEngineUtils/src/main/java/org/openecomp/policy/std/StdRemovedPolicy.java
+++ b/PolicyEngineUtils/src/main/java/org/onap/policy/std/StdRemovedPolicy.java
@@ -18,9 +18,9 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.std;
+package org.onap.policy.std;
 
-import org.openecomp.policy.api.RemovedPolicy;
+import org.onap.policy.api.RemovedPolicy;
 
 public class StdRemovedPolicy implements RemovedPolicy{
 	private String policyName = null;
diff --git a/PolicyEngineUtils/src/main/java/org/openecomp/policy/utils/AAFEnvironment.java b/PolicyEngineUtils/src/main/java/org/onap/policy/utils/AAFEnvironment.java
index dd599cb85..1fccabcbd 100644
--- a/PolicyEngineUtils/src/main/java/org/openecomp/policy/utils/AAFEnvironment.java
+++ b/PolicyEngineUtils/src/main/java/org/onap/policy/utils/AAFEnvironment.java
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.utils;
+package org.onap.policy.utils;
 
 public enum AAFEnvironment {
 	/*
diff --git a/PolicyEngineUtils/src/main/java/org/openecomp/policy/utils/AAFPolicyClient.java b/PolicyEngineUtils/src/main/java/org/onap/policy/utils/AAFPolicyClient.java
index 3955e944a..e560d0ecc 100644
--- a/PolicyEngineUtils/src/main/java/org/openecomp/policy/utils/AAFPolicyClient.java
+++ b/PolicyEngineUtils/src/main/java/org/onap/policy/utils/AAFPolicyClient.java
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.utils;
+package org.onap.policy.utils;
 
 import java.lang.reflect.Method;
 import java.util.Properties;
diff --git a/PolicyEngineUtils/src/main/java/org/openecomp/policy/utils/AAFPolicyClientImpl.java b/PolicyEngineUtils/src/main/java/org/onap/policy/utils/AAFPolicyClientImpl.java
index a1c489922..0f4876051 100644
--- a/PolicyEngineUtils/src/main/java/org/openecomp/policy/utils/AAFPolicyClientImpl.java
+++ b/PolicyEngineUtils/src/main/java/org/onap/policy/utils/AAFPolicyClientImpl.java
@@ -19,7 +19,7 @@
  */
 
 
-package org.openecomp.policy.utils;
+package org.onap.policy.utils;
 
 import java.util.Properties;
 
diff --git a/PolicyEngineUtils/src/main/java/org/openecomp/policy/utils/AAFPolicyException.java b/PolicyEngineUtils/src/main/java/org/onap/policy/utils/AAFPolicyException.java
index a798b6e53..d476d2c95 100644
--- a/PolicyEngineUtils/src/main/java/org/openecomp/policy/utils/AAFPolicyException.java
+++ b/PolicyEngineUtils/src/main/java/org/onap/policy/utils/AAFPolicyException.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.utils;
+package org.onap.policy.utils;
 
 /**
  * AAFPolicyException to show exception messages. 
diff --git a/PolicyEngineUtils/src/main/java/org/openecomp/policy/utils/BackUpHandler.java b/PolicyEngineUtils/src/main/java/org/onap/policy/utils/BackUpHandler.java
index 227d0ceff..f45ba56da 100644
--- a/PolicyEngineUtils/src/main/java/org/openecomp/policy/utils/BackUpHandler.java
+++ b/PolicyEngineUtils/src/main/java/org/onap/policy/utils/BackUpHandler.java
@@ -18,24 +18,24 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.utils;
+package org.onap.policy.utils;
 
-import org.openecomp.policy.api.NotificationHandler;
-import org.openecomp.policy.api.PDPNotification;
+import org.onap.policy.api.NotificationHandler;
+import org.onap.policy.api.PDPNotification;
 
 public interface BackUpHandler extends NotificationHandler{
 	
 	/**
 	 * <code>notificationReceived</code> method will be triggered automatically whenever a Notification is received by the PEP.
 	 * 
-	 * @param notification <code>PDPNotification</code> of {@link org.openecomp.policy.api.PDPNotification} is the object that has information of the notification.
+	 * @param notification <code>PDPNotification</code> of {@link org.onap.policy.api.PDPNotification} is the object that has information of the notification.
 	 */
 	public void notificationReceived(PDPNotification notification);
 	
 	/**
 	 * <code>runOnNotification</code> method will be triggered automatically whenever a Notification is received by the PEP This needs to be the main implementation.
 	 * 
-	 * @param notification <code>PDPNotification</code> of {@link org.openecomp.policy.api.PDPNotification} is the object that has information of the notification.
+	 * @param notification <code>PDPNotification</code> of {@link org.onap.policy.api.PDPNotification} is the object that has information of the notification.
 	 */
 	public void runOnNotification(PDPNotification notification);
 }
diff --git a/PolicyEngineUtils/src/main/java/org/openecomp/policy/utils/BackUpMonitor.java b/PolicyEngineUtils/src/main/java/org/onap/policy/utils/BackUpMonitor.java
index 6f9082bc9..6fff797a6 100644
--- a/PolicyEngineUtils/src/main/java/org/openecomp/policy/utils/BackUpMonitor.java
+++ b/PolicyEngineUtils/src/main/java/org/onap/policy/utils/BackUpMonitor.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.utils;
+package org.onap.policy.utils;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -35,10 +35,10 @@ import javax.persistence.Query;
 
 import org.apache.log4j.Logger;
 import org.eclipse.persistence.config.PersistenceUnitProperties;
-import org.openecomp.policy.api.PDPNotification;
-import org.openecomp.policy.jpa.BackUpMonitorEntity;
-import org.openecomp.policy.std.NotificationStore;
-import org.openecomp.policy.std.StdPDPNotification;
+import org.onap.policy.api.PDPNotification;
+import org.onap.policy.jpa.BackUpMonitorEntity;
+import org.onap.policy.std.NotificationStore;
+import org.onap.policy.std.StdPDPNotification;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.github.fge.jackson.JsonLoader;
diff --git a/PolicyEngineUtils/src/main/java/org/openecomp/policy/utils/BusConsumer.java b/PolicyEngineUtils/src/main/java/org/onap/policy/utils/BusConsumer.java
index 9fcae39d7..bf92835c6 100644
--- a/PolicyEngineUtils/src/main/java/org/openecomp/policy/utils/BusConsumer.java
+++ b/PolicyEngineUtils/src/main/java/org/onap/policy/utils/BusConsumer.java
@@ -1,4 +1,4 @@
-package org.openecomp.policy.utils;
+package org.onap.policy.utils;
 
 import java.util.List;
 import java.util.Properties;
diff --git a/PolicyEngineUtils/src/main/java/org/openecomp/policy/utils/BusPublisher.java b/PolicyEngineUtils/src/main/java/org/onap/policy/utils/BusPublisher.java
index fe3e4f6eb..792c389ab 100644
--- a/PolicyEngineUtils/src/main/java/org/openecomp/policy/utils/BusPublisher.java
+++ b/PolicyEngineUtils/src/main/java/org/onap/policy/utils/BusPublisher.java
@@ -1,11 +1,11 @@
-package org.openecomp.policy.utils;
+package org.onap.policy.utils;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Properties;
 import java.util.concurrent.TimeUnit;
 
-import org.openecomp.policy.common.logging.eelf.PolicyLogger;
+import org.onap.policy.common.logging.eelf.PolicyLogger;
 
 import com.att.nsa.mr.client.impl.MRSimplerBatchPublisher;
 import com.att.nsa.mr.test.clients.ProtocolTypeConstants;
diff --git a/PolicyEngineUtils/src/main/java/org/openecomp/policy/utils/PolicyAccess.java b/PolicyEngineUtils/src/main/java/org/onap/policy/utils/PolicyAccess.java
index bbbffec0a..ea1514a0f 100644
--- a/PolicyEngineUtils/src/main/java/org/openecomp/policy/utils/PolicyAccess.java
+++ b/PolicyEngineUtils/src/main/java/org/onap/policy/utils/PolicyAccess.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.utils;
+package org.onap.policy.utils;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/PolicyEngineUtils/src/main/java/org/openecomp/policy/utils/PolicyUtils.java b/PolicyEngineUtils/src/main/java/org/onap/policy/utils/PolicyUtils.java
index e7639356a..82340c13c 100644
--- a/PolicyEngineUtils/src/main/java/org/openecomp/policy/utils/PolicyUtils.java
+++ b/PolicyEngineUtils/src/main/java/org/onap/policy/utils/PolicyUtils.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.utils;
+package org.onap.policy.utils;
 
 import java.io.IOException;
 import java.io.StringReader;
diff --git a/PolicyEngineUtils/src/main/resources/META-INF/persistencePU.xml b/PolicyEngineUtils/src/main/resources/META-INF/persistencePU.xml
index 147dddf8e..6cd88bf28 100644
--- a/PolicyEngineUtils/src/main/resources/META-INF/persistencePU.xml
+++ b/PolicyEngineUtils/src/main/resources/META-INF/persistencePU.xml
@@ -24,6 +24,6 @@
 	xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd">
 	<persistence-unit name="PolicyEngineUtils" transaction-type="RESOURCE_LOCAL">
 		<provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
-		<class>org.openecomp.policy.jpa.BackUpMonitorEntity</class>
+		<class>org.onap.policy.jpa.BackUpMonitorEntity</class>
 	</persistence-unit>
 </persistence>
diff --git a/PolicyEngineUtils/src/test/java/org/openecomp/policy/test/Handler.java b/PolicyEngineUtils/src/test/java/org/onap/policy/test/Handler.java
index eb811ab22..0f71858a3 100644
--- a/PolicyEngineUtils/src/test/java/org/openecomp/policy/test/Handler.java
+++ b/PolicyEngineUtils/src/test/java/org/onap/policy/test/Handler.java
@@ -18,10 +18,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.test;
+package org.onap.policy.test;
 
-import org.openecomp.policy.api.PDPNotification;
-import org.openecomp.policy.utils.BackUpHandler;
+import org.onap.policy.api.PDPNotification;
+import org.onap.policy.utils.BackUpHandler;
 
 public class Handler implements BackUpHandler{
 
diff --git a/PolicyEngineUtils/src/test/java/org/openecomp/policy/test/PolicyUtilsTest.java b/PolicyEngineUtils/src/test/java/org/onap/policy/test/PolicyUtilsTest.java
index 42481036f..50ae3feae 100644
--- a/PolicyEngineUtils/src/test/java/org/openecomp/policy/test/PolicyUtilsTest.java
+++ b/PolicyEngineUtils/src/test/java/org/onap/policy/test/PolicyUtilsTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.test;
+package org.onap.policy.test;
 
 import static org.junit.Assert.assertEquals;
 
@@ -28,13 +28,13 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.junit.Test;
-import org.openecomp.policy.api.NotificationType;
-import org.openecomp.policy.api.PDPNotification;
-import org.openecomp.policy.api.UpdateType;
-import org.openecomp.policy.std.StdLoadedPolicy;
-import org.openecomp.policy.std.StdPDPNotification;
-import org.openecomp.policy.std.StdRemovedPolicy;
-import org.openecomp.policy.utils.PolicyUtils;
+import org.onap.policy.api.NotificationType;
+import org.onap.policy.api.PDPNotification;
+import org.onap.policy.api.UpdateType;
+import org.onap.policy.std.StdLoadedPolicy;
+import org.onap.policy.std.StdPDPNotification;
+import org.onap.policy.std.StdRemovedPolicy;
+import org.onap.policy.utils.PolicyUtils;
 
 public class PolicyUtilsTest {
 	
diff --git a/PolicyEngineUtils/src/test/java/org/openecomp/policy/test/testBackUpMonitor.java b/PolicyEngineUtils/src/test/java/org/onap/policy/test/testBackUpMonitor.java
index 8763f0fca..4cdb81873 100644
--- a/PolicyEngineUtils/src/test/java/org/openecomp/policy/test/testBackUpMonitor.java
+++ b/PolicyEngineUtils/src/test/java/org/onap/policy/test/testBackUpMonitor.java
@@ -18,13 +18,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.test;
+package org.onap.policy.test;
 
 import static org.junit.Assert.assertNull;
 import java.util.Properties;
 
 import org.junit.Test;
-import org.openecomp.policy.utils.BackUpMonitor;
+import org.onap.policy.utils.BackUpMonitor;
 
 
 public class testBackUpMonitor {