1167 files changed, 6013 insertions, 6011 deletions

diff --git a/BRMSGateway/config.properties b/BRMSGateway/config.properties
index 3f6f6f63c..762f0ff1f 100644
--- a/BRMSGateway/config.properties
+++ b/BRMSGateway/config.properties
@@ -1,6 +1,6 @@
 ###
 # ============LICENSE_START=======================================================
-# ECOMP Policy Engine
+# ONAP Policy Engine
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
@@ -48,11 +48,11 @@ policyKeyID = controller
 
 ## GroupNames can be comma separated values. 
 groupNames = default, vFW , vDNS
-default.groupID = org.openecomp.policy-engine
+default.groupID = org.onap.policy-engine
 default.artifactID = drlPDPGroup
-vFW.groupID= org.openecomp.policy-engine.drools.vFW
+vFW.groupID= org.onap.policy-engine.drools.vFW
 vFW.artifactID= policy-vFW-rules
-vDNS.groupID= org.openecomp.policy-engine.drools.vDNS
+vDNS.groupID= org.onap.policy-engine.drools.vDNS
 vDNS.artifactID= policy-vDNS-rules
 
 #Integrity Monitor values
diff --git a/BRMSGateway/config/policyLogger.properties b/BRMSGateway/config/policyLogger.properties
index d3d477256..d6b0b39e7 100644
--- a/BRMSGateway/config/policyLogger.properties
+++ b/BRMSGateway/config/policyLogger.properties
@@ -1,6 +1,6 @@
 ###
 # ============LICENSE_START=======================================================
-# ECOMP Policy Engine
+# ONAP Policy Engine
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
diff --git a/BRMSGateway/policyLogger.properties b/BRMSGateway/policyLogger.properties
index d3d477256..d6b0b39e7 100644
--- a/BRMSGateway/policyLogger.properties
+++ b/BRMSGateway/policyLogger.properties
@@ -1,6 +1,6 @@
 ###
 # ============LICENSE_START=======================================================
-# ECOMP Policy Engine
+# ONAP Policy Engine
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
diff --git a/BRMSGateway/pom.xml b/BRMSGateway/pom.xml
index 5512f7ae3..b398f373d 100644
--- a/BRMSGateway/pom.xml
+++ b/BRMSGateway/pom.xml
@@ -1,6 +1,6 @@
 <!--
   ============LICENSE_START=======================================================
-  ECOMP Policy Engine
+  ONAP Policy Engine
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
   ================================================================================
@@ -22,7 +22,7 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.openecomp.policy.engine</groupId>
+		<groupId>org.onap.policy.engine</groupId>
 		<artifactId>PolicyEngineSuite</artifactId>
 		<version>1.1.0-SNAPSHOT</version>
 	</parent>
@@ -30,7 +30,7 @@
 	<description>This application will take in BRMS rules and acts as interface between PR and PDP XACML</description>
 	<dependencies>
 		<dependency>
-			<groupId>org.openecomp.policy.engine</groupId>
+			<groupId>org.onap.policy.engine</groupId>
 			<artifactId>PolicyEngineAPI</artifactId>
 			<version>${project.version}</version>
 			<exclusions>
@@ -51,7 +51,7 @@
 			<version>2.2</version>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.policy.common</groupId>
+			<groupId>org.onap.policy.common</groupId>
 			<artifactId>integrity-monitor</artifactId>
 			<version>${common-modules.version}</version>
 		</dependency>
@@ -109,7 +109,7 @@
 						<manifest>
 							<addClasspath>true</addClasspath>
 							<classpathPrefix>lib/</classpathPrefix>
-							<mainClass>org.openecomp.policy.brmsInterface.BRMSGateway</mainClass>
+							<mainClass>org.onap.policy.brmsInterface.BRMSGateway</mainClass>
 						</manifest>
 					</archive>
 					<descriptorRefs>
diff --git a/BRMSGateway/src/main/java/org/openecomp/policy/brmsInterface/BRMSGateway.java b/BRMSGateway/src/main/java/org/onap/policy/brmsInterface/BRMSGateway.java
index 88810fb83..0b4058d59 100644
--- a/BRMSGateway/src/main/java/org/openecomp/policy/brmsInterface/BRMSGateway.java
+++ b/BRMSGateway/src/main/java/org/onap/policy/brmsInterface/BRMSGateway.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,20 +18,20 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.brmsInterface;
+package org.onap.policy.brmsInterface;
 
-import org.openecomp.policy.api.NotificationScheme;
-import org.openecomp.policy.api.PolicyEngine;
+import org.onap.policy.api.NotificationScheme;
+import org.onap.policy.api.PolicyEngine;
 
 //import org.apache.log4j.Logger;
 
 //import org.apache.commons.logging.Log;
 //import org.apache.commons.logging.LogFactory;
 
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
 
-import org.openecomp.policy.xacml.api.XACMLErrorConstants;
+import org.onap.policy.xacml.api.XACMLErrorConstants;
 
 
 /**
diff --git a/BRMSGateway/src/main/java/org/openecomp/policy/brmsInterface/BRMSHandler.java b/BRMSGateway/src/main/java/org/onap/policy/brmsInterface/BRMSHandler.java
index f5f78a970..305f64de1 100644
--- a/BRMSGateway/src/main/java/org/openecomp/policy/brmsInterface/BRMSHandler.java
+++ b/BRMSGateway/src/main/java/org/onap/policy/brmsInterface/BRMSHandler.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,24 +18,24 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.brmsInterface;
+package org.onap.policy.brmsInterface;
 
 import java.util.ArrayList;
 import java.util.Collection;
 
-import org.openecomp.policy.api.ConfigRequestParameters;
-import org.openecomp.policy.api.LoadedPolicy;
-import org.openecomp.policy.api.NotificationType;
-import org.openecomp.policy.api.PDPNotification;
-import org.openecomp.policy.api.PolicyConfig;
-import org.openecomp.policy.api.PolicyConfigStatus;
-import org.openecomp.policy.api.PolicyEngine;
-import org.openecomp.policy.api.PolicyException;
-import org.openecomp.policy.api.RemovedPolicy;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.utils.BackUpHandler;
-import org.openecomp.policy.xacml.api.XACMLErrorConstants;
+import org.onap.policy.api.ConfigRequestParameters;
+import org.onap.policy.api.LoadedPolicy;
+import org.onap.policy.api.NotificationType;
+import org.onap.policy.api.PDPNotification;
+import org.onap.policy.api.PolicyConfig;
+import org.onap.policy.api.PolicyConfigStatus;
+import org.onap.policy.api.PolicyEngine;
+import org.onap.policy.api.PolicyException;
+import org.onap.policy.api.RemovedPolicy;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.utils.BackUpHandler;
+import org.onap.policy.xacml.api.XACMLErrorConstants;
 
 /**
  * BRMSHandler: Notification Handler which listens for PDP Notifications. 
@@ -60,7 +60,7 @@ public class BRMSHandler implements BackUpHandler{
 	/*
 	 * This Method is executed upon notification by the Policy Engine API Notification. 
 	 * (non-Javadoc)
-	 * @see org.openecomp.policy.utils.BackUpHandler#notificationReceived(org.openecomp.policy.api.PDPNotification)
+	 * @see org.onap.policy.utils.BackUpHandler#notificationReceived(org.onap.policy.api.PDPNotification)
 	 */
 	@Override
 	public void notificationReceived(PDPNotification notification) {
@@ -115,7 +115,7 @@ public class BRMSHandler implements BackUpHandler{
 	/*
 	 * This method is executed if BRMSGW is "MASTER" 
 	 * (non-Javadoc)
-	 * @see org.openecomp.policy.utils.BackUpHandler#runOnNotification(org.openecomp.policy.api.PDPNotification)
+	 * @see org.onap.policy.utils.BackUpHandler#runOnNotification(org.onap.policy.api.PDPNotification)
 	 */
 	public void runOnNotification(PDPNotification notification){
 		if(notification.getNotificationType().equals(NotificationType.REMOVE)){
diff --git a/BRMSGateway/src/main/java/org/openecomp/policy/brmsInterface/BRMSPush.java b/BRMSGateway/src/main/java/org/onap/policy/brmsInterface/BRMSPush.java
index def57e2bc..c24493882 100644
--- a/BRMSGateway/src/main/java/org/openecomp/policy/brmsInterface/BRMSPush.java
+++ b/BRMSGateway/src/main/java/org/onap/policy/brmsInterface/BRMSPush.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.brmsInterface;
+package org.onap.policy.brmsInterface;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -68,22 +68,22 @@ import org.apache.maven.shared.invoker.Invoker;
 import org.codehaus.plexus.util.IOUtil;
 import org.codehaus.plexus.util.WriterFactory;
 import org.eclipse.persistence.config.PersistenceUnitProperties;
-import org.openecomp.policy.api.PEDependency;
-import org.openecomp.policy.api.PolicyException;
-import org.openecomp.policy.brmsInterface.jpa.BRMSGroupInfo;
-import org.openecomp.policy.brmsInterface.jpa.BRMSPolicyInfo;
-import org.openecomp.policy.brmsInterface.jpa.DependencyInfo;
-import org.openecomp.policy.common.im.AdministrativeStateException;
-import org.openecomp.policy.common.im.IntegrityMonitor;
-import org.openecomp.policy.common.logging.eelf.MessageCodes;
-import org.openecomp.policy.common.logging.eelf.PolicyLogger;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.utils.BackUpHandler;
-import org.openecomp.policy.utils.BackUpMonitor;
-import org.openecomp.policy.utils.BusPublisher;
-import org.openecomp.policy.utils.PolicyUtils;
-import org.openecomp.policy.xacml.api.XACMLErrorConstants;
+import org.onap.policy.api.PEDependency;
+import org.onap.policy.api.PolicyException;
+import org.onap.policy.brmsInterface.jpa.BRMSGroupInfo;
+import org.onap.policy.brmsInterface.jpa.BRMSPolicyInfo;
+import org.onap.policy.brmsInterface.jpa.DependencyInfo;
+import org.onap.policy.common.im.AdministrativeStateException;
+import org.onap.policy.common.im.IntegrityMonitor;
+import org.onap.policy.common.logging.eelf.MessageCodes;
+import org.onap.policy.common.logging.eelf.PolicyLogger;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.utils.BackUpHandler;
+import org.onap.policy.utils.BackUpMonitor;
+import org.onap.policy.utils.BusPublisher;
+import org.onap.policy.utils.PolicyUtils;
+import org.onap.policy.xacml.api.XACMLErrorConstants;
 import org.sonatype.nexus.client.NexusClient;
 import org.sonatype.nexus.client.NexusClientException;
 import org.sonatype.nexus.client.NexusConnectionException;
diff --git a/BRMSGateway/src/main/java/org/openecomp/policy/brmsInterface/ControllerPOJO.java b/BRMSGateway/src/main/java/org/onap/policy/brmsInterface/ControllerPOJO.java
index 546925bdf..5a0679c29 100644
--- a/BRMSGateway/src/main/java/org/openecomp/policy/brmsInterface/ControllerPOJO.java
+++ b/BRMSGateway/src/main/java/org/onap/policy/brmsInterface/ControllerPOJO.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.brmsInterface;
+package org.onap.policy.brmsInterface;
 
 import java.util.Map;
 
diff --git a/BRMSGateway/src/main/java/org/openecomp/policy/brmsInterface/NotificationPOJO.java b/BRMSGateway/src/main/java/org/onap/policy/brmsInterface/NotificationPOJO.java
index 116a7b41f..75bbe8a4e 100644
--- a/BRMSGateway/src/main/java/org/openecomp/policy/brmsInterface/NotificationPOJO.java
+++ b/BRMSGateway/src/main/java/org/onap/policy/brmsInterface/NotificationPOJO.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.brmsInterface;
+package org.onap.policy.brmsInterface;
 
 import java.util.List;
 
diff --git a/BRMSGateway/src/main/java/org/openecomp/policy/brmsInterface/jpa/BRMSGroupInfo.java b/BRMSGateway/src/main/java/org/onap/policy/brmsInterface/jpa/BRMSGroupInfo.java
index 1c4895080..6b4a2bf85 100644
--- a/BRMSGateway/src/main/java/org/openecomp/policy/brmsInterface/jpa/BRMSGroupInfo.java
+++ b/BRMSGateway/src/main/java/org/onap/policy/brmsInterface/jpa/BRMSGroupInfo.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.brmsInterface.jpa;
+package org.onap.policy.brmsInterface.jpa;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
diff --git a/BRMSGateway/src/main/java/org/openecomp/policy/brmsInterface/jpa/BRMSPolicyInfo.java b/BRMSGateway/src/main/java/org/onap/policy/brmsInterface/jpa/BRMSPolicyInfo.java
index 5bc272872..c269e295a 100644
--- a/BRMSGateway/src/main/java/org/openecomp/policy/brmsInterface/jpa/BRMSPolicyInfo.java
+++ b/BRMSGateway/src/main/java/org/onap/policy/brmsInterface/jpa/BRMSPolicyInfo.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.brmsInterface.jpa;
+package org.onap.policy.brmsInterface.jpa;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
diff --git a/BRMSGateway/src/main/java/org/openecomp/policy/brmsInterface/jpa/DependencyInfo.java b/BRMSGateway/src/main/java/org/onap/policy/brmsInterface/jpa/DependencyInfo.java
index 2d28cc21e..753de5219 100644
--- a/BRMSGateway/src/main/java/org/openecomp/policy/brmsInterface/jpa/DependencyInfo.java
+++ b/BRMSGateway/src/main/java/org/onap/policy/brmsInterface/jpa/DependencyInfo.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,12 +17,12 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.brmsInterface.jpa;
+package org.onap.policy.brmsInterface.jpa;
 
 import java.util.List;
 import java.util.Map;
 
-import org.openecomp.policy.api.PEDependency;
+import org.onap.policy.api.PEDependency;
 
 public class DependencyInfo {
 	private Map<String, List<PEDependency>> dependencies;
diff --git a/BRMSGateway/src/main/resources/META-INF/persistenceBRMS.xml b/BRMSGateway/src/main/resources/META-INF/persistenceBRMS.xml
index 446e734a0..99e6b92c9 100644
--- a/BRMSGateway/src/main/resources/META-INF/persistenceBRMS.xml
+++ b/BRMSGateway/src/main/resources/META-INF/persistenceBRMS.xml
@@ -24,7 +24,7 @@
 	xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd">
 	<persistence-unit name="BRMSGW" transaction-type="RESOURCE_LOCAL">
 		<provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
-		<class>org.openecomp.policy.brmsInterface.jpa.BRMSGroupInfo</class>
-		<class>org.openecomp.policy.brmsInterface.jpa.BRMSPolicyInfo</class>
+		<class>org.onap.policy.brmsInterface.jpa.BRMSGroupInfo</class>
+		<class>org.onap.policy.brmsInterface.jpa.BRMSPolicyInfo</class>
 	</persistence-unit>
 </persistence>
\ No newline at end of file
diff --git a/BRMSGateway/src/main/resources/log4j.properties b/BRMSGateway/src/main/resources/log4j.properties
index 71f359644..9ec89ea0a 100644
--- a/BRMSGateway/src/main/resources/log4j.properties
+++ b/BRMSGateway/src/main/resources/log4j.properties
@@ -1,6 +1,6 @@
 ###
 # ============LICENSE_START=======================================================
-# ECOMP Policy Engine
+# ONAP Policy Engine
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
diff --git a/BRMSGateway/src/main/resources/logback.xml b/BRMSGateway/src/main/resources/logback.xml
index 2cae6c8f2..3fa0a65c4 100644
--- a/BRMSGateway/src/main/resources/logback.xml
+++ b/BRMSGateway/src/main/resources/logback.xml
@@ -1,6 +1,6 @@
 <!--
   ============LICENSE_START=======================================================
-  ECOMP Policy Engine
+  ONAP Policy Engine
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
   ================================================================================
@@ -27,7 +27,7 @@
   <property name="debugDir" value="logs" />
   
   <!--  specify the component name 
-    <ECOMP-component-name>::= "MSO" | "DCAE" | "ASDC " | "AAI" |"Policy" | "SDNC" | "AC"  -->
+    <ONAP-component-name>::= "MSO" | "DCAE" | "ASDC " | "AAI" |"Policy" | "SDNC" | "AC"  -->
   <property name="componentName" value="Policy"></property>
   <property name="subComponentName" value="BRMSGateway"></property>
   
diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/components/package-info.java b/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/components/package-info.java
deleted file mode 100644
index 007f08d36..000000000
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/components/package-info.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ECOMP-PAP-REST
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.policy.pap.xacml.rest.components;
diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/package-info.java b/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/package-info.java
deleted file mode 100644
index 049f3c72c..000000000
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/package-info.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ECOMP-PAP-REST
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-
-package org.openecomp.policy.pap.xacml.rest.controller;
diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/policycontroller/package-info.java b/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/policycontroller/package-info.java
deleted file mode 100644
index 4eacd4b76..000000000
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/policycontroller/package-info.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ECOMP-PAP-REST
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-package org.openecomp.policy.pap.xacml.rest.policycontroller;
\ No newline at end of file
diff --git a/ECOMP-PAP-REST/src/main/resources/META-INF/persistence.xml b/ECOMP-PAP-REST/src/main/resources/META-INF/persistence.xml
deleted file mode 100644
index 1d7692a3d..000000000
--- a/ECOMP-PAP-REST/src/main/resources/META-INF/persistence.xml
+++ /dev/null
@@ -1,201 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============LICENSE_START=======================================================
-  ECOMP-PAP-REST
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ============LICENSE_END=========================================================
-  -->
-<persistence version="2.1" xmlns="http://xmlns.jcp.org/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd">
-	<persistence-unit name="XACML-PAP-REST">
-		<class>org.openecomp.policy.rest.jpa.PolicyEntity</class>
-		<class>org.openecomp.policy.rest.jpa.ConfigurationDataEntity</class>		
-		<class>org.openecomp.policy.rest.jpa.PolicyDBDaoEntity</class>
-		<class>org.openecomp.policy.rest.jpa.GroupEntity</class>
-		<class>org.openecomp.policy.rest.jpa.PdpEntity</class>
-		<class>org.openecomp.policy.rest.jpa.ActionBodyEntity</class>
-		<class>org.openecomp.policy.rest.jpa.DatabaseLockEntity</class>
-		<class>org.openecomp.policy.rest.jpa.PolicyVersion</class>
-		<class>org.openecomp.policy.rest.jpa.PolicyScore</class>
-		<class>org.openecomp.policy.rest.jpa.FunctionDefinition</class>
-		<class>org.openecomp.policy.rest.jpa.Attribute</class>
-		<class>org.openecomp.policy.rest.jpa.Category</class>
-		<class>org.openecomp.policy.rest.jpa.ConstraintType</class>
-		<class>org.openecomp.policy.rest.jpa.ConstraintValue</class>
-		<class>org.openecomp.policy.rest.jpa.Datatype</class>
-		<class>org.openecomp.policy.rest.jpa.FunctionArgument</class>
-		<class>org.openecomp.policy.rest.jpa.UserInfo</class>
-		<class>org.openecomp.policy.rest.jpa.ActionPolicyDict</class>
-		<class>org.openecomp.policy.rest.jpa.DecisionSettings</class>
-		<class>org.openecomp.policy.rest.jpa.MicroServiceModels</class>
-		<class>org.openecomp.policy.rest.jpa.BRMSParamTemplate</class>
-		<class>org.openecomp.policy.rest.jpa.PolicyEditorScopes</class>
-		<!-- unique to PolicyEngineUtils - will be audited from PAP -->
-		<class>org.openecomp.policy.jpa.BackUpMonitorEntity</class>
-		<!-- unique to integrity-monitor - will be audited from PAP -->
-		<class>org.openecomp.policy.common.im.jpa.StateManagementEntity</class>
-		<class>org.openecomp.policy.common.im.jpa.ForwardProgressEntity</class>
-		<class>org.openecomp.policy.common.im.jpa.ResourceRegistrationEntity</class>
-		<!-- unique to integrity-audit - will be audited from PAP -->
-		<class>org.openecomp.policy.common.ia.jpa.IntegrityAuditEntity</class>
-		<exclude-unlisted-classes>false</exclude-unlisted-classes>
-		<shared-cache-mode>NONE</shared-cache-mode>
-		<properties>
-	<!--	The properties defined below are the default settings to be used when someone initially
-				wants to start working with the XACML-PAP-ADMIN web gui. They are not intended for production
-				use.
-				
-				They are setup to drop and create the tables and then load an initial set of data into the database
-				every time the application is deployed. So if you add anything to the dictionaries or PIP
-				configuration, they will get lost upon each deployment. It uses an H2 database engine configured
-				for a local file so you don't have to setup you're own SQL database environment to start.
-				
-				Instead of modifying this file directly, please refer to the xacml.admin.properties file for
-				customizing the application settings.
-				
-			 -->
-	<!--     <property name="javax.persistence.schema-generation.database.action" value="drop-and-create"/>
-			<property name="javax.persistence.schema-generation.create-source" value="metadata-then-script"/>
-			<property name="javax.persistence.schema-generation.create-script-source" value="META-INF/views.sql" />
-			<property name="javax.persistence.schema-generation.drop-source" value="script"/>
-			<property name="javax.persistence.schema-generation.drop-script-source" value="META-INF/drop.sql" />
-			<property name="javax.persistence.sql-load-script-source" value="META-INF/data.sql" />-->
-			
-			
-			
-		<!-- 	These properties should be set in the xacml.admin.properties file, so they can be re-used by non-JPA
-			database functionality.	 -->
-		<!-- 	
-			<property name="javax.persistence.jdbc.driver" value="org.h2.Driver"/>
-			<property name="javax.persistence.jdbc.url" value="jdbc:h2:file:sql/xacml"/>
-			<property name="javax.persistence.jdbc.user" value="sa"/>
-			<property name="javax.persistence.jdbc.password" value=""/>
- 			-->
-		</properties>
-	</persistence-unit>
-
-<persistence-unit name="auditPapPU">
-		<!-- This is the persistence unit used by IntegrityAudit to determine
-		which classes to audit.  All the PAP classes are also included in 
-		XACML-PAP-ADMIN, so they will be audited there rather than having a
-		duplicate audit run from the XACL-PAP-REST node -->
-		<!-- unique to PolicyEngineUtils - will be audited from PAP -->
-		<class>org.openecomp.policy.jpa.BackUpMonitorEntity</class>
-		<!-- unique to integrity-monitor - will be audited from PAP -->
-		<class>org.openecomp.policy.common.im.jpa.StateManagementEntity</class>
-		<class>org.openecomp.policy.common.im.jpa.ForwardProgressEntity</class>
-		<class>org.openecomp.policy.common.im.jpa.ResourceRegistrationEntity</class>
-		<!-- unique to integrity-audit - will be audited from PAP -->
-		<class>org.openecomp.policy.common.ia.jpa.IntegrityAuditEntity</class>
-		<exclude-unlisted-classes>true</exclude-unlisted-classes>
-		<shared-cache-mode>NONE</shared-cache-mode>
-	</persistence-unit>
-
-	<persistence-unit name="testPapPU" transaction-type="RESOURCE_LOCAL">
-	<!-- This tests all the classes that will be audited in the XACML-PAP-REST and the XACML-PAP_ADMIN -->
-		<!-- XACML-PAP-REST -->
-        <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
-		<class>org.openecomp.policy.rest.jpa.PolicyEntity</class>
-		<class>org.openecomp.policy.rest.jpa.ConfigurationDataEntity</class>		
-		<class>org.openecomp.policy.rest.jpa.PolicyDBDaoEntity</class>
-		<class>org.openecomp.policy.rest.jpa.GroupEntity</class>
-		<class>org.openecomp.policy.rest.jpa.PdpEntity</class>
-		<class>org.openecomp.policy.rest.jpa.ActionBodyEntity</class>
-		<class>org.openecomp.policy.rest.jpa.DatabaseLockEntity</class>
-		<class>org.openecomp.policy.rest.jpa.PolicyVersion</class>
-		<class>org.openecomp.policy.rest.jpa.PolicyScore</class>
-		<class>org.openecomp.policy.rest.jpa.FunctionDefinition</class>
-		<class>org.openecomp.policy.rest.jpa.Attribute</class>
-		<class>org.openecomp.policy.rest.jpa.Category</class>
-		<class>org.openecomp.policy.rest.jpa.ConstraintType</class>
-		<class>org.openecomp.policy.rest.jpa.ConstraintValue</class>
-		<class>org.openecomp.policy.rest.jpa.Datatype</class>
-		<class>org.openecomp.policy.rest.jpa.FunctionArgument</class>
-		<class>org.openecomp.policy.rest.jpa.UserInfo</class>
-		<class>org.openecomp.policy.rest.jpa.ActionPolicyDict</class>
-		<class>org.openecomp.policy.rest.jpa.DecisionSettings</class>
-		<class>org.openecomp.policy.rest.jpa.MicroServiceModels</class>
-		<!-- unique to XACML-PAP-ADMIN -->
-		<class>org.openecomp.policy.rest.jpa.ActionList</class>
-		<class>org.openecomp.policy.rest.jpa.AddressGroup</class>
-		<class>org.openecomp.policy.rest.jpa.AttributeAssignment</class>
-		<class>org.openecomp.policy.rest.jpa.BRMSParamTemplate</class>
-		<class>org.openecomp.policy.rest.jpa.ClosedLoopD2Services</class>
-		<class>org.openecomp.policy.rest.jpa.ClosedLoopSite</class>
-		<class>org.openecomp.policy.rest.jpa.DCAEUsers</class>
-		<class>org.openecomp.policy.rest.jpa.DCAEuuid</class>
-		<class>org.openecomp.policy.rest.jpa.DescriptiveScope</class>
-		<class>org.openecomp.policy.rest.jpa.EcompName</class>
-		<class>org.openecomp.policy.rest.jpa.EnforcingType</class>
-		<class>org.openecomp.policy.rest.jpa.GlobalRoleSettings</class>
-		<class>org.openecomp.policy.rest.jpa.GroupPolicyScopeList</class>
-		<class>org.openecomp.policy.rest.jpa.GroupServiceList</class>
-		<class>org.openecomp.policy.rest.jpa.MicroServiceConfigName</class>
-		<class>org.openecomp.policy.rest.jpa.MicroServiceLocation</class>
-		<class>org.openecomp.policy.rest.jpa.Obadvice</class>
-		<class>org.openecomp.policy.rest.jpa.ObadviceExpression</class>
-		<class>org.openecomp.policy.rest.jpa.PEPOptions</class>
-		<class>org.openecomp.policy.rest.jpa.PIPConfigParam</class>
-		<class>org.openecomp.policy.rest.jpa.PIPConfiguration</class>
-		<class>org.openecomp.policy.rest.jpa.PIPResolver</class>
-		<class>org.openecomp.policy.rest.jpa.PIPResolverParam</class>
-		<class>org.openecomp.policy.rest.jpa.PIPType</class>	
-		<class>org.openecomp.policy.rest.jpa.PolicyAlgorithms</class>
-		<class>org.openecomp.policy.rest.jpa.PolicyManagement</class>
-		<class>org.openecomp.policy.rest.jpa.PolicyScopeService</class>
-		<class>org.openecomp.policy.rest.jpa.PolicyScopeType</class>
-		<class>org.openecomp.policy.rest.jpa.PolicyScopeResource</class>
-		<class>org.openecomp.policy.rest.jpa.PolicyScopeClosedLoop</class>
-		<class>org.openecomp.policy.rest.jpa.PortList</class>
-		<class>org.openecomp.policy.rest.jpa.PREFIXLIST</class>
-		<class>org.openecomp.policy.rest.jpa.ProtocolList</class>
-		<class>org.openecomp.policy.rest.jpa.RemoteCatalogValues</class>
-		<class>org.openecomp.policy.rest.jpa.PolicyRoles</class>
-		<class>org.openecomp.policy.rest.jpa.RuleAlgorithms</class>
-		<class>org.openecomp.policy.rest.jpa.SecurityZone</class>
-		<class>org.openecomp.policy.rest.jpa.ServiceList</class>
-		<class>org.openecomp.policy.rest.jpa.SystemLogDB</class>
-		<class>org.openecomp.policy.rest.jpa.TermList</class>
-		<class>org.openecomp.policy.rest.jpa.VarbindDictionary</class>
-		<class>org.openecomp.policy.rest.jpa.VMType</class>
-		<class>org.openecomp.policy.rest.jpa.VNFType</class>
-		<class>org.openecomp.policy.rest.jpa.VSCLAction</class>
-		<class>org.openecomp.policy.rest.jpa.Zone</class>
-		<!-- unique to PolicyEngineUtils -->
-		<class>org.openecomp.policy.jpa.BackUpMonitorEntity</class>
-		<!-- unique to integrity-monitor -->
-		<class>org.openecomp.policy.common.im.jpa.StateManagementEntity</class>
-		<class>org.openecomp.policy.common.im.jpa.ForwardProgressEntity</class>
-		<class>org.openecomp.policy.common.im.jpa.ResourceRegistrationEntity</class>
-		<!-- unique to integrity-audit -->
-		<class>org.openecomp.policy.common.ia.jpa.IntegrityAuditEntity</class>
-		
-		<exclude-unlisted-classes>false</exclude-unlisted-classes>
-		<shared-cache-mode>NONE</shared-cache-mode>	        
-        <properties>
-            <property name="javax.persistence.jdbc.driver" value="org.h2.Driver"/>
-            <property name="javax.persistence.jdbc.url" value="jdbc:h2:file:./sql/xacmlTest"/> <!-- ;MODE=MySQL"/> -->
-            <property name="javax.persistence.jdbc.user" value="sa"/>
-            <property name="javax.persistence.jdbc.password" value=""/>
-            <property name="javax.persistence.schema-generation.scripts.action" value="drop-and-create"/>
-            <property name="javax.persistence.schema-generation.scripts.create-target" value="./src/main/resources/META-INF/generatedCreate.ddl"/>
-            <property name="javax.persistence.schema-generation.scripts.drop-target" value="./src/main/resources/META-INF/generatedDrop.ddl"/>
-            <property name="javax.persistence.schema-generation.database.action" value="drop-and-create"/>
-			<property name="javax.persistence.schema-generation.create-source" value="metadata-then-script"/>
-			<property name="javax.persistence.schema-generation.drop-source" value="script"/>
-			<property name="javax.persistence.schema-generation.drop-script-source" value="META-INF/drop.ddl" />
-        </properties>
-    </persistence-unit>	
-</persistence>
diff --git a/ECOMP-PDP-REST/policyLogger.properties b/ECOMP-PDP-REST/policyLogger.properties
deleted file mode 100644
index d4e9525b8..000000000
--- a/ECOMP-PDP-REST/policyLogger.properties
+++ /dev/null
@@ -1,44 +0,0 @@
-###
-# ============LICENSE_START=======================================================
-# ECOMP-PDP-REST
-# ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
-# ================================================================================
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-# 
-#      http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ============LICENSE_END=========================================================
-###
-
-################################### Set concurrentHashMap and timer info  #######################
-#Timer initial delay and the delay between in milliseconds before task is to be execute.
-timer.delay.time=1000
-#Timer scheduleAtFixedRate period - time in milliseconds between successive task executions.
-check.interval= 30000
-#Longest time an event info can be stored in the concurrentHashMap for logging - in seconds. 
-event.expired.time=86400
-#Size of the concurrentHashMap which stores the event starting time, etc - when its size reaches this limit, the Timer gets executed 
-#to remove all expired records from this concurrentHashMap.
-concurrentHashMap.limit=5000
-#Size of the concurrentHashMap - when its size drops to this point, stop the Timer
-stop.check.point=2500
-################################### Set logging format #############################################
-# set EELF for EELF logging format, set LOG4J for using log4j, set SYSTEMOUT for using system.out.println
-logger.type=EELF
-#################################### Set level for EELF or SYSTEMOUT logging ##################################
-# Set level for debug file. Set DEBUG to enable .info, .warn and .debug; set INFO for enable .info and .warn; set OFF to disable all 
-debugLogger.level=INFO
-# Set level for metrics file. Set OFF to disable; set ON to enable
-metricsLogger.level=ON
-# Set level for error file. Set OFF to disable; set ON to enable
-error.level=ON
-# Set level for audit file. Set OFF to disable; set ON to enable
-audit.level=ON
diff --git a/ECOMP-SDK-APP/policyLogger.properties b/ECOMP-SDK-APP/policyLogger.properties
deleted file mode 100644
index 0deb1b3d6..000000000
--- a/ECOMP-SDK-APP/policyLogger.properties
+++ /dev/null
@@ -1,44 +0,0 @@
-###
-# ============LICENSE_START=======================================================
-# ECOMP Policy Engine
-# ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
-# ================================================================================
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-# 
-#      http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ============LICENSE_END=========================================================
-###
-
-################################### Set concurrentHashMap and timer info  #######################
-#Timer initial delay and the delay between in milliseconds before task is to be execute.
-timer.delay.time=1000
-#Timer scheduleAtFixedRate period - time in milliseconds between successive task executions.
-check.interval= 30000
-#Longest time an event info can be stored in the concurrentHashMap for logging - in seconds. 
-event.expired.time=86400
-#Size of the concurrentHashMap which stores the event starting time, etc - when its size reaches this limit, the Timer gets executed 
-#to remove all expired records from this concurrentHashMap.
-concurrentHashMap.limit=5000
-#Size of the concurrentHashMap - when its size drops to this point, stop the Timer
-stop.check.point=2500
-################################### Set logging format #############################################
-# set EELF for EELF logging format, set LOG4J for using log4j, set SYSTEMOUT for using system.out.println
-logger.type=EELF
-#################################### Set level for EELF or SYSTEMOUT logging ##################################
-# Set level for debug file. Set DEBUG to enable .info, .warn and .debug; set INFO for enable .info and .warn; set OFF to disable all 
-debugLogger.level=INFO
-# Set level for metrics file. Set OFF to disable; set ON to enable
-metricsLogger.level=ON
-# Set level for error file. Set OFF to disable; set ON to enable
-error.level=ON
-# Set level for audit file. Set OFF to disable; set ON to enable
-audit.level=ON
diff --git a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/html/data/worddata.csv b/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/html/data/worddata.csv
deleted file mode 100644
index 762cb4237..000000000
--- a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/html/data/worddata.csv
+++ /dev/null
@@ -1 +0,0 @@
-text,frequency
service,98
portal,70
management,70
virtual,56
design,56
VNF,56
studio,42
operations,42
inventory,42
POLO,42
D2.0,42
ASDC,42
router,28
restart,28
process,28
platform,28
manage,28
loop,28
licensing,28
license,28
integrated,28
flow-through,28
enable,28
data,28
controller,28
control,28
configure,28
component,28
common,28
asset,28
application,28
ECOMP,28
workflow,14
waterfall,14
visual,14
view,14
vCTS,14
utilization,14
user,14
usage,14
troubleshoot,14
transformation,14
track,14
topolgies,14
topics,14
time,14
tickets,14
thresholds,14
templates,14
structures,14
standards-based,14
software,14
reuse,14
repository,14
reports,14
release,14
recipes,14
real-time,14
provisioning,14
properties,14
project-based,14
processes,14
physical,14
oversight,14
openl-loop,14
network,14
monitor,14
modeling,14
model-driven,14
model,14
message,14
maximize,14
manually,14
machine,14
layer,14
interact,14
instances,14
initiate,14
increase,14
imported,14
impacts,14
host,14
function,14
feeds,14
features,14
faults,14
extended,14
engines,14
engine,14
dynamic,14
document-driven,14
determine,14
dashboard,14
current,14
creation,14
created,14
create,14
configuration,14
composer,14
components,14
collective,14
certification,14
bus,14
basis,14
available,14
automation,14
automated,14
associated,14
assignment,14
appropriate,14
against,14
aervice,14
adminstrators,14
activation,14
action,14
VMs,14
VM,14
VLAN,14
SDN,14
SDK,14
SBG,14
SAM,14
RUBY,14
Policy,14
PODS,14
Ops,14
GFP,14
F5FW,14
DMaaP,14
DCAE,14
DBC,14
CPADS,14
AT&T,14
APP-C,14
AOTS-TM,14
ALTS,14
A&AI,14
diff --git a/LogParser/parserlog.properties b/LogParser/parserlog.properties
index caac6c378..4a5ecdb9c 100644
--- a/LogParser/parserlog.properties
+++ b/LogParser/parserlog.properties
@@ -21,7 +21,7 @@
 #Health Check Values
 RESOURCE_NAME=logparser_pap01
 javax.persistence.jdbc.driver=com.mysql.jdbc.Driver
-javax.persistence.jdbc.url=jdbc:mysql://localhost:3306/ecomp_sdk
+javax.persistence.jdbc.url=jdbc:mysql://localhost:3306/onap_sdk
 javax.persistence.jdbc.user=policy_user
 javax.persistence.jdbc.password=policy_user
 
diff --git a/LogParser/pom.xml b/LogParser/pom.xml
index 81784b8a2..44bb8fe7f 100644
--- a/LogParser/pom.xml
+++ b/LogParser/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   ============LICENSE_START=======================================================
-  ECOMP Policy Engine
+  ONAP Policy Engine
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
   ================================================================================
@@ -24,7 +24,7 @@
 	<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>
@@ -47,7 +47,7 @@
 			<version>1.2.3</version>
 		</dependency>  
 		<dependency>
-			<groupId>org.openecomp.policy.common</groupId>
+			<groupId>org.onap.policy.common</groupId>
 			<artifactId>integrity-monitor</artifactId>
 			<version>${common-modules.version}</version>
 			<exclusions>
@@ -107,7 +107,7 @@
 						<manifest>
 							<addClasspath>true</addClasspath>
 							<classpathPrefix>lib/</classpathPrefix>
-							<mainClass>org.openecomp.xacml.parser.ParseLog</mainClass>
+							<mainClass>org.onap.xacml.parser.ParseLog</mainClass>
 						</manifest>
 					</archive>
 					<descriptorRefs>
diff --git a/LogParser/src/main/java/org/openecomp/xacml/parser/LogEntryObject.java b/LogParser/src/main/java/org/onap/xacml/parser/LogEntryObject.java
index 3b1ccffc5..1aeac1726 100644
--- a/LogParser/src/main/java/org/openecomp/xacml/parser/LogEntryObject.java
+++ b/LogParser/src/main/java/org/onap/xacml/parser/LogEntryObject.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.xacml.parser;
+package org.onap.xacml.parser;
 
 import java.util.Date;
 
diff --git a/LogParser/src/main/java/org/openecomp/xacml/parser/ParseLog.java b/LogParser/src/main/java/org/onap/xacml/parser/ParseLog.java
index b0a5f677d..31eceb09d 100644
--- a/LogParser/src/main/java/org/openecomp/xacml/parser/ParseLog.java
+++ b/LogParser/src/main/java/org/onap/xacml/parser/ParseLog.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.xacml.parser;
+package org.onap.xacml.parser;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -45,11 +45,11 @@ import java.util.regex.Pattern;
 import java.util.stream.Stream;
 
 import org.apache.log4j.Logger;
-import org.openecomp.policy.common.im.AdministrativeStateException;
-import org.openecomp.policy.common.im.IntegrityMonitor;
-import org.openecomp.policy.common.im.StandbyStatusException;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.xacml.parser.LogEntryObject.LOGTYPE;
+import org.onap.policy.common.im.AdministrativeStateException;
+import org.onap.policy.common.im.IntegrityMonitor;
+import org.onap.policy.common.im.StandbyStatusException;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.xacml.parser.LogEntryObject.LOGTYPE;
 
 /**
  * Parse log files and store the information in a H2 database.
@@ -62,7 +62,7 @@ public class ParseLog {
 	private static final Logger log4jlogger = Logger.getLogger(ParseLog.class.getName());
 
 	// processing logging 
-	private static org.openecomp.policy.common.logging.flexlogger.Logger logger = FlexLogger.getLogger(ParseLog.class.getName());
+	private static org.onap.policy.common.logging.flexlogger.Logger logger = FlexLogger.getLogger(ParseLog.class.getName());
 
 	private static String system;
 	private static int lastNumberRead = 0;
diff --git a/LogParser/src/test/java/org/openecomp/xacml/parser/ParseLogTest.java b/LogParser/src/test/java/org/onap/xacml/parser/ParseLogTest.java
index 2bd70f2be..3cf3d188f 100644
--- a/LogParser/src/test/java/org/openecomp/xacml/parser/ParseLogTest.java
+++ b/LogParser/src/test/java/org/onap/xacml/parser/ParseLogTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.xacml.parser;
+package org.onap.xacml.parser;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -36,12 +36,12 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;
-import org.openecomp.policy.common.im.AdministrativeStateException;
-import org.openecomp.policy.common.im.IntegrityMonitor;
-import org.openecomp.policy.common.im.StandbyStatusException;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.xacml.parser.LogEntryObject.LOGTYPE;
+import org.onap.policy.common.im.AdministrativeStateException;
+import org.onap.policy.common.im.IntegrityMonitor;
+import org.onap.policy.common.im.StandbyStatusException;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.xacml.parser.LogEntryObject.LOGTYPE;
 
 
 public class ParseLogTest {
@@ -101,7 +101,7 @@ public class ParseLogTest {
 		
 		logger.debug("testParseRemoteSystem: enter");
 		
-		String line = "||org.openecomp.policy.pap.xacml.rest.XACMLPapServlet$Heartbeat.run(XACMLPapServlet.java:2801)||Heartbeat 'https://localhost:8081/pdp/' status='UP_TO_DATE'";
+		String line = "||org.onap.policy.pap.xacml.rest.XACMLPapServlet$Heartbeat.run(XACMLPapServlet.java:2801)||Heartbeat 'https://localhost:8081/pdp/' status='UP_TO_DATE'";
 		String returnValue = ParseLog.parseRemoteSystem(line);
 		logger.debug("testParseRemoteSystem: returnValue: " + returnValue);
 		assertEquals("localhost:8081", returnValue);
@@ -490,7 +490,7 @@ public class ParseLogTest {
 		
 		logger.debug("testProcess: enter");
 		
-		String line = "2015-04-01 09:13:44.947  DEBUG 17482 --- [nio-8480-exec-7] c.a.l.ecomp.policy.std.StdPolicyConfig   : config Retrieved ";
+		String line = "2015-04-01 09:13:44.947  DEBUG 17482 --- [nio-8480-exec-7] c.a.l.onap.policy.std.StdPolicyConfig   : config Retrieved ";
 	
 		im = Mockito.mock(IntegrityMonitor.class);
 		try {
diff --git a/LogParser/src/test/resources/LineTest.txt b/LogParser/src/test/resources/LineTest.txt
index 32ec6cb0e..e80f631fc 100644
--- a/LogParser/src/test/resources/LineTest.txt
+++ b/LogParser/src/test/resources/LineTest.txt
@@ -1,12 +1,12 @@
-2016-04-26T00:00:00{GMT+0}+00:00|||Thread-5||||ERROR|||localhost.com||org.openecomp.policy.im.IntegrityMonitor.writeFpc(IntegrityMonitor.java:377)||ERROR_VALUE
-2016-04-27T11:22:08{GMT+0}+00:00|||main||||INFO|||||org.openecomp.xacml.parser.ParseLog.main(ParseLog.java:86)||File Line Count: 18409 value read in: 0
-2016-04-27T11:22:48{GMT+0}+00:00|||Thread-0||||INFO|||||org.openecomp.xacml.parser.ParseLog$1.lambda$0(ParseLog.java:96)||Last line Read: 12
-2015_10_02_15_11_19_006 [http-nio-8081-exec-10] INFO  corg.openecomp.research.xacml.rest.XACMLPdpServlet.doPutConfig(XACMLPdpServlet.java:409)- Success
-2015-04-01 09:13:44.947  INFO 17482 --- [nio-8480-exec-7] c.a.l.ecomp.policy.std.StdPolicyConfig   : config Retrieved 
+2016-04-26T00:00:00{GMT+0}+00:00|||Thread-5||||ERROR|||localhost.com||org.onap.policy.im.IntegrityMonitor.writeFpc(IntegrityMonitor.java:377)||ERROR_VALUE
+2016-04-27T11:22:08{GMT+0}+00:00|||main||||INFO|||||org.onap.xacml.parser.ParseLog.main(ParseLog.java:86)||File Line Count: 18409 value read in: 0
+2016-04-27T11:22:48{GMT+0}+00:00|||Thread-0||||INFO|||||org.onap.xacml.parser.ParseLog$1.lambda$0(ParseLog.java:96)||Last line Read: 12
+2015_10_02_15_11_19_006 [http-nio-8081-exec-10] INFO  corg.onap.research.xacml.rest.XACMLPdpServlet.doPutConfig(XACMLPdpServlet.java:409)- Success
+2015-04-01 09:13:44.947  INFO 17482 --- [nio-8480-exec-7] c.a.l.onap.policy.std.StdPolicyConfig   : config Retrieved 
 08-Apr-2015 10:31:26.503 WARNING [localhost-startStop-2] org.apache.catalina.loader.WebappClassLoaderBase.clearReferencesThreads The web application [PyPDPServer] appears to have started a thread named [Grizzly(1) SelectorRunner] but has failed to stop it. This is very likely to create a memory leak. service Catalina08-Apr-2015 10:31:26.503 WARNING [localhost-startStop-2] org.apache.catalina.loader.WebappClassLoaderBase.clearReferencesThreads The web application [PyPDPServer] appears to have started a thread named [Grizzly(1) SelectorRunner] but has failed to stop it. This is very likely to create a memory leak. 
 06-Mar-2015 11:50:06.243 SEVERE [main] org.apache.coyote.AbstractProtocol.init Failed to initialize end point associated with ProtocolHandler ["ajp-nio-8009"] java.net.BindException: Address already in use
-2015_09_30_10_39_31_675 [http-nio-8081-exec-1] ERROR org.openecomp.research.xacml.rest.XACMLPdpServlet.doPost(XACMLPdpServlet.java:644)- PE100 - Permissions Error: PEP not Authorized for making this Request!! 
-2015_03_17_15_01_08_348 [qtp1688376486-32] WARN  org.openecomp.research.xacml.admin.components.PolicyManagement$1.accept(PolicyManagement.java:184)- Filtering out: C:\git\D2PE-take2\policy-engine-prototype\XACML-PAP-ADMIN\workspace\admin\repository\com\.svnignore
-2017-05-31T22:18:42{GMT+0}+00:00|||Thread-4||||INFO|||||org.openecomp.xacml.parser.ParseLog$1.lambda$0(ParseLog.java:136)||Last-debug.log-line-Read:17
-2017-05-31T22:18:42{GMT+0}+00:00|||Thread-5||||INFO|||||org.openecomp.xacml.parser.ParseLog$2.lambda$0(ParseLog.java:194)||Last-error.log-line-Read:22
-2017-05-31T22:18:42{GMT+0}+00:00|||Thread-6||||INFO|||||org.openecomp.xacml.parser.ParseLog$3.lambda$0(ParseLog.java:250)||Last-pap-rest.log-line-Read:52
\ No newline at end of file
+2015_09_30_10_39_31_675 [http-nio-8081-exec-1] ERROR org.onap.research.xacml.rest.XACMLPdpServlet.doPost(XACMLPdpServlet.java:644)- PE100 - Permissions Error: PEP not Authorized for making this Request!! 
+2015_03_17_15_01_08_348 [qtp1688376486-32] WARN  org.onap.research.xacml.admin.components.PolicyManagement$1.accept(PolicyManagement.java:184)- Filtering out: C:\git\D2PE-take2\policy-engine-prototype\XACML-PAP-ADMIN\workspace\admin\repository\com\.svnignore
+2017-05-31T22:18:42{GMT+0}+00:00|||Thread-4||||INFO|||||org.onap.xacml.parser.ParseLog$1.lambda$0(ParseLog.java:136)||Last-debug.log-line-Read:17
+2017-05-31T22:18:42{GMT+0}+00:00|||Thread-5||||INFO|||||org.onap.xacml.parser.ParseLog$2.lambda$0(ParseLog.java:194)||Last-error.log-line-Read:22
+2017-05-31T22:18:42{GMT+0}+00:00|||Thread-6||||INFO|||||org.onap.xacml.parser.ParseLog$3.lambda$0(ParseLog.java:250)||Last-pap-rest.log-line-Read:52
\ No newline at end of file
diff --git a/LogParser/src/test/resources/LineTest2.txt b/LogParser/src/test/resources/LineTest2.txt
index 2243960df..da464412e 100644
--- a/LogParser/src/test/resources/LineTest2.txt
+++ b/LogParser/src/test/resources/LineTest2.txt
@@ -1,7 +1,7 @@
-2016-04-26T00:00:00{GMT+0}+00:00|||Thread-5||||ERROR|||localhost.com||org.openecomp.ecomp.policy.im.IntegrityMonitor.writeFpc(IntegrityMonitor.java:377)||ERROR_VALUE
-2015_10_02_15_11_19_006 [http-nio-8081-exec-10] INFO  org.openecomp.research.xacml.rest.XACMLPdpServlet.doPutConfig(XACMLPdpServlet.java:409)- Success
-2015-04-01 09:13:44.947  INFO 17482 --- [nio-8480-exec-7] c.a.l.ecomp.policy.std.StdPolicyConfig   : config Retrieved 
+2016-04-26T00:00:00{GMT+0}+00:00|||Thread-5||||ERROR|||localhost.com||org.onap.onap.policy.im.IntegrityMonitor.writeFpc(IntegrityMonitor.java:377)||ERROR_VALUE
+2015_10_02_15_11_19_006 [http-nio-8081-exec-10] INFO  org.onap.research.xacml.rest.XACMLPdpServlet.doPutConfig(XACMLPdpServlet.java:409)- Success
+2015-04-01 09:13:44.947  INFO 17482 --- [nio-8480-exec-7] c.a.l.onap.policy.std.StdPolicyConfig   : config Retrieved 
 08-Apr-2015 10:31:26.503 WARNING [localhost-startStop-2] org.apache.catalina.loader.WebappClassLoaderBase.clearReferencesThreads The web application [PyPDPServer] appears to have started a thread named [Grizzly(1) SelectorRunner] but has failed to stop it. This is very likely to create a memory leak. service Catalina08-Apr-2015 10:31:26.503 WARNING [localhost-startStop-2] org.apache.catalina.loader.WebappClassLoaderBase.clearReferencesThreads The web application [PyPDPServer] appears to have started a thread named [Grizzly(1) SelectorRunner] but has failed to stop it. This is very likely to create a memory leak. 
 06-Mar-2015 11:50:06.243 SEVERE [main] org.apache.coyote.AbstractProtocol.init Failed to initialize end point associated with ProtocolHandler ["ajp-nio-8009"] java.net.BindException: Address already in use
-2015_09_30_10_39_31_675 [http-nio-8081-exec-1] ERROR org.openecomp.research.xacml.rest.XACMLPdpServlet.doPost(XACMLPdpServlet.java:644)- PE100 - Permissions Error: PEP not Authorized for making this Request!! 
-2015_03_17_15_01_08_348 [qtp1688376486-32] WARN  org.openecomp.research.xacml.admin.components.PolicyManagement$1.accept(PolicyManagement.java:184)- Filtering out: C:\git\D2PE-take2\policy-engine-prototype\XACML-PAP-ADMIN\workspace\admin\repository\com\.svnignore
\ No newline at end of file
+2015_09_30_10_39_31_675 [http-nio-8081-exec-1] ERROR org.onap.research.xacml.rest.XACMLPdpServlet.doPost(XACMLPdpServlet.java:644)- PE100 - Permissions Error: PEP not Authorized for making this Request!! 
+2015_03_17_15_01_08_348 [qtp1688376486-32] WARN  org.onap.research.xacml.admin.components.PolicyManagement$1.accept(PolicyManagement.java:184)- Filtering out: C:\git\D2PE-take2\policy-engine-prototype\XACML-PAP-ADMIN\workspace\admin\repository\com\.svnignore
\ No newline at end of file
diff --git a/ECOMP-ASDC/pom.xml b/ONAP-ASDC/pom.xml
index 10531f3e9..62dd3a740 100644
--- a/ECOMP-ASDC/pom.xml
+++ b/ONAP-ASDC/pom.xml
@@ -1,6 +1,6 @@
 <!--
   ============LICENSE_START=======================================================
-  ECOMP Policy Engine
+  ONAP Policy Engine
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
   ================================================================================
@@ -22,7 +22,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>asdc</artifactId>
 	<parent>
-		<groupId>org.openecomp.policy.engine</groupId>
+		<groupId>org.onap.policy.engine</groupId>
 		<artifactId>PolicyEngineSuite</artifactId>
 		<version>1.1.0-SNAPSHOT</version>
 	</parent>
diff --git a/ECOMP-ASDC/src/main/java/org/openecomp/policy/asdc/Resource.java b/ONAP-ASDC/src/main/java/org/onap/policy/asdc/Resource.java
index af57afa00..1c4925cd2 100644
--- a/ECOMP-ASDC/src/main/java/org/openecomp/policy/asdc/Resource.java
+++ b/ONAP-ASDC/src/main/java/org/onap/policy/asdc/Resource.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.asdc;
+package org.onap.policy.asdc;
 
 import java.io.Serializable;
 import java.util.UUID;
diff --git a/ECOMP-ASDC/src/main/java/org/openecomp/policy/asdc/ResourceInstance.java b/ONAP-ASDC/src/main/java/org/onap/policy/asdc/ResourceInstance.java
index 40d48d9f0..a6c31426d 100644
--- a/ECOMP-ASDC/src/main/java/org/openecomp/policy/asdc/ResourceInstance.java
+++ b/ONAP-ASDC/src/main/java/org/onap/policy/asdc/ResourceInstance.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.asdc;
+package org.onap.policy.asdc;
 
 import java.io.Serializable;
 import java.util.UUID;
diff --git a/ECOMP-ASDC/src/main/java/org/openecomp/policy/asdc/ResourceType.java b/ONAP-ASDC/src/main/java/org/onap/policy/asdc/ResourceType.java
index 426b3907c..46daa7ee1 100644
--- a/ECOMP-ASDC/src/main/java/org/openecomp/policy/asdc/ResourceType.java
+++ b/ONAP-ASDC/src/main/java/org/onap/policy/asdc/ResourceType.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.asdc;
+package org.onap.policy.asdc;
 
 public enum ResourceType {
 	VF("VF"),
diff --git a/ECOMP-ASDC/src/main/java/org/openecomp/policy/asdc/Service.java b/ONAP-ASDC/src/main/java/org/onap/policy/asdc/Service.java
index b7b5d3cb5..e97a81362 100644
--- a/ECOMP-ASDC/src/main/java/org/openecomp/policy/asdc/Service.java
+++ b/ONAP-ASDC/src/main/java/org/onap/policy/asdc/Service.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.asdc;
+package org.onap.policy.asdc;
 
 import java.io.Serializable;
 import java.util.UUID;
diff --git a/ECOMP-ASDC/src/main/java/org/openecomp/policy/asdc/ServiceInstance.java b/ONAP-ASDC/src/main/java/org/onap/policy/asdc/ServiceInstance.java
index 40a08fd93..63a41fbf1 100644
--- a/ECOMP-ASDC/src/main/java/org/openecomp/policy/asdc/ServiceInstance.java
+++ b/ONAP-ASDC/src/main/java/org/onap/policy/asdc/ServiceInstance.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.asdc;
+package org.onap.policy.asdc;
 
 import java.io.Serializable;
 import java.util.UUID;
diff --git a/ECOMP-ASDC/src/main/resources/definitions.yaml b/ONAP-ASDC/src/main/resources/definitions.yaml
index 6fb1f7cfa..6fb1f7cfa 100644
--- a/ECOMP-ASDC/src/main/resources/definitions.yaml
+++ b/ONAP-ASDC/src/main/resources/definitions.yaml
diff --git a/ECOMP-ControlloopPolicy/pom.xml b/ONAP-ControlloopPolicy/pom.xml
index 870ba148f..2c973cf75 100644
--- a/ECOMP-ControlloopPolicy/pom.xml
+++ b/ONAP-ControlloopPolicy/pom.xml
@@ -1,6 +1,6 @@
 <!--
   ============LICENSE_START=======================================================
-  ECOMP Policy Engine
+  ONAP Policy Engine
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
   ================================================================================
@@ -22,13 +22,13 @@
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>ControlloopPolicy</artifactId>
 	<parent>
-		<groupId>org.openecomp.policy.engine</groupId>
+		<groupId>org.onap.policy.engine</groupId>
 		<artifactId>PolicyEngineSuite</artifactId>
 		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 	<dependencies>
 		<dependency>
-			<groupId>org.openecomp.policy.engine</groupId>
+			<groupId>org.onap.policy.engine</groupId>
 			<artifactId>asdc</artifactId>
 			<version>${project.version}</version>
 		</dependency>
@@ -54,8 +54,8 @@
 			<version>19.0</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>
 		</dependency>
 	</dependencies>
diff --git a/ECOMP-ControlloopPolicy/src/main/java/org/openecomp/policy/controlloop/compiler/CompilerException.java b/ONAP-ControlloopPolicy/src/main/java/org/onap/policy/controlloop/compiler/CompilerException.java
index 78f30570c..4a86b3bf4 100644
--- a/ECOMP-ControlloopPolicy/src/main/java/org/openecomp/policy/controlloop/compiler/CompilerException.java
+++ b/ONAP-ControlloopPolicy/src/main/java/org/onap/policy/controlloop/compiler/CompilerException.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.controlloop.compiler;
+package org.onap.policy.controlloop.compiler;
 
 public class CompilerException extends Exception {
 
diff --git a/ECOMP-ControlloopPolicy/src/main/java/org/openecomp/policy/controlloop/compiler/ControlLoopCompiler.java b/ONAP-ControlloopPolicy/src/main/java/org/onap/policy/controlloop/compiler/ControlLoopCompiler.java
index e0000c02d..18f56d53f 100644
--- a/ECOMP-ControlloopPolicy/src/main/java/org/openecomp/policy/controlloop/compiler/ControlLoopCompiler.java
+++ b/ONAP-ControlloopPolicy/src/main/java/org/onap/policy/controlloop/compiler/ControlLoopCompiler.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.controlloop.compiler;
+package org.onap.policy.controlloop.compiler;
 
 import java.io.InputStream;
 import java.io.Serializable;
@@ -32,14 +32,14 @@ import org.jgrapht.DirectedGraph;
 import org.jgrapht.graph.ClassBasedEdgeFactory;
 import org.jgrapht.graph.DefaultEdge;
 import org.jgrapht.graph.DirectedMultigraph;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.controlloop.policy.ControlLoop;
-import org.openecomp.policy.controlloop.policy.ControlLoopPolicy;
-import org.openecomp.policy.controlloop.policy.FinalResult;
-import org.openecomp.policy.controlloop.policy.Policy;
-import org.openecomp.policy.controlloop.policy.PolicyResult;
-import org.openecomp.policy.controlloop.policy.TargetType;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.controlloop.policy.ControlLoop;
+import org.onap.policy.controlloop.policy.ControlLoopPolicy;
+import org.onap.policy.controlloop.policy.FinalResult;
+import org.onap.policy.controlloop.policy.Policy;
+import org.onap.policy.controlloop.policy.PolicyResult;
+import org.onap.policy.controlloop.policy.TargetType;
 import org.yaml.snakeyaml.Yaml;
 import org.yaml.snakeyaml.constructor.Constructor;
 
diff --git a/ECOMP-ControlloopPolicy/src/main/java/org/openecomp/policy/controlloop/compiler/ControlLoopCompilerCallback.java b/ONAP-ControlloopPolicy/src/main/java/org/onap/policy/controlloop/compiler/ControlLoopCompilerCallback.java
index bb6cebde4..ab4bf5e1a 100644
--- a/ECOMP-ControlloopPolicy/src/main/java/org/openecomp/policy/controlloop/compiler/ControlLoopCompilerCallback.java
+++ b/ONAP-ControlloopPolicy/src/main/java/org/onap/policy/controlloop/compiler/ControlLoopCompilerCallback.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.controlloop.compiler;
+package org.onap.policy.controlloop.compiler;
 
 public interface ControlLoopCompilerCallback {
 	
diff --git a/ECOMP-ControlloopPolicy/src/main/java/org/openecomp/policy/controlloop/guard/compiler/ControlLoopGuardCompiler.java b/ONAP-ControlloopPolicy/src/main/java/org/onap/policy/controlloop/guard/compiler/ControlLoopGuardCompiler.java
index aa2bbfd8a..de5b47641 100644
--- a/ECOMP-ControlloopPolicy/src/main/java/org/openecomp/policy/controlloop/guard/compiler/ControlLoopGuardCompiler.java
+++ b/ONAP-ControlloopPolicy/src/main/java/org/onap/policy/controlloop/guard/compiler/ControlLoopGuardCompiler.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.controlloop.guard.compiler;
+package org.onap.policy.controlloop.guard.compiler;
 
 
 import java.io.InputStream;
@@ -26,11 +26,11 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import org.openecomp.policy.controlloop.compiler.CompilerException;
-import org.openecomp.policy.controlloop.compiler.ControlLoopCompilerCallback;
-import org.openecomp.policy.controlloop.policy.guard.Constraint;
-import org.openecomp.policy.controlloop.policy.guard.ControlLoopGuard;
-import org.openecomp.policy.controlloop.policy.guard.GuardPolicy;
+import org.onap.policy.controlloop.compiler.CompilerException;
+import org.onap.policy.controlloop.compiler.ControlLoopCompilerCallback;
+import org.onap.policy.controlloop.policy.guard.Constraint;
+import org.onap.policy.controlloop.policy.guard.ControlLoopGuard;
+import org.onap.policy.controlloop.policy.guard.GuardPolicy;
 import org.yaml.snakeyaml.Yaml;
 import org.yaml.snakeyaml.constructor.Constructor;
 
diff --git a/ECOMP-ControlloopPolicy/src/main/java/org/openecomp/policy/controlloop/policy/ControlLoop.java b/ONAP-ControlloopPolicy/src/main/java/org/onap/policy/controlloop/policy/ControlLoop.java
index ec25ab3db..3d45c21ba 100644
--- a/ECOMP-ControlloopPolicy/src/main/java/org/openecomp/policy/controlloop/policy/ControlLoop.java
+++ b/ONAP-ControlloopPolicy/src/main/java/org/onap/policy/controlloop/policy/ControlLoop.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,13 +18,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.controlloop.policy;
+package org.onap.policy.controlloop.policy;
 
 import java.util.LinkedList;
 import java.util.List;
 
-import org.openecomp.policy.asdc.Resource;
-import org.openecomp.policy.asdc.Service;
+import org.onap.policy.asdc.Resource;
+import org.onap.policy.asdc.Service;
 
 public class ControlLoop {
 	
diff --git a/ECOMP-ControlloopPolicy/src/main/java/org/openecomp/policy/controlloop/policy/ControlLoopPolicy.java b/ONAP-ControlloopPolicy/src/main/java/org/onap/policy/controlloop/policy/ControlLoopPolicy.java
index 82a9d964e..712a441c7 100644
--- a/ECOMP-ControlloopPolicy/src/main/java/org/openecomp/policy/controlloop/policy/ControlLoopPolicy.java
+++ b/ONAP-ControlloopPolicy/src/main/java/org/onap/policy/controlloop/policy/ControlLoopPolicy.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.controlloop.policy;
+package org.onap.policy.controlloop.policy;
 
 import java.util.List;
 
diff --git a/ECOMP-ControlloopPolicy/src/main/java/org/openecomp/policy/controlloop/policy/FinalResult.java b/ONAP-ControlloopPolicy/src/main/java/org/onap/policy/controlloop/policy/FinalResult.java
index f64e44939..cad99452d 100644
--- a/ECOMP-ControlloopPolicy/src/main/java/org/openecomp/policy/controlloop/policy/FinalResult.java
+++ b/ONAP-ControlloopPolicy/src/main/java/org/onap/policy/controlloop/policy/FinalResult.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.controlloop.policy;
+package org.onap.policy.controlloop.policy;
 
 public enum FinalResult {
 	/**
diff --git a/ECOMP-ControlloopPolicy/src/main/java/org/openecomp/policy/controlloop/policy/OperationsAccumulateParams.java b/ONAP-ControlloopPolicy/src/main/java/org/onap/policy/controlloop/policy/OperationsAccumulateParams.java
index b7424dd33..b27d72ed6 100644
--- a/ECOMP-ControlloopPolicy/src/main/java/org/openecomp/policy/controlloop/policy/OperationsAccumulateParams.java
+++ b/ONAP-ControlloopPolicy/src/main/java/org/onap/policy/controlloop/policy/OperationsAccumulateParams.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.controlloop.policy;
+package org.onap.policy.controlloop.policy;
 
 import java.io.Serializable;
 
diff --git a/ECOMP-ControlloopPolicy/src/main/java/org/openecomp/policy/controlloop/policy/Policy.java b/ONAP-ControlloopPolicy/src/main/java/org/onap/policy/controlloop/policy/Policy.java
index dcbc8937b..96799e964 100644
--- a/ECOMP-ControlloopPolicy/src/main/java/org/openecomp/policy/controlloop/policy/Policy.java
+++ b/ONAP-ControlloopPolicy/src/main/java/org/onap/policy/controlloop/policy/Policy.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.controlloop.policy;
+package org.onap.policy.controlloop.policy;
 
 import java.util.Collections;
 import java.util.Map;
diff --git a/ECOMP-ControlloopPolicy/src/main/java/org/openecomp/policy/controlloop/policy/PolicyResult.java b/ONAP-ControlloopPolicy/src/main/java/org/onap/policy/controlloop/policy/PolicyResult.java
index 7d0334125..5ff2d684a 100644
--- a/ECOMP-ControlloopPolicy/src/main/java/org/openecomp/policy/controlloop/policy/PolicyResult.java
+++ b/ONAP-ControlloopPolicy/src/main/java/org/onap/policy/controlloop/policy/PolicyResult.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.controlloop.policy;
+package org.onap.policy.controlloop.policy;
 
 public enum PolicyResult {
 	/**
diff --git a/ECOMP-ControlloopPolicy/src/main/java/org/openecomp/policy/controlloop/policy/Target.java b/ONAP-ControlloopPolicy/src/main/java/org/onap/policy/controlloop/policy/Target.java
index 1625c2968..2a8817d10 100644
--- a/ECOMP-ControlloopPolicy/src/main/java/org/openecomp/policy/controlloop/policy/Target.java
+++ b/ONAP-ControlloopPolicy/src/main/java/org/onap/policy/controlloop/policy/Target.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.controlloop.policy;
+package org.onap.policy.controlloop.policy;
 
 import java.io.Serializable;
 
diff --git a/ECOMP-ControlloopPolicy/src/main/java/org/openecomp/policy/controlloop/policy/TargetType.java b/ONAP-ControlloopPolicy/src/main/java/org/onap/policy/controlloop/policy/TargetType.java
index e43fa615e..875ca2e1e 100644
--- a/ECOMP-ControlloopPolicy/src/main/java/org/openecomp/policy/controlloop/policy/TargetType.java
+++ b/ONAP-ControlloopPolicy/src/main/java/org/onap/policy/controlloop/policy/TargetType.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.controlloop.policy;
+package org.onap.policy.controlloop.policy;
 
 public enum TargetType {
 	VM("VM"),
diff --git a/ECOMP-ControlloopPolicy/src/main/java/org/openecomp/policy/controlloop/policy/builder/BuilderException.java b/ONAP-ControlloopPolicy/src/main/java/org/onap/policy/controlloop/policy/builder/BuilderException.java
index 273af85e3..7cf2f4900 100644
--- a/ECOMP-ControlloopPolicy/src/main/java/org/openecomp/policy/controlloop/policy/builder/BuilderException.java
+++ b/ONAP-ControlloopPolicy/src/main/java/org/onap/policy/controlloop/policy/builder/BuilderException.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.controlloop.policy.builder;
+package org.onap.policy.controlloop.policy.builder;
 
 public class BuilderException extends Exception {
 
diff --git a/ECOMP-ControlloopPolicy/src/main/java/org/openecomp/policy/controlloop/policy/builder/ControlLoopPolicyBuilder.java b/ONAP-ControlloopPolicy/src/main/java/org/onap/policy/controlloop/policy/builder/ControlLoopPolicyBuilder.java
index 2fdb6d9df..93ecbc62e 100644
--- a/ECOMP-ControlloopPolicy/src/main/java/org/openecomp/policy/controlloop/policy/builder/ControlLoopPolicyBuilder.java
+++ b/ONAP-ControlloopPolicy/src/main/java/org/onap/policy/controlloop/policy/builder/ControlLoopPolicyBuilder.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,18 +18,18 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.controlloop.policy.builder;
+package org.onap.policy.controlloop.policy.builder;
 
 import java.util.Map;
 
-import org.openecomp.policy.asdc.Resource;
-import org.openecomp.policy.asdc.Service;
-import org.openecomp.policy.controlloop.policy.ControlLoop;
-import org.openecomp.policy.controlloop.policy.OperationsAccumulateParams;
-import org.openecomp.policy.controlloop.policy.Policy;
-import org.openecomp.policy.controlloop.policy.PolicyResult;
-import org.openecomp.policy.controlloop.policy.Target;
-import org.openecomp.policy.controlloop.policy.builder.impl.ControlLoopPolicyBuilderImpl;
+import org.onap.policy.asdc.Resource;
+import org.onap.policy.asdc.Service;
+import org.onap.policy.controlloop.policy.ControlLoop;
+import org.onap.policy.controlloop.policy.OperationsAccumulateParams;
+import org.onap.policy.controlloop.policy.Policy;
+import org.onap.policy.controlloop.policy.PolicyResult;
+import org.onap.policy.controlloop.policy.Target;
+import org.onap.policy.controlloop.policy.builder.impl.ControlLoopPolicyBuilderImpl;
 
 public interface ControlLoopPolicyBuilder {
 	
@@ -106,7 +106,7 @@ public interface ControlLoopPolicyBuilder {
 	public Integer calculateTimeout();
 	
 	/**
-	 * Sets the initial trigger policy when a DCAE Closed Loop Event arrives in the ECOMP Policy Platform.
+	 * Sets the initial trigger policy when a DCAE Closed Loop Event arrives in the ONAP Policy Platform.
 	 * 
 	 * 
 	 * @param name
diff --git a/ECOMP-ControlloopPolicy/src/main/java/org/openecomp/policy/controlloop/policy/builder/Message.java b/ONAP-ControlloopPolicy/src/main/java/org/onap/policy/controlloop/policy/builder/Message.java
index 35aa3666f..4bf2665b3 100644
--- a/ECOMP-ControlloopPolicy/src/main/java/org/openecomp/policy/controlloop/policy/builder/Message.java
+++ b/ONAP-ControlloopPolicy/src/main/java/org/onap/policy/controlloop/policy/builder/Message.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.controlloop.policy.builder;
+package org.onap.policy.controlloop.policy.builder;
 
 public interface Message {
 	
diff --git a/ECOMP-ControlloopPolicy/src/main/java/org/openecomp/policy/controlloop/policy/builder/MessageLevel.java b/ONAP-ControlloopPolicy/src/main/java/org/onap/policy/controlloop/policy/builder/MessageLevel.java
index 3c09d3813..37ecfa17c 100644
--- a/ECOMP-ControlloopPolicy/src/main/java/org/openecomp/policy/controlloop/policy/builder/MessageLevel.java
+++ b/ONAP-ControlloopPolicy/src/main/java/org/onap/policy/controlloop/policy/builder/MessageLevel.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.controlloop.policy.builder;
+package org.onap.policy.controlloop.policy.builder;
 
 public enum MessageLevel {
 	INFO,
diff --git a/ECOMP-ControlloopPolicy/src/main/java/org/openecomp/policy/controlloop/policy/builder/Results.java b/ONAP-ControlloopPolicy/src/main/java/org/onap/policy/controlloop/policy/builder/Results.java
index 172524a78..37bd93215 100644
--- a/ECOMP-ControlloopPolicy/src/main/java/org/openecomp/policy/controlloop/policy/builder/Results.java
+++ b/ONAP-ControlloopPolicy/src/main/java/org/onap/policy/controlloop/policy/builder/Results.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.controlloop.policy.builder;
+package org.onap.policy.controlloop.policy.builder;
 
 import java.util.List;
 
diff --git a/ECOMP-ControlloopPolicy/src/main/java/org/openecomp/policy/controlloop/policy/builder/impl/ControlLoopPolicyBuilderImpl.java b/ONAP-ControlloopPolicy/src/main/java/org/onap/policy/controlloop/policy/builder/impl/ControlLoopPolicyBuilderImpl.java
index 036fd75d2..dae56f32c 100644
--- a/ECOMP-ControlloopPolicy/src/main/java/org/openecomp/policy/controlloop/policy/builder/impl/ControlLoopPolicyBuilderImpl.java
+++ b/ONAP-ControlloopPolicy/src/main/java/org/onap/policy/controlloop/policy/builder/impl/ControlLoopPolicyBuilderImpl.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,30 +18,30 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.controlloop.policy.builder.impl;
+package org.onap.policy.controlloop.policy.builder.impl;
 
 import java.util.LinkedList;
 import java.util.Map;
 import java.util.UUID;
 
-import org.openecomp.policy.asdc.Resource;
-import org.openecomp.policy.asdc.Service;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.controlloop.compiler.CompilerException;
-import org.openecomp.policy.controlloop.compiler.ControlLoopCompiler;
-import org.openecomp.policy.controlloop.compiler.ControlLoopCompilerCallback;
-import org.openecomp.policy.controlloop.policy.ControlLoop;
-import org.openecomp.policy.controlloop.policy.ControlLoopPolicy;
-import org.openecomp.policy.controlloop.policy.FinalResult;
-import org.openecomp.policy.controlloop.policy.OperationsAccumulateParams;
-import org.openecomp.policy.controlloop.policy.Policy;
-import org.openecomp.policy.controlloop.policy.PolicyResult;
-import org.openecomp.policy.controlloop.policy.Target;
-import org.openecomp.policy.controlloop.policy.builder.BuilderException;
-import org.openecomp.policy.controlloop.policy.builder.ControlLoopPolicyBuilder;
-import org.openecomp.policy.controlloop.policy.builder.MessageLevel;
-import org.openecomp.policy.controlloop.policy.builder.Results;
+import org.onap.policy.asdc.Resource;
+import org.onap.policy.asdc.Service;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.controlloop.compiler.CompilerException;
+import org.onap.policy.controlloop.compiler.ControlLoopCompiler;
+import org.onap.policy.controlloop.compiler.ControlLoopCompilerCallback;
+import org.onap.policy.controlloop.policy.ControlLoop;
+import org.onap.policy.controlloop.policy.ControlLoopPolicy;
+import org.onap.policy.controlloop.policy.FinalResult;
+import org.onap.policy.controlloop.policy.OperationsAccumulateParams;
+import org.onap.policy.controlloop.policy.Policy;
+import org.onap.policy.controlloop.policy.PolicyResult;
+import org.onap.policy.controlloop.policy.Target;
+import org.onap.policy.controlloop.policy.builder.BuilderException;
+import org.onap.policy.controlloop.policy.builder.ControlLoopPolicyBuilder;
+import org.onap.policy.controlloop.policy.builder.MessageLevel;
+import org.onap.policy.controlloop.policy.builder.Results;
 import org.yaml.snakeyaml.DumperOptions;
 import org.yaml.snakeyaml.DumperOptions.FlowStyle;
 import org.yaml.snakeyaml.Yaml;
diff --git a/ECOMP-ControlloopPolicy/src/main/java/org/openecomp/policy/controlloop/policy/builder/impl/MessageImpl.java b/ONAP-ControlloopPolicy/src/main/java/org/onap/policy/controlloop/policy/builder/impl/MessageImpl.java
index 3938aa899..4d3aa7091 100644
--- a/ECOMP-ControlloopPolicy/src/main/java/org/openecomp/policy/controlloop/policy/builder/impl/MessageImpl.java
+++ b/ONAP-ControlloopPolicy/src/main/java/org/onap/policy/controlloop/policy/builder/impl/MessageImpl.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,10 +18,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.controlloop.policy.builder.impl;
+package org.onap.policy.controlloop.policy.builder.impl;
 
-import org.openecomp.policy.controlloop.policy.builder.Message;
-import org.openecomp.policy.controlloop.policy.builder.MessageLevel;
+import org.onap.policy.controlloop.policy.builder.Message;
+import org.onap.policy.controlloop.policy.builder.MessageLevel;
 
 public class MessageImpl implements Message {
 	
diff --git a/ECOMP-ControlloopPolicy/src/main/java/org/openecomp/policy/controlloop/policy/builder/impl/ResultsImpl.java b/ONAP-ControlloopPolicy/src/main/java/org/onap/policy/controlloop/policy/builder/impl/ResultsImpl.java
index 9ab78566e..18732f414 100644
--- a/ECOMP-ControlloopPolicy/src/main/java/org/openecomp/policy/controlloop/policy/builder/impl/ResultsImpl.java
+++ b/ONAP-ControlloopPolicy/src/main/java/org/onap/policy/controlloop/policy/builder/impl/ResultsImpl.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,13 +17,13 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.controlloop.policy.builder.impl;
+package org.onap.policy.controlloop.policy.builder.impl;
 
 import java.util.LinkedList;
 import java.util.List;
 
-import org.openecomp.policy.controlloop.policy.builder.Message;
-import org.openecomp.policy.controlloop.policy.builder.Results;
+import org.onap.policy.controlloop.policy.builder.Message;
+import org.onap.policy.controlloop.policy.builder.Results;
 
 public class ResultsImpl implements Results {
 	
diff --git a/ECOMP-ControlloopPolicy/src/main/java/org/openecomp/policy/controlloop/policy/guard/Constraint.java b/ONAP-ControlloopPolicy/src/main/java/org/onap/policy/controlloop/policy/guard/Constraint.java
index 89526c5fd..ac3dbb03f 100644
--- a/ECOMP-ControlloopPolicy/src/main/java/org/openecomp/policy/controlloop/policy/guard/Constraint.java
+++ b/ONAP-ControlloopPolicy/src/main/java/org/onap/policy/controlloop/policy/guard/Constraint.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.controlloop.policy.guard;
+package org.onap.policy.controlloop.policy.guard;
 
 import java.util.Collections;
 import java.util.LinkedList;
diff --git a/ECOMP-ControlloopPolicy/src/main/java/org/openecomp/policy/controlloop/policy/guard/ControlLoopGuard.java b/ONAP-ControlloopPolicy/src/main/java/org/onap/policy/controlloop/policy/guard/ControlLoopGuard.java
index 3df2a0885..5d832140c 100644
--- a/ECOMP-ControlloopPolicy/src/main/java/org/openecomp/policy/controlloop/policy/guard/ControlLoopGuard.java
+++ b/ONAP-ControlloopPolicy/src/main/java/org/onap/policy/controlloop/policy/guard/ControlLoopGuard.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.controlloop.policy.guard;
+package org.onap.policy.controlloop.policy.guard;
 
 import java.util.LinkedList;
 
diff --git a/ECOMP-ControlloopPolicy/src/main/java/org/openecomp/policy/controlloop/policy/guard/ControlLoopParameter.java b/ONAP-ControlloopPolicy/src/main/java/org/onap/policy/controlloop/policy/guard/ControlLoopParameter.java
index e65b9810f..dafa95094 100644
--- a/ECOMP-ControlloopPolicy/src/main/java/org/openecomp/policy/controlloop/policy/guard/ControlLoopParameter.java
+++ b/ONAP-ControlloopPolicy/src/main/java/org/onap/policy/controlloop/policy/guard/ControlLoopParameter.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.controlloop.policy.guard;
+package org.onap.policy.controlloop.policy.guard;
 
 public class ControlLoopParameter {
 	private String controlLoopName;
diff --git a/ECOMP-ControlloopPolicy/src/main/java/org/openecomp/policy/controlloop/policy/guard/Guard.java b/ONAP-ControlloopPolicy/src/main/java/org/onap/policy/controlloop/policy/guard/Guard.java
index ee0327c3d..453466989 100644
--- a/ECOMP-ControlloopPolicy/src/main/java/org/openecomp/policy/controlloop/policy/guard/Guard.java
+++ b/ONAP-ControlloopPolicy/src/main/java/org/onap/policy/controlloop/policy/guard/Guard.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.controlloop.policy.guard;
+package org.onap.policy.controlloop.policy.guard;
 
 public class Guard {
 
diff --git a/ECOMP-ControlloopPolicy/src/main/java/org/openecomp/policy/controlloop/policy/guard/GuardPolicy.java b/ONAP-ControlloopPolicy/src/main/java/org/onap/policy/controlloop/policy/guard/GuardPolicy.java
index 830736b42..2068a46da 100644
--- a/ECOMP-ControlloopPolicy/src/main/java/org/openecomp/policy/controlloop/policy/guard/GuardPolicy.java
+++ b/ONAP-ControlloopPolicy/src/main/java/org/onap/policy/controlloop/policy/guard/GuardPolicy.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.controlloop.policy.guard;
+package org.onap.policy.controlloop.policy.guard;
 
 import java.util.Collections;
 import java.util.LinkedList;
diff --git a/ECOMP-ControlloopPolicy/src/main/java/org/openecomp/policy/controlloop/policy/guard/MatchParameters.java b/ONAP-ControlloopPolicy/src/main/java/org/onap/policy/controlloop/policy/guard/MatchParameters.java
index 3696ab438..da64cfcaa 100644
--- a/ECOMP-ControlloopPolicy/src/main/java/org/openecomp/policy/controlloop/policy/guard/MatchParameters.java
+++ b/ONAP-ControlloopPolicy/src/main/java/org/onap/policy/controlloop/policy/guard/MatchParameters.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.controlloop.policy.guard;
+package org.onap.policy.controlloop.policy.guard;
 
 import java.util.LinkedList;
 import java.util.List;
diff --git a/ECOMP-ControlloopPolicy/src/main/java/org/openecomp/policy/controlloop/policy/guard/builder/ControlLoopGuardBuilder.java b/ONAP-ControlloopPolicy/src/main/java/org/onap/policy/controlloop/policy/guard/builder/ControlLoopGuardBuilder.java
index d55510709..e0e240db7 100644
--- a/ECOMP-ControlloopPolicy/src/main/java/org/openecomp/policy/controlloop/policy/guard/builder/ControlLoopGuardBuilder.java
+++ b/ONAP-ControlloopPolicy/src/main/java/org/onap/policy/controlloop/policy/guard/builder/ControlLoopGuardBuilder.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,15 +17,15 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.controlloop.policy.guard.builder;
+package org.onap.policy.controlloop.policy.guard.builder;
 
-import org.openecomp.policy.controlloop.policy.builder.BuilderException;
-import org.openecomp.policy.controlloop.policy.builder.Results;
-import org.openecomp.policy.controlloop.policy.guard.Constraint;
-import org.openecomp.policy.controlloop.policy.guard.ControlLoopGuard;
-import org.openecomp.policy.controlloop.policy.guard.Guard;
-import org.openecomp.policy.controlloop.policy.guard.GuardPolicy;
-import org.openecomp.policy.controlloop.policy.guard.builder.impl.ControlLoopGuardBuilderImpl;
+import org.onap.policy.controlloop.policy.builder.BuilderException;
+import org.onap.policy.controlloop.policy.builder.Results;
+import org.onap.policy.controlloop.policy.guard.Constraint;
+import org.onap.policy.controlloop.policy.guard.ControlLoopGuard;
+import org.onap.policy.controlloop.policy.guard.Guard;
+import org.onap.policy.controlloop.policy.guard.GuardPolicy;
+import org.onap.policy.controlloop.policy.guard.builder.impl.ControlLoopGuardBuilderImpl;
 
 public interface ControlLoopGuardBuilder {
 	
diff --git a/ECOMP-ControlloopPolicy/src/main/java/org/openecomp/policy/controlloop/policy/guard/builder/impl/ControlLoopGuardBuilderImpl.java b/ONAP-ControlloopPolicy/src/main/java/org/onap/policy/controlloop/policy/guard/builder/impl/ControlLoopGuardBuilderImpl.java
index 2e5711914..6152a4d08 100644
--- a/ECOMP-ControlloopPolicy/src/main/java/org/openecomp/policy/controlloop/policy/guard/builder/impl/ControlLoopGuardBuilderImpl.java
+++ b/ONAP-ControlloopPolicy/src/main/java/org/onap/policy/controlloop/policy/guard/builder/impl/ControlLoopGuardBuilderImpl.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,25 +17,25 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.controlloop.policy.guard.builder.impl;
+package org.onap.policy.controlloop.policy.guard.builder.impl;
 
 import java.util.LinkedList;
 
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.controlloop.compiler.CompilerException;
-import org.openecomp.policy.controlloop.compiler.ControlLoopCompilerCallback;
-import org.openecomp.policy.controlloop.guard.compiler.ControlLoopGuardCompiler;
-import org.openecomp.policy.controlloop.policy.builder.BuilderException;
-import org.openecomp.policy.controlloop.policy.builder.MessageLevel;
-import org.openecomp.policy.controlloop.policy.builder.Results;
-import org.openecomp.policy.controlloop.policy.builder.impl.MessageImpl;
-import org.openecomp.policy.controlloop.policy.builder.impl.ResultsImpl;
-import org.openecomp.policy.controlloop.policy.guard.Constraint;
-import org.openecomp.policy.controlloop.policy.guard.ControlLoopGuard;
-import org.openecomp.policy.controlloop.policy.guard.Guard;
-import org.openecomp.policy.controlloop.policy.guard.GuardPolicy;
-import org.openecomp.policy.controlloop.policy.guard.builder.ControlLoopGuardBuilder;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.controlloop.compiler.CompilerException;
+import org.onap.policy.controlloop.compiler.ControlLoopCompilerCallback;
+import org.onap.policy.controlloop.guard.compiler.ControlLoopGuardCompiler;
+import org.onap.policy.controlloop.policy.builder.BuilderException;
+import org.onap.policy.controlloop.policy.builder.MessageLevel;
+import org.onap.policy.controlloop.policy.builder.Results;
+import org.onap.policy.controlloop.policy.builder.impl.MessageImpl;
+import org.onap.policy.controlloop.policy.builder.impl.ResultsImpl;
+import org.onap.policy.controlloop.policy.guard.Constraint;
+import org.onap.policy.controlloop.policy.guard.ControlLoopGuard;
+import org.onap.policy.controlloop.policy.guard.Guard;
+import org.onap.policy.controlloop.policy.guard.GuardPolicy;
+import org.onap.policy.controlloop.policy.guard.builder.ControlLoopGuardBuilder;
 import org.yaml.snakeyaml.DumperOptions;
 import org.yaml.snakeyaml.DumperOptions.FlowStyle;
 import org.yaml.snakeyaml.Yaml;
diff --git a/ECOMP-ControlloopPolicy/src/test/java/org/openecomp/policy/controlloop/compiler/ControlLoopCompilerTest.java b/ONAP-ControlloopPolicy/src/test/java/org/onap/policy/controlloop/compiler/ControlLoopCompilerTest.java
index d26d094c6..40111ca48 100644
--- a/ECOMP-ControlloopPolicy/src/test/java/org/openecomp/policy/controlloop/compiler/ControlLoopCompilerTest.java
+++ b/ONAP-ControlloopPolicy/src/test/java/org/onap/policy/controlloop/compiler/ControlLoopCompilerTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.controlloop.compiler;
+package org.onap.policy.controlloop.compiler;
 
 import static org.junit.Assert.*;
 
diff --git a/ECOMP-ControlloopPolicy/src/test/java/org/openecomp/policy/controlloop/compiler/ControlLoopGuardCompilerTest.java b/ONAP-ControlloopPolicy/src/test/java/org/onap/policy/controlloop/compiler/ControlLoopGuardCompilerTest.java
index e2701eefb..5a834aad3 100644
--- a/ECOMP-ControlloopPolicy/src/test/java/org/openecomp/policy/controlloop/compiler/ControlLoopGuardCompilerTest.java
+++ b/ONAP-ControlloopPolicy/src/test/java/org/onap/policy/controlloop/compiler/ControlLoopGuardCompilerTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.controlloop.compiler;
+package org.onap.policy.controlloop.compiler;
 
 import static org.junit.Assert.fail;
 
@@ -28,14 +28,14 @@ import java.io.IOException;
 import java.io.InputStream;
 
 import org.junit.Test;
-import org.openecomp.policy.controlloop.guard.compiler.ControlLoopGuardCompiler;
+import org.onap.policy.controlloop.guard.compiler.ControlLoopGuardCompiler;
 
 public class ControlLoopGuardCompilerTest {
 	
 	@Test 
 	public void testTest1() {
 		try {
-			this.test("src/test/resources/v2.0.0-guard/policy_guard_OpenECOMP_demo_vDNS.yaml");
+			this.test("src/test/resources/v2.0.0-guard/policy_guard_ONAP_demo_vDNS.yaml");
 		} catch (Exception e) {
 			fail(e.getMessage());
 		}
diff --git a/ECOMP-ControlloopPolicy/src/test/java/org/openecomp/policy/controlloop/policy/ControlLoopPolicyBuilderTest.java b/ONAP-ControlloopPolicy/src/test/java/org/onap/policy/controlloop/policy/ControlLoopPolicyBuilderTest.java
index 713f35787..c9338409c 100644
--- a/ECOMP-ControlloopPolicy/src/test/java/org/openecomp/policy/controlloop/policy/ControlLoopPolicyBuilderTest.java
+++ b/ONAP-ControlloopPolicy/src/test/java/org/onap/policy/controlloop/policy/ControlLoopPolicyBuilderTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.controlloop.policy;
+package org.onap.policy.controlloop.policy;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
@@ -32,14 +32,14 @@ import java.io.InputStream;
 import java.util.UUID;
 
 import org.junit.Test;
-import org.openecomp.policy.asdc.Resource;
-import org.openecomp.policy.asdc.ResourceType;
-import org.openecomp.policy.asdc.Service;
-import org.openecomp.policy.controlloop.policy.builder.BuilderException;
-import org.openecomp.policy.controlloop.policy.builder.ControlLoopPolicyBuilder;
-import org.openecomp.policy.controlloop.policy.builder.Message;
-import org.openecomp.policy.controlloop.policy.builder.MessageLevel;
-import org.openecomp.policy.controlloop.policy.builder.Results;
+import org.onap.policy.asdc.Resource;
+import org.onap.policy.asdc.ResourceType;
+import org.onap.policy.asdc.Service;
+import org.onap.policy.controlloop.policy.builder.BuilderException;
+import org.onap.policy.controlloop.policy.builder.ControlLoopPolicyBuilder;
+import org.onap.policy.controlloop.policy.builder.Message;
+import org.onap.policy.controlloop.policy.builder.MessageLevel;
+import org.onap.policy.controlloop.policy.builder.Results;
 import org.yaml.snakeyaml.Yaml;
 import org.yaml.snakeyaml.constructor.Constructor;
 import org.yaml.snakeyaml.error.YAMLException;
diff --git a/ECOMP-ControlloopPolicy/src/test/java/org/openecomp/policy/controlloop/policy/ControlLoopPolicyTest.java b/ONAP-ControlloopPolicy/src/test/java/org/onap/policy/controlloop/policy/ControlLoopPolicyTest.java
index 15d327087..a7cb668d6 100644
--- a/ECOMP-ControlloopPolicy/src/test/java/org/openecomp/policy/controlloop/policy/ControlLoopPolicyTest.java
+++ b/ONAP-ControlloopPolicy/src/test/java/org/onap/policy/controlloop/policy/ControlLoopPolicyTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.controlloop.policy;
+package org.onap.policy.controlloop.policy;
 
 import static org.junit.Assert.*;
 
@@ -52,8 +52,8 @@ public class ControlLoopPolicyTest {
 	}
 	
 	@Test 
-	public void testOpenECOMPvDNS() {
-		this.test("src/test/resources/v2.0.0/policy_OpenECOMP_demo_vDNS.yaml");
+	public void testONAPvDNS() {
+		this.test("src/test/resources/v2.0.0/policy_ONAP_demo_vDNS.yaml");
 	}
 
 	public void test(String testFile) {
diff --git a/ECOMP-ControlloopPolicy/src/test/java/org/openecomp/policy/controlloop/policy/guard/ControlLoopGuardBuilderTest.java b/ONAP-ControlloopPolicy/src/test/java/org/onap/policy/controlloop/policy/guard/ControlLoopGuardBuilderTest.java
index 9dff9f33c..0dfb1ccb3 100644
--- a/ECOMP-ControlloopPolicy/src/test/java/org/openecomp/policy/controlloop/policy/guard/ControlLoopGuardBuilderTest.java
+++ b/ONAP-ControlloopPolicy/src/test/java/org/onap/policy/controlloop/policy/guard/ControlLoopGuardBuilderTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.controlloop.policy.guard;
+package org.onap.policy.controlloop.policy.guard;
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
@@ -34,11 +34,11 @@ import java.util.List;
 import java.util.Map;
 
 import org.junit.Test;
-import org.openecomp.policy.controlloop.policy.builder.BuilderException;
-import org.openecomp.policy.controlloop.policy.builder.Message;
-import org.openecomp.policy.controlloop.policy.builder.MessageLevel;
-import org.openecomp.policy.controlloop.policy.builder.Results;
-import org.openecomp.policy.controlloop.policy.guard.builder.ControlLoopGuardBuilder;
+import org.onap.policy.controlloop.policy.builder.BuilderException;
+import org.onap.policy.controlloop.policy.builder.Message;
+import org.onap.policy.controlloop.policy.builder.MessageLevel;
+import org.onap.policy.controlloop.policy.builder.Results;
+import org.onap.policy.controlloop.policy.guard.builder.ControlLoopGuardBuilder;
 import org.yaml.snakeyaml.Yaml;
 import org.yaml.snakeyaml.constructor.Constructor;
 
@@ -154,7 +154,7 @@ public class ControlLoopGuardBuilderTest {
 	
 	@Test
 	public void test1() {
-		this.test("src/test/resources/v2.0.0-guard/policy_guard_OpenECOMP_demo_vDNS.yaml");
+		this.test("src/test/resources/v2.0.0-guard/policy_guard_ONAP_demo_vDNS.yaml");
 	}
 	
 	@Test
diff --git a/ECOMP-ControlloopPolicy/src/test/java/org/openecomp/policy/controlloop/policy/guard/ControlLoopGuardTest.java b/ONAP-ControlloopPolicy/src/test/java/org/onap/policy/controlloop/policy/guard/ControlLoopGuardTest.java
index 4575e594f..5cb0007a7 100644
--- a/ECOMP-ControlloopPolicy/src/test/java/org/openecomp/policy/controlloop/policy/guard/ControlLoopGuardTest.java
+++ b/ONAP-ControlloopPolicy/src/test/java/org/onap/policy/controlloop/policy/guard/ControlLoopGuardTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.controlloop.policy.guard;
+package org.onap.policy.controlloop.policy.guard;
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
@@ -40,7 +40,7 @@ public class ControlLoopGuardTest {
 
 	@Test 
 	public void testGuardvDNS() {
-		this.test("src/test/resources/v2.0.0-guard/policy_guard_OpenECOMP_demo_vDNS.yaml");
+		this.test("src/test/resources/v2.0.0-guard/policy_guard_ONAP_demo_vDNS.yaml");
 	}
 
 	@Test 
diff --git a/ECOMP-ControlloopPolicy/src/test/resources/v1.0.0/bad_policies_1.yaml b/ONAP-ControlloopPolicy/src/test/resources/v1.0.0/bad_policies_1.yaml
index f6ad68425..f6ad68425 100644
--- a/ECOMP-ControlloopPolicy/src/test/resources/v1.0.0/bad_policies_1.yaml
+++ b/ONAP-ControlloopPolicy/src/test/resources/v1.0.0/bad_policies_1.yaml
diff --git a/ECOMP-ControlloopPolicy/src/test/resources/v1.0.0/bad_trigger_1.yaml b/ONAP-ControlloopPolicy/src/test/resources/v1.0.0/bad_trigger_1.yaml
index 981229c4a..981229c4a 100644
--- a/ECOMP-ControlloopPolicy/src/test/resources/v1.0.0/bad_trigger_1.yaml
+++ b/ONAP-ControlloopPolicy/src/test/resources/v1.0.0/bad_trigger_1.yaml
diff --git a/ECOMP-ControlloopPolicy/src/test/resources/v1.0.0/bad_trigger_2.yaml b/ONAP-ControlloopPolicy/src/test/resources/v1.0.0/bad_trigger_2.yaml
index 1f9715b13..1f9715b13 100644
--- a/ECOMP-ControlloopPolicy/src/test/resources/v1.0.0/bad_trigger_2.yaml
+++ b/ONAP-ControlloopPolicy/src/test/resources/v1.0.0/bad_trigger_2.yaml
diff --git a/ECOMP-ControlloopPolicy/src/test/resources/v1.0.0/policy_OpenLoop_1610.yaml b/ONAP-ControlloopPolicy/src/test/resources/v1.0.0/policy_OpenLoop_1610.yaml
index 7fd27fa97..7fd27fa97 100644
--- a/ECOMP-ControlloopPolicy/src/test/resources/v1.0.0/policy_OpenLoop_1610.yaml
+++ b/ONAP-ControlloopPolicy/src/test/resources/v1.0.0/policy_OpenLoop_1610.yaml
diff --git a/ECOMP-ControlloopPolicy/src/test/resources/v1.0.0/policy_Test.yaml b/ONAP-ControlloopPolicy/src/test/resources/v1.0.0/policy_Test.yaml
index b89a725cf..b89a725cf 100644
--- a/ECOMP-ControlloopPolicy/src/test/resources/v1.0.0/policy_Test.yaml
+++ b/ONAP-ControlloopPolicy/src/test/resources/v1.0.0/policy_Test.yaml
diff --git a/ECOMP-ControlloopPolicy/src/test/resources/v1.0.0/policy_Test_MultipleService.yaml b/ONAP-ControlloopPolicy/src/test/resources/v1.0.0/policy_Test_MultipleService.yaml
index 8ce707729..8ce707729 100644
--- a/ECOMP-ControlloopPolicy/src/test/resources/v1.0.0/policy_Test_MultipleService.yaml
+++ b/ONAP-ControlloopPolicy/src/test/resources/v1.0.0/policy_Test_MultipleService.yaml
diff --git a/ECOMP-ControlloopPolicy/src/test/resources/v1.0.0/test.yaml b/ONAP-ControlloopPolicy/src/test/resources/v1.0.0/test.yaml
index b89a725cf..b89a725cf 100644
--- a/ECOMP-ControlloopPolicy/src/test/resources/v1.0.0/test.yaml
+++ b/ONAP-ControlloopPolicy/src/test/resources/v1.0.0/test.yaml
diff --git a/ECOMP-ControlloopPolicy/src/test/resources/v1.0.0/test_evil.yaml b/ONAP-ControlloopPolicy/src/test/resources/v1.0.0/test_evil.yaml
index 347e84e5e..347e84e5e 100644
--- a/ECOMP-ControlloopPolicy/src/test/resources/v1.0.0/test_evil.yaml
+++ b/ONAP-ControlloopPolicy/src/test/resources/v1.0.0/test_evil.yaml
diff --git a/ECOMP-ControlloopPolicy/src/test/resources/v2.0.0-guard/duplicate_guard_constraint.yaml b/ONAP-ControlloopPolicy/src/test/resources/v2.0.0-guard/duplicate_guard_constraint.yaml
index adb1ca171..adb1ca171 100644
--- a/ECOMP-ControlloopPolicy/src/test/resources/v2.0.0-guard/duplicate_guard_constraint.yaml
+++ b/ONAP-ControlloopPolicy/src/test/resources/v2.0.0-guard/duplicate_guard_constraint.yaml
diff --git a/ECOMP-ControlloopPolicy/src/test/resources/v2.0.0-guard/duplicate_guard_policy.yaml b/ONAP-ControlloopPolicy/src/test/resources/v2.0.0-guard/duplicate_guard_policy.yaml
index 2d54e8517..2d54e8517 100644
--- a/ECOMP-ControlloopPolicy/src/test/resources/v2.0.0-guard/duplicate_guard_policy.yaml
+++ b/ONAP-ControlloopPolicy/src/test/resources/v2.0.0-guard/duplicate_guard_policy.yaml
diff --git a/ECOMP-ControlloopPolicy/src/test/resources/v2.0.0-guard/no_guard_constraint.yaml b/ONAP-ControlloopPolicy/src/test/resources/v2.0.0-guard/no_guard_constraint.yaml
index 6ab3d67fa..6ab3d67fa 100644
--- a/ECOMP-ControlloopPolicy/src/test/resources/v2.0.0-guard/no_guard_constraint.yaml
+++ b/ONAP-ControlloopPolicy/src/test/resources/v2.0.0-guard/no_guard_constraint.yaml
diff --git a/ECOMP-ControlloopPolicy/src/test/resources/v2.0.0-guard/no_guard_policy.yaml b/ONAP-ControlloopPolicy/src/test/resources/v2.0.0-guard/no_guard_policy.yaml
index 51f41d457..51f41d457 100644
--- a/ECOMP-ControlloopPolicy/src/test/resources/v2.0.0-guard/no_guard_policy.yaml
+++ b/ONAP-ControlloopPolicy/src/test/resources/v2.0.0-guard/no_guard_policy.yaml
diff --git a/ECOMP-ControlloopPolicy/src/test/resources/v2.0.0-guard/policy_guard_1707_appc.yaml b/ONAP-ControlloopPolicy/src/test/resources/v2.0.0-guard/policy_guard_1707_appc.yaml
index 6442cd5df..6442cd5df 100644
--- a/ECOMP-ControlloopPolicy/src/test/resources/v2.0.0-guard/policy_guard_1707_appc.yaml
+++ b/ONAP-ControlloopPolicy/src/test/resources/v2.0.0-guard/policy_guard_1707_appc.yaml
diff --git a/ECOMP-ControlloopPolicy/src/test/resources/v2.0.0-guard/policy_guard_OpenECOMP_demo_vDNS.yaml b/ONAP-ControlloopPolicy/src/test/resources/v2.0.0-guard/policy_guard_ONAP_demo_vDNS.yaml
index f2390fae0..f2390fae0 100644
--- a/ECOMP-ControlloopPolicy/src/test/resources/v2.0.0-guard/policy_guard_OpenECOMP_demo_vDNS.yaml
+++ b/ONAP-ControlloopPolicy/src/test/resources/v2.0.0-guard/policy_guard_ONAP_demo_vDNS.yaml
diff --git a/ECOMP-ControlloopPolicy/src/test/resources/v2.0.0/Demo-1.0.0-HeatTemplates/resource-59a2ee3fB58045feB5a1-template.yml b/ONAP-ControlloopPolicy/src/test/resources/v2.0.0/Demo-1.0.0-HeatTemplates/resource-59a2ee3fB58045feB5a1-template.yml
index f3e9bc4e4..4b501953c 100644
--- a/ECOMP-ControlloopPolicy/src/test/resources/v2.0.0/Demo-1.0.0-HeatTemplates/resource-59a2ee3fB58045feB5a1-template.yml
+++ b/ONAP-ControlloopPolicy/src/test/resources/v2.0.0/Demo-1.0.0-HeatTemplates/resource-59a2ee3fB58045feB5a1-template.yml
@@ -22,10 +22,10 @@ topology_template:
   inputs:
     vf_module_id:
       type: string
-      description: The vLoadBalancer Module ID is provided by ECOMP
-    ecomp_private_subnet_id:
+      description: The vLoadBalancer Module ID is provided by ONAP
+    onap_private_subnet_id:
       type: string
-      description: Private sub-network that connects ECOMP component and the VNF
+      description: Private sub-network that connects ONAP component and the VNF
     repo_url_blob:
       type: string
       description: URL of the repository that hosts the demo packages
@@ -42,15 +42,15 @@ topology_template:
     demo_artifacts_version:
       type: string
       description: Artifacts (jar, tar.gz) version used in demo vnfs
-    ecomp_private_net_id:
+    onap_private_net_id:
       type: string
-      description: Private network that connects ECOMP component and the VNF
+      description: Private network that connects ONAP component and the VNF
     pub_key:
       type: string
       description: Public key to be installed on the compute instance
     vlb_private_ip_1:
       type: string
-      description: Private IP address that is assigned to the vLoadBalancer to communicate with ECOMP components
+      description: Private IP address that is assigned to the vLoadBalancer to communicate with ONAP components
     key_name:
       type: string
       description: Public/Private key pair name
@@ -68,13 +68,13 @@ topology_template:
       description: Private IP address that is assigned to the vDNS to communicate with the vLoadBalancer
     vnf_id:
       type: string
-      description: The VNF ID is provided by ECOMP
+      description: The VNF ID is provided by ONAP
     dcae_collector_ip:
       type: string
       description: IP address of the DCAE collector
     vdns_private_ip_1:
       type: string
-      description: Private IP address that is assigned to the vDNS to communicate with ECOMP components
+      description: Private IP address that is assigned to the vDNS to communicate with ONAP components
     dcae_collector_port:
       type: string
       description: Port of the DCAE collector
@@ -89,12 +89,12 @@ topology_template:
     vlb_private_ip_0:
       type: string
       description: Private IP address that is assigned to the vLoadBalancer to communicate with the vDNSs
-    ecomp_private_net_cidr:
+    onap_private_net_cidr:
       type: string
       description: The CIDR of the protected private network
   node_templates:
     vdns_private_1_port:
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
+      type: org.onap.resource.cp.nodes.heat.network.neutron.Port
       metadata:
         invariantUUID: 7feb77d3-dcc5-4826-8a78-0c9089814a45
         UUID: 06bc8ea7-0f6a-489a-9f8f-c7253653b457
@@ -107,18 +107,18 @@ topology_template:
       properties:
         fixed_ips:
         - subnet:
-            get_input: ecomp_private_subnet_id
+            get_input: onap_private_subnet_id
           ip_address:
             get_input: vdns_private_ip_1
         network:
-          get_input: ecomp_private_net_id
+          get_input: onap_private_net_id
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
           node: vdns_0
           relationship: tosca.relationships.network.BindsTo
     vlb_private_network:
-      type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
+      type: org.onap.resource.vl.nodes.heat.network.neutron.Net
       metadata:
         invariantUUID: 2870cc3a-d6cd-4423-b7f6-2d63619b0eeb
         UUID: b7e764ba-17f9-4f0a-ad29-29877766ef21
@@ -138,7 +138,7 @@ topology_template:
             cidr:
               get_input: vlb_private_net_cidr
     vlb_private_1_port:
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
+      type: org.onap.resource.cp.nodes.heat.network.neutron.Port
       metadata:
         invariantUUID: 7feb77d3-dcc5-4826-8a78-0c9089814a45
         UUID: 06bc8ea7-0f6a-489a-9f8f-c7253653b457
@@ -151,18 +151,18 @@ topology_template:
       properties:
         fixed_ips:
         - subnet:
-            get_input: ecomp_private_subnet_id
+            get_input: onap_private_subnet_id
           ip_address:
             get_input: vlb_private_ip_1
         network:
-          get_input: ecomp_private_net_id
+          get_input: onap_private_net_id
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
           node: vlb_0
           relationship: tosca.relationships.network.BindsTo
     vdns_0:
-      type: org.openecomp.resource.vfc.59a2ee3fB58045feB5a1.abstact.nodes.heat.vdns
+      type: org.onap.resource.vfc.59a2ee3fB58045feB5a1.abstact.nodes.heat.vdns
       metadata:
         invariantUUID: ee585c30-127b-492e-b2c1-871dc61d1dde
         UUID: d816cb01-b5d0-4bbb-b614-f7c3e230ab19
@@ -187,7 +187,7 @@ topology_template:
         name:
           get_input: vdns_name_0
     vlb_private_0_port:
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
+      type: org.onap.resource.cp.nodes.heat.network.neutron.Port
       metadata:
         invariantUUID: 7feb77d3-dcc5-4826-8a78-0c9089814a45
         UUID: 06bc8ea7-0f6a-489a-9f8f-c7253653b457
@@ -213,7 +213,7 @@ topology_template:
           node: vlb_0
           relationship: tosca.relationships.network.BindsTo
     vdns_private_0_port:
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
+      type: org.onap.resource.cp.nodes.heat.network.neutron.Port
       metadata:
         invariantUUID: 7feb77d3-dcc5-4826-8a78-0c9089814a45
         UUID: 06bc8ea7-0f6a-489a-9f8f-c7253653b457
@@ -237,7 +237,7 @@ topology_template:
           node: vdns_0
           relationship: tosca.relationships.network.BindsTo
     vlb_0:
-      type: org.openecomp.resource.vfc.59a2ee3fB58045feB5a1.abstact.nodes.heat.vlb
+      type: org.onap.resource.vfc.59a2ee3fB58045feB5a1.abstact.nodes.heat.vlb
       metadata:
         invariantUUID: f7f1d745-cfb1-4aa9-83fc-31280d0ce513
         UUID: 1821f13e-411f-4b29-87a5-ae935897b2e1
@@ -263,7 +263,7 @@ topology_template:
           get_input: vlb_name_0
   groups:
     base_vlb:
-      type: org.openecomp.groups.heat.HeatStack
+      type: org.onap.groups.heat.HeatStack
       members:
       - vdns_private_1_port
       - vlb_private_network
@@ -278,7 +278,7 @@ topology_template:
         version: '1'
         name: base_vlb
     59a2ee3fB58045feB5a1..dnsscaling..module-1:
-      type: org.openecomp.groups.VfModule
+      type: org.onap.groups.VfModule
       members:
       - vdns_private_1_port
       - vdns_0
@@ -293,7 +293,7 @@ topology_template:
         vf_module_description:
         volume_group: false
     59a2ee3fB58045feB5a1..base_vlb..module-0:
-      type: org.openecomp.groups.VfModule
+      type: org.onap.groups.VfModule
       members:
       - vdns_private_1_port
       - vlb_private_network
@@ -312,7 +312,7 @@ topology_template:
         vf_module_description:
         volume_group: false
     dnsscaling:
-      type: org.openecomp.groups.heat.HeatStack
+      type: org.onap.groups.heat.HeatStack
       members:
       - vdns_private_1_port
       - vdns_0
@@ -323,10 +323,10 @@ topology_template:
         version: '1'
         name: dnsscaling
   substitution_mappings:
-    node_type: org.openecomp.resource.vf.59a2ee3fB58045feB5a1
+    node_type: org.onap.resource.vf.59a2ee3fB58045feB5a1
     capabilities:
       vdns_0.memory:
-        type: org.openecomp.capabilities.metric.Ceilometer
+        type: org.onap.capabilities.metric.Ceilometer
         description: Volume of RAM allocated to the instance
         occurrences:
         - 1
@@ -384,7 +384,7 @@ topology_template:
             type: string
             required: false
       vdns_0.memory.resident:
-        type: org.openecomp.capabilities.metric.Ceilometer
+        type: org.onap.capabilities.metric.Ceilometer
         description: Volume of RAM used by the instance on the physical machine
         occurrences:
         - 1
@@ -442,7 +442,7 @@ topology_template:
             type: string
             required: false
       vdns_0.cpu:
-        type: org.openecomp.capabilities.metric.Ceilometer
+        type: org.onap.capabilities.metric.Ceilometer
         description: CPU time used
         occurrences:
         - 1
@@ -568,7 +568,7 @@ topology_template:
         - 1
         - UNBOUNDED
       vlb_0.memory:
-        type: org.openecomp.capabilities.metric.Ceilometer
+        type: org.onap.capabilities.metric.Ceilometer
         description: Volume of RAM allocated to the instance
         occurrences:
         - 1
@@ -650,7 +650,7 @@ topology_template:
         - 0
         - UNBOUNDED
       vlb_0.vcpus:
-        type: org.openecomp.capabilities.metric.Ceilometer
+        type: org.onap.capabilities.metric.Ceilometer
         description: Average disk latency
         occurrences:
         - 1
@@ -708,7 +708,7 @@ topology_template:
             type: string
             required: false
       vlb_0.instance:
-        type: org.openecomp.capabilities.metric.Ceilometer
+        type: org.onap.capabilities.metric.Ceilometer
         description: Existence of instance
         occurrences:
         - 1
@@ -794,7 +794,7 @@ topology_template:
         - 1
         - UNBOUNDED
       vlb_0.cpu:
-        type: org.openecomp.capabilities.metric.Ceilometer
+        type: org.onap.capabilities.metric.Ceilometer
         description: CPU time used
         occurrences:
         - 1
@@ -852,7 +852,7 @@ topology_template:
             type: string
             required: false
       vdns_0.cpu.delta:
-        type: org.openecomp.capabilities.metric.Ceilometer
+        type: org.onap.capabilities.metric.Ceilometer
         description: CPU time used since previous datapoint
         occurrences:
         - 1
@@ -910,7 +910,7 @@ topology_template:
             type: string
             required: false
       vlb_0.memory.resident:
-        type: org.openecomp.capabilities.metric.Ceilometer
+        type: org.onap.capabilities.metric.Ceilometer
         description: Volume of RAM used by the instance on the physical machine
         occurrences:
         - 1
@@ -968,7 +968,7 @@ topology_template:
             type: string
             required: false
       vdns_0.vcpus:
-        type: org.openecomp.capabilities.metric.Ceilometer
+        type: org.onap.capabilities.metric.Ceilometer
         description: Average disk latency
         occurrences:
         - 1
@@ -1026,7 +1026,7 @@ topology_template:
             type: string
             required: false
       vdns_0.memory.usage:
-        type: org.openecomp.capabilities.metric.Ceilometer
+        type: org.onap.capabilities.metric.Ceilometer
         description: Volume of RAM used by the instance from the amount of its allocated memory
         occurrences:
         - 1
@@ -1084,7 +1084,7 @@ topology_template:
             type: string
             required: false
       vlb_0.cpu.delta:
-        type: org.openecomp.capabilities.metric.Ceilometer
+        type: org.onap.capabilities.metric.Ceilometer
         description: CPU time used since previous datapoint
         occurrences:
         - 1
@@ -1142,7 +1142,7 @@ topology_template:
             type: string
             required: false
       vdns_0.instance:type:
-        type: org.openecomp.capabilities.metric.Ceilometer
+        type: org.onap.capabilities.metric.Ceilometer
         description: Existence of instance <type> (OpenStack types)
         occurrences:
         - 1
@@ -1243,7 +1243,7 @@ topology_template:
             type: scalar-unit.size
             required: false
       vlb_0.instance:type:
-        type: org.openecomp.capabilities.metric.Ceilometer
+        type: org.onap.capabilities.metric.Ceilometer
         description: Existence of instance <type> (OpenStack types)
         occurrences:
         - 1
@@ -1316,7 +1316,7 @@ topology_template:
         - 0
         - UNBOUNDED
       vlb_0.cpu_util:
-        type: org.openecomp.capabilities.metric.Ceilometer
+        type: org.onap.capabilities.metric.Ceilometer
         description: Average CPU utilization
         occurrences:
         - 1
@@ -1384,7 +1384,7 @@ topology_template:
         - 1
         - UNBOUNDED
       vdns_0.cpu_util:
-        type: org.openecomp.capabilities.metric.Ceilometer
+        type: org.onap.capabilities.metric.Ceilometer
         description: Average CPU utilization
         occurrences:
         - 1
@@ -1442,7 +1442,7 @@ topology_template:
             type: string
             required: false
       vdns_0.instance:
-        type: org.openecomp.capabilities.metric.Ceilometer
+        type: org.onap.capabilities.metric.Ceilometer
         description: Existence of instance
         occurrences:
         - 1
@@ -1524,7 +1524,7 @@ topology_template:
         - 1
         - UNBOUNDED
       vlb_0.memory.usage:
-        type: org.openecomp.capabilities.metric.Ceilometer
+        type: org.onap.capabilities.metric.Ceilometer
         description: Volume of RAM used by the instance from the amount of its allocated memory
         occurrences:
         - 1
diff --git a/ECOMP-ControlloopPolicy/src/test/resources/v2.0.0/Demo-1.0.0-HeatTemplates/resource-Eace933104d443b496b8-template.yml b/ONAP-ControlloopPolicy/src/test/resources/v2.0.0/Demo-1.0.0-HeatTemplates/resource-Eace933104d443b496b8-template.yml
index 3ce20b597..38e6b01eb 100644
--- a/ECOMP-ControlloopPolicy/src/test/resources/v2.0.0/Demo-1.0.0-HeatTemplates/resource-Eace933104d443b496b8-template.yml
+++ b/ONAP-ControlloopPolicy/src/test/resources/v2.0.0/Demo-1.0.0-HeatTemplates/resource-Eace933104d443b496b8-template.yml
@@ -24,7 +24,7 @@ topology_template:
   inputs:
     vf_module_id:
       type: string
-      description: The vFirewall Module ID is provided by ECOMP
+      description: The vFirewall Module ID is provided by ONAP
     repo_url_blob:
       type: string
       description: URL of the repository that hosts the demo packages
@@ -40,13 +40,13 @@ topology_template:
       description: Private IP address that is assigned to the vFirewall to communicate with the vPacketGenerator
     vfw_private_ip_2:
       type: string
-      description: Private IP address that is assigned to the vFirewall to communicate with ECOMP components
+      description: Private IP address that is assigned to the vFirewall to communicate with ONAP components
     vfw_name_0:
       type: string
       description: Name of the vFirewall
     vnf_id:
       type: string
-      description: The VNF ID is provided by ECOMP
+      description: The VNF ID is provided by ONAP
     dcae_collector_ip:
       type: string
       description: IP address of the DCAE collector
@@ -55,7 +55,7 @@ topology_template:
       description: Port of the DCAE collector
     vpg_private_ip_1:
       type: string
-      description: Private IP address that is assigned to the vPacketGenerator to communicate with ECOMP components
+      description: Private IP address that is assigned to the vPacketGenerator to communicate with ONAP components
     vsn_private_ip_0:
       type: string
       description: Private IP address that is assigned to the vSink to communicate with the vFirewall
@@ -67,19 +67,19 @@ topology_template:
       description: Private IP address that is assigned to the vPacketGenerator to communicate with the vFirewall
     vsn_private_ip_1:
       type: string
-      description: Private IP address that is assigned to the vSink to communicate with ECOMP components
+      description: Private IP address that is assigned to the vSink to communicate with ONAP components
     protected_private_net_cidr:
       type: string
       description: The CIDR of the protected private network
-    ecomp_private_net_cidr:
+    onap_private_net_cidr:
       type: string
       description: The CIDR of the protected private network
     unprotected_private_net_cidr:
       type: string
       description: The CIDR of the unprotected private network
-    ecomp_private_subnet_id:
+    onap_private_subnet_id:
       type: string
-      description: Private sub-network that connects ECOMP component and the VNF
+      description: Private sub-network that connects ONAP component and the VNF
     vsn_name_0:
       type: string
       description: Name of the vSink
@@ -93,9 +93,9 @@ topology_template:
     demo_artifacts_version:
       type: string
       description: Artifacts (jar, tar.gz) version used in demo vnfs
-    ecomp_private_net_id:
+    onap_private_net_id:
       type: string
-      description: Private network that connects ECOMP component and the VNF
+      description: Private network that connects ONAP component and the VNF
     pub_key:
       type: string
       description: Public key to be installed on the compute instance
@@ -114,7 +114,7 @@ topology_template:
       description: Private network that connects vFirewall with vSink
   node_templates:
     vfw_private_0_port:
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
+      type: org.onap.resource.cp.nodes.heat.network.neutron.Port
       metadata:
         invariantUUID: 7feb77d3-dcc5-4826-8a78-0c9089814a45
         UUID: 06bc8ea7-0f6a-489a-9f8f-c7253653b457
@@ -140,7 +140,7 @@ topology_template:
           node: vfw_0
           relationship: tosca.relationships.network.BindsTo
     vsn_private_1_port:
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
+      type: org.onap.resource.cp.nodes.heat.network.neutron.Port
       metadata:
         invariantUUID: 7feb77d3-dcc5-4826-8a78-0c9089814a45
         UUID: 06bc8ea7-0f6a-489a-9f8f-c7253653b457
@@ -153,18 +153,18 @@ topology_template:
       properties:
         fixed_ips:
         - subnet:
-            get_input: ecomp_private_subnet_id
+            get_input: onap_private_subnet_id
           ip_address:
             get_input: vsn_private_ip_1
         network:
-          get_input: ecomp_private_net_id
+          get_input: onap_private_net_id
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
           node: vsn_0
           relationship: tosca.relationships.network.BindsTo
     unprotected_private_network:
-      type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
+      type: org.onap.resource.vl.nodes.heat.network.neutron.Net
       metadata:
         invariantUUID: 2870cc3a-d6cd-4423-b7f6-2d63619b0eeb
         UUID: b7e764ba-17f9-4f0a-ad29-29877766ef21
@@ -182,7 +182,7 @@ topology_template:
             cidr:
               get_input: unprotected_private_net_cidr
     vpg_private_1_port:
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
+      type: org.onap.resource.cp.nodes.heat.network.neutron.Port
       metadata:
         invariantUUID: 7feb77d3-dcc5-4826-8a78-0c9089814a45
         UUID: 06bc8ea7-0f6a-489a-9f8f-c7253653b457
@@ -195,18 +195,18 @@ topology_template:
       properties:
         fixed_ips:
         - subnet:
-            get_input: ecomp_private_subnet_id
+            get_input: onap_private_subnet_id
           ip_address:
             get_input: vpg_private_ip_1
         network:
-          get_input: ecomp_private_net_id
+          get_input: onap_private_net_id
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
           node: vpg_0
           relationship: tosca.relationships.network.BindsTo
     vfw_0:
-      type: org.openecomp.resource.vfc.Eace933104d443b496b8.abstact.nodes.heat.vfw
+      type: org.onap.resource.vfc.Eace933104d443b496b8.abstact.nodes.heat.vfw
       metadata:
         invariantUUID: 0129e34c-d9fa-442d-bb2c-f925d018000a
         UUID: 7fa1f6c7-c6bd-4444-8db2-63334a5aed1b
@@ -231,7 +231,7 @@ topology_template:
         name:
           get_input: vfw_name_0
     vsn_0:
-      type: org.openecomp.resource.vfc.Eace933104d443b496b8.abstact.nodes.heat.vsn
+      type: org.onap.resource.vfc.Eace933104d443b496b8.abstact.nodes.heat.vsn
       metadata:
         invariantUUID: b19f6643-3db0-4d73-b280-94d6f21caa71
         UUID: 6dca6eb9-330c-4090-a542-7aca5f446e21
@@ -256,7 +256,7 @@ topology_template:
         name:
           get_input: vsn_name_0
     vpg_private_0_port:
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
+      type: org.onap.resource.cp.nodes.heat.network.neutron.Port
       metadata:
         invariantUUID: 7feb77d3-dcc5-4826-8a78-0c9089814a45
         UUID: 06bc8ea7-0f6a-489a-9f8f-c7253653b457
@@ -282,7 +282,7 @@ topology_template:
           node: vpg_0
           relationship: tosca.relationships.network.BindsTo
     vsn_private_0_port:
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
+      type: org.onap.resource.cp.nodes.heat.network.neutron.Port
       metadata:
         invariantUUID: 7feb77d3-dcc5-4826-8a78-0c9089814a45
         UUID: 06bc8ea7-0f6a-489a-9f8f-c7253653b457
@@ -308,7 +308,7 @@ topology_template:
           node: vsn_0
           relationship: tosca.relationships.network.BindsTo
     vfw_private_1_port:
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
+      type: org.onap.resource.cp.nodes.heat.network.neutron.Port
       metadata:
         invariantUUID: 7feb77d3-dcc5-4826-8a78-0c9089814a45
         UUID: 06bc8ea7-0f6a-489a-9f8f-c7253653b457
@@ -334,7 +334,7 @@ topology_template:
           node: vfw_0
           relationship: tosca.relationships.network.BindsTo
     vfw_private_2_port:
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
+      type: org.onap.resource.cp.nodes.heat.network.neutron.Port
       metadata:
         invariantUUID: 7feb77d3-dcc5-4826-8a78-0c9089814a45
         UUID: 06bc8ea7-0f6a-489a-9f8f-c7253653b457
@@ -347,18 +347,18 @@ topology_template:
       properties:
         fixed_ips:
         - subnet:
-            get_input: ecomp_private_subnet_id
+            get_input: onap_private_subnet_id
           ip_address:
             get_input: vfw_private_ip_2
         network:
-          get_input: ecomp_private_net_id
+          get_input: onap_private_net_id
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
           node: vfw_0
           relationship: tosca.relationships.network.BindsTo
     vpg_0:
-      type: org.openecomp.resource.vfc.Eace933104d443b496b8.abstact.nodes.heat.vpg
+      type: org.onap.resource.vfc.Eace933104d443b496b8.abstact.nodes.heat.vpg
       metadata:
         invariantUUID: 7654ae14-4e98-45bc-a8c0-2c43e1805bb4
         UUID: 5267d6dd-f676-4f98-abec-6387ce6beaf2
@@ -383,7 +383,7 @@ topology_template:
         name:
           get_input: vpg_name_0
     protected_private_network:
-      type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
+      type: org.onap.resource.vl.nodes.heat.network.neutron.Net
       metadata:
         invariantUUID: 2870cc3a-d6cd-4423-b7f6-2d63619b0eeb
         UUID: b7e764ba-17f9-4f0a-ad29-29877766ef21
@@ -402,7 +402,7 @@ topology_template:
               get_input: protected_private_net_cidr
   groups:
     base_vfw:
-      type: org.openecomp.groups.heat.HeatStack
+      type: org.onap.groups.heat.HeatStack
       members:
       - vfw_private_0_port
       - vsn_private_1_port
@@ -422,7 +422,7 @@ topology_template:
         version: '1'
         name: base_vfw
     Eace933104d443b496b8..base_vfw..module-0:
-      type: org.openecomp.groups.VfModule
+      type: org.onap.groups.VfModule
       members:
       - vfw_private_0_port
       - vsn_private_1_port
@@ -446,10 +446,10 @@ topology_template:
         vf_module_description:
         volume_group: false
   substitution_mappings:
-    node_type: org.openecomp.resource.vf.Eace933104d443b496b8
+    node_type: org.onap.resource.vf.Eace933104d443b496b8
     capabilities:
       vfw_0.instance:
-        type: org.openecomp.capabilities.metric.Ceilometer
+        type: org.onap.capabilities.metric.Ceilometer
         description: Existence of instance
         occurrences:
         - 1
@@ -521,7 +521,7 @@ topology_template:
           default_instances:
             type: integer
       vfw_0.instance:type:
-        type: org.openecomp.capabilities.metric.Ceilometer
+        type: org.onap.capabilities.metric.Ceilometer
         description: Existence of instance <type> (OpenStack types)
         occurrences:
         - 1
@@ -584,7 +584,7 @@ topology_template:
         - 0
         - UNBOUNDED
       vsn_0.cpu:
-        type: org.openecomp.capabilities.metric.Ceilometer
+        type: org.onap.capabilities.metric.Ceilometer
         description: CPU time used
         occurrences:
         - 1
@@ -642,7 +642,7 @@ topology_template:
             type: string
             required: false
       vpg_0.instance:type:
-        type: org.openecomp.capabilities.metric.Ceilometer
+        type: org.onap.capabilities.metric.Ceilometer
         description: Existence of instance <type> (OpenStack types)
         occurrences:
         - 1
@@ -705,7 +705,7 @@ topology_template:
         - 1
         - UNBOUNDED
       vfw_0.memory:
-        type: org.openecomp.capabilities.metric.Ceilometer
+        type: org.onap.capabilities.metric.Ceilometer
         description: Volume of RAM allocated to the instance
         occurrences:
         - 1
@@ -763,7 +763,7 @@ topology_template:
             type: string
             required: false
       vpg_0.cpu_util:
-        type: org.openecomp.capabilities.metric.Ceilometer
+        type: org.onap.capabilities.metric.Ceilometer
         description: Average CPU utilization
         occurrences:
         - 1
@@ -869,7 +869,7 @@ topology_template:
         - 1
         - UNBOUNDED
       vpg_0.cpu:
-        type: org.openecomp.capabilities.metric.Ceilometer
+        type: org.onap.capabilities.metric.Ceilometer
         description: CPU time used
         occurrences:
         - 1
@@ -932,7 +932,7 @@ topology_template:
         - 1
         - UNBOUNDED
       vsn_0.vcpus:
-        type: org.openecomp.capabilities.metric.Ceilometer
+        type: org.onap.capabilities.metric.Ceilometer
         description: Average disk latency
         occurrences:
         - 1
@@ -990,7 +990,7 @@ topology_template:
             type: string
             required: false
       vpg_0.cpu.delta:
-        type: org.openecomp.capabilities.metric.Ceilometer
+        type: org.onap.capabilities.metric.Ceilometer
         description: CPU time used since previous datapoint
         occurrences:
         - 1
@@ -1053,7 +1053,7 @@ topology_template:
         - 1
         - UNBOUNDED
       vsn_0.cpu_util:
-        type: org.openecomp.capabilities.metric.Ceilometer
+        type: org.onap.capabilities.metric.Ceilometer
         description: Average CPU utilization
         occurrences:
         - 1
@@ -1111,7 +1111,7 @@ topology_template:
             type: string
             required: false
       vpg_0.instance:
-        type: org.openecomp.capabilities.metric.Ceilometer
+        type: org.onap.capabilities.metric.Ceilometer
         description: Existence of instance
         occurrences:
         - 1
@@ -1188,7 +1188,7 @@ topology_template:
           default_instances:
             type: integer
       vpg_0.memory:
-        type: org.openecomp.capabilities.metric.Ceilometer
+        type: org.onap.capabilities.metric.Ceilometer
         description: Volume of RAM allocated to the instance
         occurrences:
         - 1
@@ -1269,7 +1269,7 @@ topology_template:
             type: string
             required: false
       vfw_0.memory.resident:
-        type: org.openecomp.capabilities.metric.Ceilometer
+        type: org.onap.capabilities.metric.Ceilometer
         description: Volume of RAM used by the instance on the physical machine
         occurrences:
         - 1
@@ -1341,7 +1341,7 @@ topology_template:
           default_instances:
             type: integer
       vsn_0.instance:
-        type: org.openecomp.capabilities.metric.Ceilometer
+        type: org.onap.capabilities.metric.Ceilometer
         description: Existence of instance
         occurrences:
         - 1
@@ -1432,7 +1432,7 @@ topology_template:
             type: string
             required: false
       vsn_0.cpu.delta:
-        type: org.openecomp.capabilities.metric.Ceilometer
+        type: org.onap.capabilities.metric.Ceilometer
         description: CPU time used since previous datapoint
         occurrences:
         - 1
@@ -1518,7 +1518,7 @@ topology_template:
         - 1
         - UNBOUNDED
       vfw_0.memory.usage:
-        type: org.openecomp.capabilities.metric.Ceilometer
+        type: org.onap.capabilities.metric.Ceilometer
         description: Volume of RAM used by the instance from the amount of its allocated memory
         occurrences:
         - 1
@@ -1596,7 +1596,7 @@ topology_template:
             type: scalar-unit.size
             required: false
       vsn_0.memory:
-        type: org.openecomp.capabilities.metric.Ceilometer
+        type: org.onap.capabilities.metric.Ceilometer
         description: Volume of RAM allocated to the instance
         occurrences:
         - 1
@@ -1694,7 +1694,7 @@ topology_template:
         - 1
         - UNBOUNDED
       vpg_0.vcpus:
-        type: org.openecomp.capabilities.metric.Ceilometer
+        type: org.onap.capabilities.metric.Ceilometer
         description: Average disk latency
         occurrences:
         - 1
@@ -1792,7 +1792,7 @@ topology_template:
         - 0
         - UNBOUNDED
       vpg_0.memory.usage:
-        type: org.openecomp.capabilities.metric.Ceilometer
+        type: org.onap.capabilities.metric.Ceilometer
         description: Volume of RAM used by the instance from the amount of its allocated memory
         occurrences:
         - 1
@@ -1898,7 +1898,7 @@ topology_template:
         - 1
         - UNBOUNDED
       vfw_0.cpu:
-        type: org.openecomp.capabilities.metric.Ceilometer
+        type: org.onap.capabilities.metric.Ceilometer
         description: CPU time used
         occurrences:
         - 1
@@ -1956,7 +1956,7 @@ topology_template:
             type: string
             required: false
       vsn_0.instance:type:
-        type: org.openecomp.capabilities.metric.Ceilometer
+        type: org.onap.capabilities.metric.Ceilometer
         description: Existence of instance <type> (OpenStack types)
         occurrences:
         - 1
@@ -2037,7 +2037,7 @@ topology_template:
         - 1
         - UNBOUNDED
       vfw_0.vcpus:
-        type: org.openecomp.capabilities.metric.Ceilometer
+        type: org.onap.capabilities.metric.Ceilometer
         description: Average disk latency
         occurrences:
         - 1
@@ -2095,7 +2095,7 @@ topology_template:
             type: string
             required: false
       vfw_0.cpu.delta:
-        type: org.openecomp.capabilities.metric.Ceilometer
+        type: org.onap.capabilities.metric.Ceilometer
         description: CPU time used since previous datapoint
         occurrences:
         - 1
@@ -2153,7 +2153,7 @@ topology_template:
             type: string
             required: false
       vsn_0.memory.resident:
-        type: org.openecomp.capabilities.metric.Ceilometer
+        type: org.onap.capabilities.metric.Ceilometer
         description: Volume of RAM used by the instance on the physical machine
         occurrences:
         - 1
@@ -2211,7 +2211,7 @@ topology_template:
             type: string
             required: false
       vsn_0.memory.usage:
-        type: org.openecomp.capabilities.metric.Ceilometer
+        type: org.onap.capabilities.metric.Ceilometer
         description: Volume of RAM used by the instance from the amount of its allocated memory
         occurrences:
         - 1
@@ -2274,7 +2274,7 @@ topology_template:
         - 1
         - UNBOUNDED
       vfw_0.cpu_util:
-        type: org.openecomp.capabilities.metric.Ceilometer
+        type: org.onap.capabilities.metric.Ceilometer
         description: Average CPU utilization
         occurrences:
         - 1
@@ -2332,7 +2332,7 @@ topology_template:
             type: string
             required: false
       vpg_0.memory.resident:
-        type: org.openecomp.capabilities.metric.Ceilometer
+        type: org.onap.capabilities.metric.Ceilometer
         description: Volume of RAM used by the instance on the physical machine
         occurrences:
         - 1
diff --git a/ECOMP-ControlloopPolicy/src/test/resources/v2.0.0/Demo-1.0.0-HeatTemplates/service-57e66ea70ed645c7970f-template.yml b/ONAP-ControlloopPolicy/src/test/resources/v2.0.0/Demo-1.0.0-HeatTemplates/service-57e66ea70ed645c7970f-template.yml
index b59c85269..4bfd629e9 100644
--- a/ECOMP-ControlloopPolicy/src/test/resources/v2.0.0/Demo-1.0.0-HeatTemplates/service-57e66ea70ed645c7970f-template.yml
+++ b/ONAP-ControlloopPolicy/src/test/resources/v2.0.0/Demo-1.0.0-HeatTemplates/service-57e66ea70ed645c7970f-template.yml
@@ -6,7 +6,7 @@ metadata:
   description: catalog service description
   type: Service
   category: Network L1-3
-  serviceEcompNaming: false
+  serviceOnapNaming: false
   serviceHoming: false
 imports:
 - eace9331-04d4-43b4-96b8:
@@ -14,7 +14,7 @@ imports:
 topology_template:
   node_templates:
     eace9331-04d4-43b4-96b8 1:
-      type: org.openecomp.resource.vf.Eace933104d443b496b8
+      type: org.onap.resource.vf.Eace933104d443b496b8
       metadata:
         invariantUUID: 06fe411e-d006-4ac3-8b0e-fb4f13cd78d3
         UUID: 172ce7c5-c2e4-4f8d-b66c-edb49e8e548a
@@ -25,10 +25,10 @@ topology_template:
         category: Generic
         subcategory: Abstract
   substitution_mappings:
-    node_type: org.openecomp.service.57e66ea70ed645c7970f
+    node_type: org.onap.service.57e66ea70ed645c7970f
     capabilities:
       eace9331-04d4-43b4-96b8 1.memory.resident:
-        type: org.openecomp.capabilities.metric.Ceilometer
+        type: org.onap.capabilities.metric.Ceilometer
         description: Volume of RAM used by the instance on the physical machine
         occurrences:
         - 1
@@ -129,7 +129,7 @@ topology_template:
             type: scalar-unit.size
             required: false
       eace9331-04d4-43b4-96b8 1.instance:
-        type: org.openecomp.capabilities.metric.Ceilometer
+        type: org.onap.capabilities.metric.Ceilometer
         description: Existence of instance
         occurrences:
         - 1
@@ -201,7 +201,7 @@ topology_template:
           default_instances:
             type: integer
       eace9331-04d4-43b4-96b8 1.memory:
-        type: org.openecomp.capabilities.metric.Ceilometer
+        type: org.onap.capabilities.metric.Ceilometer
         description: Volume of RAM allocated to the instance
         occurrences:
         - 1
@@ -264,7 +264,7 @@ topology_template:
         - 1
         - UNBOUNDED
       eace9331-04d4-43b4-96b8 1.vcpus:
-        type: org.openecomp.capabilities.metric.Ceilometer
+        type: org.onap.capabilities.metric.Ceilometer
         description: Average disk latency
         occurrences:
         - 1
@@ -322,7 +322,7 @@ topology_template:
             type: string
             required: false
       eace9331-04d4-43b4-96b8 1.cpu_util:
-        type: org.openecomp.capabilities.metric.Ceilometer
+        type: org.onap.capabilities.metric.Ceilometer
         description: Average CPU utilization
         occurrences:
         - 1
@@ -380,7 +380,7 @@ topology_template:
             type: string
             required: false
       eace9331-04d4-43b4-96b8 1.cpu.delta:
-        type: org.openecomp.capabilities.metric.Ceilometer
+        type: org.onap.capabilities.metric.Ceilometer
         description: CPU time used since previous datapoint
         occurrences:
         - 1
@@ -443,7 +443,7 @@ topology_template:
         - 1
         - UNBOUNDED
       eace9331-04d4-43b4-96b8 1.cpu:
-        type: org.openecomp.capabilities.metric.Ceilometer
+        type: org.onap.capabilities.metric.Ceilometer
         description: CPU time used
         occurrences:
         - 1
@@ -501,7 +501,7 @@ topology_template:
             type: string
             required: false
       eace9331-04d4-43b4-96b8 1.instance:type:
-        type: org.openecomp.capabilities.metric.Ceilometer
+        type: org.onap.capabilities.metric.Ceilometer
         description: Existence of instance <type> (OpenStack types)
         occurrences:
         - 1
@@ -564,7 +564,7 @@ topology_template:
         - 0
         - UNBOUNDED
       eace9331-04d4-43b4-96b8 1.memory.usage:
-        type: org.openecomp.capabilities.metric.Ceilometer
+        type: org.onap.capabilities.metric.Ceilometer
         description: Volume of RAM used by the instance from the amount of its allocated memory
         occurrences:
         - 1
diff --git a/ECOMP-ControlloopPolicy/src/test/resources/v2.0.0/Demo-1.0.0-HeatTemplates/service-D473899264974dca9db9-template.yml b/ONAP-ControlloopPolicy/src/test/resources/v2.0.0/Demo-1.0.0-HeatTemplates/service-D473899264974dca9db9-template.yml
index 302cacc0a..2293b3aca 100644
--- a/ECOMP-ControlloopPolicy/src/test/resources/v2.0.0/Demo-1.0.0-HeatTemplates/service-D473899264974dca9db9-template.yml
+++ b/ONAP-ControlloopPolicy/src/test/resources/v2.0.0/Demo-1.0.0-HeatTemplates/service-D473899264974dca9db9-template.yml
@@ -6,7 +6,7 @@ metadata:
   description: catalog service description
   type: Service
   category: Network L1-3
-  serviceEcompNaming: false
+  serviceOnapNaming: false
   serviceHoming: false
 imports:
 - 59a2ee3f-b580-45fe-b5a1:
@@ -14,7 +14,7 @@ imports:
 topology_template:
   node_templates:
     59a2ee3f-b580-45fe-b5a1 1:
-      type: org.openecomp.resource.vf.59a2ee3fB58045feB5a1
+      type: org.onap.resource.vf.59a2ee3fB58045feB5a1
       metadata:
         invariantUUID: 4b8d4018-068b-4c33-b9bb-d980798e52c2
         UUID: d7d28881-b24d-4512-bfee-1e2eb335591f
@@ -25,10 +25,10 @@ topology_template:
         category: Generic
         subcategory: Abstract
   substitution_mappings:
-    node_type: org.openecomp.service.D473899264974dca9db9
+    node_type: org.onap.service.D473899264974dca9db9
     capabilities:
       59a2ee3f-b580-45fe-b5a1 1.memory.resident:
-        type: org.openecomp.capabilities.metric.Ceilometer
+        type: org.onap.capabilities.metric.Ceilometer
         description: Volume of RAM used by the instance on the physical machine
         occurrences:
         - 1
@@ -134,7 +134,7 @@ topology_template:
         - 0
         - UNBOUNDED
       59a2ee3f-b580-45fe-b5a1 1.vcpus:
-        type: org.openecomp.capabilities.metric.Ceilometer
+        type: org.onap.capabilities.metric.Ceilometer
         description: Average disk latency
         occurrences:
         - 1
@@ -212,7 +212,7 @@ topology_template:
             type: scalar-unit.size
             required: false
       59a2ee3f-b580-45fe-b5a1 1.memory.usage:
-        type: org.openecomp.capabilities.metric.Ceilometer
+        type: org.onap.capabilities.metric.Ceilometer
         description: Volume of RAM used by the instance from the amount of its allocated memory
         occurrences:
         - 1
@@ -270,7 +270,7 @@ topology_template:
             type: string
             required: false
       59a2ee3f-b580-45fe-b5a1 1.instance:
-        type: org.openecomp.capabilities.metric.Ceilometer
+        type: org.onap.capabilities.metric.Ceilometer
         description: Existence of instance
         occurrences:
         - 1
@@ -342,7 +342,7 @@ topology_template:
           default_instances:
             type: integer
       59a2ee3f-b580-45fe-b5a1 1.cpu_util:
-        type: org.openecomp.capabilities.metric.Ceilometer
+        type: org.onap.capabilities.metric.Ceilometer
         description: Average CPU utilization
         occurrences:
         - 1
@@ -400,7 +400,7 @@ topology_template:
             type: string
             required: false
       59a2ee3f-b580-45fe-b5a1 1.instance:type:
-        type: org.openecomp.capabilities.metric.Ceilometer
+        type: org.onap.capabilities.metric.Ceilometer
         description: Existence of instance <type> (OpenStack types)
         occurrences:
         - 1
@@ -458,7 +458,7 @@ topology_template:
             type: string
             required: false
       59a2ee3f-b580-45fe-b5a1 1.cpu.delta:
-        type: org.openecomp.capabilities.metric.Ceilometer
+        type: org.onap.capabilities.metric.Ceilometer
         description: CPU time used since previous datapoint
         occurrences:
         - 1
@@ -516,7 +516,7 @@ topology_template:
             type: string
             required: false
       59a2ee3f-b580-45fe-b5a1 1.memory:
-        type: org.openecomp.capabilities.metric.Ceilometer
+        type: org.onap.capabilities.metric.Ceilometer
         description: Volume of RAM allocated to the instance
         occurrences:
         - 1
@@ -579,7 +579,7 @@ topology_template:
         - 0
         - UNBOUNDED
       59a2ee3f-b580-45fe-b5a1 1.cpu:
-        type: org.openecomp.capabilities.metric.Ceilometer
+        type: org.onap.capabilities.metric.Ceilometer
         description: CPU time used
         occurrences:
         - 1
diff --git a/ECOMP-ControlloopPolicy/src/test/resources/v2.0.0/pgstreams.json b/ONAP-ControlloopPolicy/src/test/resources/v2.0.0/pgstreams.json
index 4d118afa1..4d118afa1 100644
--- a/ECOMP-ControlloopPolicy/src/test/resources/v2.0.0/pgstreams.json
+++ b/ONAP-ControlloopPolicy/src/test/resources/v2.0.0/pgstreams.json
diff --git a/ECOMP-ControlloopPolicy/src/test/resources/v2.0.0/policy_OpenECOMP_demo_vDNS.yaml b/ONAP-ControlloopPolicy/src/test/resources/v2.0.0/policy_ONAP_demo_vDNS.yaml
index 5deb8f7ff..5deb8f7ff 100644
--- a/ECOMP-ControlloopPolicy/src/test/resources/v2.0.0/policy_OpenECOMP_demo_vDNS.yaml
+++ b/ONAP-ControlloopPolicy/src/test/resources/v2.0.0/policy_ONAP_demo_vDNS.yaml
diff --git a/ECOMP-ControlloopPolicy/src/test/resources/v2.0.0/policy_OpenECOMP_demo_vFirewall.yaml b/ONAP-ControlloopPolicy/src/test/resources/v2.0.0/policy_ONAP_demo_vFirewall.yaml
index 51597714c..51597714c 100644
--- a/ECOMP-ControlloopPolicy/src/test/resources/v2.0.0/policy_OpenECOMP_demo_vFirewall.yaml
+++ b/ONAP-ControlloopPolicy/src/test/resources/v2.0.0/policy_ONAP_demo_vFirewall.yaml
diff --git a/ECOMP-PAP-REST/.gitignore b/ONAP-PAP-REST/.gitignore
index 8567d5825..8567d5825 100644
--- a/ECOMP-PAP-REST/.gitignore
+++ b/ONAP-PAP-REST/.gitignore
diff --git a/ECOMP-PAP-REST/WebContent/META-INF/MANIFEST.MF b/ONAP-PAP-REST/WebContent/META-INF/MANIFEST.MF
index 59499bce4..59499bce4 100644
--- a/ECOMP-PAP-REST/WebContent/META-INF/MANIFEST.MF
+++ b/ONAP-PAP-REST/WebContent/META-INF/MANIFEST.MF
diff --git a/ECOMP-PAP-REST/WebContent/README.txt b/ONAP-PAP-REST/WebContent/README.txt
index e69de29bb..e69de29bb 100644
--- a/ECOMP-PAP-REST/WebContent/README.txt
+++ b/ONAP-PAP-REST/WebContent/README.txt
diff --git a/ECOMP-PAP-REST/autopush.properties b/ONAP-PAP-REST/autopush.properties
index 481c33c56..e7428d8ee 100644
--- a/ECOMP-PAP-REST/autopush.properties
+++ b/ONAP-PAP-REST/autopush.properties
@@ -1,6 +1,6 @@
 ###
 # ============LICENSE_START=======================================================
-# ECOMP-PAP-REST
+# ONAP-PAP-REST
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
diff --git a/ECOMP-PAP-REST/dictionaryItemsAPI.json b/ONAP-PAP-REST/dictionaryItemsAPI.json
index 4a4219700..cb259f387 100644
--- a/ECOMP-PAP-REST/dictionaryItemsAPI.json
+++ b/ONAP-PAP-REST/dictionaryItemsAPI.json
@@ -18,10 +18,10 @@
 				"name": "attributeValue"
 			}]
 		}, {
-			"name": "ecompname",
-			"table": "EcompName",
+			"name": "onapname",
+			"table": "OnapName",
 			"fields": [{
-				"name": "ecompName"
+				"name": "onapName"
 			}, {
 				"name": "description"
 			}]
diff --git a/ECOMP-PAP-REST/pip.properties b/ONAP-PAP-REST/pip.properties
index d9df903e4..b5d46af57 100644
--- a/ECOMP-PAP-REST/pip.properties
+++ b/ONAP-PAP-REST/pip.properties
@@ -5,11 +5,11 @@ xacml.pip.engines=AAF,historydb
 
 ### AAF PIP Configuration. 
 AAF.description=AAFEngine to communicate with AAF to take decisions
-AAF.classname=org.openecomp.policy.xacml.std.pip.engines.aaf.AAFEngine
+AAF.classname=org.onap.policy.xacml.std.pip.engines.aaf.AAFEngine
 AAF.name=AAFEngine
 
 # PIP Engine Definition
 #
-historydb.classname=org.openecomp.policy.xacml.std.pip.engines.OperationHistoryEngine
+historydb.classname=org.onap.policy.xacml.std.pip.engines.OperationHistoryEngine
 historydb.issuer=org:onap:xacml:guard:historydb
 historydb.name=operationHistoryDB
\ No newline at end of file
diff --git a/ECOMP-PAP-REST/policyLogger.properties b/ONAP-PAP-REST/policyLogger.properties
index a597a7a22..fc882b06b 100644
--- a/ECOMP-PAP-REST/policyLogger.properties
+++ b/ONAP-PAP-REST/policyLogger.properties
@@ -1,6 +1,6 @@
 ###
 # ============LICENSE_START=======================================================
-# ECOMP-PAP-REST
+# ONAP-PAP-REST
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
diff --git a/ECOMP-PAP-REST/policyelk.properties b/ONAP-PAP-REST/policyelk.properties
index a42a83ca7..386008ce5 100644
--- a/ECOMP-PAP-REST/policyelk.properties
+++ b/ONAP-PAP-REST/policyelk.properties
@@ -1,6 +1,6 @@
 ###
 # ============LICENSE_START=======================================================
-# ECOMP Policy Engine
+# ONAP Policy Engine
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
@@ -25,6 +25,6 @@ policy.elk.url=http://localhost:9200
  
 #Policy Database properties
 policy.database.driver=com.mysql.jdbc.Driver
-policy.database.url=jdbc:mysql://localhost:3306/ecomp_sdk?autoReconnect=true&useSSL=false
+policy.database.url=jdbc:mysql://localhost:3306/onap_sdk?autoReconnect=true&useSSL=false
 policy.database.username=policy_user
 policy.database.password=policy_user
\ No newline at end of file
diff --git a/ECOMP-PAP-REST/pom.xml b/ONAP-PAP-REST/pom.xml
index 71fefca9b..fa20a6be5 100644
--- a/ECOMP-PAP-REST/pom.xml
+++ b/ONAP-PAP-REST/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   ============LICENSE_START=======================================================
-  ECOMP Policy Engine
+  ONAP Policy Engine
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
   ================================================================================
@@ -23,11 +23,11 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
 	<modelVersion>4.0.0</modelVersion>
-	<artifactId>ECOMP-PAP-REST</artifactId>
-	<description>ECOMP-PAP-REST</description>
+	<artifactId>ONAP-PAP-REST</artifactId>
+	<description>ONAP-PAP-REST</description>
 	<packaging>war</packaging>
 	<parent>
-		<groupId>org.openecomp.policy.engine</groupId>
+		<groupId>org.onap.policy.engine</groupId>
 		<artifactId>PolicyEngineSuite</artifactId>
 		<version>1.1.0-SNAPSHOT</version>
 	</parent>
@@ -63,7 +63,7 @@
 	<dependencies>
 		<dependency>
 			<!-- To support integrity-audit audit of BackupMonitorEntity table -->
-			<groupId>org.openecomp.policy.engine</groupId>
+			<groupId>org.onap.policy.engine</groupId>
 			<artifactId>PolicyEngineUtils</artifactId>
 			<version>${project.version}</version>
 			<exclusions>
@@ -95,8 +95,8 @@
 			<version>3.4</version>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.policy.engine</groupId>
-			<artifactId>ECOMP-PDP</artifactId>
+			<groupId>org.onap.policy.engine</groupId>
+			<artifactId>ONAP-PDP</artifactId>
 			<version>${project.version}</version>
 			<exclusions>
 				<exclusion>
@@ -106,8 +106,8 @@
 			</exclusions>
 		</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>
@@ -219,7 +219,7 @@
 			<version>2.0.8</version>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.policy.engine</groupId>
+			<groupId>org.onap.policy.engine</groupId>
 			<artifactId>ControlloopPolicy</artifactId>
 			<version>${project.version}</version>
 		</dependency>
diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/PAPRestConfig.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/PAPRestConfig.java
index bbacabab0..fee4ed2cb 100644
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/PAPRestConfig.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/PAPRestConfig.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PAP-REST
+ * ONAP-PAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.pap.xacml.rest;
+package org.onap.policy.pap.xacml.rest;
 
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -29,8 +29,8 @@ import javax.sql.DataSource;
 
 import org.apache.tomcat.dbcp.dbcp2.BasicDataSource;
 import org.hibernate.SessionFactory;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
@@ -44,7 +44,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter
 @Configuration
 @EnableWebMvc
 @EnableTransactionManagement
-@ComponentScan(basePackages = { "org.openecomp.*", "com.*" })
+@ComponentScan(basePackages = { "org.onap.*", "com.*" })
 public class PAPRestConfig extends WebMvcConfigurerAdapter {
 	private static final Logger LOGGER	= FlexLogger.getLogger(PAPRestConfig.class);
 	
@@ -92,7 +92,7 @@ public class PAPRestConfig extends WebMvcConfigurerAdapter {
 	@Bean(name = "sessionFactory")
 	public SessionFactory getSessionFactory(DataSource dataSource) {
 	    LocalSessionFactoryBuilder sessionBuilder = new LocalSessionFactoryBuilder(dataSource);
-	    sessionBuilder.scanPackages("org.openecomp.*", "com.*");
+	    sessionBuilder.scanPackages("org.onap.*", "com.*");
 	    sessionBuilder.addProperties(getHibernateProperties());
 	    return sessionBuilder.buildSessionFactory();
 	}
diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/WebConfig.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/WebConfig.java
index 069d1ba5b..89ab8bc8a 100644
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/WebConfig.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/WebConfig.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PAP-REST
+ * ONAP-PAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pap.xacml.rest;
+package org.onap.policy.pap.xacml.rest;
 
 import javax.servlet.ServletContext;
 import javax.servlet.ServletRegistration;
@@ -37,7 +37,7 @@ public class WebConfig implements WebApplicationInitializer {
 		ctx.refresh();
 		ServletRegistration.Dynamic dispatcher = container.addServlet("dispatcher", new DispatcherServlet(ctx));
 		dispatcher.setLoadOnStartup(1);
-		dispatcher.addMapping("/ecomp/*");
+		dispatcher.addMapping("/onap/*");
 	}
 
 }
diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/XACMLPapServlet.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/XACMLPapServlet.java
index c681c9325..45f803f5a 100644
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/XACMLPapServlet.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/XACMLPapServlet.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PAP-REST
+ * ONAP-PAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pap.xacml.rest;
+package org.onap.policy.pap.xacml.rest;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -60,39 +60,39 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.io.IOUtils;
-import org.openecomp.policy.common.ia.IntegrityAudit;
-import org.openecomp.policy.common.im.AdministrativeStateException;
-import org.openecomp.policy.common.im.ForwardProgressException;
-import org.openecomp.policy.common.im.IntegrityMonitor;
-import org.openecomp.policy.common.im.IntegrityMonitorProperties;
-import org.openecomp.policy.common.im.StandbyStatusException;
-import org.openecomp.policy.common.logging.ECOMPLoggingContext;
-import org.openecomp.policy.common.logging.ECOMPLoggingUtils;
-import org.openecomp.policy.common.logging.eelf.MessageCodes;
-import org.openecomp.policy.common.logging.eelf.PolicyLogger;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.pap.xacml.rest.components.AutoPushPolicy;
-import org.openecomp.policy.pap.xacml.rest.components.PolicyDBDao;
-import org.openecomp.policy.pap.xacml.rest.components.PolicyDBDaoTransaction;
-import org.openecomp.policy.pap.xacml.rest.handler.APIRequestHandler;
-import org.openecomp.policy.pap.xacml.rest.handler.PushPolicyHandler;
-import org.openecomp.policy.pap.xacml.rest.handler.SavePolicyHandler;
-import org.openecomp.policy.pap.xacml.restAuth.CheckPDP;
-import org.openecomp.policy.rest.XACMLRest;
-import org.openecomp.policy.rest.XACMLRestProperties;
-import org.openecomp.policy.utils.PolicyUtils;
-import org.openecomp.policy.xacml.api.XACMLErrorConstants;
-import org.openecomp.policy.xacml.api.pap.ECOMPPapEngineFactory;
-import org.openecomp.policy.xacml.api.pap.EcompPDP;
-import org.openecomp.policy.xacml.api.pap.EcompPDPGroup;
-import org.openecomp.policy.xacml.api.pap.PAPPolicyEngine;
-import org.openecomp.policy.xacml.std.pap.StdPAPPolicy;
-import org.openecomp.policy.xacml.std.pap.StdPDP;
-import org.openecomp.policy.xacml.std.pap.StdPDPGroup;
-import org.openecomp.policy.xacml.std.pap.StdPDPItemSetChangeNotifier.StdItemSetChangeListener;
-import org.openecomp.policy.xacml.std.pap.StdPDPPolicy;
-import org.openecomp.policy.xacml.std.pap.StdPDPStatus;
+import org.onap.policy.common.ia.IntegrityAudit;
+import org.onap.policy.common.im.AdministrativeStateException;
+import org.onap.policy.common.im.ForwardProgressException;
+import org.onap.policy.common.im.IntegrityMonitor;
+import org.onap.policy.common.im.IntegrityMonitorProperties;
+import org.onap.policy.common.im.StandbyStatusException;
+import org.onap.policy.common.logging.ONAPLoggingContext;
+import org.onap.policy.common.logging.ONAPLoggingUtils;
+import org.onap.policy.common.logging.eelf.MessageCodes;
+import org.onap.policy.common.logging.eelf.PolicyLogger;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.pap.xacml.rest.components.AutoPushPolicy;
+import org.onap.policy.pap.xacml.rest.components.PolicyDBDao;
+import org.onap.policy.pap.xacml.rest.components.PolicyDBDaoTransaction;
+import org.onap.policy.pap.xacml.rest.handler.APIRequestHandler;
+import org.onap.policy.pap.xacml.rest.handler.PushPolicyHandler;
+import org.onap.policy.pap.xacml.rest.handler.SavePolicyHandler;
+import org.onap.policy.pap.xacml.restAuth.CheckPDP;
+import org.onap.policy.rest.XACMLRest;
+import org.onap.policy.rest.XACMLRestProperties;
+import org.onap.policy.utils.PolicyUtils;
+import org.onap.policy.xacml.api.XACMLErrorConstants;
+import org.onap.policy.xacml.api.pap.ONAPPapEngineFactory;
+import org.onap.policy.xacml.api.pap.OnapPDP;
+import org.onap.policy.xacml.api.pap.OnapPDPGroup;
+import org.onap.policy.xacml.api.pap.PAPPolicyEngine;
+import org.onap.policy.xacml.std.pap.StdPAPPolicy;
+import org.onap.policy.xacml.std.pap.StdPDP;
+import org.onap.policy.xacml.std.pap.StdPDPGroup;
+import org.onap.policy.xacml.std.pap.StdPDPItemSetChangeNotifier.StdItemSetChangeListener;
+import org.onap.policy.xacml.std.pap.StdPDPPolicy;
+import org.onap.policy.xacml.std.pap.StdPDPStatus;
 
 import com.att.research.xacml.api.pap.PAPException;
 import com.att.research.xacml.api.pap.PDPPolicy;
@@ -179,14 +179,14 @@ public class XACMLPapServlet extends HttpServlet implements StdItemSetChangeList
 	private IntegrityAudit ia;
 	
 	//MicroService Model Properties
-	private static String msEcompName;
+	private static String msOnapName;
 	private static String msPolicyName;
 	/*
 	 * This thread may be invoked upon startup to initiate sending PDP policy/pip configuration when
 	 * this servlet starts. Its configurable by the admin.
 	 */
 	private Thread initiateThread = null;
-	private ECOMPLoggingContext baseLoggingContext = null;
+	private ONAPLoggingContext baseLoggingContext = null;
 	private AutoPushPolicy autoPushPolicy;
 	
 	/**
@@ -202,7 +202,7 @@ public class XACMLPapServlet extends HttpServlet implements StdItemSetChangeList
 	public void init(ServletConfig config) throws ServletException {
 		try {
 			// Logging
-			baseLoggingContext = new ECOMPLoggingContext();
+			baseLoggingContext = new ONAPLoggingContext();
 			// fixed data that will be the same in all logging output goes here
 			try {
 				String hostname = InetAddress.getLocalHost().getCanonicalHostName();
@@ -353,8 +353,8 @@ public class XACMLPapServlet extends HttpServlet implements StdItemSetChangeList
 				throw new ServletException(e.getMessage(), e.getCause());
 			}
 			//Micro Service Properties
-			msEcompName=properties.getProperty("xacml.policy.msEcompName");
-			setMsEcompName(msEcompName);
+			msOnapName=properties.getProperty("xacml.policy.msOnapName");
+			setMsOnapName(msOnapName);
 			msPolicyName=properties.getProperty("xacml.policy.msPolicyName");
 			setMsPolicyName(msPolicyName);
 			// PDPId File location 
@@ -382,14 +382,14 @@ public class XACMLPapServlet extends HttpServlet implements StdItemSetChangeList
 			//Create the policyDBDao
 			policyDBDao = PolicyDBDao.getPolicyDBDaoInstance(getEmf());
 			// Load our PAP engine, first create a factory
-			ECOMPPapEngineFactory factory = ECOMPPapEngineFactory.newInstance(XACMLProperties.getProperty(XACMLProperties.PROP_PAP_PAPENGINEFACTORY));
+			ONAPPapEngineFactory factory = ONAPPapEngineFactory.newInstance(XACMLProperties.getProperty(XACMLProperties.PROP_PAP_PAPENGINEFACTORY));
 			// The factory knows how to go about creating a PAP Engine
 			XACMLPapServlet.papEngine = (PAPPolicyEngine) factory.newEngine();
 			PolicyDBDaoTransaction addNewGroup = null;
 			try{
-				if(((org.openecomp.policy.xacml.std.pap.StdEngine)papEngine).wasDefaultGroupJustAdded){
+				if(((org.onap.policy.xacml.std.pap.StdEngine)papEngine).wasDefaultGroupJustAdded){
 					addNewGroup = policyDBDao.getNewTransaction();
-					EcompPDPGroup group = papEngine.getDefaultGroup();
+					OnapPDPGroup group = papEngine.getDefaultGroup();
 					addNewGroup.createGroup(group.getId(), group.getName(), group.getDescription(), "automaticallyAdded");
 					addNewGroup.commitTransaction();
 					addNewGroup = policyDBDao.getNewTransaction();
@@ -484,7 +484,7 @@ public class XACMLPapServlet extends HttpServlet implements StdItemSetChangeList
 	 * @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse response)
 	 */
 	protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-		ECOMPLoggingContext loggingContext = ECOMPLoggingUtils.getLoggingContextForRequest(request, baseLoggingContext);
+		ONAPLoggingContext loggingContext = ONAPLoggingUtils.getLoggingContextForRequest(request, baseLoggingContext);
 		loggingContext.transactionStarted();
 		loggingContext.setServiceName("PAP.post");
 		if ((loggingContext.getRequestID() == null) || (loggingContext.getRequestID() == "")){
@@ -552,7 +552,7 @@ public class XACMLPapServlet extends HttpServlet implements StdItemSetChangeList
 			String jmxport = this.getPDPJMX(request);
 			LOGGER.info("Request(doPost) from PDP coming up: " + id);
 			// Get the PDP Object
-			EcompPDP pdp = XACMLPapServlet.papEngine.getPDP(id);
+			OnapPDP pdp = XACMLPapServlet.papEngine.getPDP(id);
 			// Is it known?
 			if (pdp == null) {
 				LOGGER.info("Unknown PDP: " + id);
@@ -605,7 +605,7 @@ public class XACMLPapServlet extends HttpServlet implements StdItemSetChangeList
 				((StdPDP) pdp).setJmxPort(Integer.valueOf(jmxport));
 			}
 			// Get the PDP's Group
-			EcompPDPGroup group = XACMLPapServlet.papEngine.getPDPGroup((EcompPDP) pdp);
+			OnapPDPGroup group = XACMLPapServlet.papEngine.getPDPGroup((OnapPDP) pdp);
 			if (group == null) {
 				PolicyLogger.error(MessageCodes.ERROR_PROCESS_FLOW + " PDP not associated with any group, even the default");
 				loggingContext.transactionEnded();
@@ -675,7 +675,7 @@ public class XACMLPapServlet extends HttpServlet implements StdItemSetChangeList
 	 * @see HttpServlet#doGet(HttpServletRequest request, HttpServletResponse response)
 	 */
 	protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-		ECOMPLoggingContext loggingContext = ECOMPLoggingUtils.getLoggingContextForRequest(request, baseLoggingContext);
+		ONAPLoggingContext loggingContext = ONAPLoggingUtils.getLoggingContextForRequest(request, baseLoggingContext);
 		loggingContext.transactionStarted();
 		loggingContext.setServiceName("PAP.get");
 		if ((loggingContext.getRequestID() == null) || (loggingContext.getRequestID() == "")){
@@ -754,7 +754,7 @@ public class XACMLPapServlet extends HttpServlet implements StdItemSetChangeList
 			String id = this.getPDPID(request);
 			LOGGER.info("doGet from: " + id);
 			// Get the PDP Object
-			EcompPDP pdp = XACMLPapServlet.papEngine.getPDP(id);
+			OnapPDP pdp = XACMLPapServlet.papEngine.getPDP(id);
 			// Is it known?
 			if (pdp == null) {
 				// Check if request came from localhost
@@ -763,7 +763,7 @@ public class XACMLPapServlet extends HttpServlet implements StdItemSetChangeList
 						request.getRemoteHost().equals(request.getLocalAddr())) {
 					// Return status information - basically all the groups
 					loggingContext.setServiceName("PAP.getGroups");
-					Set<EcompPDPGroup> groups = papEngine.getEcompPDPGroups();
+					Set<OnapPDPGroup> groups = papEngine.getOnapPDPGroups();
 					// convert response object to JSON and include in the response
 					ObjectMapper mapper = new ObjectMapper();
 					mapper.writeValue(response.getOutputStream(),  groups);
@@ -784,7 +784,7 @@ public class XACMLPapServlet extends HttpServlet implements StdItemSetChangeList
 			}
 			loggingContext.setServiceName("PAP.getPolicy");
 			// Get the PDP's Group
-			EcompPDPGroup group = XACMLPapServlet.papEngine.getPDPGroup((EcompPDP) pdp);
+			OnapPDPGroup group = XACMLPapServlet.papEngine.getPDPGroup((OnapPDP) pdp);
 			if (group == null) {
 				String message = "No group associated with pdp " + pdp.getId();
 				LOGGER.warn(XACMLErrorConstants.ERROR_PERMISSIONS + message);
@@ -848,7 +848,7 @@ public class XACMLPapServlet extends HttpServlet implements StdItemSetChangeList
 	 * @see HttpServlet#doPut(HttpServletRequest request, HttpServletResponse response)
 	 */
 	protected void doPut(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-		ECOMPLoggingContext loggingContext = ECOMPLoggingUtils.getLoggingContextForRequest(request, baseLoggingContext);
+		ONAPLoggingContext loggingContext = ONAPLoggingUtils.getLoggingContextForRequest(request, baseLoggingContext);
 		storedRequestId = loggingContext.getRequestID();
 		loggingContext.transactionStarted();
 		loggingContext.setServiceName("PAP.put");
@@ -1067,7 +1067,7 @@ public class XACMLPapServlet extends HttpServlet implements StdItemSetChangeList
 	 * @see HttpServlet#doDelete(HttpServletRequest request, HttpServletResponse response)
 	 */
 	protected void doDelete(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-		ECOMPLoggingContext loggingContext = ECOMPLoggingUtils.getLoggingContextForRequest(request, baseLoggingContext);
+		ONAPLoggingContext loggingContext = ONAPLoggingUtils.getLoggingContextForRequest(request, baseLoggingContext);
 		loggingContext.transactionStarted();
 		loggingContext.setServiceName("PAP.delete");
 		if ((loggingContext.getRequestID() == null) || (loggingContext.getRequestID() == "")){
@@ -1213,7 +1213,7 @@ public class XACMLPapServlet extends HttpServlet implements StdItemSetChangeList
 	 * @throws ServletException
 	 * @throws IOException
 	 */
-	public void updateGroupsFromAPI(HttpServletRequest request, HttpServletResponse response, String groupId, ECOMPLoggingContext loggingContext) throws IOException {
+	public void updateGroupsFromAPI(HttpServletRequest request, HttpServletResponse response, String groupId, ONAPLoggingContext loggingContext) throws IOException {
 		PolicyDBDaoTransaction acPutTransaction = policyDBDao.getNewTransaction();
 		try {
 			// for PUT operations the group may or may not need to exist before the operation can be done
@@ -1322,7 +1322,7 @@ public class XACMLPapServlet extends HttpServlet implements StdItemSetChangeList
 	 * @throws ServletException
 	 * @throws IOException
 	 */
-	private void doACPost(HttpServletRequest request, HttpServletResponse response, String groupId, ECOMPLoggingContext loggingContext) throws ServletException, IOException {
+	private void doACPost(HttpServletRequest request, HttpServletResponse response, String groupId, ONAPLoggingContext loggingContext) throws ServletException, IOException {
 		PolicyDBDaoTransaction doACPostTransaction = null;
 		try {
 			String groupName = request.getParameter("groupName");
@@ -1361,7 +1361,7 @@ public class XACMLPapServlet extends HttpServlet implements StdItemSetChangeList
 				return;
 			}
 			// for all remaining POST operations the group must exist before the operation can be done
-			EcompPDPGroup group = papEngine.getGroup(groupId);
+			OnapPDPGroup group = papEngine.getGroup(groupId);
 			if (group == null) {
 				String message = "Unknown groupId '" + groupId + "'";
 				PolicyLogger.error(MessageCodes.ERROR_DATA_ISSUE + " " + message);
@@ -1490,8 +1490,8 @@ public class XACMLPapServlet extends HttpServlet implements StdItemSetChangeList
 				// Args:       group=<groupId> pdpId=<pdpId>               <= move PDP to group
 				loggingContext.setServiceName("AC:PAP.movePDP");
 				String pdpId = request.getParameter("pdpId");
-				EcompPDP pdp = papEngine.getPDP(pdpId);
-				EcompPDPGroup originalGroup = papEngine.getPDPGroup((EcompPDP) pdp);
+				OnapPDP pdp = papEngine.getPDP(pdpId);
+				OnapPDPGroup originalGroup = papEngine.getPDPGroup((OnapPDP) pdp);
 				try{
 					doACPostTransaction.movePdp(pdp, group, "XACMLPapServlet.doACPost");
 				}catch(Exception e){	
@@ -1501,7 +1501,7 @@ public class XACMLPapServlet extends HttpServlet implements StdItemSetChangeList
 									+"pdp="+pdp.getId()+",to group="+group.getId());
 					throw new PAPException(e.getMessage());
 				}
-				papEngine.movePDP((EcompPDP) pdp, group);
+				papEngine.movePDP((OnapPDP) pdp, group);
 				response.setStatus(HttpServletResponse.SC_NO_CONTENT);
 				if (LOGGER.isDebugEnabled()) {
 					LOGGER.debug("PDP '" + pdp.getId() +"' moved to group '" + group.getId() + "' set to be default");
@@ -1539,7 +1539,7 @@ public class XACMLPapServlet extends HttpServlet implements StdItemSetChangeList
 	 * @throws ServletException
 	 * @throws IOException
 	 */
-	private void doACGet(HttpServletRequest request, HttpServletResponse response, String groupId, ECOMPLoggingContext loggingContext) throws ServletException, IOException {
+	private void doACGet(HttpServletRequest request, HttpServletResponse response, String groupId, ONAPLoggingContext loggingContext) throws ServletException, IOException {
 		try {
 			String parameterDefault = request.getParameter("default");
 			String pdpId = request.getParameter("pdpId");
@@ -1549,7 +1549,7 @@ public class XACMLPapServlet extends HttpServlet implements StdItemSetChangeList
 				if (parameterDefault != null) {
 					// Request is for the Default group (whatever its id)
 					loggingContext.setServiceName("AC:PAP.getDefaultGroup");
-					EcompPDPGroup group = papEngine.getDefaultGroup();
+					OnapPDPGroup group = papEngine.getDefaultGroup();
 					// convert response object to JSON and include in the response
 					ObjectMapper mapper = new ObjectMapper();
 					mapper.writeValue(response.getOutputStream(),  group);
@@ -1568,7 +1568,7 @@ public class XACMLPapServlet extends HttpServlet implements StdItemSetChangeList
 					if (pdpGroup == null) {
 						// Request is for the (unspecified) group containing a given PDP
 						loggingContext.setServiceName("AC:PAP.getPDP");
-						EcompPDP pdp = papEngine.getPDP(pdpId);
+						OnapPDP pdp = papEngine.getPDP(pdpId);
 						// convert response object to JSON and include in the response
 						ObjectMapper mapper = new ObjectMapper();
 						mapper.writeValue(response.getOutputStream(),  pdp);
@@ -1585,8 +1585,8 @@ public class XACMLPapServlet extends HttpServlet implements StdItemSetChangeList
 					} else {
 						// Request is for the group containing a given PDP
 						loggingContext.setServiceName("AC:PAP.getGroupForPDP");
-						EcompPDP pdp = papEngine.getPDP(pdpId);
-						EcompPDPGroup group = papEngine.getPDPGroup((EcompPDP) pdp);
+						OnapPDP pdp = papEngine.getPDP(pdpId);
+						OnapPDPGroup group = papEngine.getPDPGroup((OnapPDP) pdp);
 						// convert response object to JSON and include in the response
 						ObjectMapper mapper = new ObjectMapper();
 						mapper.writeValue(response.getOutputStream(),  group);
@@ -1604,7 +1604,7 @@ public class XACMLPapServlet extends HttpServlet implements StdItemSetChangeList
 				} else {
 					// request is for top-level properties about all groups
 					loggingContext.setServiceName("AC:PAP.getAllGroups");
-					Set<EcompPDPGroup> groups = papEngine.getEcompPDPGroups();
+					Set<OnapPDPGroup> groups = papEngine.getOnapPDPGroups();
 					// convert response object to JSON and include in the response
 					ObjectMapper mapper = new ObjectMapper();
 					mapper.writeValue(response.getOutputStream(),  groups);
@@ -1621,7 +1621,7 @@ public class XACMLPapServlet extends HttpServlet implements StdItemSetChangeList
 				}
 			}
 			// for all other GET operations the group must exist before the operation can be done
-			EcompPDPGroup group = papEngine.getGroup(groupId);
+			OnapPDPGroup group = papEngine.getGroup(groupId);
 			if (group == null) {
 				String message = "Unknown groupId '" + groupId + "'";
 				PolicyLogger.error(MessageCodes.ERROR_DATA_ISSUE + " " + message);
@@ -1687,11 +1687,11 @@ public class XACMLPapServlet extends HttpServlet implements StdItemSetChangeList
 	 * @throws ServletException
 	 * @throws IOException
 	 */
-	private void doACPut(HttpServletRequest request, HttpServletResponse response, String groupId, ECOMPLoggingContext loggingContext) throws ServletException, IOException {
+	private void doACPut(HttpServletRequest request, HttpServletResponse response, String groupId, ONAPLoggingContext loggingContext) throws ServletException, IOException {
 		PolicyDBDaoTransaction acPutTransaction = policyDBDao.getNewTransaction();
 		try {
 			// for PUT operations the group may or may not need to exist before the operation can be done
-			EcompPDPGroup group = papEngine.getGroup(groupId);
+			OnapPDPGroup group = papEngine.getGroup(groupId);
 			// determine the operation needed based on the parameters in the request
 			// for remaining operations the group must exist before the operation can be done
 			if (group == null) {
@@ -1834,7 +1834,7 @@ public class XACMLPapServlet extends HttpServlet implements StdItemSetChangeList
 				}
 				
 				PushPolicyHandler pushPolicyHandler = PushPolicyHandler.getInstance();	
-				EcompPDPGroup updatedGroup = (StdPDPGroup)objectFromJSON;	
+				OnapPDPGroup updatedGroup = (StdPDPGroup)objectFromJSON;	
 				if (pushPolicyHandler.preSafetyCheck(updatedGroup, CONFIG_HOME)) {		
 					LOGGER.debug("Precheck Successful.");
 				}
@@ -1875,7 +1875,7 @@ public class XACMLPapServlet extends HttpServlet implements StdItemSetChangeList
 	 * @throws ServletException
 	 * @throws IOException
 	 */
-	private void doACDelete(HttpServletRequest request, HttpServletResponse response, String groupId, ECOMPLoggingContext loggingContext) throws ServletException, IOException {
+	private void doACDelete(HttpServletRequest request, HttpServletResponse response, String groupId, ONAPLoggingContext loggingContext) throws ServletException, IOException {
 		//This code is to allow deletes to propagate to the database since delete is not implemented
 		String isDeleteNotify = request.getParameter("isDeleteNotify");
 		if(isDeleteNotify != null){
@@ -1904,7 +1904,7 @@ public class XACMLPapServlet extends HttpServlet implements StdItemSetChangeList
 		try {
 			// for all DELETE operations the group must exist before the operation can be done
 			loggingContext.setServiceName("AC:PAP.delete");
-			EcompPDPGroup group = papEngine.getGroup(groupId);
+			OnapPDPGroup group = papEngine.getGroup(groupId);
 			if (group == null) {
 				String message = "Unknown groupId '" + groupId + "'";
 				PolicyLogger.error(MessageCodes.ERROR_DATA_ISSUE + " " + message);
@@ -1925,13 +1925,13 @@ public class XACMLPapServlet extends HttpServlet implements StdItemSetChangeList
 			} else if (request.getParameter("pdpId") != null) {
 				// ARGS:        group=<groupId> pdpId=<pdpId>                  <= delete PDP 
 				String pdpId = request.getParameter("pdpId");
-				EcompPDP pdp = papEngine.getPDP(pdpId);
+				OnapPDP pdp = papEngine.getPDP(pdpId);
 				try{
 					removePdpOrGroupTransaction.removePdpFromGroup(pdp.getId(),"XACMLPapServlet.doACDelete");
 				} catch(Exception e){
 					throw new PAPException();
 				}
-				papEngine.removePDP((EcompPDP) pdp);
+				papEngine.removePDP((OnapPDP) pdp);
 				// adjust the status of the group, which may have changed when we removed this PDP
 				((StdPDPGroup)group).resetStatus();
 				response.setStatus(HttpServletResponse.SC_NO_CONTENT);
@@ -1954,13 +1954,13 @@ public class XACMLPapServlet extends HttpServlet implements StdItemSetChangeList
 			} else {
 				// ARGS:      group=<groupId> movePDPsToGroupId=<movePDPsToGroupId>            <= delete a group and move all its PDPs to the given group
 				String moveToGroupId = request.getParameter("movePDPsToGroupId");
-				EcompPDPGroup moveToGroup = null;
+				OnapPDPGroup moveToGroup = null;
 				if (moveToGroupId != null) {
 					moveToGroup = papEngine.getGroup(moveToGroupId);
 				}
 				// get list of PDPs in the group being deleted so we can notify them that they got changed
-				Set<EcompPDP> movedPDPs = new HashSet<>();
-				movedPDPs.addAll(group.getEcompPdps());
+				Set<OnapPDP> movedPDPs = new HashSet<>();
+				movedPDPs.addAll(group.getOnapPdps());
 				// do the move/remove
 				try{
 					removePdpOrGroupTransaction.deleteGroup(group, moveToGroup,"XACMLPapServlet.doACDelete");
@@ -1972,7 +1972,7 @@ public class XACMLPapServlet extends HttpServlet implements StdItemSetChangeList
 				response.setStatus(HttpServletResponse.SC_NO_CONTENT);
 				notifyAC();
 				// notify any PDPs in the removed set that their config may have changed
-				for (EcompPDP pdp : movedPDPs) {
+				for (OnapPDP pdp : movedPDPs) {
 					pdpChanged(pdp);
 				}
 				removePdpOrGroupTransaction.commitTransaction();
@@ -2016,7 +2016,7 @@ public class XACMLPapServlet extends HttpServlet implements StdItemSetChangeList
 	 */
 	private class Heartbeat implements Runnable {
 		private PAPPolicyEngine papEngine;
-		private Set<EcompPDP> pdps = new HashSet<>();
+		private Set<OnapPDP> pdps = new HashSet<>();
 		private int heartbeatInterval;
 		private int heartbeatTimeout;
 
@@ -2051,8 +2051,8 @@ public class XACMLPapServlet extends HttpServlet implements StdItemSetChangeList
 					pdps.clear();
 					synchronized(papEngine) {
 						try {
-							for (EcompPDPGroup g : papEngine.getEcompPDPGroups()) {
-								for (EcompPDP p : g.getEcompPdps()) {
+							for (OnapPDPGroup g : papEngine.getOnapPDPGroups()) {
+								for (OnapPDP p : g.getOnapPdps()) {
 									pdps.add(p);
 								}
 							}
@@ -2067,7 +2067,7 @@ public class XACMLPapServlet extends HttpServlet implements StdItemSetChangeList
 					}
 					// try to get the summary status from each PDP
 					boolean changeSeen = false;
-					for (EcompPDP pdp : pdps) {
+					for (OnapPDP pdp : pdps) {
 						// Check for shutdown
 						if (this.isRunning() == false) {
 							LOGGER.info("isRunning is false, getting out of loop.");
@@ -2168,17 +2168,17 @@ public class XACMLPapServlet extends HttpServlet implements StdItemSetChangeList
 	 * HELPER to change Group status when PDP status is changed
 	 * (Must NOT be called from a method that is synchronized on the papEngine or it may deadlock)
 	 */
-	private void setPDPSummaryStatus(EcompPDP pdp, PDPStatus.Status newStatus) throws PAPException {
+	private void setPDPSummaryStatus(OnapPDP pdp, PDPStatus.Status newStatus) throws PAPException {
 		setPDPSummaryStatus(pdp, newStatus.toString());
 	}
 
-	private void setPDPSummaryStatus(EcompPDP pdp, String newStatus) throws PAPException {
+	private void setPDPSummaryStatus(OnapPDP pdp, String newStatus) throws PAPException {
 		synchronized(papEngine) {
 			StdPDPStatus status = new StdPDPStatus();
 			status.setStatus(PDPStatus.Status.valueOf(newStatus));
 			((StdPDP)pdp).setStatus(status);
 			// now adjust the group
-			StdPDPGroup group = (StdPDPGroup)papEngine.getPDPGroup((EcompPDP) pdp);
+			StdPDPGroup group = (StdPDPGroup)papEngine.getPDPGroup((OnapPDP) pdp);
 			// if the PDP was just deleted it may transiently exist but not be in a group
 			if (group != null) {
 				group.resetStatus();
@@ -2193,28 +2193,28 @@ public class XACMLPapServlet extends HttpServlet implements StdItemSetChangeList
 	@Override
 	public void changed() {
 		// all PDPs in all groups need to be updated/sync'd
-		Set<EcompPDPGroup> groups;
+		Set<OnapPDPGroup> groups;
 		try {
-			groups = papEngine.getEcompPDPGroups();
+			groups = papEngine.getOnapPDPGroups();
 		} catch (PAPException e) {
 			PolicyLogger.error(MessageCodes.ERROR_SYSTEM_ERROR, e, "XACMLPapServlet", " getPDPGroups failed");
 			throw new RuntimeException(XACMLErrorConstants.ERROR_SYSTEM_ERROR + "Unable to get Groups: " + e);
 		}
-		for (EcompPDPGroup group : groups) {
+		for (OnapPDPGroup group : groups) {
 			groupChanged(group);
 		}
 	}
 
 	@Override
-	public void groupChanged(EcompPDPGroup group) {
+	public void groupChanged(OnapPDPGroup group) {
 		// all PDPs within one group need to be updated/sync'd
-		for (EcompPDP pdp : group.getEcompPdps()) {
+		for (OnapPDP pdp : group.getOnapPdps()) {
 			pdpChanged(pdp);
 		}
 	}
 
 	@Override
-	public void pdpChanged(EcompPDP pdp) {
+	public void pdpChanged(OnapPDP pdp) {
 		// kick off a thread to do an event notification for each PDP.
 		// This needs to be on a separate thread so that PDPs that do not respond (down, non-existent, etc)
 		// do not block the PSP response to the AC, which would freeze the GUI until all PDPs sequentially respond or time-out.
@@ -2225,10 +2225,10 @@ public class XACMLPapServlet extends HttpServlet implements StdItemSetChangeList
 	}
 
 	private class UpdatePDPThread implements Runnable {
-		private EcompPDP pdp;
+		private OnapPDP pdp;
 		private String requestId;
 
-		public UpdatePDPThread(EcompPDP pdp, String storedRequestId) {
+		public UpdatePDPThread(OnapPDP pdp, String storedRequestId) {
 			this.pdp = pdp;
 			requestId = storedRequestId;
 		}
@@ -2237,7 +2237,7 @@ public class XACMLPapServlet extends HttpServlet implements StdItemSetChangeList
 			// send the current configuration to one PDP
 			HttpURLConnection connection = null;
 			// get a new logging context for the thread
-			ECOMPLoggingContext loggingContext = new ECOMPLoggingContext(baseLoggingContext);
+			ONAPLoggingContext loggingContext = new ONAPLoggingContext(baseLoggingContext);
 			try {
 				loggingContext.setServiceName("PAP:PDP.putConfig");
 				// If a requestId was provided, use it, otherwise generate one; post to loggingContext to be used later when calling PDP
@@ -2272,7 +2272,7 @@ public class XACMLPapServlet extends HttpServlet implements StdItemSetChangeList
 				connection.setInstanceFollowRedirects(true);
 				connection.setDoOutput(true);
 				try (OutputStream os = connection.getOutputStream()) {
-					EcompPDPGroup group = papEngine.getPDPGroup((EcompPDP) pdp);
+					OnapPDPGroup group = papEngine.getPDPGroup((OnapPDP) pdp);
 					// if the PDP was just deleted, there is no group, but we want to send an update anyway
 					if (group == null) {
 						// create blank properties files
@@ -2409,7 +2409,7 @@ public class XACMLPapServlet extends HttpServlet implements StdItemSetChangeList
 		}
 	}
 
-	private void testService(ECOMPLoggingContext loggingContext, HttpServletResponse response) throws IOException{
+	private void testService(ONAPLoggingContext loggingContext, HttpServletResponse response) throws IOException{
 		LOGGER.info("Test request received");
 		try {
 			im.evaluateSanity();
@@ -2476,7 +2476,7 @@ public class XACMLPapServlet extends HttpServlet implements StdItemSetChangeList
 			if(ssFailureList == null){
 				ssFailureList = "UnknownSubSystem";
 			}
-			response.addHeader("X-ECOMP-SubsystemFailure", ssFailureList);
+			response.addHeader("X-ONAP-SubsystemFailure", ssFailureList);
 			response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, message);
 			return;
 		}
@@ -2599,12 +2599,12 @@ public class XACMLPapServlet extends HttpServlet implements StdItemSetChangeList
 		XACMLPapServlet.papDbPassword = papDbPassword;
 	}
 
-	public static String getMsEcompName() {
-		return msEcompName;
+	public static String getMsOnapName() {
+		return msOnapName;
 	}
 
-	public static void setMsEcompName(String msEcompName) {
-		XACMLPapServlet.msEcompName = msEcompName;
+	public static void setMsOnapName(String msOnapName) {
+		XACMLPapServlet.msOnapName = msOnapName;
 	}
 
 	public static String getMsPolicyName() {
diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/adapters/GridData.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/adapters/GridData.java
index 86f42bcbe..1ed4bf3b5 100644
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/adapters/GridData.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/adapters/GridData.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PAP-REST
+ * ONAP-PAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pap.xacml.rest.adapters;
+package org.onap.policy.pap.xacml.rest.adapters;
 
 import java.util.ArrayList;
 
diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/model/package-info.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/adapters/package-info.java
index d3673eb2b..b51d08076 100644
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/model/package-info.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/adapters/package-info.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PAP-REST
+ * ONAP-PAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,4 +17,5 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.pap.xacml.rest.model;
+
+package org.onap.policy.pap.xacml.rest.adapters;
diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/components/ActionPolicy.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/ActionPolicy.java
index 45ef01f6e..4aec72bed 100644
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/components/ActionPolicy.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/ActionPolicy.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PAP-REST
+ * ONAP-PAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pap.xacml.rest.components;
+package org.onap.policy.pap.xacml.rest.components;
 
 import java.io.BufferedWriter;
 import java.io.File;
@@ -50,17 +50,17 @@ import oasis.names.tc.xacml._3_0.core.schema.wd_17.PolicyType;
 import oasis.names.tc.xacml._3_0.core.schema.wd_17.RuleType;
 import oasis.names.tc.xacml._3_0.core.schema.wd_17.TargetType;
 
-import org.openecomp.policy.pap.xacml.rest.XACMLPapServlet;
-import org.openecomp.policy.pap.xacml.rest.util.JPAUtils;
-import org.openecomp.policy.rest.adapter.PolicyRestAdapter;
-import org.openecomp.policy.rest.jpa.ActionPolicyDict;
-import org.openecomp.policy.rest.jpa.Datatype;
-import org.openecomp.policy.rest.jpa.FunctionDefinition;
-import org.openecomp.policy.xacml.api.XACMLErrorConstants;
-import org.openecomp.policy.common.logging.eelf.MessageCodes;
-import org.openecomp.policy.common.logging.eelf.PolicyLogger;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger; 
-import org.openecomp.policy.common.logging.flexlogger.Logger; 
+import org.onap.policy.pap.xacml.rest.XACMLPapServlet;
+import org.onap.policy.pap.xacml.rest.util.JPAUtils;
+import org.onap.policy.rest.adapter.PolicyRestAdapter;
+import org.onap.policy.rest.jpa.ActionPolicyDict;
+import org.onap.policy.rest.jpa.Datatype;
+import org.onap.policy.rest.jpa.FunctionDefinition;
+import org.onap.policy.xacml.api.XACMLErrorConstants;
+import org.onap.policy.common.logging.eelf.MessageCodes;
+import org.onap.policy.common.logging.eelf.PolicyLogger;
+import org.onap.policy.common.logging.flexlogger.FlexLogger; 
+import org.onap.policy.common.logging.flexlogger.Logger; 
 
 public class ActionPolicy extends Policy {
 	
diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/components/AutoPushPolicy.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/AutoPushPolicy.java
index 31871587b..f9dbc287b 100644
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/components/AutoPushPolicy.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/AutoPushPolicy.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PAP-REST
+ * ONAP-PAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pap.xacml.rest.components;
+package org.onap.policy.pap.xacml.rest.components;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -28,12 +28,12 @@ import java.util.Iterator;
 import java.util.Properties;
 import java.util.Set;
 
-import org.openecomp.policy.common.logging.eelf.MessageCodes;
-import org.openecomp.policy.common.logging.eelf.PolicyLogger;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.xacml.std.pap.StdPDPGroup;
-import org.openecomp.policy.xacml.std.pap.StdPDPPolicy;
+import org.onap.policy.common.logging.eelf.MessageCodes;
+import org.onap.policy.common.logging.eelf.PolicyLogger;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.xacml.std.pap.StdPDPGroup;
+import org.onap.policy.xacml.std.pap.StdPDPPolicy;
 
 import com.att.research.xacml.api.pap.PDPPolicy;
 /**
diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/components/ClosedLoopPolicy.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/ClosedLoopPolicy.java
index 1281bd083..3355fab85 100644
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/components/ClosedLoopPolicy.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/ClosedLoopPolicy.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PAP-REST
+ * ONAP-PAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pap.xacml.rest.components;
+package org.onap.policy.pap.xacml.rest.components;
 
 import java.io.File;
 import java.io.IOException;
@@ -33,11 +33,11 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.commons.io.FilenameUtils;
-import org.openecomp.policy.common.logging.eelf.MessageCodes;
-import org.openecomp.policy.common.logging.eelf.PolicyLogger;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.rest.adapter.PolicyRestAdapter;
+import org.onap.policy.common.logging.eelf.MessageCodes;
+import org.onap.policy.common.logging.eelf.PolicyLogger;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.rest.adapter.PolicyRestAdapter;
 
 import com.att.research.xacml.std.IdentifierImpl;
 
@@ -183,8 +183,8 @@ public class ClosedLoopPolicy extends Policy {
 			allOfOne.getMatch().add(createMatch("PolicyName", name));
 			AllOfType allOf = new AllOfType();
 			// Adding the matches to AllOfType element
-			// Match for Ecomp
-			allOf.getMatch().add(createMatch("ECOMPName", policyAdapter.getEcompName()));
+			// Match for Onap
+			allOf.getMatch().add(createMatch("ONAPName", policyAdapter.getOnapName()));
 			// Match for riskType
 			allOf.getMatch().add(
 					createDynamicMatch("RiskType", policyAdapter.getRiskType()));
@@ -337,13 +337,13 @@ public class ClosedLoopPolicy extends Policy {
 		advice.getAttributeAssignmentExpression().add(assignment4);
 
 		AttributeAssignmentExpressionType assignment5 = new AttributeAssignmentExpressionType();
-		assignment5.setAttributeId("matching:" + ECOMPID);
+		assignment5.setAttributeId("matching:" + ONAPID);
 		assignment5.setCategory(CATEGORY_RESOURCE);
 		assignment5.setIssuer("");
 
 		AttributeValueType configNameAttributeValue5 = new AttributeValueType();
 		configNameAttributeValue5.setDataType(STRING_DATATYPE);
-		configNameAttributeValue5.getContent().add(policyAdapter.getEcompName());
+		configNameAttributeValue5.getContent().add(policyAdapter.getOnapName());
 		assignment5.setExpression(new ObjectFactory().createAttributeValue(configNameAttributeValue5));
 
 		advice.getAttributeAssignmentExpression().add(assignment5);
diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/components/ConfigPolicy.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/ConfigPolicy.java
index 0cf9c6546..1b29c0369 100644
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/components/ConfigPolicy.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/ConfigPolicy.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PAP-REST
+ * ONAP-PAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pap.xacml.rest.components;
+package org.onap.policy.pap.xacml.rest.components;
 
 import java.io.BufferedWriter;
 import java.io.File;
@@ -52,11 +52,11 @@ import oasis.names.tc.xacml._3_0.core.schema.wd_17.RuleType;
 import oasis.names.tc.xacml._3_0.core.schema.wd_17.TargetType;
 
 import org.apache.commons.io.FilenameUtils;
-import org.openecomp.policy.common.logging.eelf.MessageCodes;
-import org.openecomp.policy.common.logging.eelf.PolicyLogger;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.rest.adapter.PolicyRestAdapter;
+import org.onap.policy.common.logging.eelf.MessageCodes;
+import org.onap.policy.common.logging.eelf.PolicyLogger;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.rest.adapter.PolicyRestAdapter;
 import org.xml.sax.ErrorHandler;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
@@ -297,8 +297,8 @@ public class ConfigPolicy extends Policy {
 			allOfOne.getMatch().add(createMatch("PolicyName", name));
 			AllOfType allOf = new AllOfType();
 			
-			// Adding the matches to AllOfType element Match for Ecomp
-			allOf.getMatch().add(createMatch("ECOMPName", policyAdapter.getEcompName()));
+			// Adding the matches to AllOfType element Match for Onap
+			allOf.getMatch().add(createMatch("ONAPName", policyAdapter.getOnapName()));
 			// Match for riskType
 			allOf.getMatch().add(createDynamicMatch("RiskType", policyAdapter.getRiskType()));
 			// Match for riskLevel
@@ -462,13 +462,13 @@ public class ConfigPolicy extends Policy {
 			advice.getAttributeAssignmentExpression().add(assignment4);
 
 			AttributeAssignmentExpressionType assignment5 = new AttributeAssignmentExpressionType();
-			assignment5.setAttributeId("matching:" + ECOMPID);
+			assignment5.setAttributeId("matching:" + ONAPID);
 			assignment5.setCategory(CATEGORY_RESOURCE);
 			assignment5.setIssuer("");
 
 			AttributeValueType configNameAttributeValue5 = new AttributeValueType();
 			configNameAttributeValue5.setDataType(STRING_DATATYPE);
-			configNameAttributeValue5.getContent().add(policyAdapter.getEcompName());
+			configNameAttributeValue5.getContent().add(policyAdapter.getOnapName());
 			assignment5.setExpression(new ObjectFactory().createAttributeValue(configNameAttributeValue5));
 
 			advice.getAttributeAssignmentExpression().add(assignment5);
diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/components/CreateBRMSRuleTemplate.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/CreateBRMSRuleTemplate.java
index 078ba1040..7c0d2683c 100644
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/components/CreateBRMSRuleTemplate.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/CreateBRMSRuleTemplate.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PAP-REST
+ * ONAP-PAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,18 +17,18 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.pap.xacml.rest.components;
+package org.onap.policy.pap.xacml.rest.components;
 
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.rest.dao.CommonClassDao;
-import org.openecomp.policy.rest.jpa.BRMSParamTemplate;
-import org.openecomp.policy.rest.jpa.UserInfo;
-import org.openecomp.policy.utils.PolicyUtils;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.rest.dao.CommonClassDao;
+import org.onap.policy.rest.jpa.BRMSParamTemplate;
+import org.onap.policy.rest.jpa.UserInfo;
+import org.onap.policy.utils.PolicyUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/components/CreateBrmsParamPolicy.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/CreateBrmsParamPolicy.java
index b9dc039fc..047342ad0 100644
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/components/CreateBrmsParamPolicy.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/CreateBrmsParamPolicy.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PAP-REST
+ * ONAP-PAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pap.xacml.rest.components;
+package org.onap.policy.pap.xacml.rest.components;
 
 import java.io.File;
 import java.io.IOException;
@@ -39,14 +39,14 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import org.apache.commons.io.FilenameUtils;
-import org.openecomp.policy.common.logging.eelf.MessageCodes;
-import org.openecomp.policy.common.logging.eelf.PolicyLogger;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.pap.xacml.rest.controller.BRMSDictionaryController;
-import org.openecomp.policy.pap.xacml.rest.daoimpl.CommonClassDaoImpl;
-import org.openecomp.policy.rest.adapter.PolicyRestAdapter;
-import org.openecomp.policy.rest.jpa.BRMSParamTemplate;
+import org.onap.policy.common.logging.eelf.MessageCodes;
+import org.onap.policy.common.logging.eelf.PolicyLogger;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.pap.xacml.rest.controller.BRMSDictionaryController;
+import org.onap.policy.pap.xacml.rest.daoimpl.CommonClassDaoImpl;
+import org.onap.policy.rest.adapter.PolicyRestAdapter;
+import org.onap.policy.rest.jpa.BRMSParamTemplate;
 
 import com.att.research.xacml.std.IdentifierImpl;
 
@@ -405,8 +405,8 @@ public class CreateBrmsParamPolicy extends Policy {
 			
 			AllOfType allOf = new AllOfType();
 
-			// Match for ECOMPName
-			allOf.getMatch().add(createMatch("ECOMPName", policyAdapter.getEcompName()));
+			// Match for ONAPName
+			allOf.getMatch().add(createMatch("ONAPName", policyAdapter.getOnapName()));
 			allOf.getMatch().add(createMatch("ConfigName", policyAdapter.getConfigName()));
 			// Match for riskType
 			allOf.getMatch().add(createDynamicMatch("RiskType", policyAdapter.getRiskType()));
@@ -570,14 +570,14 @@ public class CreateBrmsParamPolicy extends Policy {
 				.createAttributeValue(configNameAttributeValue4));
 		advice.getAttributeAssignmentExpression().add(assignment4);
 
-		// Ecomp Name Assignment
+		// Onap Name Assignment
 		AttributeAssignmentExpressionType assignment5 = new AttributeAssignmentExpressionType();
-		assignment5.setAttributeId("matching:" + ECOMPID);
+		assignment5.setAttributeId("matching:" + ONAPID);
 		assignment5.setCategory(CATEGORY_RESOURCE);
 		assignment5.setIssuer("");
 		AttributeValueType configNameAttributeValue5 = new AttributeValueType();
 		configNameAttributeValue5.setDataType(STRING_DATATYPE);
-		configNameAttributeValue5.getContent().add(policyAdapter.getEcompName());
+		configNameAttributeValue5.getContent().add(policyAdapter.getOnapName());
 		assignment5.setExpression(new ObjectFactory()
 				.createAttributeValue(configNameAttributeValue5));
 		advice.getAttributeAssignmentExpression().add(assignment5);
diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/components/CreateBrmsRawPolicy.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/CreateBrmsRawPolicy.java
index a0f13ec02..4bcb05788 100644
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/components/CreateBrmsRawPolicy.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/CreateBrmsRawPolicy.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PAP-REST
+ * ONAP-PAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pap.xacml.rest.components;
+package org.onap.policy.pap.xacml.rest.components;
 
 
 import java.io.File;
@@ -35,10 +35,10 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.commons.io.FilenameUtils;
-import org.openecomp.policy.common.logging.eelf.MessageCodes;
-import org.openecomp.policy.common.logging.eelf.PolicyLogger;
-import org.openecomp.policy.pap.xacml.rest.controller.BRMSDictionaryController;
-import org.openecomp.policy.rest.adapter.PolicyRestAdapter;
+import org.onap.policy.common.logging.eelf.MessageCodes;
+import org.onap.policy.common.logging.eelf.PolicyLogger;
+import org.onap.policy.pap.xacml.rest.controller.BRMSDictionaryController;
+import org.onap.policy.rest.adapter.PolicyRestAdapter;
 
 import com.att.research.xacml.std.IdentifierImpl;
 
@@ -198,8 +198,8 @@ public class CreateBrmsRawPolicy extends Policy {
 			
 			AllOfType allOf = new AllOfType();
 
-			// Match for ECOMPName
-			allOf.getMatch().add(createMatch("ECOMPName", policyAdapter.getEcompName()));
+			// Match for ONAPName
+			allOf.getMatch().add(createMatch("ONAPName", policyAdapter.getOnapName()));
 			allOf.getMatch().add(createMatch("ConfigName", policyAdapter.getConfigName()));
 			// Match for riskType
 			allOf.getMatch().add(createDynamicMatch("RiskType", policyAdapter.getRiskType()));
@@ -366,14 +366,14 @@ public class CreateBrmsRawPolicy extends Policy {
 				.createAttributeValue(configNameAttributeValue4));
 		advice.getAttributeAssignmentExpression().add(assignment4);
 
-		// Ecomp Name Assignment
+		// Onap Name Assignment
 		AttributeAssignmentExpressionType assignment5 = new AttributeAssignmentExpressionType();
-		assignment5.setAttributeId("matching:" + ECOMPID);
+		assignment5.setAttributeId("matching:" + ONAPID);
 		assignment5.setCategory(CATEGORY_RESOURCE);
 		assignment5.setIssuer("");
 		AttributeValueType configNameAttributeValue5 = new AttributeValueType();
 		configNameAttributeValue5.setDataType(STRING_DATATYPE);
-		configNameAttributeValue5.getContent().add(policyAdapter.getEcompName());
+		configNameAttributeValue5.getContent().add(policyAdapter.getOnapName());
 		assignment5.setExpression(new ObjectFactory()
 				.createAttributeValue(configNameAttributeValue5));
 		advice.getAttributeAssignmentExpression().add(assignment5);
diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/components/CreateClosedLoopPerformanceMetrics.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/CreateClosedLoopPerformanceMetrics.java
index a16ab9a79..ada704465 100644
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/components/CreateClosedLoopPerformanceMetrics.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/CreateClosedLoopPerformanceMetrics.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PAP-REST
+ * ONAP-PAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pap.xacml.rest.components;
+package org.onap.policy.pap.xacml.rest.components;
 
 
 import java.io.File;
@@ -31,11 +31,11 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.commons.io.FilenameUtils;
-import org.openecomp.policy.common.logging.eelf.MessageCodes;
-import org.openecomp.policy.common.logging.eelf.PolicyLogger;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.rest.adapter.PolicyRestAdapter;
+import org.onap.policy.common.logging.eelf.MessageCodes;
+import org.onap.policy.common.logging.eelf.PolicyLogger;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.rest.adapter.PolicyRestAdapter;
 
 import com.att.research.xacml.std.IdentifierImpl;
 
@@ -171,8 +171,8 @@ public class CreateClosedLoopPerformanceMetrics extends Policy {
 			allOfOne.getMatch().add(createMatch("PolicyName", name));
 			AllOfType allOf = new AllOfType();
 			
-			// Adding the matches to AllOfType element Match for Ecomp
-			allOf.getMatch().add(createMatch("ECOMPName", policyAdapter.getEcompName()));
+			// Adding the matches to AllOfType element Match for Onap
+			allOf.getMatch().add(createMatch("ONAPName", policyAdapter.getOnapName()));
 			// Match for riskType
 			allOf.getMatch().add(
 					createDynamicMatch("RiskType", policyAdapter.getRiskType()));
@@ -328,13 +328,13 @@ public class CreateClosedLoopPerformanceMetrics extends Policy {
 		advice.getAttributeAssignmentExpression().add(assignment4);
 
 		AttributeAssignmentExpressionType assignment5 = new AttributeAssignmentExpressionType();
-		assignment5.setAttributeId("matching:" + this.ECOMPID);
+		assignment5.setAttributeId("matching:" + this.ONAPID);
 		assignment5.setCategory(CATEGORY_RESOURCE);
 		assignment5.setIssuer("");
 
 		AttributeValueType configNameAttributeValue5 = new AttributeValueType();
 		configNameAttributeValue5.setDataType(STRING_DATATYPE);
-		configNameAttributeValue5.getContent().add(policyAdapter.getEcompName());
+		configNameAttributeValue5.getContent().add(policyAdapter.getOnapName());
 		assignment5.setExpression(new ObjectFactory().createAttributeValue(configNameAttributeValue5));
 
 		advice.getAttributeAssignmentExpression().add(assignment5);
diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/components/CreateNewMicroServiceModel.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/CreateNewMicroServiceModel.java
index e801a459d..fd9e49c7e 100644
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/components/CreateNewMicroServiceModel.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/CreateNewMicroServiceModel.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PAP-REST
+ * ONAP-PAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pap.xacml.rest.components;
+package org.onap.policy.pap.xacml.rest.components;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
@@ -36,17 +36,17 @@ import java.util.zip.ZipFile;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang.StringUtils;
-import org.openecomp.policy.common.logging.eelf.MessageCodes;
-import org.openecomp.policy.common.logging.eelf.PolicyLogger;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.pap.xacml.rest.XACMLPapServlet;
-import org.openecomp.policy.pap.xacml.rest.daoimpl.CommonClassDaoImpl;
-import org.openecomp.policy.rest.jpa.MicroServiceModels;
-import org.openecomp.policy.rest.jpa.UserInfo;
-import org.openecomp.policy.rest.util.MSAttributeObject;
-import org.openecomp.policy.rest.util.MSModelUtils;
-import org.openecomp.policy.rest.util.MSModelUtils.MODEL_TYPE;
+import org.onap.policy.common.logging.eelf.MessageCodes;
+import org.onap.policy.common.logging.eelf.PolicyLogger;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.pap.xacml.rest.XACMLPapServlet;
+import org.onap.policy.pap.xacml.rest.daoimpl.CommonClassDaoImpl;
+import org.onap.policy.rest.jpa.MicroServiceModels;
+import org.onap.policy.rest.jpa.UserInfo;
+import org.onap.policy.rest.util.MSAttributeObject;
+import org.onap.policy.rest.util.MSModelUtils;
+import org.onap.policy.rest.util.MSModelUtils.MODEL_TYPE;
 
 public class CreateNewMicroServiceModel {
 	private static final Logger logger = FlexLogger.getLogger(CreateNewMicroServiceModel.class);
@@ -54,7 +54,7 @@ public class CreateNewMicroServiceModel {
 	private HashMap<String,MSAttributeObject > classMap = new HashMap<>();
 
 	
-	MSModelUtils utils = new MSModelUtils(XACMLPapServlet.getMsEcompName(), XACMLPapServlet.getMsPolicyName());
+	MSModelUtils utils = new MSModelUtils(XACMLPapServlet.getMsOnapName(), XACMLPapServlet.getMsPolicyName());
 
 	public CreateNewMicroServiceModel(String fileName, String serviceName, String string, String version) {
 		super();
diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/components/DecisionPolicy.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/DecisionPolicy.java
index 5a566c9bd..fe9c581e9 100644
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/components/DecisionPolicy.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/DecisionPolicy.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PAP-REST
+ * ONAP-PAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pap.xacml.rest.components;
+package org.onap.policy.pap.xacml.rest.components;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;
@@ -40,28 +40,28 @@ import java.util.UUID;
 import javax.persistence.EntityManager;
 import javax.persistence.Query;
 
-import org.openecomp.policy.common.logging.eelf.MessageCodes;
-import org.openecomp.policy.common.logging.eelf.PolicyLogger;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.controlloop.policy.builder.BuilderException;
-import org.openecomp.policy.controlloop.policy.builder.Results;
-import org.openecomp.policy.controlloop.policy.guard.Constraint;
-import org.openecomp.policy.controlloop.policy.guard.ControlLoopGuard;
-import org.openecomp.policy.controlloop.policy.guard.Guard;
-import org.openecomp.policy.controlloop.policy.guard.GuardPolicy;
-import org.openecomp.policy.controlloop.policy.guard.MatchParameters;
-import org.openecomp.policy.controlloop.policy.guard.builder.ControlLoopGuardBuilder;
-import org.openecomp.policy.pap.xacml.rest.XACMLPapServlet;
-import org.openecomp.policy.pap.xacml.rest.util.JPAUtils;
-import org.openecomp.policy.rest.adapter.PolicyRestAdapter;
-import org.openecomp.policy.rest.jpa.Datatype;
-import org.openecomp.policy.rest.jpa.DecisionSettings;
-import org.openecomp.policy.rest.jpa.FunctionDefinition;
-import org.openecomp.policy.utils.PolicyUtils;
-import org.openecomp.policy.xacml.api.XACMLErrorConstants;
-import org.openecomp.policy.xacml.std.pip.engines.aaf.AAFEngine;
-import org.openecomp.policy.xacml.util.XACMLPolicyScanner;
+import org.onap.policy.common.logging.eelf.MessageCodes;
+import org.onap.policy.common.logging.eelf.PolicyLogger;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.controlloop.policy.builder.BuilderException;
+import org.onap.policy.controlloop.policy.builder.Results;
+import org.onap.policy.controlloop.policy.guard.Constraint;
+import org.onap.policy.controlloop.policy.guard.ControlLoopGuard;
+import org.onap.policy.controlloop.policy.guard.Guard;
+import org.onap.policy.controlloop.policy.guard.GuardPolicy;
+import org.onap.policy.controlloop.policy.guard.MatchParameters;
+import org.onap.policy.controlloop.policy.guard.builder.ControlLoopGuardBuilder;
+import org.onap.policy.pap.xacml.rest.XACMLPapServlet;
+import org.onap.policy.pap.xacml.rest.util.JPAUtils;
+import org.onap.policy.rest.adapter.PolicyRestAdapter;
+import org.onap.policy.rest.jpa.Datatype;
+import org.onap.policy.rest.jpa.DecisionSettings;
+import org.onap.policy.rest.jpa.FunctionDefinition;
+import org.onap.policy.utils.PolicyUtils;
+import org.onap.policy.xacml.api.XACMLErrorConstants;
+import org.onap.policy.xacml.std.pip.engines.aaf.AAFEngine;
+import org.onap.policy.xacml.util.XACMLPolicyScanner;
 
 import com.att.research.xacml.std.IdentifierImpl;
 
@@ -95,7 +95,7 @@ public class DecisionPolicy extends Policy {
     private static final String XACML_GUARD_TEMPLATE = "Decision_GuardPolicyTemplate.xml";
     private static final String XACML_BLGUARD_TEMPLATE = "Decision_GuardBLPolicyTemplate.xml";
 
-	private static final String ECOMPNAME = "ECOMPName";
+	private static final String ONAPNAME = "ONAPName";
 	private static final String POLICY_NAME = "PolicyName";
 	private static final String DESCRIPTION = "description";
 
@@ -173,7 +173,7 @@ public class DecisionPolicy extends Policy {
 				name = fileName.substring(fileName.lastIndexOf('/') + 1, fileName.length());
 			}
 			yamlParams.put(POLICY_NAME, name);
-			yamlParams.put(ECOMPNAME, policyAdapter.getEcompName());
+			yamlParams.put(ONAPNAME, policyAdapter.getOnapName());
 			Map<String, String> params = policyAdapter.getDynamicFieldConfigAttributes();
 			yamlParams.putAll(params);
 			// Call YAML to XACML 
@@ -198,8 +198,8 @@ public class DecisionPolicy extends Policy {
 			
 			AllOfType allOf = new AllOfType();
 			
-			// Match for Ecomp
-			allOf.getMatch().add(createMatch(ECOMPNAME, (policyAdapter.getEcompName())));
+			// Match for Onap
+			allOf.getMatch().add(createMatch(ONAPNAME, (policyAdapter.getOnapName())));
 			
 			Map<String, String> dynamicFieldComponentAttributes = policyAdapter.getDynamicFieldConfigAttributes();
 			if(policyAdapter.getRuleProvider()!=null && policyAdapter.getRuleProvider().equals(AAFPROVIDER)){
@@ -327,7 +327,7 @@ public class DecisionPolicy extends Policy {
 				HashMap<String, String> yamlSpecs = new HashMap<>();
 				yamlSpecs.put(POLICY_NAME, yamlParams.get(POLICY_NAME));
 				yamlSpecs.put(DESCRIPTION, yamlParams.get(DESCRIPTION));
-				yamlSpecs.put(ECOMPNAME, yamlParams.get(ECOMPNAME));
+				yamlSpecs.put(ONAPNAME, yamlParams.get(ONAPNAME));
 				yamlSpecs.put("actor", yamlGuardObject.getGuards().getFirst().getMatch_parameters().getActor());
 				yamlSpecs.put("recipe", yamlGuardObject.getGuards().getFirst().getMatch_parameters().getRecipe());
 				yamlSpecs.put("clname", yamlGuardObject.getGuards().getFirst().getMatch_parameters().getControlLoopName());
diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/components/FirewallConfigPolicy.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/FirewallConfigPolicy.java
index 9f780fd28..0c8784c81 100644
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/components/FirewallConfigPolicy.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/FirewallConfigPolicy.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PAP-REST
+ * ONAP-PAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pap.xacml.rest.components;
+package org.onap.policy.pap.xacml.rest.components;
 
 import java.io.BufferedWriter;
 import java.io.File;
@@ -44,23 +44,23 @@ import javax.persistence.EntityManager;
 import javax.persistence.Query;
 
 import org.apache.commons.io.FilenameUtils;
-import org.openecomp.policy.common.logging.eelf.MessageCodes;
-import org.openecomp.policy.common.logging.eelf.PolicyLogger;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.pap.xacml.rest.XACMLPapServlet;
-import org.openecomp.policy.pap.xacml.rest.daoimpl.CommonClassDaoImpl;
-import org.openecomp.policy.rest.adapter.PolicyRestAdapter;
-import org.openecomp.policy.rest.jpa.ActionList;
-import org.openecomp.policy.rest.jpa.AddressGroup;
-import org.openecomp.policy.rest.jpa.GroupServiceList;
-import org.openecomp.policy.rest.jpa.PolicyEntity;
-import org.openecomp.policy.rest.jpa.PortList;
-import org.openecomp.policy.rest.jpa.PrefixList;
-import org.openecomp.policy.rest.jpa.ProtocolList;
-import org.openecomp.policy.rest.jpa.ServiceList;
-import org.openecomp.policy.rest.jpa.TermList;
-import org.openecomp.policy.rest.jpa.UserInfo;
+import org.onap.policy.common.logging.eelf.MessageCodes;
+import org.onap.policy.common.logging.eelf.PolicyLogger;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.pap.xacml.rest.XACMLPapServlet;
+import org.onap.policy.pap.xacml.rest.daoimpl.CommonClassDaoImpl;
+import org.onap.policy.rest.adapter.PolicyRestAdapter;
+import org.onap.policy.rest.jpa.ActionList;
+import org.onap.policy.rest.jpa.AddressGroup;
+import org.onap.policy.rest.jpa.GroupServiceList;
+import org.onap.policy.rest.jpa.PolicyEntity;
+import org.onap.policy.rest.jpa.PortList;
+import org.onap.policy.rest.jpa.PrefixList;
+import org.onap.policy.rest.jpa.ProtocolList;
+import org.onap.policy.rest.jpa.ServiceList;
+import org.onap.policy.rest.jpa.TermList;
+import org.onap.policy.rest.jpa.UserInfo;
 
 import com.att.research.xacml.std.IdentifierImpl;
 import com.fasterxml.jackson.databind.JsonNode;
@@ -394,9 +394,9 @@ public class FirewallConfigPolicy extends Policy {
 		assignment4.setExpression(new ObjectFactory().createAttributeValue(configNameAttributeValue4));
 		advice.getAttributeAssignmentExpression().add(assignment4);
 
-		//Ecomp Name Assignment
+		//Onap Name Assignment
 		AttributeAssignmentExpressionType assignment5 = new AttributeAssignmentExpressionType();
-		assignment5.setAttributeId("matching:" + ECOMPID);
+		assignment5.setAttributeId("matching:" + ONAPID);
 		assignment5.setCategory(CATEGORY_RESOURCE);
 		assignment5.setIssuer("");
 		AttributeValueType configNameAttributeValue5 = new AttributeValueType();
diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/components/MicroServiceConfigPolicy.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/MicroServiceConfigPolicy.java
index 5938faa66..0297f30c0 100644
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/components/MicroServiceConfigPolicy.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/MicroServiceConfigPolicy.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PAP-REST
+ * ONAP-PAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pap.xacml.rest.components;
+package org.onap.policy.pap.xacml.rest.components;
 
 import java.io.File;
 import java.io.PrintWriter;
@@ -34,13 +34,13 @@ import java.util.Map.Entry;
 
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.lang.StringUtils;
-import org.openecomp.policy.common.logging.eelf.MessageCodes;
-import org.openecomp.policy.common.logging.eelf.PolicyLogger;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.pap.xacml.rest.daoimpl.CommonClassDaoImpl;
-import org.openecomp.policy.rest.adapter.PolicyRestAdapter;
-import org.openecomp.policy.rest.jpa.MicroServiceModels;
+import org.onap.policy.common.logging.eelf.MessageCodes;
+import org.onap.policy.common.logging.eelf.PolicyLogger;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.pap.xacml.rest.daoimpl.CommonClassDaoImpl;
+import org.onap.policy.rest.adapter.PolicyRestAdapter;
+import org.onap.policy.rest.jpa.MicroServiceModels;
 
 import com.att.research.xacml.std.IdentifierImpl;
 import com.fasterxml.jackson.databind.JsonNode;
@@ -189,8 +189,8 @@ public class MicroServiceConfigPolicy extends Policy {
 			
 			AllOfType allOf = new AllOfType();
 		
-			// Adding the matches to AllOfType element Match for Ecomp
-			allOf.getMatch().add(createMatch("ECOMPName", policyAdapter.getEcompName()));
+			// Adding the matches to AllOfType element Match for Onap
+			allOf.getMatch().add(createMatch("ONAPName", policyAdapter.getOnapName()));
 			if (matchMap==null || matchMap.isEmpty()){
 				// Match for ConfigName
 				allOf.getMatch().add(createMatch("ConfigName", policyAdapter.getConfigName()));
@@ -400,13 +400,13 @@ public class MicroServiceConfigPolicy extends Policy {
 		advice.getAttributeAssignmentExpression().add(assignment4);
 
 		AttributeAssignmentExpressionType assignment5 = new AttributeAssignmentExpressionType();
-		assignment5.setAttributeId("matching:" + ECOMPID);
+		assignment5.setAttributeId("matching:" + ONAPID);
 		assignment5.setCategory(CATEGORY_RESOURCE);
 		assignment5.setIssuer("");
 
 		AttributeValueType configNameAttributeValue5 = new AttributeValueType();
 		configNameAttributeValue5.setDataType(STRING_DATATYPE);
-		configNameAttributeValue5.getContent().add(policyAdapter.getEcompName());
+		configNameAttributeValue5.getContent().add(policyAdapter.getOnapName());
 		assignment5.setExpression(new ObjectFactory().createAttributeValue(configNameAttributeValue5));
 
 		advice.getAttributeAssignmentExpression().add(assignment5);
diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/components/Policy.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/Policy.java
index bdd36123f..6d0a0c79b 100644
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/components/Policy.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/Policy.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PAP-REST
+ * ONAP-PAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pap.xacml.rest.components;
+package org.onap.policy.pap.xacml.rest.components;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -37,13 +37,13 @@ import javax.json.JsonReader;
 
 import org.apache.commons.io.FilenameUtils;
 import org.json.JSONObject;
-import org.openecomp.policy.common.logging.eelf.MessageCodes;
-import org.openecomp.policy.common.logging.eelf.PolicyLogger;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.rest.XACMLRestProperties;
-import org.openecomp.policy.rest.adapter.PolicyRestAdapter;
-import org.openecomp.policy.xacml.util.XACMLPolicyWriter;
+import org.onap.policy.common.logging.eelf.MessageCodes;
+import org.onap.policy.common.logging.eelf.PolicyLogger;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.rest.XACMLRestProperties;
+import org.onap.policy.rest.adapter.PolicyRestAdapter;
+import org.onap.policy.xacml.util.XACMLPolicyWriter;
 
 import com.att.research.xacml.std.IdentifierImpl;
 import com.att.research.xacml.util.XACMLProperties;
@@ -66,7 +66,7 @@ public abstract class Policy {
 	public static final String GET_INT_TYPE = "Integer";
 	public static final String GET_STRING_TYPE = "String";
 
-	public static final String ECOMPID = "ECOMPName";
+	public static final String ONAPID = "ONAPName";
 	public static final String CONFIGID = "ConfigName";
 	public static final String CLOSEDLOOPID = "ServiceType";
 
@@ -104,7 +104,7 @@ public abstract class Policy {
 	public static final String FUNCTION_STRING_ONE_AND_ONLY = "urn:oasis:names:tc:xacml:1.0:function:string-one-and-only";
 	public static final String FUNCTION_BOOLEAN_ONE_AND_ONLY = "urn:oasis:names:tc:xacml:1.0:function:boolean-one-and-only";
 	public static final String FUNCTION_STRING_EQUAL = "urn:oasis:names:tc:xacml:1.0:function:string-equal";
-	public static final String FUNCTION_STRING_REGEX_MATCH = "org.openecomp.function.regex-match";
+	public static final String FUNCTION_STRING_REGEX_MATCH = "org.onap.function.regex-match";
 	public static final String FUNCTION_STRING_REGEXP_MATCH = "urn:oasis:names:tc:xacml:1.0:function:string-regexp-match";
 	public static final String FUNCTION_STRING_EQUAL_IGNORE = "urn:oasis:names:tc:xacml:3.0:function:string-equal-ignore-case";
 	public static final String INTEGER_DATATYPE = "http://www.w3.org/2001/XMLSchema#integer";
@@ -151,7 +151,7 @@ public abstract class Policy {
 	public abstract boolean prepareToSave() throws Exception;
 
 
-	// create match for ecomp and config name
+	// create match for onap and config name
 	protected MatchType createMatch(String key, String value) {
 		MatchType match = new MatchType();
 
diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/components/PolicyDBDao.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/PolicyDBDao.java
index 2297413e8..98c8137de 100644
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/components/PolicyDBDao.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/PolicyDBDao.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PAP-REST
+ * ONAP-PAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pap.xacml.rest.components;
+package org.onap.policy.pap.xacml.rest.components;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;
@@ -64,27 +64,27 @@ import javax.xml.xpath.XPathFactory;
 
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.io.IOUtils;
-import org.openecomp.policy.common.logging.eelf.MessageCodes;
-import org.openecomp.policy.common.logging.eelf.PolicyLogger;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.pap.xacml.rest.XACMLPapServlet;
-import org.openecomp.policy.rest.XACMLRestProperties;
-import org.openecomp.policy.rest.adapter.PolicyRestAdapter;
-import org.openecomp.policy.rest.jpa.ActionBodyEntity;
-import org.openecomp.policy.rest.jpa.ConfigurationDataEntity;
-import org.openecomp.policy.rest.jpa.DatabaseLockEntity;
-import org.openecomp.policy.rest.jpa.GroupEntity;
-import org.openecomp.policy.rest.jpa.PdpEntity;
-import org.openecomp.policy.rest.jpa.PolicyDBDaoEntity;
-import org.openecomp.policy.rest.jpa.PolicyEntity;
-import org.openecomp.policy.rest.util.Webapps;
-import org.openecomp.policy.xacml.api.pap.EcompPDP;
-import org.openecomp.policy.xacml.api.pap.EcompPDPGroup;
-import org.openecomp.policy.xacml.api.pap.PAPPolicyEngine;
-import org.openecomp.policy.xacml.std.pap.StdPDPGroup;
-import org.openecomp.policy.xacml.std.pap.StdPDPPolicy;
-import org.openecomp.policy.xacml.util.XACMLPolicyWriter;
+import org.onap.policy.common.logging.eelf.MessageCodes;
+import org.onap.policy.common.logging.eelf.PolicyLogger;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.pap.xacml.rest.XACMLPapServlet;
+import org.onap.policy.rest.XACMLRestProperties;
+import org.onap.policy.rest.adapter.PolicyRestAdapter;
+import org.onap.policy.rest.jpa.ActionBodyEntity;
+import org.onap.policy.rest.jpa.ConfigurationDataEntity;
+import org.onap.policy.rest.jpa.DatabaseLockEntity;
+import org.onap.policy.rest.jpa.GroupEntity;
+import org.onap.policy.rest.jpa.PdpEntity;
+import org.onap.policy.rest.jpa.PolicyDBDaoEntity;
+import org.onap.policy.rest.jpa.PolicyEntity;
+import org.onap.policy.rest.util.Webapps;
+import org.onap.policy.xacml.api.pap.OnapPDP;
+import org.onap.policy.xacml.api.pap.OnapPDPGroup;
+import org.onap.policy.xacml.api.pap.PAPPolicyEngine;
+import org.onap.policy.xacml.std.pap.StdPDPGroup;
+import org.onap.policy.xacml.std.pap.StdPDPPolicy;
+import org.onap.policy.xacml.util.XACMLPolicyWriter;
 import org.w3c.dom.Document;
 import org.xml.sax.InputSource;
 
@@ -268,7 +268,7 @@ public class PolicyDBDao {
 	 * Computes the scope in dotted format based on an absolute path and a path that divides the scope.
 	 * @param fullPath An absolute path including scope folders and other folders(does not have to be absolute, must just contain scope and other folders before)
 	 * @param pathToExclude The path that acts as a division between the scope and the other folders
-	 * @return The scope in dotted format (org.openecomp)
+	 * @return The scope in dotted format (org.onap)
 	 */
 	private static String computeScope(String fullPath, String pathToExclude){
 		logger.debug("computeScope(String fullPath, String pathToExclude) as computeScope("+fullPath+", "+pathToExclude+") called");
@@ -704,7 +704,7 @@ public class PolicyDBDao {
 		}
 		//compare to local fs
 		//does group folder exist
-		EcompPDPGroup localGroup = null;
+		OnapPDPGroup localGroup = null;
 		try {
 			localGroup = papEngine.getGroup(groupRecord.getGroupId());
 		} catch (Exception e) {
@@ -719,7 +719,7 @@ public class PolicyDBDao {
 			}
 		}
 		if(localGroup != null && groupRecord.isDeleted()){
-			EcompPDPGroup newLocalGroup = null;
+			OnapPDPGroup newLocalGroup = null;
 			if(extraData != null){
 				try {
 					newLocalGroup = papEngine.getGroup(extraData);
@@ -767,7 +767,7 @@ public class PolicyDBDao {
 			//clone the object
 			//because it will be comparing the new group to its own version
 			StdPDPGroup localGroupClone = new StdPDPGroup(localGroup.getId(),localGroup.isDefaultGroup(),localGroup.getName(),localGroup.getDescription(),((StdPDPGroup)localGroup).getDirectory());
-			localGroupClone.setEcompPdps(localGroup.getEcompPdps());
+			localGroupClone.setOnapPdps(localGroup.getOnapPdps());
 			localGroupClone.setPipConfigs(localGroup.getPipConfigs());
 			localGroupClone.setStatus(localGroup.getStatus());			
 			//we are updating a group or adding a policy or changing default
@@ -809,7 +809,7 @@ public class PolicyDBDao {
 		//call command that corresponds to the change that was made
 	}
 	//this will also handle removes, since incoming pdpGroup has no policies internally, we are just going to add them all in from the db
-	private boolean updateGroupPoliciesInFileSystem(EcompPDPGroup pdpGroup,EcompPDPGroup oldPdpGroup, GroupEntity groupRecord, PolicyDBDaoTransaction transaction) throws PAPException{
+	private boolean updateGroupPoliciesInFileSystem(OnapPDPGroup pdpGroup,OnapPDPGroup oldPdpGroup, GroupEntity groupRecord, PolicyDBDaoTransaction transaction) throws PAPException{
 		if(!(pdpGroup instanceof StdPDPGroup)){
 			throw new PAPException("group is not a StdPDPGroup");
 		}
@@ -905,7 +905,7 @@ public class PolicyDBDao {
 		}
 		if(localPdp != null && pdpRecord.isDeleted()){
 			try {
-				papEngine.removePDP((EcompPDP) localPdp);
+				papEngine.removePDP((OnapPDP) localPdp);
 			} catch (PAPException e) {
 				PolicyLogger.error(MessageCodes.EXCEPTION_ERROR, e, "PolicyDBDao", "Caught PAPException trying to get remove pdp with papEngine.removePDP("+localPdp+");");
 				throw new PAPException("Could not remove pdp "+pdpId);
@@ -914,7 +914,7 @@ public class PolicyDBDao {
 		else if(localPdp == null){
 			//add new pdp
 			//get group
-			EcompPDPGroup localGroup = null;
+			OnapPDPGroup localGroup = null;
 			try {
 				localGroup = papEngine.getGroup(pdpRecord.getGroup().getGroupId());
 			} catch (PAPException e1) {
@@ -940,13 +940,13 @@ public class PolicyDBDao {
 			}
 			String localPdpGroupId = null;
 			try{
-				localPdpGroupId = papEngine.getPDPGroup((EcompPDP) localPdp).getId();
+				localPdpGroupId = papEngine.getPDPGroup((OnapPDP) localPdp).getId();
 			} catch(PAPException e){
 				//could be null or something, just warn at this point
 				logger.warn("Caught PAPException trying to get id of local group that pdp is in with localPdpGroupId = papEngine.getPDPGroup(localPdp).getId();",e);
 			}
 			if(!stringEquals(localPdpGroupId,pdpRecord.getGroup().getGroupId())){
-				EcompPDPGroup newPdpGroup = null;
+				OnapPDPGroup newPdpGroup = null;
 				try{
 					newPdpGroup = papEngine.getGroup(pdpRecord.getGroup().getGroupId());
 				}catch(PAPException e){
@@ -955,7 +955,7 @@ public class PolicyDBDao {
 					throw new PAPException("Could not get local group");
 				}
 				try{
-					papEngine.movePDP((EcompPDP) localPdp, newPdpGroup);
+					papEngine.movePDP((OnapPDP) localPdp, newPdpGroup);
 				}catch(PAPException e){
 					PolicyLogger.error(MessageCodes.EXCEPTION_ERROR, e, "PolicyDBDao", "Caught PAPException trying to move pdp with papEngine.movePDP(localPdp, newPdpGroup);");
 					throw new PAPException("Could not move pdp "+localPdp);
@@ -967,7 +967,7 @@ public class PolicyDBDao {
 			}
 			if(needToUpdate){
 				try {
-					papEngine.updatePDP((EcompPDP) localPdp);
+					papEngine.updatePDP((OnapPDP) localPdp);
 				} catch (PAPException e) {
 					PolicyLogger.error(MessageCodes.EXCEPTION_ERROR, e, "PolicyDBDao", "Caught PAPException trying to update pdp with papEngine.updatePdp("+localPdp+");");
 					throw new PAPException("Could not update pdp "+localPdp);
@@ -1144,9 +1144,9 @@ public class PolicyDBDao {
 		final String AUDIT_STR = "Audit";
 		try{
 
-			Set<EcompPDPGroup> groups = papEngine2.getEcompPDPGroups();
+			Set<OnapPDPGroup> groups = papEngine2.getOnapPDPGroups();
 
-			for (EcompPDPGroup grp : groups){
+			for (OnapPDPGroup grp : groups){
 				try{
 					GroupEntity groupEntity = new GroupEntity();
 					em.persist(groupEntity);
@@ -1156,9 +1156,9 @@ public class PolicyDBDao {
 					groupEntity.setCreatedBy(AUDIT_STR);
 					groupEntity.setGroupId(createNewPDPGroupId(grp.getId()));
 					groupEntity.setModifiedBy(AUDIT_STR);
-					Set<EcompPDP> pdps =  grp.getEcompPdps();				
+					Set<OnapPDP> pdps =  grp.getOnapPdps();				
 
-					for(EcompPDP pdp : pdps){
+					for(OnapPDP pdp : pdps){
 						PdpEntity pdpEntity = new PdpEntity();
 						em.persist(pdpEntity);
 						pdpEntity.setGroup(groupEntity);
@@ -2250,7 +2250,7 @@ public class PolicyDBDao {
 		}
 
 		@Override
-		public void updateGroup(EcompPDPGroup group, String username){
+		public void updateGroup(OnapPDPGroup group, String username){
 			logger.debug("updateGroup(PDPGroup group) as updateGroup("+group+","+username+") called");
 			if(group == null){
 				throw new IllegalArgumentException("PDPGroup group must not be null");
@@ -2405,7 +2405,7 @@ public class PolicyDBDao {
 
 
 		@Override
-		public void updatePdp(EcompPDP pdp, String username){
+		public void updatePdp(OnapPDP pdp, String username){
 			logger.debug("updatePdp(PDP pdp, String username) as updatePdp("+pdp+","+username+") called");
 			if(pdp == null){
 				throw new IllegalArgumentException("PDP pdp must not be null");
@@ -2453,7 +2453,7 @@ public class PolicyDBDao {
 		}
 
 		@Override
-		public void movePdp(EcompPDP pdp, EcompPDPGroup group, String username){
+		public void movePdp(OnapPDP pdp, OnapPDPGroup group, String username){
 			logger.debug("movePdp(PDP pdp, PDPGroup group, String username) as movePdp("+pdp+","+group+","+username+") called");
 			if(pdp == null || group == null){
 				throw new IllegalArgumentException("PDP pdp and PDPGroup group must not be null");
@@ -2511,7 +2511,7 @@ public class PolicyDBDao {
 		}
 
 		@Override
-		public void changeDefaultGroup(EcompPDPGroup group, String username){
+		public void changeDefaultGroup(OnapPDPGroup group, String username){
 			logger.debug("changeDefaultGroup(PDPGroup group, String username) as changeDefaultGroup("+group+","+username+") called");
 			if(group == null){
 				throw new IllegalArgumentException("PDPGroup group must not be null");
@@ -2565,7 +2565,7 @@ public class PolicyDBDao {
 
 
 		@Override
-		public void deleteGroup(EcompPDPGroup group, EcompPDPGroup moveToGroup, String username) throws PAPException {
+		public void deleteGroup(OnapPDPGroup group, OnapPDPGroup moveToGroup, String username) throws PAPException {
 			logger.debug("deleteGroup(PDPGroup group, PDPGroup moveToGroup, String username) as deleteGroup("+group+", "+moveToGroup+","+username+") called");
 			if(group == null){
 				throw new IllegalArgumentException("PDPGroup group cannot be null");
diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/components/PolicyDBDaoTransaction.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/PolicyDBDaoTransaction.java
index 7b8801cd8..f5a22bcd4 100644
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/components/PolicyDBDaoTransaction.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/PolicyDBDaoTransaction.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PAP-REST
+ * ONAP-PAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,16 +18,16 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pap.xacml.rest.components;
+package org.onap.policy.pap.xacml.rest.components;
 
 import java.util.List;
 
 import javax.persistence.PersistenceException;
 
-import org.openecomp.policy.rest.jpa.GroupEntity;
-import org.openecomp.policy.rest.jpa.PdpEntity;
-import org.openecomp.policy.xacml.api.pap.EcompPDP;
-import org.openecomp.policy.xacml.api.pap.EcompPDPGroup;
+import org.onap.policy.rest.jpa.GroupEntity;
+import org.onap.policy.rest.jpa.PdpEntity;
+import org.onap.policy.xacml.api.pap.OnapPDP;
+import org.onap.policy.xacml.api.pap.OnapPDPGroup;
 
 import com.att.research.xacml.api.pap.PAPException;
 
@@ -98,7 +98,7 @@ public interface PolicyDBDaoTransaction {
 	 * @throws IllegalStateException If a transaction is already open
 	 * @throws PersistenceException If a database error occurs or if the group can not be found
 	 */
-	public void updateGroup(EcompPDPGroup group, String username) throws IllegalArgumentException, IllegalStateException, PersistenceException;
+	public void updateGroup(OnapPDPGroup group, String username) throws IllegalArgumentException, IllegalStateException, PersistenceException;
 	
 	/**
 	 * Updates a PDP in the database with new information
@@ -108,7 +108,7 @@ public interface PolicyDBDaoTransaction {
 	 * @throws IllegalStateException If a transaction is already open
 	 * @throws PersistenceException If a database error occurs or if the pdp can not be found
 	 */
-	public void updatePdp(EcompPDP pdp, String username) throws IllegalArgumentException, IllegalStateException, PersistenceException;
+	public void updatePdp(OnapPDP pdp, String username) throws IllegalArgumentException, IllegalStateException, PersistenceException;
 	
 	/**
 	 * Change the default group in the database to the group provided.
@@ -118,7 +118,7 @@ public interface PolicyDBDaoTransaction {
 	 * @throws IllegalStateException If a transaction is already open
 	 * @throws PersistenceException If a database error occurs
 	 */
-	public void changeDefaultGroup(EcompPDPGroup group, String username) throws IllegalArgumentException, IllegalStateException, PersistenceException;
+	public void changeDefaultGroup(OnapPDPGroup group, String username) throws IllegalArgumentException, IllegalStateException, PersistenceException;
 	
 	/**
 	 * Moves a PDP to a new group.
@@ -129,7 +129,7 @@ public interface PolicyDBDaoTransaction {
 	 * @throws IllegalStateException If a transaction is already open
 	 * @throws PersistenceException If a database error occurs
 	 */
-	public void movePdp(EcompPDP pdp, EcompPDPGroup group, String username) throws IllegalArgumentException, IllegalStateException, PersistenceException;
+	public void movePdp(OnapPDP pdp, OnapPDPGroup group, String username) throws IllegalArgumentException, IllegalStateException, PersistenceException;
 	
 	/**
 	 * Add a new PDP to an existing group
@@ -165,7 +165,7 @@ public interface PolicyDBDaoTransaction {
 	 * @throws PersistenceException If a database error occurs
 	 * @throws PAPException If an error relating to how groups are handled occurs
 	 */
-	public void deleteGroup(EcompPDPGroup group, EcompPDPGroup moveToGroup, String username)throws IllegalArgumentException, IllegalStateException, PersistenceException, PAPException;
+	public void deleteGroup(OnapPDPGroup group, OnapPDPGroup moveToGroup, String username)throws IllegalArgumentException, IllegalStateException, PersistenceException, PAPException;
 	
 	/**
 	 * Removes an existing PDP from its group and deletes it.
diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/components/SafePolicyBuilder.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/SafePolicyBuilder.java
index bd69a8808..ba5b0026a 100644
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/components/SafePolicyBuilder.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/SafePolicyBuilder.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PAP-REST
+ * ONAP-PAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,15 +17,15 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.pap.xacml.rest.components;
+package org.onap.policy.pap.xacml.rest.components;
 
 import java.util.List;
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.openecomp.policy.common.logging.eelf.PolicyLogger;
-import org.openecomp.policy.controlloop.policy.guard.ControlLoopGuard;
+import org.onap.policy.common.logging.eelf.PolicyLogger;
+import org.onap.policy.controlloop.policy.guard.ControlLoopGuard;
 import org.yaml.snakeyaml.Yaml;
 import org.yaml.snakeyaml.constructor.Constructor;
 
diff --git a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/package-info.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/package-info.java
new file mode 100644
index 000000000..31e504883
--- /dev/null
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/package-info.java
@@ -0,0 +1,21 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP-PAP-REST
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.pap.xacml.rest.components;
diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/ActionPolicyDictionaryController.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/controller/ActionPolicyDictionaryController.java
index 3ddeee32e..f7a170131 100644
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/ActionPolicyDictionaryController.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/controller/ActionPolicyDictionaryController.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PAP-REST
+ * ONAP-PAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pap.xacml.rest.controller;
+package org.onap.policy.pap.xacml.rest.controller;
 
 import java.io.PrintWriter;
 import java.util.ArrayList;
@@ -32,12 +32,12 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.json.JSONObject;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.pap.xacml.rest.util.JsonMessage;
-import org.openecomp.policy.rest.dao.CommonClassDao;
-import org.openecomp.policy.rest.jpa.ActionPolicyDict;
-import org.openecomp.policy.rest.jpa.UserInfo;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.pap.xacml.rest.util.JsonMessage;
+import org.onap.policy.rest.dao.CommonClassDao;
+import org.onap.policy.rest.jpa.ActionPolicyDict;
+import org.onap.policy.rest.jpa.UserInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.stereotype.Controller;
diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/BRMSDictionaryController.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/controller/BRMSDictionaryController.java
index 4dda095d4..26d3ccfff 100644
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/BRMSDictionaryController.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/controller/BRMSDictionaryController.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PAP-REST
+ * ONAP-PAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pap.xacml.rest.controller;
+package org.onap.policy.pap.xacml.rest.controller;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
@@ -33,17 +33,17 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.io.IOUtils;
 import org.json.JSONObject;
-import org.openecomp.policy.api.PEDependency;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.pap.xacml.rest.util.JsonMessage;
-import org.openecomp.policy.rest.dao.CommonClassDao;
-import org.openecomp.policy.rest.jpa.BRMSController;
-import org.openecomp.policy.rest.jpa.BRMSDependency;
-import org.openecomp.policy.rest.jpa.BRMSParamTemplate;
-import org.openecomp.policy.rest.jpa.UserInfo;
-import org.openecomp.policy.utils.PolicyUtils;
-import org.openecomp.policy.xacml.api.XACMLErrorConstants;
+import org.onap.policy.api.PEDependency;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.pap.xacml.rest.util.JsonMessage;
+import org.onap.policy.rest.dao.CommonClassDao;
+import org.onap.policy.rest.jpa.BRMSController;
+import org.onap.policy.rest.jpa.BRMSDependency;
+import org.onap.policy.rest.jpa.BRMSParamTemplate;
+import org.onap.policy.rest.jpa.UserInfo;
+import org.onap.policy.utils.PolicyUtils;
+import org.onap.policy.xacml.api.XACMLErrorConstants;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.stereotype.Controller;
@@ -300,7 +300,7 @@ public class BRMSDictionaryController{
                 userId = root.get("userid").textValue();
             }
             
-            LOGGER.audit("the userId from the ecomp portal is: " + userId);
+            LOGGER.audit("the userId from the onap portal is: " + userId);
             String responseString = null;
             
             if(brmsDependency.getDependency()!=null && !brmsDependency.getDependency().trim().equals("")){
@@ -454,7 +454,7 @@ public class BRMSDictionaryController{
                 brmsController = (BRMSController)mapper.readValue(root.get("brmsControllerDictionaryData").toString(), BRMSController.class);
                 userId = root.get("userid").textValue();
             }
-            LOGGER.audit("the userId from the ecomp portal is: " + userId);
+            LOGGER.audit("the userId from the onap portal is: " + userId);
             String responseString = null;
             if(brmsController.getController()!=null && !brmsController.getController().trim().equals("")){
                 PEDependency dependency = null;
diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/ClosedLoopDictionaryController.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/controller/ClosedLoopDictionaryController.java
index f97d84692..75345f99c 100644
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/ClosedLoopDictionaryController.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/controller/ClosedLoopDictionaryController.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PAP-REST
+ * ONAP-PAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pap.xacml.rest.controller;
+package org.onap.policy.pap.xacml.rest.controller;
 
 import java.io.PrintWriter;
 import java.util.Date;
@@ -31,19 +31,19 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.json.JSONObject;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.pap.xacml.rest.adapters.GridData;
-import org.openecomp.policy.pap.xacml.rest.util.JsonMessage;
-import org.openecomp.policy.rest.dao.CommonClassDao;
-import org.openecomp.policy.rest.jpa.ClosedLoopD2Services;
-import org.openecomp.policy.rest.jpa.ClosedLoopSite;
-import org.openecomp.policy.rest.jpa.PEPOptions;
-import org.openecomp.policy.rest.jpa.UserInfo;
-import org.openecomp.policy.rest.jpa.VNFType;
-import org.openecomp.policy.rest.jpa.VSCLAction;
-import org.openecomp.policy.rest.jpa.VarbindDictionary;
-import org.openecomp.policy.xacml.api.XACMLErrorConstants;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.pap.xacml.rest.adapters.GridData;
+import org.onap.policy.pap.xacml.rest.util.JsonMessage;
+import org.onap.policy.rest.dao.CommonClassDao;
+import org.onap.policy.rest.jpa.ClosedLoopD2Services;
+import org.onap.policy.rest.jpa.ClosedLoopSite;
+import org.onap.policy.rest.jpa.PEPOptions;
+import org.onap.policy.rest.jpa.UserInfo;
+import org.onap.policy.rest.jpa.VNFType;
+import org.onap.policy.rest.jpa.VSCLAction;
+import org.onap.policy.rest.jpa.VarbindDictionary;
+import org.onap.policy.xacml.api.XACMLErrorConstants;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.stereotype.Controller;
diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/DecisionPolicyDictionaryController.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/controller/DecisionPolicyDictionaryController.java
index c9a20066d..ac19b99a2 100644
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/DecisionPolicyDictionaryController.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/controller/DecisionPolicyDictionaryController.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PAP-REST
+ * ONAP-PAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pap.xacml.rest.controller;
+package org.onap.policy.pap.xacml.rest.controller;
 
 import java.io.PrintWriter;
 import java.util.ArrayList;
@@ -32,15 +32,15 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.json.JSONObject;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.pap.xacml.rest.util.JsonMessage;
-import org.openecomp.policy.rest.dao.CommonClassDao;
-import org.openecomp.policy.rest.jpa.Datatype;
-import org.openecomp.policy.rest.jpa.DecisionSettings;
-import org.openecomp.policy.rest.jpa.RainyDayTreatments;
-import org.openecomp.policy.rest.jpa.UserInfo;
-import org.openecomp.policy.xacml.api.XACMLErrorConstants;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.pap.xacml.rest.util.JsonMessage;
+import org.onap.policy.rest.dao.CommonClassDao;
+import org.onap.policy.rest.jpa.Datatype;
+import org.onap.policy.rest.jpa.DecisionSettings;
+import org.onap.policy.rest.jpa.RainyDayTreatments;
+import org.onap.policy.rest.jpa.UserInfo;
+import org.onap.policy.xacml.api.XACMLErrorConstants;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.stereotype.Controller;
diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/DescriptiveDictionaryController.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/controller/DescriptiveDictionaryController.java
index 0ea1da171..1811223e6 100644
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/DescriptiveDictionaryController.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/controller/DescriptiveDictionaryController.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PAP-REST
+ * ONAP-PAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pap.xacml.rest.controller;
+package org.onap.policy.pap.xacml.rest.controller;
 
 import java.io.PrintWriter;
 import java.util.Date;
@@ -31,14 +31,14 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.json.JSONObject;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.pap.xacml.rest.adapters.GridData;
-import org.openecomp.policy.pap.xacml.rest.util.JsonMessage;
-import org.openecomp.policy.rest.dao.CommonClassDao;
-import org.openecomp.policy.rest.jpa.DescriptiveScope;
-import org.openecomp.policy.rest.jpa.UserInfo;
-import org.openecomp.policy.xacml.api.XACMLErrorConstants;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.pap.xacml.rest.adapters.GridData;
+import org.onap.policy.pap.xacml.rest.util.JsonMessage;
+import org.onap.policy.rest.dao.CommonClassDao;
+import org.onap.policy.rest.jpa.DescriptiveScope;
+import org.onap.policy.rest.jpa.UserInfo;
+import org.onap.policy.xacml.api.XACMLErrorConstants;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.stereotype.Controller;
diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/DictionaryController.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/controller/DictionaryController.java
index b01f9b031..d16de1f9c 100644
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/DictionaryController.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/controller/DictionaryController.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PAP-REST
+ * ONAP-PAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pap.xacml.rest.controller;
+package org.onap.policy.pap.xacml.rest.controller;
 
 import java.io.PrintWriter;
 import java.util.ArrayList;
@@ -34,14 +34,14 @@ import javax.servlet.http.HttpServletResponse;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.json.JSONObject;
-import org.openecomp.policy.pap.xacml.rest.util.JsonMessage;
-import org.openecomp.policy.rest.dao.CommonClassDao;
-import org.openecomp.policy.rest.jpa.Attribute;
-import org.openecomp.policy.rest.jpa.Category;
-import org.openecomp.policy.rest.jpa.Datatype;
-import org.openecomp.policy.rest.jpa.EcompName;
-import org.openecomp.policy.rest.jpa.UserInfo;
-import org.openecomp.policy.xacml.api.XACMLErrorConstants;
+import org.onap.policy.pap.xacml.rest.util.JsonMessage;
+import org.onap.policy.rest.dao.CommonClassDao;
+import org.onap.policy.rest.jpa.Attribute;
+import org.onap.policy.rest.jpa.Category;
+import org.onap.policy.rest.jpa.Datatype;
+import org.onap.policy.rest.jpa.OnapName;
+import org.onap.policy.rest.jpa.UserInfo;
+import org.onap.policy.xacml.api.XACMLErrorConstants;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.stereotype.Controller;
@@ -275,14 +275,14 @@ public class DictionaryController {
 		return null;
 	}
 	
-	//EcompName Dictionary
-	@RequestMapping(value={"/get_EcompNameDataByName"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
-	public void getEcompNameDictionaryByNameEntityData(HttpServletRequest request, HttpServletResponse response){
-		LOGGER.info("get_EcompNameDataByName is called");
+	//OnapName Dictionary
+	@RequestMapping(value={"/get_OnapNameDataByName"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
+	public void getOnapNameDictionaryByNameEntityData(HttpServletRequest request, HttpServletResponse response){
+		LOGGER.info("get_OnapNameDataByName is called");
 		try{
 			Map<String, Object> model = new HashMap<>();
 			ObjectMapper mapper = new ObjectMapper();
-			model.put("ecompNameDictionaryDatas", mapper.writeValueAsString(commonClassDao.getDataByColumn(EcompName.class, "ecompName")));
+			model.put("onapNameDictionaryDatas", mapper.writeValueAsString(commonClassDao.getDataByColumn(OnapName.class, "onapName")));
 			JsonMessage msg = new JsonMessage(mapper.writeValueAsString(model));
 			JSONObject j = new JSONObject(msg);
 			response.getWriter().write(j.toString());
@@ -292,12 +292,12 @@ public class DictionaryController {
 		}
 	}
 	
-	@RequestMapping(value={"/get_EcompNameData"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
-	public void getEcompNameDictionaryEntityData(HttpServletRequest request, HttpServletResponse response){
+	@RequestMapping(value={"/get_OnapNameData"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
+	public void getOnapNameDictionaryEntityData(HttpServletRequest request, HttpServletResponse response){
 		try{
 			Map<String, Object> model = new HashMap<>();
 			ObjectMapper mapper = new ObjectMapper();
-			model.put("ecompNameDictionaryDatas", mapper.writeValueAsString(commonClassDao.getData(EcompName.class)));
+			model.put("onapNameDictionaryDatas", mapper.writeValueAsString(commonClassDao.getData(OnapName.class)));
 			JsonMessage msg = new JsonMessage(mapper.writeValueAsString(model));
 			JSONObject j = new JSONObject(msg);
             response.addHeader("successMapKey", "success"); 
@@ -311,8 +311,8 @@ public class DictionaryController {
 		}
 	}
 
-	@RequestMapping(value={"/ecomp_dictionary/save_ecompName"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-	public ModelAndView saveEcompDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
+	@RequestMapping(value={"/onap_dictionary/save_onapName"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
+	public ModelAndView saveOnapDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
 		try {
 			boolean duplicateflag = false;
 			boolean isFakeUpdate = false;
@@ -323,51 +323,51 @@ public class DictionaryController {
 			ObjectMapper mapper = new ObjectMapper();
 			mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
 			JsonNode root = mapper.readTree(request.getReader());
-			EcompName ecompData;
+			OnapName onapData;
 			String userId = null;
 			if (fromAPI) {
-				ecompData = (EcompName)mapper.readValue(root.get("dictionaryFields").toString(), EcompName.class);
+				onapData = (OnapName)mapper.readValue(root.get("dictionaryFields").toString(), OnapName.class);
 				userId = "API";
 
 				//check if update operation or create, get id for data to be updated
 				if (request.getParameter("operation").equals("update")) {
-					List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(ecompData.getEcompName(), "ecompName", EcompName.class);
+					List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(onapData.getOnapName(), "onapName", OnapName.class);
 					int id = 0;
-					EcompName data = (EcompName) duplicateData.get(0);
+					OnapName data = (OnapName) duplicateData.get(0);
 					id = data.getId();
 					if(id==0){
 						isFakeUpdate=true;
-						ecompData.setId(1);
+						onapData.setId(1);
 					} else {
-						ecompData.setId(id);
+						onapData.setId(id);
 					}
-					ecompData.setUserCreatedBy(this.getUserInfo(userId));
+					onapData.setUserCreatedBy(this.getUserInfo(userId));
 				}
 			} else {
-				ecompData = (EcompName)mapper.readValue(root.get("ecompNameDictionaryData").toString(), EcompName.class);
+				onapData = (OnapName)mapper.readValue(root.get("onapNameDictionaryData").toString(), OnapName.class);
 				userId = root.get("userid").textValue();
 			}
-			if(ecompData.getId() == 0){
-				List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(ecompData.getEcompName(), "ecompName", EcompName.class);
+			if(onapData.getId() == 0){
+				List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(onapData.getOnapName(), "onapName", OnapName.class);
 				if(!duplicateData.isEmpty()){
 					duplicateflag = true;
 				}else{
-					ecompData.setUserCreatedBy(getUserInfo(userId));
-					ecompData.setUserModifiedBy(getUserInfo(userId));
-					commonClassDao.save(ecompData);
+					onapData.setUserCreatedBy(getUserInfo(userId));
+					onapData.setUserModifiedBy(getUserInfo(userId));
+					commonClassDao.save(onapData);
 				}
 			}else{
 				if(!isFakeUpdate){
-					ecompData.setUserModifiedBy(this.getUserInfo(userId));
-					ecompData.setModifiedDate(new Date());
-					commonClassDao.update(ecompData);
+					onapData.setUserModifiedBy(this.getUserInfo(userId));
+					onapData.setModifiedDate(new Date());
+					commonClassDao.update(onapData);
 				}
 			} 
 			String responseString = null;
 			if(duplicateflag) {
 				responseString = "Duplicate";
 			} else {
-				responseString = mapper.writeValueAsString(commonClassDao.getData(EcompName.class));
+				responseString = mapper.writeValueAsString(commonClassDao.getData(OnapName.class));
 			}
 			if (fromAPI) {
 				if (responseString!=null && !responseString.equals("Duplicate")) {
@@ -387,7 +387,7 @@ public class DictionaryController {
 				request.setCharacterEncoding("UTF-8");
 
 				PrintWriter out = response.getWriter();
-				JSONObject j = new JSONObject("{ecompNameDictionaryDatas: " + responseString + "}");
+				JSONObject j = new JSONObject("{onapNameDictionaryDatas: " + responseString + "}");
 				out.write(j.toString());
 				return null;
 			}
@@ -401,22 +401,22 @@ public class DictionaryController {
 		return null;
 	}
 
-	@RequestMapping(value={"/ecomp_dictionary/remove_ecomp"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-	public ModelAndView removeEcompDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception {
+	@RequestMapping(value={"/onap_dictionary/remove_onap"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
+	public ModelAndView removeOnapDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception {
 		try{
 			ObjectMapper mapper = new ObjectMapper();
 			mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
 			JsonNode root = mapper.readTree(request.getReader());
-			EcompName ecompData = (EcompName)mapper.readValue(root.get("data").toString(), EcompName.class);
-			commonClassDao.delete(ecompData);
+			OnapName onapData = (OnapName)mapper.readValue(root.get("data").toString(), OnapName.class);
+			commonClassDao.delete(onapData);
 			response.setCharacterEncoding("UTF-8");
 			response.setContentType("application / json");
 			request.setCharacterEncoding("UTF-8");
 
 			PrintWriter out = response.getWriter();
 
-			String responseString = mapper.writeValueAsString(commonClassDao.getData(EcompName.class));
-			JSONObject j = new JSONObject("{ecompNameDictionaryDatas: " + responseString + "}");
+			String responseString = mapper.writeValueAsString(commonClassDao.getData(OnapName.class));
+			JSONObject j = new JSONObject("{onapNameDictionaryDatas: " + responseString + "}");
 			out.write(j.toString());
 
 			return null;
diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/DictionaryImportController.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/controller/DictionaryImportController.java
index 94f83674b..12851917a 100644
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/DictionaryImportController.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/controller/DictionaryImportController.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PAP-REST
+ * ONAP-PAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pap.xacml.rest.controller;
+package org.onap.policy.pap.xacml.rest.controller;
  /*
   * 
   * 
@@ -33,29 +33,29 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.compress.utils.IOUtils;
-import org.openecomp.policy.rest.dao.CommonClassDao;
-import org.openecomp.policy.rest.jpa.ActionList;
-import org.openecomp.policy.rest.jpa.ActionPolicyDict;
-import org.openecomp.policy.rest.jpa.AddressGroup;
-import org.openecomp.policy.rest.jpa.Attribute;
-import org.openecomp.policy.rest.jpa.BRMSParamTemplate;
-import org.openecomp.policy.rest.jpa.Category;
-import org.openecomp.policy.rest.jpa.Datatype;
-import org.openecomp.policy.rest.jpa.DecisionSettings;
-import org.openecomp.policy.rest.jpa.DescriptiveScope;
-import org.openecomp.policy.rest.jpa.EcompName;
-import org.openecomp.policy.rest.jpa.GroupServiceList;
-import org.openecomp.policy.rest.jpa.PEPOptions;
-import org.openecomp.policy.rest.jpa.PrefixList;
-import org.openecomp.policy.rest.jpa.ProtocolList;
-import org.openecomp.policy.rest.jpa.SecurityZone;
-import org.openecomp.policy.rest.jpa.ServiceList;
-import org.openecomp.policy.rest.jpa.TermList;
-import org.openecomp.policy.rest.jpa.UserInfo;
-import org.openecomp.policy.rest.jpa.VNFType;
-import org.openecomp.policy.rest.jpa.VSCLAction;
-import org.openecomp.policy.rest.jpa.VarbindDictionary;
-import org.openecomp.policy.rest.jpa.Zone;
+import org.onap.policy.rest.dao.CommonClassDao;
+import org.onap.policy.rest.jpa.ActionList;
+import org.onap.policy.rest.jpa.ActionPolicyDict;
+import org.onap.policy.rest.jpa.AddressGroup;
+import org.onap.policy.rest.jpa.Attribute;
+import org.onap.policy.rest.jpa.BRMSParamTemplate;
+import org.onap.policy.rest.jpa.Category;
+import org.onap.policy.rest.jpa.Datatype;
+import org.onap.policy.rest.jpa.DecisionSettings;
+import org.onap.policy.rest.jpa.DescriptiveScope;
+import org.onap.policy.rest.jpa.OnapName;
+import org.onap.policy.rest.jpa.GroupServiceList;
+import org.onap.policy.rest.jpa.PEPOptions;
+import org.onap.policy.rest.jpa.PrefixList;
+import org.onap.policy.rest.jpa.ProtocolList;
+import org.onap.policy.rest.jpa.SecurityZone;
+import org.onap.policy.rest.jpa.ServiceList;
+import org.onap.policy.rest.jpa.TermList;
+import org.onap.policy.rest.jpa.UserInfo;
+import org.onap.policy.rest.jpa.VNFType;
+import org.onap.policy.rest.jpa.VSCLAction;
+import org.onap.policy.rest.jpa.VarbindDictionary;
+import org.onap.policy.rest.jpa.Zone;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -172,17 +172,17 @@ public class DictionaryImportController {
 				commonClassDao.save(attribute);
 			}
 		}
-		if(dictionaryName.startsWith("EcompName")){
+		if(dictionaryName.startsWith("OnapName")){
 			for(int i = 1; i< dictSheet.size(); i++){
-				EcompName attribute = new EcompName("",  userId);
+				OnapName attribute = new OnapName("",  userId);
 				UserInfo userinfo = new UserInfo();
 				userinfo.setUserLoginId(userId);
 				attribute.setUserCreatedBy(userinfo);
 				attribute.setUserModifiedBy(userinfo);
 				String[] rows = dictSheet.get(i);
 				for (int j=0 ; j<rows.length; j++ ){
-					if(dictSheet.get(0)[j].equalsIgnoreCase("ecomp_name") || dictSheet.get(0)[j].equalsIgnoreCase("Ecomp Name")){
-						attribute.setEcompName(rows[j]);
+					if(dictSheet.get(0)[j].equalsIgnoreCase("onap_name") || dictSheet.get(0)[j].equalsIgnoreCase("Onap Name")){
+						attribute.setOnapName(rows[j]);
 					}
 					if(dictSheet.get(0)[j].equalsIgnoreCase("description")){
 						attribute.setDescription(rows[j]);
diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/EnforcerDictionaryController.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/controller/EnforcerDictionaryController.java
index bfccb984a..f0389fcde 100644
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/EnforcerDictionaryController.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/controller/EnforcerDictionaryController.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PAP-REST
+ * ONAP-PAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pap.xacml.rest.controller;
+package org.onap.policy.pap.xacml.rest.controller;
 
 import java.io.PrintWriter;
 import java.util.ArrayList;
@@ -30,11 +30,11 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.json.JSONObject;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.pap.xacml.rest.util.JsonMessage;
-import org.openecomp.policy.rest.dao.CommonClassDao;
-import org.openecomp.policy.rest.jpa.EnforcingType;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.pap.xacml.rest.util.JsonMessage;
+import org.onap.policy.rest.dao.CommonClassDao;
+import org.onap.policy.rest.jpa.EnforcingType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.stereotype.Controller;
@@ -65,7 +65,7 @@ public class EnforcerDictionaryController {
 				dictList.add(dict.getEnforcingType());
 			}
 			model.put("enforcerDictionaryDatas", mapper.writeValueAsString(dictList));
-			org.openecomp.policy.pap.xacml.rest.util.JsonMessage msg = new JsonMessage(mapper.writeValueAsString(model));
+			org.onap.policy.pap.xacml.rest.util.JsonMessage msg = new JsonMessage(mapper.writeValueAsString(model));
 			JSONObject j = new JSONObject(msg);
 			response.getWriter().write(j.toString());
 		}
diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/FirewallDictionaryController.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/controller/FirewallDictionaryController.java
index 5172f451b..ee2d1d622 100644
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/FirewallDictionaryController.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/controller/FirewallDictionaryController.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PAP-REST
+ * ONAP-PAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pap.xacml.rest.controller;
+package org.onap.policy.pap.xacml.rest.controller;
 
 import java.io.PrintWriter;
 import java.net.UnknownHostException;
@@ -34,26 +34,26 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.jboss.netty.handler.ipfilter.CIDR;
 import org.json.JSONObject;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.pap.xacml.rest.adapters.GridData;
-import org.openecomp.policy.pap.xacml.rest.util.JsonMessage;
-import org.openecomp.policy.rest.dao.CommonClassDao;
-import org.openecomp.policy.rest.jpa.ActionList;
-import org.openecomp.policy.rest.jpa.AddressGroup;
-import org.openecomp.policy.rest.jpa.FWTag;
-import org.openecomp.policy.rest.jpa.FWTagPicker;
-import org.openecomp.policy.rest.jpa.FirewallDictionaryList;
-import org.openecomp.policy.rest.jpa.GroupServiceList;
-import org.openecomp.policy.rest.jpa.PrefixList;
-import org.openecomp.policy.rest.jpa.PortList;
-import org.openecomp.policy.rest.jpa.ProtocolList;
-import org.openecomp.policy.rest.jpa.SecurityZone;
-import org.openecomp.policy.rest.jpa.ServiceList;
-import org.openecomp.policy.rest.jpa.TermList;
-import org.openecomp.policy.rest.jpa.UserInfo;
-import org.openecomp.policy.rest.jpa.Zone;
-import org.openecomp.policy.xacml.api.XACMLErrorConstants;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.pap.xacml.rest.adapters.GridData;
+import org.onap.policy.pap.xacml.rest.util.JsonMessage;
+import org.onap.policy.rest.dao.CommonClassDao;
+import org.onap.policy.rest.jpa.ActionList;
+import org.onap.policy.rest.jpa.AddressGroup;
+import org.onap.policy.rest.jpa.FWTag;
+import org.onap.policy.rest.jpa.FWTagPicker;
+import org.onap.policy.rest.jpa.FirewallDictionaryList;
+import org.onap.policy.rest.jpa.GroupServiceList;
+import org.onap.policy.rest.jpa.PrefixList;
+import org.onap.policy.rest.jpa.PortList;
+import org.onap.policy.rest.jpa.ProtocolList;
+import org.onap.policy.rest.jpa.SecurityZone;
+import org.onap.policy.rest.jpa.ServiceList;
+import org.onap.policy.rest.jpa.TermList;
+import org.onap.policy.rest.jpa.UserInfo;
+import org.onap.policy.rest.jpa.Zone;
+import org.onap.policy.xacml.api.XACMLErrorConstants;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.stereotype.Controller;
diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/MicroServiceDictionaryController.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/controller/MicroServiceDictionaryController.java
index b933a4f84..621f0c474 100644
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/MicroServiceDictionaryController.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/controller/MicroServiceDictionaryController.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PAP-REST
+ * ONAP-PAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pap.xacml.rest.controller;
+package org.onap.policy.pap.xacml.rest.controller;
 
 import java.io.PrintWriter;
 import java.util.ArrayList;
@@ -33,19 +33,19 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.lang.StringUtils;
 import org.json.JSONObject;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.pap.xacml.rest.XACMLPapServlet;
-import org.openecomp.policy.pap.xacml.rest.util.JsonMessage;
-import org.openecomp.policy.rest.dao.CommonClassDao;
-import org.openecomp.policy.rest.jpa.DCAEuuid;
-import org.openecomp.policy.rest.jpa.MicroServiceAttribute;
-import org.openecomp.policy.rest.jpa.MicroServiceConfigName;
-import org.openecomp.policy.rest.jpa.MicroServiceLocation;
-import org.openecomp.policy.rest.jpa.MicroServiceModels;
-import org.openecomp.policy.rest.jpa.UserInfo;
-import org.openecomp.policy.rest.util.MSAttributeObject;
-import org.openecomp.policy.rest.util.MSModelUtils;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.pap.xacml.rest.XACMLPapServlet;
+import org.onap.policy.pap.xacml.rest.util.JsonMessage;
+import org.onap.policy.rest.dao.CommonClassDao;
+import org.onap.policy.rest.jpa.DCAEuuid;
+import org.onap.policy.rest.jpa.MicroServiceAttribute;
+import org.onap.policy.rest.jpa.MicroServiceConfigName;
+import org.onap.policy.rest.jpa.MicroServiceLocation;
+import org.onap.policy.rest.jpa.MicroServiceModels;
+import org.onap.policy.rest.jpa.UserInfo;
+import org.onap.policy.rest.util.MSAttributeObject;
+import org.onap.policy.rest.util.MSModelUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.stereotype.Controller;
@@ -90,7 +90,7 @@ public class MicroServiceDictionaryController {
     
 	
 
-	MSModelUtils utils = new MSModelUtils(XACMLPapServlet.getMsEcompName(), XACMLPapServlet.getMsPolicyName());
+	MSModelUtils utils = new MSModelUtils(XACMLPapServlet.getMsOnapName(), XACMLPapServlet.getMsPolicyName());
 	private MicroServiceModels newModel;
 	
 	
diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/PolicyScopeDictionaryController.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/controller/PolicyScopeDictionaryController.java
index 08635c157..c2dcbc651 100644
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/PolicyScopeDictionaryController.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/controller/PolicyScopeDictionaryController.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PAP-REST
+ * ONAP-PAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pap.xacml.rest.controller;
+package org.onap.policy.pap.xacml.rest.controller;
 
 import java.io.PrintWriter;
 import java.util.ArrayList;
@@ -31,16 +31,16 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.lang.StringUtils;
 import org.json.JSONObject;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.pap.xacml.rest.util.JsonMessage;
-import org.openecomp.policy.rest.dao.CommonClassDao;
-import org.openecomp.policy.rest.jpa.GroupPolicyScopeList;
-import org.openecomp.policy.rest.jpa.PolicyScopeClosedLoop;
-import org.openecomp.policy.rest.jpa.PolicyScopeResource;
-import org.openecomp.policy.rest.jpa.PolicyScopeService;
-import org.openecomp.policy.rest.jpa.PolicyScopeType;
-import org.openecomp.policy.rest.jpa.UserInfo;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.pap.xacml.rest.util.JsonMessage;
+import org.onap.policy.rest.dao.CommonClassDao;
+import org.onap.policy.rest.jpa.GroupPolicyScopeList;
+import org.onap.policy.rest.jpa.PolicyScopeClosedLoop;
+import org.onap.policy.rest.jpa.PolicyScopeResource;
+import org.onap.policy.rest.jpa.PolicyScopeService;
+import org.onap.policy.rest.jpa.PolicyScopeType;
+import org.onap.policy.rest.jpa.UserInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.stereotype.Controller;
@@ -261,8 +261,8 @@ public class PolicyScopeDictionaryController {
 			ObjectMapper mapper = new ObjectMapper();
 			mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
 			JsonNode root = mapper.readTree(request.getReader());
-			GroupPolicyScopeList ecompData = (GroupPolicyScopeList)mapper.readValue(root.get("data").toString(), GroupPolicyScopeList.class);
-			commonClassDao.delete(ecompData);
+			GroupPolicyScopeList onapData = (GroupPolicyScopeList)mapper.readValue(root.get("data").toString(), GroupPolicyScopeList.class);
+			commonClassDao.delete(onapData);
 			response.setCharacterEncoding("UTF-8");
 			response.setContentType("application / json");
 			request.setCharacterEncoding("UTF-8");
@@ -331,13 +331,13 @@ public class PolicyScopeDictionaryController {
 			ObjectMapper mapper = new ObjectMapper();
 			mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
 			JsonNode root = mapper.readTree(request.getReader());
-			PolicyScopeClosedLoop ecompData;
+			PolicyScopeClosedLoop onapData;
 			if (fromAPI) {
-				ecompData = (PolicyScopeClosedLoop)mapper.readValue(root.get("dictionaryFields").toString(), PolicyScopeClosedLoop.class);
+				onapData = (PolicyScopeClosedLoop)mapper.readValue(root.get("dictionaryFields").toString(), PolicyScopeClosedLoop.class);
 
 				//check if update operation or create, get id for data to be updated and update attributeData
 				if (request.getParameter("operation").equals("update")) {
-					List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(ecompData.getName(), "name", PolicyScopeClosedLoop.class);
+					List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(onapData.getName(), "name", PolicyScopeClosedLoop.class);
 					int id = 0;
 					for (int i =0; i< duplicateData.size(); i++){
 						PolicyScopeClosedLoop data = (PolicyScopeClosedLoop) duplicateData.get(0);
@@ -346,25 +346,25 @@ public class PolicyScopeDictionaryController {
 
 					if(id==0){
 						isFakeUpdate=true;
-						ecompData.setId(1);
+						onapData.setId(1);
 					} else {
-						ecompData.setId(id);
+						onapData.setId(id);
 					}   
 
 				}
 			} else {
-				ecompData = (PolicyScopeClosedLoop)mapper.readValue(root.get("psClosedLoopDictionaryData").toString(), PolicyScopeClosedLoop.class);
+				onapData = (PolicyScopeClosedLoop)mapper.readValue(root.get("psClosedLoopDictionaryData").toString(), PolicyScopeClosedLoop.class);
 			}
-			if(ecompData.getId() == 0){
-				List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(ecompData.getName(), "name", PolicyScopeClosedLoop.class);
+			if(onapData.getId() == 0){
+				List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(onapData.getName(), "name", PolicyScopeClosedLoop.class);
 				if(!duplicateData.isEmpty()){
 					duplicateflag = true;
 				}else{
-					commonClassDao.save(ecompData);
+					commonClassDao.save(onapData);
 				}
 			}else{
 				if(!isFakeUpdate) {
-					commonClassDao.update(ecompData); 
+					commonClassDao.update(onapData); 
 				}
 			} 
 			String responseString = "";
@@ -413,8 +413,8 @@ public class PolicyScopeDictionaryController {
 			ObjectMapper mapper = new ObjectMapper();
 			mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
 			JsonNode root = mapper.readTree(request.getReader());
-			PolicyScopeClosedLoop ecompData = (PolicyScopeClosedLoop)mapper.readValue(root.get("data").toString(), PolicyScopeClosedLoop.class);
-			commonClassDao.delete(ecompData);
+			PolicyScopeClosedLoop onapData = (PolicyScopeClosedLoop)mapper.readValue(root.get("data").toString(), PolicyScopeClosedLoop.class);
+			commonClassDao.delete(onapData);
 			response.setCharacterEncoding("UTF-8");
 			response.setContentType("application / json");
 			request.setCharacterEncoding("UTF-8");
@@ -483,13 +483,13 @@ public class PolicyScopeDictionaryController {
 			ObjectMapper mapper = new ObjectMapper();
 			mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
 			JsonNode root = mapper.readTree(request.getReader());
-			PolicyScopeService ecompData;
+			PolicyScopeService onapData;
 			if (fromAPI) {
-				ecompData = (PolicyScopeService)mapper.readValue(root.get("dictionaryFields").toString(), PolicyScopeService.class);
+				onapData = (PolicyScopeService)mapper.readValue(root.get("dictionaryFields").toString(), PolicyScopeService.class);
 
 				//check if update operation or create, get id for data to be updated and update attributeData
 				if (request.getParameter("operation").equals("update")) {
-					List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(ecompData.getName(), "name", PolicyScopeService.class);
+					List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(onapData.getName(), "name", PolicyScopeService.class);
 					int id = 0;
 					for (int i =0; i< duplicateData.size(); i++){
 						PolicyScopeService data = (PolicyScopeService) duplicateData.get(0);
@@ -497,24 +497,24 @@ public class PolicyScopeDictionaryController {
 					}
 					if(id==0){
 						isFakeUpdate=true;
-						ecompData.setId(1);
+						onapData.setId(1);
 					} else {
-						ecompData.setId(id);
+						onapData.setId(id);
 					}
 				}
 			} else {
-				ecompData = (PolicyScopeService)mapper.readValue(root.get("psServiceDictionaryData").toString(), PolicyScopeService.class);
+				onapData = (PolicyScopeService)mapper.readValue(root.get("psServiceDictionaryData").toString(), PolicyScopeService.class);
 			}
-			if(ecompData.getId() == 0){
-				List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(ecompData.getName(), "name", PolicyScopeService.class);
+			if(onapData.getId() == 0){
+				List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(onapData.getName(), "name", PolicyScopeService.class);
 				if(!duplicateData.isEmpty()){
 					duplicateflag = true;
 				}else{
-					commonClassDao.save(ecompData);
+					commonClassDao.save(onapData);
 				}
 			}else{
 				if(!isFakeUpdate) {
-					commonClassDao.update(ecompData); 
+					commonClassDao.update(onapData); 
 				}
 			} 
 
@@ -562,8 +562,8 @@ public class PolicyScopeDictionaryController {
 			ObjectMapper mapper = new ObjectMapper();
 			mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
 			JsonNode root = mapper.readTree(request.getReader());
-			PolicyScopeService ecompData = (PolicyScopeService)mapper.readValue(root.get("data").toString(), PolicyScopeService.class);
-			commonClassDao.delete(ecompData);
+			PolicyScopeService onapData = (PolicyScopeService)mapper.readValue(root.get("data").toString(), PolicyScopeService.class);
+			commonClassDao.delete(onapData);
 			response.setCharacterEncoding("UTF-8");
 			response.setContentType("application / json");
 			request.setCharacterEncoding("UTF-8");
@@ -632,13 +632,13 @@ public class PolicyScopeDictionaryController {
 			ObjectMapper mapper = new ObjectMapper();
 			mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
 			JsonNode root = mapper.readTree(request.getReader());
-			PolicyScopeType ecompData;
+			PolicyScopeType onapData;
 			if (fromAPI) {
-				ecompData = (PolicyScopeType)mapper.readValue(root.get("dictionaryFields").toString(), PolicyScopeType.class);
+				onapData = (PolicyScopeType)mapper.readValue(root.get("dictionaryFields").toString(), PolicyScopeType.class);
 
 				//check if update operation or create, get id for data to be updated and update attributeData
 				if (request.getParameter("operation").equals("update")) {
-					List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(ecompData.getName(), "name", PolicyScopeType.class);
+					List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(onapData.getName(), "name", PolicyScopeType.class);
 					int id = 0;
 					for (int i =0; i< duplicateData.size(); i++){
 						PolicyScopeType data = (PolicyScopeType) duplicateData.get(0);
@@ -647,25 +647,25 @@ public class PolicyScopeDictionaryController {
 
 					if(id==0){
 						isFakeUpdate=true;
-						ecompData.setId(1);
+						onapData.setId(1);
 					} else {
-						ecompData.setId(id);
+						onapData.setId(id);
 					}   
 
 				}
 			} else {
-				ecompData = (PolicyScopeType)mapper.readValue(root.get("psTypeDictionaryData").toString(), PolicyScopeType.class);
+				onapData = (PolicyScopeType)mapper.readValue(root.get("psTypeDictionaryData").toString(), PolicyScopeType.class);
 			}
-			if(ecompData.getId() == 0){
-				List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(ecompData.getName(), "name", PolicyScopeType.class);
+			if(onapData.getId() == 0){
+				List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(onapData.getName(), "name", PolicyScopeType.class);
 				if(!duplicateData.isEmpty()){
 					duplicateflag = true;
 				}else{
-					commonClassDao.save(ecompData);
+					commonClassDao.save(onapData);
 				}
 			}else{
 				if(!isFakeUpdate) {
-					commonClassDao.update(ecompData); 
+					commonClassDao.update(onapData); 
 				}
 			} 
 			String responseString = "";
@@ -717,8 +717,8 @@ public class PolicyScopeDictionaryController {
 			ObjectMapper mapper = new ObjectMapper();
 			mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
 			JsonNode root = mapper.readTree(request.getReader());
-			PolicyScopeType ecompData = (PolicyScopeType)mapper.readValue(root.get("data").toString(), PolicyScopeType.class);
-			commonClassDao.delete(ecompData);
+			PolicyScopeType onapData = (PolicyScopeType)mapper.readValue(root.get("data").toString(), PolicyScopeType.class);
+			commonClassDao.delete(onapData);
 			response.setCharacterEncoding("UTF-8");
 			response.setContentType("application / json");
 			request.setCharacterEncoding("UTF-8");
@@ -787,37 +787,37 @@ public class PolicyScopeDictionaryController {
 			ObjectMapper mapper = new ObjectMapper();
 			mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
 			JsonNode root = mapper.readTree(request.getReader());
-			PolicyScopeResource ecompData;
+			PolicyScopeResource onapData;
 			if (fromAPI) {
-				ecompData = (PolicyScopeResource)mapper.readValue(root.get("dictionaryFields").toString(), PolicyScopeResource.class);
+				onapData = (PolicyScopeResource)mapper.readValue(root.get("dictionaryFields").toString(), PolicyScopeResource.class);
 
 				//check if update operation or create, get id for data to be updated and update attributeData
 				if (request.getParameter("operation").equals("update")) {
-					List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(ecompData.getName(), "name", PolicyScopeResource.class);
+					List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(onapData.getName(), "name", PolicyScopeResource.class);
 					int id = 0;
 					PolicyScopeResource data = (PolicyScopeResource) duplicateData.get(0);
 					id = data.getId();
 
 					if(id==0){
 						isFakeUpdate=true;
-						ecompData.setId(1);
+						onapData.setId(1);
 					} else {
-						ecompData.setId(id);
+						onapData.setId(id);
 					}
 				}
 			} else {
-				ecompData = (PolicyScopeResource)mapper.readValue(root.get("psResourceDictionaryData").toString(), PolicyScopeResource.class);
+				onapData = (PolicyScopeResource)mapper.readValue(root.get("psResourceDictionaryData").toString(), PolicyScopeResource.class);
 			}
-			if(ecompData.getId() == 0){
-				List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(ecompData.getName(), "name", PolicyScopeResource.class);
+			if(onapData.getId() == 0){
+				List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(onapData.getName(), "name", PolicyScopeResource.class);
 				if(!duplicateData.isEmpty()){
 					duplicateflag = true;
 				}else{
-					commonClassDao.save(ecompData);
+					commonClassDao.save(onapData);
 				}
 			}else{
 				if(!isFakeUpdate) {
-					commonClassDao.update(ecompData); 
+					commonClassDao.update(onapData); 
 				}
 			} 
 			String responseString = "";
@@ -869,8 +869,8 @@ public class PolicyScopeDictionaryController {
 			ObjectMapper mapper = new ObjectMapper();
 			mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
 			JsonNode root = mapper.readTree(request.getReader());
-			PolicyScopeResource ecompData = (PolicyScopeResource)mapper.readValue(root.get("data").toString(), PolicyScopeResource.class);
-			commonClassDao.delete(ecompData);
+			PolicyScopeResource onapData = (PolicyScopeResource)mapper.readValue(root.get("data").toString(), PolicyScopeResource.class);
+			commonClassDao.delete(onapData);
 			response.setCharacterEncoding("UTF-8");
 			response.setContentType("application / json");
 			request.setCharacterEncoding("UTF-8");
diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/PushPolicyController.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/controller/PushPolicyController.java
index 3f86378ab..a545bb409 100644
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/PushPolicyController.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/controller/PushPolicyController.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PAP-REST
+ * ONAP-PAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.pap.xacml.rest.controller;
+package org.onap.policy.pap.xacml.rest.controller;
 
 import java.io.BufferedWriter;
 import java.io.File;
@@ -33,16 +33,16 @@ import javax.persistence.Query;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.openecomp.policy.common.logging.eelf.MessageCodes;
-import org.openecomp.policy.common.logging.eelf.PolicyLogger;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.pap.xacml.rest.XACMLPapServlet;
-import org.openecomp.policy.rest.dao.CommonClassDao;
-import org.openecomp.policy.rest.jpa.PolicyEntity;
-import org.openecomp.policy.rest.jpa.PolicyVersion;
-import org.openecomp.policy.xacml.std.pap.StdPDPGroup;
-import org.openecomp.policy.xacml.std.pap.StdPDPPolicy;
+import org.onap.policy.common.logging.eelf.MessageCodes;
+import org.onap.policy.common.logging.eelf.PolicyLogger;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.pap.xacml.rest.XACMLPapServlet;
+import org.onap.policy.rest.dao.CommonClassDao;
+import org.onap.policy.rest.jpa.PolicyEntity;
+import org.onap.policy.rest.jpa.PolicyVersion;
+import org.onap.policy.xacml.std.pap.StdPDPGroup;
+import org.onap.policy.xacml.std.pap.StdPDPPolicy;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/SafePolicyController.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/controller/SafePolicyController.java
index 8c88e68be..fad6a871f 100644
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/SafePolicyController.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/controller/SafePolicyController.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PAP-REST
+ * ONAP-PAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pap.xacml.rest.controller;
+package org.onap.policy.pap.xacml.rest.controller;
 
 import java.io.PrintWriter;
 import java.util.Date;
@@ -30,13 +30,13 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.json.JSONObject;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.pap.xacml.rest.util.JsonMessage;
-import org.openecomp.policy.rest.dao.CommonClassDao;
-import org.openecomp.policy.rest.jpa.RiskType;
-import org.openecomp.policy.rest.jpa.SafePolicyWarning;
-import org.openecomp.policy.rest.jpa.UserInfo;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.pap.xacml.rest.util.JsonMessage;
+import org.onap.policy.rest.dao.CommonClassDao;
+import org.onap.policy.rest.jpa.RiskType;
+import org.onap.policy.rest.jpa.SafePolicyWarning;
+import org.onap.policy.rest.jpa.UserInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.stereotype.Controller;
@@ -85,7 +85,7 @@ public class SafePolicyController {
 
 	@RequestMapping(value = { "/get_RiskTypeData" }, method = {
 			org.springframework.web.bind.annotation.RequestMethod.GET }, produces = MediaType.APPLICATION_JSON_VALUE)
-	public void getEcompNameDictionaryEntityData(HttpServletRequest request, HttpServletResponse response) {
+	public void getOnapNameDictionaryEntityData(HttpServletRequest request, HttpServletResponse response) {
 		try {
 			Map<String, Object> model = new HashMap<>();
 			ObjectMapper mapper = new ObjectMapper();
@@ -199,14 +199,14 @@ public class SafePolicyController {
 
 	@RequestMapping(value = { "/sp_dictionary/remove_riskType" }, method = {
 			org.springframework.web.bind.annotation.RequestMethod.POST })
-	public ModelAndView removeEcompDictionary(HttpServletRequest request, HttpServletResponse response)
+	public ModelAndView removeOnapDictionary(HttpServletRequest request, HttpServletResponse response)
 			throws Exception {
 		try {
 			ObjectMapper mapper = new ObjectMapper();
 			mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
 			JsonNode root = mapper.readTree(request.getReader());
-			RiskType ecompData = (RiskType) mapper.readValue(root.get("data").toString(), RiskType.class);
-			commonClassDao.delete(ecompData);
+			RiskType onapData = (RiskType) mapper.readValue(root.get("data").toString(), RiskType.class);
+			commonClassDao.delete(onapData);
 			response.setCharacterEncoding("UTF-8");
 			response.setContentType("application / json");
 			request.setCharacterEncoding("UTF-8");
diff --git a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/controller/package-info.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/controller/package-info.java
new file mode 100644
index 000000000..bb42fb6aa
--- /dev/null
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/controller/package-info.java
@@ -0,0 +1,22 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP-PAP-REST
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+
+package org.onap.policy.pap.xacml.rest.controller;
diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/daoimpl/CommonClassDaoImpl.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/daoimpl/CommonClassDaoImpl.java
index c624012f1..2cc211701 100644
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/daoimpl/CommonClassDaoImpl.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/daoimpl/CommonClassDaoImpl.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PAP-REST
+ * ONAP-PAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pap.xacml.rest.daoimpl;
+package org.onap.policy.pap.xacml.rest.daoimpl;
 
 import java.util.List;
 
@@ -34,11 +34,11 @@ import org.hibernate.criterion.Criterion;
 import org.hibernate.criterion.Disjunction;
 import org.hibernate.criterion.Projections;
 import org.hibernate.criterion.Restrictions;
-import org.openecomp.policy.rest.dao.CommonClassDao;
-import org.openecomp.policy.rest.jpa.ClosedLoops;
-import org.openecomp.policy.rest.jpa.GroupPolicyScopeList;
-import org.openecomp.policy.rest.jpa.PolicyRoles;
-import org.openecomp.policy.xacml.api.XACMLErrorConstants;
+import org.onap.policy.rest.dao.CommonClassDao;
+import org.onap.policy.rest.jpa.ClosedLoops;
+import org.onap.policy.rest.jpa.GroupPolicyScopeList;
+import org.onap.policy.rest.jpa.PolicyRoles;
+import org.onap.policy.xacml.api.XACMLErrorConstants;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/elk/client/ElasticSearchPolicyUpdate.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/elk/client/ElasticSearchPolicyUpdate.java
index facc6e06f..dcd44f84f 100644
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/elk/client/ElasticSearchPolicyUpdate.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/elk/client/ElasticSearchPolicyUpdate.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.pap.xacml.rest.elk.client;
+package org.onap.policy.pap.xacml.rest.elk.client;
 
 import java.io.FileInputStream;
 import java.io.InputStream;
@@ -33,8 +33,8 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Properties;
 
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
 
 import com.google.gson.Gson;
 
@@ -281,9 +281,9 @@ public class ElasticSearchPolicyUpdate {
 										String value = (String) attributeValue.getContent().get(0);
 										AttributeDesignatorType designator = match.getAttributeDesignator();
 										String attributeId = designator.getAttributeId();
-										// First match in the target is EcompName, so set that value.
-										if ("ECOMPName".equals(attributeId)) {
-											policyDataString.append("\"ecompName\":\""+value+"\",");
+										// First match in the target is OnapName, so set that value.
+										if ("ONAPName".equals(attributeId)) {
+											policyDataString.append("\"onapName\":\""+value+"\",");
 										}
 										if ("RiskType".equals(attributeId)){
 											policyDataString.append("\"riskType\":\""+value+"\",");
diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/elk/client/ElkConnector.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/elk/client/ElkConnector.java
index 2b94e44c7..1dea5dd4b 100644
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/elk/client/ElkConnector.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/elk/client/ElkConnector.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PAP-REST
+ * ONAP-PAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,12 +17,12 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.pap.xacml.rest.elk.client;
+package org.onap.policy.pap.xacml.rest.elk.client;
 
 
 import java.util.Map;
 
-import org.openecomp.policy.rest.adapter.PolicyRestAdapter;
+import org.onap.policy.rest.adapter.PolicyRestAdapter;
 
 import io.searchbox.client.JestResult;
 
diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/elk/client/ElkConnectorImpl.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/elk/client/ElkConnectorImpl.java
index a6315f89d..8868db3bc 100644
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/elk/client/ElkConnectorImpl.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/elk/client/ElkConnectorImpl.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PAP-REST
+ * ONAP-PAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.pap.xacml.rest.elk.client;
+package org.onap.policy.pap.xacml.rest.elk.client;
 
 import java.io.IOException;
 import java.util.Map;
@@ -27,10 +27,10 @@ import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.index.query.QueryStringQueryBuilder;
 import org.elasticsearch.search.builder.SearchSourceBuilder;
 import org.json.JSONObject;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.rest.adapter.PolicyRestAdapter;
-import org.openecomp.policy.xacml.api.XACMLErrorConstants;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.rest.adapter.PolicyRestAdapter;
+import org.onap.policy.xacml.api.XACMLErrorConstants;
 
 import io.searchbox.action.Action;
 import io.searchbox.client.JestClient;
diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/elk/client/Pair.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/elk/client/Pair.java
index cf4cecbb4..2b0c94bf3 100644
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/elk/client/Pair.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/elk/client/Pair.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PAP-REST
+ * ONAP-PAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.pap.xacml.rest.elk.client;
+package org.onap.policy.pap.xacml.rest.elk.client;
 
 public class Pair<L,R> {
     private L left;
diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/elk/client/PolicyElasticData.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/elk/client/PolicyElasticData.java
index 15eae89ec..3e065ff05 100644
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/elk/client/PolicyElasticData.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/elk/client/PolicyElasticData.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PAP-REST
+ * ONAP-PAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,15 +17,15 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.pap.xacml.rest.elk.client;
+package org.onap.policy.pap.xacml.rest.elk.client;
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.openecomp.policy.rest.adapter.PolicyRestAdapter;
-import org.openecomp.policy.rest.adapter.YAMLParams;
+import org.onap.policy.rest.adapter.PolicyRestAdapter;
+import org.onap.policy.rest.adapter.YAMLParams;
 
 public class PolicyElasticData {
 	
@@ -35,7 +35,7 @@ public class PolicyElasticData {
 	private String configBodyData;
 	private String policyName;
 	private String policyDescription;
-	private String ecompName;
+	private String onapName;
 	private String configName;
 	private String configType;
 	private String jsonBody;
@@ -119,7 +119,7 @@ public class PolicyElasticData {
 		this.configBodyData = policyData.getConfigBodyData();
 		this.policyName  = policyData.getNewFileName();
 		this.policyDescription  = policyData.getPolicyDescription();
-		this.ecompName = policyData.getEcompName();
+		this.onapName = policyData.getOnapName();
 		this.configName = policyData.getConfigName();
 		this.configType = policyData.getConfigType();
 		this.jsonBody = policyData.getJsonBody();
@@ -238,11 +238,11 @@ public class PolicyElasticData {
 	public void setPolicyDescription(String policyDescription) {
 		this.policyDescription = policyDescription;
 	}
-	public String getEcompName() {
-		return ecompName;
+	public String getOnapName() {
+		return onapName;
 	}
-	public void setEcompName(String ecompName) {
-		this.ecompName = ecompName;
+	public void setOnapName(String onapName) {
+		this.onapName = onapName;
 	}
 	public String getConfigName() {
 		return configName;
diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/elk/client/PolicyElasticSearchController.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/elk/client/PolicyElasticSearchController.java
index e5250d6b6..2f4dc59cf 100644
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/elk/client/PolicyElasticSearchController.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/elk/client/PolicyElasticSearchController.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PAP-REST
+ * ONAP-PAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.pap.xacml.rest.elk.client;
+package org.onap.policy.pap.xacml.rest.elk.client;
 
 
 import java.io.PrintWriter;
@@ -39,32 +39,32 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.json.JSONObject;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.pap.xacml.rest.elk.client.ElkConnector.PolicyIndexType;
-import org.openecomp.policy.pap.xacml.rest.util.JsonMessage;
-import org.openecomp.policy.rest.adapter.PolicyRestAdapter;
-import org.openecomp.policy.rest.dao.CommonClassDao;
-import org.openecomp.policy.rest.jpa.ActionPolicyDict;
-import org.openecomp.policy.rest.jpa.Attribute;
-import org.openecomp.policy.rest.jpa.BRMSParamTemplate;
-import org.openecomp.policy.rest.jpa.ClosedLoopD2Services;
-import org.openecomp.policy.rest.jpa.ClosedLoopSite;
-import org.openecomp.policy.rest.jpa.DCAEuuid;
-import org.openecomp.policy.rest.jpa.DecisionSettings;
-import org.openecomp.policy.rest.jpa.DescriptiveScope;
-import org.openecomp.policy.rest.jpa.EcompName;
-import org.openecomp.policy.rest.jpa.GroupPolicyScopeList;
-import org.openecomp.policy.rest.jpa.MicroServiceLocation;
-import org.openecomp.policy.rest.jpa.MicroServiceModels;
-import org.openecomp.policy.rest.jpa.PEPOptions;
-import org.openecomp.policy.rest.jpa.RiskType;
-import org.openecomp.policy.rest.jpa.SafePolicyWarning;
-import org.openecomp.policy.rest.jpa.TermList;
-import org.openecomp.policy.rest.jpa.VNFType;
-import org.openecomp.policy.rest.jpa.VSCLAction;
-import org.openecomp.policy.rest.jpa.VarbindDictionary;
-import org.openecomp.policy.xacml.api.XACMLErrorConstants;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.pap.xacml.rest.elk.client.ElkConnector.PolicyIndexType;
+import org.onap.policy.pap.xacml.rest.util.JsonMessage;
+import org.onap.policy.rest.adapter.PolicyRestAdapter;
+import org.onap.policy.rest.dao.CommonClassDao;
+import org.onap.policy.rest.jpa.ActionPolicyDict;
+import org.onap.policy.rest.jpa.Attribute;
+import org.onap.policy.rest.jpa.BRMSParamTemplate;
+import org.onap.policy.rest.jpa.ClosedLoopD2Services;
+import org.onap.policy.rest.jpa.ClosedLoopSite;
+import org.onap.policy.rest.jpa.DCAEuuid;
+import org.onap.policy.rest.jpa.DecisionSettings;
+import org.onap.policy.rest.jpa.DescriptiveScope;
+import org.onap.policy.rest.jpa.OnapName;
+import org.onap.policy.rest.jpa.GroupPolicyScopeList;
+import org.onap.policy.rest.jpa.MicroServiceLocation;
+import org.onap.policy.rest.jpa.MicroServiceModels;
+import org.onap.policy.rest.jpa.PEPOptions;
+import org.onap.policy.rest.jpa.RiskType;
+import org.onap.policy.rest.jpa.SafePolicyWarning;
+import org.onap.policy.rest.jpa.TermList;
+import org.onap.policy.rest.jpa.VNFType;
+import org.onap.policy.rest.jpa.VSCLAction;
+import org.onap.policy.rest.jpa.VarbindDictionary;
+import org.onap.policy.xacml.api.XACMLErrorConstants;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -85,7 +85,7 @@ public class PolicyElasticSearchController{
 	private static final Logger LOGGER = FlexLogger.getLogger(PolicyElasticSearchController.class);
 
 	enum Mode{
-		attribute, ecompName, actionPolicy, brmsParam, pepOptions,
+		attribute, onapName, actionPolicy, brmsParam, pepOptions,
 		clSite, clService, clVarbind, clVnf, clVSCL, decision, 
 		fwTerm, msDCAEUUID, msConfigName, msLocation, msModels,
 		psGroupPolicy, safeRisk, safePolicyWarning
@@ -244,8 +244,8 @@ public class PolicyElasticSearchController{
 						}
 						searchKeyValue.put("configPolicyType", closedLoopType);
 					}
-					if(searchData.getEcompName() != null){
-						searchKeyValue.put("ecompName", searchData.getEcompName());
+					if(searchData.getOnapName() != null){
+						searchKeyValue.put("onapName", searchData.getOnapName());
 					}
 					if(searchData.getD2Service() != null){
 						String d2Service = searchData.getD2Service().trim();
@@ -353,10 +353,10 @@ public class PolicyElasticSearchController{
 				value = attributedata.getXacmlId();
 				policyList = searchElkDatabase(all, "pholder",value);
 				break;
-			case ecompName :
-				EcompName ecompName = (EcompName)mapper.readValue(root.get("data").toString(), EcompName.class);
-				value = ecompName.getEcompName();
-				policyList = searchElkDatabase(all, "ecompName",value);
+			case onapName :
+				OnapName onapName = (OnapName)mapper.readValue(root.get("data").toString(), OnapName.class);
+				value = onapName.getOnapName();
+				policyList = searchElkDatabase(all, "onapName",value);
 				break;
 			case actionPolicy :
 				ActionPolicyDict actionPolicyDict = (ActionPolicyDict)mapper.readValue(root.get("data").toString(), ActionPolicyDict.class);
@@ -487,7 +487,7 @@ class SearchData{
 	private String policyType;
 	private String descriptiveScope;
 	private String closedLooppolicyType;
-	private String ecompName;
+	private String onapName;
 	private String d2Service;
 	private String vnfType;
 	private String policyStatus;
@@ -518,11 +518,11 @@ class SearchData{
 	public void setClosedLooppolicyType(String closedLooppolicyType) {
 		this.closedLooppolicyType = closedLooppolicyType;
 	}
-	public String getEcompName() {
-		return ecompName;
+	public String getOnapName() {
+		return onapName;
 	}
-	public void setEcompName(String ecompName) {
-		this.ecompName = ecompName;
+	public void setOnapName(String onapName) {
+		this.onapName = onapName;
 	}
 	public String getD2Service() {
 		return d2Service;
diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/elk/client/PolicyLocator.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/elk/client/PolicyLocator.java
index f246c9b15..58c89f781 100644
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/elk/client/PolicyLocator.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/elk/client/PolicyLocator.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PAP-REST
+ * ONAP-PAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.pap.xacml.rest.elk.client;
+package org.onap.policy.pap.xacml.rest.elk.client;
 
 public class PolicyLocator {
 	public final String policyType;
diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/handler/APIRequestHandler.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/handler/APIRequestHandler.java
index c1de11548..36d7c29ef 100644
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/handler/APIRequestHandler.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/handler/APIRequestHandler.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PAP-REST
+ * ONAP-PAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,21 +17,21 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.pap.xacml.rest.handler;
+package org.onap.policy.pap.xacml.rest.handler;
 
 import java.io.IOException;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.openecomp.policy.common.logging.ECOMPLoggingContext;
-import org.openecomp.policy.pap.xacml.rest.service.ImportService;
-import org.openecomp.policy.pap.xacml.rest.service.MetricService;
-import org.openecomp.policy.xacml.api.pap.EcompPDPGroup;
+import org.onap.policy.common.logging.ONAPLoggingContext;
+import org.onap.policy.pap.xacml.rest.service.ImportService;
+import org.onap.policy.pap.xacml.rest.service.MetricService;
+import org.onap.policy.xacml.api.pap.OnapPDPGroup;
 
 public class APIRequestHandler {
 
-	private EcompPDPGroup newGroup;
+	private OnapPDPGroup newGroup;
 
 	public void doGet(HttpServletRequest request, HttpServletResponse response, String apiflag) throws IOException{
 		// Request from the API to get Dictionary Items
@@ -74,7 +74,7 @@ public class APIRequestHandler {
 		}
 	}
 
-	public void doDelete(HttpServletRequest request, HttpServletResponse response, ECOMPLoggingContext loggingContext, String apiflag) throws Exception {
+	public void doDelete(HttpServletRequest request, HttpServletResponse response, ONAPLoggingContext loggingContext, String apiflag) throws Exception {
 		DeleteHandler deleteHandler = DeleteHandler.getInstance();
 		if ("deletePapApi".equalsIgnoreCase(apiflag)) {
 			deleteHandler.doAPIDeleteFromPAP(request, response, loggingContext);
@@ -86,11 +86,11 @@ public class APIRequestHandler {
 		}
 	}
 	
-	private void setNewGroup(EcompPDPGroup newGroup) {
+	private void setNewGroup(OnapPDPGroup newGroup) {
 		this.newGroup = newGroup;
 	}
 
-	public EcompPDPGroup getNewGroup() {
+	public OnapPDPGroup getNewGroup() {
 		return newGroup;
 	}
 }
diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/handler/DeleteHandler.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/handler/DeleteHandler.java
index 693196517..17fd2c12b 100644
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/handler/DeleteHandler.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/handler/DeleteHandler.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PAP-REST
+ * ONAP-PAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.pap.xacml.rest.handler;
+package org.onap.policy.pap.xacml.rest.handler;
 
 import java.io.File;
 import java.io.IOException;
@@ -33,23 +33,23 @@ import javax.persistence.Query;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.openecomp.policy.common.logging.ECOMPLoggingContext;
-import org.openecomp.policy.common.logging.eelf.MessageCodes;
-import org.openecomp.policy.common.logging.eelf.PolicyLogger;
-import org.openecomp.policy.pap.xacml.rest.XACMLPapServlet;
-import org.openecomp.policy.pap.xacml.rest.components.PolicyDBDaoTransaction;
-import org.openecomp.policy.pap.xacml.rest.elk.client.PolicyElasticSearchController;
-import org.openecomp.policy.pap.xacml.rest.model.RemoveGroupPolicy;
-import org.openecomp.policy.pap.xacml.rest.util.JPAUtils;
-import org.openecomp.policy.rest.XACMLRestProperties;
-import org.openecomp.policy.rest.adapter.PolicyRestAdapter;
-import org.openecomp.policy.rest.jpa.PolicyEntity;
-import org.openecomp.policy.rest.jpa.PolicyVersion;
-import org.openecomp.policy.utils.PolicyUtils;
-import org.openecomp.policy.xacml.api.XACMLErrorConstants;
-import org.openecomp.policy.xacml.api.pap.EcompPDPGroup;
-import org.openecomp.policy.xacml.std.pap.StdPAPPolicy;
-import org.openecomp.policy.xacml.std.pap.StdPDPGroup;
+import org.onap.policy.common.logging.ONAPLoggingContext;
+import org.onap.policy.common.logging.eelf.MessageCodes;
+import org.onap.policy.common.logging.eelf.PolicyLogger;
+import org.onap.policy.pap.xacml.rest.XACMLPapServlet;
+import org.onap.policy.pap.xacml.rest.components.PolicyDBDaoTransaction;
+import org.onap.policy.pap.xacml.rest.elk.client.PolicyElasticSearchController;
+import org.onap.policy.pap.xacml.rest.model.RemoveGroupPolicy;
+import org.onap.policy.pap.xacml.rest.util.JPAUtils;
+import org.onap.policy.rest.XACMLRestProperties;
+import org.onap.policy.rest.adapter.PolicyRestAdapter;
+import org.onap.policy.rest.jpa.PolicyEntity;
+import org.onap.policy.rest.jpa.PolicyVersion;
+import org.onap.policy.utils.PolicyUtils;
+import org.onap.policy.xacml.api.XACMLErrorConstants;
+import org.onap.policy.xacml.api.pap.OnapPDPGroup;
+import org.onap.policy.xacml.std.pap.StdPAPPolicy;
+import org.onap.policy.xacml.std.pap.StdPDPGroup;
 
 import com.att.research.xacml.api.pap.PAPException;
 import com.att.research.xacml.api.pap.PDPPolicy;
@@ -57,14 +57,14 @@ import com.att.research.xacml.util.XACMLProperties;
 
 public class DeleteHandler {
 
-	private EcompPDPGroup newgroup;
+	private OnapPDPGroup newgroup;
 	
 	private static String papDbDriver = null;
 	private static String papDbUrl = null;
 	private static String papDbUser = null;
 	private static String papDbPassword = null;
 
-	public void doAPIDeleteFromPAP(HttpServletRequest request, HttpServletResponse response, ECOMPLoggingContext loggingContext) throws Exception {
+	public void doAPIDeleteFromPAP(HttpServletRequest request, HttpServletResponse response, ONAPLoggingContext loggingContext) throws Exception {
 		// get the request content into a String
 		String json = null;
 		java.util.Scanner scanner = new java.util.Scanner(request.getInputStream());
@@ -316,12 +316,12 @@ public class DeleteHandler {
 		return false;
 	}
 
-	public void doAPIDeleteFromPDP(HttpServletRequest request, HttpServletResponse response, ECOMPLoggingContext loggingContext) throws IOException {
+	public void doAPIDeleteFromPDP(HttpServletRequest request, HttpServletResponse response, ONAPLoggingContext loggingContext) throws IOException {
 		String policyName = request.getParameter("policyName");
 		String groupId = request.getParameter("groupId");
 		String responseString = null;
 		// for PUT operations the group may or may not need to exist before the operation can be done
-		EcompPDPGroup group = null;
+		OnapPDPGroup group = null;
 		try {
 			group = XACMLPapServlet.getPAPEngine().getGroup(groupId);
 		} catch (PAPException e) {
@@ -359,7 +359,7 @@ public class DeleteHandler {
 				}
 				
 				removePolicy.prepareToRemove(policy);
-				EcompPDPGroup updatedGroup = removePolicy.getUpdatedObject();
+				OnapPDPGroup updatedGroup = removePolicy.getUpdatedObject();
 				responseString = deletePolicyFromPDPGroup(updatedGroup, loggingContext);
 			} else {
 				String message = XACMLErrorConstants.ERROR_DATA_ISSUE + "Policy does not exist on the PDP.";
@@ -397,11 +397,11 @@ public class DeleteHandler {
 		}
 	}
 
-	private String deletePolicyFromPDPGroup (EcompPDPGroup group, ECOMPLoggingContext loggingContext){
+	private String deletePolicyFromPDPGroup (OnapPDPGroup group, ONAPLoggingContext loggingContext){
 		PolicyDBDaoTransaction acPutTransaction = XACMLPapServlet.getDbDaoTransaction();
 		String response = null;
 		loggingContext.setServiceName("API:PAP.DeleteHandler");
-		EcompPDPGroup existingGroup = null;
+		OnapPDPGroup existingGroup = null;
 		try {
 			existingGroup = XACMLPapServlet.getPAPEngine().getGroup(group.getId());
 		} catch (PAPException e1) {
@@ -455,7 +455,7 @@ public class DeleteHandler {
 		return response;
 	}
 	
-	public EcompPDPGroup getDeletedGroup(){
+	public OnapPDPGroup getDeletedGroup(){
 		return newgroup;
 	}
 	
diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/handler/DictionaryHandler.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/handler/DictionaryHandler.java
index 43342dd65..4fe126fd9 100644
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/handler/DictionaryHandler.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/handler/DictionaryHandler.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PAP-REST
+ * ONAP-PAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,12 +17,12 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.pap.xacml.rest.handler;
+package org.onap.policy.pap.xacml.rest.handler;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.openecomp.policy.common.logging.eelf.PolicyLogger;
+import org.onap.policy.common.logging.eelf.PolicyLogger;
 
 import com.att.research.xacml.util.XACMLProperties;
 
diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/handler/DictionaryHandlerImpl.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/handler/DictionaryHandlerImpl.java
index 8b462bad2..e0304d079 100644
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/handler/DictionaryHandlerImpl.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/handler/DictionaryHandlerImpl.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PAP-REST
+ * ONAP-PAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,15 +17,15 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.pap.xacml.rest.handler;
+package org.onap.policy.pap.xacml.rest.handler;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.openecomp.policy.common.logging.eelf.MessageCodes;
-import org.openecomp.policy.common.logging.eelf.PolicyLogger;
-import org.openecomp.policy.pap.xacml.rest.service.DictionaryService;
-import org.openecomp.policy.xacml.api.XACMLErrorConstants;
+import org.onap.policy.common.logging.eelf.MessageCodes;
+import org.onap.policy.common.logging.eelf.PolicyLogger;
+import org.onap.policy.pap.xacml.rest.service.DictionaryService;
+import org.onap.policy.xacml.api.XACMLErrorConstants;
 
 public class DictionaryHandlerImpl implements DictionaryHandler{
 	/*
@@ -36,8 +36,8 @@ public class DictionaryHandlerImpl implements DictionaryHandler{
 		try {
 			DictionaryService dictionary = new DictionaryService();
 			switch (dictionaryType) {
-			case "EcompName":
-				dictionary.getEcompDictionary(request, response);
+			case "OnapName":
+				dictionary.getOnapDictionary(request, response);
 				break;
 			case "Attribute":
 				dictionary.getAttributeDictionary(request, response);
@@ -179,8 +179,8 @@ public class DictionaryHandlerImpl implements DictionaryHandler{
 		try {
 			DictionaryService dictionary = new DictionaryService();
 			switch (dictionaryType) {
-			case "EcompName":
-				result = dictionary.saveEcompDictionary(request, response);
+			case "OnapName":
+				result = dictionary.saveOnapDictionary(request, response);
 				break;
 			case "Attribute":
 				result = dictionary.saveAttributeDictionary(request, response);
diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/handler/PushPolicyHandler.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/handler/PushPolicyHandler.java
index 009a2d601..9ef0e6f1e 100644
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/handler/PushPolicyHandler.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/handler/PushPolicyHandler.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PAP-REST
+ * ONAP-PAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.pap.xacml.rest.handler;
+package org.onap.policy.pap.xacml.rest.handler;
 
 import java.io.File;
 import java.net.URI;
@@ -28,12 +28,12 @@ import javax.persistence.Query;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.openecomp.policy.common.logging.eelf.MessageCodes;
-import org.openecomp.policy.common.logging.eelf.PolicyLogger;
-import org.openecomp.policy.pap.xacml.rest.XACMLPapServlet;
-import org.openecomp.policy.rest.jpa.PolicyVersion;
-import org.openecomp.policy.xacml.api.pap.EcompPDPGroup;
-import org.openecomp.policy.xacml.std.pap.StdPDPPolicy;
+import org.onap.policy.common.logging.eelf.MessageCodes;
+import org.onap.policy.common.logging.eelf.PolicyLogger;
+import org.onap.policy.pap.xacml.rest.XACMLPapServlet;
+import org.onap.policy.rest.jpa.PolicyVersion;
+import org.onap.policy.xacml.api.pap.OnapPDPGroup;
+import org.onap.policy.xacml.std.pap.StdPDPPolicy;
 
 import com.att.research.xacml.util.XACMLProperties;
 
@@ -106,7 +106,7 @@ public class PushPolicyHandler {
 		return true;
 	}
 	
-	public boolean preSafetyCheck(EcompPDPGroup policy, String configHome){
+	public boolean preSafetyCheck(OnapPDPGroup policy, String configHome){
 		return true;
 	}
 	
diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/handler/SavePolicyHandler.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/handler/SavePolicyHandler.java
index 4624f74aa..d88aee0cb 100644
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/handler/SavePolicyHandler.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/handler/SavePolicyHandler.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PAP-REST
+ * ONAP-PAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.pap.xacml.rest.handler;
+package org.onap.policy.pap.xacml.rest.handler;
 
 import java.io.IOException;
 import java.util.HashMap;
@@ -27,13 +27,13 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.xml.parsers.ParserConfigurationException;
 
-import org.openecomp.policy.common.logging.eelf.PolicyLogger;
-import org.openecomp.policy.pap.xacml.rest.XACMLPapServlet;
-import org.openecomp.policy.pap.xacml.rest.policycontroller.PolicyCreation;
-import org.openecomp.policy.rest.adapter.PolicyRestAdapter;
-import org.openecomp.policy.utils.PolicyUtils;
-import org.openecomp.policy.xacml.api.XACMLErrorConstants;
-import org.openecomp.policy.xacml.std.pap.StdPAPPolicy;
+import org.onap.policy.common.logging.eelf.PolicyLogger;
+import org.onap.policy.pap.xacml.rest.XACMLPapServlet;
+import org.onap.policy.pap.xacml.rest.policycontroller.PolicyCreation;
+import org.onap.policy.rest.adapter.PolicyRestAdapter;
+import org.onap.policy.utils.PolicyUtils;
+import org.onap.policy.xacml.api.XACMLErrorConstants;
+import org.onap.policy.xacml.std.pap.StdPAPPolicy;
 import org.xml.sax.SAXException;
 
 import com.att.research.xacml.util.XACMLProperties;
@@ -92,7 +92,7 @@ public class SavePolicyHandler {
 		//Common among policy types
 		policyAdapter.setPolicyName(policy.getPolicyName());
 		policyAdapter.setPolicyDescription(policy.getPolicyDescription());
-		policyAdapter.setEcompName(policy.getEcompName()); //Config Base and Decision Policies
+		policyAdapter.setOnapName(policy.getOnapName()); //Config Base and Decision Policies
 		policyAdapter.setRuleCombiningAlgId("urn:oasis:names:tc:xacml:3.0:rule-combining-algorithm:permit-overrides");
 	
 		policyAdapter.setPolicyType(policyType);
diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/model/PDPPolicyContainer.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/model/PDPPolicyContainer.java
index 13a1801bd..cbcb7e04b 100644
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/model/PDPPolicyContainer.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/model/PDPPolicyContainer.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PAP-REST
+ * ONAP-PAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pap.xacml.rest.model;
+package org.onap.policy.pap.xacml.rest.model;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -26,12 +26,12 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.pap.xacml.rest.util.PolicyContainer;
-import org.openecomp.policy.pap.xacml.rest.util.PolicyItemSetChangeNotifier;
-import org.openecomp.policy.xacml.api.XACMLErrorConstants;
-import org.openecomp.policy.xacml.std.pap.StdPDPPolicy;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.pap.xacml.rest.util.PolicyContainer;
+import org.onap.policy.pap.xacml.rest.util.PolicyItemSetChangeNotifier;
+import org.onap.policy.xacml.api.XACMLErrorConstants;
+import org.onap.policy.xacml.std.pap.StdPDPPolicy;
 
 import com.att.research.xacml.api.pap.PDP;
 import com.att.research.xacml.api.pap.PDPGroup;
diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/model/RemoveGroupPolicy.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/model/RemoveGroupPolicy.java
index 83d0991f5..7645535b0 100644
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/model/RemoveGroupPolicy.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/model/RemoveGroupPolicy.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PAP-REST
+ * ONAP-PAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,14 +18,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pap.xacml.rest.model;
+package org.onap.policy.pap.xacml.rest.model;
 
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
 
-import org.openecomp.policy.xacml.api.pap.EcompPDPGroup;
-import org.openecomp.policy.xacml.std.pap.StdPDPGroup;
+import org.onap.policy.xacml.api.pap.OnapPDPGroup;
+import org.onap.policy.xacml.std.pap.StdPDPGroup;
 
 import com.att.research.xacml.api.pap.PDPPolicy;
 
@@ -80,7 +80,7 @@ public class RemoveGroupPolicy {
 		Set<PDPPolicy> changedPolicies = new HashSet<>();
 		changedPolicies.addAll((Collection<PDPPolicy>) RemoveGroupPolicy.policyContainer.getItemIds());
 		updatedGroupObject.setPolicies(changedPolicies);
-		updatedGroupObject.setEcompPdps(this.group.getEcompPdps());
+		updatedGroupObject.setOnapPdps(this.group.getOnapPdps());
 		
 		// replace the original set of PIP Configs with the set from the container
 		updatedGroupObject.setPipConfigs(this.group.getPipConfigs());
@@ -95,7 +95,7 @@ public class RemoveGroupPolicy {
 		return this.isSaved;
 	}
 		
-	public EcompPDPGroup getUpdatedObject() {
+	public OnapPDPGroup getUpdatedObject() {
 		return this.updatedObject;
 	}
 
diff --git a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/model/package-info.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/model/package-info.java
new file mode 100644
index 000000000..51d988887
--- /dev/null
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/model/package-info.java
@@ -0,0 +1,20 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP-PAP-REST
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.policy.pap.xacml.rest.model;
diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/policycontroller/PolicyCreation.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/policycontroller/PolicyCreation.java
index e6f322a72..80657fcd6 100644
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/policycontroller/PolicyCreation.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/policycontroller/PolicyCreation.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PAP-REST
+ * ONAP-PAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.pap.xacml.rest.policycontroller;
+package org.onap.policy.pap.xacml.rest.policycontroller;
 
 import java.io.File;
 import java.util.HashMap;
@@ -30,32 +30,32 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.lang.StringUtils;
-import org.openecomp.policy.common.logging.eelf.PolicyLogger;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.pap.xacml.rest.XACMLPapServlet;
-import org.openecomp.policy.pap.xacml.rest.components.ActionPolicy;
-import org.openecomp.policy.pap.xacml.rest.components.ClosedLoopPolicy;
-import org.openecomp.policy.pap.xacml.rest.components.ConfigPolicy;
-import org.openecomp.policy.pap.xacml.rest.components.CreateBrmsParamPolicy;
-import org.openecomp.policy.pap.xacml.rest.components.CreateBrmsRawPolicy;
-import org.openecomp.policy.pap.xacml.rest.components.CreateClosedLoopPerformanceMetrics;
-import org.openecomp.policy.pap.xacml.rest.components.DecisionPolicy;
-import org.openecomp.policy.pap.xacml.rest.components.FirewallConfigPolicy;
-import org.openecomp.policy.pap.xacml.rest.components.MicroServiceConfigPolicy;
-import org.openecomp.policy.pap.xacml.rest.components.Policy;
-import org.openecomp.policy.pap.xacml.rest.components.PolicyDBDao;
-import org.openecomp.policy.pap.xacml.rest.components.PolicyDBDaoTransaction;
-import org.openecomp.policy.pap.xacml.rest.elk.client.PolicyElasticSearchController;
-import org.openecomp.policy.pap.xacml.rest.util.AbstractPolicyCreation;
-import org.openecomp.policy.rest.adapter.PolicyRestAdapter;
-import org.openecomp.policy.rest.dao.CommonClassDao;
-import org.openecomp.policy.rest.jpa.ActionPolicyDict;
-import org.openecomp.policy.rest.jpa.BRMSParamTemplate;
-import org.openecomp.policy.rest.jpa.PolicyEditorScopes;
-import org.openecomp.policy.rest.jpa.PolicyVersion;
-import org.openecomp.policy.rest.jpa.UserInfo;
-import org.openecomp.policy.xacml.api.XACMLErrorConstants;
+import org.onap.policy.common.logging.eelf.PolicyLogger;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.pap.xacml.rest.XACMLPapServlet;
+import org.onap.policy.pap.xacml.rest.components.ActionPolicy;
+import org.onap.policy.pap.xacml.rest.components.ClosedLoopPolicy;
+import org.onap.policy.pap.xacml.rest.components.ConfigPolicy;
+import org.onap.policy.pap.xacml.rest.components.CreateBrmsParamPolicy;
+import org.onap.policy.pap.xacml.rest.components.CreateBrmsRawPolicy;
+import org.onap.policy.pap.xacml.rest.components.CreateClosedLoopPerformanceMetrics;
+import org.onap.policy.pap.xacml.rest.components.DecisionPolicy;
+import org.onap.policy.pap.xacml.rest.components.FirewallConfigPolicy;
+import org.onap.policy.pap.xacml.rest.components.MicroServiceConfigPolicy;
+import org.onap.policy.pap.xacml.rest.components.Policy;
+import org.onap.policy.pap.xacml.rest.components.PolicyDBDao;
+import org.onap.policy.pap.xacml.rest.components.PolicyDBDaoTransaction;
+import org.onap.policy.pap.xacml.rest.elk.client.PolicyElasticSearchController;
+import org.onap.policy.pap.xacml.rest.util.AbstractPolicyCreation;
+import org.onap.policy.rest.adapter.PolicyRestAdapter;
+import org.onap.policy.rest.dao.CommonClassDao;
+import org.onap.policy.rest.jpa.ActionPolicyDict;
+import org.onap.policy.rest.jpa.BRMSParamTemplate;
+import org.onap.policy.rest.jpa.PolicyEditorScopes;
+import org.onap.policy.rest.jpa.PolicyVersion;
+import org.onap.policy.rest.jpa.UserInfo;
+import org.onap.policy.xacml.api.XACMLErrorConstants;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -242,11 +242,11 @@ public class PolicyCreation extends AbstractPolicyCreation{
 				if (policyConfigType.equalsIgnoreCase("Firewall Config")) {
 					newPolicy = new FirewallConfigPolicy(policyData);
 				}else if (policyConfigType.equalsIgnoreCase("BRMS_Raw")) { 
-					policyData.setEcompName("DROOLS");
+					policyData.setOnapName("DROOLS");
 					policyData.setConfigName("BRMS_RAW_RULE");
 					newPolicy = new CreateBrmsRawPolicy(policyData);
 				}else if (policyConfigType.equalsIgnoreCase("BRMS_Param")) {
-					policyData.setEcompName("DROOLS");
+					policyData.setOnapName("DROOLS");
 					policyData.setConfigName("BRMS_PARAM_RULE");
 					Map<String, String> drlRuleAndUIParams = new HashMap<>();
 					if(policyData.getApiflag() == null){
diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/adapters/package-info.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/policycontroller/package-info.java
index 20b95c734..bb5307573 100644
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/adapters/package-info.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/policycontroller/package-info.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PAP-REST
+ * ONAP-PAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,5 +17,4 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
-package org.openecomp.policy.pap.xacml.rest.adapters;
+package org.onap.policy.pap.xacml.rest.policycontroller;
\ No newline at end of file
diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/service/DictionaryService.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/service/DictionaryService.java
index 662df9a36..df1916be9 100644
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/service/DictionaryService.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/service/DictionaryService.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PAP-REST
+ * ONAP-PAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,25 +17,25 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.pap.xacml.rest.service;
+package org.onap.policy.pap.xacml.rest.service;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.pap.xacml.rest.controller.ActionPolicyDictionaryController;
-import org.openecomp.policy.pap.xacml.rest.controller.BRMSDictionaryController;
-import org.openecomp.policy.pap.xacml.rest.controller.ClosedLoopDictionaryController;
-import org.openecomp.policy.pap.xacml.rest.controller.DecisionPolicyDictionaryController;
-import org.openecomp.policy.pap.xacml.rest.controller.DescriptiveDictionaryController;
-import org.openecomp.policy.pap.xacml.rest.controller.DictionaryController;
-import org.openecomp.policy.pap.xacml.rest.controller.EnforcerDictionaryController;
-import org.openecomp.policy.pap.xacml.rest.controller.FirewallDictionaryController;
-import org.openecomp.policy.pap.xacml.rest.controller.MicroServiceDictionaryController;
-import org.openecomp.policy.pap.xacml.rest.controller.PolicyScopeDictionaryController;
-import org.openecomp.policy.pap.xacml.rest.controller.SafePolicyController;
-import org.openecomp.policy.xacml.api.XACMLErrorConstants;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.pap.xacml.rest.controller.ActionPolicyDictionaryController;
+import org.onap.policy.pap.xacml.rest.controller.BRMSDictionaryController;
+import org.onap.policy.pap.xacml.rest.controller.ClosedLoopDictionaryController;
+import org.onap.policy.pap.xacml.rest.controller.DecisionPolicyDictionaryController;
+import org.onap.policy.pap.xacml.rest.controller.DescriptiveDictionaryController;
+import org.onap.policy.pap.xacml.rest.controller.DictionaryController;
+import org.onap.policy.pap.xacml.rest.controller.EnforcerDictionaryController;
+import org.onap.policy.pap.xacml.rest.controller.FirewallDictionaryController;
+import org.onap.policy.pap.xacml.rest.controller.MicroServiceDictionaryController;
+import org.onap.policy.pap.xacml.rest.controller.PolicyScopeDictionaryController;
+import org.onap.policy.pap.xacml.rest.controller.SafePolicyController;
+import org.onap.policy.xacml.api.XACMLErrorConstants;
 import org.springframework.stereotype.Service;
 import org.springframework.web.servlet.ModelAndView;
 
@@ -48,12 +48,12 @@ public class DictionaryService {
 	/*
 	 * Methods that call the controller method directly to Save and Update dictionary data
 	 */
-	public String saveEcompDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
+	public String saveOnapDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
 		
 		DictionaryController dictionary = new DictionaryController();
 		String responseString = null;
 		try {
-			ModelAndView result = dictionary.saveEcompDictionary(request, response);
+			ModelAndView result = dictionary.saveOnapDictionary(request, response);
 			responseString = result.getViewName();
 			
 		} catch (Exception e) {
@@ -590,11 +590,11 @@ public class DictionaryService {
 	/*
 	 * Methods that call the controller get methods directly to get dictionary data
 	 */
-	public void getEcompDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
+	public void getOnapDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
 		
 		DictionaryController dictionary = new DictionaryController();
 		try {
-			dictionary.getEcompNameDictionaryEntityData(request, response);					
+			dictionary.getOnapNameDictionaryEntityData(request, response);					
 		} catch (Exception e) {
 			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
 			
@@ -973,7 +973,7 @@ public class DictionaryService {
 		
 		SafePolicyController dictionary = new SafePolicyController();
 		try {
-			dictionary.getEcompNameDictionaryEntityData(request, response);
+			dictionary.getOnapNameDictionaryEntityData(request, response);
 		
 		} catch (Exception e) {
 			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/service/ImportService.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/service/ImportService.java
index 0b3e313d6..0a5da0ec3 100644
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/service/ImportService.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/service/ImportService.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PAP-REST
+ * ONAP-PAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.pap.xacml.rest.service;
+package org.onap.policy.pap.xacml.rest.service;
 
 import java.io.BufferedWriter;
 import java.io.File;
@@ -33,9 +33,9 @@ import java.util.UUID;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.openecomp.policy.common.logging.eelf.PolicyLogger;
-import org.openecomp.policy.pap.xacml.rest.components.CreateBRMSRuleTemplate;
-import org.openecomp.policy.pap.xacml.rest.components.CreateNewMicroServiceModel;
+import org.onap.policy.common.logging.eelf.PolicyLogger;
+import org.onap.policy.pap.xacml.rest.components.CreateBRMSRuleTemplate;
+import org.onap.policy.pap.xacml.rest.components.CreateNewMicroServiceModel;
 
 public class ImportService {
 
diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/service/MetricService.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/service/MetricService.java
index 97e53e8eb..416af4413 100644
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/service/MetricService.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/service/MetricService.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PAP-REST
+ * ONAP-PAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.pap.xacml.rest.service;
+package org.onap.policy.pap.xacml.rest.service;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -27,25 +27,25 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.json.JSONObject;
-import org.openecomp.policy.common.logging.eelf.MessageCodes;
-import org.openecomp.policy.common.logging.eelf.PolicyLogger;
-import org.openecomp.policy.pap.xacml.rest.XACMLPapServlet;
-import org.openecomp.policy.xacml.api.XACMLErrorConstants;
-import org.openecomp.policy.xacml.api.pap.EcompPDPGroup;
+import org.onap.policy.common.logging.eelf.MessageCodes;
+import org.onap.policy.common.logging.eelf.PolicyLogger;
+import org.onap.policy.pap.xacml.rest.XACMLPapServlet;
+import org.onap.policy.xacml.api.XACMLErrorConstants;
+import org.onap.policy.xacml.api.pap.OnapPDPGroup;
 
 import com.att.research.xacml.api.pap.PDPPolicy;
 
 public class MetricService {
 
 	public static void doGetPolicyMetrics(HttpServletRequest request, HttpServletResponse response) {
-		Set<EcompPDPGroup> groups = new HashSet<>();
+		Set<OnapPDPGroup> groups = new HashSet<>();
 		try {
 			//get the count of policies on the PDP
 			if(XACMLPapServlet.getPAPEngine()!=null){
-				groups = XACMLPapServlet.getPAPEngine().getEcompPDPGroups();
+				groups = XACMLPapServlet.getPAPEngine().getOnapPDPGroups();
 			}
 			int pdpCount = 0;
-			for (EcompPDPGroup group : groups) {
+			for (OnapPDPGroup group : groups) {
 				Set<PDPPolicy> policies = group.getPolicies();
 				pdpCount += policies.size();
 			}
diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/util/AbstractPolicyCreation.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/util/AbstractPolicyCreation.java
index 5fa681e85..71de2b297 100644
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/util/AbstractPolicyCreation.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/util/AbstractPolicyCreation.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PAP-REST
+ * ONAP-PAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,12 +17,12 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.pap.xacml.rest.util;
+package org.onap.policy.pap.xacml.rest.util;
 
 
 import java.util.UUID;
 
-import org.openecomp.policy.rest.XACMLRestProperties;
+import org.onap.policy.rest.XACMLRestProperties;
 import org.springframework.stereotype.Component;
 
 import com.att.research.xacml.util.XACMLProperties;
diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/util/JPAUtils.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/util/JPAUtils.java
index 9a23beed3..732ed2f44 100644
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/util/JPAUtils.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/util/JPAUtils.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PAP-REST
+ * ONAP-PAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pap.xacml.rest.util;
+package org.onap.policy.pap.xacml.rest.util;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -30,17 +30,17 @@ import javax.persistence.EntityManagerFactory;
 import javax.persistence.Query;
 import javax.servlet.ServletException;
 
-import org.openecomp.policy.rest.XacmlAdminAuthorization;
-import org.openecomp.policy.rest.jpa.Attribute;
-import org.openecomp.policy.rest.jpa.Datatype;
-import org.openecomp.policy.rest.jpa.FunctionDefinition;
-import org.openecomp.policy.rest.jpa.GlobalRoleSettings;
+import org.onap.policy.rest.XacmlAdminAuthorization;
+import org.onap.policy.rest.jpa.Attribute;
+import org.onap.policy.rest.jpa.Datatype;
+import org.onap.policy.rest.jpa.FunctionDefinition;
+import org.onap.policy.rest.jpa.GlobalRoleSettings;
 
 import oasis.names.tc.xacml._3_0.core.schema.wd_17.AttributeDesignatorType;
 import oasis.names.tc.xacml._3_0.core.schema.wd_17.AttributeSelectorType;
 
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger; 
-import org.openecomp.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.common.logging.flexlogger.FlexLogger; 
+import org.onap.policy.common.logging.flexlogger.Logger;
 
 public class JPAUtils {
 	private static Logger LOGGER	= FlexLogger.getLogger(JPAUtils.class);
diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/util/JsonMessage.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/util/JsonMessage.java
index 3e9351044..ab3b126ea 100644
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/util/JsonMessage.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/util/JsonMessage.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PAP-REST
+ * ONAP-PAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pap.xacml.rest.util;
+package org.onap.policy.pap.xacml.rest.util;
 
 public class JsonMessage {
 
diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/util/PolicyContainer.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/util/PolicyContainer.java
index 3741dbda9..5d2453b5c 100644
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/util/PolicyContainer.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/util/PolicyContainer.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pap.xacml.rest.util;
+package org.onap.policy.pap.xacml.rest.util;
 
 import java.io.Serializable;
 import java.util.Collection;
diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/util/PolicyItemSetChangeNotifier.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/util/PolicyItemSetChangeNotifier.java
index da9278435..5d7f7853c 100644
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/util/PolicyItemSetChangeNotifier.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/util/PolicyItemSetChangeNotifier.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pap.xacml.rest.util;
+package org.onap.policy.pap.xacml.rest.util;
 
 
 import java.io.Serializable;
@@ -26,8 +26,8 @@ import java.util.Collection;
 import java.util.EventObject;
 import java.util.LinkedList;
 
-import org.openecomp.policy.pap.xacml.rest.util.PolicyContainer.ItemSetChangeEvent;
-import org.openecomp.policy.pap.xacml.rest.util.PolicyContainer.ItemSetChangeListener;
+import org.onap.policy.pap.xacml.rest.util.PolicyContainer.ItemSetChangeEvent;
+import org.onap.policy.pap.xacml.rest.util.PolicyContainer.ItemSetChangeListener;
 
 
 
diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/restAuth/AuthenticationService.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/restAuth/AuthenticationService.java
index 78e652836..d0bfa2f8d 100644
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/restAuth/AuthenticationService.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/restAuth/AuthenticationService.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PAP-REST
+ * ONAP-PAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,14 +18,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pap.xacml.restAuth;
+package org.onap.policy.pap.xacml.restAuth;
 
 import java.util.Base64;
 import java.util.StringTokenizer;
 
-import org.openecomp.policy.common.logging.eelf.MessageCodes;
-import org.openecomp.policy.common.logging.eelf.PolicyLogger;
-import org.openecomp.policy.rest.XACMLRestProperties;
+import org.onap.policy.common.logging.eelf.MessageCodes;
+import org.onap.policy.common.logging.eelf.PolicyLogger;
+import org.onap.policy.rest.XACMLRestProperties;
 
 import com.att.research.xacml.util.XACMLProperties;
 
diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/restAuth/CheckPDP.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/restAuth/CheckPDP.java
index c1a1907c0..02ec467ed 100644
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/restAuth/CheckPDP.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/restAuth/CheckPDP.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PAP-REST
+ * ONAP-PAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pap.xacml.restAuth;
+package org.onap.policy.pap.xacml.restAuth;
 
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -36,12 +36,12 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Properties;
 
-import org.openecomp.policy.common.logging.eelf.MessageCodes;
-import org.openecomp.policy.common.logging.eelf.PolicyLogger;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.pap.xacml.rest.XACMLPapServlet;
-import org.openecomp.policy.xacml.api.XACMLErrorConstants;
+import org.onap.policy.common.logging.eelf.MessageCodes;
+import org.onap.policy.common.logging.eelf.PolicyLogger;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.pap.xacml.rest.XACMLPapServlet;
+import org.onap.policy.xacml.api.XACMLErrorConstants;
 
 public class CheckPDP {
 
diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/restAuth/PAPAuthenticationFilter.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/restAuth/PAPAuthenticationFilter.java
index 2352beb4d..44cb7d14a 100644
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/restAuth/PAPAuthenticationFilter.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/restAuth/PAPAuthenticationFilter.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PAP-REST
+ * ONAP-PAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pap.xacml.restAuth;
+package org.onap.policy.pap.xacml.restAuth;
 
 import java.io.IOException;
 
@@ -61,10 +61,10 @@ public class PAPAuthenticationFilter implements Filter {
 			//getting authentication credentials
 			if(url.contains("@Auth@")){
 				int authIndex = url.lastIndexOf("@");
-				int endAuthIndex = url.indexOf("/ecomp");
+				int endAuthIndex = url.indexOf("/onap");
 				authCredentials = "Basic " + url.substring(authIndex+1, endAuthIndex);
 				
-				//parse the url for /pap/ecomp/
+				//parse the url for /pap/onap/
 				String url1 = url.substring(0, 4);
 				String url2 = url.substring(endAuthIndex, url.length());
 				url = url1 + url2;
@@ -85,14 +85,14 @@ public class PAPAuthenticationFilter implements Filter {
 					//forward request to the XACMLPAPServlet if authenticated
 					request.getRequestDispatcher("/pap/pap/").forward(request, response);
 					
-				}else if (url.startsWith("/pap/ecomp/")){
+				}else if (url.startsWith("/pap/onap/")){
 					
-					//indicates the request comes from the ECOMP Portal ecomp-sdk-app
+					//indicates the request comes from the ONAP Portal onap-sdk-app
 					if(response instanceof HttpServletResponse) {
 						HttpServletResponse alteredResponse = ((HttpServletResponse)response);
 						addCorsHeader(alteredResponse);
-						logger.info("Request comes from Ecomp Portal");
-						//Spring dispatcher servlet is at the end of the filter chain at /pap/ecomp/ path
+						logger.info("Request comes from Onap Portal");
+						//Spring dispatcher servlet is at the end of the filter chain at /pap/onap/ path
 						System.out.println("New Request URI: " + url);
 						filter.doFilter(request, response);
 						/*url = url.substring(url.indexOf("/pap/")+4);
@@ -111,7 +111,7 @@ public class PAPAuthenticationFilter implements Filter {
 		}
 	}
 	
-	//method to add CorsHeaders for ecomp portal rest call
+	//method to add CorsHeaders for onap portal rest call
 	private void addCorsHeader(HttpServletResponse response) {
 		logger.info("Adding Cors Response Headers!!!");
 		response.addHeader("Access-Control-Allow-Origin", "*");
diff --git a/ECOMP-PAP-REST/src/main/resources/Decision_GuardBLPolicyTemplate.xml b/ONAP-PAP-REST/src/main/resources/Decision_GuardBLPolicyTemplate.xml
index 7e4201a58..19e567ddd 100644
--- a/ECOMP-PAP-REST/src/main/resources/Decision_GuardBLPolicyTemplate.xml
+++ b/ONAP-PAP-REST/src/main/resources/Decision_GuardBLPolicyTemplate.xml
@@ -4,15 +4,15 @@
     <Target>
         <AnyOf>
             <AllOf>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">${PolicyName}</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="PolicyName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
             </AllOf>
             <AllOf>
-                <Match MatchId="org.openecomp.function.regex-match">
-                    <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">${ECOMPName}</AttributeValue>
-                    <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ECOMPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
+                <Match MatchId="org.onap.function.regex-match">
+                    <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">${ONAPName}</AttributeValue>
+                    <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ONAPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
                 <Match MatchId="urn:oasis:names:tc:xacml:1.0:function:string-regexp-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">${actor}</AttributeValue>
diff --git a/ECOMP-PAP-REST/src/main/resources/Decision_GuardPolicyTemplate.xml b/ONAP-PAP-REST/src/main/resources/Decision_GuardPolicyTemplate.xml
index d404080e0..ed5b27b7d 100644
--- a/ECOMP-PAP-REST/src/main/resources/Decision_GuardPolicyTemplate.xml
+++ b/ONAP-PAP-REST/src/main/resources/Decision_GuardPolicyTemplate.xml
@@ -4,15 +4,15 @@
     <Target>
         <AnyOf>
             <AllOf>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">${PolicyName}</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="PolicyName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
             </AllOf>
             <AllOf>
-                <Match MatchId="org.openecomp.function.regex-match">
-                    <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">${ECOMPName}</AttributeValue>
-                    <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ECOMPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
+                <Match MatchId="org.onap.function.regex-match">
+                    <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">${ONAPName}</AttributeValue>
+                    <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ONAPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
                 <Match MatchId="urn:oasis:names:tc:xacml:1.0:function:string-regexp-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">${actor}</AttributeValue>
diff --git a/ECOMP-PAP-REST/src/main/resources/META-INF/drop.ddl b/ONAP-PAP-REST/src/main/resources/META-INF/drop.ddl
index f7138ad52..f7138ad52 100644
--- a/ECOMP-PAP-REST/src/main/resources/META-INF/drop.ddl
+++ b/ONAP-PAP-REST/src/main/resources/META-INF/drop.ddl
diff --git a/ECOMP-PAP-REST/src/main/resources/META-INF/generatedCreate.ddl b/ONAP-PAP-REST/src/main/resources/META-INF/generatedCreate.ddl
index 73ce58f3c..c12949aed 100644
--- a/ECOMP-PAP-REST/src/main/resources/META-INF/generatedCreate.ddl
+++ b/ONAP-PAP-REST/src/main/resources/META-INF/generatedCreate.ddl
@@ -1,6 +1,6 @@
 CREATE TABLE PolicyEntity (policyId BIGINT NOT NULL, created_by VARCHAR(255) NOT NULL, created_date TIMESTAMP, deleted BOOLEAN NOT NULL, description VARCHAR(2048) NOT NULL, modified_by VARCHAR(255) NOT NULL, modified_date TIMESTAMP NOT NULL, policyData TEXT, policyName VARCHAR(255) NOT NULL, policyVersion INTEGER, scope VARCHAR(255) NOT NULL, version INTEGER, actionBodyId BIGINT, configurationDataId BIGINT, PRIMARY KEY (policyId))
 CREATE TABLE ConfigurationDataEntity (configurationDataId BIGINT NOT NULL, configBody TEXT, configType VARCHAR(255) NOT NULL, configurationName VARCHAR(255) NOT NULL, created_by VARCHAR(255) NOT NULL, created_date TIMESTAMP, deleted BOOLEAN NOT NULL, description VARCHAR(2048) NOT NULL, modified_by VARCHAR(255) NOT NULL, modified_date TIMESTAMP NOT NULL, version INTEGER, PRIMARY KEY (configurationDataId))
-CREATE TABLE PolicyDBDaoEntity (policyDBDaoUrl VARCHAR NOT NULL, created_date TIMESTAMP, description VARCHAR(2048) NOT NULL, modified_date TIMESTAMP NOT NULL, password LONGVARCHAR, username VARCHAR, PRIMARY KEY (policyDBDaoUrl))
+CREATE TABLE PolicyDBDaoEntity (policyDBDaoUrl VARCHAR NOT NULL, created_date TIMESTAMP, description VARCHAR(2048) NOT NULL, modified_date TIMESTAMP NOT NULL, password VARCHAR, username VARCHAR, PRIMARY KEY (policyDBDaoUrl))
 CREATE TABLE GroupEntity (groupKey BIGINT NOT NULL, created_by VARCHAR(255) NOT NULL, created_date TIMESTAMP, defaultGroup BOOLEAN NOT NULL, deleted BOOLEAN NOT NULL, description VARCHAR(2048) NOT NULL, groupId VARCHAR NOT NULL, groupName VARCHAR(255) NOT NULL, modified_by VARCHAR(255) NOT NULL, modified_date TIMESTAMP NOT NULL, version INTEGER, PRIMARY KEY (groupKey))
 CREATE TABLE PdpEntity (pdpKey BIGINT NOT NULL, created_by VARCHAR(255) NOT NULL, created_date TIMESTAMP, deleted BOOLEAN NOT NULL, description VARCHAR(2048) NOT NULL, jmxPort INTEGER NOT NULL, modified_by VARCHAR(255) NOT NULL, modified_date TIMESTAMP NOT NULL, pdpId VARCHAR(255) NOT NULL, pdpName VARCHAR(255) NOT NULL, groupKey BIGINT, PRIMARY KEY (pdpKey))
 CREATE TABLE ActionBodyEntity (actionBodyId BIGINT NOT NULL, actionBody TEXT, actionBodyName VARCHAR(255) NOT NULL, created_by VARCHAR(255) NOT NULL, created_date TIMESTAMP, deleted BOOLEAN NOT NULL, modified_by VARCHAR(255) NOT NULL, modified_date TIMESTAMP NOT NULL, version INTEGER, PRIMARY KEY (actionBodyId))
@@ -27,7 +27,7 @@ CREATE TABLE ClosedLoopSite (id INTEGER NOT NULL, created_date TIMESTAMP, descri
 CREATE TABLE DCAEUsers (id INTEGER NOT NULL, description  VARCHAR, name VARCHAR NOT NULL, PRIMARY KEY (id))
 CREATE TABLE DCAEuuid (id INTEGER NOT NULL, description VARCHAR, name VARCHAR NOT NULL, PRIMARY KEY (id))
 CREATE TABLE DescriptiveScope (Id INTEGER NOT NULL, created_date TIMESTAMP, description VARCHAR(2048), scopename VARCHAR NOT NULL, modified_date TIMESTAMP NOT NULL, search VARCHAR, created_by VARCHAR(45), modified_by VARCHAR(45), PRIMARY KEY (Id))
-CREATE TABLE EcompName (id INTEGER NOT NULL, created_date TIMESTAMP, description VARCHAR(2048), ecomp_Name VARCHAR NOT NULL UNIQUE, modified_date TIMESTAMP NOT NULL, created_by VARCHAR(45), modified_by VARCHAR(45), PRIMARY KEY (id))
+CREATE TABLE OnapName (id INTEGER NOT NULL, created_date TIMESTAMP, description VARCHAR(2048), modified_date TIMESTAMP NOT NULL, onap_Name VARCHAR NOT NULL UNIQUE, created_by VARCHAR(45), modified_by VARCHAR(45), PRIMARY KEY (id))
 CREATE TABLE EnforcingType (id INTEGER NOT NULL, connectionQuery VARCHAR(255) NOT NULL, enforcingType VARCHAR NOT NULL UNIQUE, script VARCHAR(255) NOT NULL, valueQuery VARCHAR(255) NOT NULL, PRIMARY KEY (id))
 CREATE TABLE GlobalRoleSettings (role VARCHAR(45) NOT NULL, lockdown BOOLEAN, PRIMARY KEY (role))
 CREATE TABLE GroupPolicyScopeList (id INTEGER NOT NULL, description VARCHAR, groupList VARCHAR, name VARCHAR NOT NULL, PRIMARY KEY (id))
@@ -43,7 +43,7 @@ CREATE TABLE PIPResolver (id INTEGER NOT NULL, CLASSNAME VARCHAR(2048) NOT NULL,
 CREATE TABLE PIPResolverParams (id INTEGER NOT NULL, PARAM_DEFAULT VARCHAR(2048), PARAM_NAME VARCHAR(1024) NOT NULL, PARAM_VALUE VARCHAR(2048) NOT NULL, REQUIRED CHAR NOT NULL, ID_RESOLVER INTEGER, PRIMARY KEY (id))
 CREATE TABLE PIPType (id INTEGER NOT NULL, type VARCHAR(45) NOT NULL, PRIMARY KEY (id))
 CREATE TABLE PolicyAlgorithms (id INTEGER NOT NULL, is_standard CHAR NOT NULL, short_name VARCHAR(64) NOT NULL, xacml_id VARCHAR(255) NOT NULL UNIQUE, PRIMARY KEY (id))
-CREATE TABLE policy_manangement (id INTEGER NOT NULL, CONFIG_NAME VARCHAR(45) NOT NULL, CREATE_DATE_TIME TIMESTAMP NOT NULL, CREATED_BY VARCHAR(45) NOT NULL, ECOMP_NAME VARCHAR(45) NOT NULL, POLICY_NAME VARCHAR(45) NOT NULL, scope VARCHAR(45) NOT NULL, UPDATE_DATE_TIME TIMESTAMP NOT NULL, UPDATED_BY VARCHAR(45) NOT NULL, XML CLOB NOT NULL, PRIMARY KEY (id))
+CREATE TABLE policy_manangement (id INTEGER NOT NULL, CONFIG_NAME VARCHAR(45) NOT NULL, CREATE_DATE_TIME TIMESTAMP NOT NULL, CREATED_BY VARCHAR(45) NOT NULL, ONAP_NAME VARCHAR(45) NOT NULL, POLICY_NAME VARCHAR(45) NOT NULL, scope VARCHAR(45) NOT NULL, UPDATE_DATE_TIME TIMESTAMP NOT NULL, UPDATED_BY VARCHAR(45) NOT NULL, XML CLOB NOT NULL, PRIMARY KEY (id))
 CREATE TABLE PolicyScopeService (id INTEGER NOT NULL, description  VARCHAR, name VARCHAR NOT NULL, PRIMARY KEY (id))
 CREATE TABLE PolicyScopeType (id INTEGER NOT NULL, description  VARCHAR, name VARCHAR NOT NULL, PRIMARY KEY (id))
 CREATE TABLE PolicyScopeResource (id INTEGER NOT NULL, description  VARCHAR, name VARCHAR NOT NULL, PRIMARY KEY (id))
@@ -94,8 +94,8 @@ ALTER TABLE ClosedLoopSite ADD CONSTRAINT FK_ClosedLoopSite_modified_by FOREIGN
 ALTER TABLE ClosedLoopSite ADD CONSTRAINT FK_ClosedLoopSite_created_by FOREIGN KEY (created_by) REFERENCES UserInfo (loginid)
 ALTER TABLE DescriptiveScope ADD CONSTRAINT FK_DescriptiveScope_created_by FOREIGN KEY (created_by) REFERENCES UserInfo (loginid)
 ALTER TABLE DescriptiveScope ADD CONSTRAINT FK_DescriptiveScope_modified_by FOREIGN KEY (modified_by) REFERENCES UserInfo (loginid)
-ALTER TABLE EcompName ADD CONSTRAINT FK_EcompName_created_by FOREIGN KEY (created_by) REFERENCES UserInfo (loginid)
-ALTER TABLE EcompName ADD CONSTRAINT FK_EcompName_modified_by FOREIGN KEY (modified_by) REFERENCES UserInfo (loginid)
+ALTER TABLE OnapName ADD CONSTRAINT FK_OnapName_modified_by FOREIGN KEY (modified_by) REFERENCES UserInfo (loginid)
+ALTER TABLE OnapName ADD CONSTRAINT FK_OnapName_created_by FOREIGN KEY (created_by) REFERENCES UserInfo (loginid)
 ALTER TABLE ObadviceExpressions ADD CONSTRAINT FK_ObadviceExpressions_obadvice_id FOREIGN KEY (obadvice_id) REFERENCES Obadvice (id)
 ALTER TABLE ObadviceExpressions ADD CONSTRAINT FK_ObadviceExpressions_attribute_id FOREIGN KEY (attribute_id) REFERENCES Attribute (id)
 ALTER TABLE PEPOptions ADD CONSTRAINT FK_PEPOptions_modified_by FOREIGN KEY (modified_by) REFERENCES UserInfo (loginid)
diff --git a/ECOMP-PAP-REST/src/main/resources/META-INF/generatedDrop.ddl b/ONAP-PAP-REST/src/main/resources/META-INF/generatedDrop.ddl
index 70ef3cb75..ce1769a4d 100644
--- a/ECOMP-PAP-REST/src/main/resources/META-INF/generatedDrop.ddl
+++ b/ONAP-PAP-REST/src/main/resources/META-INF/generatedDrop.ddl
@@ -24,8 +24,8 @@ ALTER TABLE ClosedLoopSite DROP CONSTRAINT FK_ClosedLoopSite_modified_by
 ALTER TABLE ClosedLoopSite DROP CONSTRAINT FK_ClosedLoopSite_created_by
 ALTER TABLE DescriptiveScope DROP CONSTRAINT FK_DescriptiveScope_created_by
 ALTER TABLE DescriptiveScope DROP CONSTRAINT FK_DescriptiveScope_modified_by
-ALTER TABLE EcompName DROP CONSTRAINT FK_EcompName_created_by
-ALTER TABLE EcompName DROP CONSTRAINT FK_EcompName_modified_by
+ALTER TABLE OnapName DROP CONSTRAINT FK_OnapName_modified_by
+ALTER TABLE OnapName DROP CONSTRAINT FK_OnapName_created_by
 ALTER TABLE ObadviceExpressions DROP CONSTRAINT FK_ObadviceExpressions_obadvice_id
 ALTER TABLE ObadviceExpressions DROP CONSTRAINT FK_ObadviceExpressions_attribute_id
 ALTER TABLE PEPOptions DROP CONSTRAINT FK_PEPOptions_modified_by
@@ -74,7 +74,7 @@ DROP TABLE ClosedLoopSite
 DROP TABLE DCAEUsers
 DROP TABLE DCAEuuid
 DROP TABLE DescriptiveScope
-DROP TABLE EcompName
+DROP TABLE OnapName
 DROP TABLE EnforcingType
 DROP TABLE GlobalRoleSettings
 DROP TABLE GroupPolicyScopeList
diff --git a/ONAP-PAP-REST/src/main/resources/META-INF/persistence.xml b/ONAP-PAP-REST/src/main/resources/META-INF/persistence.xml
new file mode 100644
index 000000000..b0a76c40a
--- /dev/null
+++ b/ONAP-PAP-REST/src/main/resources/META-INF/persistence.xml
@@ -0,0 +1,201 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ============LICENSE_START=======================================================
+  ONAP-PAP-REST
+  ================================================================================
+  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+  ================================================================================
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+  
+       http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  ============LICENSE_END=========================================================
+  -->
+<persistence version="2.1" xmlns="http://xmlns.jcp.org/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd">
+	<persistence-unit name="XACML-PAP-REST">
+		<class>org.onap.policy.rest.jpa.PolicyEntity</class>
+		<class>org.onap.policy.rest.jpa.ConfigurationDataEntity</class>		
+		<class>org.onap.policy.rest.jpa.PolicyDBDaoEntity</class>
+		<class>org.onap.policy.rest.jpa.GroupEntity</class>
+		<class>org.onap.policy.rest.jpa.PdpEntity</class>
+		<class>org.onap.policy.rest.jpa.ActionBodyEntity</class>
+		<class>org.onap.policy.rest.jpa.DatabaseLockEntity</class>
+		<class>org.onap.policy.rest.jpa.PolicyVersion</class>
+		<class>org.onap.policy.rest.jpa.PolicyScore</class>
+		<class>org.onap.policy.rest.jpa.FunctionDefinition</class>
+		<class>org.onap.policy.rest.jpa.Attribute</class>
+		<class>org.onap.policy.rest.jpa.Category</class>
+		<class>org.onap.policy.rest.jpa.ConstraintType</class>
+		<class>org.onap.policy.rest.jpa.ConstraintValue</class>
+		<class>org.onap.policy.rest.jpa.Datatype</class>
+		<class>org.onap.policy.rest.jpa.FunctionArgument</class>
+		<class>org.onap.policy.rest.jpa.UserInfo</class>
+		<class>org.onap.policy.rest.jpa.ActionPolicyDict</class>
+		<class>org.onap.policy.rest.jpa.DecisionSettings</class>
+		<class>org.onap.policy.rest.jpa.MicroServiceModels</class>
+		<class>org.onap.policy.rest.jpa.BRMSParamTemplate</class>
+		<class>org.onap.policy.rest.jpa.PolicyEditorScopes</class>
+		<!-- unique to PolicyEngineUtils - will be audited from PAP -->
+		<class>org.onap.policy.jpa.BackUpMonitorEntity</class>
+		<!-- unique to integrity-monitor - will be audited from PAP -->
+		<class>org.onap.policy.common.im.jpa.StateManagementEntity</class>
+		<class>org.onap.policy.common.im.jpa.ForwardProgressEntity</class>
+		<class>org.onap.policy.common.im.jpa.ResourceRegistrationEntity</class>
+		<!-- unique to integrity-audit - will be audited from PAP -->
+		<class>org.onap.policy.common.ia.jpa.IntegrityAuditEntity</class>
+		<exclude-unlisted-classes>false</exclude-unlisted-classes>
+		<shared-cache-mode>NONE</shared-cache-mode>
+		<properties>
+	<!--	The properties defined below are the default settings to be used when someone initially
+				wants to start working with the XACML-PAP-ADMIN web gui. They are not intended for production
+				use.
+				
+				They are setup to drop and create the tables and then load an initial set of data into the database
+				every time the application is deployed. So if you add anything to the dictionaries or PIP
+				configuration, they will get lost upon each deployment. It uses an H2 database engine configured
+				for a local file so you don't have to setup you're own SQL database environment to start.
+				
+				Instead of modifying this file directly, please refer to the xacml.admin.properties file for
+				customizing the application settings.
+				
+			 -->
+	<!--     <property name="javax.persistence.schema-generation.database.action" value="drop-and-create"/>
+			<property name="javax.persistence.schema-generation.create-source" value="metadata-then-script"/>
+			<property name="javax.persistence.schema-generation.create-script-source" value="META-INF/views.sql" />
+			<property name="javax.persistence.schema-generation.drop-source" value="script"/>
+			<property name="javax.persistence.schema-generation.drop-script-source" value="META-INF/drop.sql" />
+			<property name="javax.persistence.sql-load-script-source" value="META-INF/data.sql" />-->
+			
+			
+			
+		<!-- 	These properties should be set in the xacml.admin.properties file, so they can be re-used by non-JPA
+			database functionality.	 -->
+		<!-- 	
+			<property name="javax.persistence.jdbc.driver" value="org.h2.Driver"/>
+			<property name="javax.persistence.jdbc.url" value="jdbc:h2:file:sql/xacml"/>
+			<property name="javax.persistence.jdbc.user" value="sa"/>
+			<property name="javax.persistence.jdbc.password" value=""/>
+ 			-->
+		</properties>
+	</persistence-unit>
+
+<persistence-unit name="auditPapPU">
+		<!-- This is the persistence unit used by IntegrityAudit to determine
+		which classes to audit.  All the PAP classes are also included in 
+		XACML-PAP-ADMIN, so they will be audited there rather than having a
+		duplicate audit run from the XACL-PAP-REST node -->
+		<!-- unique to PolicyEngineUtils - will be audited from PAP -->
+		<class>org.onap.policy.jpa.BackUpMonitorEntity</class>
+		<!-- unique to integrity-monitor - will be audited from PAP -->
+		<class>org.onap.policy.common.im.jpa.StateManagementEntity</class>
+		<class>org.onap.policy.common.im.jpa.ForwardProgressEntity</class>
+		<class>org.onap.policy.common.im.jpa.ResourceRegistrationEntity</class>
+		<!-- unique to integrity-audit - will be audited from PAP -->
+		<class>org.onap.policy.common.ia.jpa.IntegrityAuditEntity</class>
+		<exclude-unlisted-classes>true</exclude-unlisted-classes>
+		<shared-cache-mode>NONE</shared-cache-mode>
+	</persistence-unit>
+
+	<persistence-unit name="testPapPU" transaction-type="RESOURCE_LOCAL">
+	<!-- This tests all the classes that will be audited in the XACML-PAP-REST and the XACML-PAP_ADMIN -->
+		<!-- XACML-PAP-REST -->
+        <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
+		<class>org.onap.policy.rest.jpa.PolicyEntity</class>
+		<class>org.onap.policy.rest.jpa.ConfigurationDataEntity</class>		
+		<class>org.onap.policy.rest.jpa.PolicyDBDaoEntity</class>
+		<class>org.onap.policy.rest.jpa.GroupEntity</class>
+		<class>org.onap.policy.rest.jpa.PdpEntity</class>
+		<class>org.onap.policy.rest.jpa.ActionBodyEntity</class>
+		<class>org.onap.policy.rest.jpa.DatabaseLockEntity</class>
+		<class>org.onap.policy.rest.jpa.PolicyVersion</class>
+		<class>org.onap.policy.rest.jpa.PolicyScore</class>
+		<class>org.onap.policy.rest.jpa.FunctionDefinition</class>
+		<class>org.onap.policy.rest.jpa.Attribute</class>
+		<class>org.onap.policy.rest.jpa.Category</class>
+		<class>org.onap.policy.rest.jpa.ConstraintType</class>
+		<class>org.onap.policy.rest.jpa.ConstraintValue</class>
+		<class>org.onap.policy.rest.jpa.Datatype</class>
+		<class>org.onap.policy.rest.jpa.FunctionArgument</class>
+		<class>org.onap.policy.rest.jpa.UserInfo</class>
+		<class>org.onap.policy.rest.jpa.ActionPolicyDict</class>
+		<class>org.onap.policy.rest.jpa.DecisionSettings</class>
+		<class>org.onap.policy.rest.jpa.MicroServiceModels</class>
+		<!-- unique to XACML-PAP-ADMIN -->
+		<class>org.onap.policy.rest.jpa.ActionList</class>
+		<class>org.onap.policy.rest.jpa.AddressGroup</class>
+		<class>org.onap.policy.rest.jpa.AttributeAssignment</class>
+		<class>org.onap.policy.rest.jpa.BRMSParamTemplate</class>
+		<class>org.onap.policy.rest.jpa.ClosedLoopD2Services</class>
+		<class>org.onap.policy.rest.jpa.ClosedLoopSite</class>
+		<class>org.onap.policy.rest.jpa.DCAEUsers</class>
+		<class>org.onap.policy.rest.jpa.DCAEuuid</class>
+		<class>org.onap.policy.rest.jpa.DescriptiveScope</class>
+		<class>org.onap.policy.rest.jpa.OnapName</class>
+		<class>org.onap.policy.rest.jpa.EnforcingType</class>
+		<class>org.onap.policy.rest.jpa.GlobalRoleSettings</class>
+		<class>org.onap.policy.rest.jpa.GroupPolicyScopeList</class>
+		<class>org.onap.policy.rest.jpa.GroupServiceList</class>
+		<class>org.onap.policy.rest.jpa.MicroServiceConfigName</class>
+		<class>org.onap.policy.rest.jpa.MicroServiceLocation</class>
+		<class>org.onap.policy.rest.jpa.Obadvice</class>
+		<class>org.onap.policy.rest.jpa.ObadviceExpression</class>
+		<class>org.onap.policy.rest.jpa.PEPOptions</class>
+		<class>org.onap.policy.rest.jpa.PIPConfigParam</class>
+		<class>org.onap.policy.rest.jpa.PIPConfiguration</class>
+		<class>org.onap.policy.rest.jpa.PIPResolver</class>
+		<class>org.onap.policy.rest.jpa.PIPResolverParam</class>
+		<class>org.onap.policy.rest.jpa.PIPType</class>	
+		<class>org.onap.policy.rest.jpa.PolicyAlgorithms</class>
+		<class>org.onap.policy.rest.jpa.PolicyManagement</class>
+		<class>org.onap.policy.rest.jpa.PolicyScopeService</class>
+		<class>org.onap.policy.rest.jpa.PolicyScopeType</class>
+		<class>org.onap.policy.rest.jpa.PolicyScopeResource</class>
+		<class>org.onap.policy.rest.jpa.PolicyScopeClosedLoop</class>
+		<class>org.onap.policy.rest.jpa.PortList</class>
+		<class>org.onap.policy.rest.jpa.PREFIXLIST</class>
+		<class>org.onap.policy.rest.jpa.ProtocolList</class>
+		<class>org.onap.policy.rest.jpa.RemoteCatalogValues</class>
+		<class>org.onap.policy.rest.jpa.PolicyRoles</class>
+		<class>org.onap.policy.rest.jpa.RuleAlgorithms</class>
+		<class>org.onap.policy.rest.jpa.SecurityZone</class>
+		<class>org.onap.policy.rest.jpa.ServiceList</class>
+		<class>org.onap.policy.rest.jpa.SystemLogDB</class>
+		<class>org.onap.policy.rest.jpa.TermList</class>
+		<class>org.onap.policy.rest.jpa.VarbindDictionary</class>
+		<class>org.onap.policy.rest.jpa.VMType</class>
+		<class>org.onap.policy.rest.jpa.VNFType</class>
+		<class>org.onap.policy.rest.jpa.VSCLAction</class>
+		<class>org.onap.policy.rest.jpa.Zone</class>
+		<!-- unique to PolicyEngineUtils -->
+		<class>org.onap.policy.jpa.BackUpMonitorEntity</class>
+		<!-- unique to integrity-monitor -->
+		<class>org.onap.policy.common.im.jpa.StateManagementEntity</class>
+		<class>org.onap.policy.common.im.jpa.ForwardProgressEntity</class>
+		<class>org.onap.policy.common.im.jpa.ResourceRegistrationEntity</class>
+		<!-- unique to integrity-audit -->
+		<class>org.onap.policy.common.ia.jpa.IntegrityAuditEntity</class>
+		
+		<exclude-unlisted-classes>false</exclude-unlisted-classes>
+		<shared-cache-mode>NONE</shared-cache-mode>	        
+        <properties>
+            <property name="javax.persistence.jdbc.driver" value="org.h2.Driver"/>
+            <property name="javax.persistence.jdbc.url" value="jdbc:h2:file:./sql/xacmlTest"/> <!-- ;MODE=MySQL"/> -->
+            <property name="javax.persistence.jdbc.user" value="sa"/>
+            <property name="javax.persistence.jdbc.password" value=""/>
+            <property name="javax.persistence.schema-generation.scripts.action" value="drop-and-create"/>
+            <property name="javax.persistence.schema-generation.scripts.create-target" value="./src/main/resources/META-INF/generatedCreate.ddl"/>
+            <property name="javax.persistence.schema-generation.scripts.drop-target" value="./src/main/resources/META-INF/generatedDrop.ddl"/>
+            <property name="javax.persistence.schema-generation.database.action" value="drop-and-create"/>
+			<property name="javax.persistence.schema-generation.create-source" value="metadata-then-script"/>
+			<property name="javax.persistence.schema-generation.drop-source" value="script"/>
+			<property name="javax.persistence.schema-generation.drop-script-source" value="META-INF/drop.ddl" />
+        </properties>
+    </persistence-unit>	
+</persistence>
diff --git a/ECOMP-PAP-REST/src/main/resources/log4j.properties b/ONAP-PAP-REST/src/main/resources/log4j.properties
index 80f85e945..04f3233c1 100644
--- a/ECOMP-PAP-REST/src/main/resources/log4j.properties
+++ b/ONAP-PAP-REST/src/main/resources/log4j.properties
@@ -1,6 +1,6 @@
 ###
 # ============LICENSE_START=======================================================
-# ECOMP-PAP-REST
+# ONAP-PAP-REST
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
diff --git a/ECOMP-PDP-REST/src/main/resources/logback.xml b/ONAP-PAP-REST/src/main/resources/logback.xml
index df4d33f32..28dc956f3 100644
--- a/ECOMP-PDP-REST/src/main/resources/logback.xml
+++ b/ONAP-PAP-REST/src/main/resources/logback.xml
@@ -1,6 +1,6 @@
 <!--
   ============LICENSE_START=======================================================
-  ECOMP-PDP-REST
+  ONAP-PAP-REST
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
   ================================================================================
@@ -27,9 +27,9 @@
   <property name="debugDir" value="logs" />
   
   <!--  specify the component name 
-    <ECOMP-component-name>::= "MSO" | "DCAE" | "ASDC " | "AAI" |"Policy" | "SDNC" | "AC"  -->
+    <ONAP-component-name>::= "MSO" | "DCAE" | "ASDC " | "AAI" |"Policy" | "SDNC" | "AC"  -->
   <property name="componentName" value="Policy"></property>
-  <property name="subComponentName" value="ECOMP-PDP-REST"></property>
+  <property name="subComponentName" value="ONAP-PAP-REST"></property>
   
   <!--  log file names -->
   <property name="errorLogName" value="error" />
@@ -53,6 +53,7 @@
    -->
    <property name="defaultMetricPattern" value="%X{MetricBeginTimestamp}|%X{MetricEndTimestamp}|%X{requestId}|%X{serviceInstanceId}|%t|%X{serverName}|%X{serviceName}|%X{partnerName}|%X{targetEntity}|%X{targetServiceName}|%X{statusCode}|%X{ResponseCode}|%X{ResponseDescription}|%X{InstanceUUID}|%p|%X{severity}|%X{serverIpAddress}|%X{MetricElapsedTime}|%X{server}|%X{clientIpAddress}|%c||%X{ProcessKey}|%X{TargetVirtualEntity}|%X{CustomField1}|%X{CustomField2}|%X{CustomField3}|%X{CustomField4}|%msg%n" />
   
+  
      
    
    <!--   E R R O R
diff --git a/ECOMP-PAP-REST/src/main/resources/spring.xml b/ONAP-PAP-REST/src/main/resources/spring.xml
index 20414fabe..ced7ac130 100644
--- a/ECOMP-PAP-REST/src/main/resources/spring.xml
+++ b/ONAP-PAP-REST/src/main/resources/spring.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   ============LICENSE_START=======================================================
-  ECOMP-PAP-REST
+  ONAP-PAP-REST
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
   ================================================================================
@@ -28,7 +28,7 @@
         http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.0.xsd">
 
 	<context:annotation-config />
-	<context:component-scan base-package="org.openecomp" />
+	<context:component-scan base-package="org.onap" />
 	<!-- Hibernate 4 SessionFactory Bean definition -->
 	<bean id="hibernate4AnnotatedSessionFactory"
 		class="org.springframework.orm.hibernate4.LocalSessionFactoryBean">
diff --git a/ECOMP-PAP-REST/src/test/java/org/openecomp/policy/pap/ia/DbAuditCompareEntriesTest.java b/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/ia/DbAuditCompareEntriesTest.java
index 2fef9a7cb..6c91411c3 100644
--- a/ECOMP-PAP-REST/src/test/java/org/openecomp/policy/pap/ia/DbAuditCompareEntriesTest.java
+++ b/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/ia/DbAuditCompareEntriesTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PAP-REST
+ * ONAP-PAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pap.ia;
+package org.onap.policy.pap.ia;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -39,14 +39,14 @@ import org.apache.commons.logging.LogFactory;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.openecomp.policy.common.ia.DbAudit;
-import org.openecomp.policy.common.ia.DbDAO;
-import org.openecomp.policy.common.ia.IntegrityAuditProperties;
-import org.openecomp.policy.common.ia.jpa.IntegrityAuditEntity;
-import org.openecomp.policy.common.im.jpa.ForwardProgressEntity;
-import org.openecomp.policy.common.im.jpa.ResourceRegistrationEntity;
-import org.openecomp.policy.common.im.jpa.StateManagementEntity;
-import org.openecomp.policy.jpa.BackUpMonitorEntity;
+import org.onap.policy.common.ia.DbAudit;
+import org.onap.policy.common.ia.DbDAO;
+import org.onap.policy.common.ia.IntegrityAuditProperties;
+import org.onap.policy.common.ia.jpa.IntegrityAuditEntity;
+import org.onap.policy.common.im.jpa.ForwardProgressEntity;
+import org.onap.policy.common.im.jpa.ResourceRegistrationEntity;
+import org.onap.policy.common.im.jpa.StateManagementEntity;
+import org.onap.policy.jpa.BackUpMonitorEntity;
 
 public class DbAuditCompareEntriesTest {
 
@@ -149,7 +149,7 @@ public class DbAuditCompareEntriesTest {
 		//There is only one entry IntegrityAuditEntity, but we will check anyway
 		HashSet<String> classNameSet = dbDAO.getPersistenceClassNames();
 		for(String c : classNameSet){
-			if (c.equals("org.openecomp.policy.common.ia.jpa.IntegrityAuditEntity")){
+			if (c.equals("org.onap.policy.common.ia.jpa.IntegrityAuditEntity")){
 				className = c;
 			}
 		}
diff --git a/ECOMP-PAP-REST/src/test/java/org/openecomp/policy/pap/xacml/rest/components/PolicyDBDaoTest.java b/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/components/PolicyDBDaoTest.java
index 9d7fae209..01e4a9b61 100644
--- a/ECOMP-PAP-REST/src/test/java/org/openecomp/policy/pap/xacml/rest/components/PolicyDBDaoTest.java
+++ b/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/components/PolicyDBDaoTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PAP-REST
+ * ONAP-PAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pap.xacml.rest.components;
+package org.onap.policy.pap.xacml.rest.components;
 
 import java.io.File;
 import java.io.IOException;
@@ -41,17 +41,17 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.pap.xacml.rest.components.PolicyDBDao.PolicyDBDaoTestClass;
-import org.openecomp.policy.rest.XACMLRestProperties;
-import org.openecomp.policy.rest.adapter.PolicyRestAdapter;
-import org.openecomp.policy.rest.jpa.GroupEntity;
-import org.openecomp.policy.rest.jpa.PdpEntity;
-import org.openecomp.policy.rest.jpa.PolicyEntity;
-import org.openecomp.policy.xacml.api.pap.EcompPDPGroup;
-import org.openecomp.policy.xacml.std.pap.StdPDPGroup;
-import org.openecomp.policy.xacml.util.XACMLPolicyWriter;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.pap.xacml.rest.components.PolicyDBDao.PolicyDBDaoTestClass;
+import org.onap.policy.rest.XACMLRestProperties;
+import org.onap.policy.rest.adapter.PolicyRestAdapter;
+import org.onap.policy.rest.jpa.GroupEntity;
+import org.onap.policy.rest.jpa.PdpEntity;
+import org.onap.policy.rest.jpa.PolicyEntity;
+import org.onap.policy.xacml.api.pap.OnapPDPGroup;
+import org.onap.policy.xacml.std.pap.StdPDPGroup;
+import org.onap.policy.xacml.util.XACMLPolicyWriter;
 
 import com.att.research.xacml.api.pap.PAPException;
 import com.att.research.xacml.util.XACMLProperties;
@@ -125,17 +125,17 @@ public class PolicyDBDaoTest {
 	@Test
 	public void computeScopeTest(){
 		Assert.assertEquals("com",d.computeScope("C:\\Users\\testuser\\admin\\repo\\com\\", "C:\\Users\\testuser\\admin\\repo"));
-		Assert.assertEquals("org.openecomp.policy",d.computeScope("/Users/testuser/admin/repo/org/openecomp/policy", "/Users/testuser/admin/repo"));
+		Assert.assertEquals("org.onap.policy",d.computeScope("/Users/testuser/admin/repo/org.onap.policy", "/Users/testuser/admin/repo"));
 	}
 	@Test
 	public void getConfigFileTest(){
 		PolicyRestAdapter pra = new PolicyRestAdapter();
 		pra.setConfigType(ConfigPolicy.JSON_CONFIG);
-		String configFile = d.getConfigFile("Config_mypolicy.xml", "org.openecomp", pra);
-		Assert.assertEquals("org.openecomp.Config_mypolicy.json", configFile);
+		String configFile = d.getConfigFile("Config_mypolicy.xml", "org.onap", pra);
+		Assert.assertEquals("org.onap.Config_mypolicy.json", configFile);
 		//yes, we can do action files too even though they don't have configs
-		configFile = d.getConfigFile("Action_mypolicy.xml", "org.openecomp", pra);
-		Assert.assertEquals("org.openecomp.Action_mypolicy.json", configFile);
+		configFile = d.getConfigFile("Action_mypolicy.xml", "org.onap", pra);
+		Assert.assertEquals("org.onap.Action_mypolicy.json", configFile);
 	}
 	
 	@Ignore
@@ -152,7 +152,7 @@ public class PolicyDBDaoTest {
 		policyObject.policyAdapter.setPolicyName("testpolicy1");
 		policyObject.policyAdapter.setConfigType(ConfigPolicy.OTHER_CONFIG);
 		policyObject.policyAdapter.setPolicyType("Config");
-		policyObject.policyAdapter.setDomainDir("org.openecomp");
+		policyObject.policyAdapter.setDomainDir("org.onap");
 		PolicyType policyTypeObject = new PolicyType();
 		policyObject.policyAdapter.setPolicyData(policyTypeObject);
 		PolicyDBDaoTransaction transaction = dbd.getNewTransaction();
@@ -166,7 +166,7 @@ public class PolicyDBDaoTest {
 		
 		EntityManager getData = emf.createEntityManager();
 		Query getDataQuery = getData.createQuery("SELECT p FROM PolicyEntity p WHERE p.scope=:scope AND p.policyName=:name");
-		getDataQuery.setParameter("scope", "org.openecomp");
+		getDataQuery.setParameter("scope", "org.onap");
 		getDataQuery.setParameter("name","Config_testpolicy1.xml");
 		PolicyEntity result = null;
 		try{
@@ -184,7 +184,7 @@ public class PolicyDBDaoTest {
 		Assert.assertEquals(expectedData, result.getPolicyData());
 		getData.close();
 		result = null;
-		File policyFile = new File(workspaceDir+"/org/openecomp/Config_testpolicy1.xml");
+		File policyFile = new File(workspaceDir+"/org/onap/Config_testpolicy1.xml");
 		try{
 			transaction = dbd.getNewTransaction();
 			transaction.deletePolicy(policyFile.getAbsolutePath());
@@ -241,7 +241,7 @@ public class PolicyDBDaoTest {
 		Assert.assertEquals("this is a test group", groupEntity.getDescription());
 		group = dbd.getNewTransaction();
 		try{
-			EcompPDPGroup groupToDelete = new StdPDPGroup(PolicyDBDao.createNewPDPGroupId(groupName),Paths.get("/"));			
+			OnapPDPGroup groupToDelete = new StdPDPGroup(PolicyDBDao.createNewPDPGroupId(groupName),Paths.get("/"));			
 			group.deleteGroup(groupToDelete, null,"testuser");
 			group.commitTransaction();
 		} catch(Exception e){
@@ -360,8 +360,8 @@ public class PolicyDBDaoTest {
 		
 		group = dbd.getNewTransaction();
 		try{
-			EcompPDPGroup groupToDelete = new StdPDPGroup(PolicyDBDao.createNewPDPGroupId("testgroup1"),Paths.get("/"));
-			EcompPDPGroup groupToMoveTo = new StdPDPGroup(PolicyDBDao.createNewPDPGroupId("testgroup2"),Paths.get("/"));	
+			OnapPDPGroup groupToDelete = new StdPDPGroup(PolicyDBDao.createNewPDPGroupId("testgroup1"),Paths.get("/"));
+			OnapPDPGroup groupToMoveTo = new StdPDPGroup(PolicyDBDao.createNewPDPGroupId("testgroup2"),Paths.get("/"));	
 			group.deleteGroup(groupToDelete, groupToMoveTo,"testuser");
 			group.commitTransaction();
 		} catch(Exception e){
@@ -391,8 +391,8 @@ public class PolicyDBDaoTest {
 		
 		group = dbd.getNewTransaction();
 		try{
-			EcompPDPGroup groupToDelete = new StdPDPGroup(PolicyDBDao.createNewPDPGroupId("testgroup2"),Paths.get("/"));
-			EcompPDPGroup groupToMoveTo = null;	
+			OnapPDPGroup groupToDelete = new StdPDPGroup(PolicyDBDao.createNewPDPGroupId("testgroup2"),Paths.get("/"));
+			OnapPDPGroup groupToMoveTo = null;	
 			group.deleteGroup(groupToDelete, groupToMoveTo,"testuser");
 			group.commitTransaction();
 			Assert.fail();
@@ -409,7 +409,7 @@ public class PolicyDBDaoTest {
 		//add policy to group
 		
 		//update group
-		EcompPDPGroup pdpGroup = new StdPDPGroup("testgroup2", false, "newtestgroup2", "this is my new description", Paths.get("/"));
+		OnapPDPGroup pdpGroup = new StdPDPGroup("testgroup2", false, "newtestgroup2", "this is my new description", Paths.get("/"));
 		group = dbd.getNewTransaction();
 		try{
 			group.updateGroup(pdpGroup, "testuser");
diff --git a/ECOMP-PAP-REST/src/test/java/org/openecomp/policy/pap/xacml/rest/controller/DictionaryControllerTest.java b/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/controller/DictionaryControllerTest.java
index 82427e8cb..708794d60 100644
--- a/ECOMP-PAP-REST/src/test/java/org/openecomp/policy/pap/xacml/rest/controller/DictionaryControllerTest.java
+++ b/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/controller/DictionaryControllerTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PAP-REST
+ * ONAP-PAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -19,7 +19,7 @@
  */
 
 
-package org.openecomp.policy.pap.xacml.rest.controller;
+package org.onap.policy.pap.xacml.rest.controller;
 
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.doNothing;
@@ -41,13 +41,13 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.rest.adapter.PolicyRestAdapter;
-import org.openecomp.policy.rest.dao.CommonClassDao;
-import org.openecomp.policy.rest.jpa.Attribute;
-import org.openecomp.policy.rest.jpa.MicroServiceModels;
-import org.openecomp.policy.rest.jpa.PolicyEditorScopes;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.rest.adapter.PolicyRestAdapter;
+import org.onap.policy.rest.dao.CommonClassDao;
+import org.onap.policy.rest.jpa.Attribute;
+import org.onap.policy.rest.jpa.MicroServiceModels;
+import org.onap.policy.rest.jpa.PolicyEditorScopes;
 import org.springframework.mock.web.MockHttpServletResponse;
 
 import com.fasterxml.jackson.databind.DeserializationFeature;
@@ -99,7 +99,7 @@ public class DictionaryControllerTest {
 				+ " \"version\": \"\",\"createdBy\": \"someone\",	\"modifiedBy\": \"someone\",	\"content\": \"\",\"recursive\": false},"
 				+ " \"tempModel\": {\"name\": \"testingdata\",\"subScopename\": \"\"	},"
 				+ " \"policy\": {\"policyType\": \"Config\",\"configPolicyType\": \"Micro Service\",\"policyName\": \"may1501\", "
-				+ "	\"policyDescription\": \"testing input\", \"ecompName\": \"RaviTest\",\"guard\": \"False\",\"riskType\": \"Risk12345\",\"riskLevel\": \"2\","
+				+ "	\"policyDescription\": \"testing input\", \"onapName\": \"RaviTest\",\"guard\": \"False\",\"riskType\": \"Risk12345\",\"riskLevel\": \"2\","
 				+ "	\"priority\": \"6\",\"serviceType\": \"DkatPolicyBody\",\"version\": \"1707.41.02\",\"ruleGridData\": [	[\"fileId\"]],\"ttlDate\": null}}, "
 				+ "	\"policyJSON\": {\"pmTableName\": \"test\",	\"dmdTopic\": \"1\",\"fileId\": \"56\"} }";
 
@@ -171,7 +171,7 @@ public class DictionaryControllerTest {
 					+ " \"version\": \"\",\"createdBy\": \"someone\",	\"modifiedBy\": \"someone\",	\"content\": \"\",\"recursive\": false},"
 					+ " \"tempModel\": {\"name\": \"testingdata\",\"subScopename\": \"\"	},"
 					+ " \"policy\": {\"policyType\": \"Config\",\"configPolicyType\": \"Micro Service\",\"policyName\": \"may1501\", "
-					+ "	\"policyDescription\": \"testing input\", \"ecompName\": \"RaviTest\",\"guard\": \"False\",\"riskType\": \"Risk12345\",\"riskLevel\": \"2\","
+					+ "	\"policyDescription\": \"testing input\", \"onapName\": \"RaviTest\",\"guard\": \"False\",\"riskType\": \"Risk12345\",\"riskLevel\": \"2\","
 					+ "	\"priority\": \"6\",\"serviceType\": \"DkatPolicyBody\",\"version\": \"1707.41.02\",\"ruleGridData\": [	[\"fileId\"]],\"ttlDate\": null}}, "
 					+ "	\"policyJSON\": {\"some\": \"test\",	\"dmdTopic\": \"1\",\"fileId\": \"56\"}, \"userid\":\"smetest\", \"userDataTypeValues\":[\"type-one\"]}";
 			
@@ -202,7 +202,7 @@ public class DictionaryControllerTest {
 					+ " \"version\": \"\",\"createdBy\": \"someone\",	\"modifiedBy\": \"someone\",	\"content\": \"\",\"recursive\": false},"
 					+ " \"tempModel\": {\"name\": \"testingdata\",\"subScopename\": \"\"	},"
 					+ " \"policy\": {\"policyType\": \"Config\",\"configPolicyType\": \"Micro Service\",\"policyName\": \"may1501\", "
-					+ "	\"policyDescription\": \"testing input\", \"ecompName\": \"RaviTest\",\"guard\": \"False\",\"riskType\": \"Risk12345\",\"riskLevel\": \"2\","
+					+ "	\"policyDescription\": \"testing input\", \"onapName\": \"RaviTest\",\"guard\": \"False\",\"riskType\": \"Risk12345\",\"riskLevel\": \"2\","
 					+ "	\"priority\": \"6\",\"serviceType\": \"DkatPolicyBody\",\"version\": \"1707.41.02\",\"ruleGridData\": [	[\"fileId\"]],\"ttlDate\": null}}, "
 					+ "	\"policyJSON\": {\"pmTableName\": \"test\",	\"dmdTopic\": \"1\",\"fileId\": \"56\"} }";
 			BufferedReader br = new BufferedReader(new StringReader(jsonString));
@@ -219,76 +219,76 @@ public class DictionaryControllerTest {
 	}
 
 	@Test
-	public void testGetEcompNameDictionaryByNameEntityData() {
-		logger.info("testGetEcompNameDictionaryByNameEntityData: Entering");
+	public void testGetOnapNameDictionaryByNameEntityData() {
+		logger.info("testGetOnapNameDictionaryByNameEntityData: Entering");
 
 		MockHttpServletResponse response =  new MockHttpServletResponse();
 
-		controller.getEcompNameDictionaryByNameEntityData(request, response);
+		controller.getOnapNameDictionaryByNameEntityData(request, response);
 		
 		try {
-			assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("ecompNameDictionaryDatas"));
+			assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("onapNameDictionaryDatas"));
 			logger.info("response.getContentAsString(): " + response.getContentAsString());
 		} catch (UnsupportedEncodingException e) {
 			fail("Exception: " + e);
 		}
 		
-		logger.info("testGetEcompNameDictionaryByNameEntityData: exit");
+		logger.info("testGetOnapNameDictionaryByNameEntityData: exit");
 	}
 
 	@Test
-	public void testGetEcompNameDictionaryEntityData() {
-		logger.info("testGetEcompNameDictionaryEntityData: Entering");
+	public void testGetOnapNameDictionaryEntityData() {
+		logger.info("testGetOnapNameDictionaryEntityData: Entering");
 
 		MockHttpServletResponse response =  new MockHttpServletResponse();
 
-		controller.getEcompNameDictionaryEntityData(request, response);
+		controller.getOnapNameDictionaryEntityData(request, response);
 		
 		try {
-			assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("ecompNameDictionaryDatas"));
+			assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("onapNameDictionaryDatas"));
 			logger.info("response.getContentAsString(): " + response.getContentAsString());
 		} catch (UnsupportedEncodingException e) {
 			fail("Exception: " + e);
 		}
 		
-		logger.info("testGetEcompNameDictionaryEntityData: exit");
+		logger.info("testGetOnapNameDictionaryEntityData: exit");
 	}
 
 	@Test
-	public void testSaveEcompDictionary() {
+	public void testSaveOnapDictionary() {
 		
-		logger.info("testSaveEcompDictionary: Entering");
+		logger.info("testSaveOnapDictionary: Entering");
 
 		MockHttpServletResponse response =  new MockHttpServletResponse();
 	    request = mock(HttpServletRequest.class);  
         
 		try {
 		    // mock the getReader() call
-			jsonString = "{\"ecompNameDictionaryData\": {\"userDataTypeValues\": [{\"attributeValues\": \"Values1\"}, {\"attributeValues\": \"Values2\"}],	\"datatypeBean\": {\"type\": \"C\"},\"model\": {\"name\": \"testingdata\", "
+			jsonString = "{\"onapNameDictionaryData\": {\"userDataTypeValues\": [{\"attributeValues\": \"Values1\"}, {\"attributeValues\": \"Values2\"}],	\"datatypeBean\": {\"type\": \"C\"},\"model\": {\"name\": \"testingdata\", "
 					+ " \"subScopename\": \"\",\"userDataTypeValues\": [\"user-type\"],\"type\": \"dir\",\"size\": 0,\"date\": \"2017-04-12T21:26:57.000Z\", "
 					+ " \"version\": \"\",\"createdBy\": \"someone\",	\"modifiedBy\": \"someone\",	\"content\": \"\",\"recursive\": false},"
 					+ " \"tempModel\": {\"name\": \"testingdata\",\"subScopename\": \"\"	},"
 					+ " \"policy\": {\"policyType\": \"Config\",\"configPolicyType\": \"Micro Service\",\"policyName\": \"may1501\", "
-					+ "	\"policyDescription\": \"testing input\", \"ecompName\": \"RaviTest\",\"guard\": \"False\",\"riskType\": \"Risk12345\",\"riskLevel\": \"2\","
+					+ "	\"policyDescription\": \"testing input\", \"onapName\": \"RaviTest\",\"guard\": \"False\",\"riskType\": \"Risk12345\",\"riskLevel\": \"2\","
 					+ "	\"priority\": \"6\",\"serviceType\": \"DkatPolicyBody\",\"version\": \"1707.41.02\",\"ruleGridData\": [	[\"fileId\"]],\"ttlDate\": null}}, "
 					+ "	\"policyJSON\": {\"some\": \"test\",	\"dmdTopic\": \"1\",\"fileId\": \"56\"}, \"userid\":\"smetest\", \"userDataTypeValues\":[\"type-one\"]}";
 			
 			BufferedReader br = new BufferedReader(new StringReader(jsonString));
 			when(request.getReader()).thenReturn(br); 		    
-			controller.saveEcompDictionary(request, response);
+			controller.saveOnapDictionary(request, response);
 			logger.info("response.getContentAsString(): " + response.getContentAsString());
-			assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("ecompNameDictionaryDatas"));
+			assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("onapNameDictionaryDatas"));
 
 		} catch (Exception e) {
 			fail("Exception: " + e);
 		}
 		
-		logger.info("testSaveEcompDictionary: exit");		
+		logger.info("testSaveOnapDictionary: exit");		
 	}
 
 	@Test
-	public void testRemoveEcompDictionary() {
-		logger.info("testRemoveEcompDictionary: Entering");
+	public void testRemoveOnapDictionary() {
+		logger.info("testRemoveOnapDictionary: Entering");
 
 		MockHttpServletResponse response =  new MockHttpServletResponse();
 	    request = mock(HttpServletRequest.class);   
@@ -300,20 +300,20 @@ public class DictionaryControllerTest {
 					+ " \"version\": \"\",\"createdBy\": \"someone\",	\"modifiedBy\": \"someone\",	\"content\": \"\",\"recursive\": false},"
 					+ " \"tempModel\": {\"name\": \"testingdata\",\"subScopename\": \"\"	},"
 					+ " \"policy\": {\"policyType\": \"Config\",\"configPolicyType\": \"Micro Service\",\"policyName\": \"may1501\", "
-					+ "	\"policyDescription\": \"testing input\", \"ecompName\": \"RaviTest\",\"guard\": \"False\",\"riskType\": \"Risk12345\",\"riskLevel\": \"2\","
+					+ "	\"policyDescription\": \"testing input\", \"onapName\": \"RaviTest\",\"guard\": \"False\",\"riskType\": \"Risk12345\",\"riskLevel\": \"2\","
 					+ "	\"priority\": \"6\",\"serviceType\": \"DkatPolicyBody\",\"version\": \"1707.41.02\",\"ruleGridData\": [	[\"fileId\"]],\"ttlDate\": null}}, "
 					+ "	\"policyJSON\": {\"pmTableName\": \"test\",	\"dmdTopic\": \"1\",\"fileId\": \"56\"} }";
 			BufferedReader br = new BufferedReader(new StringReader(jsonString));
 			when(request.getReader()).thenReturn(br); 		    
-			controller.removeEcompDictionary(request, response);
+			controller.removeOnapDictionary(request, response);
 			logger.info("response.getContentAsString(): " + response.getContentAsString());
-			assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("ecompNameDictionaryDatas"));
+			assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("onapNameDictionaryDatas"));
 
 		} catch (Exception e) {
 			fail("Exception: " + e);
 		}
 		
-		logger.info("testRemoveEcompDictionary: exit");
+		logger.info("testRemoveOnapDictionary: exit");
 	}
 
 }
diff --git a/ECOMP-PAP-REST/src/test/java/org/openecomp/policy/pap/xacml/rest/controller/MicroServiceDictionaryControllerTest.java b/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/controller/MicroServiceDictionaryControllerTest.java
index c1f2973d3..c66ace11e 100644
--- a/ECOMP-PAP-REST/src/test/java/org/openecomp/policy/pap/xacml/rest/controller/MicroServiceDictionaryControllerTest.java
+++ b/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/controller/MicroServiceDictionaryControllerTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PAP-REST
+ * ONAP-PAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -19,7 +19,7 @@
  */
 
 
-package org.openecomp.policy.pap.xacml.rest.controller;
+package org.onap.policy.pap.xacml.rest.controller;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -40,13 +40,13 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.rest.dao.CommonClassDao;
-import org.openecomp.policy.rest.jpa.DCAEuuid;
-import org.openecomp.policy.rest.jpa.MicroServiceLocation;
-import org.openecomp.policy.rest.jpa.MicroServiceModels;
-import org.openecomp.policy.rest.jpa.UserInfo;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.rest.dao.CommonClassDao;
+import org.onap.policy.rest.jpa.DCAEuuid;
+import org.onap.policy.rest.jpa.MicroServiceLocation;
+import org.onap.policy.rest.jpa.MicroServiceModels;
+import org.onap.policy.rest.jpa.UserInfo;
 import org.springframework.mock.web.MockHttpServletResponse;
 
 /**
@@ -103,7 +103,7 @@ public class MicroServiceDictionaryControllerTest {
 				+ " \"version\": \"\",\"createdBy\": \"someone\",	\"modifiedBy\": \"someone\",	\"content\": \"\",\"recursive\": false},"
 				+ " \"tempModel\": {\"name\": \"testingdata\",\"subScopename\": \"\"	},"
 				+ " \"policy\": {\"policyType\": \"Config\",\"configPolicyType\": \"Micro Service\",\"policyName\": \"may1501\", "
-				+ "	\"policyDescription\": \"testing input\", \"ecompName\": \"RaviTest\",\"guard\": \"False\",\"riskType\": \"Risk12345\",\"riskLevel\": \"2\","
+				+ "	\"policyDescription\": \"testing input\", \"onapName\": \"RaviTest\",\"guard\": \"False\",\"riskType\": \"Risk12345\",\"riskLevel\": \"2\","
 				+ "	\"priority\": \"6\",\"serviceType\": \"DkatPolicyBody\",\"version\": \"1707.41.02\",\"ruleGridData\": [	[\"fileId\"]],\"ttlDate\": null}}, "
 				+ "	\"policyJSON\": {\"pmTableName\": \"test\",	\"dmdTopic\": \"1\",\"fileId\": \"56\"} }";
 
@@ -188,7 +188,7 @@ public class MicroServiceDictionaryControllerTest {
 					+ " \"version\": \"\",\"createdBy\": \"someone\",	\"modifiedBy\": \"someone\",	\"content\": \"\",\"recursive\": false},"
 					+ " \"tempModel\": {\"name\": \"testingdata\",\"subScopename\": \"\"	},"
 					+ " \"policy\": {\"policyType\": \"Config\",\"configPolicyType\": \"Micro Service\",\"policyName\": \"may1501\", "
-					+ "	\"policyDescription\": \"testing input\", \"ecompName\": \"RaviTest\",\"guard\": \"False\",\"riskType\": \"Risk12345\",\"riskLevel\": \"2\","
+					+ "	\"policyDescription\": \"testing input\", \"onapName\": \"RaviTest\",\"guard\": \"False\",\"riskType\": \"Risk12345\",\"riskLevel\": \"2\","
 					+ "	\"priority\": \"6\",\"serviceType\": \"DkatPolicyBody\",\"version\": \"1707.41.02\",\"ruleGridData\": [	[\"fileId\"]],\"ttlDate\": null}}, "
 					+ "	\"policyJSON\": {\"pmTableName\": \"test\",	\"dmdTopic\": \"1\",\"fileId\": \"56\"} }";
 			BufferedReader br = new BufferedReader(new StringReader(jsonString));
@@ -218,7 +218,7 @@ public class MicroServiceDictionaryControllerTest {
 					+ " \"version\": \"\",\"createdBy\": \"someone\",	\"modifiedBy\": \"someone\",	\"content\": \"\",\"recursive\": false},"
 					+ " \"tempModel\": {\"name\": \"testingdata\",\"subScopename\": \"\"	},"
 					+ " \"policy\": {\"policyType\": \"Config\",\"configPolicyType\": \"Micro Service\",\"policyName\": \"may1501\", "
-					+ "	\"policyDescription\": \"testing input\", \"ecompName\": \"RaviTest\",\"guard\": \"False\",\"riskType\": \"Risk12345\",\"riskLevel\": \"2\","
+					+ "	\"policyDescription\": \"testing input\", \"onapName\": \"RaviTest\",\"guard\": \"False\",\"riskType\": \"Risk12345\",\"riskLevel\": \"2\","
 					+ "	\"priority\": \"6\",\"serviceType\": \"DkatPolicyBody\",\"version\": \"1707.41.02\",\"ruleGridData\": [	[\"fileId\"]],\"ttlDate\": null}}, "
 					+ "	\"policyJSON\": {\"pmTableName\": \"test\",	\"dmdTopic\": \"1\",\"fileId\": \"56\"} }";
 			BufferedReader br = new BufferedReader(new StringReader(jsonString));
@@ -284,7 +284,7 @@ public class MicroServiceDictionaryControllerTest {
 					+ " \"version\": \"\",\"createdBy\": \"someone\",	\"modifiedBy\": \"someone\",	\"content\": \"\",\"recursive\": false},"
 					+ " \"tempModel\": {\"name\": \"testingdata\",\"subScopename\": \"\"	},"
 					+ " \"policy\": {\"policyType\": \"Config\",\"configPolicyType\": \"Micro Service\",\"policyName\": \"may1501\", "
-					+ "	\"policyDescription\": \"testing input\", \"ecompName\": \"RaviTest\",\"guard\": \"False\",\"riskType\": \"Risk12345\",\"riskLevel\": \"2\","
+					+ "	\"policyDescription\": \"testing input\", \"onapName\": \"RaviTest\",\"guard\": \"False\",\"riskType\": \"Risk12345\",\"riskLevel\": \"2\","
 					+ "	\"priority\": \"6\",\"serviceType\": \"DkatPolicyBody\",\"version\": \"1707.41.02\",\"ruleGridData\": [	[\"fileId\"]],\"ttlDate\": null}}, "
 					+ "	\"policyJSON\": {\"pmTableName\": \"test\",	\"dmdTopic\": \"1\",\"fileId\": \"56\"} }";
 			BufferedReader br = new BufferedReader(new StringReader(jsonString));
@@ -314,7 +314,7 @@ public class MicroServiceDictionaryControllerTest {
 					+ " \"version\": \"\",\"createdBy\": \"someone\",	\"modifiedBy\": \"someone\",	\"content\": \"\",\"recursive\": false},"
 					+ " \"tempModel\": {\"name\": \"testingdata\",\"subScopename\": \"\"	},"
 					+ " \"policy\": {\"policyType\": \"Config\",\"configPolicyType\": \"Micro Service\",\"policyName\": \"may1501\", "
-					+ "	\"policyDescription\": \"testing input\", \"ecompName\": \"RaviTest\",\"guard\": \"False\",\"riskType\": \"Risk12345\",\"riskLevel\": \"2\","
+					+ "	\"policyDescription\": \"testing input\", \"onapName\": \"RaviTest\",\"guard\": \"False\",\"riskType\": \"Risk12345\",\"riskLevel\": \"2\","
 					+ "	\"priority\": \"6\",\"serviceType\": \"DkatPolicyBody\",\"version\": \"1707.41.02\",\"ruleGridData\": [	[\"fileId\"]],\"ttlDate\": null}}, "
 					+ "	\"policyJSON\": {\"pmTableName\": \"test\",	\"dmdTopic\": \"1\",\"fileId\": \"56\"} }";
 			BufferedReader br = new BufferedReader(new StringReader(jsonString));
@@ -381,7 +381,7 @@ public class MicroServiceDictionaryControllerTest {
 					+ " \"version\": \"\",\"createdBy\": \"someone\",	\"modifiedBy\": \"someone\",	\"content\": \"\",\"recursive\": false},"
 					+ " \"tempModel\": {\"name\": \"testingdata\",\"subScopename\": \"\"	},"
 					+ " \"policy\": {\"policyType\": \"Config\",\"configPolicyType\": \"Micro Service\",\"policyName\": \"may1501\", "
-					+ "	\"policyDescription\": \"testing input\", \"ecompName\": \"RaviTest\",\"guard\": \"False\",\"riskType\": \"Risk12345\",\"riskLevel\": \"2\","
+					+ "	\"policyDescription\": \"testing input\", \"onapName\": \"RaviTest\",\"guard\": \"False\",\"riskType\": \"Risk12345\",\"riskLevel\": \"2\","
 					+ "	\"priority\": \"6\",\"serviceType\": \"DkatPolicyBody\",\"version\": \"1707.41.02\",\"ruleGridData\": [	[\"fileId\"]],\"ttlDate\": null}}, "
 					+ "	\"policyJSON\": {\"pmTableName\": \"test\",	\"dmdTopic\": \"1\",\"fileId\": \"56\"} }";
 			BufferedReader br = new BufferedReader(new StringReader(jsonString));
@@ -411,7 +411,7 @@ public class MicroServiceDictionaryControllerTest {
 					+ " \"version\": \"\",\"createdBy\": \"someone\",	\"modifiedBy\": \"someone\",	\"content\": \"\",\"recursive\": false},"
 					+ " \"tempModel\": {\"name\": \"testingdata\",\"subScopename\": \"\"	},"
 					+ " \"policy\": {\"policyType\": \"Config\",\"configPolicyType\": \"Micro Service\",\"policyName\": \"may1501\", "
-					+ "	\"policyDescription\": \"testing input\", \"ecompName\": \"RaviTest\",\"guard\": \"False\",\"riskType\": \"Risk12345\",\"riskLevel\": \"2\","
+					+ "	\"policyDescription\": \"testing input\", \"onapName\": \"RaviTest\",\"guard\": \"False\",\"riskType\": \"Risk12345\",\"riskLevel\": \"2\","
 					+ "	\"priority\": \"6\",\"serviceType\": \"DkatPolicyBody\",\"version\": \"1707.41.02\",\"ruleGridData\": [	[\"fileId\"]],\"ttlDate\": null}}, "
 					+ "	\"policyJSON\": {\"pmTableName\": \"test\",	\"dmdTopic\": \"1\",\"fileId\": \"56\"} }";
 			BufferedReader br = new BufferedReader(new StringReader(jsonString));
@@ -478,7 +478,7 @@ public class MicroServiceDictionaryControllerTest {
 					+ " \"version\": \"\",\"createdBy\": \"someone\",	\"modifiedBy\": \"someone\",	\"content\": \"\",\"recursive\": false},"
 					+ " \"tempModel\": {\"name\": \"testingdata\",\"subScopename\": \"\"	},"
 					+ " \"policy\": {\"policyType\": \"Config\",\"configPolicyType\": \"Micro Service\",\"policyName\": \"may1501\", "
-					+ "	\"policyDescription\": \"testing input\", \"ecompName\": \"RaviTest\",\"guard\": \"False\",\"riskType\": \"Risk12345\",\"riskLevel\": \"2\","
+					+ "	\"policyDescription\": \"testing input\", \"onapName\": \"RaviTest\",\"guard\": \"False\",\"riskType\": \"Risk12345\",\"riskLevel\": \"2\","
 					+ "	\"priority\": \"6\",\"serviceType\": \"DkatPolicyBody\",\"version\": \"1707.41.02\",\"ruleGridData\": [	[\"fileId\"]],\"ttlDate\": null}}, "
 					+ "	\"policyJSON\": {\"pmTableName\": \"test\",	\"dmdTopic\": \"1\",\"fileId\": \"56\"} }";
 			BufferedReader br = new BufferedReader(new StringReader(jsonString));
@@ -508,7 +508,7 @@ public class MicroServiceDictionaryControllerTest {
 					+ " \"version\": \"\",\"createdBy\": \"someone\",	\"modifiedBy\": \"someone\",	\"content\": \"\",\"recursive\": false},"
 					+ " \"tempModel\": {\"name\": \"testingdata\",\"subScopename\": \"\"	},"
 					+ " \"policy\": {\"policyType\": \"Config\",\"configPolicyType\": \"Micro Service\",\"policyName\": \"may1501\", "
-					+ "	\"policyDescription\": \"testing input\", \"ecompName\": \"RaviTest\",\"guard\": \"False\",\"riskType\": \"Risk12345\",\"riskLevel\": \"2\","
+					+ "	\"policyDescription\": \"testing input\", \"onapName\": \"RaviTest\",\"guard\": \"False\",\"riskType\": \"Risk12345\",\"riskLevel\": \"2\","
 					+ "	\"priority\": \"6\",\"serviceType\": \"DkatPolicyBody\",\"version\": \"1707.41.02\",\"ruleGridData\": [	[\"fileId\"]],\"ttlDate\": null}}, "
 					+ "	\"policyJSON\": {\"pmTableName\": \"test\",	\"dmdTopic\": \"1\",\"fileId\": \"56\"} }";
 			BufferedReader br = new BufferedReader(new StringReader(jsonString));
@@ -673,7 +673,7 @@ public class MicroServiceDictionaryControllerTest {
 					+ " \"version\": \"\",\"createdBy\": \"someone\",	\"modifiedBy\": \"someone\",	\"content\": \"\",\"recursive\": false},"
 					+ " \"tempModel\": {\"name\": \"testingdata\",\"subScopename\": \"\"	},"
 					+ " \"policy\": {\"policyType\": \"Config\",\"configPolicyType\": \"Micro Service\",\"policyName\": \"may1501\", "
-					+ "	\"policyDescription\": \"testing input\", \"ecompName\": \"RaviTest\",\"guard\": \"False\",\"riskType\": \"Risk12345\",\"riskLevel\": \"2\","
+					+ "	\"policyDescription\": \"testing input\", \"onapName\": \"RaviTest\",\"guard\": \"False\",\"riskType\": \"Risk12345\",\"riskLevel\": \"2\","
 					+ "	\"priority\": \"6\",\"serviceType\": \"DkatPolicyBody\",\"version\": \"1707.41.02\",\"ruleGridData\": [	[\"fileId\"]],\"ttlDate\": null}}, "
 					+ "	\"policyJSON\": {\"pmTableName\": \"test\",	\"dmdTopic\": \"1\",\"fileId\": \"56\"} }";
 			
diff --git a/ECOMP-PAP-REST/src/test/java/org/openecomp/policy/pap/xacml/rest/jpa/PolicyEntityTest.java b/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/jpa/PolicyEntityTest.java
index 04ddd66e5..8b4c73abd 100644
--- a/ECOMP-PAP-REST/src/test/java/org/openecomp/policy/pap/xacml/rest/jpa/PolicyEntityTest.java
+++ b/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/jpa/PolicyEntityTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PAP-REST
+ * ONAP-PAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,18 +18,18 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pap.xacml.rest.jpa;
+package org.onap.policy.pap.xacml.rest.jpa;
 
 import static org.junit.Assert.*;
 
 //import org.apache.commons.logging.Log;
 //import org.apache.commons.logging.LogFactory;
 import org.junit.*;
-import org.openecomp.policy.rest.XACMLRestProperties;
-import org.openecomp.policy.rest.jpa.ActionBodyEntity;
-import org.openecomp.policy.rest.jpa.ConfigurationDataEntity;
-import org.openecomp.policy.rest.jpa.PolicyDBDaoEntity;
-import org.openecomp.policy.rest.jpa.PolicyEntity;
+import org.onap.policy.rest.XACMLRestProperties;
+import org.onap.policy.rest.jpa.ActionBodyEntity;
+import org.onap.policy.rest.jpa.ConfigurationDataEntity;
+import org.onap.policy.rest.jpa.PolicyDBDaoEntity;
+import org.onap.policy.rest.jpa.PolicyEntity;
 
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
@@ -39,8 +39,8 @@ import javax.persistence.Query;
 
 import java.util.Date;
 import java.util.List;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger; 
-import org.openecomp.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.common.logging.flexlogger.FlexLogger; 
+import org.onap.policy.common.logging.flexlogger.Logger;
 
 import java.util.Properties;
 
diff --git a/ECOMP-PAP-REST/test.properties b/ONAP-PAP-REST/test.properties
index 251a69e5e..65a9363ee 100644
--- a/ECOMP-PAP-REST/test.properties
+++ b/ONAP-PAP-REST/test.properties
@@ -1,6 +1,6 @@
 ###
 # ============LICENSE_START=======================================================
-# ECOMP-PAP-REST
+# ONAP-PAP-REST
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
diff --git a/ECOMP-PAP-REST/xacml.pap.properties b/ONAP-PAP-REST/xacml.pap.properties
index 0c6edc155..b0fa954a8 100644
--- a/ECOMP-PAP-REST/xacml.pap.properties
+++ b/ONAP-PAP-REST/xacml.pap.properties
@@ -1,6 +1,6 @@
 ###
 # ============LICENSE_START=======================================================
-# ECOMP-PAP-REST
+# ONAP-PAP-REST
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
@@ -23,12 +23,12 @@
 #
 # This is our factory that will create our engine
 #
-xacml.PAP.papEngineFactory=org.openecomp.policy.xacml.std.pap.StdEngineFactory
+xacml.PAP.papEngineFactory=org.onap.policy.xacml.std.pap.StdEngineFactory
 # Dictionary and Policy Implementation Classes Properties
-dictionary.impl.className=org.openecomp.policy.pap.xacml.rest.handler.DictionaryHandlerImpl
-savePolicy.impl.className=org.openecomp.policy.pap.xacml.rest.handler.SavePolicyHandler
-pushPolicy.impl.className=org.openecomp.policy.pap.xacml.rest.handler.PushPolicyHandler
-deletePolicy.impl.className=org.openecomp.policy.pap.xacml.rest.handler.DeleteHandler
+dictionary.impl.className=org.onap.policy.pap.xacml.rest.handler.DictionaryHandlerImpl
+savePolicy.impl.className=org.onap.policy.pap.xacml.rest.handler.SavePolicyHandler
+pushPolicy.impl.className=org.onap.policy.pap.xacml.rest.handler.PushPolicyHandler
+deletePolicy.impl.className=org.onap.policy.pap.xacml.rest.handler.DeleteHandler
 #AutoPush Policy 
 xacml.rest.pap.autopush.file=autopush.properties
 #=====================================================================================#
@@ -90,7 +90,7 @@ xacml.rest.pdp.idfile=test.properties
 #Properties for db access
 #properties for MySql xacml database:  PLEASE DO NOT REMOVE... NEEDED FOR APIs
 javax.persistence.jdbc.driver=com.mysql.jdbc.Driver
-javax.persistence.jdbc.url=jdbc:mysql://localhost:3306/ecomp_sdk?failOverReadOnly=false&autoReconnect=true
+javax.persistence.jdbc.url=jdbc:mysql://localhost:3306/onap_sdk?failOverReadOnly=false&autoReconnect=true
 javax.persistence.jdbc.user=policy_user
 javax.persistence.jdbc.password=policy_user
 
@@ -161,5 +161,5 @@ CLIENT_ID=
 CLIENT_KEY=
 
 #Micro Service Model Properties
-xacml.policy.msEcompName=http://org.openecomp
-xacml.policy.msPolicyName=http://org.openecomp/policy
\ No newline at end of file
+xacml.policy.msOnapName=http://org.onap
+xacml.policy.msPolicyName=http://org.onap.policy
\ No newline at end of file
diff --git a/ECOMP-PAP-REST/xacml.pap.test.properties b/ONAP-PAP-REST/xacml.pap.test.properties
index fbeb5bd81..fe9559591 100644
--- a/ECOMP-PAP-REST/xacml.pap.test.properties
+++ b/ONAP-PAP-REST/xacml.pap.test.properties
@@ -1,6 +1,6 @@
 ###
 # ============LICENSE_START=======================================================
-# ECOMP-PAP-REST
+# ONAP-PAP-REST
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
@@ -23,12 +23,12 @@
 #
 # This is our factory that will create our engine
 #
-xacml.PAP.papEngineFactory=org.openecomp.policy.xacml.std.pap.StdEngineFactory
+xacml.PAP.papEngineFactory=org.onap.policy.xacml.std.pap.StdEngineFactory
 # Dictionary and Policy Implementation Classes Properties
-dictionary.impl.className=org.openecomp.policy.pap.xacml.rest.handler.DictionaryHandlerImpl
-savePolicy.impl.className=org.openecomp.policy.pap.xacml.rest.handler.SavePolicyHandler
-pushPolicy.impl.className=org.openecomp.policy.pap.xacml.rest.handler.PushPolicyHandler
-deletePolicy.impl.className=org.openecomp.policy.pap.xacml.rest.handler.DeleteHandler
+dictionary.impl.className=org.onap.policy.pap.xacml.rest.handler.DictionaryHandlerImpl
+savePolicy.impl.className=org.onap.policy.pap.xacml.rest.handler.SavePolicyHandler
+pushPolicy.impl.className=org.onap.policy.pap.xacml.rest.handler.PushPolicyHandler
+deletePolicy.impl.className=org.onap.policy.pap.xacml.rest.handler.DeleteHandler
 #AutoPush Policy 
 xacml.rest.pap.autopush.file=autopush.properties
 #=====================================================================================#
diff --git a/ECOMP-PDP-REST/.gitignore b/ONAP-PDP-REST/.gitignore
index b49c56399..b49c56399 100644
--- a/ECOMP-PDP-REST/.gitignore
+++ b/ONAP-PDP-REST/.gitignore
diff --git a/ECOMP-PDP-REST/WebContent/META-INF/MANIFEST.MF b/ONAP-PDP-REST/WebContent/META-INF/MANIFEST.MF
index 59499bce4..59499bce4 100644
--- a/ECOMP-PDP-REST/WebContent/META-INF/MANIFEST.MF
+++ b/ONAP-PDP-REST/WebContent/META-INF/MANIFEST.MF
diff --git a/ECOMP-PDP-REST/WebContent/WEB-INF/.gitignore b/ONAP-PDP-REST/WebContent/WEB-INF/.gitignore
index 840e7d312..840e7d312 100644
--- a/ECOMP-PDP-REST/WebContent/WEB-INF/.gitignore
+++ b/ONAP-PDP-REST/WebContent/WEB-INF/.gitignore
diff --git a/ECOMP-PDP-REST/client.properties b/ONAP-PDP-REST/client.properties
index 15319dd41..15319dd41 100644
--- a/ECOMP-PDP-REST/client.properties
+++ b/ONAP-PDP-REST/client.properties
diff --git a/ONAP-PDP-REST/config/policyLogger.properties b/ONAP-PDP-REST/config/policyLogger.properties
new file mode 100644
index 000000000..a04f4eef8
--- /dev/null
+++ b/ONAP-PDP-REST/config/policyLogger.properties
@@ -0,0 +1,44 @@
+###
+# ============LICENSE_START=======================================================
+# ONAP-PDP-REST
+# ================================================================================
+# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+# ================================================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#      http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ============LICENSE_END=========================================================
+###
+
+################################### Set concurrentHashMap and timer info  #######################
+#Timer initial delay and the delay between in milliseconds before task is to be execute.
+timer.delay.time=1000
+#Timer scheduleAtFixedRate period - time in milliseconds between successive task executions.
+check.interval= 30000
+#Longest time an event info can be stored in the concurrentHashMap for logging - in seconds. 
+event.expired.time=86400
+#Size of the concurrentHashMap which stores the event starting time, etc - when its size reaches this limit, the Timer gets executed 
+#to remove all expired records from this concurrentHashMap.
+concurrentHashMap.limit=5000
+#Size of the concurrentHashMap - when its size drops to this point, stop the Timer
+stop.check.point=2500
+################################### Set logging format #############################################
+# set EELF for EELF logging format, set LOG4J for using log4j, set SYSTEMOUT for using system.out.println
+logger.type=EELF
+#################################### Set level for EELF or SYSTEMOUT logging ##################################
+# Set level for debug file. Set DEBUG to enable .info, .warn and .debug; set INFO for enable .info and .warn; set OFF to disable all 
+debugLogger.level=INFO
+# Set level for metrics file. Set OFF to disable; set ON to enable
+metricsLogger.level=ON
+# Set level for error file. Set OFF to disable; set ON to enable
+error.level=ON
+# Set level for audit file. Set OFF to disable; set ON to enable
+audit.level=ON
diff --git a/ECOMP-PDP-REST/config/xacml.pip.properties b/ONAP-PDP-REST/config/xacml.pip.properties
index 2286b5dc1..2286b5dc1 100644
--- a/ECOMP-PDP-REST/config/xacml.pip.properties
+++ b/ONAP-PDP-REST/config/xacml.pip.properties
diff --git a/ECOMP-PDP-REST/config/xacml.policy.properties b/ONAP-PDP-REST/config/xacml.policy.properties
index 5c884ed8b..5c884ed8b 100644
--- a/ECOMP-PDP-REST/config/xacml.policy.properties
+++ b/ONAP-PDP-REST/config/xacml.policy.properties
diff --git a/ONAP-PDP-REST/policyLogger.properties b/ONAP-PDP-REST/policyLogger.properties
new file mode 100644
index 000000000..a04f4eef8
--- /dev/null
+++ b/ONAP-PDP-REST/policyLogger.properties
@@ -0,0 +1,44 @@
+###
+# ============LICENSE_START=======================================================
+# ONAP-PDP-REST
+# ================================================================================
+# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+# ================================================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#      http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ============LICENSE_END=========================================================
+###
+
+################################### Set concurrentHashMap and timer info  #######################
+#Timer initial delay and the delay between in milliseconds before task is to be execute.
+timer.delay.time=1000
+#Timer scheduleAtFixedRate period - time in milliseconds between successive task executions.
+check.interval= 30000
+#Longest time an event info can be stored in the concurrentHashMap for logging - in seconds. 
+event.expired.time=86400
+#Size of the concurrentHashMap which stores the event starting time, etc - when its size reaches this limit, the Timer gets executed 
+#to remove all expired records from this concurrentHashMap.
+concurrentHashMap.limit=5000
+#Size of the concurrentHashMap - when its size drops to this point, stop the Timer
+stop.check.point=2500
+################################### Set logging format #############################################
+# set EELF for EELF logging format, set LOG4J for using log4j, set SYSTEMOUT for using system.out.println
+logger.type=EELF
+#################################### Set level for EELF or SYSTEMOUT logging ##################################
+# Set level for debug file. Set DEBUG to enable .info, .warn and .debug; set INFO for enable .info and .warn; set OFF to disable all 
+debugLogger.level=INFO
+# Set level for metrics file. Set OFF to disable; set ON to enable
+metricsLogger.level=ON
+# Set level for error file. Set OFF to disable; set ON to enable
+error.level=ON
+# Set level for audit file. Set OFF to disable; set ON to enable
+audit.level=ON
diff --git a/ECOMP-PDP-REST/pom.xml b/ONAP-PDP-REST/pom.xml
index 142d81bc9..64c036a65 100644
--- a/ECOMP-PDP-REST/pom.xml
+++ b/ONAP-PDP-REST/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   ============LICENSE_START=======================================================
-  ECOMP Policy Engine
+  ONAP Policy Engine
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
   ================================================================================
@@ -24,14 +24,14 @@
 	<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>ECOMP-PDP-REST</artifactId>
+	<artifactId>ONAP-PDP-REST</artifactId>
 
-	<description>ECOMP PDP REST</description>
+	<description>ONAP PDP REST</description>
 	<properties>
 		<springframework.version>4.3.3.RELEASE</springframework.version>
 	</properties>
@@ -49,8 +49,8 @@
 	</build>
 	<dependencies>
 		<dependency>
-			<groupId>org.openecomp.policy.engine</groupId>
-			<artifactId>ECOMP-PDP</artifactId>
+			<groupId>org.onap.policy.engine</groupId>
+			<artifactId>ONAP-PDP</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
@@ -201,7 +201,7 @@
 			<version>2.5.0</version>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.policy.engine</groupId>
+			<groupId>org.onap.policy.engine</groupId>
 			<artifactId>PolicyEngineAPI</artifactId>
 			<version>${project.version}</version>
 			<exclusions>
diff --git a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/PapUrlResolver.java b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/PapUrlResolver.java
index 924c2b5ff..cee07fd9f 100644
--- a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/PapUrlResolver.java
+++ b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/PapUrlResolver.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP-REST
+ * ONAP-PDP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pdp.rest;
+package org.onap.policy.pdp.rest;
 
 import java.net.URI;
 import java.text.DateFormat;
@@ -28,9 +28,9 @@ import java.util.Date;
 import java.util.NoSuchElementException;
 import java.util.Properties;
 
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.rest.XACMLRestProperties;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.rest.XACMLRestProperties;
 
 import com.att.research.xacml.util.XACMLProperties;
 
diff --git a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/XACMLPdpLoader.java b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/XACMLPdpLoader.java
index 5288d30aa..7526af692 100644
--- a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/XACMLPdpLoader.java
+++ b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/XACMLPdpLoader.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP-REST
+ * ONAP-PDP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pdp.rest;
+package org.onap.policy.pdp.rest;
 
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -39,13 +39,13 @@ import java.util.Properties;
 import java.util.Set;
 
 import org.apache.commons.io.IOUtils;
-import org.openecomp.policy.pdp.rest.notifications.NotificationController;
-import org.openecomp.policy.rest.XACMLRest;
-import org.openecomp.policy.rest.XACMLRestProperties;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.pdp.rest.notifications.NotificationController;
+import org.onap.policy.rest.XACMLRest;
+import org.onap.policy.rest.XACMLRestProperties;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
 
-import org.openecomp.policy.xacml.api.XACMLErrorConstants;
+import org.onap.policy.xacml.api.XACMLErrorConstants;
 import com.att.research.xacml.api.pap.PAPException;
 import com.att.research.xacml.api.pap.PDPStatus;
 import com.att.research.xacml.api.pap.PDPStatus.Status;
@@ -55,9 +55,9 @@ import com.att.research.xacml.api.pip.PIPEngine;
 import com.att.research.xacml.api.pip.PIPException;
 import com.att.research.xacml.api.pip.PIPFinder;
 import com.att.research.xacml.api.pip.PIPFinderFactory;
-import org.openecomp.policy.xacml.std.pap.StdPDPPIPConfig;
-import org.openecomp.policy.xacml.std.pap.StdPDPPolicy;
-import org.openecomp.policy.xacml.std.pap.StdPDPStatus;
+import org.onap.policy.xacml.std.pap.StdPDPPIPConfig;
+import org.onap.policy.xacml.std.pap.StdPDPPolicy;
+import org.onap.policy.xacml.std.pap.StdPDPStatus;
 import com.att.research.xacml.util.FactoryException;
 import com.att.research.xacml.util.XACMLProperties;
 import com.att.research.xacmlatt.pdp.policy.PolicyDef;
diff --git a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/XACMLPdpRegisterThread.java b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/XACMLPdpRegisterThread.java
index 6bc8a6461..14b312f6d 100644
--- a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/XACMLPdpRegisterThread.java
+++ b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/XACMLPdpRegisterThread.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP-REST
+ * ONAP-PDP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -19,7 +19,7 @@
  */
 
 
-package org.openecomp.policy.pdp.rest;
+package org.onap.policy.pdp.rest;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -35,26 +35,26 @@ import java.util.Properties;
 import java.util.UUID;
 
 import org.apache.commons.io.IOUtils;
-import org.openecomp.policy.pdp.rest.XACMLPdpServlet.PutRequest;
-import org.openecomp.policy.rest.XACMLRestProperties;
+import org.onap.policy.pdp.rest.XACMLPdpServlet.PutRequest;
+import org.onap.policy.rest.XACMLRestProperties;
 
-import org.openecomp.policy.xacml.api.XACMLErrorConstants;
+import org.onap.policy.xacml.api.XACMLErrorConstants;
 import com.att.research.xacml.util.XACMLProperties;
 
-import org.openecomp.policy.common.logging.ECOMPLoggingContext;
-import org.openecomp.policy.common.logging.eelf.PolicyLogger;
-import org.openecomp.policy.common.logging.flexlogger.*; 
+import org.onap.policy.common.logging.ONAPLoggingContext;
+import org.onap.policy.common.logging.eelf.PolicyLogger;
+import org.onap.policy.common.logging.flexlogger.*; 
 
 public class XACMLPdpRegisterThread implements Runnable {
 	private static final Logger LOGGER	= FlexLogger.getLogger(XACMLPdpRegisterThread.class);
 	private static final Logger auditLogger = FlexLogger.getLogger("auditLogger");
-	private ECOMPLoggingContext baseLoggingContext = null;
+	private ONAPLoggingContext baseLoggingContext = null;
 	
 
 
 	public volatile boolean isRunning = false;
 	
-	public XACMLPdpRegisterThread(ECOMPLoggingContext baseLoggingContext) {
+	public XACMLPdpRegisterThread(ONAPLoggingContext baseLoggingContext) {
 		this.baseLoggingContext = baseLoggingContext;
 	}
 
@@ -77,7 +77,7 @@ public class XACMLPdpRegisterThread implements Runnable {
 			this.isRunning = true;
 		}
 		// get a new logging context for the thread
-		ECOMPLoggingContext loggingContext = new ECOMPLoggingContext(baseLoggingContext);
+		ONAPLoggingContext loggingContext = new ONAPLoggingContext(baseLoggingContext);
 		loggingContext.setServiceName("PDP:PAP.register");
 		//are we registered with at least one
 		boolean registered = false;
diff --git a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/XACMLPdpServlet.java b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/XACMLPdpServlet.java
index bad8e6638..1e1b94d9b 100644
--- a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/XACMLPdpServlet.java
+++ b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/XACMLPdpServlet.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP-REST
+ * ONAP-PDP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pdp.rest;
+package org.onap.policy.pdp.rest;
 
 import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
@@ -48,22 +48,22 @@ import org.apache.commons.io.IOUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.http.entity.ContentType;
-import org.openecomp.policy.api.PolicyParameters;
-import org.openecomp.policy.common.im.AdministrativeStateException;
-import org.openecomp.policy.common.im.ForwardProgressException;
-import org.openecomp.policy.common.im.IntegrityMonitor;
-import org.openecomp.policy.common.im.IntegrityMonitorProperties;
-import org.openecomp.policy.common.im.StandbyStatusException;
-import org.openecomp.policy.common.logging.ECOMPLoggingContext;
-import org.openecomp.policy.common.logging.ECOMPLoggingUtils;
-import org.openecomp.policy.common.logging.eelf.MessageCodes;
-import org.openecomp.policy.common.logging.eelf.PolicyLogger;
-import org.openecomp.policy.pdp.rest.jmx.PdpRestMonitor;
-import org.openecomp.policy.rest.XACMLRest;
-import org.openecomp.policy.rest.XACMLRestProperties;
-import org.openecomp.policy.xacml.api.XACMLErrorConstants;
-import org.openecomp.policy.xacml.pdp.std.functions.PolicyList;
-import org.openecomp.policy.xacml.std.pap.StdPDPStatus;
+import org.onap.policy.api.PolicyParameters;
+import org.onap.policy.common.im.AdministrativeStateException;
+import org.onap.policy.common.im.ForwardProgressException;
+import org.onap.policy.common.im.IntegrityMonitor;
+import org.onap.policy.common.im.IntegrityMonitorProperties;
+import org.onap.policy.common.im.StandbyStatusException;
+import org.onap.policy.common.logging.ONAPLoggingContext;
+import org.onap.policy.common.logging.ONAPLoggingUtils;
+import org.onap.policy.common.logging.eelf.MessageCodes;
+import org.onap.policy.common.logging.eelf.PolicyLogger;
+import org.onap.policy.pdp.rest.jmx.PdpRestMonitor;
+import org.onap.policy.rest.XACMLRest;
+import org.onap.policy.rest.XACMLRestProperties;
+import org.onap.policy.xacml.api.XACMLErrorConstants;
+import org.onap.policy.xacml.pdp.std.functions.PolicyList;
+import org.onap.policy.xacml.std.pap.StdPDPStatus;
 
 import com.att.research.xacml.api.Request;
 import com.att.research.xacml.api.Response;
@@ -110,7 +110,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 public class XACMLPdpServlet extends HttpServlet implements Runnable {
 	private static final long serialVersionUID = 1L;
 	private static final String DEFAULT_MAX_CONTENT_LENGTH = "999999999"; //32767
-	private static final String CREATE_UPDATE_POLICY_SERVICE = "org.openecomp.policy.pdp.rest.api.services.CreateUpdatePolicyServiceImpl";
+	private static final String CREATE_UPDATE_POLICY_SERVICE = "org.onap.policy.pdp.rest.api.services.CreateUpdatePolicyServiceImpl";
 	//
 	// Our application debug log
 	//
@@ -178,7 +178,7 @@ public class XACMLPdpServlet extends HttpServlet implements Runnable {
 	//
 	private Thread configThread = null;
 	private volatile boolean configThreadTerminate = false;
-	private ECOMPLoggingContext baseLoggingContext = null;
+	private ONAPLoggingContext baseLoggingContext = null;
 	private IntegrityMonitor im;
 	/**
 	 * Default constructor. 
@@ -220,7 +220,7 @@ public class XACMLPdpServlet extends HttpServlet implements Runnable {
 		//
 		// Logging stuff....
 		//
-		baseLoggingContext = new ECOMPLoggingContext();
+		baseLoggingContext = new ONAPLoggingContext();
 		// fixed data that will be the same in all logging output goes here
 		try {
 			String ipaddress = InetAddress.getLocalHost().getHostAddress();
@@ -385,7 +385,7 @@ public class XACMLPdpServlet extends HttpServlet implements Runnable {
 	 */
 	@Override
 	protected void doPut(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-		ECOMPLoggingContext loggingContext = ECOMPLoggingUtils.getLoggingContextForRequest(request, baseLoggingContext);
+		ONAPLoggingContext loggingContext = ONAPLoggingUtils.getLoggingContextForRequest(request, baseLoggingContext);
 		loggingContext.transactionStarted();
 		if ((loggingContext.getRequestID() == null) || "".equals(loggingContext.getRequestID())){
 			UUID requestID = UUID.randomUUID();
@@ -466,7 +466,7 @@ public class XACMLPdpServlet extends HttpServlet implements Runnable {
 		}
 	}
 
-	protected void doPutConfig(String config, HttpServletRequest request, HttpServletResponse response, ECOMPLoggingContext loggingContext)  throws ServletException, IOException {
+	protected void doPutConfig(String config, HttpServletRequest request, HttpServletResponse response, ONAPLoggingContext loggingContext)  throws ServletException, IOException {
 		try {
 			// prevent multiple configuration changes from stacking up
 			if (XACMLPdpServlet.queue.remainingCapacity() <= 0) {
@@ -592,7 +592,7 @@ public class XACMLPdpServlet extends HttpServlet implements Runnable {
 	 */
 	@Override
 	protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-		ECOMPLoggingContext loggingContext = ECOMPLoggingUtils.getLoggingContextForRequest(request, baseLoggingContext);
+		ONAPLoggingContext loggingContext = ONAPLoggingUtils.getLoggingContextForRequest(request, baseLoggingContext);
 		loggingContext.transactionStarted();
 		if ((loggingContext.getRequestID() == null) || (loggingContext.getRequestID() == "")){
 			UUID requestID = UUID.randomUUID();
@@ -687,7 +687,7 @@ public class XACMLPdpServlet extends HttpServlet implements Runnable {
 					if(failedNodeList == null){
 						failedNodeList = "UnknownSubSystem";
 					}
-					response.addHeader("X-ECOMP-SubsystemFailure", failedNodeList);
+					response.addHeader("X-ONAP-SubsystemFailure", failedNodeList);
 					try{
 						response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, message);
 					}catch(Exception e1){
@@ -802,7 +802,7 @@ public class XACMLPdpServlet extends HttpServlet implements Runnable {
 	@Override
 	protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
 
-		ECOMPLoggingContext loggingContext = ECOMPLoggingUtils.getLoggingContextForRequest(request, baseLoggingContext);
+		ONAPLoggingContext loggingContext = ONAPLoggingUtils.getLoggingContextForRequest(request, baseLoggingContext);
 		loggingContext.transactionStarted();
 		loggingContext.setServiceName("PDP.decide");
 		if ((loggingContext.getRequestID() == null) || ("".equals(loggingContext.getRequestID()))){
diff --git a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/api/controller/PolicyEngineServices.java b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/controller/PolicyEngineServices.java
index 48539ad83..2348fd0da 100644
--- a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/api/controller/PolicyEngineServices.java
+++ b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/controller/PolicyEngineServices.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP-REST
+ * ONAP-PDP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.pdp.rest.api.controller;
+package org.onap.policy.pdp.rest.api.controller;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -30,40 +30,40 @@ import java.util.concurrent.atomic.AtomicLong;
 
 import javax.servlet.http.HttpServletRequest;
 
-import org.openecomp.policy.api.ConfigRequestParameters;
-import org.openecomp.policy.api.DecisionRequestParameters;
-import org.openecomp.policy.api.DecisionResponse;
-import org.openecomp.policy.api.DeletePolicyParameters;
-import org.openecomp.policy.api.DictionaryParameters;
-import org.openecomp.policy.api.DictionaryResponse;
-import org.openecomp.policy.api.EventRequestParameters;
-import org.openecomp.policy.api.MetricsResponse;
-import org.openecomp.policy.api.PolicyParameters;
-import org.openecomp.policy.api.PolicyResponse;
-import org.openecomp.policy.api.PushPolicyParameters;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.pdp.rest.XACMLPdpServlet;
-import org.openecomp.policy.pdp.rest.api.models.ConfigFirewallPolicyAPIRequest;
-import org.openecomp.policy.pdp.rest.api.models.ConfigNameRequest;
-import org.openecomp.policy.pdp.rest.api.models.ConfigPolicyAPIRequest;
-import org.openecomp.policy.pdp.rest.api.models.PolicyConfig;
-import org.openecomp.policy.pdp.rest.api.services.CreateUpdateConfigPolicyService;
-import org.openecomp.policy.pdp.rest.api.services.CreateUpdateDictionaryService;
-import org.openecomp.policy.pdp.rest.api.services.CreateUpdateFirewallPolicyService;
-import org.openecomp.policy.pdp.rest.api.services.CreateUpdatePolicyService;
-import org.openecomp.policy.pdp.rest.api.services.DeletePolicyService;
-import org.openecomp.policy.pdp.rest.api.services.GetConfigService;
-import org.openecomp.policy.pdp.rest.api.services.GetDecisionService;
-import org.openecomp.policy.pdp.rest.api.services.GetDictionaryService;
-import org.openecomp.policy.pdp.rest.api.services.GetMetricsService;
-import org.openecomp.policy.pdp.rest.api.services.ListConfigService;
-import org.openecomp.policy.pdp.rest.api.services.NotificationService;
-import org.openecomp.policy.pdp.rest.api.services.NotificationService.NotificationServiceType;
-import org.openecomp.policy.pdp.rest.api.services.PolicyEngineImportService;
-import org.openecomp.policy.pdp.rest.api.services.PushPolicyService;
-import org.openecomp.policy.pdp.rest.api.services.SendEventService;
-import org.openecomp.policy.pdp.rest.config.PDPApiAuth;
+import org.onap.policy.api.ConfigRequestParameters;
+import org.onap.policy.api.DecisionRequestParameters;
+import org.onap.policy.api.DecisionResponse;
+import org.onap.policy.api.DeletePolicyParameters;
+import org.onap.policy.api.DictionaryParameters;
+import org.onap.policy.api.DictionaryResponse;
+import org.onap.policy.api.EventRequestParameters;
+import org.onap.policy.api.MetricsResponse;
+import org.onap.policy.api.PolicyParameters;
+import org.onap.policy.api.PolicyResponse;
+import org.onap.policy.api.PushPolicyParameters;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.pdp.rest.XACMLPdpServlet;
+import org.onap.policy.pdp.rest.api.models.ConfigFirewallPolicyAPIRequest;
+import org.onap.policy.pdp.rest.api.models.ConfigNameRequest;
+import org.onap.policy.pdp.rest.api.models.ConfigPolicyAPIRequest;
+import org.onap.policy.pdp.rest.api.models.PolicyConfig;
+import org.onap.policy.pdp.rest.api.services.CreateUpdateConfigPolicyService;
+import org.onap.policy.pdp.rest.api.services.CreateUpdateDictionaryService;
+import org.onap.policy.pdp.rest.api.services.CreateUpdateFirewallPolicyService;
+import org.onap.policy.pdp.rest.api.services.CreateUpdatePolicyService;
+import org.onap.policy.pdp.rest.api.services.DeletePolicyService;
+import org.onap.policy.pdp.rest.api.services.GetConfigService;
+import org.onap.policy.pdp.rest.api.services.GetDecisionService;
+import org.onap.policy.pdp.rest.api.services.GetDictionaryService;
+import org.onap.policy.pdp.rest.api.services.GetMetricsService;
+import org.onap.policy.pdp.rest.api.services.ListConfigService;
+import org.onap.policy.pdp.rest.api.services.NotificationService;
+import org.onap.policy.pdp.rest.api.services.NotificationService.NotificationServiceType;
+import org.onap.policy.pdp.rest.api.services.PolicyEngineImportService;
+import org.onap.policy.pdp.rest.api.services.PushPolicyService;
+import org.onap.policy.pdp.rest.api.services.SendEventService;
+import org.onap.policy.pdp.rest.config.PDPApiAuth;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.http.converter.HttpMessageNotReadableException;
diff --git a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/api/models/ConfigFirewallPolicyAPIRequest.java b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/models/ConfigFirewallPolicyAPIRequest.java
index 4ae368ae7..5c9b9efcc 100644
--- a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/api/models/ConfigFirewallPolicyAPIRequest.java
+++ b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/models/ConfigFirewallPolicyAPIRequest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP-REST
+ * ONAP-PDP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.pdp.rest.api.models;
+package org.onap.policy.pdp.rest.api.models;
 
 import io.swagger.annotations.ApiModel;
 
diff --git a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/api/models/ConfigNameRequest.java b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/models/ConfigNameRequest.java
index 91881a3b2..945445991 100644
--- a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/api/models/ConfigNameRequest.java
+++ b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/models/ConfigNameRequest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP-REST
+ * ONAP-PDP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.pdp.rest.api.models;
+package org.onap.policy.pdp.rest.api.models;
 
 import io.swagger.annotations.ApiModel;
 
diff --git a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/api/models/ConfigPolicyAPIRequest.java b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/models/ConfigPolicyAPIRequest.java
index ed5d0ccaf..dd40bfe5f 100644
--- a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/api/models/ConfigPolicyAPIRequest.java
+++ b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/models/ConfigPolicyAPIRequest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP-REST
+ * ONAP-PDP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.pdp.rest.api.models;
+package org.onap.policy.pdp.rest.api.models;
 
 import io.swagger.annotations.ApiModel;
 
@@ -31,7 +31,7 @@ public class ConfigPolicyAPIRequest implements Serializable{
     private String policyScope = null;
     private String policyName = null;
     private String policyDescription = null;
-    private String ecompName = null;
+    private String onapName = null;
     private String configName = null;
     private Map<String,String> configAttributes = null;
     private String configType = null;
@@ -60,10 +60,10 @@ public class ConfigPolicyAPIRequest implements Serializable{
         return policyDescription;
     }
     /**
-     * @return the ecompName
+     * @return the onapName
      */
-    public String getEcompName() {
-        return ecompName;
+    public String getOnapName() {
+        return onapName;
     }
     /**
      * @return the configName
@@ -108,10 +108,10 @@ public class ConfigPolicyAPIRequest implements Serializable{
         this.policyDescription = policyDescription;
     }
     /**
-     * @param ecompName the ecompName to set
+     * @param onapName the onapName to set
      */
-    public void setEcompName(String ecompName) {
-        this.ecompName = ecompName;
+    public void setOnapName(String onapName) {
+        this.onapName = onapName;
     }
     /**
      * @param configName the configName to set
diff --git a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/api/models/PDPResponse.java b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/models/PDPResponse.java
index 2301d003c..c2dbbdef0 100644
--- a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/api/models/PDPResponse.java
+++ b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/models/PDPResponse.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP-REST
+ * ONAP-PDP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,17 +17,17 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.pdp.rest.api.models;
+package org.onap.policy.pdp.rest.api.models;
 
 import java.util.Map;
 
-import org.openecomp.policy.api.DecisionResponse;
-import org.openecomp.policy.api.PolicyConfigStatus;
-import org.openecomp.policy.api.PolicyDecision;
-import org.openecomp.policy.api.PolicyResponse;
-import org.openecomp.policy.api.PolicyResponseStatus;
-import org.openecomp.policy.api.PolicyType;
-import org.openecomp.policy.models.APIConfigResponse;
+import org.onap.policy.api.DecisionResponse;
+import org.onap.policy.api.PolicyConfigStatus;
+import org.onap.policy.api.PolicyDecision;
+import org.onap.policy.api.PolicyResponse;
+import org.onap.policy.api.PolicyResponseStatus;
+import org.onap.policy.api.PolicyType;
+import org.onap.policy.models.APIConfigResponse;
 
 public class PDPResponse implements APIConfigResponse, PolicyResponse, DecisionResponse{
     private String policyConfigMessage;
diff --git a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/api/models/PolicyConfig.java b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/models/PolicyConfig.java
index 729ffbb6f..391ef6c8a 100644
--- a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/api/models/PolicyConfig.java
+++ b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/models/PolicyConfig.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP-REST
+ * ONAP-PDP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,15 +17,15 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.pdp.rest.api.models;
+package org.onap.policy.pdp.rest.api.models;
 
 import io.swagger.annotations.ApiModel;
 
 import java.util.Map;
 
-import org.openecomp.policy.api.PolicyConfigStatus;
-import org.openecomp.policy.api.PolicyType;
-import org.openecomp.policy.models.APIConfigResponse;
+import org.onap.policy.api.PolicyConfigStatus;
+import org.onap.policy.api.PolicyType;
+import org.onap.policy.models.APIConfigResponse;
 
 @ApiModel
 public class PolicyConfig implements APIConfigResponse{
diff --git a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/api/services/ActionPolicyService.java b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/ActionPolicyService.java
index 7640cad0e..66920e0db 100644
--- a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/api/services/ActionPolicyService.java
+++ b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/ActionPolicyService.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP-REST
+ * ONAP-PDP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,17 +17,17 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.pdp.rest.api.services;
+package org.onap.policy.pdp.rest.api.services;
 
 import java.util.Map;
 
-import org.openecomp.policy.api.AttributeType;
-import org.openecomp.policy.api.PolicyException;
-import org.openecomp.policy.api.PolicyParameters;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.xacml.api.XACMLErrorConstants;
-import org.openecomp.policy.xacml.std.pap.StdPAPPolicy;
+import org.onap.policy.api.AttributeType;
+import org.onap.policy.api.PolicyException;
+import org.onap.policy.api.PolicyParameters;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.xacml.api.XACMLErrorConstants;
+import org.onap.policy.xacml.std.pap.StdPAPPolicy;
 
 /**
  * Action Policy Implementation. 
diff --git a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/api/services/BRMSParamPolicyService.java b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/BRMSParamPolicyService.java
index 37d07660d..dd2bd452e 100644
--- a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/api/services/BRMSParamPolicyService.java
+++ b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/BRMSParamPolicyService.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP-REST
+ * ONAP-PDP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,18 +17,18 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.pdp.rest.api.services;
+package org.onap.policy.pdp.rest.api.services;
 
 import java.util.Map;
 
-import org.openecomp.policy.api.AttributeType;
-import org.openecomp.policy.api.PolicyException;
-import org.openecomp.policy.api.PolicyParameters;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.pdp.rest.api.utils.PolicyApiUtils;
-import org.openecomp.policy.xacml.api.XACMLErrorConstants;
-import org.openecomp.policy.xacml.std.pap.StdPAPPolicy;
+import org.onap.policy.api.AttributeType;
+import org.onap.policy.api.PolicyException;
+import org.onap.policy.api.PolicyParameters;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.pdp.rest.api.utils.PolicyApiUtils;
+import org.onap.policy.xacml.api.XACMLErrorConstants;
+import org.onap.policy.xacml.std.pap.StdPAPPolicy;
 
 /**
  * BRMS Param Policy Implementation.  
diff --git a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/api/services/BRMSRawPolicyService.java b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/BRMSRawPolicyService.java
index c68b1695b..ea17529ba 100644
--- a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/api/services/BRMSRawPolicyService.java
+++ b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/BRMSRawPolicyService.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP-REST
+ * ONAP-PDP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,19 +17,19 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.pdp.rest.api.services;
+package org.onap.policy.pdp.rest.api.services;
 
 import java.util.Map;
 
-import org.openecomp.policy.api.AttributeType;
-import org.openecomp.policy.api.PolicyException;
-import org.openecomp.policy.api.PolicyParameters;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.pdp.rest.api.utils.PolicyApiUtils;
-import org.openecomp.policy.utils.PolicyUtils;
-import org.openecomp.policy.xacml.api.XACMLErrorConstants;
-import org.openecomp.policy.xacml.std.pap.StdPAPPolicy;
+import org.onap.policy.api.AttributeType;
+import org.onap.policy.api.PolicyException;
+import org.onap.policy.api.PolicyParameters;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.pdp.rest.api.utils.PolicyApiUtils;
+import org.onap.policy.utils.PolicyUtils;
+import org.onap.policy.xacml.api.XACMLErrorConstants;
+import org.onap.policy.xacml.std.pap.StdPAPPolicy;
 
 /**
  * BRMS RAW Policy Implementation. 
diff --git a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/api/services/ClosedLoopFaultPolicyService.java b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/ClosedLoopFaultPolicyService.java
index b2ff00ed5..5817d7410 100644
--- a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/api/services/ClosedLoopFaultPolicyService.java
+++ b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/ClosedLoopFaultPolicyService.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP-REST
+ * ONAP-PDP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,18 +17,18 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.pdp.rest.api.services;
+package org.onap.policy.pdp.rest.api.services;
 
 import javax.json.JsonException;
 import javax.json.JsonObject;
 
-import org.openecomp.policy.api.PolicyException;
-import org.openecomp.policy.api.PolicyParameters;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.pdp.rest.api.utils.PolicyApiUtils;
-import org.openecomp.policy.xacml.api.XACMLErrorConstants;
-import org.openecomp.policy.xacml.std.pap.StdPAPPolicy;
+import org.onap.policy.api.PolicyException;
+import org.onap.policy.api.PolicyParameters;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.pdp.rest.api.utils.PolicyApiUtils;
+import org.onap.policy.xacml.api.XACMLErrorConstants;
+import org.onap.policy.xacml.std.pap.StdPAPPolicy;
 
 /**
  * Closed Loop Fault Policy Implementation. 
@@ -91,14 +91,14 @@ public class ClosedLoopFaultPolicyService{
 			operation = "create";
 		}
 		// get values and attributes from the JsonObject
-		if(!configBody.containsKey("ecompname")){
-			message = XACMLErrorConstants.ERROR_DATA_ISSUE + "No Ecomp Name given.";
+		if(!configBody.containsKey("onapname")){
+			message = XACMLErrorConstants.ERROR_DATA_ISSUE + "No Onap Name given.";
 			LOGGER.error(message);
 			return message;
 		}
-		String ecompName = configBody.get("ecompname").toString().trim().replace("\"", "");
-		if (ecompName==null||ecompName.trim().isEmpty()){
-			message = XACMLErrorConstants.ERROR_DATA_ISSUE + "No Ecomp Name given.";
+		String onapName = configBody.get("onapname").toString().trim().replace("\"", "");
+		if (onapName==null||onapName.trim().isEmpty()){
+			message = XACMLErrorConstants.ERROR_DATA_ISSUE + "No Onap Name given.";
 			LOGGER.error(message);
 			return message;
 		}
@@ -110,7 +110,7 @@ public class ClosedLoopFaultPolicyService{
 		}
 		String jsonBody = configBody.toString();
 		// Create Policy. 
-		StdPAPPolicy newPAPPolicy = new StdPAPPolicy("ClosedLoop_Fault", policyName, policyParameters.getPolicyDescription(), ecompName, 
+		StdPAPPolicy newPAPPolicy = new StdPAPPolicy("ClosedLoop_Fault", policyName, policyParameters.getPolicyDescription(), onapName, 
 				jsonBody, false, oldPolicyName, null, updateFlag, policyScope, 0, policyParameters.getRiskLevel(),
 				policyParameters.getRiskType(), String.valueOf(policyParameters.getGuard()), date); 
 		//send JSON object to PAP
diff --git a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/api/services/ClosedLoopPMPolicyService.java b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/ClosedLoopPMPolicyService.java
index 3fb8f461c..74c4bd71d 100644
--- a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/api/services/ClosedLoopPMPolicyService.java
+++ b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/ClosedLoopPMPolicyService.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP-REST
+ * ONAP-PDP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,18 +17,18 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.pdp.rest.api.services;
+package org.onap.policy.pdp.rest.api.services;
 
 import javax.json.JsonException;
 import javax.json.JsonObject;
 
-import org.openecomp.policy.api.PolicyException;
-import org.openecomp.policy.api.PolicyParameters;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.pdp.rest.api.utils.PolicyApiUtils;
-import org.openecomp.policy.xacml.api.XACMLErrorConstants;
-import org.openecomp.policy.xacml.std.pap.StdPAPPolicy;
+import org.onap.policy.api.PolicyException;
+import org.onap.policy.api.PolicyParameters;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.pdp.rest.api.utils.PolicyApiUtils;
+import org.onap.policy.xacml.api.XACMLErrorConstants;
+import org.onap.policy.xacml.std.pap.StdPAPPolicy;
 
 /**
  * Closed Loop PM policy Implementation. 
@@ -87,8 +87,8 @@ public class ClosedLoopPMPolicyService{
 			operation = "create";
 		}
 		// get values and attributes from the JsonObject
-		if(!configBody.containsKey("ecompname")){
-			message = XACMLErrorConstants.ERROR_DATA_ISSUE + "No Ecomp Name given.";
+		if(!configBody.containsKey("onapname")){
+			message = XACMLErrorConstants.ERROR_DATA_ISSUE + "No Onap Name given.";
 			LOGGER.error(message);
 			return message;
 		}
@@ -97,9 +97,9 @@ public class ClosedLoopPMPolicyService{
 			LOGGER.error(message);
 			return message;
 		}
-		String ecompName = configBody.get("ecompname").toString().trim().replace("\"", "");
-		if (ecompName==null||ecompName.trim().isEmpty()){
-			message = XACMLErrorConstants.ERROR_DATA_ISSUE + "No Ecomp Name given.";
+		String onapName = configBody.get("onapname").toString().trim().replace("\"", "");
+		if (onapName==null||onapName.trim().isEmpty()){
+			message = XACMLErrorConstants.ERROR_DATA_ISSUE + "No Onap Name given.";
 			LOGGER.error(message);
 			return message;
 		}
@@ -112,7 +112,7 @@ public class ClosedLoopPMPolicyService{
 		String jsonBody = configBody.toString();
 		String serviceType = configBody.get("serviceTypePolicyName").toString().replace("\"", "");
 		// Create Policy. 
-		StdPAPPolicy newPAPPolicy = new StdPAPPolicy("ClosedLoop_PM", policyName, policyParameters.getPolicyDescription(), ecompName, 
+		StdPAPPolicy newPAPPolicy = new StdPAPPolicy("ClosedLoop_PM", policyName, policyParameters.getPolicyDescription(), onapName, 
 				jsonBody, false, null, serviceType, updateFlag, policyScope, 0, policyParameters.getRiskLevel(),
 				policyParameters.getRiskType(), String.valueOf(policyParameters.getGuard()), date); 
 		//send JSON object to PAP
diff --git a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/api/services/ConfigPolicyService.java b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/ConfigPolicyService.java
index 3401d55b9..c8d3d74d1 100644
--- a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/api/services/ConfigPolicyService.java
+++ b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/ConfigPolicyService.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP-REST
+ * ONAP-PDP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,19 +17,19 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.pdp.rest.api.services;
+package org.onap.policy.pdp.rest.api.services;
 
 import java.util.Map;
 
-import org.openecomp.policy.api.AttributeType;
-import org.openecomp.policy.api.PolicyException;
-import org.openecomp.policy.api.PolicyParameters;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.pdp.rest.api.utils.PolicyApiUtils;
-import org.openecomp.policy.utils.PolicyUtils;
-import org.openecomp.policy.xacml.api.XACMLErrorConstants;
-import org.openecomp.policy.xacml.std.pap.StdPAPPolicy;
+import org.onap.policy.api.AttributeType;
+import org.onap.policy.api.PolicyException;
+import org.onap.policy.api.PolicyParameters;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.pdp.rest.api.utils.PolicyApiUtils;
+import org.onap.policy.utils.PolicyUtils;
+import org.onap.policy.xacml.api.XACMLErrorConstants;
+import org.onap.policy.xacml.std.pap.StdPAPPolicy;
 
 /**
  * Config Base Policy Implementation. 
@@ -45,7 +45,7 @@ public class ConfigPolicyService {
 	private String policyName = null;
 	private String policyScope = null;
 	private String date = null;
-	private String ecompName = null;
+	private String onapName = null;
 	private String configName = null;
 	
 	public ConfigPolicyService(String policyName, String policyScope,
@@ -72,17 +72,17 @@ public class ConfigPolicyService {
 			message = XACMLErrorConstants.ERROR_DATA_ISSUE + "Incorrect Risk Level given.";
 			return false;
 		}
-		ecompName = policyParameters.getEcompName();
+		onapName = policyParameters.getOnapName();
 		configName = policyParameters.getConfigName();
-		if(ecompName==null || ecompName.trim().isEmpty()){
-			message = XACMLErrorConstants.ERROR_DATA_ISSUE + "No ECOMP Name given.";
+		if(onapName==null || onapName.trim().isEmpty()){
+			message = XACMLErrorConstants.ERROR_DATA_ISSUE + "No ONAP Name given.";
 			return false;
 		}
 		if(configName==null || configName.trim().isEmpty()){
 			message = XACMLErrorConstants.ERROR_DATA_ISSUE + "No Config Name given.";
 			return false;
 		}
-		message = PolicyUtils.emptyPolicyValidator(ecompName);
+		message = PolicyUtils.emptyPolicyValidator(onapName);
         if(!message.contains("success")){
             message = XACMLErrorConstants.ERROR_DATA_ISSUE+ message;
             return false;
@@ -125,7 +125,7 @@ public class ConfigPolicyService {
 			configAttributes = policyParameters.getAttributes().get(AttributeType.MATCHING);
 		}
 		// create Policy. 
-		StdPAPPolicy newPAPPolicy = new StdPAPPolicy("Base", policyName, policyParameters.getPolicyDescription(), ecompName, configName, configAttributes, configType, 
+		StdPAPPolicy newPAPPolicy = new StdPAPPolicy("Base", policyName, policyParameters.getPolicyDescription(), onapName, configName, configAttributes, configType, 
 				configBody, updateFlag, policyScope,0, policyParameters.getRiskLevel(),policyParameters.getRiskType(), String.valueOf(policyParameters.getGuard()), date);
 		// Send Json to PAP. 
 		response = (String) papServices.callPAP(newPAPPolicy, new String[] {"operation="+operation, "apiflag=api", "policyType=Config"}, policyParameters.getRequestID(), "Config");
diff --git a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/api/services/CreateUpdateConfigPolicyService.java b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/CreateUpdateConfigPolicyService.java
index 6dde8a276..d8cca2bb9 100644
--- a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/api/services/CreateUpdateConfigPolicyService.java
+++ b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/CreateUpdateConfigPolicyService.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP-REST
+ * ONAP-PDP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,23 +17,23 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.pdp.rest.api.services;
+package org.onap.policy.pdp.rest.api.services;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.openecomp.policy.api.AttributeType;
-import org.openecomp.policy.api.PolicyClass;
-import org.openecomp.policy.api.PolicyConfigType;
-import org.openecomp.policy.api.PolicyException;
-import org.openecomp.policy.api.PolicyParameters;
-import org.openecomp.policy.api.PolicyType;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.pdp.rest.api.models.ConfigPolicyAPIRequest;
-import org.openecomp.policy.xacml.api.XACMLErrorConstants;
+import org.onap.policy.api.AttributeType;
+import org.onap.policy.api.PolicyClass;
+import org.onap.policy.api.PolicyConfigType;
+import org.onap.policy.api.PolicyException;
+import org.onap.policy.api.PolicyParameters;
+import org.onap.policy.api.PolicyType;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.pdp.rest.api.models.ConfigPolicyAPIRequest;
+import org.onap.policy.xacml.api.XACMLErrorConstants;
 import org.springframework.http.HttpStatus;
 
 public class CreateUpdateConfigPolicyService {
@@ -70,7 +70,7 @@ public class CreateUpdateConfigPolicyService {
         }
         policyParameters.setPolicyName(configPolicyAPIRequest.getPolicyScope()+"."+configPolicyAPIRequest.getPolicyName());
         policyParameters.setPolicyDescription(configPolicyAPIRequest.getPolicyDescription());
-        policyParameters.setEcompName(configPolicyAPIRequest.getEcompName());
+        policyParameters.setOnapName(configPolicyAPIRequest.getOnapName());
         policyParameters.setConfigName(configPolicyAPIRequest.getConfigName());
         Map<AttributeType, Map<String, String>> attributes = new HashMap<>();
         attributes.put(AttributeType.MATCHING, configPolicyAPIRequest.getConfigAttributes());
diff --git a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/api/services/CreateUpdateDictionaryService.java b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/CreateUpdateDictionaryService.java
index 3c102fa68..9d2577426 100644
--- a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/api/services/CreateUpdateDictionaryService.java
+++ b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/CreateUpdateDictionaryService.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP-REST
+ * ONAP-PDP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.pdp.rest.api.services;
+package org.onap.policy.pdp.rest.api.services;
 
 import java.io.ByteArrayInputStream;
 import java.util.UUID;
@@ -25,12 +25,12 @@ import java.util.UUID;
 import javax.json.JsonException;
 import javax.json.JsonObject;
 
-import org.openecomp.policy.api.DictionaryParameters;
-import org.openecomp.policy.api.PolicyException;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.pdp.rest.api.utils.PolicyApiUtils;
-import org.openecomp.policy.xacml.api.XACMLErrorConstants;
+import org.onap.policy.api.DictionaryParameters;
+import org.onap.policy.api.PolicyException;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.pdp.rest.api.utils.PolicyApiUtils;
+import org.onap.policy.xacml.api.XACMLErrorConstants;
 import org.springframework.http.HttpStatus;
 
 public class CreateUpdateDictionaryService {
diff --git a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/api/services/CreateUpdateFirewallPolicyService.java b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/CreateUpdateFirewallPolicyService.java
index 3e5dce15b..d4d686a13 100644
--- a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/api/services/CreateUpdateFirewallPolicyService.java
+++ b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/CreateUpdateFirewallPolicyService.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP-REST
+ * ONAP-PDP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,19 +17,19 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.pdp.rest.api.services;
+package org.onap.policy.pdp.rest.api.services;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 
-import org.openecomp.policy.api.PolicyClass;
-import org.openecomp.policy.api.PolicyConfigType;
-import org.openecomp.policy.api.PolicyException;
-import org.openecomp.policy.api.PolicyParameters;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.pdp.rest.api.models.ConfigFirewallPolicyAPIRequest;
-import org.openecomp.policy.xacml.api.XACMLErrorConstants;
+import org.onap.policy.api.PolicyClass;
+import org.onap.policy.api.PolicyConfigType;
+import org.onap.policy.api.PolicyException;
+import org.onap.policy.api.PolicyParameters;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.pdp.rest.api.models.ConfigFirewallPolicyAPIRequest;
+import org.onap.policy.xacml.api.XACMLErrorConstants;
 import org.springframework.http.HttpStatus;
 
 public class CreateUpdateFirewallPolicyService {
diff --git a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/api/services/CreateUpdatePolicyService.java b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/CreateUpdatePolicyService.java
index 73f9e7448..0ff5f4a0a 100644
--- a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/api/services/CreateUpdatePolicyService.java
+++ b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/CreateUpdatePolicyService.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP-REST
+ * ONAP-PDP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,9 +17,9 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.pdp.rest.api.services;
+package org.onap.policy.pdp.rest.api.services;
 
-import org.openecomp.policy.api.PolicyException;
+import org.onap.policy.api.PolicyException;
 import org.springframework.http.HttpStatus;
 
 public interface CreateUpdatePolicyService {
diff --git a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/api/services/CreateUpdatePolicyServiceImpl.java b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/CreateUpdatePolicyServiceImpl.java
index cf2171137..945cdba8b 100644
--- a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/api/services/CreateUpdatePolicyServiceImpl.java
+++ b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/CreateUpdatePolicyServiceImpl.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP-REST
+ * ONAP-PDP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,19 +17,19 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.pdp.rest.api.services;
+package org.onap.policy.pdp.rest.api.services;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.UUID;
 
-import org.openecomp.policy.api.PolicyException;
-import org.openecomp.policy.api.PolicyParameters;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.pdp.rest.api.utils.PolicyApiUtils;
-import org.openecomp.policy.utils.PolicyUtils;
-import org.openecomp.policy.xacml.api.XACMLErrorConstants;
+import org.onap.policy.api.PolicyException;
+import org.onap.policy.api.PolicyParameters;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.pdp.rest.api.utils.PolicyApiUtils;
+import org.onap.policy.utils.PolicyUtils;
+import org.onap.policy.xacml.api.XACMLErrorConstants;
 import org.springframework.http.HttpStatus;
 
 public class CreateUpdatePolicyServiceImpl implements CreateUpdatePolicyService {
diff --git a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/api/services/DecisionPolicyService.java b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/DecisionPolicyService.java
index c6789a0b8..c283ff14c 100644
--- a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/api/services/DecisionPolicyService.java
+++ b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/DecisionPolicyService.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP-REST
+ * ONAP-PDP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,18 +17,18 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.pdp.rest.api.services;
+package org.onap.policy.pdp.rest.api.services;
 
 import java.util.Map;
 
-import org.openecomp.policy.api.AttributeType;
-import org.openecomp.policy.api.PolicyException;
-import org.openecomp.policy.api.PolicyParameters;
-import org.openecomp.policy.api.RuleProvider;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.xacml.api.XACMLErrorConstants;
-import org.openecomp.policy.xacml.std.pap.StdPAPPolicy;
+import org.onap.policy.api.AttributeType;
+import org.onap.policy.api.PolicyException;
+import org.onap.policy.api.PolicyParameters;
+import org.onap.policy.api.RuleProvider;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.xacml.api.XACMLErrorConstants;
+import org.onap.policy.xacml.std.pap.StdPAPPolicy;
 
 /**
  * Decision Policy Implementation 
@@ -43,7 +43,7 @@ public class DecisionPolicyService{
 	private String policyScope = null;
 	private String policyName = null;
 	private PolicyParameters policyParameters = null;
-	private String ecompName = null;
+	private String onapName = null;
 	
 	public DecisionPolicyService(String policyScope, String policyName,
 			PolicyParameters policyParameters) {
@@ -54,9 +54,9 @@ public class DecisionPolicyService{
 	}
 
 	public Boolean getValidation() {
-	    ecompName = policyParameters.getEcompName();
-		if (ecompName==null||ecompName.trim().isEmpty()){
-			message = XACMLErrorConstants.ERROR_DATA_ISSUE + "No ECOMP Name given.";
+	    onapName = policyParameters.getOnapName();
+		if (onapName==null||onapName.trim().isEmpty()){
+			message = XACMLErrorConstants.ERROR_DATA_ISSUE + "No ONAP Name given.";
 			return false;
 		}
 		return true;
@@ -89,7 +89,7 @@ public class DecisionPolicyService{
 			matchingAttributes = policyParameters.getAttributes().get(AttributeType.MATCHING);
 		}
 		// Create Policy. 
-		StdPAPPolicy newPAPPolicy = new StdPAPPolicy(policyName, policyParameters.getPolicyDescription(), ecompName, ruleProvider.toString(), matchingAttributes, settingsAttributes, policyParameters.getDynamicRuleAlgorithmLabels(), 
+		StdPAPPolicy newPAPPolicy = new StdPAPPolicy(policyName, policyParameters.getPolicyDescription(), onapName, ruleProvider.toString(), matchingAttributes, settingsAttributes, policyParameters.getDynamicRuleAlgorithmLabels(), 
 				policyParameters.getDynamicRuleAlgorithmFunctions(), policyParameters.getDynamicRuleAlgorithmField1(), policyParameters.getDynamicRuleAlgorithmField2(), null, null, null, updateFlag, policyScope, 0);
 		// Send JSON to PAP. 
 		response = (String) papServices.callPAP(newPAPPolicy, new String[] {"operation="+operation, "apiflag=api", "policyType=Decision"}, policyParameters.getRequestID(), "Decision");
diff --git a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/api/services/DeletePolicyService.java b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/DeletePolicyService.java
index 3b1ea23fb..01670a5fd 100644
--- a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/api/services/DeletePolicyService.java
+++ b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/DeletePolicyService.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP-REST
+ * ONAP-PDP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,17 +17,17 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.pdp.rest.api.services;
+package org.onap.policy.pdp.rest.api.services;
 
 import java.io.File;
 import java.util.UUID;
 
-import org.openecomp.policy.api.DeletePolicyParameters;
-import org.openecomp.policy.api.PolicyException;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.xacml.api.XACMLErrorConstants;
-import org.openecomp.policy.xacml.std.pap.StdPAPPolicy;
+import org.onap.policy.api.DeletePolicyParameters;
+import org.onap.policy.api.PolicyException;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.xacml.api.XACMLErrorConstants;
+import org.onap.policy.xacml.std.pap.StdPAPPolicy;
 import org.springframework.http.HttpStatus;
 
 public class DeletePolicyService {
diff --git a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/api/services/FirewallPolicyService.java b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/FirewallPolicyService.java
index f301bf05d..8f4ba9a79 100644
--- a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/api/services/FirewallPolicyService.java
+++ b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/FirewallPolicyService.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP-REST
+ * ONAP-PDP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,18 +17,18 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.pdp.rest.api.services;
+package org.onap.policy.pdp.rest.api.services;
 
 import javax.json.JsonException;
 import javax.json.JsonObject;
 
-import org.openecomp.policy.api.PolicyException;
-import org.openecomp.policy.api.PolicyParameters;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.pdp.rest.api.utils.PolicyApiUtils;
-import org.openecomp.policy.xacml.api.XACMLErrorConstants;
-import org.openecomp.policy.xacml.std.pap.StdPAPPolicy;
+import org.onap.policy.api.PolicyException;
+import org.onap.policy.api.PolicyParameters;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.pdp.rest.api.utils.PolicyApiUtils;
+import org.onap.policy.xacml.api.XACMLErrorConstants;
+import org.onap.policy.xacml.std.pap.StdPAPPolicy;
 
 /**
  * Firewall Policy Implementation. 
diff --git a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/api/services/GetConfigService.java b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/GetConfigService.java
index 2363877b2..1817d8861 100644
--- a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/api/services/GetConfigService.java
+++ b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/GetConfigService.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP-REST
+ * ONAP-PDP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.pdp.rest.api.services;
+package org.onap.policy.pdp.rest.api.services;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -33,14 +33,14 @@ import javax.json.JsonArrayBuilder;
 import javax.json.JsonObject;
 import javax.json.JsonObjectBuilder;
 
-import org.openecomp.policy.api.ConfigRequestParameters;
-import org.openecomp.policy.api.PolicyConfigException;
-import org.openecomp.policy.api.PolicyConfigStatus;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.pdp.rest.api.models.PDPResponse;
-import org.openecomp.policy.pdp.rest.api.models.PolicyConfig;
-import org.openecomp.policy.xacml.api.XACMLErrorConstants;
+import org.onap.policy.api.ConfigRequestParameters;
+import org.onap.policy.api.PolicyConfigException;
+import org.onap.policy.api.PolicyConfigStatus;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.pdp.rest.api.models.PDPResponse;
+import org.onap.policy.pdp.rest.api.models.PolicyConfig;
+import org.onap.policy.xacml.api.XACMLErrorConstants;
 import org.springframework.http.HttpStatus;
 
 public class GetConfigService {
@@ -161,8 +161,8 @@ public class GetConfigService {
                 }
             }
             if(config.getMatchingConditions()!=null && config.getMatchingConditions().size()>0){
-                if(configRequestParameters.getEcompName()!=null && configRequestParameters.getEcompName().trim().length()>0 && config.getMatchingConditions().containsKey("ECOMPName")){
-                    if(!config.getMatchingConditions().get("ECOMPName").matches(configRequestParameters.getEcompName())){
+                if(configRequestParameters.getOnapName()!=null && configRequestParameters.getOnapName().trim().length()>0 && config.getMatchingConditions().containsKey("ONAPName")){
+                    if(!config.getMatchingConditions().get("ONAPName").matches(configRequestParameters.getOnapName())){
                         continue;
                     }
                 }
@@ -225,10 +225,10 @@ public class GetConfigService {
         }else{
             LOGGER.info("PolicyName values are not given. ");
         }
-        if(configRequestParameters.getEcompName()!=null){
+        if(configRequestParameters.getOnapName()!=null){
             JsonObjectBuilder subjectBuilder = Json.createObjectBuilder();
-            subjectBuilder.add("Value", configRequestParameters.getEcompName());
-            subjectBuilder.add("AttributeId", "ECOMPName");
+            subjectBuilder.add("Value", configRequestParameters.getOnapName());
+            subjectBuilder.add("AttributeId", "ONAPName");
             subjectArray.add(subjectBuilder);
             if(configRequestParameters.getConfigName()!=null){
                 subjectBuilder = Json.createObjectBuilder();
@@ -240,7 +240,7 @@ public class GetConfigService {
                 LOGGER.info("Config Name is not given. ");
             }
         }else{
-            LOGGER.info("Ecomp Name is not given. ");
+            LOGGER.info("Onap Name is not given. ");
         }
         return Json.createObjectBuilder()
                 .add("Request",Json.createObjectBuilder()
@@ -301,8 +301,8 @@ public class GetConfigService {
             message = XACMLErrorConstants.ERROR_DATA_ISSUE + "No config Request Parameters given.";
             return false;
         }
-        if(configRequestParameters.getEcompName()==null && configRequestParameters.getPolicyName()==null){
-            message = XACMLErrorConstants.ERROR_DATA_ISSUE + "Cannot proceed without eCOMPComponentName or PolicyName";
+        if(configRequestParameters.getOnapName()==null && configRequestParameters.getPolicyName()==null){
+            message = XACMLErrorConstants.ERROR_DATA_ISSUE + "Cannot proceed without onapComponentName or PolicyName";
             return false;
         }
         return true;
diff --git a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/api/services/GetDecisionService.java b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/GetDecisionService.java
index 1ef5e53cf..66beb0663 100644
--- a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/api/services/GetDecisionService.java
+++ b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/GetDecisionService.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP-REST
+ * ONAP-PDP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.pdp.rest.api.services;
+package org.onap.policy.pdp.rest.api.services;
 
 import java.util.Collection;
 import java.util.Map;
@@ -29,15 +29,15 @@ import javax.json.JsonArrayBuilder;
 import javax.json.JsonObject;
 import javax.json.JsonObjectBuilder;
 
-import org.openecomp.policy.api.DecisionRequestParameters;
-import org.openecomp.policy.api.DecisionResponse;
-import org.openecomp.policy.api.PolicyDecision;
-import org.openecomp.policy.api.PolicyDecisionException;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.pdp.rest.api.models.PDPResponse;
-import org.openecomp.policy.std.StdDecisionResponse;
-import org.openecomp.policy.xacml.api.XACMLErrorConstants;
+import org.onap.policy.api.DecisionRequestParameters;
+import org.onap.policy.api.DecisionResponse;
+import org.onap.policy.api.PolicyDecision;
+import org.onap.policy.api.PolicyDecisionException;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.pdp.rest.api.models.PDPResponse;
+import org.onap.policy.std.StdDecisionResponse;
+import org.onap.policy.xacml.api.XACMLErrorConstants;
 import org.springframework.http.HttpStatus;
 
 public class GetDecisionService {
@@ -47,7 +47,7 @@ public class GetDecisionService {
     private HttpStatus status = HttpStatus.BAD_REQUEST;
     private DecisionRequestParameters decisionRequestParameters = null;
     private String message = null;
-    private String eCOMPComponentName = null;
+    private String onapComponentName = null;
     private Map<String,String> decisionAttributes = null;
     
     public GetDecisionService(
@@ -148,8 +148,8 @@ public class GetDecisionService {
                 .add("Request", Json.createObjectBuilder()
                                 .add("AccessSubject", Json.createObjectBuilder()
                                                 .add("Attribute", Json.createObjectBuilder()
-                                                                .add("Value", eCOMPComponentName)
-                                                                .add("AttributeId", "ECOMPName")))
+                                                                .add("Value", onapComponentName)
+                                                                .add("AttributeId", "ONAPName")))
                                 .add("Resource", Json.createObjectBuilder()
                                                 .add("Attribute", resourceArray))
                                 .add("Action", Json.createObjectBuilder()
@@ -164,10 +164,10 @@ public class GetDecisionService {
             message = XACMLErrorConstants.ERROR_DATA_ISSUE + "No Decision Request Paramaters";
             return false; 
         }
-        eCOMPComponentName = decisionRequestParameters.getECOMPComponentName();
+        onapComponentName = decisionRequestParameters.getONAPComponentName();
         decisionAttributes = decisionRequestParameters.getDecisionAttributes();
-        if (eCOMPComponentName == null || eCOMPComponentName.isEmpty()) {
-            message = XACMLErrorConstants.ERROR_DATA_ISSUE + "No eCOMPComponentName given : " + eCOMPComponentName;
+        if (onapComponentName == null || onapComponentName.isEmpty()) {
+            message = XACMLErrorConstants.ERROR_DATA_ISSUE + "No onapComponentName given : " + onapComponentName;
             return false;
         }
         if (decisionAttributes == null || decisionAttributes.isEmpty()) {
diff --git a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/api/services/GetDictionaryService.java b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/GetDictionaryService.java
index 04567e2e1..8f88ef7c7 100644
--- a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/api/services/GetDictionaryService.java
+++ b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/GetDictionaryService.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP-REST
+ * ONAP-PDP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,21 +17,21 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.pdp.rest.api.services;
+package org.onap.policy.pdp.rest.api.services;
 
 import java.util.UUID;
 
 import javax.json.JsonException;
 import javax.json.JsonObject;
 
-import org.openecomp.policy.api.DictionaryParameters;
-import org.openecomp.policy.api.DictionaryResponse;
-import org.openecomp.policy.api.PolicyException;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.pdp.rest.api.utils.PolicyApiUtils;
-import org.openecomp.policy.std.StdDictionaryResponse;
-import org.openecomp.policy.xacml.api.XACMLErrorConstants;
+import org.onap.policy.api.DictionaryParameters;
+import org.onap.policy.api.DictionaryResponse;
+import org.onap.policy.api.PolicyException;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.pdp.rest.api.utils.PolicyApiUtils;
+import org.onap.policy.std.StdDictionaryResponse;
+import org.onap.policy.xacml.api.XACMLErrorConstants;
 import org.springframework.http.HttpStatus;
 
 public class GetDictionaryService {
@@ -138,8 +138,8 @@ public class GetDictionaryService {
         String dictionary = dictionaryParameters.getDictionary();
         
         switch (dictionary) {
-        case "EcompName":
-            jsonString = jsonString.replace("ecompNameDictionaryDatas", "DictionaryDatas");
+        case "OnapName":
+            jsonString = jsonString.replace("onapNameDictionaryDatas", "DictionaryDatas");
             break;
         case "Attribute":
             jsonString = jsonString.replace("attributeDictionaryDatas", "DictionaryDatas");
diff --git a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/api/services/GetMetricsService.java b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/GetMetricsService.java
index 5a90bfac9..a0a477cdf 100644
--- a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/api/services/GetMetricsService.java
+++ b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/GetMetricsService.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP-REST
+ * ONAP-PDP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,20 +17,20 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.pdp.rest.api.services;
+package org.onap.policy.pdp.rest.api.services;
 
 import java.util.UUID;
 
 import javax.json.JsonException;
 
 import org.json.JSONObject;
-import org.openecomp.policy.api.MetricsRequestParameters;
-import org.openecomp.policy.api.MetricsResponse;
-import org.openecomp.policy.api.PolicyException;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.std.StdMetricsResponse;
-import org.openecomp.policy.xacml.api.XACMLErrorConstants;
+import org.onap.policy.api.MetricsRequestParameters;
+import org.onap.policy.api.MetricsResponse;
+import org.onap.policy.api.PolicyException;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.std.StdMetricsResponse;
+import org.onap.policy.xacml.api.XACMLErrorConstants;
 import org.springframework.http.HttpStatus;
 
 public class GetMetricsService {
diff --git a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/api/services/ListConfigService.java b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/ListConfigService.java
index 9aca4c049..26f491963 100644
--- a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/api/services/ListConfigService.java
+++ b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/ListConfigService.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP-REST
+ * ONAP-PDP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,15 +17,15 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.pdp.rest.api.services;
+package org.onap.policy.pdp.rest.api.services;
 
 import java.util.ArrayList;
 import java.util.Collection;
 
-import org.openecomp.policy.api.ConfigRequestParameters;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.pdp.rest.api.models.PolicyConfig;
+import org.onap.policy.api.ConfigRequestParameters;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.pdp.rest.api.models.PolicyConfig;
 import org.springframework.http.HttpStatus;
 
 public class ListConfigService {
diff --git a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/api/services/MicroServicesPolicyService.java b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/MicroServicesPolicyService.java
index 3188292d7..22d8873d7 100644
--- a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/api/services/MicroServicesPolicyService.java
+++ b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/MicroServicesPolicyService.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP-REST
+ * ONAP-PDP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,18 +17,18 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.pdp.rest.api.services;
+package org.onap.policy.pdp.rest.api.services;
 
 import javax.json.JsonException;
 import javax.json.JsonObject;
 
-import org.openecomp.policy.api.PolicyException;
-import org.openecomp.policy.api.PolicyParameters;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.pdp.rest.api.utils.PolicyApiUtils;
-import org.openecomp.policy.xacml.api.XACMLErrorConstants;
-import org.openecomp.policy.xacml.std.pap.StdPAPPolicy;
+import org.onap.policy.api.PolicyException;
+import org.onap.policy.api.PolicyParameters;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.pdp.rest.api.utils.PolicyApiUtils;
+import org.onap.policy.xacml.api.XACMLErrorConstants;
+import org.onap.policy.xacml.std.pap.StdPAPPolicy;
 
 /**
  * MicroServices Policy implementation. 
@@ -44,7 +44,7 @@ public class MicroServicesPolicyService{
 	private String policyName = null;
 	private String policyScope = null;
 	private String date = null;
-	private String ecompName = null;
+	private String onapName = null;
 	private JsonObject microServiceAttributes = null;
 	
 	public MicroServicesPolicyService(String policyName, String policyScope, PolicyParameters policyParameters, String date) {
@@ -67,9 +67,9 @@ public class MicroServicesPolicyService{
 			LOGGER.error("Error while parsing JSON body for MicroService Policy creation. ", e);
 			return false;
 		}
-		ecompName = policyParameters.getEcompName();
-		if (ecompName==null||ecompName.trim().isEmpty()){
-			message = XACMLErrorConstants.ERROR_DATA_ISSUE + "No Ecomp Name given.";
+		onapName = policyParameters.getOnapName();
+		if (onapName==null||onapName.trim().isEmpty()){
+			message = XACMLErrorConstants.ERROR_DATA_ISSUE + "No Onap Name given.";
 			return false;
 		}
 		boolean levelCheck = false;
@@ -123,7 +123,7 @@ public class MicroServicesPolicyService{
         	version = microServiceAttributes.get("version").toString().replace("\"", "");
         }
         // Create Policy. 
-        StdPAPPolicy newPAPPolicy = new StdPAPPolicy("Micro Service", policyName, policyDescription, ecompName, 
+        StdPAPPolicy newPAPPolicy = new StdPAPPolicy("Micro Service", policyName, policyDescription, onapName, 
                 configName, microService, uuid, msLocation, microServiceAttributes.toString(), priority, 
                 version, updateFlag, policyScope, 0, policyParameters.getRiskLevel(),
                 policyParameters.getRiskType(), String.valueOf(policyParameters.getGuard()), date); 
diff --git a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/api/services/NotificationService.java b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/NotificationService.java
index 4b453fa87..c1b9f63e1 100644
--- a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/api/services/NotificationService.java
+++ b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/NotificationService.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP-REST
+ * ONAP-PDP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.pdp.rest.api.services;
+package org.onap.policy.pdp.rest.api.services;
 
 import java.io.File;
 import java.io.IOException;
@@ -36,12 +36,12 @@ import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import org.openecomp.policy.api.PolicyException;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.rest.XACMLRestProperties;
-import org.openecomp.policy.utils.BusPublisher;
-import org.openecomp.policy.xacml.api.XACMLErrorConstants;
+import org.onap.policy.api.PolicyException;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.rest.XACMLRestProperties;
+import org.onap.policy.utils.BusPublisher;
+import org.onap.policy.xacml.api.XACMLErrorConstants;
 import org.springframework.http.HttpStatus;
 
 import com.att.research.xacml.util.XACMLProperties;
diff --git a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/api/services/PAPServices.java b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/PAPServices.java
index aea058d37..e7216e152 100644
--- a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/api/services/PAPServices.java
+++ b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/PAPServices.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP-REST
+ * ONAP-PDP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.pdp.rest.api.services;
+package org.onap.policy.pdp.rest.api.services;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -35,13 +35,13 @@ import java.util.Map;
 import java.util.UUID;
 
 import org.apache.commons.io.IOUtils;
-import org.openecomp.policy.api.PolicyException;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.pdp.rest.config.PDPApiAuth;
-import org.openecomp.policy.rest.XACMLRestProperties;
-import org.openecomp.policy.xacml.api.XACMLErrorConstants;
-import org.openecomp.policy.xacml.std.pap.StdPDPPolicy;
+import org.onap.policy.api.PolicyException;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.pdp.rest.config.PDPApiAuth;
+import org.onap.policy.rest.XACMLRestProperties;
+import org.onap.policy.xacml.api.XACMLErrorConstants;
+import org.onap.policy.xacml.std.pap.StdPDPPolicy;
 
 import com.att.research.xacml.util.XACMLProperties;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -570,7 +570,7 @@ public class PAPServices {
         while (papsCount < paps.size()) {
             try {
             	String fullURL = getPAP();
-                fullURL = (fullURL.endsWith("/"))? fullURL+"ecomp/pushPolicy" : fullURL+"/ecomp/pushPolicy";
+                fullURL = (fullURL.endsWith("/"))? fullURL+"onap/pushPolicy" : fullURL+"/onap/pushPolicy";
                 URL url = new URL(fullURL);
                 LOGGER.debug("--- Sending Request to PAP : "+ url.toString() + " ---");
                 // Open the connection
diff --git a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/api/services/PDPServices.java b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/PDPServices.java
index fb7b8e270..e495c9950 100644
--- a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/api/services/PDPServices.java
+++ b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/PDPServices.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP-REST
+ * ONAP-PDP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.pdp.rest.api.services;
+package org.onap.policy.pdp.rest.api.services;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -43,18 +43,18 @@ import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 
 import org.apache.commons.io.IOUtils;
-import org.openecomp.policy.api.PolicyConfigStatus;
-import org.openecomp.policy.api.PolicyDecision;
-import org.openecomp.policy.api.PolicyException;
-import org.openecomp.policy.api.PolicyResponseStatus;
-import org.openecomp.policy.api.PolicyType;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.pdp.rest.XACMLPdpServlet;
-import org.openecomp.policy.pdp.rest.api.models.PDPResponse;
-import org.openecomp.policy.rest.XACMLRestProperties;
-import org.openecomp.policy.std.Matches;
-import org.openecomp.policy.xacml.api.XACMLErrorConstants;
+import org.onap.policy.api.PolicyConfigStatus;
+import org.onap.policy.api.PolicyDecision;
+import org.onap.policy.api.PolicyException;
+import org.onap.policy.api.PolicyResponseStatus;
+import org.onap.policy.api.PolicyType;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.pdp.rest.XACMLPdpServlet;
+import org.onap.policy.pdp.rest.api.models.PDPResponse;
+import org.onap.policy.rest.XACMLRestProperties;
+import org.onap.policy.std.Matches;
+import org.onap.policy.xacml.api.XACMLErrorConstants;
 import org.w3c.dom.Document;
 
 import com.att.research.xacml.api.Advice;
@@ -206,9 +206,9 @@ public class PDPServices {
                             } else if (attribute.getAttributeId().stringValue().startsWith("matching")) {
                                 matchingConditions.put(attribute.getAttributeId().stringValue()
                                         .replaceFirst("(matching).", ""),attribute.getAttributeValue().getValue().toString());
-                                if ("ECOMPName".equals(attribute.getAttributeId().stringValue()
+                                if ("ONAPName".equals(attribute.getAttributeId().stringValue()
                                         .replaceFirst("(matching).", ""))) {
-                                    match.setEcompName(attribute.getAttributeValue().getValue().toString());
+                                    match.setOnapName(attribute.getAttributeValue().getValue().toString());
                                 } else if ("ConfigName".equals(attribute.getAttributeId().stringValue()
                                         .replaceFirst("(matching).", ""))) {
                                     match.setConfigName(attribute.getAttributeValue().getValue().toString());
diff --git a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/api/services/PolicyEngineImportService.java b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/PolicyEngineImportService.java
index 2a526f751..2d8af54c5 100644
--- a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/api/services/PolicyEngineImportService.java
+++ b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/PolicyEngineImportService.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP-REST
+ * ONAP-PDP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,20 +17,20 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.pdp.rest.api.services;
+package org.onap.policy.pdp.rest.api.services;
 
 import java.io.BufferedInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.UUID;
 
-import org.openecomp.policy.api.ImportParameters;
-import org.openecomp.policy.api.PolicyException;
-import org.openecomp.policy.api.ImportParameters.IMPORT_TYPE;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.utils.PolicyUtils;
-import org.openecomp.policy.xacml.api.XACMLErrorConstants;
+import org.onap.policy.api.ImportParameters;
+import org.onap.policy.api.PolicyException;
+import org.onap.policy.api.ImportParameters.IMPORT_TYPE;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.utils.PolicyUtils;
+import org.onap.policy.xacml.api.XACMLErrorConstants;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.multipart.MultipartFile;
 
diff --git a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/api/services/PushPolicyService.java b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/PushPolicyService.java
index a703c50d6..f2c6c221c 100644
--- a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/api/services/PushPolicyService.java
+++ b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/PushPolicyService.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP-REST
+ * ONAP-PDP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,17 +17,17 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.pdp.rest.api.services;
+package org.onap.policy.pdp.rest.api.services;
 
 import java.util.UUID;
 
-import org.openecomp.policy.api.PolicyException;
-import org.openecomp.policy.api.PushPolicyParameters;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.xacml.api.XACMLErrorConstants;
-import org.openecomp.policy.xacml.std.pap.StdPAPPolicy;
-import org.openecomp.policy.xacml.std.pap.StdPDPPolicy;
+import org.onap.policy.api.PolicyException;
+import org.onap.policy.api.PushPolicyParameters;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.xacml.api.XACMLErrorConstants;
+import org.onap.policy.xacml.std.pap.StdPAPPolicy;
+import org.onap.policy.xacml.std.pap.StdPDPPolicy;
 import org.springframework.http.HttpStatus;
 
 import com.att.research.xacml.api.pap.PAPException;
diff --git a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/api/services/SendEventService.java b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/SendEventService.java
index c16872ebc..c655a2ad4 100644
--- a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/api/services/SendEventService.java
+++ b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/SendEventService.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP-REST
+ * ONAP-PDP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.pdp.rest.api.services;
+package org.onap.policy.pdp.rest.api.services;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -31,15 +31,15 @@ import javax.json.JsonArrayBuilder;
 import javax.json.JsonObject;
 import javax.json.JsonObjectBuilder;
 
-import org.openecomp.policy.api.EventRequestParameters;
-import org.openecomp.policy.api.PolicyEventException;
-import org.openecomp.policy.api.PolicyResponse;
-import org.openecomp.policy.api.PolicyResponseStatus;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.pdp.rest.api.models.PDPResponse;
-import org.openecomp.policy.std.StdPolicyResponse;
-import org.openecomp.policy.xacml.api.XACMLErrorConstants;
+import org.onap.policy.api.EventRequestParameters;
+import org.onap.policy.api.PolicyEventException;
+import org.onap.policy.api.PolicyResponse;
+import org.onap.policy.api.PolicyResponseStatus;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.pdp.rest.api.models.PDPResponse;
+import org.onap.policy.std.StdPolicyResponse;
+import org.onap.policy.xacml.api.XACMLErrorConstants;
 import org.springframework.http.HttpStatus;
 
 public class SendEventService {
diff --git a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/api/utils/PolicyApiUtils.java b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/utils/PolicyApiUtils.java
index 984cc907b..cd107d0ba 100644
--- a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/api/utils/PolicyApiUtils.java
+++ b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/utils/PolicyApiUtils.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP-REST
+ * ONAP-PDP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.pdp.rest.api.utils;
+package org.onap.policy.pdp.rest.api.utils;
 
 import java.io.StringReader;
 
@@ -27,8 +27,8 @@ import javax.json.JsonObject;
 import javax.json.JsonReader;
 import javax.json.stream.JsonParsingException;
 
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
 
 import com.google.common.base.CharMatcher;
 
diff --git a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/config/PDPApiAuth.java b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/config/PDPApiAuth.java
index 5c3dcad60..1e3a41aeb 100644
--- a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/config/PDPApiAuth.java
+++ b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/config/PDPApiAuth.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP-REST
+ * ONAP-PDP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.pdp.rest.config;
+package org.onap.policy.pdp.rest.config;
 
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -32,15 +32,15 @@ import java.util.Map;
 import java.util.Properties;
 import java.util.StringTokenizer;
 
-import org.openecomp.policy.api.PolicyEngineException;
-import org.openecomp.policy.common.logging.eelf.MessageCodes;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.rest.XACMLRestProperties;
-import org.openecomp.policy.utils.AAFPolicyClient;
-import org.openecomp.policy.utils.AAFPolicyException;
-import org.openecomp.policy.utils.PolicyUtils;
-import org.openecomp.policy.xacml.api.XACMLErrorConstants;
+import org.onap.policy.api.PolicyEngineException;
+import org.onap.policy.common.logging.eelf.MessageCodes;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.rest.XACMLRestProperties;
+import org.onap.policy.utils.AAFPolicyClient;
+import org.onap.policy.utils.AAFPolicyException;
+import org.onap.policy.utils.PolicyUtils;
+import org.onap.policy.xacml.api.XACMLErrorConstants;
 
 import com.att.research.xacml.util.XACMLProperties;
 
diff --git a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/config/PDPRestConfig.java b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/config/PDPRestConfig.java
index 6686673d3..078cab2aa 100644
--- a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/config/PDPRestConfig.java
+++ b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/config/PDPRestConfig.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP-REST
+ * ONAP-PDP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,12 +17,12 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.pdp.rest.config;
+package org.onap.policy.pdp.rest.config;
 
 import javax.servlet.MultipartConfigElement;
 
-import org.openecomp.policy.common.logging.eelf.PolicyLogger;
-import org.openecomp.policy.pdp.rest.api.controller.PolicyEngineServices;
+import org.onap.policy.common.logging.eelf.PolicyLogger;
+import org.onap.policy.pdp.rest.api.controller.PolicyEngineServices;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
@@ -62,7 +62,7 @@ public class PDPRestConfig extends WebMvcConfigurerAdapter{
         PolicyLogger.info("Setting up Swagger... ");
         return new Docket(DocumentationType.SWAGGER_2)                
                 .select()
-                .apis(RequestHandlerSelectors.basePackage("org.openecomp.policy.pdp.rest.api"))
+                .apis(RequestHandlerSelectors.basePackage("org.onap.policy.pdp.rest.api"))
                 .paths(PathSelectors.any())
                 .build()
                 .apiInfo(apiInfo());
diff --git a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/config/PDPRestInitializer.java b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/config/PDPRestInitializer.java
index e6acc61bd..0c1e97e62 100644
--- a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/config/PDPRestInitializer.java
+++ b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/config/PDPRestInitializer.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP-REST
+ * ONAP-PDP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,14 +17,14 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.pdp.rest.config;
+package org.onap.policy.pdp.rest.config;
 
 import javax.servlet.MultipartConfigElement;
 import javax.servlet.ServletContext;
 import javax.servlet.ServletException;
 import javax.servlet.ServletRegistration;
 
-import org.openecomp.policy.common.logging.eelf.PolicyLogger;
+import org.onap.policy.common.logging.eelf.PolicyLogger;
 import org.springframework.web.WebApplicationInitializer;
 import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;
 import org.springframework.web.servlet.DispatcherServlet;
diff --git a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/impl/XACMLPdpPIPFinderFactory.java b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/impl/XACMLPdpPIPFinderFactory.java
index 6de84d174..babcafaeb 100644
--- a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/impl/XACMLPdpPIPFinderFactory.java
+++ b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/impl/XACMLPdpPIPFinderFactory.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP-REST
+ * ONAP-PDP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,16 +17,16 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.pdp.rest.impl;
+package org.onap.policy.pdp.rest.impl;
 
 import java.util.Properties;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.openecomp.policy.common.logging.eelf.MessageCodes;
-import org.openecomp.policy.common.logging.eelf.PolicyLogger;
+import org.onap.policy.common.logging.eelf.MessageCodes;
+import org.onap.policy.common.logging.eelf.PolicyLogger;
 
-import org.openecomp.policy.xacml.api.XACMLErrorConstants;
+import org.onap.policy.xacml.api.XACMLErrorConstants;
 import com.att.research.xacml.api.pip.PIPException;
 import com.att.research.xacml.api.pip.PIPFinder;
 import com.att.research.xacml.api.pip.PIPFinderFactory;
diff --git a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/impl/XACMLPdpPolicyFinderFactory.java b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/impl/XACMLPdpPolicyFinderFactory.java
index 0d6d12a63..5641d8b0a 100644
--- a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/impl/XACMLPdpPolicyFinderFactory.java
+++ b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/impl/XACMLPdpPolicyFinderFactory.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP-REST
+ * ONAP-PDP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pdp.rest.impl;
+package org.onap.policy.pdp.rest.impl;
 
 import java.io.File;
 import java.io.IOException;
@@ -33,7 +33,7 @@ import java.util.Properties;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import org.openecomp.policy.xacml.api.XACMLErrorConstants;
+import org.onap.policy.xacml.api.XACMLErrorConstants;
 import com.att.research.xacml.std.StdStatusCode;
 import com.att.research.xacml.std.dom.DOMStructureException;
 import com.att.research.xacml.util.FactoryException;
diff --git a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/jmx/PdpRestMBeanListener.java b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/jmx/PdpRestMBeanListener.java
index c56ddba9a..3232b6b8c 100644
--- a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/jmx/PdpRestMBeanListener.java
+++ b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/jmx/PdpRestMBeanListener.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP-REST
+ * ONAP-PDP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pdp.rest.jmx;
+package org.onap.policy.pdp.rest.jmx;
 
 import java.lang.management.ManagementFactory;
 
@@ -28,9 +28,9 @@ import javax.servlet.ServletContextEvent;
 import javax.servlet.ServletContextListener;
 import javax.servlet.annotation.WebListener;
 
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.xacml.api.XACMLErrorConstants;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.xacml.api.XACMLErrorConstants;
 /**
  *  
  *
diff --git a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/jmx/PdpRestMonitor.java b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/jmx/PdpRestMonitor.java
index 1c088b24e..cdeec9acb 100644
--- a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/jmx/PdpRestMonitor.java
+++ b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/jmx/PdpRestMonitor.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP-REST
+ * ONAP-PDP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,15 +18,15 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pdp.rest.jmx;
+package org.onap.policy.pdp.rest.jmx;
 
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicLong;
 
-import org.openecomp.policy.xacml.util.MetricsUtil.AvgLatency;
-import org.openecomp.policy.xacml.util.MetricsUtil.MaxLatency;
-import org.openecomp.policy.xacml.util.MetricsUtil.MinLatency;
+import org.onap.policy.xacml.util.MetricsUtil.AvgLatency;
+import org.onap.policy.xacml.util.MetricsUtil.MaxLatency;
+import org.onap.policy.xacml.util.MetricsUtil.MinLatency;
 
 public class PdpRestMonitor implements PdpRestMonitorMBean {	
 	private static PdpRestMonitor singleton = new PdpRestMonitor();
diff --git a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/jmx/PdpRestMonitorMBean.java b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/jmx/PdpRestMonitorMBean.java
index e7db09d24..4acfbb7f5 100644
--- a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/jmx/PdpRestMonitorMBean.java
+++ b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/jmx/PdpRestMonitorMBean.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP-REST
+ * ONAP-PDP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pdp.rest.jmx;
+package org.onap.policy.pdp.rest.jmx;
 
 import java.util.Map;
 
diff --git a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/notifications/ManualNotificationUpdateThread.java b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/notifications/ManualNotificationUpdateThread.java
index a1d0ece83..c1306572f 100644
--- a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/notifications/ManualNotificationUpdateThread.java
+++ b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/notifications/ManualNotificationUpdateThread.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP-REST
+ * ONAP-PDP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pdp.rest.notifications;
+package org.onap.policy.pdp.rest.notifications;
 
 import java.io.IOException;
 import java.net.MalformedURLException;
@@ -29,12 +29,12 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.UUID;
 
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.rest.XACMLRestProperties;
-import org.openecomp.policy.utils.BusConsumer;
-import org.openecomp.policy.utils.BusPublisher;
-import org.openecomp.policy.xacml.api.XACMLErrorConstants;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.rest.XACMLRestProperties;
+import org.onap.policy.utils.BusConsumer;
+import org.onap.policy.utils.BusPublisher;
+import org.onap.policy.xacml.api.XACMLErrorConstants;
 
 import com.att.nsa.cambria.client.CambriaClientFactory;
 import com.att.nsa.cambria.client.CambriaConsumer;
diff --git a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/notifications/Notification.java b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/notifications/Notification.java
index c9b510ec3..2d68708c8 100644
--- a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/notifications/Notification.java
+++ b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/notifications/Notification.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP-REST
+ * ONAP-PDP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,11 +18,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pdp.rest.notifications;
+package org.onap.policy.pdp.rest.notifications;
 
 import java.util.Collection;
 
-import org.openecomp.policy.api.NotificationType;
+import org.onap.policy.api.NotificationType;
 
 /**
  * Notification is the POJO which will be used to send the Notifications to the Server. 
diff --git a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/notifications/NotificationController.java b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/notifications/NotificationController.java
index 57678461d..873db4b6c 100644
--- a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/notifications/NotificationController.java
+++ b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/notifications/NotificationController.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP-REST
+ * ONAP-PDP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pdp.rest.notifications;
+package org.onap.policy.pdp.rest.notifications;
 
 import java.io.File;
 import java.io.FileFilter;
@@ -38,14 +38,14 @@ import java.util.Map;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.io.filefilter.WildcardFileFilter;
-import org.openecomp.policy.api.NotificationType;
-import org.openecomp.policy.api.RemovedPolicy;
-import org.openecomp.policy.api.UpdateType;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.pdp.rest.PapUrlResolver;
-import org.openecomp.policy.rest.XACMLRestProperties;
-import org.openecomp.policy.xacml.api.XACMLErrorConstants;
+import org.onap.policy.api.NotificationType;
+import org.onap.policy.api.RemovedPolicy;
+import org.onap.policy.api.UpdateType;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.pdp.rest.PapUrlResolver;
+import org.onap.policy.rest.XACMLRestProperties;
+import org.onap.policy.xacml.api.XACMLErrorConstants;
 
 import com.att.research.xacml.api.pap.PDPPolicy;
 import com.att.research.xacml.api.pap.PDPStatus;
diff --git a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/notifications/NotificationServer.java b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/notifications/NotificationServer.java
index 9bd2e1f20..690d8c517 100644
--- a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/notifications/NotificationServer.java
+++ b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/notifications/NotificationServer.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP-REST
+ * ONAP-PDP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pdp.rest.notifications;
+package org.onap.policy.pdp.rest.notifications;
 
 import java.io.IOException;
 import java.net.MalformedURLException;
@@ -38,14 +38,14 @@ import javax.websocket.OnOpen;
 import javax.websocket.Session;
 import javax.websocket.server.ServerEndpoint;
 
-import org.openecomp.policy.common.logging.eelf.MessageCodes;
-import org.openecomp.policy.common.logging.eelf.PolicyLogger;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.pdp.rest.api.services.NotificationService;
-import org.openecomp.policy.rest.XACMLRestProperties;
-import org.openecomp.policy.utils.BusPublisher;
-import org.openecomp.policy.xacml.api.XACMLErrorConstants;
+import org.onap.policy.common.logging.eelf.MessageCodes;
+import org.onap.policy.common.logging.eelf.PolicyLogger;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.pdp.rest.api.services.NotificationService;
+import org.onap.policy.rest.XACMLRestProperties;
+import org.onap.policy.utils.BusPublisher;
+import org.onap.policy.xacml.api.XACMLErrorConstants;
 
 import com.att.nsa.cambria.client.CambriaBatchingPublisher;
 import com.att.nsa.cambria.client.CambriaClientBuilders;
diff --git a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/notifications/Removed.java b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/notifications/Removed.java
index 151b40125..f6c9bfaa5 100644
--- a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/notifications/Removed.java
+++ b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/notifications/Removed.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP-REST
+ * ONAP-PDP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,9 +18,9 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pdp.rest.notifications;
+package org.onap.policy.pdp.rest.notifications;
 
-import org.openecomp.policy.api.RemovedPolicy;
+import org.onap.policy.api.RemovedPolicy;
 
 
 /**
diff --git a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/notifications/Updated.java b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/notifications/Updated.java
index f0d9aa38d..002886de9 100644
--- a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/notifications/Updated.java
+++ b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/notifications/Updated.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP-REST
+ * ONAP-PDP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,12 +18,12 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pdp.rest.notifications;
+package org.onap.policy.pdp.rest.notifications;
 
 import java.util.HashMap;
 
-import org.openecomp.policy.api.LoadedPolicy;
-import org.openecomp.policy.api.UpdateType;
+import org.onap.policy.api.LoadedPolicy;
+import org.onap.policy.api.UpdateType;
 
 /**
  * Updated is the POJO which consists of any new or Updated Policy information.
diff --git a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/notifications/package-info.java b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/notifications/package-info.java
index 7d3995ec6..5bf894d0a 100644
--- a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/notifications/package-info.java
+++ b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/notifications/package-info.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP-REST
+ * ONAP-PDP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -25,4 +25,4 @@
  * @version 0.1
  * 
  */
-package org.openecomp.policy.pdp.rest.notifications;
+package org.onap.policy.pdp.rest.notifications;
diff --git a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/restAuth/AuthenticationService.java b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/restAuth/AuthenticationService.java
index 5a6258032..0d066c59c 100644
--- a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/restAuth/AuthenticationService.java
+++ b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/restAuth/AuthenticationService.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP-REST
+ * ONAP-PDP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,17 +18,17 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pdp.rest.restAuth;
+package org.onap.policy.pdp.rest.restAuth;
 
 import java.util.Base64;
 import java.util.StringTokenizer;
 
-import org.openecomp.policy.rest.XACMLRestProperties;
+import org.onap.policy.rest.XACMLRestProperties;
 
 import com.att.research.xacml.util.XACMLProperties;
 
-import org.openecomp.policy.common.logging.eelf.MessageCodes;
-import org.openecomp.policy.common.logging.eelf.PolicyLogger;
+import org.onap.policy.common.logging.eelf.MessageCodes;
+import org.onap.policy.common.logging.eelf.PolicyLogger;
 
 public class AuthenticationService {
 	private String pdpID = XACMLProperties.getProperty(XACMLRestProperties.PROP_PDP_USERID);
diff --git a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/restAuth/PDPAuthenticationFilter.java b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/restAuth/PDPAuthenticationFilter.java
index 4bc14df02..5b01ca9e5 100644
--- a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/restAuth/PDPAuthenticationFilter.java
+++ b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/restAuth/PDPAuthenticationFilter.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP-REST
+ * ONAP-PDP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pdp.rest.restAuth;
+package org.onap.policy.pdp.rest.restAuth;
 
 import java.io.IOException;
 
@@ -32,7 +32,7 @@ import javax.servlet.annotation.WebFilter;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.openecomp.policy.pdp.rest.config.PDPApiAuth;
+import org.onap.policy.pdp.rest.config.PDPApiAuth;
 
 /**
  * Servlet Filter implementation class PDPAuthenticationFilter
diff --git a/ECOMP-PDP-REST/src/main/resources/log4j.properties b/ONAP-PDP-REST/src/main/resources/log4j.properties
index 3b31771c4..6e5cfac93 100644
--- a/ECOMP-PDP-REST/src/main/resources/log4j.properties
+++ b/ONAP-PDP-REST/src/main/resources/log4j.properties
@@ -1,6 +1,6 @@
 ###
 # ============LICENSE_START=======================================================
-# ECOMP-PDP-REST
+# ONAP-PDP-REST
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
diff --git a/ECOMP-PAP-REST/src/main/resources/logback.xml b/ONAP-PDP-REST/src/main/resources/logback.xml
index d406431db..70e9f90c7 100644
--- a/ECOMP-PAP-REST/src/main/resources/logback.xml
+++ b/ONAP-PDP-REST/src/main/resources/logback.xml
@@ -1,6 +1,6 @@
 <!--
   ============LICENSE_START=======================================================
-  ECOMP-PAP-REST
+  ONAP-PDP-REST
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
   ================================================================================
@@ -27,9 +27,9 @@
   <property name="debugDir" value="logs" />
   
   <!--  specify the component name 
-    <ECOMP-component-name>::= "MSO" | "DCAE" | "ASDC " | "AAI" |"Policy" | "SDNC" | "AC"  -->
+    <ONAP-component-name>::= "MSO" | "DCAE" | "ASDC " | "AAI" |"Policy" | "SDNC" | "AC"  -->
   <property name="componentName" value="Policy"></property>
-  <property name="subComponentName" value="ECOMP-PAP-REST"></property>
+  <property name="subComponentName" value="ONAP-PDP-REST"></property>
   
   <!--  log file names -->
   <property name="errorLogName" value="error" />
@@ -53,7 +53,6 @@
    -->
    <property name="defaultMetricPattern" value="%X{MetricBeginTimestamp}|%X{MetricEndTimestamp}|%X{requestId}|%X{serviceInstanceId}|%t|%X{serverName}|%X{serviceName}|%X{partnerName}|%X{targetEntity}|%X{targetServiceName}|%X{statusCode}|%X{ResponseCode}|%X{ResponseDescription}|%X{InstanceUUID}|%p|%X{severity}|%X{serverIpAddress}|%X{MetricElapsedTime}|%X{server}|%X{clientIpAddress}|%c||%X{ProcessKey}|%X{TargetVirtualEntity}|%X{CustomField1}|%X{CustomField2}|%X{CustomField3}|%X{CustomField4}|%msg%n" />
   
-  
      
    
    <!--   E R R O R
diff --git a/ECOMP-PDP-REST/src/test/java/org/openecomp/policy/pdp/rest/PapUrlResolverTest.java b/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/PapUrlResolverTest.java
index 1811d8912..c8716c3bc 100644
--- a/ECOMP-PDP-REST/src/test/java/org/openecomp/policy/pdp/rest/PapUrlResolverTest.java
+++ b/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/PapUrlResolverTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP-REST
+ * ONAP-PDP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pdp.rest;
+package org.onap.policy.pdp.rest;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -26,7 +26,7 @@ import java.util.Properties;
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.openecomp.policy.rest.XACMLRestProperties;
+import org.onap.policy.rest.XACMLRestProperties;
 
 public class PapUrlResolverTest {
 
diff --git a/ECOMP-PDP-REST/src/test/java/org/openecomp/policy/pdp/rest/XACMLPdpServletTest.java b/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/XACMLPdpServletTest.java
index e0d2f18c1..3e3f584a9 100644
--- a/ECOMP-PDP-REST/src/test/java/org/openecomp/policy/pdp/rest/XACMLPdpServletTest.java
+++ b/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/XACMLPdpServletTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP-REST
+ * ONAP-PDP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pdp.rest;
+package org.onap.policy.pdp.rest;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -36,11 +36,11 @@ import javax.servlet.http.HttpServletResponse;
 import org.junit.Before;
 import org.junit.runner.RunWith;
 import org.mockito.Mockito;
-import org.openecomp.policy.common.im.AdministrativeStateException;
-import org.openecomp.policy.common.im.IntegrityMonitor;
-import org.openecomp.policy.common.im.StandbyStatusException;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.common.im.AdministrativeStateException;
+import org.onap.policy.common.im.IntegrityMonitor;
+import org.onap.policy.common.im.StandbyStatusException;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
 import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
diff --git a/ECOMP-PDP-REST/src/test/java/org/openecomp/policy/pdp/rest/api/services/PDPServicesTest.java b/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/services/PDPServicesTest.java
index fd20e3162..e77a8517a 100644
--- a/ECOMP-PDP-REST/src/test/java/org/openecomp/policy/pdp/rest/api/services/PDPServicesTest.java
+++ b/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/services/PDPServicesTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP-REST
+ * ONAP-PDP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.pdp.rest.api.services;
+package org.onap.policy.pdp.rest.api.services;
 
 import java.util.Collection;
 import java.util.HashMap;
@@ -35,10 +35,10 @@ import org.junit.runner.RunWith;
 
 import static org.junit.Assert.*;
 
-import org.openecomp.policy.api.DecisionRequestParameters;
-import org.openecomp.policy.api.PolicyDecisionException;
-import org.openecomp.policy.pdp.rest.api.models.PDPResponse;
-import org.openecomp.policy.pdp.rest.config.PDPRestConfig;
+import org.onap.policy.api.DecisionRequestParameters;
+import org.onap.policy.api.PolicyDecisionException;
+import org.onap.policy.pdp.rest.api.models.PDPResponse;
+import org.onap.policy.pdp.rest.config.PDPRestConfig;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.web.WebAppConfiguration;
@@ -73,7 +73,7 @@ public class PDPServicesTest {
 		DecisionRequestParameters pep = new DecisionRequestParameters();
 		Map<String,String> eventAttributes = new HashMap<>();
 		eventAttributes.put("TEST", "test");
-		pep.setECOMPComponentName("te123");
+		pep.setONAPComponentName("te123");
 		pep.setDecisionAttributes(eventAttributes);
 		PDPServices fixture = new PDPServices();
 
@@ -85,7 +85,7 @@ public class PDPServicesTest {
 
 		// add additional test code here
 		// An unexpected exception was thrown in user code while executing this test:
-		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.pdp.rest.api.services.PDPServices
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.onap.policy.pdp.rest.api.services.PDPServices
 		assertNotNull(result);
 	
 	}
@@ -119,8 +119,8 @@ public class PDPServicesTest {
                 .add("Request", Json.createObjectBuilder()
                                 .add("AccessSubject", Json.createObjectBuilder()
                                                 .add("Attribute", Json.createObjectBuilder()
-                                                                .add("Value", pep.getECOMPComponentName())
-                                                                .add("AttributeId", "ECOMPName")))
+                                                                .add("Value", pep.getONAPComponentName())
+                                                                .add("AttributeId", "ONAPName")))
                                 .add("Resource", Json.createObjectBuilder()
                                                 .add("Attribute", resourceArray))
                                 .add("Action", Json.createObjectBuilder()
@@ -137,7 +137,7 @@ public class PDPServicesTest {
 	 *
 	 * @generatedBy CodePro at 7/20/17 9:26 AM
 	 */
-	@Test(expected = org.openecomp.policy.api.PolicyException.class)
+	@Test(expected = org.onap.policy.api.PolicyException.class)
 	public void testGenerateRequest_2()
 		throws Exception {
 		PDPServices fixture = new PDPServices();
diff --git a/ECOMP-PDP-REST/src/test/java/org/openecomp/policy/pdp/rest/api/test/NotificationAPITest.java b/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/test/NotificationAPITest.java
index 8d6cf8945..096f7a37a 100644
--- a/ECOMP-PDP-REST/src/test/java/org/openecomp/policy/pdp/rest/api/test/NotificationAPITest.java
+++ b/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/test/NotificationAPITest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP-REST
+ * ONAP-PDP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.pdp.rest.api.test;
+package org.onap.policy.pdp.rest.api.test;
 
 import static org.awaitility.Awaitility.await;
 import static org.junit.Assert.assertEquals;
@@ -27,9 +27,9 @@ import java.util.concurrent.TimeUnit;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.openecomp.policy.pdp.rest.api.services.NotificationService;
-import org.openecomp.policy.pdp.rest.api.services.NotificationService.NotificationServiceType;
-import org.openecomp.policy.xacml.api.XACMLErrorConstants;
+import org.onap.policy.pdp.rest.api.services.NotificationService;
+import org.onap.policy.pdp.rest.api.services.NotificationService.NotificationServiceType;
+import org.onap.policy.xacml.api.XACMLErrorConstants;
 import org.springframework.http.HttpStatus;
 
 import com.att.research.xacml.util.XACMLProperties;
@@ -59,10 +59,10 @@ public class NotificationAPITest {
 	public void testFailureTopicName(){
 		NotificationService notificationService = new NotificationService(null,null,null);
 		assertEquals(HttpStatus.BAD_REQUEST, notificationService.getResponseCode());
-		assertEquals(XACMLErrorConstants.ERROR_DATA_ISSUE + "org.openecomp.policy.api.PolicyException: Notification Topic is null", notificationService.getResult());
+		assertEquals(XACMLErrorConstants.ERROR_DATA_ISSUE + "org.onap.policy.api.PolicyException: Notification Topic is null", notificationService.getResult());
 		notificationService = new NotificationService(" ",null,null);
 		assertEquals(HttpStatus.BAD_REQUEST, notificationService.getResponseCode());
-		assertEquals(XACMLErrorConstants.ERROR_DATA_ISSUE + "org.openecomp.policy.api.PolicyException: Notification Topic is not valid. ", notificationService.getResult());
+		assertEquals(XACMLErrorConstants.ERROR_DATA_ISSUE + "org.onap.policy.api.PolicyException: Notification Topic is not valid. ", notificationService.getResult());
 	}
 	
 	@Test
diff --git a/ECOMP-PDP-REST/src/test/java/org/openecomp/policy/pdp/rest/api/test/PolicyEngineServicesTest.java b/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/test/PolicyEngineServicesTest.java
index eb514a8f5..2a76f581c 100644
--- a/ECOMP-PDP-REST/src/test/java/org/openecomp/policy/pdp/rest/api/test/PolicyEngineServicesTest.java
+++ b/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/test/PolicyEngineServicesTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP-REST
+ * ONAP-PDP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.pdp.rest.api.test;
+package org.onap.policy.pdp.rest.api.test;
 
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
@@ -37,26 +37,26 @@ import java.util.UUID;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.openecomp.policy.api.AttributeType;
-import org.openecomp.policy.api.ConfigRequestParameters;
-import org.openecomp.policy.api.DecisionRequestParameters;
-import org.openecomp.policy.api.DeletePolicyCondition;
-import org.openecomp.policy.api.DeletePolicyParameters;
-import org.openecomp.policy.api.DictionaryParameters;
-import org.openecomp.policy.api.DictionaryType;
-import org.openecomp.policy.api.EventRequestParameters;
-import org.openecomp.policy.api.PolicyClass;
-import org.openecomp.policy.api.PolicyConfigType;
-import org.openecomp.policy.api.PolicyParameters;
-import org.openecomp.policy.api.PolicyType;
-import org.openecomp.policy.api.PushPolicyParameters;
-import org.openecomp.policy.pdp.rest.XACMLPdpServlet;
-import org.openecomp.policy.pdp.rest.api.models.ConfigFirewallPolicyAPIRequest;
-import org.openecomp.policy.pdp.rest.api.models.ConfigNameRequest;
-import org.openecomp.policy.pdp.rest.api.models.ConfigPolicyAPIRequest;
-import org.openecomp.policy.pdp.rest.api.services.CreateUpdatePolicyServiceImpl;
-import org.openecomp.policy.pdp.rest.config.PDPRestConfig;
-import org.openecomp.policy.utils.PolicyUtils;
+import org.onap.policy.api.AttributeType;
+import org.onap.policy.api.ConfigRequestParameters;
+import org.onap.policy.api.DecisionRequestParameters;
+import org.onap.policy.api.DeletePolicyCondition;
+import org.onap.policy.api.DeletePolicyParameters;
+import org.onap.policy.api.DictionaryParameters;
+import org.onap.policy.api.DictionaryType;
+import org.onap.policy.api.EventRequestParameters;
+import org.onap.policy.api.PolicyClass;
+import org.onap.policy.api.PolicyConfigType;
+import org.onap.policy.api.PolicyParameters;
+import org.onap.policy.api.PolicyType;
+import org.onap.policy.api.PushPolicyParameters;
+import org.onap.policy.pdp.rest.XACMLPdpServlet;
+import org.onap.policy.pdp.rest.api.models.ConfigFirewallPolicyAPIRequest;
+import org.onap.policy.pdp.rest.api.models.ConfigNameRequest;
+import org.onap.policy.pdp.rest.api.models.ConfigPolicyAPIRequest;
+import org.onap.policy.pdp.rest.api.services.CreateUpdatePolicyServiceImpl;
+import org.onap.policy.pdp.rest.config.PDPRestConfig;
+import org.onap.policy.utils.PolicyUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
@@ -120,9 +120,9 @@ public class PolicyEngineServicesTest {
 		pep.setPolicyName(".*");
 		mockMvc.perform(post("/getConfig").content(PolicyUtils.objectToJsonString(pep)).headers(headers).header(UUIDHEADER, UUID.randomUUID()).contentType(MediaType.APPLICATION_JSON))
 				.andExpect(status().isOk());
-		// Without policyName and using ecompName and other fields. 
+		// Without policyName and using onapName and other fields. 
 		pep.setPolicyName(null);
-		pep.setEcompName("test");
+		pep.setOnapName("test");
 		pep.setConfigName("test");
 		mockMvc.perform(post("/getConfig").content(PolicyUtils.objectToJsonString(pep)).headers(headers).contentType(MediaType.APPLICATION_JSON))
 		.andExpect(status().isOk());
@@ -236,7 +236,7 @@ public class PolicyEngineServicesTest {
 		DecisionRequestParameters pep = new DecisionRequestParameters();
 		Map<String,String> eventAttributes = new HashMap<>();
 		eventAttributes.put("TEST", "test");
-		pep.setECOMPComponentName("te123");
+		pep.setONAPComponentName("te123");
 		pep.setDecisionAttributes(eventAttributes);
 		//Failure Tests. 
 		mockMvc.perform(post("/getDecision")).andExpect(status().isBadRequest());
@@ -245,10 +245,10 @@ public class PolicyEngineServicesTest {
 		mockMvc.perform(post("/getDecision").content(PolicyUtils.objectToJsonString(pep)).contentType(MediaType.APPLICATION_JSON)
 				.headers(headers).header(UUIDHEADER, "123")).andExpect(status().isOk());
 		pep.setDecisionAttributes(null);
-		pep.setECOMPComponentName(null);
+		pep.setONAPComponentName(null);
 		mockMvc.perform(post("/getDecision").content(PolicyUtils.objectToJsonString(pep)).contentType(MediaType.APPLICATION_JSON)
 				.headers(headers).header(UUIDHEADER, UUID.randomUUID())).andExpect(status().isBadRequest());
-		pep.setECOMPComponentName("testing");
+		pep.setONAPComponentName("testing");
 		mockMvc.perform(post("/getDecision").content(PolicyUtils.objectToJsonString(pep)).contentType(MediaType.APPLICATION_JSON)
 				.headers(headers)).andExpect(status().isBadRequest());
 		pep.setDecisionAttributes(eventAttributes);
@@ -490,10 +490,10 @@ public class PolicyEngineServicesTest {
 		pep.setRiskLevel("4");
 		mockMvc.perform(put("/createPolicy").content(PolicyUtils.objectToJsonString(pep)).contentType(MediaType.APPLICATION_JSON)
 				.headers(headers)).andExpect(status().isBadRequest());
-		pep.setEcompName("ec nam-e");
+		pep.setOnapName("ec nam-e");
 		mockMvc.perform(put("/createPolicy").content(PolicyUtils.objectToJsonString(pep)).contentType(MediaType.APPLICATION_JSON)
 				.headers(headers)).andExpect(status().isBadRequest());
-		pep.setEcompName("ecompName");
+		pep.setOnapName("onapName");
 		pep.setConfigName("tes config");
 		mockMvc.perform(put("/createPolicy").content(PolicyUtils.objectToJsonString(pep)).contentType(MediaType.APPLICATION_JSON)
 				.headers(headers)).andExpect(status().isBadRequest());
@@ -535,10 +535,10 @@ public class PolicyEngineServicesTest {
 		pep.setConfigBody("{\"key\":\"value\"}");
 		mockMvc.perform(put("/createPolicy").content(PolicyUtils.objectToJsonString(pep)).contentType(MediaType.APPLICATION_JSON)
 				.headers(headers)).andExpect(status().isBadRequest());
-		pep.setConfigBody("{\"ecompname\":\"\"}");
+		pep.setConfigBody("{\"onapname\":\"\"}");
 		mockMvc.perform(put("/createPolicy").content(PolicyUtils.objectToJsonString(pep)).contentType(MediaType.APPLICATION_JSON)
 				.headers(headers)).andExpect(status().isBadRequest());
-		pep.setConfigBody("{\"ecompname\":\"test\"}");
+		pep.setConfigBody("{\"onapname\":\"test\"}");
 		mockMvc.perform(put("/createPolicy").content(PolicyUtils.objectToJsonString(pep)).contentType(MediaType.APPLICATION_JSON)
 				.headers(headers)).andExpect(status().isInternalServerError());
 		pep.setRiskLevel("test");
@@ -574,13 +574,13 @@ public class PolicyEngineServicesTest {
 		pep.setConfigBody("{\"key\":\"value\"}");
 		mockMvc.perform(put("/createPolicy").content(PolicyUtils.objectToJsonString(pep)).contentType(MediaType.APPLICATION_JSON)
 				.headers(headers)).andExpect(status().isBadRequest());
-		pep.setConfigBody("{\"ecompname\":\"\"}");
+		pep.setConfigBody("{\"onapname\":\"\"}");
 		mockMvc.perform(put("/createPolicy").content(PolicyUtils.objectToJsonString(pep)).contentType(MediaType.APPLICATION_JSON)
 				.headers(headers)).andExpect(status().isBadRequest());
-		pep.setConfigBody("{\"ecompname\":\"test\"}");
+		pep.setConfigBody("{\"onapname\":\"test\"}");
 		mockMvc.perform(put("/createPolicy").content(PolicyUtils.objectToJsonString(pep)).contentType(MediaType.APPLICATION_JSON)
 				.headers(headers)).andExpect(status().isBadRequest());
-		pep.setConfigBody("{\"ecompname\":\"test\", \"serviceTypePolicyName\":\"value\"}");
+		pep.setConfigBody("{\"onapname\":\"test\", \"serviceTypePolicyName\":\"value\"}");
 		mockMvc.perform(put("/createPolicy").content(PolicyUtils.objectToJsonString(pep)).contentType(MediaType.APPLICATION_JSON)
 				.headers(headers)).andExpect(status().isInternalServerError());
 		pep.setRiskLevel("test");
@@ -644,10 +644,10 @@ public class PolicyEngineServicesTest {
 		mockMvc.perform(put("/createPolicy").content(PolicyUtils.objectToJsonString(pep)).contentType(MediaType.APPLICATION_JSON)
 				.headers(headers)).andExpect(status().isBadRequest());
 		pep.setConfigBody("{\"test\":\"test\"}");
-		pep.setEcompName("   ");
+		pep.setOnapName("   ");
 		mockMvc.perform(put("/createPolicy").content(PolicyUtils.objectToJsonString(pep)).contentType(MediaType.APPLICATION_JSON)
 				.headers(headers)).andExpect(status().isBadRequest());
-		pep.setEcompName("testecomp");
+		pep.setOnapName("testonap");
 		pep.setRiskLevel("fail");
 		mockMvc.perform(put("/createPolicy").content(PolicyUtils.objectToJsonString(pep)).contentType(MediaType.APPLICATION_JSON)
 				.headers(headers)).andExpect(status().isBadRequest());
@@ -700,7 +700,7 @@ public class PolicyEngineServicesTest {
 		pep.setPolicyClass(PolicyClass.Decision);
 		mockMvc.perform(put("/createPolicy").content(PolicyUtils.objectToJsonString(pep)).contentType(MediaType.APPLICATION_JSON)
 				.headers(headers)).andExpect(status().isBadRequest());
-		pep.setEcompName("xyz");
+		pep.setOnapName("xyz");
 		mockMvc.perform(put("/createPolicy").content(PolicyUtils.objectToJsonString(pep)).contentType(MediaType.APPLICATION_JSON)
 				.headers(headers)).andExpect(status().isInternalServerError());
 		attributes.remove(AttributeType.MATCHING);
@@ -758,7 +758,7 @@ public class PolicyEngineServicesTest {
 		pep.setDictionaryType(DictionaryType.Common);
 		mockMvc.perform(post("/getDictionaryItems").content(PolicyUtils.objectToJsonString(pep)).contentType(MediaType.APPLICATION_JSON)
 				.headers(headers).header(UUIDHEADER, UUID.randomUUID().toString())).andExpect(status().isBadRequest());
-		pep.setDictionary("EcompName");
+		pep.setDictionary("OnapName");
 		mockMvc.perform(post("/getDictionaryItems").content(PolicyUtils.objectToJsonString(pep)).contentType(MediaType.APPLICATION_JSON)
 				.headers(headers)).andExpect(status().isInternalServerError());
 		pep.setRequestID(UUID.randomUUID());
diff --git a/ECOMP-PDP-REST/src/test/java/org/openecomp/policy/pdp/rest/api/test/getConfigTest.java b/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/test/getConfigTest.java
index ebe86b0d8..2d79b234a 100644
--- a/ECOMP-PDP-REST/src/test/java/org/openecomp/policy/pdp/rest/api/test/getConfigTest.java
+++ b/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/test/getConfigTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP-REST
+ * ONAP-PDP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.pdp.rest.api.test;
+package org.onap.policy.pdp.rest.api.test;
 
 import static org.junit.Assert.assertEquals;
 
@@ -30,10 +30,10 @@ import java.util.List;
 import java.util.Map;
 
 import org.junit.Test;
-import org.openecomp.policy.api.ConfigRequestParameters;
-import org.openecomp.policy.api.PolicyConfigStatus;
-import org.openecomp.policy.pdp.rest.api.models.PolicyConfig;
-import org.openecomp.policy.pdp.rest.api.services.GetConfigService;
+import org.onap.policy.api.ConfigRequestParameters;
+import org.onap.policy.api.PolicyConfigStatus;
+import org.onap.policy.pdp.rest.api.models.PolicyConfig;
+import org.onap.policy.pdp.rest.api.services.GetConfigService;
 
 public class getConfigTest {
 	private static final String TEST = "test";
@@ -51,7 +51,7 @@ public class getConfigTest {
 		assertEquals(PolicyConfigStatus.CONFIG_NOT_FOUND, filterResults.get(0).getPolicyConfigStatus());
 		// Check again with some values 
 		configRequestParameters.setPolicyName(TEST);
-		configRequestParameters.setEcompName(TEST);
+		configRequestParameters.setOnapName(TEST);
 		configRequestParameters.setConfigName(TEST);
 		Map<String,String> configAttributes = new HashMap<>();
 		configAttributes.put(TEST, TEST);
@@ -59,7 +59,7 @@ public class getConfigTest {
 		PolicyConfig pConfig = new PolicyConfig();
 		pConfig.setPolicyName(TEST);
 		Map<String,String> matching = new HashMap<>();
-		matching.put("ECOMPName", TEST);
+		matching.put("ONAPName", TEST);
 		matching.put("ConfigName", TEST);
 		matching.put("TEST", TEST);
 		pConfig.setMatchingConditions(matching);
diff --git a/ECOMP-PDP-REST/src/test/java/org/openecomp/policy/pdp/rest/api/test/getDictionaryTest.java b/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/test/getDictionaryTest.java
index 3ade07ccb..e18f8bb03 100644
--- a/ECOMP-PDP-REST/src/test/java/org/openecomp/policy/pdp/rest/api/test/getDictionaryTest.java
+++ b/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/test/getDictionaryTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP-REST
+ * ONAP-PDP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.pdp.rest.api.test;
+package org.onap.policy.pdp.rest.api.test;
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
@@ -25,8 +25,8 @@ import static org.junit.Assert.assertNull;
 import java.lang.reflect.Method;
 
 import org.junit.Test;
-import org.openecomp.policy.api.DictionaryParameters;
-import org.openecomp.policy.pdp.rest.api.services.GetDictionaryService;
+import org.onap.policy.api.DictionaryParameters;
+import org.onap.policy.pdp.rest.api.services.GetDictionaryService;
 
 public class getDictionaryTest {
 	
@@ -43,7 +43,7 @@ public class getDictionaryTest {
 		String result = (String) formatDictionary.invoke(gds, input);
 		assertNull(result);
 		//
-		dp.setDictionary("EcompName");
+		dp.setDictionary("OnapName");
 		gds = new GetDictionaryService(dp, null);
 		result = (String) formatDictionary.invoke(gds, input);
 		assertNotNull(result);
diff --git a/ECOMP-PDP-REST/src/test/java/org/openecomp/policy/pdp/rest/auth/test/FilterTests.java b/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/auth/test/FilterTests.java
index 944dd90a9..88369850f 100644
--- a/ECOMP-PDP-REST/src/test/java/org/openecomp/policy/pdp/rest/auth/test/FilterTests.java
+++ b/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/auth/test/FilterTests.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP-REST
+ * ONAP-PDP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pdp.rest.auth.test;
+package org.onap.policy.pdp.rest.auth.test;
 
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
@@ -33,7 +33,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.openecomp.policy.pdp.rest.restAuth.PDPAuthenticationFilter;
+import org.onap.policy.pdp.rest.restAuth.PDPAuthenticationFilter;
 
 import com.att.research.xacml.util.XACMLProperties;
 import com.mockrunner.mock.web.MockRequestDispatcher;
diff --git a/ECOMP-PDP-REST/src/test/resources/client.properties b/ONAP-PDP-REST/src/test/resources/client.properties
index 13aa106cd..13aa106cd 100644
--- a/ECOMP-PDP-REST/src/test/resources/client.properties
+++ b/ONAP-PDP-REST/src/test/resources/client.properties
diff --git a/ECOMP-PDP-REST/src/test/resources/fail.xacml.pdp.properties b/ONAP-PDP-REST/src/test/resources/fail.xacml.pdp.properties
index 52ca6ab92..a16b422bf 100644
--- a/ECOMP-PDP-REST/src/test/resources/fail.xacml.pdp.properties
+++ b/ONAP-PDP-REST/src/test/resources/fail.xacml.pdp.properties
@@ -1,6 +1,6 @@
 ###
 # ============LICENSE_START=======================================================
-# ECOMP-PDP-REST
+# ONAP-PDP-REST
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
@@ -25,24 +25,24 @@
 xacml.dataTypeFactory=com.att.research.xacml.std.StdDataTypeFactory
 xacml.pdpEngineFactory=com.att.research.xacmlatt.pdp.ATTPDPEngineFactory
 xacml.pepEngineFactory=com.att.research.xacml.std.pep.StdEngineFactory
-# NOT USED SEE BELOW xacml.pipFinderFactory=org.openecomp.policy.xacml.std.pip.StdPIPFinderFactory
+# NOT USED SEE BELOW xacml.pipFinderFactory=org.onap.policy.xacml.std.pip.StdPIPFinderFactory
 xacml.traceEngineFactory=com.att.research.xacml.std.trace.LoggingTraceEngineFactory
 #
 # AT&T PDP Implementation Factories
 #
 xacml.att.evaluationContextFactory=com.att.research.xacmlatt.pdp.std.StdEvaluationContextFactory
 xacml.att.combiningAlgorithmFactory=com.att.research.xacmlatt.pdp.std.StdCombiningAlgorithmFactory
-xacml.att.functionDefinitionFactory=org.openecomp.policy.xacml.custom.EcompFunctionDefinitionFactory
-# NOT USED SEE BELOW xacml.att.policyFinderFactory=org.openecomp.policy.pdp.std.StdPolicyFinderFactory
+xacml.att.functionDefinitionFactory=org.onap.policy.xacml.custom.OnapFunctionDefinitionFactory
+# NOT USED SEE BELOW xacml.att.policyFinderFactory=org.onap.policy.pdp.std.StdPolicyFinderFactory
 # creteUpdate Policy Implementation Class details. 
-createUpdatePolicy.impl.className=org.openecomp.policy.pdp.rest.api.services.CreateUpdatePolicyServiceImpl
+createUpdatePolicy.impl.className=org.onap.policy.pdp.rest.api.services.CreateUpdatePolicyServiceImpl
 # AAF Implementation class details
-aafClient.impl.className=org.openecomp.policy.utils.AAFPolicyClientImpl
+aafClient.impl.className=org.onap.policy.utils.AAFPolicyClientImpl
 #
 # AT&T RESTful PDP Implementation Factories
 #
-xacml.pipFinderFactory=org.openecomp.policy.pdp.rest.impl.XACMLPdpPIPFinderFactory
-xacml.att.policyFinderFactory=org.openecomp.policy.pdp.rest.XACMLPdpPolicyFinderFactory
+xacml.pipFinderFactory=org.onap.policy.pdp.rest.impl.XACMLPdpPIPFinderFactory
+xacml.att.policyFinderFactory=org.onap.policy.pdp.rest.XACMLPdpPolicyFinderFactory
 #
 # When set to true, this flag tells the StdPolicyFinderFactory to combined all the root policy files into
 # into one PolicySet and use the given Policy Algorithm.
@@ -164,7 +164,7 @@ ENVIRONMENT=DEVL
 xacml.rest.pep.idfile = src/test/resources/client.properties
 
 #AAF Policy Name space
-#Not Mandatory for Open Ecomp
+#Not Mandatory for Open Onap
 policy.aaf.namespace = 
 policy.aaf.resource = 
 #
diff --git a/ECOMP-PDP-REST/src/test/resources/pass.xacml.pdp.properties b/ONAP-PDP-REST/src/test/resources/pass.xacml.pdp.properties
index 0fe3e2aee..c9a111012 100644
--- a/ECOMP-PDP-REST/src/test/resources/pass.xacml.pdp.properties
+++ b/ONAP-PDP-REST/src/test/resources/pass.xacml.pdp.properties
@@ -1,6 +1,6 @@
 ###
 # ============LICENSE_START=======================================================
-# ECOMP-PDP-REST
+# ONAP-PDP-REST
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
@@ -25,24 +25,24 @@
 xacml.dataTypeFactory=com.att.research.xacml.std.StdDataTypeFactory
 xacml.pdpEngineFactory=com.att.research.xacmlatt.pdp.ATTPDPEngineFactory
 xacml.pepEngineFactory=com.att.research.xacml.std.pep.StdEngineFactory
-# NOT USED SEE BELOW xacml.pipFinderFactory=org.openecomp.policy.xacml.std.pip.StdPIPFinderFactory
+# NOT USED SEE BELOW xacml.pipFinderFactory=org.onap.policy.xacml.std.pip.StdPIPFinderFactory
 xacml.traceEngineFactory=com.att.research.xacml.std.trace.LoggingTraceEngineFactory
 #
 # AT&T PDP Implementation Factories
 #
 xacml.att.evaluationContextFactory=com.att.research.xacmlatt.pdp.std.StdEvaluationContextFactory
 xacml.att.combiningAlgorithmFactory=com.att.research.xacmlatt.pdp.std.StdCombiningAlgorithmFactory
-xacml.att.functionDefinitionFactory=org.openecomp.policy.xacml.custom.EcompFunctionDefinitionFactory
-# NOT USED SEE BELOW xacml.att.policyFinderFactory=org.openecomp.policy.pdp.std.StdPolicyFinderFactory
+xacml.att.functionDefinitionFactory=org.onap.policy.xacml.custom.OnapFunctionDefinitionFactory
+# NOT USED SEE BELOW xacml.att.policyFinderFactory=org.onap.policy.pdp.std.StdPolicyFinderFactory
 # creteUpdate Policy Implementation Class details. 
-createUpdatePolicy.impl.className=org.openecomp.policy.pdp.rest.api.services.CreateUpdatePolicyServiceImpl
+createUpdatePolicy.impl.className=org.onap.policy.pdp.rest.api.services.CreateUpdatePolicyServiceImpl
 # AAF Implementation class details
-aafClient.impl.className=org.openecomp.policy.utils.AAFPolicyClientImpl
+aafClient.impl.className=org.onap.policy.utils.AAFPolicyClientImpl
 #
 # AT&T RESTful PDP Implementation Factories
 #
-xacml.pipFinderFactory=org.openecomp.policy.pdp.rest.impl.XACMLPdpPIPFinderFactory
-xacml.att.policyFinderFactory=org.openecomp.policy.pdp.rest.XACMLPdpPolicyFinderFactory
+xacml.pipFinderFactory=org.onap.policy.pdp.rest.impl.XACMLPdpPIPFinderFactory
+xacml.att.policyFinderFactory=org.onap.policy.pdp.rest.XACMLPdpPolicyFinderFactory
 #
 # When set to true, this flag tells the StdPolicyFinderFactory to combined all the root policy files into
 # into one PolicySet and use the given Policy Algorithm.
@@ -164,7 +164,7 @@ ENVIRONMENT=DEVL
 xacml.rest.pep.idfile = src/test/resources/client.properties
 
 #AAF Policy Name space
-#Not Mandatory for Open Ecomp
+#Not Mandatory for Open Onap
 policy.aaf.namespace = 
 policy.aaf.resource = 
 #
diff --git a/ECOMP-PDP-REST/src/test/resources/test.drl b/ONAP-PDP-REST/src/test/resources/test.drl
index 2a58f5439..7accc63ae 100644
--- a/ECOMP-PDP-REST/src/test/resources/test.drl
+++ b/ONAP-PDP-REST/src/test/resources/test.drl
@@ -78,7 +78,7 @@ import org.onap.policy.mso.MSORelatedInstanceListElement;
 import org.onap.policy.mso.MSORelatedInstance;
 import org.onap.policy.mso.MSOResponse;
 
-import org.openecomp.policy.drools.system.PolicyEngine;
+import org.onap.policy.drools.system.PolicyEngine;
 
 //
 // These parameters are required to build the runtime policy
@@ -101,7 +101,7 @@ end
 /*
 *
 * Called once and only once to insert the parameters into working memory for this Closed Loop policy.
-* (Comment SETUP rule out for the first ECOMP opensource release since policy BRMS_GW already puts a Params fact in there)
+* (Comment SETUP rule out for the first ONAP opensource release since policy BRMS_GW already puts a Params fact in there)
 *
 *
 *rule "${policyName}.SETUP"
diff --git a/ECOMP-PDP-REST/xacml.pdp.properties b/ONAP-PDP-REST/xacml.pdp.properties
index 7631d00e7..b88c93543 100644
--- a/ECOMP-PDP-REST/xacml.pdp.properties
+++ b/ONAP-PDP-REST/xacml.pdp.properties
@@ -1,6 +1,6 @@
 ###
 # ============LICENSE_START=======================================================
-# ECOMP-PDP-REST
+# ONAP-PDP-REST
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
@@ -25,24 +25,24 @@
 xacml.dataTypeFactory=com.att.research.xacml.std.StdDataTypeFactory
 xacml.pdpEngineFactory=com.att.research.xacmlatt.pdp.ATTPDPEngineFactory
 xacml.pepEngineFactory=com.att.research.xacml.std.pep.StdEngineFactory
-# NOT USED SEE BELOW xacml.pipFinderFactory=org.openecomp.policy.xacml.std.pip.StdPIPFinderFactory
+# NOT USED SEE BELOW xacml.pipFinderFactory=org.onap.policy.xacml.std.pip.StdPIPFinderFactory
 xacml.traceEngineFactory=com.att.research.xacml.std.trace.LoggingTraceEngineFactory
 #
 # AT&T PDP Implementation Factories
 #
 xacml.att.evaluationContextFactory=com.att.research.xacmlatt.pdp.std.StdEvaluationContextFactory
 xacml.att.combiningAlgorithmFactory=com.att.research.xacmlatt.pdp.std.StdCombiningAlgorithmFactory
-xacml.att.functionDefinitionFactory=org.openecomp.policy.xacml.custom.EcompFunctionDefinitionFactory
-# NOT USED SEE BELOW xacml.att.policyFinderFactory=org.openecomp.policy.pdp.std.StdPolicyFinderFactory
+xacml.att.functionDefinitionFactory=org.onap.policy.xacml.custom.OnapFunctionDefinitionFactory
+# NOT USED SEE BELOW xacml.att.policyFinderFactory=org.onap.policy.pdp.std.StdPolicyFinderFactory
 # creteUpdate Policy Implementation Class details. 
-createUpdatePolicy.impl.className=org.openecomp.policy.pdp.rest.api.services.CreateUpdatePolicyServiceImpl
+createUpdatePolicy.impl.className=org.onap.policy.pdp.rest.api.services.CreateUpdatePolicyServiceImpl
 # AAF Implementation class details
-aafClient.impl.className=org.openecomp.policy.utils.AAFPolicyClientImpl
+aafClient.impl.className=org.onap.policy.utils.AAFPolicyClientImpl
 #
 # AT&T RESTful PDP Implementation Factories
 #
-xacml.pipFinderFactory=org.openecomp.policy.pdp.rest.impl.XACMLPdpPIPFinderFactory
-xacml.att.policyFinderFactory=org.openecomp.policy.pdp.rest.XACMLPdpPolicyFinderFactory
+xacml.pipFinderFactory=org.onap.policy.pdp.rest.impl.XACMLPdpPIPFinderFactory
+xacml.att.policyFinderFactory=org.onap.policy.pdp.rest.XACMLPdpPolicyFinderFactory
 #
 # When set to true, this flag tells the StdPolicyFinderFactory to combined all the root policy files into
 # into one PolicySet and use the given Policy Algorithm.
@@ -123,7 +123,7 @@ REQUEST_BUFFER_SIZE=15
 
 #properties for MySql xacml database:  PLEASE DO NOT REMOVE... NEEDED FOR APIs
 javax.persistence.jdbc.driver=com.mysql.jdbc.Driver
-javax.persistence.jdbc.url=jdbc:mysql://localhost:3306/ecomp_sdk
+javax.persistence.jdbc.url=jdbc:mysql://localhost:3306/onap_sdk
 javax.persistence.jdbc.user=policy_user
 javax.persistence.jdbc.password=policy_user
 
@@ -164,7 +164,7 @@ ENVIRONMENT=DEVL
 xacml.rest.pep.idfile = client.properties
 
 #AAF Policy Name space
-#Not Mandatory for Open Ecomp
+#Not Mandatory for Open Onap
 policy.aaf.namespace = 
 policy.aaf.resource = 
 # Decision Response settings. 
diff --git a/ECOMP-PDP/.gitignore b/ONAP-PDP/.gitignore
index 74a25dfd0..74a25dfd0 100644
--- a/ECOMP-PDP/.gitignore
+++ b/ONAP-PDP/.gitignore
diff --git a/ECOMP-PDP/config_testing/test_PolicyEngine.xml b/ONAP-PDP/config_testing/test_PolicyEngine.xml
index e168ca2ab..13c126364 100644
--- a/ECOMP-PDP/config_testing/test_PolicyEngine.xml
+++ b/ONAP-PDP/config_testing/test_PolicyEngine.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <!--
   ============LICENSE_START=======================================================
-  ECOMP-PDP
+  ONAP-PDP
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
   ================================================================================
@@ -28,14 +28,14 @@
             <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:integer-greater-than">
                 <Description>CPU</Description>
                 <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:integer-one-and-only">
-                    <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="com:att:labs:ecomp:resource:vm:cpu" DataType="http://www.w3.org/2001/XMLSchema#integer" MustBePresent="true"/>
+                    <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="com:att:labs:onap:resource:vm:cpu" DataType="http://www.w3.org/2001/XMLSchema#integer" MustBePresent="true"/>
                 </Apply>
                 <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#integer">95</AttributeValue>
             </Apply>
             <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:integer-greater-than">
                 <Description>Memory</Description>
                 <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:integer-one-and-only">
-                    <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="com:att:labs:ecomp:resource:vm:memory" DataType="http://www.w3.org/2001/XMLSchema#integer" MustBePresent="true"/>
+                    <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="com:att:labs:onap:resource:vm:memory" DataType="http://www.w3.org/2001/XMLSchema#integer" MustBePresent="true"/>
                 </Apply>
                 <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#integer">95</AttributeValue>
             </Apply>
@@ -47,14 +47,14 @@
             <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:integer-greater-than">
                 <Description>CPU</Description>
                 <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:integer-one-and-only">
-                    <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="com:att:labs:ecomp:resource:vm:cpu" DataType="http://www.w3.org/2001/XMLSchema#integer" MustBePresent="true"/>
+                    <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="com:att:labs:onap:resource:vm:cpu" DataType="http://www.w3.org/2001/XMLSchema#integer" MustBePresent="true"/>
                 </Apply>
                 <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#integer">90</AttributeValue>
             </Apply>
             <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:integer-greater-than">
                 <Description>Memory</Description>
                 <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:integer-one-and-only">
-                    <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="com:att:labs:ecomp:resource:vm:memory" DataType="http://www.w3.org/2001/XMLSchema#integer" MustBePresent="true"/>
+                    <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="com:att:labs:onap:resource:vm:memory" DataType="http://www.w3.org/2001/XMLSchema#integer" MustBePresent="true"/>
                 </Apply>
                 <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#integer">90</AttributeValue>
             </Apply>
@@ -67,7 +67,7 @@
                 <AllOf>
                     <Match MatchId="urn:oasis:names:tc:xacml:3.0:function:string-equal-ignore-case">
                         <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">JSON</AttributeValue>
-                        <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ECOMPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
+                        <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ONAPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                     </Match>
                     <Match MatchId="urn:oasis:names:tc:xacml:3.0:function:string-equal-ignore-case">
                         <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">ACCESS</AttributeValue>
@@ -81,11 +81,11 @@
             </AnyOf>
         </Target>
         <AdviceExpressions>
-            <AdviceExpression AdviceId="com.att.labs.ecomp.advice.config" AppliesTo="Permit">
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+            <AdviceExpression AdviceId="com.att.labs.onap.advice.config" AppliesTo="Permit">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">Configuration</AttributeValue>
                 </AttributeAssignmentExpression>
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#anyURI">http://localhost:5443/config/test_json.json</AttributeValue>
                 </AttributeAssignmentExpression>
             </AdviceExpression>
@@ -98,7 +98,7 @@
                 <AllOf>
                     <Match MatchId="urn:oasis:names:tc:xacml:3.0:function:string-equal-ignore-case">
                         <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">JSON</AttributeValue>
-                        <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ECOMPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
+                        <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ONAPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                     </Match>
 					<Match MatchId="urn:oasis:names:tc:xacml:3.0:function:string-equal-ignore-case">
                         <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">JSONconfig</AttributeValue>
@@ -116,11 +116,11 @@
             </AnyOf>
         </Target>
         <AdviceExpressions>
-            <AdviceExpression AdviceId="com.att.labs.ecomp.advice.config" AppliesTo="Permit">
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+            <AdviceExpression AdviceId="com.att.labs.onap.advice.config" AppliesTo="Permit">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">Configuration</AttributeValue>
                 </AttributeAssignmentExpression>
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#anyURI">http://localhost:5443/config/test_json.json</AttributeValue>
                 </AttributeAssignmentExpression>
             </AdviceExpression>
@@ -133,7 +133,7 @@
                 <AllOf>
                     <Match MatchId="urn:oasis:names:tc:xacml:3.0:function:string-equal-ignore-case">
                         <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">XML</AttributeValue>
-                        <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ECOMPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
+                        <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ONAPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                     </Match>
                     <Match MatchId="urn:oasis:names:tc:xacml:3.0:function:string-equal-ignore-case">
                         <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">ACCESS</AttributeValue>
@@ -147,11 +147,11 @@
             </AnyOf>
         </Target>
         <AdviceExpressions>
-            <AdviceExpression AdviceId="com.att.labs.ecomp.advice.config" AppliesTo="Permit">
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+            <AdviceExpression AdviceId="com.att.labs.onap.advice.config" AppliesTo="Permit">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">Configuration</AttributeValue>
                 </AttributeAssignmentExpression>
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#anyURI">http://localhost:5443/config/test_xml.xml</AttributeValue>
                 </AttributeAssignmentExpression>
             </AdviceExpression>
@@ -164,7 +164,7 @@
                 <AllOf>
                     <Match MatchId="urn:oasis:names:tc:xacml:3.0:function:string-equal-ignore-case">
                         <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">XML</AttributeValue>
-                        <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ECOMPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
+                        <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ONAPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                     </Match>
 					<Match MatchId="urn:oasis:names:tc:xacml:3.0:function:string-equal-ignore-case">
                         <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">XMLConfig</AttributeValue>
@@ -182,11 +182,11 @@
             </AnyOf>
         </Target>
         <AdviceExpressions>
-            <AdviceExpression AdviceId="com.att.labs.ecomp.advice.config" AppliesTo="Permit">
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+            <AdviceExpression AdviceId="com.att.labs.onap.advice.config" AppliesTo="Permit">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">Configuration</AttributeValue>
                 </AttributeAssignmentExpression>
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#anyURI">http://localhost:5443/config/test_xml.xml</AttributeValue>
                 </AttributeAssignmentExpression>
             </AdviceExpression>
@@ -199,7 +199,7 @@
                 <AllOf>
                     <Match MatchId="urn:oasis:names:tc:xacml:3.0:function:string-equal-ignore-case">
                         <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">Properties</AttributeValue>
-                        <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ECOMPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
+                        <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ONAPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                     </Match>
                     <Match MatchId="urn:oasis:names:tc:xacml:3.0:function:string-equal-ignore-case">
                         <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">ACCESS</AttributeValue>
@@ -213,11 +213,11 @@
             </AnyOf>
         </Target>
         <AdviceExpressions>
-            <AdviceExpression AdviceId="com.att.labs.ecomp.advice.config" AppliesTo="Permit">
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+            <AdviceExpression AdviceId="com.att.labs.onap.advice.config" AppliesTo="Permit">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">Configuration</AttributeValue>
                 </AttributeAssignmentExpression>
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#anyURI">http://localhost:5443/config/test_prop.properties</AttributeValue>
                 </AttributeAssignmentExpression>
             </AdviceExpression>
@@ -230,7 +230,7 @@
                 <AllOf>
                     <Match MatchId="urn:oasis:names:tc:xacml:3.0:function:string-equal-ignore-case">
                         <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">Properties</AttributeValue>
-                        <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ECOMPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
+                        <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ONAPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                     </Match>
 					<Match MatchId="urn:oasis:names:tc:xacml:3.0:function:string-equal-ignore-case">
                         <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">PropConfig</AttributeValue>
@@ -248,11 +248,11 @@
             </AnyOf>
         </Target>
         <AdviceExpressions>
-            <AdviceExpression AdviceId="com.att.labs.ecomp.advice.config" AppliesTo="Permit">
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+            <AdviceExpression AdviceId="com.att.labs.onap.advice.config" AppliesTo="Permit">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">Configuration</AttributeValue>
                 </AttributeAssignmentExpression>
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#anyURI">http://localhost:5443/config/test_prop.properties</AttributeValue>
                 </AttributeAssignmentExpression>
             </AdviceExpression>
@@ -265,7 +265,7 @@
                 <AllOf>
                     <Match MatchId="urn:oasis:names:tc:xacml:3.0:function:string-equal-ignore-case">
                         <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">Other</AttributeValue>
-                        <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ECOMPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
+                        <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ONAPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                     </Match>
                     <Match MatchId="urn:oasis:names:tc:xacml:3.0:function:string-equal-ignore-case">
                         <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">ACCESS</AttributeValue>
@@ -279,11 +279,11 @@
             </AnyOf>
         </Target>
         <AdviceExpressions>
-            <AdviceExpression AdviceId="com.att.labs.ecomp.advice.config" AppliesTo="Permit">
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+            <AdviceExpression AdviceId="com.att.labs.onap.advice.config" AppliesTo="Permit">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">Configuration</AttributeValue>
                 </AttributeAssignmentExpression>
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#anyURI">http://localhost:5443/config/test_other.txt</AttributeValue>
                 </AttributeAssignmentExpression>
             </AdviceExpression>
@@ -296,7 +296,7 @@
                 <AllOf>
                     <Match MatchId="urn:oasis:names:tc:xacml:3.0:function:string-equal-ignore-case">
                         <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">Other</AttributeValue>
-                        <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ECOMPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
+                        <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ONAPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                     </Match>
 					<Match MatchId="urn:oasis:names:tc:xacml:3.0:function:string-equal-ignore-case">
                         <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">OtherConfig</AttributeValue>
@@ -314,11 +314,11 @@
             </AnyOf>
         </Target>
         <AdviceExpressions>
-            <AdviceExpression AdviceId="com.att.labs.ecomp.advice.config" AppliesTo="Permit">
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+            <AdviceExpression AdviceId="com.att.labs.onap.advice.config" AppliesTo="Permit">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">Configuration</AttributeValue>
                 </AttributeAssignmentExpression>
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#anyURI">http://localhost:5443/config/test_other.txt</AttributeValue>
                 </AttributeAssignmentExpression>
             </AdviceExpression>
@@ -331,7 +331,7 @@
                 <AllOf>
                     <Match MatchId="urn:oasis:names:tc:xacml:3.0:function:string-equal-ignore-case">
                         <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">JSON</AttributeValue>
-                        <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ECOMPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
+                        <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ONAPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                     </Match>
 					<Match MatchId="urn:oasis:names:tc:xacml:3.0:function:string-equal-ignore-case">
                         <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">JSONconfig</AttributeValue>
@@ -361,11 +361,11 @@
             </AnyOf>
         </Target>
         <AdviceExpressions>
-            <AdviceExpression AdviceId="com.att.labs.ecomp.advice.config" AppliesTo="Permit">
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+            <AdviceExpression AdviceId="com.att.labs.onap.advice.config" AppliesTo="Permit">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">Configuration</AttributeValue>
                 </AttributeAssignmentExpression>
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#anyURI">http://localhost:5443/config/test_json.json</AttributeValue>
                 </AttributeAssignmentExpression>
             </AdviceExpression>
@@ -378,7 +378,7 @@
                 <AllOf>
                     <Match MatchId="urn:oasis:names:tc:xacml:3.0:function:string-equal-ignore-case">
                         <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">XML</AttributeValue>
-                        <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ECOMPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
+                        <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ONAPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                     </Match>
 					<Match MatchId="urn:oasis:names:tc:xacml:3.0:function:string-equal-ignore-case">
                         <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">XMLConfig</AttributeValue>
@@ -408,11 +408,11 @@
             </AnyOf>
         </Target>
         <AdviceExpressions>
-            <AdviceExpression AdviceId="com.att.labs.ecomp.advice.config" AppliesTo="Permit">
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+            <AdviceExpression AdviceId="com.att.labs.onap.advice.config" AppliesTo="Permit">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">Configuration</AttributeValue>
                 </AttributeAssignmentExpression>
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#anyURI">http://localhost:5443/config/test_xml.xml</AttributeValue>
                 </AttributeAssignmentExpression>
             </AdviceExpression>
@@ -425,7 +425,7 @@
                 <AllOf>
                     <Match MatchId="urn:oasis:names:tc:xacml:3.0:function:string-equal-ignore-case">
                         <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">Properties</AttributeValue>
-                        <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ECOMPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
+                        <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ONAPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                     </Match>
 					<Match MatchId="urn:oasis:names:tc:xacml:3.0:function:string-equal-ignore-case">
                         <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">PropConfig</AttributeValue>
@@ -455,11 +455,11 @@
             </AnyOf>
         </Target>
         <AdviceExpressions>
-            <AdviceExpression AdviceId="com.att.labs.ecomp.advice.config" AppliesTo="Permit">
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+            <AdviceExpression AdviceId="com.att.labs.onap.advice.config" AppliesTo="Permit">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">Configuration</AttributeValue>
                 </AttributeAssignmentExpression>
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#anyURI">http://localhost:5443/config/test_prop.properties</AttributeValue>
                 </AttributeAssignmentExpression>
             </AdviceExpression>
@@ -472,7 +472,7 @@
                 <AllOf>
                     <Match MatchId="urn:oasis:names:tc:xacml:3.0:function:string-equal-ignore-case">
                         <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">Other</AttributeValue>
-                        <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ECOMPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
+                        <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ONAPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                     </Match>
 					<Match MatchId="urn:oasis:names:tc:xacml:3.0:function:string-equal-ignore-case">
                         <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">Otherconfig</AttributeValue>
@@ -502,11 +502,11 @@
             </AnyOf>
         </Target>
         <AdviceExpressions>
-            <AdviceExpression AdviceId="com.att.labs.ecomp.advice.config" AppliesTo="Permit">
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+            <AdviceExpression AdviceId="com.att.labs.onap.advice.config" AppliesTo="Permit">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">Configuration</AttributeValue>
                 </AttributeAssignmentExpression>
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#anyURI">http://localhost:5443/config/test_other.txt</AttributeValue>
                 </AttributeAssignmentExpression>
             </AdviceExpression>
@@ -536,12 +536,12 @@
             </Apply>
         </Condition>
         <ObligationExpressions>
-            <ObligationExpression ObligationId="com.att.labs.ecomp.obligation" FulfillOn="Permit">
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.obligation.restart" Category="urn:oasis:names:tc:xacml:1.0:subject-category:recipient-subject">
+            <ObligationExpression ObligationId="com.att.labs.onap.obligation" FulfillOn="Permit">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.obligation.restart" Category="urn:oasis:names:tc:xacml:1.0:subject-category:recipient-subject">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">Restart</AttributeValue>
                 </AttributeAssignmentExpression>
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.obligation.server" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
-                    <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="com:att:labs:ecomp:resource:server:name" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="true"/>
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.obligation.server" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+                    <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="com:att:labs:onap:resource:server:name" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="true"/>
                 </AttributeAssignmentExpression>
             </ObligationExpression>
         </ObligationExpressions>
@@ -566,8 +566,8 @@
             </Apply>
         </Condition>
         <ObligationExpressions>
-            <ObligationExpression ObligationId="com.att.labs.ecomp.obligation" FulfillOn="Permit">
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.obligation.spinoff" Category="urn:oasis:names:tc:xacml:1.0:subject-category:recipient-subject">
+            <ObligationExpression ObligationId="com.att.labs.onap.obligation" FulfillOn="Permit">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.obligation.spinoff" Category="urn:oasis:names:tc:xacml:1.0:subject-category:recipient-subject">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">SpinOff</AttributeValue>
                 </AttributeAssignmentExpression>
 				<AttributeAssignmentExpression AttributeId="performer" Category="urn:oasis:names:tc:xacml:1.0:subject-category:recipient-subject">
@@ -576,14 +576,14 @@
                 <AttributeAssignmentExpression AttributeId="type" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">REST</AttributeValue>
                 </AttributeAssignmentExpression>
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.obligation.server" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
-                    <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="com:att:labs:ecomp:resource:server:name" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="true"/>
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.obligation.server" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+                    <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="com:att:labs:onap:resource:server:name" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="true"/>
                 </AttributeAssignmentExpression>
 				<AttributeAssignmentExpression AttributeId="method" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">GET</AttributeValue>
                 </AttributeAssignmentExpression>
 				<AttributeAssignmentExpression AttributeId="URL" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
-                    <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#anyURI">http://localhost:8635/RESTjson/PDP/VM/$com.att.labs.ecomp.obligation.spinoff/$com.att.labs.ecomp.obligation.server</AttributeValue>
+                    <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#anyURI">http://localhost:8635/RESTjson/PDP/VM/$com.att.labs.onap.obligation.spinoff/$com.att.labs.onap.obligation.server</AttributeValue>
                 </AttributeAssignmentExpression>
             </ObligationExpression>
         </ObligationExpressions>
diff --git a/ECOMP-PDP/config_testing/xacml.pip.properties b/ONAP-PDP/config_testing/xacml.pip.properties
index 27b5b3e9b..e5974f481 100644
--- a/ECOMP-PDP/config_testing/xacml.pip.properties
+++ b/ONAP-PDP/config_testing/xacml.pip.properties
@@ -1,6 +1,6 @@
 ###
 # ============LICENSE_START=======================================================
-# ECOMP-PDP
+# ONAP-PDP
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
diff --git a/ECOMP-PDP/config_testing/xacml.policy.properties b/ONAP-PDP/config_testing/xacml.policy.properties
index 9990d375d..0fbaef976 100644
--- a/ECOMP-PDP/config_testing/xacml.policy.properties
+++ b/ONAP-PDP/config_testing/xacml.policy.properties
@@ -1,6 +1,6 @@
 ###
 # ============LICENSE_START=======================================================
-# ECOMP-PDP
+# ONAP-PDP
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
diff --git a/ECOMP-PDP/logging.properties b/ONAP-PDP/logging.properties
index 747d39b30..d25697ea8 100644
--- a/ECOMP-PDP/logging.properties
+++ b/ONAP-PDP/logging.properties
@@ -1,6 +1,6 @@
 ###
 # ============LICENSE_START=======================================================
-# ECOMP-PDP
+# ONAP-PDP
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
diff --git a/ECOMP-PDP/policyLogger.properties b/ONAP-PDP/policyLogger.properties
index 0e9957442..35c893b3e 100644
--- a/ECOMP-PDP/policyLogger.properties
+++ b/ONAP-PDP/policyLogger.properties
@@ -1,6 +1,6 @@
 ###
 # ============LICENSE_START=======================================================
-# ECOMP-PDP
+# ONAP-PDP
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
diff --git a/ECOMP-PDP/pom.xml b/ONAP-PDP/pom.xml
index 9aa5d6fd7..b82e22346 100644
--- a/ECOMP-PDP/pom.xml
+++ b/ONAP-PDP/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   ============LICENSE_START=======================================================
-  ECOMP Policy Engine
+  ONAP Policy Engine
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
   ================================================================================
@@ -24,19 +24,19 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
 	<modelVersion>4.0.0</modelVersion>
-	<artifactId>ECOMP-PDP</artifactId>
-	<description>ECOMP-PDP</description>
+	<artifactId>ONAP-PDP</artifactId>
+	<description>ONAP-PDP</description>
 	<packaging>jar</packaging>
 	<parent>
-		<groupId>org.openecomp.policy.engine</groupId>
+		<groupId>org.onap.policy.engine</groupId>
 		<artifactId>PolicyEngineSuite</artifactId>
 		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 	<dependencies>
 		<dependency>
-			<groupId>org.openecomp.policy.engine</groupId>
+			<groupId>org.onap.policy.engine</groupId>
 			<version>${project.version}</version>
-			<artifactId>ECOMP-REST</artifactId>
+			<artifactId>ONAP-REST</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.httpcomponents</groupId>
diff --git a/ECOMP-PDP/sql/xacmlTest.mv.db b/ONAP-PDP/sql/xacmlTest.mv.db
index 81e99a969..81e99a969 100644
--- a/ECOMP-PDP/sql/xacmlTest.mv.db
+++ b/ONAP-PDP/sql/xacmlTest.mv.db
diff --git a/ECOMP-PDP/src/main/java/org/openecomp/policy/xacml/action/FindAction.java b/ONAP-PDP/src/main/java/org/onap/policy/xacml/action/FindAction.java
index 5419b8946..c6a889821 100644
--- a/ECOMP-PDP/src/main/java/org/openecomp/policy/xacml/action/FindAction.java
+++ b/ONAP-PDP/src/main/java/org/onap/policy/xacml/action/FindAction.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP
+ * ONAP-PDP
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.xacml.action;
+package org.onap.policy.xacml.action;
 
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
@@ -39,9 +39,9 @@ import org.apache.http.client.methods.HttpPost;
 import org.apache.http.client.methods.HttpPut;
 import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.DefaultHttpClient;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.rest.XACMLRestProperties;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.rest.XACMLRestProperties;
 
 import com.att.research.xacml.api.Advice;
 import com.att.research.xacml.api.Attribute;
@@ -182,15 +182,15 @@ public class FindAction {
 			callRest();
 			// Including the Results in an Advice
 			Identifier id = new IdentifierImpl(
-					"org:openecomp:policy:pdp:reply");
+					"org.onap.policy:pdp:reply");
 			Identifier statId = new IdentifierImpl(
-					"org:openecomp:ecomp:policy:pdp:reply:status");
+					"org:onap:onap:policy:pdp:reply:status");
 			Identifier statCategory = new IdentifierImpl(
 					"urn:oasis:names:tc:xacml:1.0:subject-category:recipient-subject");
 			Identifier strId = new IdentifierImpl(
 					"http://www.w3.org/2001/XMLSchema#string");
 			Identifier resId = new IdentifierImpl(
-					"org:openecomp:ecomp:policy:pdp:reply:resource");
+					"org:onap:onap:policy:pdp:reply:resource");
 			Identifier resCategory = new IdentifierImpl(
 					"urn:oasis:names:tc:xacml:3.0:attribute-category:resource");
 			Identifier urlId = new IdentifierImpl(
diff --git a/ECOMP-PDP/src/main/java/org/openecomp/policy/xacml/action/package-info.java b/ONAP-PDP/src/main/java/org/onap/policy/xacml/action/package-info.java
index 88ecc78c2..82c6182b9 100644
--- a/ECOMP-PDP/src/main/java/org/openecomp/policy/xacml/action/package-info.java
+++ b/ONAP-PDP/src/main/java/org/onap/policy/xacml/action/package-info.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP
+ * ONAP-PDP
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,10 +18,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.xacml.action;
+package org.onap.policy.xacml.action;
 
 /**
- * org.openecomp.policy.xacml.action contains the implementation of the PDP Actions.
+ * org.onap.policy.xacml.action contains the implementation of the PDP Actions.
  * Changes: 
  * 	Now PDP supports actions based on PUT, GET, POST methods 
  * 
diff --git a/ECOMP-PDP/src/main/java/org/openecomp/policy/xacml/custom/EcompFunctionDefinitionFactory.java b/ONAP-PDP/src/main/java/org/onap/policy/xacml/custom/OnapFunctionDefinitionFactory.java
index 2cb8e67ae..87075f9bb 100644
--- a/ECOMP-PDP/src/main/java/org/openecomp/policy/xacml/custom/EcompFunctionDefinitionFactory.java
+++ b/ONAP-PDP/src/main/java/org/onap/policy/xacml/custom/OnapFunctionDefinitionFactory.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP
+ * ONAP-PDP
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,16 +17,16 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.xacml.custom;
+package org.onap.policy.xacml.custom;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.xacml.pdp.std.functions.FunctionDefinitionCustomRegexpMatch;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.xacml.pdp.std.functions.FunctionDefinitionCustomRegexpMatch;
 
 import com.att.research.xacml.api.Identifier;
 import com.att.research.xacml.std.IdentifierImpl;
@@ -35,12 +35,12 @@ import com.att.research.xacmlatt.pdp.policy.FunctionDefinition;
 import com.att.research.xacmlatt.pdp.policy.FunctionDefinitionFactory;
 import com.att.research.xacmlatt.pdp.std.StdFunctions;
 
-public class EcompFunctionDefinitionFactory extends FunctionDefinitionFactory {
-	private static Logger logger = FlexLogger.getLogger(EcompFunctionDefinitionFactory.class);
+public class OnapFunctionDefinitionFactory extends FunctionDefinitionFactory {
+	private static Logger logger = FlexLogger.getLogger(OnapFunctionDefinitionFactory.class);
 	private static Map<Identifier,FunctionDefinition> 	mapFunctionDefinitions	= new HashMap<>();
 	private static boolean								needMapInit				= true;
 
-	public static final Identifier ID_FUNCTION_CUSTOM_REGEXP_MATCH						= new IdentifierImpl("org.openecomp.function.regex-match");
+	public static final Identifier ID_FUNCTION_CUSTOM_REGEXP_MATCH						= new IdentifierImpl("org.onap.function.regex-match");
 	
 	private static final FunctionDefinition FD_CUSTOM_REGEXP_MATCH = new FunctionDefinitionCustomRegexpMatch<>(ID_FUNCTION_CUSTOM_REGEXP_MATCH, DataTypes.DT_STRING);
 
@@ -77,7 +77,7 @@ public class EcompFunctionDefinitionFactory extends FunctionDefinitionFactory {
 		}
 	}
 	
-	public EcompFunctionDefinitionFactory() {
+	public OnapFunctionDefinitionFactory() {
 		initMap();
 	}
 
diff --git a/ECOMP-PDP/src/main/java/org/openecomp/policy/xacml/pdp/ECOMPPDPEngine.java b/ONAP-PDP/src/main/java/org/onap/policy/xacml/pdp/ONAPPDPEngine.java
index 34dee4fbb..fb90d0a2e 100644
--- a/ECOMP-PDP/src/main/java/org/openecomp/policy/xacml/pdp/ECOMPPDPEngine.java
+++ b/ONAP-PDP/src/main/java/org/onap/policy/xacml/pdp/ONAPPDPEngine.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP
+ * ONAP-PDP
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,11 +17,11 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.xacml.pdp;
+package org.onap.policy.xacml.pdp;
 
 import java.util.Properties;
 
-import org.openecomp.policy.xacml.action.FindAction;
+import org.onap.policy.xacml.action.FindAction;
 
 import com.att.research.xacml.api.Decision;
 import com.att.research.xacml.api.Request;
@@ -32,19 +32,19 @@ import com.att.research.xacml.std.StdMutableResponse;
 import com.att.research.xacmlatt.pdp.ATTPDPEngine;
 import com.att.research.xacmlatt.pdp.eval.EvaluationContextFactory;
 
-public class ECOMPPDPEngine extends ATTPDPEngine {
+public class ONAPPDPEngine extends ATTPDPEngine {
 
-	public ECOMPPDPEngine(EvaluationContextFactory evaluationContextFactoryIn, Decision defaultDecisionIn,
+	public ONAPPDPEngine(EvaluationContextFactory evaluationContextFactoryIn, Decision defaultDecisionIn,
 			ScopeResolver scopeResolverIn, Properties properties) {
 		super(evaluationContextFactoryIn, defaultDecisionIn, scopeResolverIn, properties);
 	}
 
-	public ECOMPPDPEngine(EvaluationContextFactory evaluationContextFactoryIn, Decision defaultDecisionIn,
+	public ONAPPDPEngine(EvaluationContextFactory evaluationContextFactoryIn, Decision defaultDecisionIn,
 			ScopeResolver scopeResolverIn) {
 		super(evaluationContextFactoryIn, defaultDecisionIn, scopeResolverIn);
 	}
 
-	public ECOMPPDPEngine(EvaluationContextFactory evaluationContextFactoryIn, ScopeResolver scopeResolverIn) {
+	public ONAPPDPEngine(EvaluationContextFactory evaluationContextFactoryIn, ScopeResolver scopeResolverIn) {
 		super(evaluationContextFactoryIn, scopeResolverIn);
 	}
 
diff --git a/ECOMP-PDP/src/main/java/org/openecomp/policy/xacml/pdp/ECOMPPDPEngineFactory.java b/ONAP-PDP/src/main/java/org/onap/policy/xacml/pdp/ONAPPDPEngineFactory.java
index 437eb69b5..2e796bf68 100644
--- a/ECOMP-PDP/src/main/java/org/openecomp/policy/xacml/pdp/ECOMPPDPEngineFactory.java
+++ b/ONAP-PDP/src/main/java/org/onap/policy/xacml/pdp/ONAPPDPEngineFactory.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP
+ * ONAP-PDP
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,18 +17,18 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.xacml.pdp;
+package org.onap.policy.xacml.pdp;
 
 import java.util.Properties;
 
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger; 
-import org.openecomp.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.common.logging.flexlogger.FlexLogger; 
+import org.onap.policy.common.logging.flexlogger.Logger;
 import com.att.research.xacml.api.pdp.PDPEngine;
 import com.att.research.xacml.api.pdp.PDPEngineFactory;
 import com.att.research.xacml.util.FactoryException;
 import com.att.research.xacmlatt.pdp.eval.EvaluationContextFactory;
 
-public class ECOMPPDPEngineFactory extends PDPEngineFactory {
+public class ONAPPDPEngineFactory extends PDPEngineFactory {
 	private Logger logger	= FlexLogger.getLogger(this.getClass());
 
 	@Override
@@ -38,7 +38,7 @@ public class ECOMPPDPEngineFactory extends PDPEngineFactory {
 			this.logger.error("Null EvaluationContextFactory");
 			throw new FactoryException("Null EvaluationContextFactory");
 		}
-		return new ECOMPPDPEngine(evaluationContextFactory, this.getDefaultBehavior(), this.getScopeResolver());
+		return new ONAPPDPEngine(evaluationContextFactory, this.getDefaultBehavior(), this.getScopeResolver());
 	}
 
 	@Override
@@ -48,7 +48,7 @@ public class ECOMPPDPEngineFactory extends PDPEngineFactory {
 			this.logger.error("Null EvaluationContextFactory");
 			throw new FactoryException("Null EvaluationContextFactory");
 		}
-		return new ECOMPPDPEngine(evaluationContextFactory, this.getDefaultBehavior(), this.getScopeResolver(), properties);
+		return new ONAPPDPEngine(evaluationContextFactory, this.getDefaultBehavior(), this.getScopeResolver(), properties);
 	}
 
 }
diff --git a/ECOMP-PDP/src/main/java/org/openecomp/policy/xacml/pdp/std/functions/FunctionDefinitionCustomRegexpMatch.java b/ONAP-PDP/src/main/java/org/onap/policy/xacml/pdp/std/functions/FunctionDefinitionCustomRegexpMatch.java
index 5c11f8c43..590d519cc 100644
--- a/ECOMP-PDP/src/main/java/org/openecomp/policy/xacml/pdp/std/functions/FunctionDefinitionCustomRegexpMatch.java
+++ b/ONAP-PDP/src/main/java/org/onap/policy/xacml/pdp/std/functions/FunctionDefinitionCustomRegexpMatch.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP
+ * ONAP-PDP
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,13 +17,13 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.xacml.pdp.std.functions;
+package org.onap.policy.xacml.pdp.std.functions;
 
 
 import java.util.List;
 
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
 
 import com.att.research.xacml.api.DataType;
 import com.att.research.xacml.api.DataTypeException;
diff --git a/ECOMP-PDP/src/main/java/org/openecomp/policy/xacml/pdp/std/functions/PolicyList.java b/ONAP-PDP/src/main/java/org/onap/policy/xacml/pdp/std/functions/PolicyList.java
index da9e69ebc..794276f6a 100644
--- a/ECOMP-PDP/src/main/java/org/openecomp/policy/xacml/pdp/std/functions/PolicyList.java
+++ b/ONAP-PDP/src/main/java/org/onap/policy/xacml/pdp/std/functions/PolicyList.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP
+ * ONAP-PDP
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.xacml.pdp.std.functions;
+package org.onap.policy.xacml.pdp.std.functions;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/FunctionDefinitionAccessPermittedTest.java b/ONAP-PDP/src/test/java/org/onap/policy/pdp/test/FunctionDefinitionAccessPermittedTest.java
index a94c110d8..4abfd99dc 100644
--- a/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/FunctionDefinitionAccessPermittedTest.java
+++ b/ONAP-PDP/src/test/java/org/onap/policy/pdp/test/FunctionDefinitionAccessPermittedTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP
+ * ONAP-PDP
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pdp.test;
+package org.onap.policy.pdp.test;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
diff --git a/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/FunctionDefinitionArithmeticTest.java b/ONAP-PDP/src/test/java/org/onap/policy/pdp/test/FunctionDefinitionArithmeticTest.java
index 69e8744f7..56e79cf29 100644
--- a/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/FunctionDefinitionArithmeticTest.java
+++ b/ONAP-PDP/src/test/java/org/onap/policy/pdp/test/FunctionDefinitionArithmeticTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP
+ * ONAP-PDP
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pdp.test;
+package org.onap.policy.pdp.test;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
diff --git a/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/FunctionDefinitionBagIsInTest.java b/ONAP-PDP/src/test/java/org/onap/policy/pdp/test/FunctionDefinitionBagIsInTest.java
index ecb870164..09fd95f05 100644
--- a/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/FunctionDefinitionBagIsInTest.java
+++ b/ONAP-PDP/src/test/java/org/onap/policy/pdp/test/FunctionDefinitionBagIsInTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP
+ * ONAP-PDP
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pdp.test;
+package org.onap.policy.pdp.test;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
diff --git a/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/FunctionDefinitionBagOneAndOnlyTest.java b/ONAP-PDP/src/test/java/org/onap/policy/pdp/test/FunctionDefinitionBagOneAndOnlyTest.java
index e45dfb99c..192747aec 100644
--- a/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/FunctionDefinitionBagOneAndOnlyTest.java
+++ b/ONAP-PDP/src/test/java/org/onap/policy/pdp/test/FunctionDefinitionBagOneAndOnlyTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP
+ * ONAP-PDP
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pdp.test;
+package org.onap.policy.pdp.test;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
diff --git a/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/FunctionDefinitionBagSizeTest.java b/ONAP-PDP/src/test/java/org/onap/policy/pdp/test/FunctionDefinitionBagSizeTest.java
index 7cb3e0488..f2bcbc5c2 100644
--- a/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/FunctionDefinitionBagSizeTest.java
+++ b/ONAP-PDP/src/test/java/org/onap/policy/pdp/test/FunctionDefinitionBagSizeTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP
+ * ONAP-PDP
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pdp.test;
+package org.onap.policy.pdp.test;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
diff --git a/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/FunctionDefinitionBagTest.java b/ONAP-PDP/src/test/java/org/onap/policy/pdp/test/FunctionDefinitionBagTest.java
index 0f1a6009c..d96bd273f 100644
--- a/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/FunctionDefinitionBagTest.java
+++ b/ONAP-PDP/src/test/java/org/onap/policy/pdp/test/FunctionDefinitionBagTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP
+ * ONAP-PDP
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pdp.test;
+package org.onap.policy.pdp.test;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
diff --git a/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/FunctionDefinitionBaseTest.java b/ONAP-PDP/src/test/java/org/onap/policy/pdp/test/FunctionDefinitionBaseTest.java
index 10975f469..334226c84 100644
--- a/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/FunctionDefinitionBaseTest.java
+++ b/ONAP-PDP/src/test/java/org/onap/policy/pdp/test/FunctionDefinitionBaseTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP
+ * ONAP-PDP
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pdp.test;
+package org.onap.policy.pdp.test;
 
 
 import static org.junit.Assert.assertEquals;
diff --git a/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/FunctionDefinitionComparisonTest.java b/ONAP-PDP/src/test/java/org/onap/policy/pdp/test/FunctionDefinitionComparisonTest.java
index 9c3cc7faf..4cd558536 100644
--- a/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/FunctionDefinitionComparisonTest.java
+++ b/ONAP-PDP/src/test/java/org/onap/policy/pdp/test/FunctionDefinitionComparisonTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP
+ * ONAP-PDP
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pdp.test;
+package org.onap.policy.pdp.test;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
diff --git a/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/FunctionDefinitionDateTimeArithmeticTest.java b/ONAP-PDP/src/test/java/org/onap/policy/pdp/test/FunctionDefinitionDateTimeArithmeticTest.java
index a4a6a425b..809733ea8 100644
--- a/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/FunctionDefinitionDateTimeArithmeticTest.java
+++ b/ONAP-PDP/src/test/java/org/onap/policy/pdp/test/FunctionDefinitionDateTimeArithmeticTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP
+ * ONAP-PDP
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pdp.test;
+package org.onap.policy.pdp.test;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
diff --git a/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/FunctionDefinitionEqualityTest.java b/ONAP-PDP/src/test/java/org/onap/policy/pdp/test/FunctionDefinitionEqualityTest.java
index 53762264c..9a94ef631 100644
--- a/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/FunctionDefinitionEqualityTest.java
+++ b/ONAP-PDP/src/test/java/org/onap/policy/pdp/test/FunctionDefinitionEqualityTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP
+ * ONAP-PDP
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pdp.test;
+package org.onap.policy.pdp.test;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
diff --git a/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/FunctionDefinitionHigherOrderBagTest.java b/ONAP-PDP/src/test/java/org/onap/policy/pdp/test/FunctionDefinitionHigherOrderBagTest.java
index 9e0c72ce0..95a83d76e 100644
--- a/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/FunctionDefinitionHigherOrderBagTest.java
+++ b/ONAP-PDP/src/test/java/org/onap/policy/pdp/test/FunctionDefinitionHigherOrderBagTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP
+ * ONAP-PDP
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pdp.test;
+package org.onap.policy.pdp.test;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
diff --git a/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/FunctionDefinitionHomogeneousSimpleTest.java b/ONAP-PDP/src/test/java/org/onap/policy/pdp/test/FunctionDefinitionHomogeneousSimpleTest.java
index 1e104a594..c72bfaba1 100644
--- a/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/FunctionDefinitionHomogeneousSimpleTest.java
+++ b/ONAP-PDP/src/test/java/org/onap/policy/pdp/test/FunctionDefinitionHomogeneousSimpleTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP
+ * ONAP-PDP
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -19,7 +19,7 @@
  */
 
 
-package org.openecomp.policy.pdp.test;
+package org.onap.policy.pdp.test;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
diff --git a/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/FunctionDefinitionLogicalTest.java b/ONAP-PDP/src/test/java/org/onap/policy/pdp/test/FunctionDefinitionLogicalTest.java
index 7530e417b..1778dd112 100644
--- a/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/FunctionDefinitionLogicalTest.java
+++ b/ONAP-PDP/src/test/java/org/onap/policy/pdp/test/FunctionDefinitionLogicalTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP
+ * ONAP-PDP
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pdp.test;
+package org.onap.policy.pdp.test;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
diff --git a/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/FunctionDefinitionNumberTypeConversionTest.java b/ONAP-PDP/src/test/java/org/onap/policy/pdp/test/FunctionDefinitionNumberTypeConversionTest.java
index 9b2a39424..471025e12 100644
--- a/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/FunctionDefinitionNumberTypeConversionTest.java
+++ b/ONAP-PDP/src/test/java/org/onap/policy/pdp/test/FunctionDefinitionNumberTypeConversionTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP
+ * ONAP-PDP
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pdp.test;
+package org.onap.policy.pdp.test;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
diff --git a/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/FunctionDefinitionRegexpMatchTest.java b/ONAP-PDP/src/test/java/org/onap/policy/pdp/test/FunctionDefinitionRegexpMatchTest.java
index 423c4db48..c631e1e2d 100644
--- a/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/FunctionDefinitionRegexpMatchTest.java
+++ b/ONAP-PDP/src/test/java/org/onap/policy/pdp/test/FunctionDefinitionRegexpMatchTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP
+ * ONAP-PDP
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pdp.test;
+package org.onap.policy.pdp.test;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
diff --git a/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/FunctionDefinitionSetTest.java b/ONAP-PDP/src/test/java/org/onap/policy/pdp/test/FunctionDefinitionSetTest.java
index 8e8497b0b..8f22c8227 100644
--- a/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/FunctionDefinitionSetTest.java
+++ b/ONAP-PDP/src/test/java/org/onap/policy/pdp/test/FunctionDefinitionSetTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP
+ * ONAP-PDP
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pdp.test;
+package org.onap.policy.pdp.test;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
diff --git a/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/FunctionDefinitionSpecialMatchTest.java b/ONAP-PDP/src/test/java/org/onap/policy/pdp/test/FunctionDefinitionSpecialMatchTest.java
index f2e6bdb35..e4c68514d 100644
--- a/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/FunctionDefinitionSpecialMatchTest.java
+++ b/ONAP-PDP/src/test/java/org/onap/policy/pdp/test/FunctionDefinitionSpecialMatchTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP
+ * ONAP-PDP
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pdp.test;
+package org.onap.policy.pdp.test;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
diff --git a/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/FunctionDefinitionStringConversionTest.java b/ONAP-PDP/src/test/java/org/onap/policy/pdp/test/FunctionDefinitionStringConversionTest.java
index deca2b15f..3268266f4 100644
--- a/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/FunctionDefinitionStringConversionTest.java
+++ b/ONAP-PDP/src/test/java/org/onap/policy/pdp/test/FunctionDefinitionStringConversionTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP
+ * ONAP-PDP
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pdp.test;
+package org.onap.policy.pdp.test;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
diff --git a/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/FunctionDefinitionStringEqualIgnoreCaseTest.java b/ONAP-PDP/src/test/java/org/onap/policy/pdp/test/FunctionDefinitionStringEqualIgnoreCaseTest.java
index 65f92a9f0..9c5c8a1e7 100644
--- a/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/FunctionDefinitionStringEqualIgnoreCaseTest.java
+++ b/ONAP-PDP/src/test/java/org/onap/policy/pdp/test/FunctionDefinitionStringEqualIgnoreCaseTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP
+ * ONAP-PDP
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pdp.test;
+package org.onap.policy.pdp.test;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
diff --git a/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/FunctionDefinitionStringFunctionsTest.java b/ONAP-PDP/src/test/java/org/onap/policy/pdp/test/FunctionDefinitionStringFunctionsTest.java
index 7b556e3bc..c6cba9f67 100644
--- a/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/FunctionDefinitionStringFunctionsTest.java
+++ b/ONAP-PDP/src/test/java/org/onap/policy/pdp/test/FunctionDefinitionStringFunctionsTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP
+ * ONAP-PDP
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pdp.test;
+package org.onap.policy.pdp.test;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
diff --git a/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/FunctionDefinitionStringNormalizeTest.java b/ONAP-PDP/src/test/java/org/onap/policy/pdp/test/FunctionDefinitionStringNormalizeTest.java
index 0de8a0f0b..2631be06b 100644
--- a/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/FunctionDefinitionStringNormalizeTest.java
+++ b/ONAP-PDP/src/test/java/org/onap/policy/pdp/test/FunctionDefinitionStringNormalizeTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP
+ * ONAP-PDP
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pdp.test;
+package org.onap.policy.pdp.test;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
diff --git a/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/FunctionDefinitionURIStringConcatenateTest.java b/ONAP-PDP/src/test/java/org/onap/policy/pdp/test/FunctionDefinitionURIStringConcatenateTest.java
index 8a864a1a0..63ae2072b 100644
--- a/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/FunctionDefinitionURIStringConcatenateTest.java
+++ b/ONAP-PDP/src/test/java/org/onap/policy/pdp/test/FunctionDefinitionURIStringConcatenateTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP
+ * ONAP-PDP
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pdp.test;
+package org.onap.policy.pdp.test;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
diff --git a/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/FunctionDefinitionXPathTest.java b/ONAP-PDP/src/test/java/org/onap/policy/pdp/test/FunctionDefinitionXPathTest.java
index 3a7d12869..b174c4205 100644
--- a/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/FunctionDefinitionXPathTest.java
+++ b/ONAP-PDP/src/test/java/org/onap/policy/pdp/test/FunctionDefinitionXPathTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP
+ * ONAP-PDP
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pdp.test;
+package org.onap.policy.pdp.test;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
diff --git a/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/PDPTest.java b/ONAP-PDP/src/test/java/org/onap/policy/pdp/test/PDPTest.java
index bd19ae357..6442d7a12 100644
--- a/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/PDPTest.java
+++ b/ONAP-PDP/src/test/java/org/onap/policy/pdp/test/PDPTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP
+ * ONAP-PDP
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pdp.test;
+package org.onap.policy.pdp.test;
 
 
 import static org.junit.Assert.assertNull;
diff --git a/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/TestRunner.java b/ONAP-PDP/src/test/java/org/onap/policy/pdp/test/TestRunner.java
index 111d85276..b131964d4 100644
--- a/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/TestRunner.java
+++ b/ONAP-PDP/src/test/java/org/onap/policy/pdp/test/TestRunner.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP
+ * ONAP-PDP
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pdp.test;
+package org.onap.policy.pdp.test;
 
 import org.junit.runner.JUnitCore;
 import org.junit.runner.Result;
diff --git a/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/conformance/Conformance.java b/ONAP-PDP/src/test/java/org/onap/policy/pdp/test/conformance/Conformance.java
index fb0d6922a..d7af8b008 100644
--- a/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/conformance/Conformance.java
+++ b/ONAP-PDP/src/test/java/org/onap/policy/pdp/test/conformance/Conformance.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP
+ * ONAP-PDP
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pdp.test.conformance;
+package org.onap.policy.pdp.test.conformance;
 
 import java.io.File;
 import java.io.FileOutputStream;
diff --git a/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/conformance/ConformancePIPEngine.java b/ONAP-PDP/src/test/java/org/onap/policy/pdp/test/conformance/ConformancePIPEngine.java
index 64085411f..e81024159 100644
--- a/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/conformance/ConformancePIPEngine.java
+++ b/ONAP-PDP/src/test/java/org/onap/policy/pdp/test/conformance/ConformancePIPEngine.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP
+ * ONAP-PDP
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pdp.test.conformance;
+package org.onap.policy.pdp.test.conformance;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -36,8 +36,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
 
 import com.att.research.xacml.api.Attribute;
 import com.att.research.xacml.api.AttributeValue;
diff --git a/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/conformance/ConformanceRepository.java b/ONAP-PDP/src/test/java/org/onap/policy/pdp/test/conformance/ConformanceRepository.java
index edbfbbf62..995537ecd 100644
--- a/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/conformance/ConformanceRepository.java
+++ b/ONAP-PDP/src/test/java/org/onap/policy/pdp/test/conformance/ConformanceRepository.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP
+ * ONAP-PDP
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pdp.test.conformance;
+package org.onap.policy.pdp.test.conformance;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/conformance/ConformanceScopeResolver.java b/ONAP-PDP/src/test/java/org/onap/policy/pdp/test/conformance/ConformanceScopeResolver.java
index 76149869a..654145424 100644
--- a/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/conformance/ConformanceScopeResolver.java
+++ b/ONAP-PDP/src/test/java/org/onap/policy/pdp/test/conformance/ConformanceScopeResolver.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP
+ * ONAP-PDP
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pdp.test.conformance;
+package org.onap.policy.pdp.test.conformance;
 
 import java.net.URI;
 import java.util.ArrayList;
@@ -27,8 +27,8 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
 
 import com.att.research.xacml.api.Attribute;
 import com.att.research.xacml.api.AttributeValue;
diff --git a/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/conformance/ConformanceTest.java b/ONAP-PDP/src/test/java/org/onap/policy/pdp/test/conformance/ConformanceTest.java
index bb985ad7a..a37d1c155 100644
--- a/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/conformance/ConformanceTest.java
+++ b/ONAP-PDP/src/test/java/org/onap/policy/pdp/test/conformance/ConformanceTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP
+ * ONAP-PDP
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pdp.test.conformance;
+package org.onap.policy.pdp.test.conformance;
 
 import java.io.File;
 
diff --git a/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/conformance/ConformanceTestEngine.java b/ONAP-PDP/src/test/java/org/onap/policy/pdp/test/conformance/ConformanceTestEngine.java
index c2ad3a207..91e96cf1a 100644
--- a/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/conformance/ConformanceTestEngine.java
+++ b/ONAP-PDP/src/test/java/org/onap/policy/pdp/test/conformance/ConformanceTestEngine.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP
+ * ONAP-PDP
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,10 +18,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pdp.test.conformance;
+package org.onap.policy.pdp.test.conformance;
 
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
 
 import com.att.research.xacml.api.Request;
 import com.att.research.xacml.api.Response;
diff --git a/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/conformance/ConformanceTestResult.java b/ONAP-PDP/src/test/java/org/onap/policy/pdp/test/conformance/ConformanceTestResult.java
index a6b789679..65cfd55fe 100644
--- a/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/conformance/ConformanceTestResult.java
+++ b/ONAP-PDP/src/test/java/org/onap/policy/pdp/test/conformance/ConformanceTestResult.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP
+ * ONAP-PDP
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pdp.test.conformance;
+package org.onap.policy.pdp.test.conformance;
 
 import com.att.research.xacml.api.Request;
 import com.att.research.xacml.api.Response;
diff --git a/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/conformance/ConformanceTestSet.java b/ONAP-PDP/src/test/java/org/onap/policy/pdp/test/conformance/ConformanceTestSet.java
index 2df4dbc2f..6fc6e8d3d 100644
--- a/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/conformance/ConformanceTestSet.java
+++ b/ONAP-PDP/src/test/java/org/onap/policy/pdp/test/conformance/ConformanceTestSet.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP
+ * ONAP-PDP
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pdp.test.conformance;
+package org.onap.policy.pdp.test.conformance;
 
 import java.io.File;
 import java.io.IOException;
@@ -34,8 +34,8 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger; 
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger; 
 
 /**
  * ConformanceTestSet represents a collection of <code>ConformanceTest</code>s ordered by the test name.  It has methods for
diff --git a/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/conformance/ResponseMatchResult.java b/ONAP-PDP/src/test/java/org/onap/policy/pdp/test/conformance/ResponseMatchResult.java
index f556bcc2e..4c7423022 100644
--- a/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/conformance/ResponseMatchResult.java
+++ b/ONAP-PDP/src/test/java/org/onap/policy/pdp/test/conformance/ResponseMatchResult.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP
+ * ONAP-PDP
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pdp.test.conformance;
+package org.onap.policy.pdp.test.conformance;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/conformance/ResultMatchResult.java b/ONAP-PDP/src/test/java/org/onap/policy/pdp/test/conformance/ResultMatchResult.java
index f612c1a3c..fd6bf7103 100644
--- a/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/conformance/ResultMatchResult.java
+++ b/ONAP-PDP/src/test/java/org/onap/policy/pdp/test/conformance/ResultMatchResult.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP
+ * ONAP-PDP
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pdp.test.conformance;
+package org.onap.policy.pdp.test.conformance;
 
 import com.att.research.xacml.api.Result;
 import com.att.research.xacml.std.StdStatusCode;
diff --git a/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/custom/CustomDataTypeFactory.java b/ONAP-PDP/src/test/java/org/onap/policy/pdp/test/custom/CustomDataTypeFactory.java
index 10f77666d..82a2e3ec5 100644
--- a/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/custom/CustomDataTypeFactory.java
+++ b/ONAP-PDP/src/test/java/org/onap/policy/pdp/test/custom/CustomDataTypeFactory.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP
+ * ONAP-PDP
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pdp.test.custom;
+package org.onap.policy.pdp.test.custom;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/custom/CustomFunctionDefinitionFactory.java b/ONAP-PDP/src/test/java/org/onap/policy/pdp/test/custom/CustomFunctionDefinitionFactory.java
index 80f130906..017edad1a 100644
--- a/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/custom/CustomFunctionDefinitionFactory.java
+++ b/ONAP-PDP/src/test/java/org/onap/policy/pdp/test/custom/CustomFunctionDefinitionFactory.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP
+ * ONAP-PDP
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pdp.test.custom;
+package org.onap.policy.pdp.test.custom;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
diff --git a/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/custom/DataTypePrivateKey.java b/ONAP-PDP/src/test/java/org/onap/policy/pdp/test/custom/DataTypePrivateKey.java
index b161f9072..36fd9e725 100644
--- a/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/custom/DataTypePrivateKey.java
+++ b/ONAP-PDP/src/test/java/org/onap/policy/pdp/test/custom/DataTypePrivateKey.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP
+ * ONAP-PDP
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pdp.test.custom;
+package org.onap.policy.pdp.test.custom;
 
 import java.security.PrivateKey;
 
diff --git a/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/custom/DataTypePublicKey.java b/ONAP-PDP/src/test/java/org/onap/policy/pdp/test/custom/DataTypePublicKey.java
index c49caa399..b73274785 100644
--- a/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/custom/DataTypePublicKey.java
+++ b/ONAP-PDP/src/test/java/org/onap/policy/pdp/test/custom/DataTypePublicKey.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP
+ * ONAP-PDP
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pdp.test.custom;
+package org.onap.policy.pdp.test.custom;
 
 import java.security.PublicKey;
 
diff --git a/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/custom/FunctionDefinitionDecrypt.java b/ONAP-PDP/src/test/java/org/onap/policy/pdp/test/custom/FunctionDefinitionDecrypt.java
index ec7aff3b9..6d34e6334 100644
--- a/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/custom/FunctionDefinitionDecrypt.java
+++ b/ONAP-PDP/src/test/java/org/onap/policy/pdp/test/custom/FunctionDefinitionDecrypt.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP
+ * ONAP-PDP
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pdp.test.custom;
+package org.onap.policy.pdp.test.custom;
 
 import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
diff --git a/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/custom/TestBase.java b/ONAP-PDP/src/test/java/org/onap/policy/pdp/test/custom/TestBase.java
index a9b504dfd..2ccf15682 100644
--- a/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/custom/TestBase.java
+++ b/ONAP-PDP/src/test/java/org/onap/policy/pdp/test/custom/TestBase.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP
+ * ONAP-PDP
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pdp.test.custom;
+package org.onap.policy.pdp.test.custom;
 
 import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
@@ -48,8 +48,8 @@ import org.apache.commons.cli.Options;
 import org.apache.commons.cli.ParseException;
 import org.apache.commons.io.IOUtils;
 import org.apache.http.entity.ContentType;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
 
 import com.att.research.xacml.api.AttributeValue;
 import com.att.research.xacml.api.DataType;
diff --git a/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/custom/TestCustom.java b/ONAP-PDP/src/test/java/org/onap/policy/pdp/test/custom/TestCustom.java
index 84d8226be..e7a038814 100644
--- a/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/custom/TestCustom.java
+++ b/ONAP-PDP/src/test/java/org/onap/policy/pdp/test/custom/TestCustom.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PDP
+ * ONAP-PDP
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.pdp.test.custom;
+package org.onap.policy.pdp.test.custom;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
@@ -45,8 +45,8 @@ import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.GnuParser;
 import org.apache.commons.cli.Option;
 import org.apache.commons.cli.ParseException;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
 
 import com.att.research.xacml.api.AttributeValue;
 import com.att.research.xacml.api.DataType;
@@ -145,7 +145,7 @@ public class TestCustom extends TestBase {
 	 * This generates the public/private key. Shouldn't need to call it again, the keys have
 	 * already been generated and saved.
 	 * 
-	 * @see org.openecomp.policy.pdp.test.TestBase#parseCommands(java.lang.String[])
+	 * @see org.onap.policy.pdp.test.TestBase#parseCommands(java.lang.String[])
 	 */
 	@Override
 	protected void parseCommands(String[] args) throws ParseException, MalformedURLException, HelpException {
@@ -171,7 +171,7 @@ public class TestCustom extends TestBase {
 	 * After our parent class configure's itself, all this needs to do is read in
 	 * the public/private key's into objects.
 	 * 
-	 * @see org.openecomp.policy.pdp.test.TestBase#configure()
+	 * @see org.onap.policy.pdp.test.TestBase#configure()
 	 */
 	@Override
 	protected void configure() throws FactoryException {
@@ -203,7 +203,7 @@ public class TestCustom extends TestBase {
 	 * 
 	 * The goal is to have the custom decrypt function use the private key to decrypt that string.
 	 * 
-	 * @see org.openecomp.policy.pdp.test.TestBase#generateRequest(java.nio.file.Path, java.lang.String)
+	 * @see org.onap.policy.pdp.test.TestBase#generateRequest(java.nio.file.Path, java.lang.String)
 	 */
 	@Override
 	protected Request generateRequest(Path file, String group) throws JSONStructureException, DOMStructureException, PEPException {
diff --git a/ECOMP-PDP/src/test/resources/CSVPolicy.xml b/ONAP-PDP/src/test/resources/CSVPolicy.xml
index 7175fb500..10bb8579f 100644
--- a/ECOMP-PDP/src/test/resources/CSVPolicy.xml
+++ b/ONAP-PDP/src/test/resources/CSVPolicy.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <!--
   ============LICENSE_START=======================================================
-  ECOMP-PDP
+  ONAP-PDP
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
   ================================================================================
@@ -38,7 +38,7 @@
             <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:integer-greater-than">
                 <Description>Load</Description>
                 <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:integer-one-and-only">
-                    <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="com:att:labs:ecomp:resource:vm:load" DataType="http://www.w3.org/2001/XMLSchema#integer" MustBePresent="true"/>
+                    <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="com:att:labs:onap:resource:vm:load" DataType="http://www.w3.org/2001/XMLSchema#integer" MustBePresent="true"/>
                 </Apply>
 				<AttributeValue DataType="http://www.w3.org/2001/XMLSchema#integer">95</AttributeValue>
                 <!--<Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:integer-one-and-only">
@@ -48,7 +48,7 @@
             <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:integer-greater-than">
                 <Description>CPU</Description>
                 <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:integer-one-and-only">
-                    <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="com:att:labs:ecomp:resource:vm:cpu" DataType="http://www.w3.org/2001/XMLSchema#integer" MustBePresent="true"/>
+                    <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="com:att:labs:onap:resource:vm:cpu" DataType="http://www.w3.org/2001/XMLSchema#integer" MustBePresent="true"/>
                 </Apply>
 				<AttributeValue DataType="http://www.w3.org/2001/XMLSchema#integer">95</AttributeValue>
                 <!-- <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:integer-one-and-only">
diff --git a/ECOMP-PDP/src/test/resources/log4j.properties b/ONAP-PDP/src/test/resources/log4j.properties
index d3d3f48b6..e498777bb 100644
--- a/ECOMP-PDP/src/test/resources/log4j.properties
+++ b/ONAP-PDP/src/test/resources/log4j.properties
@@ -1,6 +1,6 @@
 ###
 # ============LICENSE_START=======================================================
-# ECOMP-PDP
+# ONAP-PDP
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
diff --git a/ECOMP-PDP/src/test/resources/logback.xml b/ONAP-PDP/src/test/resources/logback.xml
index ea027dcbb..03e9c0442 100644
--- a/ECOMP-PDP/src/test/resources/logback.xml
+++ b/ONAP-PDP/src/test/resources/logback.xml
@@ -1,6 +1,6 @@
 <!--
   ============LICENSE_START=======================================================
-  ECOMP-PDP
+  ONAP-PDP
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
   ================================================================================
@@ -27,9 +27,9 @@
   <property name="debugDir" value="logs" />
   
   <!--  specify the component name 
-    <ECOMP-component-name>::= "MSO" | "DCAE" | "ASDC " | "AAI" |"Policy" | "SDNC" | "AC"  -->
+    <ONAP-component-name>::= "MSO" | "DCAE" | "ASDC " | "AAI" |"Policy" | "SDNC" | "AC"  -->
   <property name="componentName" value="Policy"></property>
-  <property name="subComponentName" value="ECOMP-PDP"></property>
+  <property name="subComponentName" value="ONAP-PDP"></property>
   
   <!--  log file names -->
   <property name="errorLogName" value="error" />
diff --git a/ECOMP-PDP/src/test/resources/logging.properties b/ONAP-PDP/src/test/resources/logging.properties
index cd4ad799f..699369639 100644
--- a/ECOMP-PDP/src/test/resources/logging.properties
+++ b/ONAP-PDP/src/test/resources/logging.properties
@@ -1,6 +1,6 @@
 ###
 # ============LICENSE_START=======================================================
-# ECOMP-PDP
+# ONAP-PDP
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
diff --git a/ECOMP-PDP/src/test/resources/xacml.pip.properties b/ONAP-PDP/src/test/resources/xacml.pip.properties
index 739504faf..728a48281 100644
--- a/ECOMP-PDP/src/test/resources/xacml.pip.properties
+++ b/ONAP-PDP/src/test/resources/xacml.pip.properties
@@ -1,6 +1,6 @@
 ###
 # ============LICENSE_START=======================================================
-# ECOMP-PDP
+# ONAP-PDP
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
diff --git a/ECOMP-PDP/src/test/resources/xacml.policy.properties b/ONAP-PDP/src/test/resources/xacml.policy.properties
index 889a63ad3..20e77188b 100644
--- a/ECOMP-PDP/src/test/resources/xacml.policy.properties
+++ b/ONAP-PDP/src/test/resources/xacml.policy.properties
@@ -1,6 +1,6 @@
 ###
 # ============LICENSE_START=======================================================
-# ECOMP-PDP
+# ONAP-PDP
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
diff --git a/ECOMP-PDP/testclient.properties b/ONAP-PDP/testclient.properties
index 8e16d2397..908bae01c 100644
--- a/ECOMP-PDP/testclient.properties
+++ b/ONAP-PDP/testclient.properties
@@ -1,6 +1,6 @@
 ###
 # ============LICENSE_START=======================================================
-# ECOMP-PDP
+# ONAP-PDP
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
diff --git a/ECOMP-PDP/testpdp.properties b/ONAP-PDP/testpdp.properties
index 6ae5501d3..f99e93517 100644
--- a/ECOMP-PDP/testpdp.properties
+++ b/ONAP-PDP/testpdp.properties
@@ -1,6 +1,6 @@
 ###
 # ============LICENSE_START=======================================================
-# ECOMP-PDP
+# ONAP-PDP
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
diff --git a/ECOMP-PDP/xacml.pap.properties b/ONAP-PDP/xacml.pap.properties
index 13aef044f..9e7f92a11 100644
--- a/ECOMP-PDP/xacml.pap.properties
+++ b/ONAP-PDP/xacml.pap.properties
@@ -1,6 +1,6 @@
 ###
 # ============LICENSE_START=======================================================
-# ECOMP-PDP
+# ONAP-PDP
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
@@ -21,7 +21,7 @@
 #
 # This is our factory that will create our engine
 #
-xacml.PAP.papEngineFactory=org.openecomp.policy.xacml.std.pap.StdEngineFactory
+xacml.PAP.papEngineFactory=org.onap.policy.xacml.std.pap.StdEngineFactory
 
 #
 # Where we store our PAP PDP Group/Node information
diff --git a/ECOMP-PDP/xacml.pdp.properties b/ONAP-PDP/xacml.pdp.properties
index ba5358d0b..8ad735dda 100644
--- a/ECOMP-PDP/xacml.pdp.properties
+++ b/ONAP-PDP/xacml.pdp.properties
@@ -1,6 +1,6 @@
 ###
 # ============LICENSE_START=======================================================
-# ECOMP-PDP
+# ONAP-PDP
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
@@ -32,14 +32,14 @@ xacml.traceEngineFactory=com.att.research.xacml.std.trace.LoggingTraceEngineFact
 #
 xacml.att.evaluationContextFactory=com.att.research.xacmlatt.pdp.std.StdEvaluationContextFactory
 xacml.att.combiningAlgorithmFactory=com.att.research.xacmlatt.pdp.std.StdCombiningAlgorithmFactory
-xacml.att.functionDefinitionFactory=org.openecomp.policy.xacml.custom.EcompFunctionDefinitionFactory
-# NOT USED SEE BELOW xacml.att.policyFinderFactory=org.openecomp.policy.pdp.std.StdPolicyFinderFactory
+xacml.att.functionDefinitionFactory=org.onap.policy.xacml.custom.OnapFunctionDefinitionFactory
+# NOT USED SEE BELOW xacml.att.policyFinderFactory=org.onap.policy.pdp.std.StdPolicyFinderFactory
 
 #
 # AT&T RESTful PDP Implementation Factories
 #
-xacml.pipFinderFactory=org.openecomp.policy.rest.impl.XACMLPdpPIPFinderFactory
-xacml.att.policyFinderFactory=org.openecomp.policy.rest.XACMLPdpPolicyFinderFactory
+xacml.pipFinderFactory=org.onap.policy.rest.impl.XACMLPdpPIPFinderFactory
+xacml.att.policyFinderFactory=org.onap.policy.rest.XACMLPdpPolicyFinderFactory
 #
 # When set to true, this flag tells the StdPolicyFinderFactory to combined all the root policy files into
 # into one PolicySet and use the given Policy Algorithm.
diff --git a/ECOMP-PDP/xacml.properties b/ONAP-PDP/xacml.properties
index 22e8ee093..13ffdcf0d 100644
--- a/ECOMP-PDP/xacml.properties
+++ b/ONAP-PDP/xacml.properties
@@ -1,6 +1,6 @@
 ###
 # ============LICENSE_START=======================================================
-# ECOMP-PDP
+# ONAP-PDP
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
diff --git a/ECOMP-REST/.gitignore b/ONAP-REST/.gitignore
index 227059fcf..227059fcf 100644
--- a/ECOMP-REST/.gitignore
+++ b/ONAP-REST/.gitignore
diff --git a/ECOMP-REST/policyLogger.properties b/ONAP-REST/policyLogger.properties
index 2cd1c4bef..e5c1619b6 100644
--- a/ECOMP-REST/policyLogger.properties
+++ b/ONAP-REST/policyLogger.properties
@@ -1,6 +1,6 @@
 ###
 # ============LICENSE_START=======================================================
-# ECOMP-REST
+# ONAP-REST
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
diff --git a/ECOMP-REST/pom.xml b/ONAP-REST/pom.xml
index 77f60f0a8..220d2aa4e 100644
--- a/ECOMP-REST/pom.xml
+++ b/ONAP-REST/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   ============LICENSE_START=======================================================
-  ECOMP Policy Engine
+  ONAP Policy Engine
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
   ================================================================================
@@ -26,22 +26,22 @@
 	<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>ECOMP-REST</artifactId>
+	<artifactId>ONAP-REST</artifactId>
 
-	<description>ECOMP REST</description>
+	<description>ONAP REST</description>
 
 	<packaging>jar</packaging>
 
 	<dependencies>
 		<dependency>
-			<groupId>org.openecomp.policy.engine</groupId>
+			<groupId>org.onap.policy.engine</groupId>
 			<version>${project.version}</version>
-			<artifactId>ECOMP-XACML</artifactId>
+			<artifactId>ONAP-XACML</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>javax.servlet</groupId>
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/XACMLRest.java b/ONAP-REST/src/main/java/org/onap/policy/rest/XACMLRest.java
index 050d03bce..6bef28dfb 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/XACMLRest.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/XACMLRest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-REST
+ * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest;
+package org.onap.policy.rest;
 
 import java.io.IOException;
 import java.util.Enumeration;
@@ -31,8 +31,8 @@ import javax.servlet.http.HttpServletRequest;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.openecomp.policy.common.logging.eelf.MessageCodes;
-import org.openecomp.policy.common.logging.eelf.PolicyLogger;
+import org.onap.policy.common.logging.eelf.MessageCodes;
+import org.onap.policy.common.logging.eelf.PolicyLogger;
 
 import com.att.research.xacml.util.XACMLProperties;
 
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/XACMLRestProperties.java b/ONAP-REST/src/main/java/org/onap/policy/rest/XACMLRestProperties.java
index 04472f8fe..5c8449603 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/XACMLRestProperties.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/XACMLRestProperties.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-REST
+ * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest;
+package org.onap.policy.rest;
 
 import com.att.research.xacml.util.XACMLProperties;
 
@@ -426,10 +426,10 @@ public class XACMLRestProperties extends XACMLProperties {
 	 */
 	public static final String PROP_AUTOMATIC_POLICYPUSH= "xacml.automatic.push";
 	/*
-	 * Add Limit for Ecomp Portal Dashboard tab data
+	 * Add Limit for Onap Portal Dashboard tab data
 	 */
-	public static final String PROP_ECOMP_LOGLIMIT = "xacml.ecomp.dashboard.logTableLimit";
-	public static final String PROP_ECOMP_SYSTEMALERTLIMIT = "xacml.ecomp.dashboard.systemAlertTableLimit";
+	public static final String PROP_ONAP_LOGLIMIT = "xacml.onap.dashboard.logTableLimit";
+	public static final String PROP_ONAP_SYSTEMALERTLIMIT = "xacml.onap.dashboard.systemAlertTableLimit";
 	/*
 	 * Diff of the policies for the Firewall Feature. 
 	 */
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/XacmlAdminAuthorization.java b/ONAP-REST/src/main/java/org/onap/policy/rest/XacmlAdminAuthorization.java
index 9a2dbdbdb..c8dc71918 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/XacmlAdminAuthorization.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/XacmlAdminAuthorization.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-REST
+ * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,14 +18,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest;
+package org.onap.policy.rest;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.openecomp.policy.common.logging.eelf.MessageCodes;
-import org.openecomp.policy.common.logging.eelf.PolicyLogger;
-import org.openecomp.policy.rest.jpa.UserInfo;
-import org.openecomp.policy.xacml.api.XACMLErrorConstants;
+import org.onap.policy.common.logging.eelf.MessageCodes;
+import org.onap.policy.common.logging.eelf.PolicyLogger;
+import org.onap.policy.rest.jpa.UserInfo;
+import org.onap.policy.xacml.api.XACMLErrorConstants;
 
 import com.att.research.xacml.api.DataTypeException;
 import com.att.research.xacml.api.Decision;
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/adapter/AddressGroupJson.java b/ONAP-REST/src/main/java/org/onap/policy/rest/adapter/AddressGroupJson.java
index 9d9ce64e1..c634a74d1 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/adapter/AddressGroupJson.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/adapter/AddressGroupJson.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.adapter;
+package org.onap.policy.rest.adapter;
 
 
 import java.util.ArrayList;
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/adapter/AddressJson.java b/ONAP-REST/src/main/java/org/onap/policy/rest/adapter/AddressJson.java
index d2361d807..555994347 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/adapter/AddressJson.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/adapter/AddressJson.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.adapter;
+package org.onap.policy.rest.adapter;
 
 
 public class AddressJson {
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/adapter/AddressMembers.java b/ONAP-REST/src/main/java/org/onap/policy/rest/adapter/AddressMembers.java
index f53f61c32..14e46f15f 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/adapter/AddressMembers.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/adapter/AddressMembers.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.adapter;
+package org.onap.policy.rest.adapter;
 
 
 
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/adapter/AutoPushTabAdapter.java b/ONAP-REST/src/main/java/org/onap/policy/rest/adapter/AutoPushTabAdapter.java
index 7180f9a46..4e5336a05 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/adapter/AutoPushTabAdapter.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/adapter/AutoPushTabAdapter.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.adapter;
+package org.onap.policy.rest.adapter;
 
 
 import java.util.ArrayList;
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/adapter/ClosedLoopFaultBody.java b/ONAP-REST/src/main/java/org/onap/policy/rest/adapter/ClosedLoopFaultBody.java
index 469b1075c..80853af5d 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/adapter/ClosedLoopFaultBody.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/adapter/ClosedLoopFaultBody.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.adapter;
+package org.onap.policy.rest.adapter;
 
 
 
@@ -32,7 +32,7 @@ public class ClosedLoopFaultBody {
 	
 	private String vnfType;
 	private String vServices;
-	private String ECOMPname;
+	private String ONAPname;
 	
 	private String closedLoopPolicyStatus;
 	private ClosedLoopSignatures triggerSignatures;
@@ -114,12 +114,12 @@ public class ClosedLoopFaultBody {
 		this.verfificationTimeWindowUsedForUI = verfificationTimeWindowUsedForUI;
 	}
 
-	public String getECOMPname(){
-		return ECOMPname;
+	public String getONAPname(){
+		return ONAPname;
 	}
 	
-	public void setECOMPname(String ECOMPname){
-		this.ECOMPname = ECOMPname;
+	public void setONAPname(String ONAPname){
+		this.ONAPname = ONAPname;
 	}
 	
 	public String getvServices() {
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/adapter/ClosedLoopFaultTriggerUISignatures.java b/ONAP-REST/src/main/java/org/onap/policy/rest/adapter/ClosedLoopFaultTriggerUISignatures.java
index 1c1702e89..6363aa95f 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/adapter/ClosedLoopFaultTriggerUISignatures.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/adapter/ClosedLoopFaultTriggerUISignatures.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.adapter;
+package org.onap.policy.rest.adapter;
 
 
 
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/adapter/ClosedLoopPMBody.java b/ONAP-REST/src/main/java/org/onap/policy/rest/adapter/ClosedLoopPMBody.java
index 419c7d7ea..1898bc46d 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/adapter/ClosedLoopPMBody.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/adapter/ClosedLoopPMBody.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.adapter;
+package org.onap.policy.rest.adapter;
 
 
 import java.util.Map;
@@ -32,7 +32,7 @@ public class ClosedLoopPMBody {
 	private boolean vDNS;
 	private String geoLink;
 	private String vServices;
-	private String ECOMPname;
+	private String ONAPname;
 	
 	private String emailAddress;
 	
@@ -49,12 +49,12 @@ public class ClosedLoopPMBody {
 		this.templateVersion = templateVersion;
 	}
 	
-	public String getECOMPname(){
-		return ECOMPname;
+	public String getONAPname(){
+		return ONAPname;
 	}
 	
-	public void setECOMPname(String ECOMPname){
-		this.ECOMPname = ECOMPname;
+	public void setONAPname(String ONAPname){
+		this.ONAPname = ONAPname;
 	}
 	
 	public String getvServices() {
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/adapter/ClosedLoopPerformanceMetrics.java b/ONAP-REST/src/main/java/org/onap/policy/rest/adapter/ClosedLoopPerformanceMetrics.java
index ad858a6af..32839e97a 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/adapter/ClosedLoopPerformanceMetrics.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/adapter/ClosedLoopPerformanceMetrics.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.adapter;
+package org.onap.policy.rest.adapter;
 
 
 public class ClosedLoopPerformanceMetrics {
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/adapter/ClosedLoopPolicy.java b/ONAP-REST/src/main/java/org/onap/policy/rest/adapter/ClosedLoopPolicy.java
index 16db3c2b4..a230db84e 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/adapter/ClosedLoopPolicy.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/adapter/ClosedLoopPolicy.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.adapter;
+package org.onap.policy.rest.adapter;
 
 
 public class ClosedLoopPolicy {
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/adapter/ClosedLoopPolicyConditions.java b/ONAP-REST/src/main/java/org/onap/policy/rest/adapter/ClosedLoopPolicyConditions.java
index ff7efdfbc..5b3838985 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/adapter/ClosedLoopPolicyConditions.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/adapter/ClosedLoopPolicyConditions.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.adapter;
+package org.onap.policy.rest.adapter;
 
 
 public enum ClosedLoopPolicyConditions {
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/adapter/ClosedLoopPolicyStatus.java b/ONAP-REST/src/main/java/org/onap/policy/rest/adapter/ClosedLoopPolicyStatus.java
index 74138f448..fd8f2b6cf 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/adapter/ClosedLoopPolicyStatus.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/adapter/ClosedLoopPolicyStatus.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.adapter;
+package org.onap.policy.rest.adapter;
 
 
 public enum ClosedLoopPolicyStatus {
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/adapter/ClosedLoopSignatures.java b/ONAP-REST/src/main/java/org/onap/policy/rest/adapter/ClosedLoopSignatures.java
index 793e93ed8..b2226f95f 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/adapter/ClosedLoopSignatures.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/adapter/ClosedLoopSignatures.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.adapter;
+package org.onap.policy.rest.adapter;
 
 
 public class ClosedLoopSignatures {
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/adapter/DeletePolicyCondition.java b/ONAP-REST/src/main/java/org/onap/policy/rest/adapter/DeletePolicyCondition.java
index f34bc1d3e..b4fb5d973 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/adapter/DeletePolicyCondition.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/adapter/DeletePolicyCondition.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.adapter;
+package org.onap.policy.rest.adapter;
 
 
 public enum DeletePolicyCondition {
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/adapter/DeployNowJson.java b/ONAP-REST/src/main/java/org/onap/policy/rest/adapter/DeployNowJson.java
index 6344fbfcb..6c41253a1 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/adapter/DeployNowJson.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/adapter/DeployNowJson.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.adapter;
+package org.onap.policy.rest.adapter;
 
 
 public class DeployNowJson {
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/adapter/GridData.java b/ONAP-REST/src/main/java/org/onap/policy/rest/adapter/GridData.java
index f39156cf1..77bbf0378 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/adapter/GridData.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/adapter/GridData.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.adapter;
+package org.onap.policy.rest.adapter;
 
 
 import java.util.ArrayList;
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/adapter/IdMap.java b/ONAP-REST/src/main/java/org/onap/policy/rest/adapter/IdMap.java
index 6efb53a0b..3557aae11 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/adapter/IdMap.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/adapter/IdMap.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.adapter;
+package org.onap.policy.rest.adapter;
 
 
 public class IdMap {
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/adapter/PolicyExportAdapter.java b/ONAP-REST/src/main/java/org/onap/policy/rest/adapter/PolicyExportAdapter.java
index ce2d21083..21efb9b48 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/adapter/PolicyExportAdapter.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/adapter/PolicyExportAdapter.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.adapter;
+package org.onap.policy.rest.adapter;
 
 
 import java.util.ArrayList;
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/adapter/PolicyRestAdapter.java b/ONAP-REST/src/main/java/org/onap/policy/rest/adapter/PolicyRestAdapter.java
index 27da724e2..9d05e3984 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/adapter/PolicyRestAdapter.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/adapter/PolicyRestAdapter.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-PAP-REST
+ * ONAP-PAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.adapter;
+package org.onap.policy.rest.adapter;
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
@@ -27,7 +27,7 @@ import java.util.Map;
 
 import javax.persistence.EntityManagerFactory;
 
-import org.openecomp.policy.rest.jpa.EcompName;
+import org.onap.policy.rest.jpa.OnapName;
 
 public class PolicyRestAdapter {
 	
@@ -49,7 +49,7 @@ public class PolicyRestAdapter {
 	private String comboPolicyType;
 	private String configPolicyType = null;
 	private String policyDescription = null;
-	private String ecompName = null;
+	private String onapName = null;
 	private String configName = null;
 	private String ruleID = null;
 	private String parentPath;	
@@ -79,7 +79,7 @@ public class PolicyRestAdapter {
 	private String newCLName = null;
 	private String existingCLName = null;
 	//Used by GUI
-	private EcompName ecompNameField;
+	private OnapName onapNameField;
 	private Object jsonBodyData;
 	private String dirPath;
 	private String configBodyPath;
@@ -280,11 +280,11 @@ public class PolicyRestAdapter {
 	public void setPolicyDescription(String policyDescription) {
 		this.policyDescription = policyDescription;
 	}
-	public String getEcompName() {
-		return ecompName;
+	public String getOnapName() {
+		return onapName;
 	}
-	public void setEcompName(String ecompName) {
-		this.ecompName = ecompName;
+	public void setOnapName(String onapName) {
+		this.onapName = onapName;
 	}
 	public String getConfigName() {
 		return configName;
@@ -635,11 +635,11 @@ public class PolicyRestAdapter {
 		public void setDomain(String domain) {
 			this.domain = domain;
 		}
-		public EcompName getEcompNameField() {
-			return ecompNameField;
+		public OnapName getOnapNameField() {
+			return onapNameField;
 		}
-		public void setEcompNameField(EcompName ecompNameField) {
-			this.ecompNameField = ecompNameField;
+		public void setOnapNameField(OnapName onapNameField) {
+			this.onapNameField = onapNameField;
 		}
 		public Object getJsonBodyData() {
 			return jsonBodyData;
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/adapter/PrefixIPList.java b/ONAP-REST/src/main/java/org/onap/policy/rest/adapter/PrefixIPList.java
index 3de72ee68..c9b5b0cf1 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/adapter/PrefixIPList.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/adapter/PrefixIPList.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.adapter;
+package org.onap.policy.rest.adapter;
 
 
 
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/adapter/RainyDayParams.java b/ONAP-REST/src/main/java/org/onap/policy/rest/adapter/RainyDayParams.java
index 8fdcc0ffb..f465e8605 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/adapter/RainyDayParams.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/adapter/RainyDayParams.java
@@ -1,4 +1,4 @@
-package org.openecomp.policy.rest.adapter;
+package org.onap.policy.rest.adapter;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/adapter/ServiceGroupJson.java b/ONAP-REST/src/main/java/org/onap/policy/rest/adapter/ServiceGroupJson.java
index 1dca60cbc..0d06552b1 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/adapter/ServiceGroupJson.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/adapter/ServiceGroupJson.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.adapter;
+package org.onap.policy.rest.adapter;
 
 
 import java.util.ArrayList;
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/adapter/ServiceListJson.java b/ONAP-REST/src/main/java/org/onap/policy/rest/adapter/ServiceListJson.java
index 46aa2b55c..f64abb83f 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/adapter/ServiceListJson.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/adapter/ServiceListJson.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.adapter;
+package org.onap.policy.rest.adapter;
 
 
 
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/adapter/ServiceMembers.java b/ONAP-REST/src/main/java/org/onap/policy/rest/adapter/ServiceMembers.java
index a88df5174..632d5a4e8 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/adapter/ServiceMembers.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/adapter/ServiceMembers.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.adapter;
+package org.onap.policy.rest.adapter;
 
 
 
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/adapter/ServicesJson.java b/ONAP-REST/src/main/java/org/onap/policy/rest/adapter/ServicesJson.java
index c64af9a3c..5cb9e9801 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/adapter/ServicesJson.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/adapter/ServicesJson.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.adapter;
+package org.onap.policy.rest.adapter;
 
 
 public class ServicesJson {
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/adapter/TagDefines.java b/ONAP-REST/src/main/java/org/onap/policy/rest/adapter/TagDefines.java
index 0af88912a..339b0e1f5 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/adapter/TagDefines.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/adapter/TagDefines.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-REST
+ * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.adapter;
+package org.onap.policy.rest.adapter;
 
 public class TagDefines {
 	String key;
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/adapter/Tags.java b/ONAP-REST/src/main/java/org/onap/policy/rest/adapter/Tags.java
index 43bff884c..d046a2f97 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/adapter/Tags.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/adapter/Tags.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-REST
+ * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.adapter;
+package org.onap.policy.rest.adapter;
 
 
 import java.util.List;
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/adapter/Term.java b/ONAP-REST/src/main/java/org/onap/policy/rest/adapter/Term.java
index e5e0a7b00..7188e3558 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/adapter/Term.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/adapter/Term.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.adapter;
+package org.onap.policy.rest.adapter;
 
 
 
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/adapter/TermCollector.java b/ONAP-REST/src/main/java/org/onap/policy/rest/adapter/TermCollector.java
index ca7c0dcae..cfc91f089 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/adapter/TermCollector.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/adapter/TermCollector.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.adapter;
+package org.onap.policy.rest.adapter;
 
 
 
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/adapter/VendorSpecificData.java b/ONAP-REST/src/main/java/org/onap/policy/rest/adapter/VendorSpecificData.java
index c8ca8e95d..740aa838c 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/adapter/VendorSpecificData.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/adapter/VendorSpecificData.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.adapter;
+package org.onap.policy.rest.adapter;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/adapter/YAMLParams.java b/ONAP-REST/src/main/java/org/onap/policy/rest/adapter/YAMLParams.java
index 194ba1a88..e67a23ad8 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/adapter/YAMLParams.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/adapter/YAMLParams.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.adapter;
+package org.onap.policy.rest.adapter;
 
 import java.util.List;
 
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/adapter/package-info.java b/ONAP-REST/src/main/java/org/onap/policy/rest/adapter/package-info.java
index a78bbf203..29ad2551c 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/adapter/package-info.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/adapter/package-info.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-REST
+ * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,4 +17,4 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.rest.adapter;
\ No newline at end of file
+package org.onap.policy.rest.adapter;
\ No newline at end of file
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/dao/CommonClassDao.java b/ONAP-REST/src/main/java/org/onap/policy/rest/dao/CommonClassDao.java
index 3d0da0e6b..c486f53cb 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/dao/CommonClassDao.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/dao/CommonClassDao.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-REST
+ * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,11 +18,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.dao;
+package org.onap.policy.rest.dao;
 
 import java.util.List;
 
-import org.openecomp.policy.rest.jpa.PolicyRoles;
+import org.onap.policy.rest.jpa.PolicyRoles;
 
 public interface CommonClassDao {
 
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/package-info.java b/ONAP-REST/src/main/java/org/onap/policy/rest/dao/package-info.java
index 4e77ba9e7..2d8be25c4 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/package-info.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/dao/package-info.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-REST
+ * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,4 +18,4 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.jpa;
+package org.onap.policy.rest.dao;
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/ActionBodyEntity.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/ActionBodyEntity.java
index bda58b607..e65b317d0 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/ActionBodyEntity.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/ActionBodyEntity.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-REST
+ * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.rest.jpa;
+package org.onap.policy.rest.jpa;
 /*
  */
 import java.io.Serializable;
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/ActionList.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/ActionList.java
index 0fea71a1c..6be8cd7a8 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/ActionList.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/ActionList.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-REST
+ * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.jpa;
+package org.onap.policy.rest.jpa;
 /*
  */
 import java.io.Serializable;
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/ActionPolicyDict.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/ActionPolicyDict.java
index f6c8965d2..bf8a73161 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/ActionPolicyDict.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/ActionPolicyDict.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-REST
+ * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -20,7 +20,7 @@
 
 /*
  */
-package org.openecomp.policy.rest.jpa;
+package org.onap.policy.rest.jpa;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -42,7 +42,7 @@ import javax.persistence.TemporalType;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.openecomp.policy.rest.XacmlAdminAuthorization;
+import org.onap.policy.rest.XacmlAdminAuthorization;
 
 
 @Entity
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/AddressGroup.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/AddressGroup.java
index 1b6430c21..2a14e709a 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/AddressGroup.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/AddressGroup.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-REST
+ * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.jpa;
+package org.onap.policy.rest.jpa;
 /*
  */
 import java.io.Serializable;
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/Attribute.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/Attribute.java
index f9d60ff4d..7285e2e36 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/Attribute.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/Attribute.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-REST
+ * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.jpa;
+package org.onap.policy.rest.jpa;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -45,7 +45,7 @@ import javax.persistence.Transient;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.openecomp.policy.rest.XacmlAdminAuthorization;
+import org.onap.policy.rest.XacmlAdminAuthorization;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/AttributeAssignment.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/AttributeAssignment.java
index 1e81213d3..7a1be9e7d 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/AttributeAssignment.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/AttributeAssignment.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-REST
+ * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.rest.jpa;
+package org.onap.policy.rest.jpa;
 
 import java.io.Serializable;
 
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/BRMSController.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/BRMSController.java
index afa6d94cf..af2b11a20 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/BRMSController.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/BRMSController.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-REST
+ * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.jpa;
+package org.onap.policy.rest.jpa;
 
 import java.io.Serializable;
 import java.util.Date;
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/BRMSDependency.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/BRMSDependency.java
index 9c4406948..d06ec5d92 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/BRMSDependency.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/BRMSDependency.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-REST
+ * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.jpa;
+package org.onap.policy.rest.jpa;
 
 import java.io.Serializable;
 import java.util.Date;
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/BRMSParamTemplate.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/BRMSParamTemplate.java
index 54661de0c..5a78df227 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/BRMSParamTemplate.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/BRMSParamTemplate.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-REST
+ * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.jpa;
+package org.onap.policy.rest.jpa;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -38,7 +38,7 @@ import javax.persistence.Table;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
 
-import org.openecomp.policy.rest.jpa.UserInfo;
+import org.onap.policy.rest.jpa.UserInfo;
 
 /*
  * JPA for the BRMS Param Template. 
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/Category.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/Category.java
index 1f4243304..1d0f0e456 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/Category.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/Category.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-REST
+ * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.jpa;
+package org.onap.policy.rest.jpa;
 
 import java.io.Serializable;
 import java.util.HashSet;
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/ClosedLoopD2Services.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/ClosedLoopD2Services.java
index 391ed9714..f4ade220e 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/ClosedLoopD2Services.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/ClosedLoopD2Services.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-REST
+ * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.jpa;
+package org.onap.policy.rest.jpa;
 /*
  * 
  */
@@ -42,9 +42,9 @@ import javax.persistence.TemporalType;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.openecomp.policy.common.logging.eelf.MessageCodes;
-import org.openecomp.policy.common.logging.eelf.PolicyLogger;
-import org.openecomp.policy.rest.XacmlAdminAuthorization;
+import org.onap.policy.common.logging.eelf.MessageCodes;
+import org.onap.policy.common.logging.eelf.PolicyLogger;
+import org.onap.policy.rest.XacmlAdminAuthorization;
 
 
 @Entity
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/ClosedLoopSite.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/ClosedLoopSite.java
index fd8b295b9..6fbf9fb11 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/ClosedLoopSite.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/ClosedLoopSite.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-REST
+ * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.jpa;
+package org.onap.policy.rest.jpa;
 
 /*
  * 
@@ -43,10 +43,10 @@ import javax.persistence.TemporalType;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.openecomp.policy.rest.XacmlAdminAuthorization;
+import org.onap.policy.rest.XacmlAdminAuthorization;
 
-import org.openecomp.policy.common.logging.eelf.MessageCodes;
-import org.openecomp.policy.common.logging.eelf.PolicyLogger;
+import org.onap.policy.common.logging.eelf.MessageCodes;
+import org.onap.policy.common.logging.eelf.PolicyLogger;
 
 
 @Entity
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/ClosedLoops.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/ClosedLoops.java
index 5732832c6..bb5b4bda7 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/ClosedLoops.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/ClosedLoops.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-REST
+ * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.jpa;
+package org.onap.policy.rest.jpa;
 
 import java.io.Serializable;
 
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/ConfigurationDataEntity.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/ConfigurationDataEntity.java
index bf42a7788..e755d6fc5 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/ConfigurationDataEntity.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/ConfigurationDataEntity.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-REST
+ * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.jpa;
+package org.onap.policy.rest.jpa;
 /*
  */
 import java.io.Serializable;
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/ConstraintType.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/ConstraintType.java
index 60923d5a8..eeadeb0fc 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/ConstraintType.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/ConstraintType.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-REST
+ * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.jpa;
+package org.onap.policy.rest.jpa;
 
 import java.io.Serializable;
 import java.util.HashMap;
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/ConstraintValue.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/ConstraintValue.java
index 65eb6586a..57e9af8b8 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/ConstraintValue.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/ConstraintValue.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-REST
+ * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.jpa;
+package org.onap.policy.rest.jpa;
 
 import java.io.Serializable;
 
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/DCAEUsers.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/DCAEUsers.java
index fdad24419..27d5d2790 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/DCAEUsers.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/DCAEUsers.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-REST
+ * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.jpa;
+package org.onap.policy.rest.jpa;
 /*
  */
 import java.io.Serializable;
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/DCAEuuid.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/DCAEuuid.java
index 9e7225fc7..b7f9243bc 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/DCAEuuid.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/DCAEuuid.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-REST
+ * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.jpa;
+package org.onap.policy.rest.jpa;
 /*
  */
 import java.io.Serializable;
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/DatabaseLockEntity.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/DatabaseLockEntity.java
index c24b13a0e..7b5a8954e 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/DatabaseLockEntity.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/DatabaseLockEntity.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-REST
+ * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.jpa;
+package org.onap.policy.rest.jpa;
 
 import java.io.Serializable;
 
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/Datatype.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/Datatype.java
index 05e4fbc0c..6be1a84ce 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/Datatype.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/Datatype.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-REST
+ * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.jpa;
+package org.onap.policy.rest.jpa;
 
 import java.io.Serializable;
 import java.util.HashSet;
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/DecisionSettings.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/DecisionSettings.java
index 2d3e5b58a..164cc3cef 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/DecisionSettings.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/DecisionSettings.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-REST
+ * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.jpa;
+package org.onap.policy.rest.jpa;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -39,9 +39,9 @@ import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
 import javax.persistence.Transient;
 
-import org.openecomp.policy.common.logging.eelf.MessageCodes;
-import org.openecomp.policy.common.logging.eelf.PolicyLogger;
-import org.openecomp.policy.rest.XacmlAdminAuthorization;
+import org.onap.policy.common.logging.eelf.MessageCodes;
+import org.onap.policy.common.logging.eelf.PolicyLogger;
+import org.onap.policy.rest.XacmlAdminAuthorization;
 
 
 @Entity
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/DescriptiveScope.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/DescriptiveScope.java
index d4719cf41..30882fc13 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/DescriptiveScope.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/DescriptiveScope.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-REST
+ * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.jpa;
+package org.onap.policy.rest.jpa;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -40,10 +40,10 @@ import javax.persistence.TemporalType;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.openecomp.policy.rest.XacmlAdminAuthorization;
+import org.onap.policy.rest.XacmlAdminAuthorization;
 
-import org.openecomp.policy.common.logging.eelf.MessageCodes;
-import org.openecomp.policy.common.logging.eelf.PolicyLogger;
+import org.onap.policy.common.logging.eelf.MessageCodes;
+import org.onap.policy.common.logging.eelf.PolicyLogger;
 
 
 @Entity
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/EnforcingType.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/EnforcingType.java
index f293bc0cb..9c1cda451 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/EnforcingType.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/EnforcingType.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-REST
+ * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.jpa;
+package org.onap.policy.rest.jpa;
 
 import java.io.Serializable;
 
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/FWTag.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/FWTag.java
index f10f6662c..71f4d6a6a 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/FWTag.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/FWTag.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-REST
+ * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.jpa;
+package org.onap.policy.rest.jpa;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -40,9 +40,9 @@ import javax.persistence.TemporalType;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.openecomp.policy.common.logging.eelf.MessageCodes;
-import org.openecomp.policy.common.logging.eelf.PolicyLogger;
-import org.openecomp.policy.rest.XacmlAdminAuthorization;
+import org.onap.policy.common.logging.eelf.MessageCodes;
+import org.onap.policy.common.logging.eelf.PolicyLogger;
+import org.onap.policy.rest.XacmlAdminAuthorization;
 
 @Entity
 @Table(name = "FWTag")
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/FWTagPicker.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/FWTagPicker.java
index 032f77f3c..6f03b4915 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/FWTagPicker.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/FWTagPicker.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-REST
+ * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.rest.jpa;
+package org.onap.policy.rest.jpa;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -39,9 +39,9 @@ import javax.persistence.TemporalType;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.openecomp.policy.common.logging.eelf.MessageCodes;
-import org.openecomp.policy.common.logging.eelf.PolicyLogger;
-import org.openecomp.policy.rest.XacmlAdminAuthorization;
+import org.onap.policy.common.logging.eelf.MessageCodes;
+import org.onap.policy.common.logging.eelf.PolicyLogger;
+import org.onap.policy.rest.XacmlAdminAuthorization;
 
 @Entity
 @Table(name = "FWTagPicker")
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/FirewallDictionaryList.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/FirewallDictionaryList.java
index 712172acb..27f5e75bd 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/FirewallDictionaryList.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/FirewallDictionaryList.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-REST
+ * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.jpa;
+package org.onap.policy.rest.jpa;
 
 import java.io.Serializable;
 
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/FunctionArgument.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/FunctionArgument.java
index c660fde06..4d712994c 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/FunctionArgument.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/FunctionArgument.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-REST
+ * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.jpa;
+package org.onap.policy.rest.jpa;
 
 import java.io.Serializable;
 
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/FunctionDefinition.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/FunctionDefinition.java
index c0ccef99a..c3dfcaa63 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/FunctionDefinition.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/FunctionDefinition.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-REST
+ * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.jpa;
+package org.onap.policy.rest.jpa;
 
 import java.io.Serializable;
 
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/GlobalRoleSettings.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/GlobalRoleSettings.java
index 5b69cab32..357906d4f 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/GlobalRoleSettings.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/GlobalRoleSettings.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-REST
+ * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.jpa;
+package org.onap.policy.rest.jpa;
 
 import java.io.Serializable;
 
@@ -51,7 +51,7 @@ public class GlobalRoleSettings implements Serializable {
 	}
 	
 	public GlobalRoleSettings(boolean lockdown) {
-		this.role = org.openecomp.policy.rest.XacmlAdminAuthorization.Role.ROLE_SUPERADMIN.toString();
+		this.role = org.onap.policy.rest.XacmlAdminAuthorization.Role.ROLE_SUPERADMIN.toString();
 		this.lockdown = lockdown;
 	}
 	
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/GroupEntity.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/GroupEntity.java
index 405a5d458..a53ac2d58 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/GroupEntity.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/GroupEntity.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-REST
+ * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -28,7 +28,7 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package org.openecomp.policy.rest.jpa;
+package org.onap.policy.rest.jpa;
 /*
  */
 import java.io.Serializable;
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/GroupPolicyScopeList.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/GroupPolicyScopeList.java
index a8e052282..44f27ba35 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/GroupPolicyScopeList.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/GroupPolicyScopeList.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-REST
+ * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.jpa;
+package org.onap.policy.rest.jpa;
 /*
  */
 import java.io.Serializable;
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/GroupServiceList.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/GroupServiceList.java
index d214e4694..53fb89d4f 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/GroupServiceList.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/GroupServiceList.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-REST
+ * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.jpa;
+package org.onap.policy.rest.jpa;
 /*
  */
 import java.io.Serializable;
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/MicroServiceAttribute.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/MicroServiceAttribute.java
index e30379e1d..bb0507123 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/MicroServiceAttribute.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/MicroServiceAttribute.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-REST
+ * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.jpa;
+package org.onap.policy.rest.jpa;
 
 import java.io.Serializable;
 
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/MicroServiceConfigName.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/MicroServiceConfigName.java
index 0a1034c77..f47b96ed8 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/MicroServiceConfigName.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/MicroServiceConfigName.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-REST
+ * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.jpa;
+package org.onap.policy.rest.jpa;
 /*
  */
 import java.io.Serializable;
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/MicroServiceLocation.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/MicroServiceLocation.java
index a72f690ac..4d82a3b20 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/MicroServiceLocation.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/MicroServiceLocation.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-REST
+ * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.jpa;
+package org.onap.policy.rest.jpa;
 /*
  */
 import java.io.Serializable;
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/MicroServiceModels.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/MicroServiceModels.java
index c1eb24058..513799762 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/MicroServiceModels.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/MicroServiceModels.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-REST
+ * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -28,7 +28,7 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package org.openecomp.policy.rest.jpa;
+package org.onap.policy.rest.jpa;
 
 import java.io.Serializable;
 
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/Obadvice.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/Obadvice.java
index 494092029..b3b52cdd4 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/Obadvice.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/Obadvice.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-REST
+ * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.jpa;
+package org.onap.policy.rest.jpa;
 
 import java.io.Serializable;
 import java.util.Date;
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/ObadviceExpression.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/ObadviceExpression.java
index 1908b9dc9..8d5be9742 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/ObadviceExpression.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/ObadviceExpression.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-REST
+ * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.jpa;
+package org.onap.policy.rest.jpa;
 
 import java.io.Serializable;
 
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/EcompName.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/OnapName.java
index 09dcd4738..a4c0c85da 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/EcompName.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/OnapName.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-REST
+ * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.jpa;
+package org.onap.policy.rest.jpa;
 /*
  */
 import java.io.Serializable;
@@ -39,15 +39,15 @@ import javax.persistence.Table;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
 
-import org.openecomp.policy.common.logging.eelf.MessageCodes;
-import org.openecomp.policy.common.logging.eelf.PolicyLogger;
-import org.openecomp.policy.rest.XacmlAdminAuthorization;
+import org.onap.policy.common.logging.eelf.MessageCodes;
+import org.onap.policy.common.logging.eelf.PolicyLogger;
+import org.onap.policy.rest.XacmlAdminAuthorization;
 
 
 @Entity
-@Table(name="EcompName")
-@NamedQuery(name="EcompName.findAll", query="SELECT e FROM EcompName e ")
-public class EcompName implements Serializable {
+@Table(name="OnapName")
+@NamedQuery(name="OnapName.findAll", query="SELECT e FROM OnapName e ")
+public class OnapName implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	private static String domain;
@@ -57,9 +57,9 @@ public class EcompName implements Serializable {
 	@Column(name="id")
 	private int id;
 	
-	@Column(name="ecomp_Name", nullable=false, unique=true)
+	@Column(name="onap_Name", nullable=false, unique=true)
 	@OrderBy("asc")
-	private String ecompName;
+	private String onapName;
 
 	@Temporal(TemporalType.TIMESTAMP)
 	@Column(name="created_date", updatable=false)
@@ -96,16 +96,16 @@ public class EcompName implements Serializable {
 		this.userModifiedBy = userModifiedBy;
 	}
 	
-	public EcompName() {
+	public OnapName() {
 		
 	}
 	
-	public EcompName(String string, String userid) {
+	public OnapName(String string, String userid) {
 		this(domain);
 	}
 	
-	public EcompName(String domain) {
-		this.ecompName = domain;
+	public OnapName(String domain) {
+		this.onapName = domain;
 	}	
 
 	@PrePersist
@@ -121,15 +121,15 @@ public class EcompName implements Serializable {
 		try {
 			this.userModifiedBy =XacmlAdminAuthorization.getUserId();
 		} catch (Exception e) {
-			PolicyLogger.error(MessageCodes.EXCEPTION_ERROR, e, "EcompName", "Exception caused While adding Modified by Role");
+			PolicyLogger.error(MessageCodes.EXCEPTION_ERROR, e, "OnapName", "Exception caused While adding Modified by Role");
 		}
 	}
-	public String getEcompName() {
-		return this.ecompName;
+	public String getOnapName() {
+		return this.onapName;
 	}
 
-	public void setEcompName(String ecompName) {
-		this.ecompName = ecompName;
+	public void setOnapName(String onapName) {
+		this.onapName = onapName;
 
 	}
 	public int getId() {
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PEPOptions.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PEPOptions.java
index ed520472c..c1fff1420 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PEPOptions.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PEPOptions.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-REST
+ * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.jpa;
+package org.onap.policy.rest.jpa;
 /*
  * 
  * */
@@ -42,10 +42,10 @@ import javax.persistence.TemporalType;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.openecomp.policy.rest.XacmlAdminAuthorization;
+import org.onap.policy.rest.XacmlAdminAuthorization;
 
-import org.openecomp.policy.common.logging.eelf.MessageCodes;
-import org.openecomp.policy.common.logging.eelf.PolicyLogger;
+import org.onap.policy.common.logging.eelf.MessageCodes;
+import org.onap.policy.common.logging.eelf.PolicyLogger;
 
 
 @Entity
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PIPConfigParam.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PIPConfigParam.java
index d3724363f..1540c8ad8 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PIPConfigParam.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PIPConfigParam.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-REST
+ * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.jpa;
+package org.onap.policy.rest.jpa;
 
 import java.io.Serializable;
 
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PIPConfiguration.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PIPConfiguration.java
index 70a0e845f..5d731552b 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PIPConfiguration.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PIPConfiguration.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-REST
+ * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.jpa;
+package org.onap.policy.rest.jpa;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -51,9 +51,9 @@ import javax.persistence.Transient;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.openecomp.policy.common.logging.eelf.MessageCodes;
-import org.openecomp.policy.common.logging.eelf.PolicyLogger;
-import org.openecomp.policy.xacml.api.XACMLErrorConstants;
+import org.onap.policy.common.logging.eelf.MessageCodes;
+import org.onap.policy.common.logging.eelf.PolicyLogger;
+import org.onap.policy.xacml.api.XACMLErrorConstants;
 
 import com.att.research.xacml.api.pip.PIPException;
 import com.att.research.xacml.std.pip.engines.StdConfigurableEngine;
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PIPResolver.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PIPResolver.java
index 618c1a4ea..daab6d658 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PIPResolver.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PIPResolver.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-REST
+ * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.jpa;
+package org.onap.policy.rest.jpa;
 
 import java.io.Serializable;
 import java.util.ArrayList;
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PIPResolverParam.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PIPResolverParam.java
index 957b105d1..8dec7915a 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PIPResolverParam.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PIPResolverParam.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-REST
+ * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.jpa;
+package org.onap.policy.rest.jpa;
 
 import java.io.Serializable;
 
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PIPType.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PIPType.java
index 964a15412..0ef4388c4 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PIPType.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PIPType.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-REST
+ * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.jpa;
+package org.onap.policy.rest.jpa;
 
 import java.io.Serializable;
 import java.util.Set;
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PdpEntity.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PdpEntity.java
index c7d666056..a76bd624a 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PdpEntity.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PdpEntity.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-REST
+ * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.jpa;
+package org.onap.policy.rest.jpa;
 /*
  */
 import java.io.Serializable;
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PolicyAlgorithms.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyAlgorithms.java
index eb46ae0dc..4488fcd30 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PolicyAlgorithms.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyAlgorithms.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-REST
+ * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.jpa;
+package org.onap.policy.rest.jpa;
 
 import java.io.Serializable;
 
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PolicyDBDaoEntity.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyDBDaoEntity.java
index c395ab49a..8b0843ed0 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PolicyDBDaoEntity.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyDBDaoEntity.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-REST
+ * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.jpa;
+package org.onap.policy.rest.jpa;
 /*
  */
 import java.io.Serializable;
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PolicyEditorScopes.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyEditorScopes.java
index daf97b3ed..bfb4218ab 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PolicyEditorScopes.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyEditorScopes.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-REST
+ * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.jpa;
+package org.onap.policy.rest.jpa;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -40,10 +40,10 @@ import javax.persistence.TemporalType;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.openecomp.policy.rest.XacmlAdminAuthorization;
+import org.onap.policy.rest.XacmlAdminAuthorization;
 
-import org.openecomp.policy.common.logging.eelf.MessageCodes;
-import org.openecomp.policy.common.logging.eelf.PolicyLogger;
+import org.onap.policy.common.logging.eelf.MessageCodes;
+import org.onap.policy.common.logging.eelf.PolicyLogger;
 
 @Entity
 @Table(name="PolicyEditorScopes")
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PolicyEntity.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyEntity.java
index 7b938e461..4cb4440c1 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PolicyEntity.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyEntity.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-REST
+ * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.jpa;
+package org.onap.policy.rest.jpa;
 /*
  */
 import java.io.Serializable;
@@ -75,7 +75,7 @@ public class PolicyEntity implements Serializable {
 	@Column(name="policyName", nullable=false, unique=false, length=255)
 	private String policyName;
 	
-	//The scope is the directory structure in dot notation.  For example: org.openecomp.myproject 
+	//The scope is the directory structure in dot notation.  For example: org.onap.myproject 
 	@Column(name="scope", nullable=false, unique=false, length=255)
 	private String scope;
 	
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PolicyGroupEntity.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyGroupEntity.java
index 85c42ee48..ef2ff6e56 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PolicyGroupEntity.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyGroupEntity.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-REST
+ * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.rest.jpa;
+package org.onap.policy.rest.jpa;
 
 import java.io.Serializable;
 
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PolicyManagement.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyManagement.java
index 3f036d555..2a6571e52 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PolicyManagement.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyManagement.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-REST
+ * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.jpa;
+package org.onap.policy.rest.jpa;
 
 import java.io.Serializable;
 import java.sql.Clob;
@@ -55,8 +55,8 @@ public class PolicyManagement implements Serializable {
 	@Column(name="scope", nullable=false, length=45)
 	private String scope;
 
-	@Column(name="ECOMP_NAME", nullable=false, length=45)
-	private String ecompName;
+	@Column(name="ONAP_NAME", nullable=false, length=45)
+	private String onapName;
 	
 	@Column(name="CONFIG_NAME", nullable=false, length=45)
 	private String configName;
@@ -101,12 +101,12 @@ public class PolicyManagement implements Serializable {
 		this.scope = scope;
 	}
 
-	public String getEcompName() {
-		return ecompName;
+	public String getOnapName() {
+		return onapName;
 	}
 
-	public void setEcompName(String ecompName) {
-		this.ecompName = ecompName;
+	public void setOnapName(String onapName) {
+		this.onapName = onapName;
 	}
 
 	public String getConfigName() {
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PolicyRoles.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyRoles.java
index ede5d1020..99d6075a3 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PolicyRoles.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyRoles.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-REST
+ * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.jpa;
+package org.onap.policy.rest.jpa;
 /*
  */
 import java.io.Serializable;
@@ -34,7 +34,7 @@ import javax.persistence.NamedQuery;
 import javax.persistence.OrderBy;
 import javax.persistence.Table;
 
-import org.openecomp.policy.rest.jpa.UserInfo;
+import org.onap.policy.rest.jpa.UserInfo;
 
 
 /**
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PolicyScopeClosedLoop.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyScopeClosedLoop.java
index 8315ed070..6fc45eb70 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PolicyScopeClosedLoop.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyScopeClosedLoop.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-REST
+ * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.jpa;
+package org.onap.policy.rest.jpa;
 /*
  */
 import java.io.Serializable;
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PolicyScopeResource.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyScopeResource.java
index 76eb40d3e..f9ec94564 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PolicyScopeResource.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyScopeResource.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-REST
+ * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.jpa;
+package org.onap.policy.rest.jpa;
 /*
  */
 import java.io.Serializable;
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PolicyScopeService.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyScopeService.java
index 820616988..84e85570b 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PolicyScopeService.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyScopeService.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-REST
+ * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.jpa;
+package org.onap.policy.rest.jpa;
 /*
  */
 import java.io.Serializable;
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PolicyScopeType.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyScopeType.java
index 65fe6e5f7..48f17b0fc 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PolicyScopeType.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyScopeType.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-REST
+ * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.jpa;
+package org.onap.policy.rest.jpa;
 /*
  */
 import java.io.Serializable;
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PolicyScore.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyScore.java
index 3cd84eb2d..3ad4b9b85 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PolicyScore.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyScore.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-REST
+ * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.jpa;
+package org.onap.policy.rest.jpa;
 import java.io.Serializable;
 
 import javax.persistence.Column;
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PolicyVersion.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyVersion.java
index 4355693f3..d098ee5a2 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PolicyVersion.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyVersion.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-REST
+ * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.jpa;
+package org.onap.policy.rest.jpa;
 
 import java.io.Serializable;
 //import java.sql.Clob;
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PortList.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PortList.java
index 7bc4cf46a..5d2f35414 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PortList.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PortList.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-REST
+ * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.jpa;
+package org.onap.policy.rest.jpa;
 /*
  */
 import java.io.Serializable;
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PrefixList.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PrefixList.java
index e94afd4f1..98e940228 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PrefixList.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PrefixList.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-REST
+ * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.jpa;
+package org.onap.policy.rest.jpa;
 /*
  */
 import java.io.Serializable;
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/ProtocolList.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/ProtocolList.java
index d7cba8ffe..befea36ed 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/ProtocolList.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/ProtocolList.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-REST
+ * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.jpa;
+package org.onap.policy.rest.jpa;
 /*
  */
 import java.io.Serializable;
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/RainyDayTreatments.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/RainyDayTreatments.java
index 7219c7d36..383eb11c2 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/RainyDayTreatments.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/RainyDayTreatments.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-REST
+ * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.jpa;
+package org.onap.policy.rest.jpa;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/RemoteCatalogValues.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/RemoteCatalogValues.java
index b2b4df75b..f0443c0db 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/RemoteCatalogValues.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/RemoteCatalogValues.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-REST
+ * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.jpa;
+package org.onap.policy.rest.jpa;
 /*
  */
 import java.io.Serializable;
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/RiskType.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/RiskType.java
index 077138e1f..155372617 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/RiskType.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/RiskType.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-REST
+ * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.jpa;
+package org.onap.policy.rest.jpa;
 /*
  */
 import java.io.Serializable;
@@ -41,9 +41,9 @@ import javax.persistence.TemporalType;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.openecomp.policy.common.logging.eelf.MessageCodes;
-import org.openecomp.policy.common.logging.eelf.PolicyLogger;
-import org.openecomp.policy.rest.XacmlAdminAuthorization;
+import org.onap.policy.common.logging.eelf.MessageCodes;
+import org.onap.policy.common.logging.eelf.PolicyLogger;
+import org.onap.policy.rest.XacmlAdminAuthorization;
 
 
 @Entity
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/RuleAlgorithms.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/RuleAlgorithms.java
index 4ec0dff67..83f6e2d3e 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/RuleAlgorithms.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/RuleAlgorithms.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-REST
+ * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -28,7 +28,7 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package org.openecomp.policy.rest.jpa;
+package org.onap.policy.rest.jpa;
 
 import java.io.Serializable;
 
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/SafePolicyWarning.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/SafePolicyWarning.java
index 8d3a0f277..1f92fe67a 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/SafePolicyWarning.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/SafePolicyWarning.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-REST
+ * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.jpa;
+package org.onap.policy.rest.jpa;
 /*
  */
 import java.io.Serializable;
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/SecurityZone.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/SecurityZone.java
index 5de032f8f..d8bc33c13 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/SecurityZone.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/SecurityZone.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-REST
+ * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.jpa;
+package org.onap.policy.rest.jpa;
 /*
  */
 import java.io.Serializable;
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/ServiceList.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/ServiceList.java
index b3e473b1a..40e31172e 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/ServiceList.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/ServiceList.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-REST
+ * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.jpa;
+package org.onap.policy.rest.jpa;
 /*
  */
 import java.io.Serializable;
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/SystemLogDB.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/SystemLogDB.java
index 6fa91ee03..0747c837f 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/SystemLogDB.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/SystemLogDB.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-REST
+ * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -28,7 +28,7 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package org.openecomp.policy.rest.jpa;
+package org.onap.policy.rest.jpa;
 
 import java.io.Serializable;
 import java.util.Date;
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/TermList.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/TermList.java
index 38bbf793a..c9a27ef15 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/TermList.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/TermList.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-REST
+ * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.jpa;
+package org.onap.policy.rest.jpa;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -40,10 +40,10 @@ import javax.persistence.TemporalType;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.openecomp.policy.rest.XacmlAdminAuthorization;
+import org.onap.policy.rest.XacmlAdminAuthorization;
 
-import org.openecomp.policy.common.logging.eelf.MessageCodes;
-import org.openecomp.policy.common.logging.eelf.PolicyLogger;
+import org.onap.policy.common.logging.eelf.MessageCodes;
+import org.onap.policy.common.logging.eelf.PolicyLogger;
 
 
 @Entity
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/UserInfo.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/UserInfo.java
index 9dd771e6c..d2185c27b 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/UserInfo.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/UserInfo.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-REST
+ * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.jpa;
+package org.onap.policy.rest.jpa;
 
 import java.io.Serializable;
 
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/VMType.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/VMType.java
index e7ae197fc..01df59201 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/VMType.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/VMType.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-REST
+ * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.jpa;
+package org.onap.policy.rest.jpa;
 /*
  */
 import java.io.Serializable;
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/VNFType.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/VNFType.java
index 693e27553..cf1e6b85f 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/VNFType.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/VNFType.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-REST
+ * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.jpa;
+package org.onap.policy.rest.jpa;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -40,10 +40,10 @@ import javax.persistence.TemporalType;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.openecomp.policy.rest.XacmlAdminAuthorization;
+import org.onap.policy.rest.XacmlAdminAuthorization;
 
-import org.openecomp.policy.common.logging.eelf.MessageCodes;
-import org.openecomp.policy.common.logging.eelf.PolicyLogger;
+import org.onap.policy.common.logging.eelf.MessageCodes;
+import org.onap.policy.common.logging.eelf.PolicyLogger;
 
 
 
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/VSCLAction.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/VSCLAction.java
index 7f42650a3..5bfab1793 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/VSCLAction.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/VSCLAction.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-REST
+ * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.jpa;
+package org.onap.policy.rest.jpa;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -40,10 +40,10 @@ import javax.persistence.TemporalType;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.openecomp.policy.rest.XacmlAdminAuthorization;
+import org.onap.policy.rest.XacmlAdminAuthorization;
 
-import org.openecomp.policy.common.logging.eelf.MessageCodes;
-import org.openecomp.policy.common.logging.eelf.PolicyLogger;
+import org.onap.policy.common.logging.eelf.MessageCodes;
+import org.onap.policy.common.logging.eelf.PolicyLogger;
 
 
 @Entity
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/VarbindDictionary.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/VarbindDictionary.java
index 1bb56a067..0ede025bd 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/VarbindDictionary.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/VarbindDictionary.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-REST
+ * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.jpa;
+package org.onap.policy.rest.jpa;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -40,10 +40,10 @@ import javax.persistence.TemporalType;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.openecomp.policy.rest.XacmlAdminAuthorization;
+import org.onap.policy.rest.XacmlAdminAuthorization;
 
-import org.openecomp.policy.common.logging.eelf.MessageCodes;
-import org.openecomp.policy.common.logging.eelf.PolicyLogger;
+import org.onap.policy.common.logging.eelf.MessageCodes;
+import org.onap.policy.common.logging.eelf.PolicyLogger;
 
 @Entity
 @Table(name="VarbindDictionary")
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/WatchPolicyNotificationTable.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/WatchPolicyNotificationTable.java
index 2acc82cce..297c1f6df 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/WatchPolicyNotificationTable.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/WatchPolicyNotificationTable.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-REST
+ * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.jpa;
+package org.onap.policy.rest.jpa;
 /*
  * 
  * 
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/Zone.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/Zone.java
index 30e02e06d..eb53c42f1 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/Zone.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/Zone.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-REST
+ * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.jpa;
+package org.onap.policy.rest.jpa;
 /*
  */
 import java.io.Serializable;
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/dao/package-info.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/package-info.java
index 84cd76a92..72a36f4f4 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/dao/package-info.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/package-info.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-REST
+ * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,4 +18,4 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.dao;
+package org.onap.policy.rest.jpa;
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/util/LockdownListener.java b/ONAP-REST/src/main/java/org/onap/policy/rest/util/LockdownListener.java
index a44ef63d8..8e06656a3 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/util/LockdownListener.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/util/LockdownListener.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-REST
+ * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -21,7 +21,7 @@
 /**
  * 
  */
-package org.openecomp.policy.rest.util;
+package org.onap.policy.rest.util;
 
 public interface LockdownListener {
 	/**
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/util/MSAttributeObject.java b/ONAP-REST/src/main/java/org/onap/policy/rest/util/MSAttributeObject.java
index adf1fae8c..b5d359fd6 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/util/MSAttributeObject.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/util/MSAttributeObject.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-REST
+ * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.util;
+package org.onap.policy.rest.util;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/util/MSAttributeValue.java b/ONAP-REST/src/main/java/org/onap/policy/rest/util/MSAttributeValue.java
index cce8f7619..23b5f8658 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/util/MSAttributeValue.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/util/MSAttributeValue.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-REST
+ * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.util;
+package org.onap.policy.rest.util;
 
 public class MSAttributeValue{
 	public String getName() {
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/util/MSModelUtils.java b/ONAP-REST/src/main/java/org/onap/policy/rest/util/MSModelUtils.java
index 711abe59c..fa2c51d18 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/util/MSModelUtils.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/util/MSModelUtils.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-REST
+ * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.util;
+package org.onap.policy.rest.util;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -53,7 +53,7 @@ import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
 import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl;
 import org.json.JSONObject;
-import org.openecomp.policy.rest.XACMLRestProperties;
+import org.onap.policy.rest.XACMLRestProperties;
 
 import com.att.research.xacml.util.XACMLProperties;
 import com.google.gson.Gson;
@@ -68,12 +68,12 @@ public class MSModelUtils {
 	private HashMap<String, String> matchingClass = new HashMap<>();
 	private String configuration = "configuration";
 	private String dictionary = "dictionary";
-	private String ecomp = "";
+	private String onap = "";
 	private String policy = "";
 	private String eProxyURI = "eProxyURI:";
 	
-	public MSModelUtils(String ecomp, String policy){
-		this.ecomp = ecomp;
+	public MSModelUtils(String onap, String policy){
+		this.onap = onap;
 		this.policy = policy;
 	}
 
@@ -313,7 +313,7 @@ public class MSModelUtils {
 				if (obj instanceof EStructuralFeature) {
 					EStructuralFeature eStrucClassifier = (EStructuralFeature) obj;
 					if (eStrucClassifier.getEAnnotations().size() != 0) {
-						annotation = annotationTest(eStrucClassifier, configuration, ecomp);
+						annotation = annotationTest(eStrucClassifier, configuration, onap);
 						if (annotation &&  obj instanceof EReference) {
 							EClass refType = ((EReference) obj).getEReferenceType();
 							if(!refType.toString().contains(eProxyURI)){
@@ -383,7 +383,7 @@ public class MSModelUtils {
 				if (obj instanceof EStructuralFeature) {
 					EStructuralFeature eStrucClassifier = (EStructuralFeature) obj;
 					if (eStrucClassifier.getEAnnotations().size() != 0) {
-						annotation = annotationTest(eStrucClassifier, configuration, ecomp);
+						annotation = annotationTest(eStrucClassifier, configuration, onap);
 						if ( annotation &&  obj instanceof EReference) {
 							EClass refType = ((EReference) obj).getEReferenceType();
 							if(refType.toString().contains(eProxyURI)){
@@ -410,19 +410,19 @@ public class MSModelUtils {
 	private boolean annotationTest(EStructuralFeature eStrucClassifier, String annotation, String type) {
 		String annotationType = null;
 		EAnnotation eAnnotation = null;
-		String ecompType = null;
-		String ecompValue = null;
+		String onapType = null;
+		String onapValue = null;
 
 		EList<EAnnotation> value = eStrucClassifier.getEAnnotations();
 
 		for (int i = 0; i < value.size(); i++){
 			annotationType = value.get(i).getSource();
 			eAnnotation = eStrucClassifier.getEAnnotations().get(i);
-			ecompType = eAnnotation.getDetails().get(0).getValue();
-			ecompValue = eAnnotation.getDetails().get(0).getKey();
-			if (annotationType.contains(type) && ecompType.contains(annotation)){
+			onapType = eAnnotation.getDetails().get(0).getValue();
+			onapValue = eAnnotation.getDetails().get(0).getKey();
+			if (annotationType.contains(type) && onapType.contains(annotation)){
 				return true;
-			} else if (annotationType.contains(type) && ecompValue.contains(annotation)){
+			} else if (annotationType.contains(type) && onapValue.contains(annotation)){
 				return true;
 			}
 		}
@@ -434,26 +434,26 @@ public class MSModelUtils {
 	private String annotationValue(EStructuralFeature eStrucClassifier, ANNOTATION_TYPE annotation, String type) {
 		String annotationType = null;
 		EAnnotation eAnnotation = null;
-		String ecompType = null;
-		String ecompValue = null;
+		String onapType = null;
+		String onapValue = null;
 
 		EList<EAnnotation> value = eStrucClassifier.getEAnnotations();
 
 		for (int i = 0; i < value.size(); i++){
 			annotationType = value.get(i).getSource();
 			eAnnotation = eStrucClassifier.getEAnnotations().get(i);
-			ecompType = eAnnotation.getDetails().get(0).getKey();
-			if (annotationType.contains(type) && ecompType.compareToIgnoreCase(annotation.toString())==0){
-				ecompValue = eAnnotation.getDetails().get(0).getValue();
+			onapType = eAnnotation.getDetails().get(0).getKey();
+			if (annotationType.contains(type) && onapType.compareToIgnoreCase(annotation.toString())==0){
+				onapValue = eAnnotation.getDetails().get(0).getValue();
 				if (annotation == ANNOTATION_TYPE.VALIDATION){
-					return ecompValue;
+					return onapValue;
 				} else {
-					return ecompType + "-" + ecompValue;
+					return onapType + "-" + onapValue;
 				}
 			}
 		}
 
-		return ecompValue;
+		return onapValue;
 	}
 	public boolean isRequiredAttribute(EObject obj, String className){
 		EClassifier eClassifier = (EClassifier) obj;
@@ -527,7 +527,7 @@ public class MSModelUtils {
 				if (obj instanceof EStructuralFeature) {
 					EStructuralFeature eStrucClassifier = (EStructuralFeature) obj;
 					if (eStrucClassifier.getEAnnotations().size() != 0) {
-						annotation = annotationTest(eStrucClassifier, configuration, ecomp);
+						annotation = annotationTest(eStrucClassifier, configuration, onap);
 						dictionaryTest = annotationTest(eStrucClassifier, dictionary, policy);
 						EClassifier refType = ((EStructuralFeature) obj).getEType();
 						if (annotation && !(obj instanceof EReference) && !(refType instanceof EEnumImpl)) {
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/util/Webapps.java b/ONAP-REST/src/main/java/org/onap/policy/rest/util/Webapps.java
index 5cffb998a..908078f73 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/util/Webapps.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/util/Webapps.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-REST
+ * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest.util;
+package org.onap.policy.rest.util;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -27,13 +27,13 @@ import java.nio.file.Paths;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.openecomp.policy.rest.XACMLRestProperties;
+import org.onap.policy.rest.XACMLRestProperties;
 
-import org.openecomp.policy.xacml.api.XACMLErrorConstants;
+import org.onap.policy.xacml.api.XACMLErrorConstants;
 import com.att.research.xacml.util.XACMLProperties;
 
-import org.openecomp.policy.common.logging.eelf.MessageCodes;
-import org.openecomp.policy.common.logging.eelf.PolicyLogger;
+import org.onap.policy.common.logging.eelf.MessageCodes;
+import org.onap.policy.common.logging.eelf.PolicyLogger;
 
 public class Webapps {
 	private static String actionHome = null;
diff --git a/ECOMP-REST/src/test/java/org/openecomp/policy/rest/XACMLRestTest.java b/ONAP-REST/src/test/java/org/onap/policy/rest/XACMLRestTest.java
index c49231b6a..3de436481 100644
--- a/ECOMP-REST/src/test/java/org/openecomp/policy/rest/XACMLRestTest.java
+++ b/ONAP-REST/src/test/java/org/onap/policy/rest/XACMLRestTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-REST
+ * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.rest;
+package org.onap.policy.rest;
 
 /*import java.io.IOException;
 import java.io.InputStream;
diff --git a/ECOMP-SDK-APP/.externalToolBuilders/org.eclipse.wst.jsdt.core.javascriptValidator.launch b/ONAP-SDK-APP/.externalToolBuilders/org.eclipse.wst.jsdt.core.javascriptValidator.launch
index 627021fb9..627021fb9 100644
--- a/ECOMP-SDK-APP/.externalToolBuilders/org.eclipse.wst.jsdt.core.javascriptValidator.launch
+++ b/ONAP-SDK-APP/.externalToolBuilders/org.eclipse.wst.jsdt.core.javascriptValidator.launch
diff --git a/ECOMP-SDK-APP/.gitignore b/ONAP-SDK-APP/.gitignore
index 64634ffb1..64634ffb1 100644
--- a/ECOMP-SDK-APP/.gitignore
+++ b/ONAP-SDK-APP/.gitignore
diff --git a/ECOMP-SDK-APP/JSONConfig.json b/ONAP-SDK-APP/JSONConfig.json
index 23f985962..23f985962 100644
--- a/ECOMP-SDK-APP/JSONConfig.json
+++ b/ONAP-SDK-APP/JSONConfig.json
diff --git a/ECOMP-SDK-APP/README.md b/ONAP-SDK-APP/README.md
index 4595f162c..043a967fd 100644
--- a/ECOMP-SDK-APP/README.md
+++ b/ONAP-SDK-APP/README.md
@@ -1,7 +1,7 @@
-Ecomp SDK Web App
+Onap SDK Web App
 =================
 
-This is a Maven project with the ECOMP SDK web application for public release, containing files specific to requirements of the open-source version. This project uses the Maven war plugin to copy in ("overlay") the contents of the ECOMP SDK web application overlay files distribution at package time.
+This is a Maven project with the ONAP SDK web application for public release, containing files specific to requirements of the open-source version. This project uses the Maven war plugin to copy in ("overlay") the contents of the ONAP SDK web application overlay files distribution at package time.
 
 Use Apache Maven to build, package and deploy this webapp to a web container like Apache Tomcat. Eclipse users must install the M2E-WTP connector, see https://www.eclipse.org/m2e-wtp/
 Release Notes
diff --git a/ECOMP-SDK-APP/distribution.xml b/ONAP-SDK-APP/distribution.xml
index 3a9d6e799..3a9d6e799 100644
--- a/ECOMP-SDK-APP/distribution.xml
+++ b/ONAP-SDK-APP/distribution.xml
diff --git a/ECOMP-PDP-REST/config/policyLogger.properties b/ONAP-SDK-APP/policyLogger.properties
index d4e9525b8..bbb0ecf4e 100644
--- a/ECOMP-PDP-REST/config/policyLogger.properties
+++ b/ONAP-SDK-APP/policyLogger.properties
@@ -1,6 +1,6 @@
 ###
 # ============LICENSE_START=======================================================
-# ECOMP-PDP-REST
+# ONAP Policy Engine
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
diff --git a/ECOMP-SDK-APP/pom.xml b/ONAP-SDK-APP/pom.xml
index 9603b6475..5a2cab5b7 100644
--- a/ECOMP-SDK-APP/pom.xml
+++ b/ONAP-SDK-APP/pom.xml
@@ -1,6 +1,6 @@
 <!--
   ============LICENSE_START=======================================================
-  ECOMP Policy Engine
+  ONAP Policy Engine
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
   ================================================================================
@@ -22,11 +22,11 @@
 	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>ECOMP-SDK-APP</artifactId>
+	<artifactId>ONAP-SDK-APP</artifactId>
 	<packaging>war</packaging>
 
 	<properties>
@@ -112,7 +112,7 @@
 							<artifactId>epsdk-app-overlay</artifactId>
 						</overlay>
 						<overlay>
-							<groupId>org.openecomp.policy.engine</groupId>
+							<groupId>org.onap.policy.engine</groupId>
 							<artifactId>POLICY-SDK-APP</artifactId>
 						</overlay>
 					</overlays>
@@ -143,7 +143,7 @@
 	<dependencies>
 	<!-- Policy overlay war -->
 		<dependency>
-			<groupId>org.openecomp.policy.engine</groupId>
+			<groupId>org.onap.policy.engine</groupId>
 			<artifactId>POLICY-SDK-APP</artifactId>
 			<version>${project.version}</version>
 			<type>war</type>
@@ -155,7 +155,7 @@
 			</exclusions>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.policy.engine</groupId>
+			<groupId>org.onap.policy.engine</groupId>
 			<artifactId>POLICY-SDK-APP</artifactId>
 			<version>${project.version}</version>
 			<type>jar</type>
@@ -168,7 +168,7 @@
 			</exclusions>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.policy.engine</groupId>
+			<groupId>org.onap.policy.engine</groupId>
 			<artifactId>PolicyEngineUtils</artifactId>
 			<version>${project.version}</version>
 			<exclusions>
diff --git a/ECOMP-SDK-APP/src/main/java/org/openecomp/portalapp/conf/ExternalAppConfig.java b/ONAP-SDK-APP/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java
index e0a11cbc8..15a6c765e 100644
--- a/ECOMP-SDK-APP/src/main/java/org/openecomp/portalapp/conf/ExternalAppConfig.java
+++ b/ONAP-SDK-APP/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java
@@ -1,6 +1,6 @@
 /*-
  * ================================================================================
- * ECOMP Portal SDK
+ * ONAP Portal SDK
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property
  * ================================================================================
@@ -17,13 +17,13 @@
  * limitations under the License.
  * ================================================================================
  */
-package org.openecomp.portalapp.conf;
+package org.onap.portalapp.conf;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.openecomp.portalapp.login.LoginStrategyImpl;
-import org.openecomp.portalapp.scheduler.RegistryAdapter;
+import org.onap.portalapp.login.LoginStrategyImpl;
+import org.onap.portalapp.scheduler.RegistryAdapter;
 import org.openecomp.portalsdk.core.auth.LoginStrategy;
 import org.openecomp.portalsdk.core.conf.AppConfig;
 import org.openecomp.portalsdk.core.conf.Configurable;
@@ -47,12 +47,12 @@ import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 
 /**
- * ECOMP Portal SDK sample application. ECOMP Portal SDK core AppConfig class to
+ * ONAP Portal SDK sample application. ONAP Portal SDK core AppConfig class to
  * reuse interceptors, view resolvers and other features defined there.
  */
 @Configuration
 @EnableWebMvc
-@ComponentScan(basePackages = "org.openecomp")
+@ComponentScan(basePackages = "org.onap")
 @PropertySource(value = { "${container.classpath:}/WEB-INF/conf/app/test.properties" }, ignoreResourceNotFound = true)
 @Profile("src")
 @EnableAsync
diff --git a/ECOMP-SDK-APP/src/main/java/org/openecomp/portalapp/conf/ExternalAppInitializer.java b/ONAP-SDK-APP/src/main/java/org/onap/portalapp/conf/ExternalAppInitializer.java
index 6d7c72d1a..a77c781ff 100644
--- a/ECOMP-SDK-APP/src/main/java/org/openecomp/portalapp/conf/ExternalAppInitializer.java
+++ b/ONAP-SDK-APP/src/main/java/org/onap/portalapp/conf/ExternalAppInitializer.java
@@ -1,6 +1,6 @@
 /*-
  * ================================================================================
- * ECOMP Portal SDK
+ * ONAP Portal SDK
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property
  * ================================================================================
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ================================================================================
  */
-package org.openecomp.portalapp.conf;
+package org.onap.portalapp.conf;
 
 import org.openecomp.portalsdk.core.conf.AppInitializer;
 
diff --git a/ECOMP-SDK-APP/src/main/java/org/openecomp/portalapp/conf/HibernateMappingLocations.java b/ONAP-SDK-APP/src/main/java/org/onap/portalapp/conf/HibernateMappingLocations.java
index cf6ee2f07..ee73a5a98 100644
--- a/ECOMP-SDK-APP/src/main/java/org/openecomp/portalapp/conf/HibernateMappingLocations.java
+++ b/ONAP-SDK-APP/src/main/java/org/onap/portalapp/conf/HibernateMappingLocations.java
@@ -1,6 +1,6 @@
 /*-
  * ================================================================================
- * ECOMP Portal SDK
+ * ONAP Portal SDK
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property
  * ================================================================================
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ================================================================================
  */
-package org.openecomp.portalapp.conf;
+package org.onap.portalapp.conf;
 
 import org.springframework.context.annotation.Profile;
 import org.springframework.core.io.ClassPathResource;
@@ -51,7 +51,7 @@ public class HibernateMappingLocations implements HibernateMappingLocatable {
 	 */
 	@Override
 	public String[] getPackagesToScan() {
-		return new String[] { "org.openecomp" };
+		return new String[] { "org.onap" };
 	}
 
 }
diff --git a/ECOMP-SDK-APP/src/main/java/org/openecomp/portalapp/lm/FusionLicenseManagerImpl.java b/ONAP-SDK-APP/src/main/java/org/onap/portalapp/lm/FusionLicenseManagerImpl.java
index 4993a005d..5028162b5 100644
--- a/ECOMP-SDK-APP/src/main/java/org/openecomp/portalapp/lm/FusionLicenseManagerImpl.java
+++ b/ONAP-SDK-APP/src/main/java/org/onap/portalapp/lm/FusionLicenseManagerImpl.java
@@ -1,4 +1,4 @@
-package org.openecomp.portalapp.lm;
+package org.onap.portalapp.lm;
 
 import java.util.Date;
 import java.util.List;
diff --git a/ECOMP-SDK-APP/src/main/java/org/openecomp/portalapp/lm/LicenseableClassImpl.java b/ONAP-SDK-APP/src/main/java/org/onap/portalapp/lm/LicenseableClassImpl.java
index 91fe78706..d3b08e242 100644
--- a/ECOMP-SDK-APP/src/main/java/org/openecomp/portalapp/lm/LicenseableClassImpl.java
+++ b/ONAP-SDK-APP/src/main/java/org/onap/portalapp/lm/LicenseableClassImpl.java
@@ -1,6 +1,6 @@
 /*-
  * ================================================================================
- * eCOMP Portal SDK
+ * onap Portal SDK
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property
  * ================================================================================
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ================================================================================
  */
-package org.openecomp.portalapp.lm;
+package org.onap.portalapp.lm;
 
 import java.io.FileNotFoundException;
 import java.io.InputStream;
diff --git a/ECOMP-SDK-APP/src/main/java/org/openecomp/portalapp/login/LoginStrategyImpl.java b/ONAP-SDK-APP/src/main/java/org/onap/portalapp/login/LoginStrategyImpl.java
index d0aca5d32..dca71ae5f 100644
--- a/ECOMP-SDK-APP/src/main/java/org/openecomp/portalapp/login/LoginStrategyImpl.java
+++ b/ONAP-SDK-APP/src/main/java/org/onap/portalapp/login/LoginStrategyImpl.java
@@ -1,11 +1,11 @@
-package org.openecomp.portalapp.login;
+package org.onap.portalapp.login;
 
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
 import org.openecomp.portalsdk.core.auth.LoginStrategy;
 import org.openecomp.portalsdk.core.onboarding.exception.PortalAPIException;
 import org.openecomp.portalsdk.core.onboarding.util.CipherUtil;
@@ -25,7 +25,7 @@ public class LoginStrategyImpl extends LoginStrategy {
 	
 	@Override
 	public String getUserId(HttpServletRequest request) throws PortalAPIException {
-		// Check ECOMP Portal cookie
+		// Check ONAP Portal cookie
 		if (!isLoginCookieExist(request))
 			return null;
 
diff --git a/ECOMP-SDK-APP/src/main/java/org/openecomp/portalapp/scheduler/Register.java b/ONAP-SDK-APP/src/main/java/org/onap/portalapp/scheduler/Register.java
index 5793fac5a..b33707f2a 100644
--- a/ECOMP-SDK-APP/src/main/java/org/openecomp/portalapp/scheduler/Register.java
+++ b/ONAP-SDK-APP/src/main/java/org/onap/portalapp/scheduler/Register.java
@@ -1,6 +1,6 @@
 /*-
  * ================================================================================
- * ECOMP Portal SDK
+ * ONAP Portal SDK
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property
  * ================================================================================
@@ -17,11 +17,12 @@
  * limitations under the License.
  * ================================================================================
  */
-package org.openecomp.portalapp.scheduler;
+package org.onap.portalapp.scheduler;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import org.openecomp.portalapp.scheduler.LogRegistry;
 import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
 import org.openecomp.portalsdk.core.scheduler.Registerable;
 import org.openecomp.portalsdk.core.util.SystemProperties;
diff --git a/ECOMP-SDK-APP/src/main/java/org/openecomp/portalapp/scheduler/RegistryAdapter.java b/ONAP-SDK-APP/src/main/java/org/onap/portalapp/scheduler/RegistryAdapter.java
index af2bca592..40069cf77 100644
--- a/ECOMP-SDK-APP/src/main/java/org/openecomp/portalapp/scheduler/RegistryAdapter.java
+++ b/ONAP-SDK-APP/src/main/java/org/onap/portalapp/scheduler/RegistryAdapter.java
@@ -1,6 +1,6 @@
 /*-
  * ================================================================================
- * ECOMP Portal SDK
+ * ONAP Portal SDK
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property
  * ================================================================================
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ================================================================================
  */
-package org.openecomp.portalapp.scheduler;
+package org.onap.portalapp.scheduler;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/ECOMP-SDK-APP/src/main/java/org/openecomp/portalapp/service/AdminAuthExtension.java b/ONAP-SDK-APP/src/main/java/org/onap/portalapp/service/AdminAuthExtension.java
index 20de89874..dadb66c8e 100644
--- a/ECOMP-SDK-APP/src/main/java/org/openecomp/portalapp/service/AdminAuthExtension.java
+++ b/ONAP-SDK-APP/src/main/java/org/onap/portalapp/service/AdminAuthExtension.java
@@ -1,6 +1,6 @@
 /*-
  * ================================================================================
- * ECOMP Portal SDK
+ * ONAP Portal SDK
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property
  * ================================================================================
@@ -17,13 +17,14 @@
  * limitations under the License.
  * ================================================================================
  */
-package org.openecomp.portalapp.service;
+package org.onap.portalapp.service;
 
 import java.util.Set;
 
-import org.openecomp.policy.model.Roles;
-import org.openecomp.policy.rest.dao.CommonClassDao;
-import org.openecomp.policy.rest.jpa.UserInfo;
+import org.onap.policy.model.Roles;
+import org.onap.policy.rest.dao.CommonClassDao;
+import org.onap.policy.rest.jpa.UserInfo;
+import org.openecomp.portalapp.service.IAdminAuthExtension;
 import org.openecomp.portalsdk.core.domain.Role;
 import org.openecomp.portalsdk.core.domain.User;
 import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
@@ -47,7 +48,7 @@ public class AdminAuthExtension implements IAdminAuthExtension {
 	
 	/*
 	 * (non-Javadoc)
-	 * @see org.openecomp.portalapp.service.IAdminAuthExtension#saveUserExtension(org.openecomp.portalsdk.core.domain.User)
+	 * @see org.onap.portalapp.service.IAdminAuthExtension#saveUserExtension(org.openecomp.portalsdk.core.domain.User)
 	 */
 	public void saveUserExtension(User user) {
 		logger.debug("saveUserExtension");
@@ -56,7 +57,7 @@ public class AdminAuthExtension implements IAdminAuthExtension {
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.openecomp.portalapp.service.IAdminAuthExtension#editUserExtension(org.openecomp.portalsdk.core.domain.User)
+	 * @see org.onap.portalapp.service.IAdminAuthExtension#editUserExtension(org.openecomp.portalsdk.core.domain.User)
 	 */
 	public void editUserExtension(User user) {
 		logger.debug("editUserExtension");
@@ -64,7 +65,7 @@ public class AdminAuthExtension implements IAdminAuthExtension {
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.openecomp.portalapp.service.IAdminAuthExtension#saveUserRoleExtension(java.util.Set, org.openecomp.portalsdk.core.domain.User)
+	 * @see org.onap.portalapp.service.IAdminAuthExtension#saveUserRoleExtension(java.util.Set, org.openecomp.portalsdk.core.domain.User)
 	 */
 	public void saveUserRoleExtension(Set<Role> roles, User user) {
 		logger.debug("saveUserRoleExtension");
diff --git a/ECOMP-SDK-APP/src/main/resources/logback.xml b/ONAP-SDK-APP/src/main/resources/logback.xml
index c944721f5..5340181f1 100644
--- a/ECOMP-SDK-APP/src/main/resources/logback.xml
+++ b/ONAP-SDK-APP/src/main/resources/logback.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   ================================================================================
-  ECOMP Portal SDK
+  ONAP Portal SDK
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property
   ================================================================================
@@ -21,7 +21,7 @@
 
 <configuration scan="true" scanPeriod="3 seconds" debug="true">
   <!-- 
-  Logback files for the ECOMP Portal SDK Application "epsdk-app-os"
+  Logback files for the ONAP Portal SDK Application "epsdk-app-os"
   are created in directory ${catalina.base}/logs/epsdk_app_os;
   e.g., apache-tomcat-8.0.35/logs/epsdk_app_os/application.log  
   -->
@@ -99,7 +99,7 @@
     <encoder>
       <pattern>${applicationLoggerPattern}</pattern>
     </encoder>
-    <filter class="org.openecomp.portalapp.util.CustomLoggingFilter" />
+    <filter class="org.onap.portalapp.util.CustomLoggingFilter" />
   </appender>
   
   <appender name="asyncEELF" class="ch.qos.logback.classic.AsyncAppender">
@@ -327,38 +327,38 @@
   <!-- ============================================================================ -->
   <!--  EELF loggers -->
   <!-- ============================================================================ -->
-  <logger name="org.openecomp.epsdk.eelf" level="debug" additivity="false">
+  <logger name="org.onap.epsdk.eelf" level="debug" additivity="false">
     <appender-ref ref="asyncEELF" />
   </logger>
   
   <!--
-  <logger name="org.openecomp.epsdk.eelf.security" level="info" additivity="false">
+  <logger name="org.onap.epsdk.eelf.security" level="info" additivity="false">
     <appender-ref ref="asyncEELFSecurity" />
   </logger>
-  <logger name="org.openecomp.epsdk.eelf.perf" level="info" additivity="false">
+  <logger name="org.onap.epsdk.eelf.perf" level="info" additivity="false">
     <appender-ref ref="asyncEELFPerformance" />
   </logger>
-  <logger name="org.openecomp.epsdk.eelf.server" level="info" additivity="false">
+  <logger name="org.onap.epsdk.eelf.server" level="info" additivity="false">
     <appender-ref ref="asyncEELFServer" />
   </logger>
-  <logger name="org.openecomp.epsdk.eelf.policy" level="info" additivity="false">
+  <logger name="org.onap.epsdk.eelf.policy" level="info" additivity="false">
     <appender-ref ref="asyncEELFPolicy" />
   </logger>
   -->
   
-  <logger name="org.openecomp.epsdk.eelf.audit" level="info" additivity="false">
+  <logger name="org.onap.epsdk.eelf.audit" level="info" additivity="false">
     <appender-ref ref="asyncEELFAudit" />
   </logger>
   
-  <logger name="org.openecomp.epsdk.eelf.metrics" level="info" additivity="false">
+  <logger name="org.onap.epsdk.eelf.metrics" level="info" additivity="false">
         <appender-ref ref="asyncEELFMetrics" />
   </logger>
     
-  <logger name="org.openecomp.epsdk.eelf.error" level="info" additivity="false">
+  <logger name="org.onap.epsdk.eelf.error" level="info" additivity="false">
   	<appender-ref ref="asyncEELFError" />
   </logger>
   
-   <logger name="org.openecomp.epsdk.eelf.debug" level="debug" additivity="false">
+   <logger name="org.onap.epsdk.eelf.debug" level="debug" additivity="false">
         <appender-ref ref="asyncEELFDebug" />
   </logger>
   
diff --git a/ECOMP-SDK-APP/src/main/resources/portal.properties b/ONAP-SDK-APP/src/main/resources/portal.properties
index 0da2d5b5c..deca4e34b 100644
--- a/ECOMP-SDK-APP/src/main/resources/portal.properties
+++ b/ONAP-SDK-APP/src/main/resources/portal.properties
@@ -1,6 +1,6 @@
 ###
 # ================================================================================
-# eCOMP Portal SDK
+# onap Portal SDK
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property
 # ================================================================================
@@ -17,7 +17,7 @@
 # limitations under the License.
 # ================================================================================
 ###
-# Properties read by ECOMP Framework library, ecompFW.jar
+# Properties read by ONAP Framework library, onapFW.jar
 
 ##########################################################################
 # The following properties should NOT be changed by partner applications.
@@ -40,13 +40,13 @@ use_rest_for_functional_menu=true
 ##########################################################################
 
 # Name of java class that implements the OnBoardingApiService interface.
-portal.api.impl.class = org.openecomp.portalapp.service.OnBoardingApiServiceImpl
+portal.api.impl.class = org.onap.portalapp.service.OnBoardingApiServiceImpl
 
 # CSP Global Log On for single sign on
-ecomp_redirect_url = todo_csp_global_logon
+onap_redirect_url = todo_csp_global_logon
 
-# URL of the ECOMP Portal REST API
-ecomp_rest_url = todo_Ecomp_rest_url
+# URL of the ONAP Portal REST API
+onap_rest_url = todo_Onap_rest_url
 
 # Applications do not need to run a UEB listener in 1610.  
 ueb_listeners_enable = false
@@ -57,13 +57,13 @@ ueb_listeners_enable = false
 # then only the ueb_app_key is required.
 # UEB servers
 ueb_url_list = todo_ueb_list
-# ECOMP Portal listens on this UEB topic
-ecomp_portal_inbox_name = ECOMP-PORTAL-INBOX-TEST-DEMETER
+# ONAP Portal listens on this UEB topic
+onap_portal_inbox_name = ONAP-PORTAL-INBOX-TEST-DEMETER
 # Replace these 3 default values with the ones for your specific App,
-# as shown on the on-boarding page on the ECOMP Portal web application.
+# as shown on the on-boarding page on the ONAP Portal web application.
 ueb_app_key = ZOicEniw7BWDL1pM
 ueb_app_secret = PJIsBErHfo2RGKzuu03CZKgV
-ueb_app_mailbox_name = ECOMP-PORTAL-OUTBOX-TEST-32756
+ueb_app_mailbox_name = ONAP-PORTAL-OUTBOX-TEST-32756
 # Consumer group name for UEB topic.
 # Use the special tag '{UUID}' to generate a unique one for each sdk-app server.
 ueb_app_consumer_group_name = {UUID}
diff --git a/ECOMP-SDK-APP/src/main/webapp/WEB-INF/conf/system.properties b/ONAP-SDK-APP/src/main/webapp/WEB-INF/conf/system.properties
index 6c65eaf52..304bcbd90 100644
--- a/ECOMP-SDK-APP/src/main/webapp/WEB-INF/conf/system.properties
+++ b/ONAP-SDK-APP/src/main/webapp/WEB-INF/conf/system.properties
@@ -1,4 +1,4 @@
-# Properties read by ECOMP Core library, ecompSDK-core.jar
+# Properties read by ONAP Core library, onapSDK-core.jar
 
 ##########################################################################
 # The following properties should NOT be changed by partner applications.
@@ -24,7 +24,7 @@ decryption_key				  = AGLDdG4D04BKm2IxIWEr8o==
 ##########################################################################
 #Mysql
 db.driver = com.mysql.jdbc.Driver
-db.connectionURL = jdbc:mysql://localhost:3306/ecomp_sdk
+db.connectionURL = jdbc:mysql://localhost:3306/onap_sdk
 db.userName = policy_user
 db.password = policy_user
 db.hib.dialect = org.hibernate.dialect.MySQLDialect
@@ -49,8 +49,8 @@ mylogins_feed_cron            = 0 0/60 * * * ?;
 #sessiontimeout_feed_cron	  = 0 * * * * ? *
 my_login_feed_output_dir      = /tmp/MyLogins
 
-# ECOMP Portal Shared Context REST API URL
-ecomp_shared_context_rest_url= todo_shared_context_url
+# ONAP Portal Shared Context REST API URL
+onap_shared_context_rest_url= todo_shared_context_url
 
 # Link shown in Help menu
 contact_us_link = todo_Contact_link
@@ -60,7 +60,7 @@ camunda_cockpit_link = todo_camunda_link
 # An Unique 128-bit value defined to identify a specific version
 # of an application deployed on a specific virtual machine.
 # This value must be generated and updated by the application 
-# which is using the ECOMP SDK at the time of its deployment.
+# which is using the ONAP SDK at the time of its deployment.
 # Online Unique UUID generator - https://www.uuidgenerator.net/
 instance_uuid=8da691c9-987d-43ed-a358-00ac2f35685d
 
diff --git a/ECOMP-SDK-APP/src/main/webapp/WEB-INF/defs/definitions.xml b/ONAP-SDK-APP/src/main/webapp/WEB-INF/defs/definitions.xml
index b2391b562..b2391b562 100644
--- a/ECOMP-SDK-APP/src/main/webapp/WEB-INF/defs/definitions.xml
+++ b/ONAP-SDK-APP/src/main/webapp/WEB-INF/defs/definitions.xml
diff --git a/ECOMP-SDK-APP/src/main/webapp/WEB-INF/fusion/conf/fusion.properties b/ONAP-SDK-APP/src/main/webapp/WEB-INF/fusion/conf/fusion.properties
index 7140d35fb..7140d35fb 100644
--- a/ECOMP-SDK-APP/src/main/webapp/WEB-INF/fusion/conf/fusion.properties
+++ b/ONAP-SDK-APP/src/main/webapp/WEB-INF/fusion/conf/fusion.properties
diff --git a/ECOMP-SDK-APP/src/main/webapp/WEB-INF/fusion/jsp/ds2/footer.jsp b/ONAP-SDK-APP/src/main/webapp/WEB-INF/fusion/jsp/ds2/footer.jsp
index 3374b75ff..3374b75ff 100644
--- a/ECOMP-SDK-APP/src/main/webapp/WEB-INF/fusion/jsp/ds2/footer.jsp
+++ b/ONAP-SDK-APP/src/main/webapp/WEB-INF/fusion/jsp/ds2/footer.jsp
diff --git a/ECOMP-SDK-APP/src/main/webapp/WEB-INF/fusion/jsp/ds2/header.jsp b/ONAP-SDK-APP/src/main/webapp/WEB-INF/fusion/jsp/ds2/header.jsp
index 94213a2a3..94213a2a3 100644
--- a/ECOMP-SDK-APP/src/main/webapp/WEB-INF/fusion/jsp/ds2/header.jsp
+++ b/ONAP-SDK-APP/src/main/webapp/WEB-INF/fusion/jsp/ds2/header.jsp
diff --git a/ECOMP-SDK-APP/src/main/webapp/WEB-INF/fusion/jsp/ds2/left-menu.jsp b/ONAP-SDK-APP/src/main/webapp/WEB-INF/fusion/jsp/ds2/left-menu.jsp
index cbf7f8ad5..edb040504 100644
--- a/ECOMP-SDK-APP/src/main/webapp/WEB-INF/fusion/jsp/ds2/left-menu.jsp
+++ b/ONAP-SDK-APP/src/main/webapp/WEB-INF/fusion/jsp/ds2/left-menu.jsp
@@ -1,6 +1,6 @@
 <%--
   ================================================================================
-  eCOMP Portal SDK
+  onap Portal SDK
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property
   ================================================================================
@@ -57,7 +57,7 @@
 
 <% 
 	String contactUsLink = SystemProperties.getProperty(SystemProperties.CONTACT_US_LINK);
-	String redirectUrl = PortalApiProperties.getProperty(PortalApiConstants.ECOMP_REDIRECT_URL);
+	String redirectUrl = PortalApiProperties.getProperty(PortalApiConstants.ONAP_REDIRECT_URL);
 	String portalUrl = redirectUrl.substring(0, redirectUrl.lastIndexOf('/')) + "/process_csp";
 	String getAccessLink = redirectUrl.substring(0, redirectUrl.lastIndexOf('/')) + "/get_access";	
 %>
@@ -84,7 +84,7 @@
 								<div style="float:left">
 									<li class="megamenu__item" style="line-height:55px;" onclick="returnToPortal()">
 										<img src="app/fusion/external/ebz/images/att_logo.png" class="ATTLogo"   ></span>
-										<strong	style="font-weight: 400 !important; font-family: "Omnes-ECOMP-W02", Arial !important; font-size: 18px;" id='returnPortal' >ECOMP Portal</strong>
+										<strong	style="font-weight: 400 !important; font-family: "Omnes-ONAP-W02", Arial !important; font-size: 18px;" id='returnPortal' >ONAP Portal</strong>
 									</li>										
 									<div menu-tabs mega-menu="true" tab-name="item.text" menu-item="item" active-menu="activeClickMenu.x" 
 									ng-repeat="item in megaMenuDataObject" style="font-size: 18px;" ng-mousedown="loadFavorites()" >
@@ -161,10 +161,10 @@
 														</div>
 														<div>
 															<br>
-															<p style='font-weight: 400; font-family: "Omnes-ECOMP-W02", Arial !important;
+															<p style='font-weight: 400; font-family: "Omnes-ONAP-W02", Arial !important;
 															font-size: 18px; text-align: center; background-color: lightgray;
 															width: 400px; margin-left: 25%; margin-right: 25%;'>
-																Manage favorites on ECOMP Portal.
+																Manage favorites on ONAP Portal.
 															</p>
 														</div>
 													</div>
@@ -174,7 +174,7 @@
 			                                                    <div>
 			                                                        <img src="app/fusion/external/ebz/images/no_favorites_star.png">
 			                                                        <p class='favoritesLargeText'>No Favorites</p>
-																	<p class='favoritesNormalText'>Manage favorites on ECOMP Portal.</p>
+																	<p class='favoritesNormalText'>Manage favorites on ONAP Portal.</p>
 			                                                    </div>
 			                                                </div>
 														</div>
@@ -185,7 +185,7 @@
 				                        </div> 
 				                    </div >
 				                    <li class="megamenu__item" style="line-height:55px;" ng-if="loadMenufail">
-										<strong	style="font-weight: 400 !important; font-family: "Omnes-ECOMP-W02", Arial !important; font-size: 18px;" >Unable to load menus</strong>
+										<strong	style="font-weight: 400 !important; font-family: "Omnes-ONAP-W02", Arial !important; font-size: 18px;" >Unable to load menus</strong>
 									</li>
 <!-- 										<li class="megamenu__item" style="width: 20%;">&nbsp;</li>
  -->									</div>
@@ -208,7 +208,7 @@
 				</div>
 			</div>
 		<div class="license-notification" id="license-notification">
-			<a href="javascript:void(0)" style="background-color:#bbb;" class="button button--small" tooltip="Please contact ECOMP Portal team to get the license" tooltip-placement="below" tooltip-style="light"  tooltip-popup-delay="500" >
+			<a href="javascript:void(0)" style="background-color:#bbb;" class="button button--small" tooltip="Please contact ONAP Portal team to get the license" tooltip-placement="below" tooltip-style="light"  tooltip-popup-delay="500" >
 				<span style="">{{app_name_full}}</span>
 			</a>									
 		</div>
@@ -345,7 +345,7 @@
 		var menuStructureConvert = function(menuItems) {
 			var megaMenuDataObjectTemp = [
 	                                 {
-	                                	 text: "ECOMP",
+	                                	 text: "ONAP",
 	                                	 children:menuItems
 	                                 },
 	                                 {
diff --git a/ECOMP-SDK-APP/src/main/webapp/WEB-INF/fusion/orm/RNoteBookIntegration.hbm.xml b/ONAP-SDK-APP/src/main/webapp/WEB-INF/fusion/orm/RNoteBookIntegration.hbm.xml
index 6638b4bc7..984e2369b 100644
--- a/ECOMP-SDK-APP/src/main/webapp/WEB-INF/fusion/orm/RNoteBookIntegration.hbm.xml
+++ b/ONAP-SDK-APP/src/main/webapp/WEB-INF/fusion/orm/RNoteBookIntegration.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
   ================================================================================
-  eCOMP Portal SDK
+  onap Portal SDK
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property
   ================================================================================
diff --git a/ECOMP-SDK-APP/src/main/webapp/WEB-INF/index.jsp b/ONAP-SDK-APP/src/main/webapp/WEB-INF/index.jsp
index f6030c979..ac19fd94a 100644
--- a/ECOMP-SDK-APP/src/main/webapp/WEB-INF/index.jsp
+++ b/ONAP-SDK-APP/src/main/webapp/WEB-INF/index.jsp
@@ -1,6 +1,6 @@
 <%--
   ================================================================================
-  eCOMP Portal SDK
+  onap Portal SDK
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property
   ================================================================================
diff --git a/ECOMP-SDK-APP/src/main/webapp/WEB-INF/jsp/login.jsp b/ONAP-SDK-APP/src/main/webapp/WEB-INF/jsp/login.jsp
index 09320356c..2d6c95115 100644
--- a/ECOMP-SDK-APP/src/main/webapp/WEB-INF/jsp/login.jsp
+++ b/ONAP-SDK-APP/src/main/webapp/WEB-INF/jsp/login.jsp
@@ -1,6 +1,6 @@
 <%--
   ================================================================================
-  ECOMP Portal SDK
+  ONAP Portal SDK
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property
   ================================================================================
@@ -77,7 +77,7 @@
 	</head>
 	<body>
 		<div class="login">
-			<img src="static/fusion/images/ecomp_trans.png" />
+			<img src="static/fusion/images/onap_trans.png" />
 			<h2>
 				<%=appDisplayName%>
 			</h2>
@@ -106,7 +106,7 @@
 		<br />
 		<div id="footer">
 			<div class="terms">
-				Copyright 2017 Open ECOMP and Linux Foundation.
+				Copyright 2017 Open ONAP and Linux Foundation.
 			</div>
 		</div>
 	</body>
diff --git a/ECOMP-SDK-APP/src/main/webapp/WEB-INF/jsp/login_external.jsp b/ONAP-SDK-APP/src/main/webapp/WEB-INF/jsp/login_external.jsp
index 9d099bf0e..cb980c625 100644
--- a/ECOMP-SDK-APP/src/main/webapp/WEB-INF/jsp/login_external.jsp
+++ b/ONAP-SDK-APP/src/main/webapp/WEB-INF/jsp/login_external.jsp
@@ -1,6 +1,6 @@
 <%--
   ================================================================================
-  ECOMP Portal SDK
+  ONAP Portal SDK
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property
   ================================================================================
@@ -77,7 +77,7 @@
 	<body>
 
 		<div class="login">
-			<img src="static/fusion/images/ecomp_trans.png" />
+			<img src="static/fusion/images/onap_trans.png" />
 			<h2>
 				<%=appDisplayName%>
 			</h2>
@@ -106,7 +106,7 @@
 		<br />
 		<div id="footer">
 			<div class="terms">
-				Copyright 2017 Open ECOMP and Linux Foundation.
+				Copyright 2017 Open ONAP and Linux Foundation.
 			</div>
 			<p>
 			<div class="terms">
diff --git a/ECOMP-SDK-APP/src/main/webapp/WEB-INF/web.xml b/ONAP-SDK-APP/src/main/webapp/WEB-INF/web.xml
index 0290f1fc8..31b096049 100644
--- a/ECOMP-SDK-APP/src/main/webapp/WEB-INF/web.xml
+++ b/ONAP-SDK-APP/src/main/webapp/WEB-INF/web.xml
@@ -4,7 +4,7 @@
          xmlns:web="http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
          version="3.1" xmlns="http://xmlns.jcp.org/xml/ns/javaee">
 
-	<display-name>ecomp-sdk-app-os</display-name>
+	<display-name>onap-sdk-app-os</display-name>
 
 	<!-- The app can function on a HA cluster -->
 	<distributable />
diff --git a/ECOMP-SDK-APP/src/main/webapp/app/fusion/external/b2b/css/b2b-angular/font_icons.css b/ONAP-SDK-APP/src/main/webapp/app/fusion/external/b2b/css/b2b-angular/font_icons.css
index 0aa5b8571..0aa5b8571 100644
--- a/ECOMP-SDK-APP/src/main/webapp/app/fusion/external/b2b/css/b2b-angular/font_icons.css
+++ b/ONAP-SDK-APP/src/main/webapp/app/fusion/external/b2b/css/b2b-angular/font_icons.css
diff --git a/ECOMP-SDK-APP/src/main/webapp/app/fusion/external/ds2/css/digital-ng-library/ionicons.css b/ONAP-SDK-APP/src/main/webapp/app/fusion/external/ds2/css/digital-ng-library/ionicons.css
index 3f7fef611..3f7fef611 100644
--- a/ECOMP-SDK-APP/src/main/webapp/app/fusion/external/ds2/css/digital-ng-library/ionicons.css
+++ b/ONAP-SDK-APP/src/main/webapp/app/fusion/external/ds2/css/digital-ng-library/ionicons.css
diff --git a/ECOMP-SDK-APP/src/main/webapp/app/fusion/external/ds2/css/fonts/ionicons.eot b/ONAP-SDK-APP/src/main/webapp/app/fusion/external/ds2/css/fonts/ionicons.eot
index 92a3f20a3..92a3f20a3 100644
--- a/ECOMP-SDK-APP/src/main/webapp/app/fusion/external/ds2/css/fonts/ionicons.eot
+++ b/ONAP-SDK-APP/src/main/webapp/app/fusion/external/ds2/css/fonts/ionicons.eot
diff --git a/ECOMP-SDK-APP/src/main/webapp/app/fusion/external/ds2/css/fonts/ionicons.svg b/ONAP-SDK-APP/src/main/webapp/app/fusion/external/ds2/css/fonts/ionicons.svg
index 49fc8f367..49fc8f367 100644
--- a/ECOMP-SDK-APP/src/main/webapp/app/fusion/external/ds2/css/fonts/ionicons.svg
+++ b/ONAP-SDK-APP/src/main/webapp/app/fusion/external/ds2/css/fonts/ionicons.svg
diff --git a/ECOMP-SDK-APP/src/main/webapp/app/fusion/external/ds2/css/fonts/ionicons.ttf b/ONAP-SDK-APP/src/main/webapp/app/fusion/external/ds2/css/fonts/ionicons.ttf
index c4e463248..c4e463248 100644
--- a/ECOMP-SDK-APP/src/main/webapp/app/fusion/external/ds2/css/fonts/ionicons.ttf
+++ b/ONAP-SDK-APP/src/main/webapp/app/fusion/external/ds2/css/fonts/ionicons.ttf
diff --git a/ECOMP-SDK-APP/src/main/webapp/app/fusion/external/ds2/css/fonts/ionicons.woff b/ONAP-SDK-APP/src/main/webapp/app/fusion/external/ds2/css/fonts/ionicons.woff
index 5f3a14e0a..5f3a14e0a 100644
--- a/ECOMP-SDK-APP/src/main/webapp/app/fusion/external/ds2/css/fonts/ionicons.woff
+++ b/ONAP-SDK-APP/src/main/webapp/app/fusion/external/ds2/css/fonts/ionicons.woff
diff --git a/ECOMP-SDK-APP/src/main/webapp/app/fusion/scripts/DS2-controllers/ds-profile/post-controller.js b/ONAP-SDK-APP/src/main/webapp/app/fusion/scripts/DS2-controllers/ds-profile/post-controller.js
index b9de4be87..b9de4be87 100644
--- a/ECOMP-SDK-APP/src/main/webapp/app/fusion/scripts/DS2-controllers/ds-profile/post-controller.js
+++ b/ONAP-SDK-APP/src/main/webapp/app/fusion/scripts/DS2-controllers/ds-profile/post-controller.js
diff --git a/ECOMP-SDK-APP/src/main/webapp/app/fusion/scripts/DS2-controllers/samplePage-route.js b/ONAP-SDK-APP/src/main/webapp/app/fusion/scripts/DS2-controllers/samplePage-route.js
index b2042b856..b2042b856 100644
--- a/ECOMP-SDK-APP/src/main/webapp/app/fusion/scripts/DS2-controllers/samplePage-route.js
+++ b/ONAP-SDK-APP/src/main/webapp/app/fusion/scripts/DS2-controllers/samplePage-route.js
diff --git a/ECOMP-SDK-APP/src/main/webapp/app/fusion/scripts/DS2-services/postSearch.js b/ONAP-SDK-APP/src/main/webapp/app/fusion/scripts/DS2-services/postSearch.js
index cf225def1..cf225def1 100644
--- a/ECOMP-SDK-APP/src/main/webapp/app/fusion/scripts/DS2-services/postSearch.js
+++ b/ONAP-SDK-APP/src/main/webapp/app/fusion/scripts/DS2-services/postSearch.js
diff --git a/ECOMP-SDK-APP/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-profile/post.html b/ONAP-SDK-APP/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-profile/post.html
index 43bec5214..43bec5214 100644
--- a/ECOMP-SDK-APP/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-profile/post.html
+++ b/ONAP-SDK-APP/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-profile/post.html
diff --git a/ECOMP-SDK-APP/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-profile/profile_searchDS2.html b/ONAP-SDK-APP/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-profile/profile_searchDS2.html
index 36b8c2a42..36b8c2a42 100644
--- a/ECOMP-SDK-APP/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-profile/profile_searchDS2.html
+++ b/ONAP-SDK-APP/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-profile/profile_searchDS2.html
diff --git a/ECOMP-SDK-APP/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-profile/self_profile.html b/ONAP-SDK-APP/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-profile/self_profile.html
index 3b5ef525a..3b5ef525a 100644
--- a/ECOMP-SDK-APP/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-profile/self_profile.html
+++ b/ONAP-SDK-APP/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-profile/self_profile.html
diff --git a/ECOMP-SDK-APP/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-samplePages/samplePage.html b/ONAP-SDK-APP/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-samplePages/samplePage.html
index 06d62f676..523bfe71e 100644
--- a/ECOMP-SDK-APP/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-samplePages/samplePage.html
+++ b/ONAP-SDK-APP/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-samplePages/samplePage.html
@@ -11,7 +11,7 @@
 	
 	<!-- icons in open source -->
 	<link rel="stylesheet" type="text/css" href="app/fusion/external/ds2/css/digital-ng-library/ionicons.css">
-	<link rel="stylesheet" type="text/css" href="app/fusion/styles/ecomp.css">
+	<link rel="stylesheet" type="text/css" href="app/fusion/styles/onap.css">
 	
 	<!-- Common scripts -->
 
diff --git a/ECOMP-SDK-APP/src/main/webapp/app/fusion/scripts/DS2-view-models/footer.html b/ONAP-SDK-APP/src/main/webapp/app/fusion/scripts/DS2-view-models/footer.html
index f4d8d7edb..f219b1b0b 100644
--- a/ECOMP-SDK-APP/src/main/webapp/app/fusion/scripts/DS2-view-models/footer.html
+++ b/ONAP-SDK-APP/src/main/webapp/app/fusion/scripts/DS2-view-models/footer.html
@@ -4,7 +4,7 @@
 			<div class="divider-bottom-footer">
 				<div class="span12 footerLogo">	
 					 <p class="copyright-text">
-					 	Copyright 2017 Open ECOMP and Linux Foundation. <span class="build_number">Build Number: {{build_number}}</span>								
+					 	Copyright 2017 Open ONAP and Linux Foundation. <span class="build_number">Build Number: {{build_number}}</span>								
 					 </p> 	
 				</div>
 			</div>
diff --git a/ECOMP-SDK-APP/src/main/webapp/app/fusion/scripts/utils/page-resource-ds2.js b/ONAP-SDK-APP/src/main/webapp/app/fusion/scripts/utils/page-resource-ds2.js
index d0af6cbc3..21b6b0dc1 100644
--- a/ECOMP-SDK-APP/src/main/webapp/app/fusion/scripts/utils/page-resource-ds2.js
+++ b/ONAP-SDK-APP/src/main/webapp/app/fusion/scripts/utils/page-resource-ds2.js
@@ -76,7 +76,7 @@ function loadResource(){
 	/*******DS2 ICONS*******/
 	
 	loadjscssfile("./app/fusion/external/ds2/css/digital-ng-library/ionicons.css", "css");	
-	loadjscssfile("./app/fusion/styles/ecomp.css", "css");
+	loadjscssfile("./app/fusion/styles/onap.css", "css");
 	loadjscssfile("./app/fusion/external/angular-gridster/dist/angular-gridster.min.css", "css");
 
 }
diff --git a/ECOMP-SDK-APP/src/main/webapp/app/fusion/scripts/view-models/footer.html b/ONAP-SDK-APP/src/main/webapp/app/fusion/scripts/view-models/footer.html
index 7cbff474b..5e42f0015 100644
--- a/ECOMP-SDK-APP/src/main/webapp/app/fusion/scripts/view-models/footer.html
+++ b/ONAP-SDK-APP/src/main/webapp/app/fusion/scripts/view-models/footer.html
@@ -7,7 +7,7 @@
 			<div class="footerLastSection">			
 					<div class="footerText">
 			            <p class="copyright-text">
-			            	Copyright Open ECOMP and Linux Foundation 2017. 
+			            	Copyright Open ONAP and Linux Foundation 2017. 
 			            </p>
 			        </div>	
 				</div>
diff --git a/ECOMP-SDK-APP/src/main/webapp/static/fusion/css/att_angular_gridster/sandbox-gridster.css b/ONAP-SDK-APP/src/main/webapp/static/fusion/css/att_angular_gridster/sandbox-gridster.css
index a9edba8ff..a9edba8ff 100644
--- a/ECOMP-SDK-APP/src/main/webapp/static/fusion/css/att_angular_gridster/sandbox-gridster.css
+++ b/ONAP-SDK-APP/src/main/webapp/static/fusion/css/att_angular_gridster/sandbox-gridster.css
diff --git a/ECOMP-SDK-APP/src/main/webapp/static/fusion/css/att_angular_gridster/ui-gridster.css b/ONAP-SDK-APP/src/main/webapp/static/fusion/css/att_angular_gridster/ui-gridster.css
index 4bf19bfaf..b237f3056 100644
--- a/ECOMP-SDK-APP/src/main/webapp/static/fusion/css/att_angular_gridster/ui-gridster.css
+++ b/ONAP-SDK-APP/src/main/webapp/static/fusion/css/att_angular_gridster/ui-gridster.css
@@ -47,7 +47,7 @@
     .gridster-item-container .gridster-item-header .gridster-item-header-content {
       line-height: 44px;
       margin-left: 26px;
-      font-family: "Omnes-ECOMP-W02", Arial;
+      font-family: "Omnes-ONAP-W02", Arial;
       font-size: 18px;
       color: #444444;
       float: left; }
@@ -55,7 +55,7 @@
       position: absolute;
       top: 29.5px;
       left: 26px;
-      font-family: "Omnes-ECOMP-W02", Arial;
+      font-family: "Omnes-ONAP-W02", Arial;
       font-size: 12px;
       color: #444444; }
     .gridster-item-container .gridster-item-header .gridster-item-header-buttons-container {
@@ -106,7 +106,7 @@
       text-decoration: underline; }
     .gridster-item-container .gridster-item-footer .gridster-item-footer-content {
       line-height: 30px;
-      font-family: "Omnes-ECOMP-W02", Arial;
+      font-family: "Omnes-ONAP-W02", Arial;
       font-size: 12px;
       color: #565656;
       margin: 20px;
diff --git a/ECOMP-SDK-APP/src/main/webapp/static/fusion/css/fusion-sunny.css b/ONAP-SDK-APP/src/main/webapp/static/fusion/css/fusion-sunny.css
index f9154a1ca..f9154a1ca 100644
--- a/ECOMP-SDK-APP/src/main/webapp/static/fusion/css/fusion-sunny.css
+++ b/ONAP-SDK-APP/src/main/webapp/static/fusion/css/fusion-sunny.css
diff --git a/ECOMP-SDK-APP/src/main/webapp/static/fusion/images/att_angular_gridster/grips.png b/ONAP-SDK-APP/src/main/webapp/static/fusion/images/att_angular_gridster/grips.png
index 29b92cc57..29b92cc57 100644
--- a/ECOMP-SDK-APP/src/main/webapp/static/fusion/images/att_angular_gridster/grips.png
+++ b/ONAP-SDK-APP/src/main/webapp/static/fusion/images/att_angular_gridster/grips.png
diff --git a/ECOMP-SDK-APP/src/main/webapp/static/fusion/images/ecomp-login-550x360.jpg b/ONAP-SDK-APP/src/main/webapp/static/fusion/images/onap-login-550x360.jpg
index 618b1a924..618b1a924 100644
--- a/ECOMP-SDK-APP/src/main/webapp/static/fusion/images/ecomp-login-550x360.jpg
+++ b/ONAP-SDK-APP/src/main/webapp/static/fusion/images/onap-login-550x360.jpg
diff --git a/ECOMP-SDK-APP/src/main/webapp/static/fusion/images/ecomp-login.jpg b/ONAP-SDK-APP/src/main/webapp/static/fusion/images/onap-login.jpg
index 618b20e91..618b20e91 100644
--- a/ECOMP-SDK-APP/src/main/webapp/static/fusion/images/ecomp-login.jpg
+++ b/ONAP-SDK-APP/src/main/webapp/static/fusion/images/onap-login.jpg
diff --git a/ECOMP-SDK-APP/src/main/webapp/static/fusion/images/ecomp.png b/ONAP-SDK-APP/src/main/webapp/static/fusion/images/onap.png
index b355f109f..b355f109f 100644
--- a/ECOMP-SDK-APP/src/main/webapp/static/fusion/images/ecomp.png
+++ b/ONAP-SDK-APP/src/main/webapp/static/fusion/images/onap.png
diff --git a/ECOMP-SDK-APP/src/main/webapp/static/fusion/images/ecomp_trans.png b/ONAP-SDK-APP/src/main/webapp/static/fusion/images/onap_trans.png
index 4e8381c1a..4e8381c1a 100644
--- a/ECOMP-SDK-APP/src/main/webapp/static/fusion/images/ecomp_trans.png
+++ b/ONAP-SDK-APP/src/main/webapp/static/fusion/images/onap_trans.png
diff --git a/ECOMP-SDK-APP/src/main/webapp/static/fusion/js/att_angular_gridster/angular-gridster.js b/ONAP-SDK-APP/src/main/webapp/static/fusion/js/att_angular_gridster/angular-gridster.js
index 985fa4341..985fa4341 100644
--- a/ECOMP-SDK-APP/src/main/webapp/static/fusion/js/att_angular_gridster/angular-gridster.js
+++ b/ONAP-SDK-APP/src/main/webapp/static/fusion/js/att_angular_gridster/angular-gridster.js
diff --git a/ECOMP-SDK-APP/src/main/webapp/static/fusion/js/att_angular_gridster/ui-gridster-tpls.js b/ONAP-SDK-APP/src/main/webapp/static/fusion/js/att_angular_gridster/ui-gridster-tpls.js
index 3ca3db7d8..3ca3db7d8 100644
--- a/ECOMP-SDK-APP/src/main/webapp/static/fusion/js/att_angular_gridster/ui-gridster-tpls.js
+++ b/ONAP-SDK-APP/src/main/webapp/static/fusion/js/att_angular_gridster/ui-gridster-tpls.js
diff --git a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/css/images/blank.gif b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/css/images/blank.gif
index 75b945d25..75b945d25 100644
--- a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/css/images/blank.gif
+++ b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/css/images/blank.gif
diff --git a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/css/scribble.css b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/css/scribble.css
index 9986f2acc..9986f2acc 100644
--- a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/css/scribble.css
+++ b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/css/scribble.css
diff --git a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/css/slider.css b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/css/slider.css
index f609403c2..f609403c2 100644
--- a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/css/slider.css
+++ b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/css/slider.css
diff --git a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/css/spacegallery.css b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/css/spacegallery.css
index ce4fd57c4..ce4fd57c4 100644
--- a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/css/spacegallery.css
+++ b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/css/spacegallery.css
diff --git a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/css/welcome.css b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/css/welcome.css
index ea1af26e5..ea1af26e5 100644
--- a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/css/welcome.css
+++ b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/css/welcome.css
diff --git a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/html/area_chart.html b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/html/area_chart.html
index 30ef20110..30ef20110 100644
--- a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/html/area_chart.html
+++ b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/html/area_chart.html
diff --git a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/html/bar_chart.html b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/html/bar_chart.html
index 0be16ec11..0be16ec11 100644
--- a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/html/bar_chart.html
+++ b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/html/bar_chart.html
diff --git a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/html/d3_gauges_demo.html b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/html/d3_gauges_demo.html
index 94596e73c..94596e73c 100644
--- a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/html/d3_gauges_demo.html
+++ b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/html/d3_gauges_demo.html
diff --git a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/html/data/speedometer2.csv b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/html/data/speedometer2.csv
index 406143ea2..406143ea2 100644
--- a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/html/data/speedometer2.csv
+++ b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/html/data/speedometer2.csv
diff --git a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/html/data/speedometer3.csv b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/html/data/speedometer3.csv
index 046383e40..046383e40 100644
--- a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/html/data/speedometer3.csv
+++ b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/html/data/speedometer3.csv
diff --git a/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/html/data/worddata.csv b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/html/data/worddata.csv
new file mode 100644
index 000000000..f9a8669ba
--- /dev/null
+++ b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/html/data/worddata.csv
@@ -0,0 +1 @@
+text,frequency
service,98
portal,70
management,70
virtual,56
design,56
VNF,56
studio,42
operations,42
inventory,42
POLO,42
D2.0,42
ASDC,42
router,28
restart,28
process,28
platform,28
manage,28
loop,28
licensing,28
license,28
integrated,28
flow-through,28
enable,28
data,28
controller,28
control,28
configure,28
component,28
common,28
asset,28
application,28
ONAP,28
workflow,14
waterfall,14
visual,14
view,14
vCTS,14
utilization,14
user,14
usage,14
troubleshoot,14
transformation,14
track,14
topolgies,14
topics,14
time,14
tickets,14
thresholds,14
templates,14
structures,14
standards-based,14
software,14
reuse,14
repository,14
reports,14
release,14
recipes,14
real-time,14
provisioning,14
properties,14
project-based,14
processes,14
physical,14
oversight,14
openl-loop,14
network,14
monitor,14
modeling,14
model-driven,14
model,14
message,14
maximize,14
manually,14
machine,14
layer,14
interact,14
instances,14
initiate,14
increase,14
imported,14
impacts,14
host,14
function,14
feeds,14
features,14
faults,14
extended,14
engines,14
engine,14
dynamic,14
document-driven,14
determine,14
dashboard,14
current,14
creation,14
created,14
create,14
configuration,14
composer,14
components,14
collective,14
certification,14
bus,14
basis,14
available,14
automation,14
automated,14
associated,14
assignment,14
appropriate,14
against,14
aervice,14
adminstrators,14
activation,14
action,14
VMs,14
VM,14
VLAN,14
SDN,14
SDK,14
SBG,14
SAM,14
RUBY,14
Policy,14
PODS,14
Ops,14
GFP,14
F5FW,14
DMaaP,14
DCAE,14
DBC,14
CPADS,14
AT&T,14
APP-C,14
AOTS-TM,14
ALTS,14
A&AI,14
diff --git a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/html/donut_d3.html b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/html/donut_d3.html
index afcac3598..afcac3598 100644
--- a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/html/donut_d3.html
+++ b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/html/donut_d3.html
diff --git a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/html/js/area_chart.min.js b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/html/js/area_chart.min.js
index 9b3decb90..9b3decb90 100644
--- a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/html/js/area_chart.min.js
+++ b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/html/js/area_chart.min.js
diff --git a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/html/js/donut.min.js b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/html/js/donut.min.js
index 60c4fd4bd..60c4fd4bd 100644
--- a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/html/js/donut.min.js
+++ b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/html/js/donut.min.js
diff --git a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/html/js/gauges.min.js b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/html/js/gauges.min.js
index c0fd74849..c0fd74849 100644
--- a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/html/js/gauges.min.js
+++ b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/html/js/gauges.min.js
diff --git a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/html/js/line_chart.min.js b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/html/js/line_chart.min.js
index e501260bc..e501260bc 100644
--- a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/html/js/line_chart.min.js
+++ b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/html/js/line_chart.min.js
diff --git a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/html/js/pie_chart.min.js b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/html/js/pie_chart.min.js
index f78eec708..f78eec708 100644
--- a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/html/js/pie_chart.min.js
+++ b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/html/js/pie_chart.min.js
diff --git a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/html/js/worddata.min.js b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/html/js/worddata.min.js
index 6b8274605..6b8274605 100644
--- a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/html/js/worddata.min.js
+++ b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/html/js/worddata.min.js
diff --git a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/html/line_chart.html b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/html/line_chart.html
index d4ba57a46..d4ba57a46 100644
--- a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/html/line_chart.html
+++ b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/html/line_chart.html
diff --git a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/html/pie_chart.html b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/html/pie_chart.html
index ebbdd9c00..ebbdd9c00 100644
--- a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/html/pie_chart.html
+++ b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/html/pie_chart.html
diff --git a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/html/wordcloud.html b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/html/wordcloud.html
index 6cf000795..120c1e30b 100644
--- a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/html/wordcloud.html
+++ b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/html/wordcloud.html
@@ -28,7 +28,7 @@
 <script>
 var cloudSize = 200;
 var dataURL = "data/worddata.csv";
-var keywords = ["VNF", "portal", "D2.0", "service", "management", "ECOMP"];
+var keywords = ["VNF", "portal", "D2.0", "service", "management", "ONAP"];
 </script>
 <script src="js/worddata.min.js" type="text/JavaScript"></script>
   </footer>
diff --git a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/images/Calendar-16x16.png b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/images/Calendar-16x16.png
index ac970bda5..ac970bda5 100644
--- a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/images/Calendar-16x16.png
+++ b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/images/Calendar-16x16.png
diff --git a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/images/arrow-next.png b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/images/arrow-next.png
index 1a4f72c68..1a4f72c68 100644
--- a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/images/arrow-next.png
+++ b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/images/arrow-next.png
diff --git a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/images/arrow-prev.png b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/images/arrow-prev.png
index 8211eba1d..8211eba1d 100644
--- a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/images/arrow-prev.png
+++ b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/images/arrow-prev.png
diff --git a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/images/carousel/slide_b_drive_test_map.png b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/images/carousel/slide_b_drive_test_map.png
index 78a8873bb..78a8873bb 100644
--- a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/images/carousel/slide_b_drive_test_map.png
+++ b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/images/carousel/slide_b_drive_test_map.png
diff --git a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/images/carousel/slide_b_eppt_county.png b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/images/carousel/slide_b_eppt_county.png
index df471d7d8..df471d7d8 100644
--- a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/images/carousel/slide_b_eppt_county.png
+++ b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/images/carousel/slide_b_eppt_county.png
diff --git a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/images/carousel/slide_b_eppt_regression.png b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/images/carousel/slide_b_eppt_regression.png
index e59fc189c..e59fc189c 100644
--- a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/images/carousel/slide_b_eppt_regression.png
+++ b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/images/carousel/slide_b_eppt_regression.png
diff --git a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/images/carousel/slide_b_ios_throughput.png b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/images/carousel/slide_b_ios_throughput.png
index 76a2d2b7a..76a2d2b7a 100644
--- a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/images/carousel/slide_b_ios_throughput.png
+++ b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/images/carousel/slide_b_ios_throughput.png
diff --git a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/images/carousel/slide_b_lata_map.png b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/images/carousel/slide_b_lata_map.png
index 174ef9b8e..174ef9b8e 100644
--- a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/images/carousel/slide_b_lata_map.png
+++ b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/images/carousel/slide_b_lata_map.png
diff --git a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/images/carousel/slide_b_lata_map_legend.png b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/images/carousel/slide_b_lata_map_legend.png
index f7f2719ae..f7f2719ae 100644
--- a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/images/carousel/slide_b_lata_map_legend.png
+++ b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/images/carousel/slide_b_lata_map_legend.png
diff --git a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/images/carousel/slide_b_nova_sdn_map.png b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/images/carousel/slide_b_nova_sdn_map.png
index ee0ddef91..ee0ddef91 100644
--- a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/images/carousel/slide_b_nova_sdn_map.png
+++ b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/images/carousel/slide_b_nova_sdn_map.png
diff --git a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/images/copyicon.png b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/images/copyicon.png
index 6c1c3c155..6c1c3c155 100644
--- a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/images/copyicon.png
+++ b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/images/copyicon.png
diff --git a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/images/deleteicon.gif b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/images/deleteicon.gif
index 4b07af826..4b07af826 100644
--- a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/images/deleteicon.gif
+++ b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/images/deleteicon.gif
diff --git a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/images/example-frame.png b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/images/example-frame.png
index 31f2fe1cc..31f2fe1cc 100644
--- a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/images/example-frame.png
+++ b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/images/example-frame.png
diff --git a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/images/loading.gif b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/images/loading.gif
index cccb0fc9f..cccb0fc9f 100644
--- a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/images/loading.gif
+++ b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/images/loading.gif
diff --git a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/images/tunnels/1_mon.png b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/images/tunnels/1_mon.png
index d46eee505..d46eee505 100644
--- a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/images/tunnels/1_mon.png
+++ b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/images/tunnels/1_mon.png
diff --git a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/images/tunnels/2_tue.png b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/images/tunnels/2_tue.png
index ed82aad3a..ed82aad3a 100644
--- a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/images/tunnels/2_tue.png
+++ b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/images/tunnels/2_tue.png
diff --git a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/images/tunnels/3_wed.png b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/images/tunnels/3_wed.png
index 8f8c03287..8f8c03287 100644
--- a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/images/tunnels/3_wed.png
+++ b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/images/tunnels/3_wed.png
diff --git a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/images/tunnels/4_thu.png b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/images/tunnels/4_thu.png
index 750dca5d6..750dca5d6 100644
--- a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/images/tunnels/4_thu.png
+++ b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/images/tunnels/4_thu.png
diff --git a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/images/tunnels/5_fri.png b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/images/tunnels/5_fri.png
index 599e51f1e..599e51f1e 100644
--- a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/images/tunnels/5_fri.png
+++ b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/images/tunnels/5_fri.png
diff --git a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/images/tunnels/6_sat.png b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/images/tunnels/6_sat.png
index 70323ea04..70323ea04 100644
--- a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/images/tunnels/6_sat.png
+++ b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/images/tunnels/6_sat.png
diff --git a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/images/tunnels/7_sun.png b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/images/tunnels/7_sun.png
index 9d579d680..9d579d680 100644
--- a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/images/tunnels/7_sun.png
+++ b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/images/tunnels/7_sun.png
diff --git a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/images/tunnels/BH_DLSTX_IN.png b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/images/tunnels/BH_DLSTX_IN.png
index af1ac0a72..af1ac0a72 100644
--- a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/images/tunnels/BH_DLSTX_IN.png
+++ b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/images/tunnels/BH_DLSTX_IN.png
diff --git a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/images/tunnels/BH_DLSTX_OUT.png b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/images/tunnels/BH_DLSTX_OUT.png
index 935b53862..935b53862 100644
--- a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/images/tunnels/BH_DLSTX_OUT.png
+++ b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/images/tunnels/BH_DLSTX_OUT.png
diff --git a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/images/tunnels/BH_Nat.png b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/images/tunnels/BH_Nat.png
index 916a655ff..916a655ff 100644
--- a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/images/tunnels/BH_Nat.png
+++ b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/images/tunnels/BH_Nat.png
diff --git a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/images/tunnels/BH_Nat_Def.png b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/images/tunnels/BH_Nat_Def.png
index a8b516d9f..a8b516d9f 100644
--- a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/images/tunnels/BH_Nat_Def.png
+++ b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/images/tunnels/BH_Nat_Def.png
diff --git a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/images/tunnels/BH_Nat_Priority.png b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/images/tunnels/BH_Nat_Priority.png
index 2cf814113..2cf814113 100644
--- a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/images/tunnels/BH_Nat_Priority.png
+++ b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/images/tunnels/BH_Nat_Priority.png
diff --git a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/js/FusionCharts.js b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/js/FusionCharts.js
index 4c174dfae..4c174dfae 100644
--- a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/js/FusionCharts.js
+++ b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/js/FusionCharts.js
diff --git a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/js/charts.js b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/js/charts.js
index 4bebbd365..4bebbd365 100644
--- a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/js/charts.js
+++ b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/js/charts.js
diff --git a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/js/jquery.flexslider-min.js b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/js/jquery.flexslider-min.js
index 5ad6c3775..5ad6c3775 100644
--- a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/js/jquery.flexslider-min.js
+++ b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/js/jquery.flexslider-min.js
diff --git a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/js/scribble.js b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/js/scribble.js
index 5384b3049..5384b3049 100644
--- a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/js/scribble.js
+++ b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/js/scribble.js
diff --git a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/js/slides.min.jquery.js b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/js/slides.min.jquery.js
index 1a1fcdd8d..1a1fcdd8d 100644
--- a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/js/slides.min.jquery.js
+++ b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/js/slides.min.jquery.js
diff --git a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/js/spacegallery.js b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/js/spacegallery.js
index 69ab2cccb..69ab2cccb 100644
--- a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/js/spacegallery.js
+++ b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/js/spacegallery.js
diff --git a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/org_chart/css/bootstrap.min.css b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/org_chart/css/bootstrap.min.css
index 3424a5f10..3424a5f10 100644
--- a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/org_chart/css/bootstrap.min.css
+++ b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/org_chart/css/bootstrap.min.css
diff --git a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/org_chart/css/custom.css b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/org_chart/css/custom.css
index b7df8c255..b7df8c255 100644
--- a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/org_chart/css/custom.css
+++ b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/org_chart/css/custom.css
diff --git a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/org_chart/css/jquery.jOrgChart.css b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/org_chart/css/jquery.jOrgChart.css
index ffabe2740..ffabe2740 100644
--- a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/org_chart/css/jquery.jOrgChart.css
+++ b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/org_chart/css/jquery.jOrgChart.css
diff --git a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/org_chart/css/prettify.css b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/org_chart/css/prettify.css
index d44b3a228..d44b3a228 100644
--- a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/org_chart/css/prettify.css
+++ b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/org_chart/css/prettify.css
diff --git a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/org_chart/example.html b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/org_chart/example.html
index 543b0f924..543b0f924 100644
--- a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/org_chart/example.html
+++ b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/org_chart/example.html
diff --git a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/org_chart/example_vsp.html b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/org_chart/example_vsp.html
index a2e3703d2..a2e3703d2 100644
--- a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/org_chart/example_vsp.html
+++ b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/org_chart/example_vsp.html
diff --git a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/org_chart/images/bkgd.png b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/org_chart/images/bkgd.png
index 3bbaf5eee..3bbaf5eee 100644
--- a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/org_chart/images/bkgd.png
+++ b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/org_chart/images/bkgd.png
diff --git a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/org_chart/images/raspberry.jpg b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/org_chart/images/raspberry.jpg
index e79a0515d..e79a0515d 100644
--- a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/org_chart/images/raspberry.jpg
+++ b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/org_chart/images/raspberry.jpg
diff --git a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/org_chart/jquery.jOrgChart.js b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/org_chart/jquery.jOrgChart.js
index 89411b290..89411b290 100644
--- a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/org_chart/jquery.jOrgChart.js
+++ b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/org_chart/jquery.jOrgChart.js
diff --git a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/org_chart/prettify.js b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/org_chart/prettify.js
index eef5ad7e6..eef5ad7e6 100644
--- a/ECOMP-SDK-APP/src/main/webapp/static/fusion/sample/org_chart/prettify.js
+++ b/ONAP-SDK-APP/src/main/webapp/static/fusion/sample/org_chart/prettify.js
diff --git a/ECOMP-SDK-APP/xacml.admin.properties b/ONAP-SDK-APP/xacml.admin.properties
index e6774a6cd..0f285b694 100644
--- a/ECOMP-SDK-APP/xacml.admin.properties
+++ b/ONAP-SDK-APP/xacml.admin.properties
@@ -1,6 +1,6 @@
 ###
 # ============LICENSE_START=======================================================
-# ECOMP Policy Engine
+# ONAP Policy Engine
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
@@ -39,7 +39,7 @@ xacml.pipFinderFactory=com.att.research.xacml.std.pip.StdPIPFinderFactory
 #
 xacml.att.evaluationContextFactory=com.att.research.xacmlatt.pdp.std.StdEvaluationContextFactory
 xacml.att.combiningAlgorithmFactory=com.att.research.xacmlatt.pdp.std.StdCombiningAlgorithmFactory
-xacml.att.functionDefinitionFactory=org.openecomp.policy.xacml.custom.EcompFunctionDefinitionFactory
+xacml.att.functionDefinitionFactory=org.onap.policy.xacml.custom.OnapFunctionDefinitionFactory
 xacml.att.policyFinderFactory=com.att.research.xacmlatt.pdp.std.StdPolicyFinderFactory
 
 #
@@ -50,12 +50,12 @@ xacml.rootPolicies=admin
 #
 # PAP Servlet properties
 #
-xacml.PAP.papEngineFactory=org.openecomp.policy.xacml.std.pap.StdEngineFactory
+xacml.PAP.papEngineFactory=org.onap.policy.xacml.std.pap.StdEngineFactory
 
 #
 # Admin Console properties
 #
-xacml.AC.papEngineFactory=org.openecomp.policy.xacml.admin.util.RESTfulPAPFactory
+xacml.AC.papEngineFactory=org.onap.policy.xacml.admin.util.RESTfulPAPFactory
 
 # Set your domain here:
 xacml.rest.admin.domain=com
@@ -88,7 +88,7 @@ xacml.log.db.password=policy_user
 xacml.att.log.timeframe=150
 
 javax.persistence.jdbc.driver=com.mysql.jdbc.Driver
-javax.persistence.jdbc.url=jdbc:mysql://localhost:3306/ecomp_sdk
+javax.persistence.jdbc.url=jdbc:mysql://localhost:3306/onap_sdk
 javax.persistence.jdbc.user=policy_user
 javax.persistence.jdbc.password=policy_user
 
@@ -175,8 +175,8 @@ xacml.att.automatic.push = false
 
 
 #Dashboard Tab Limit
-xacml.ecomp.dashboard.logTableLimit = 5000
-xacml.ecomp.dashboard.systemAlertTableLimit = 2000
+xacml.onap.dashboard.logTableLimit = 5000
+xacml.onap.dashboard.systemAlertTableLimit = 2000
 
 
 #Diff of policies for Firewall feature
@@ -186,18 +186,18 @@ FW_PROXY=todo_enter_the_proxy
 FW_PORT=8080
 
 #SMTP Server Details for Java Mail
-ecomp.smtp.host = smtp_host
-ecomp.smtp.port = smtp_port
-ecomp.smtp.userName = smtp_username
-ecomp.smtp.password = smtp_password
-ecomp.smtp.emailExtension=smtp_emailExtension
-ecomp.application.name = smtp_AppName
+onap.smtp.host = smtp_host
+onap.smtp.port = smtp_port
+onap.smtp.userName = smtp_username
+onap.smtp.password = smtp_password
+onap.smtp.emailExtension=smtp_emailExtension
+onap.application.name = smtp_AppName
 
 #Dialect for Database
-ecomp.dialect = org.hibernate.dialect.MySQLDialect
+onap.dialect = org.hibernate.dialect.MySQLDialect
 
-policyAdapter.impl.className = org.openecomp.policy.admin.PolicyAdapter
+policyAdapter.impl.className = org.onap.policy.admin.PolicyAdapter
 
 #Micro Service Model Properties
-xacml.policy.msEcompName=http://org.openecomp
-xacml.policy.msPolicyName=http://org.openecomp/policy
\ No newline at end of file
+xacml.policy.msOnapName=http://org.onap
+xacml.policy.msPolicyName=http://org.onap.policy
\ No newline at end of file
diff --git a/ECOMP-XACML/.gitignore b/ONAP-XACML/.gitignore
index 1baade8f7..1baade8f7 100644
--- a/ECOMP-XACML/.gitignore
+++ b/ONAP-XACML/.gitignore
diff --git a/ECOMP-XACML/config_testing/test_PolicyEngine.xml b/ONAP-XACML/config_testing/test_PolicyEngine.xml
index e111dfbf6..b5206a89a 100644
--- a/ECOMP-XACML/config_testing/test_PolicyEngine.xml
+++ b/ONAP-XACML/config_testing/test_PolicyEngine.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <!--
   ============LICENSE_START=======================================================
-  ECOMP-XACML
+  ONAP-XACML
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
   ================================================================================
@@ -28,14 +28,14 @@
             <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:integer-greater-than">
                 <Description>CPU</Description>
                 <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:integer-one-and-only">
-                    <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="com:att:labs:ecomp:resource:vm:cpu" DataType="http://www.w3.org/2001/XMLSchema#integer" MustBePresent="true"/>
+                    <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="com:att:labs:onap:resource:vm:cpu" DataType="http://www.w3.org/2001/XMLSchema#integer" MustBePresent="true"/>
                 </Apply>
                 <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#integer">95</AttributeValue>
             </Apply>
             <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:integer-greater-than">
                 <Description>Memory</Description>
                 <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:integer-one-and-only">
-                    <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="com:att:labs:ecomp:resource:vm:memory" DataType="http://www.w3.org/2001/XMLSchema#integer" MustBePresent="true"/>
+                    <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="com:att:labs:onap:resource:vm:memory" DataType="http://www.w3.org/2001/XMLSchema#integer" MustBePresent="true"/>
                 </Apply>
                 <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#integer">95</AttributeValue>
             </Apply>
@@ -47,14 +47,14 @@
             <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:integer-greater-than">
                 <Description>CPU</Description>
                 <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:integer-one-and-only">
-                    <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="com:att:labs:ecomp:resource:vm:cpu" DataType="http://www.w3.org/2001/XMLSchema#integer" MustBePresent="true"/>
+                    <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="com:att:labs:onap:resource:vm:cpu" DataType="http://www.w3.org/2001/XMLSchema#integer" MustBePresent="true"/>
                 </Apply>
                 <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#integer">90</AttributeValue>
             </Apply>
             <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:integer-greater-than">
                 <Description>Memory</Description>
                 <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:integer-one-and-only">
-                    <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="com:att:labs:ecomp:resource:vm:memory" DataType="http://www.w3.org/2001/XMLSchema#integer" MustBePresent="true"/>
+                    <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="com:att:labs:onap:resource:vm:memory" DataType="http://www.w3.org/2001/XMLSchema#integer" MustBePresent="true"/>
                 </Apply>
                 <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#integer">90</AttributeValue>
             </Apply>
@@ -67,7 +67,7 @@
                 <AllOf>
                     <Match MatchId="urn:oasis:names:tc:xacml:3.0:function:string-equal-ignore-case">
                         <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">JSON</AttributeValue>
-                        <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ECOMPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
+                        <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ONAPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                     </Match>
                     <Match MatchId="urn:oasis:names:tc:xacml:3.0:function:string-equal-ignore-case">
                         <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">ACCESS</AttributeValue>
@@ -81,11 +81,11 @@
             </AnyOf>
         </Target>
         <AdviceExpressions>
-            <AdviceExpression AdviceId="com.att.labs.ecomp.advice.config" AppliesTo="Permit">
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+            <AdviceExpression AdviceId="com.att.labs.onap.advice.config" AppliesTo="Permit">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">Configuration</AttributeValue>
                 </AttributeAssignmentExpression>
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#anyURI">http://localhost:5443/config/test_json.json</AttributeValue>
                 </AttributeAssignmentExpression>
             </AdviceExpression>
@@ -98,7 +98,7 @@
                 <AllOf>
                     <Match MatchId="urn:oasis:names:tc:xacml:3.0:function:string-equal-ignore-case">
                         <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">JSON</AttributeValue>
-                        <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ECOMPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
+                        <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ONAPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                     </Match>
 					<Match MatchId="urn:oasis:names:tc:xacml:3.0:function:string-equal-ignore-case">
                         <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">JSONconfig</AttributeValue>
@@ -116,11 +116,11 @@
             </AnyOf>
         </Target>
         <AdviceExpressions>
-            <AdviceExpression AdviceId="com.att.labs.ecomp.advice.config" AppliesTo="Permit">
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+            <AdviceExpression AdviceId="com.att.labs.onap.advice.config" AppliesTo="Permit">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">Configuration</AttributeValue>
                 </AttributeAssignmentExpression>
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#anyURI">http://localhost:5443/config/test_json.json</AttributeValue>
                 </AttributeAssignmentExpression>
             </AdviceExpression>
@@ -133,7 +133,7 @@
                 <AllOf>
                     <Match MatchId="urn:oasis:names:tc:xacml:3.0:function:string-equal-ignore-case">
                         <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">XML</AttributeValue>
-                        <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ECOMPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
+                        <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ONAPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                     </Match>
                     <Match MatchId="urn:oasis:names:tc:xacml:3.0:function:string-equal-ignore-case">
                         <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">ACCESS</AttributeValue>
@@ -147,11 +147,11 @@
             </AnyOf>
         </Target>
         <AdviceExpressions>
-            <AdviceExpression AdviceId="com.att.labs.ecomp.advice.config" AppliesTo="Permit">
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+            <AdviceExpression AdviceId="com.att.labs.onap.advice.config" AppliesTo="Permit">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">Configuration</AttributeValue>
                 </AttributeAssignmentExpression>
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#anyURI">http://localhost:5443/config/test_xml.xml</AttributeValue>
                 </AttributeAssignmentExpression>
             </AdviceExpression>
@@ -164,7 +164,7 @@
                 <AllOf>
                     <Match MatchId="urn:oasis:names:tc:xacml:3.0:function:string-equal-ignore-case">
                         <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">XML</AttributeValue>
-                        <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ECOMPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
+                        <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ONAPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                     </Match>
 					<Match MatchId="urn:oasis:names:tc:xacml:3.0:function:string-equal-ignore-case">
                         <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">XMLConfig</AttributeValue>
@@ -182,11 +182,11 @@
             </AnyOf>
         </Target>
         <AdviceExpressions>
-            <AdviceExpression AdviceId="com.att.labs.ecomp.advice.config" AppliesTo="Permit">
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+            <AdviceExpression AdviceId="com.att.labs.onap.advice.config" AppliesTo="Permit">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">Configuration</AttributeValue>
                 </AttributeAssignmentExpression>
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#anyURI">http://localhost:5443/config/test_xml.xml</AttributeValue>
                 </AttributeAssignmentExpression>
             </AdviceExpression>
@@ -199,7 +199,7 @@
                 <AllOf>
                     <Match MatchId="urn:oasis:names:tc:xacml:3.0:function:string-equal-ignore-case">
                         <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">Properties</AttributeValue>
-                        <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ECOMPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
+                        <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ONAPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                     </Match>
                     <Match MatchId="urn:oasis:names:tc:xacml:3.0:function:string-equal-ignore-case">
                         <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">ACCESS</AttributeValue>
@@ -213,11 +213,11 @@
             </AnyOf>
         </Target>
         <AdviceExpressions>
-            <AdviceExpression AdviceId="com.att.labs.ecomp.advice.config" AppliesTo="Permit">
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+            <AdviceExpression AdviceId="com.att.labs.onap.advice.config" AppliesTo="Permit">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">Configuration</AttributeValue>
                 </AttributeAssignmentExpression>
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#anyURI">http://localhost:5443/config/test_prop.properties</AttributeValue>
                 </AttributeAssignmentExpression>
             </AdviceExpression>
@@ -230,7 +230,7 @@
                 <AllOf>
                     <Match MatchId="urn:oasis:names:tc:xacml:3.0:function:string-equal-ignore-case">
                         <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">Properties</AttributeValue>
-                        <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ECOMPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
+                        <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ONAPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                     </Match>
 					<Match MatchId="urn:oasis:names:tc:xacml:3.0:function:string-equal-ignore-case">
                         <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">PropConfig</AttributeValue>
@@ -248,11 +248,11 @@
             </AnyOf>
         </Target>
         <AdviceExpressions>
-            <AdviceExpression AdviceId="com.att.labs.ecomp.advice.config" AppliesTo="Permit">
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+            <AdviceExpression AdviceId="com.att.labs.onap.advice.config" AppliesTo="Permit">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">Configuration</AttributeValue>
                 </AttributeAssignmentExpression>
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#anyURI">http://localhost:5443/config/test_prop.properties</AttributeValue>
                 </AttributeAssignmentExpression>
             </AdviceExpression>
@@ -265,7 +265,7 @@
                 <AllOf>
                     <Match MatchId="urn:oasis:names:tc:xacml:3.0:function:string-equal-ignore-case">
                         <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">Other</AttributeValue>
-                        <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ECOMPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
+                        <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ONAPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                     </Match>
                     <Match MatchId="urn:oasis:names:tc:xacml:3.0:function:string-equal-ignore-case">
                         <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">ACCESS</AttributeValue>
@@ -279,11 +279,11 @@
             </AnyOf>
         </Target>
         <AdviceExpressions>
-            <AdviceExpression AdviceId="com.att.labs.ecomp.advice.config" AppliesTo="Permit">
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+            <AdviceExpression AdviceId="com.att.labs.onap.advice.config" AppliesTo="Permit">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">Configuration</AttributeValue>
                 </AttributeAssignmentExpression>
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#anyURI">http://localhost:5443/config/test_other.txt</AttributeValue>
                 </AttributeAssignmentExpression>
             </AdviceExpression>
@@ -296,7 +296,7 @@
                 <AllOf>
                     <Match MatchId="urn:oasis:names:tc:xacml:3.0:function:string-equal-ignore-case">
                         <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">Other</AttributeValue>
-                        <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ECOMPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
+                        <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ONAPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                     </Match>
 					<Match MatchId="urn:oasis:names:tc:xacml:3.0:function:string-equal-ignore-case">
                         <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">OtherConfig</AttributeValue>
@@ -314,11 +314,11 @@
             </AnyOf>
         </Target>
         <AdviceExpressions>
-            <AdviceExpression AdviceId="com.att.labs.ecomp.advice.config" AppliesTo="Permit">
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+            <AdviceExpression AdviceId="com.att.labs.onap.advice.config" AppliesTo="Permit">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">Configuration</AttributeValue>
                 </AttributeAssignmentExpression>
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#anyURI">http://localhost:5443/config/test_other.txt</AttributeValue>
                 </AttributeAssignmentExpression>
             </AdviceExpression>
@@ -331,7 +331,7 @@
                 <AllOf>
                     <Match MatchId="urn:oasis:names:tc:xacml:3.0:function:string-equal-ignore-case">
                         <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">JSON</AttributeValue>
-                        <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ECOMPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
+                        <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ONAPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                     </Match>
 					<Match MatchId="urn:oasis:names:tc:xacml:3.0:function:string-equal-ignore-case">
                         <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">JSONconfig</AttributeValue>
@@ -361,11 +361,11 @@
             </AnyOf>
         </Target>
         <AdviceExpressions>
-            <AdviceExpression AdviceId="com.att.labs.ecomp.advice.config" AppliesTo="Permit">
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+            <AdviceExpression AdviceId="com.att.labs.onap.advice.config" AppliesTo="Permit">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">Configuration</AttributeValue>
                 </AttributeAssignmentExpression>
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#anyURI">http://localhost:5443/config/test_json.json</AttributeValue>
                 </AttributeAssignmentExpression>
             </AdviceExpression>
@@ -378,7 +378,7 @@
                 <AllOf>
                     <Match MatchId="urn:oasis:names:tc:xacml:3.0:function:string-equal-ignore-case">
                         <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">XML</AttributeValue>
-                        <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ECOMPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
+                        <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ONAPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                     </Match>
 					<Match MatchId="urn:oasis:names:tc:xacml:3.0:function:string-equal-ignore-case">
                         <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">XMLConfig</AttributeValue>
@@ -408,11 +408,11 @@
             </AnyOf>
         </Target>
         <AdviceExpressions>
-            <AdviceExpression AdviceId="com.att.labs.ecomp.advice.config" AppliesTo="Permit">
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+            <AdviceExpression AdviceId="com.att.labs.onap.advice.config" AppliesTo="Permit">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">Configuration</AttributeValue>
                 </AttributeAssignmentExpression>
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#anyURI">http://localhost:5443/config/test_xml.xml</AttributeValue>
                 </AttributeAssignmentExpression>
             </AdviceExpression>
@@ -425,7 +425,7 @@
                 <AllOf>
                     <Match MatchId="urn:oasis:names:tc:xacml:3.0:function:string-equal-ignore-case">
                         <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">Properties</AttributeValue>
-                        <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ECOMPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
+                        <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ONAPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                     </Match>
 					<Match MatchId="urn:oasis:names:tc:xacml:3.0:function:string-equal-ignore-case">
                         <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">PropConfig</AttributeValue>
@@ -455,11 +455,11 @@
             </AnyOf>
         </Target>
         <AdviceExpressions>
-            <AdviceExpression AdviceId="com.att.labs.ecomp.advice.config" AppliesTo="Permit">
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+            <AdviceExpression AdviceId="com.att.labs.onap.advice.config" AppliesTo="Permit">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">Configuration</AttributeValue>
                 </AttributeAssignmentExpression>
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#anyURI">http://localhost:5443/config/test_prop.properties</AttributeValue>
                 </AttributeAssignmentExpression>
             </AdviceExpression>
@@ -472,7 +472,7 @@
                 <AllOf>
                     <Match MatchId="urn:oasis:names:tc:xacml:3.0:function:string-equal-ignore-case">
                         <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">Other</AttributeValue>
-                        <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ECOMPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
+                        <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ONAPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                     </Match>
 					<Match MatchId="urn:oasis:names:tc:xacml:3.0:function:string-equal-ignore-case">
                         <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">Otherconfig</AttributeValue>
@@ -502,11 +502,11 @@
             </AnyOf>
         </Target>
         <AdviceExpressions>
-            <AdviceExpression AdviceId="com.att.labs.ecomp.advice.config" AppliesTo="Permit">
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+            <AdviceExpression AdviceId="com.att.labs.onap.advice.config" AppliesTo="Permit">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">Configuration</AttributeValue>
                 </AttributeAssignmentExpression>
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#anyURI">http://localhost:5443/config/test_other.txt</AttributeValue>
                 </AttributeAssignmentExpression>
             </AdviceExpression>
@@ -536,12 +536,12 @@
             </Apply>
         </Condition>
         <ObligationExpressions>
-            <ObligationExpression ObligationId="com.att.labs.ecomp.obligation" FulfillOn="Permit">
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.obligation.restart" Category="urn:oasis:names:tc:xacml:1.0:subject-category:recipient-subject">
+            <ObligationExpression ObligationId="com.att.labs.onap.obligation" FulfillOn="Permit">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.obligation.restart" Category="urn:oasis:names:tc:xacml:1.0:subject-category:recipient-subject">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">Restart</AttributeValue>
                 </AttributeAssignmentExpression>
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.obligation.server" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
-                    <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="com:att:labs:ecomp:resource:server:name" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="true"/>
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.obligation.server" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+                    <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="com:att:labs:onap:resource:server:name" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="true"/>
                 </AttributeAssignmentExpression>
             </ObligationExpression>
         </ObligationExpressions>
@@ -566,8 +566,8 @@
             </Apply>
         </Condition>
         <ObligationExpressions>
-            <ObligationExpression ObligationId="com.att.labs.ecomp.obligation" FulfillOn="Permit">
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.obligation.spinoff" Category="urn:oasis:names:tc:xacml:1.0:subject-category:recipient-subject">
+            <ObligationExpression ObligationId="com.att.labs.onap.obligation" FulfillOn="Permit">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.obligation.spinoff" Category="urn:oasis:names:tc:xacml:1.0:subject-category:recipient-subject">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">SpinOff</AttributeValue>
                 </AttributeAssignmentExpression>
 				<AttributeAssignmentExpression AttributeId="performer" Category="urn:oasis:names:tc:xacml:1.0:subject-category:recipient-subject">
@@ -576,14 +576,14 @@
                 <AttributeAssignmentExpression AttributeId="type" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">REST</AttributeValue>
                 </AttributeAssignmentExpression>
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.obligation.server" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
-                    <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="com:att:labs:ecomp:resource:server:name" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="true"/>
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.obligation.server" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+                    <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="com:att:labs:onap:resource:server:name" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="true"/>
                 </AttributeAssignmentExpression>
 				<AttributeAssignmentExpression AttributeId="method" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">GET</AttributeValue>
                 </AttributeAssignmentExpression>
 				<AttributeAssignmentExpression AttributeId="URL" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
-                    <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#anyURI">http://localhost:8635/RESTjson/PDP/VM/$com.att.labs.ecomp.obligation.spinoff/$com.att.labs.ecomp.obligation.server</AttributeValue>
+                    <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#anyURI">http://localhost:8635/RESTjson/PDP/VM/$com.att.labs.onap.obligation.spinoff/$com.att.labs.onap.obligation.server</AttributeValue>
                 </AttributeAssignmentExpression>
             </ObligationExpression>
         </ObligationExpressions>
diff --git a/ECOMP-XACML/config_testing/xacml.pip.properties b/ONAP-XACML/config_testing/xacml.pip.properties
index 16a66ed56..868488fc7 100644
--- a/ECOMP-XACML/config_testing/xacml.pip.properties
+++ b/ONAP-XACML/config_testing/xacml.pip.properties
@@ -1,6 +1,6 @@
 ###
 # ============LICENSE_START=======================================================
-# ECOMP-XACML
+# ONAP-XACML
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
diff --git a/ECOMP-XACML/config_testing/xacml.policy.properties b/ONAP-XACML/config_testing/xacml.policy.properties
index 17d6b455e..09c580341 100644
--- a/ECOMP-XACML/config_testing/xacml.policy.properties
+++ b/ONAP-XACML/config_testing/xacml.policy.properties
@@ -1,6 +1,6 @@
 ###
 # ============LICENSE_START=======================================================
-# ECOMP-XACML
+# ONAP-XACML
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
diff --git a/ECOMP-XACML/policyLogger.properties b/ONAP-XACML/policyLogger.properties
index 7fa1b2099..6bb54e22e 100644
--- a/ECOMP-XACML/policyLogger.properties
+++ b/ONAP-XACML/policyLogger.properties
@@ -1,6 +1,6 @@
 ###
 # ============LICENSE_START=======================================================
-# ECOMP-XACML
+# ONAP-XACML
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
diff --git a/ECOMP-XACML/pom.xml b/ONAP-XACML/pom.xml
index 30720e9fc..d51cac9fe 100644
--- a/ECOMP-XACML/pom.xml
+++ b/ONAP-XACML/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   ============LICENSE_START=======================================================
-  ECOMP Policy Engine
+  ONAP Policy Engine
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
   ================================================================================
@@ -25,15 +25,15 @@
 
 	<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>ECOMP-XACML</artifactId>
+	<artifactId>ONAP-XACML</artifactId>
 	<packaging>jar</packaging>
 	<dependencies>
 		<dependency>
-			<groupId>org.openecomp.policy.engine</groupId>
+			<groupId>org.onap.policy.engine</groupId>
 			<version>${project.version}</version>
 			<artifactId>PolicyEngineUtils</artifactId>
 		</dependency>
diff --git a/ECOMP-XACML/sql/xacmlTest.mv.db b/ONAP-XACML/sql/xacmlTest.mv.db
index 81e99a969..81e99a969 100644
--- a/ECOMP-XACML/sql/xacmlTest.mv.db
+++ b/ONAP-XACML/sql/xacmlTest.mv.db
diff --git a/ECOMP-XACML/src/main/java/org/openecomp/policy/xacml/api/XACMLErrorConstants.java b/ONAP-XACML/src/main/java/org/onap/policy/xacml/api/XACMLErrorConstants.java
index 5a2eac109..77c0da401 100644
--- a/ECOMP-XACML/src/main/java/org/openecomp/policy/xacml/api/XACMLErrorConstants.java
+++ b/ONAP-XACML/src/main/java/org/onap/policy/xacml/api/XACMLErrorConstants.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-XACML
+ * ONAP-XACML
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.xacml.api;
+package org.onap.policy.xacml.api;
 
 /**
  * List of Error Classifications
diff --git a/ECOMP-XACML/src/main/java/org/openecomp/policy/xacml/api/pap/ECOMPPapEngineFactory.java b/ONAP-XACML/src/main/java/org/onap/policy/xacml/api/pap/ONAPPapEngineFactory.java
index d34d03348..bd9531532 100644
--- a/ECOMP-XACML/src/main/java/org/openecomp/policy/xacml/api/pap/ECOMPPapEngineFactory.java
+++ b/ONAP-XACML/src/main/java/org/onap/policy/xacml/api/pap/ONAPPapEngineFactory.java
@@ -1,4 +1,4 @@
-package org.openecomp.policy.xacml.api.pap;
+package org.onap.policy.xacml.api.pap;
 
 import java.util.Properties;
 
@@ -6,20 +6,20 @@ import com.att.research.xacml.api.pap.PAPException;
 import com.att.research.xacml.util.FactoryException;
 import com.att.research.xacml.util.FactoryFinder;
 
-public abstract class ECOMPPapEngineFactory{
+public abstract class ONAPPapEngineFactory{
 	
 	/**
 	 * Creates a new <code>PAPEngineFactory</code> instance using the given class name and the default thread class loader.
 	 * 
 	 * @param factoryClassName the <code>String</code> name of the factory class to instantiate
-	 * @return an instance of an object that extends <code>ECOMPPapEngineFactory</code> to use in creating <code>PAPPolicyEngine</code> objects.
+	 * @return an instance of an object that extends <code>ONAPPapEngineFactory</code> to use in creating <code>PAPPolicyEngine</code> objects.
 	 */
-	public static ECOMPPapEngineFactory newInstance(String factoryClassName) throws FactoryException {
-		return FactoryFinder.newInstance(factoryClassName, ECOMPPapEngineFactory.class, null, true);
+	public static ONAPPapEngineFactory newInstance(String factoryClassName) throws FactoryException {
+		return FactoryFinder.newInstance(factoryClassName, ONAPPapEngineFactory.class, null, true);
 	}
 
 	/**
-	 * Creates a new <code>PAPPolicyEngine</code> based on the configured <code>ECOMPPapEngineFactory</code>.
+	 * Creates a new <code>PAPPolicyEngine</code> based on the configured <code>ONAPPapEngineFactory</code>.
 	 * 
 	 * @return a new <code>PAPPolicyEngine</code>
 	 * @throws PAPException 
@@ -27,7 +27,7 @@ public abstract class ECOMPPapEngineFactory{
 	public abstract PAPPolicyEngine newEngine() throws FactoryException, PAPException;
 
 	/**
-	 * Creates a new <code>PAPPolicyEngine</code> based on the configured <code>ECOMPPapEngineFactory</code>.
+	 * Creates a new <code>PAPPolicyEngine</code> based on the configured <code>ONAPPapEngineFactory</code>.
 	 * 
 	 * @return a new <code>PAPPolicyEngine</code>
 	 * @throws PAPException 
diff --git a/ECOMP-XACML/src/main/java/org/openecomp/policy/xacml/api/pap/EcompPAPPolicy.java b/ONAP-XACML/src/main/java/org/onap/policy/xacml/api/pap/OnapPAPPolicy.java
index 79ee08e2e..78ce354e0 100644
--- a/ECOMP-XACML/src/main/java/org/openecomp/policy/xacml/api/pap/EcompPAPPolicy.java
+++ b/ONAP-XACML/src/main/java/org/onap/policy/xacml/api/pap/OnapPAPPolicy.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-XACML
+ * ONAP-XACML
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,13 +17,13 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.xacml.api.pap;
+package org.onap.policy.xacml.api.pap;
 
 import java.net.URI;
 import java.util.List;
 import java.util.Map;
 
-import org.openecomp.policy.xacml.std.pap.StdPAPPolicy;
+import org.onap.policy.xacml.std.pap.StdPAPPolicy;
 
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
@@ -38,12 +38,12 @@ import com.fasterxml.jackson.annotation.JsonSubTypes.Type;
 	    property = "PAPPolicyType")  
 @JsonSubTypes({  
 	    @Type(value = StdPAPPolicy.class, name = "StdPAPPolicy") })  
-public interface EcompPAPPolicy {
+public interface OnapPAPPolicy {
 	
 	public String getPolicyName();
 	public String getOldPolicyFileName();
 	public String getPolicyDescription();
-	public String getEcompName();
+	public String getOnapName();
 	public String getConfigName();
 	public Map<String, String> getDynamicFieldConfigAttributes();
 	public Map<String, String> getDynamicSettingsMap();
diff --git a/ECOMP-XACML/src/main/java/org/openecomp/policy/xacml/api/pap/EcompPDP.java b/ONAP-XACML/src/main/java/org/onap/policy/xacml/api/pap/OnapPDP.java
index ecb21aa09..65db0b980 100644
--- a/ECOMP-XACML/src/main/java/org/openecomp/policy/xacml/api/pap/EcompPDP.java
+++ b/ONAP-XACML/src/main/java/org/onap/policy/xacml/api/pap/OnapPDP.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-XACML
+ * ONAP-XACML
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,9 +17,9 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.xacml.api.pap;
+package org.onap.policy.xacml.api.pap;
 
-import org.openecomp.policy.xacml.std.pap.StdPDP;
+import org.onap.policy.xacml.std.pap.StdPDP;
 
 import com.att.research.xacml.api.pap.PDP;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
@@ -35,7 +35,7 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo;
 	    property = "PDPType")  
 @JsonSubTypes({  
 	    @Type(value = StdPDP.class, name = "StdPDP") })  
-public interface EcompPDP extends PDP {
+public interface OnapPDP extends PDP {
 
 	public Integer 						getJmxPort();
 	
diff --git a/ECOMP-XACML/src/main/java/org/openecomp/policy/xacml/api/pap/EcompPDPGroup.java b/ONAP-XACML/src/main/java/org/onap/policy/xacml/api/pap/OnapPDPGroup.java
index 4aa7cbf64..3c9bdb355 100644
--- a/ECOMP-XACML/src/main/java/org/openecomp/policy/xacml/api/pap/EcompPDPGroup.java
+++ b/ONAP-XACML/src/main/java/org/onap/policy/xacml/api/pap/OnapPDPGroup.java
@@ -1,13 +1,13 @@
-package org.openecomp.policy.xacml.api.pap;
+package org.onap.policy.xacml.api.pap;
 
 import java.util.Set;
 
 import com.att.research.xacml.api.pap.PDPGroup;
 import com.att.research.xacml.api.pap.PDPPolicy;
 
-public interface EcompPDPGroup extends PDPGroup {
+public interface OnapPDPGroup extends PDPGroup {
 
-	public Set<EcompPDP> getEcompPdps();
+	public Set<OnapPDP> getOnapPdps();
 	
 	public Set<PDPPolicy> 				getSelectedPolicies();
 	
diff --git a/ECOMP-XACML/src/main/java/org/openecomp/policy/xacml/api/pap/PAPPolicyEngine.java b/ONAP-XACML/src/main/java/org/onap/policy/xacml/api/pap/PAPPolicyEngine.java
index 0c5c334da..4f1cfaf4b 100644
--- a/ECOMP-XACML/src/main/java/org/openecomp/policy/xacml/api/pap/PAPPolicyEngine.java
+++ b/ONAP-XACML/src/main/java/org/onap/policy/xacml/api/pap/PAPPolicyEngine.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-XACML
+ * ONAP-XACML
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.xacml.api.pap;
+package org.onap.policy.xacml.api.pap;
 
 import java.io.InputStream;
 import java.util.Set;
@@ -28,39 +28,39 @@ import com.att.research.xacml.api.pap.PDPStatus;
 
 public interface PAPPolicyEngine{
 	
-	public EcompPDPGroup getDefaultGroup() throws PAPException;
+	public OnapPDPGroup getDefaultGroup() throws PAPException;
 	
-	public void						SetDefaultGroup(EcompPDPGroup group) throws PAPException;
+	public void						SetDefaultGroup(OnapPDPGroup group) throws PAPException;
 	
-	public void		newPDP(String id, EcompPDPGroup group, String name, String description, int jmxport) throws PAPException, NullPointerException;
+	public void		newPDP(String id, OnapPDPGroup group, String name, String description, int jmxport) throws PAPException, NullPointerException;
 	
 	public void						newGroup(String name, String description) throws PAPException, NullPointerException;
 	
-	public EcompPDPGroup getGroup(String id) throws PAPException;
+	public OnapPDPGroup getGroup(String id) throws PAPException;
 	
-	public Set<EcompPDPGroup> getEcompPDPGroups() throws PAPException;
+	public Set<OnapPDPGroup> getOnapPDPGroups() throws PAPException;
 	
-	public EcompPDPGroup getPDPGroup(EcompPDP pdp) throws PAPException;
+	public OnapPDPGroup getPDPGroup(OnapPDP pdp) throws PAPException;
 	
-	public PDPStatus getStatus(EcompPDP pdp) throws PAPException;
+	public PDPStatus getStatus(OnapPDP pdp) throws PAPException;
 	
-	public void movePDP(EcompPDP pdp, EcompPDPGroup newGroup) throws PAPException;
+	public void movePDP(OnapPDP pdp, OnapPDPGroup newGroup) throws PAPException;
 	
-	public void updatePDP(EcompPDP pdp) throws PAPException;
+	public void updatePDP(OnapPDP pdp) throws PAPException;
 	
-	public void removePDP(EcompPDP pdp) throws PAPException; 
+	public void removePDP(OnapPDP pdp) throws PAPException; 
 	
-	public EcompPDP getPDP(String pdpId) throws PAPException;
+	public OnapPDP getPDP(String pdpId) throws PAPException;
 	
-	public void						updateGroup(EcompPDPGroup group) throws PAPException;
+	public void						updateGroup(OnapPDPGroup group) throws PAPException;
 	
-	public void						removeGroup(EcompPDPGroup group, EcompPDPGroup newGroup) throws PAPException, NullPointerException;
+	public void						removeGroup(OnapPDPGroup group, OnapPDPGroup newGroup) throws PAPException, NullPointerException;
 	
-public void						publishPolicy(String id, String name, boolean isRoot, InputStream policy, EcompPDPGroup group) throws PAPException;
+public void						publishPolicy(String id, String name, boolean isRoot, InputStream policy, OnapPDPGroup group) throws PAPException;
 	
 	// copy the given policy file into the group's directory, but do not include the policy in the group's policy set
-	public void						copyPolicy(PDPPolicy policy, EcompPDPGroup group) throws PAPException;
+	public void						copyPolicy(PDPPolicy policy, OnapPDPGroup group) throws PAPException;
 	
-	public void						removePolicy(PDPPolicy policy, EcompPDPGroup group) throws PAPException;
+	public void						removePolicy(PDPPolicy policy, OnapPDPGroup group) throws PAPException;
 	
 }
diff --git a/ECOMP-XACML/src/main/java/org/openecomp/policy/xacml/std/pap/StdEngine.java b/ONAP-XACML/src/main/java/org/onap/policy/xacml/std/pap/StdEngine.java
index 83ff56ebf..3132b8cac 100644
--- a/ECOMP-XACML/src/main/java/org/openecomp/policy/xacml/std/pap/StdEngine.java
+++ b/ONAP-XACML/src/main/java/org/onap/policy/xacml/std/pap/StdEngine.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-XACML
+ * ONAP-XACML
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.xacml.std.pap;
+package org.onap.policy.xacml.std.pap;
 
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -40,12 +40,12 @@ import java.util.TreeSet;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.openecomp.policy.common.logging.eelf.MessageCodes;
-import org.openecomp.policy.common.logging.eelf.PolicyLogger;
-import org.openecomp.policy.xacml.api.XACMLErrorConstants;
-import org.openecomp.policy.xacml.api.pap.EcompPDP;
-import org.openecomp.policy.xacml.api.pap.EcompPDPGroup;
-import org.openecomp.policy.xacml.api.pap.PAPPolicyEngine;
+import org.onap.policy.common.logging.eelf.MessageCodes;
+import org.onap.policy.common.logging.eelf.PolicyLogger;
+import org.onap.policy.xacml.api.XACMLErrorConstants;
+import org.onap.policy.xacml.api.pap.OnapPDP;
+import org.onap.policy.xacml.api.pap.OnapPDPGroup;
+import org.onap.policy.xacml.api.pap.PAPPolicyEngine;
 
 import com.att.research.xacml.api.pap.PAPException;
 import com.att.research.xacml.api.pap.PDP;
@@ -263,8 +263,8 @@ public class StdEngine extends StdPDPItemSetChangeNotifier implements PAPPolicyE
 	}
 	
 	@Override
-	public EcompPDPGroup getDefaultGroup() throws PAPException{
-		for (EcompPDPGroup group : this.groups) {
+	public OnapPDPGroup getDefaultGroup() throws PAPException{
+		for (OnapPDPGroup group : this.groups) {
 			if (group.isDefaultGroup()) {
 				return group;
 			}
@@ -276,8 +276,8 @@ public class StdEngine extends StdPDPItemSetChangeNotifier implements PAPPolicyE
 	}
 
 	@Override
-	public EcompPDPGroup getGroup(String id) throws PAPException {
-		for (EcompPDPGroup g: this.groups) {
+	public OnapPDPGroup getGroup(String id) throws PAPException {
+		for (OnapPDPGroup g: this.groups) {
 			if (g.getId().equals(id)) {
 				return g;
 			}
@@ -429,9 +429,9 @@ public class StdEngine extends StdPDPItemSetChangeNotifier implements PAPPolicyE
 	
 	
 	@Override
-	public EcompPDP	getPDP(String pdpId) throws PAPException {
-		for (EcompPDPGroup group : this.groups) {
-			for (EcompPDP pdp : group.getEcompPdps()) {
+	public OnapPDP	getPDP(String pdpId) throws PAPException {
+		for (OnapPDPGroup group : this.groups) {
+			for (OnapPDP pdp : group.getOnapPdps()) {
 				if (pdp.getId().equals(pdpId)) {
 					return pdp;
 				}
@@ -442,7 +442,7 @@ public class StdEngine extends StdPDPItemSetChangeNotifier implements PAPPolicyE
 
 	
 	@Override
-	public void movePDP(EcompPDP pdp, EcompPDPGroup newGroup) throws PAPException {
+	public void movePDP(OnapPDP pdp, OnapPDPGroup newGroup) throws PAPException {
 		if (newGroup == null) {
 			throw new NullPointerException("You must specify which group the PDP will belong to.");
 		}
@@ -478,7 +478,7 @@ public class StdEngine extends StdPDPItemSetChangeNotifier implements PAPPolicyE
 
 	
 	@Override
-	public void	updatePDP(EcompPDP pdp) throws PAPException {
+	public void	updatePDP(OnapPDP pdp) throws PAPException {
 		PDP currentPDP = this.getPDP(pdp.getId());
 		if (currentPDP == null) {
 			String message = "Unknown PDP id '" + pdp.getId() + "'";
@@ -489,14 +489,14 @@ public class StdEngine extends StdPDPItemSetChangeNotifier implements PAPPolicyE
 		// the only things that the user can change are name and description
 		currentPDP.setDescription(pdp.getDescription());
 		currentPDP.setName(pdp.getName());
-		if (currentPDP instanceof EcompPDP && pdp instanceof EcompPDP) {
-			((EcompPDP)currentPDP).setJmxPort(((EcompPDP)pdp).getJmxPort());
+		if (currentPDP instanceof OnapPDP && pdp instanceof OnapPDP) {
+			((OnapPDP)currentPDP).setJmxPort(((OnapPDP)pdp).getJmxPort());
 		}
 		this.doSave();
 	}
 	
 	@Override
-	public void removePDP(EcompPDP pdp) throws PAPException {
+	public void removePDP(OnapPDP pdp) throws PAPException {
 		PDPGroup group = this.getPDPGroup(pdp);
 		if (group == null) {
 			throw new NullPointerException();
@@ -518,12 +518,12 @@ public class StdEngine extends StdPDPItemSetChangeNotifier implements PAPPolicyE
 	/**
 	 * Should never be called - Detailed status is held on the PDP, not the PAP
 	 */
-	public PDPStatus getStatus(EcompPDP pdp) throws PAPException {
+	public PDPStatus getStatus(OnapPDP pdp) throws PAPException {
 		return getPDP(pdp.getId()).getStatus();
 	}
 	
 	@Override
-	public void publishPolicy(String id, String name, boolean isRoot, InputStream policy, EcompPDPGroup group) throws PAPException {
+	public void publishPolicy(String id, String name, boolean isRoot, InputStream policy, OnapPDPGroup group) throws PAPException {
 		if (group == null) {
 			throw new NullPointerException();
 		}
@@ -537,13 +537,13 @@ public class StdEngine extends StdPDPItemSetChangeNotifier implements PAPPolicyE
 
 	// Currently not used on the PAP side.  This is done by ((StdPDPGroup) group).copyPolicyToFile
 	@Override
-	public void copyPolicy(PDPPolicy policy, EcompPDPGroup group)
+	public void copyPolicy(PDPPolicy policy, OnapPDPGroup group)
 			throws PAPException {
 	}
 	
 	
 	@Override
-	public void removePolicy(PDPPolicy policy, EcompPDPGroup group) throws PAPException {
+	public void removePolicy(PDPPolicy policy, OnapPDPGroup group) throws PAPException {
 		if (group == null) {
 			throw new NullPointerException();
 		}
@@ -629,8 +629,8 @@ public class StdEngine extends StdPDPItemSetChangeNotifier implements PAPPolicyE
 				pdps.add(pdp.getId());
 				properties.setProperty(pdp.getId() + ".name", (pdp.getName() == null ? "" : pdp.getName()));
 				properties.setProperty(pdp.getId() + ".description", (pdp.getDescription() == null ? "" : pdp.getDescription()));
-				if (pdp instanceof EcompPDP) {
-					properties.setProperty(pdp.getId() + ".jmxport", (((EcompPDP)pdp).getJmxPort()==0 ? "" : ((EcompPDP)pdp).getJmxPort()).toString());
+				if (pdp instanceof OnapPDP) {
+					properties.setProperty(pdp.getId() + ".jmxport", (((OnapPDP)pdp).getJmxPort()==0 ? "" : ((OnapPDP)pdp).getJmxPort()).toString());
 				}
 			}
 			String pdpList = "";
@@ -738,7 +738,7 @@ public class StdEngine extends StdPDPItemSetChangeNotifier implements PAPPolicyE
 		this.fireChanged();
 	}
 
-	public void groupChanged(EcompPDPGroup group) {
+	public void groupChanged(OnapPDPGroup group) {
 		if (logger.isDebugEnabled()) {
 			logger.debug("groupChanged: " + group);
 		}
@@ -747,7 +747,7 @@ public class StdEngine extends StdPDPItemSetChangeNotifier implements PAPPolicyE
 	}
 
 
-	public void pdpChanged(EcompPDP pdp) {
+	public void pdpChanged(OnapPDP pdp) {
 		if (logger.isDebugEnabled()) {
 			logger.debug("pdpChanged: " + pdp);
 		}
@@ -772,7 +772,7 @@ public class StdEngine extends StdPDPItemSetChangeNotifier implements PAPPolicyE
 		props.setProperty(XACMLProperties.PROP_PIP_ENGINES, "AAF");
 		props.setProperty("AAF.name", "AAFEngine");
 		props.setProperty("AAF.description", "AAFEngine to communicate with AAF to take decisions");
-		props.setProperty("AAF.classname","org.openecomp.policy.xacml.std.pip.engines.aaf.AAFEngine");
+		props.setProperty("AAF.classname","org.onap.policy.xacml.std.pip.engines.aaf.AAFEngine");
 		// read from PIP properties file. 
 		Path file = Paths.get(pipPropertyFile);
 		if (!Files.notExists(file)) {
@@ -791,17 +791,17 @@ public class StdEngine extends StdPDPItemSetChangeNotifier implements PAPPolicyE
 
 	
 	@Override
-	public Set<EcompPDPGroup> getEcompPDPGroups() throws PAPException {
-		final Set<EcompPDPGroup> grps = new HashSet<>();
-		for (EcompPDPGroup g : this.groups) {
+	public Set<OnapPDPGroup> getOnapPDPGroups() throws PAPException {
+		final Set<OnapPDPGroup> grps = new HashSet<>();
+		for (OnapPDPGroup g : this.groups) {
 			grps.add(g);
 		}
 		return Collections.unmodifiableSet(grps);
 	}
 
 	@Override
-	public EcompPDPGroup getPDPGroup(EcompPDP pdp) throws PAPException {
-		for (EcompPDPGroup group : this.groups) {
+	public OnapPDPGroup getPDPGroup(OnapPDP pdp) throws PAPException {
+		for (OnapPDPGroup group : this.groups) {
 			if (group.getPdps().contains(pdp)) {
 				return group;
 			}
@@ -810,9 +810,9 @@ public class StdEngine extends StdPDPItemSetChangeNotifier implements PAPPolicyE
 	}
 
 	@Override
-	public void SetDefaultGroup(EcompPDPGroup group) throws PAPException {
+	public void SetDefaultGroup(OnapPDPGroup group) throws PAPException {
 		boolean changesMade = false;
-		for (EcompPDPGroup aGroup : groups) {
+		for (OnapPDPGroup aGroup : groups) {
 			if (aGroup.getId().equals(group.getId())) {
 				if ( ! aGroup.isDefaultGroup()) {
 					if (aGroup instanceof StdPDPGroup) {
@@ -843,7 +843,7 @@ public class StdEngine extends StdPDPItemSetChangeNotifier implements PAPPolicyE
 	}
 
 	@Override
-	public void newPDP(String id, EcompPDPGroup group, String name, String description, int jmxport)
+	public void newPDP(String id, OnapPDPGroup group, String name, String description, int jmxport)
 			throws PAPException, NullPointerException {
 		if (group == null) {
 			throw new PAPException("You must specify which group the PDP will belong to.");
@@ -851,7 +851,7 @@ public class StdEngine extends StdPDPItemSetChangeNotifier implements PAPPolicyE
 		if (this.groups.contains(group) == false) {
 			throw new PAPException("Unknown group, not in our list.");
 		}
-		for (EcompPDP p : group.getEcompPdps()) {
+		for (OnapPDP p : group.getOnapPdps()) {
 			if (p.getId().equals(id)) {
 				throw new PAPException("A PDP with this ID exists.");
 			}
@@ -871,7 +871,7 @@ public class StdEngine extends StdPDPItemSetChangeNotifier implements PAPPolicyE
 	}
 
 	@Override
-	public void updateGroup(EcompPDPGroup group) throws PAPException {
+	public void updateGroup(OnapPDPGroup group) throws PAPException {
 		if (group == null || group.getId() == null) {
 			throw new PAPException("Group or id is null");
 		}
@@ -904,7 +904,7 @@ public class StdEngine extends StdPDPItemSetChangeNotifier implements PAPPolicyE
 			String newId = createNewPDPGroupId(group.getName());
 			
 			// make sure no other group uses the new id
-			for (EcompPDPGroup g : groups) {
+			for (OnapPDPGroup g : groups) {
 				if (g.getId().equals(newId)) {
 					throw new PAPException("Replacement name maps to ID '" + newId + "' which is already in use");
 				}
@@ -945,7 +945,7 @@ public class StdEngine extends StdPDPItemSetChangeNotifier implements PAPPolicyE
 	}
 
 	@Override
-	public void removeGroup(EcompPDPGroup group, EcompPDPGroup newGroup) throws PAPException, NullPointerException {
+	public void removeGroup(OnapPDPGroup group, OnapPDPGroup newGroup) throws PAPException, NullPointerException {
 		if (group == null) {
 			throw new NullPointerException();
 		}
@@ -962,7 +962,7 @@ public class StdEngine extends StdPDPItemSetChangeNotifier implements PAPPolicyE
 		if (group.isDefaultGroup()) {
 			throw new PAPException("You cannot delete the default group.");
 		}
-		Set<EcompPDP> pdps = group.getEcompPdps();
+		Set<OnapPDP> pdps = group.getOnapPdps();
 		//
 		// Are there PDPs? If so, then we need a target group
 		//
@@ -978,12 +978,12 @@ public class StdEngine extends StdPDPItemSetChangeNotifier implements PAPPolicyE
 			}
 			// The movePDP function will modify the set of PDPs in the group.
 			// To avoid concurrent modification exceptions we need to duplicate the list before calling that function.
-			List<EcompPDP> pdpList = new ArrayList<>();
-			for (EcompPDP pdp : pdps) {
+			List<OnapPDP> pdpList = new ArrayList<>();
+			for (OnapPDP pdp : pdps) {
 				pdpList.add(pdp);
 			}
 			// now we can use the PDPs from the list without having ConcurrentAccessExceptions
-			for (EcompPDP pdp : pdpList) {
+			for (OnapPDP pdp : pdpList) {
 				this.movePDP(pdp, newGroup);
 			}
 		}
diff --git a/ECOMP-XACML/src/main/java/org/openecomp/policy/xacml/std/pap/StdEngineFactory.java b/ONAP-XACML/src/main/java/org/onap/policy/xacml/std/pap/StdEngineFactory.java
index b8ca1f2e9..ee6785611 100644
--- a/ECOMP-XACML/src/main/java/org/openecomp/policy/xacml/std/pap/StdEngineFactory.java
+++ b/ONAP-XACML/src/main/java/org/onap/policy/xacml/std/pap/StdEngineFactory.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-XACML
+ * ONAP-XACML
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,21 +17,21 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.xacml.std.pap;
+package org.onap.policy.xacml.std.pap;
 
-import org.openecomp.policy.common.logging.eelf.MessageCodes;
-import org.openecomp.policy.common.logging.eelf.PolicyLogger;
+import org.onap.policy.common.logging.eelf.MessageCodes;
+import org.onap.policy.common.logging.eelf.PolicyLogger;
 
 import java.io.IOException;
 import java.util.Properties;
 
-import org.openecomp.policy.xacml.api.pap.ECOMPPapEngineFactory;
-import org.openecomp.policy.xacml.api.pap.PAPPolicyEngine;
+import org.onap.policy.xacml.api.pap.ONAPPapEngineFactory;
+import org.onap.policy.xacml.api.pap.PAPPolicyEngine;
 
 import com.att.research.xacml.api.pap.PAPException;
 import com.att.research.xacml.util.FactoryException;
 
-public class StdEngineFactory extends ECOMPPapEngineFactory {
+public class StdEngineFactory extends ONAPPapEngineFactory {
 	
 	@Override
 	public PAPPolicyEngine newEngine() throws FactoryException, PAPException {
diff --git a/ECOMP-XACML/src/main/java/org/openecomp/policy/xacml/std/pap/StdPAPPolicy.java b/ONAP-XACML/src/main/java/org/onap/policy/xacml/std/pap/StdPAPPolicy.java
index 61ba86b8a..d69f38d95 100644
--- a/ECOMP-XACML/src/main/java/org/openecomp/policy/xacml/std/pap/StdPAPPolicy.java
+++ b/ONAP-XACML/src/main/java/org/onap/policy/xacml/std/pap/StdPAPPolicy.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-XACML
+ * ONAP-XACML
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.xacml.std.pap;
+package org.onap.policy.xacml.std.pap;
 
 import java.io.Serializable;
 import java.net.URI;
@@ -25,15 +25,15 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import org.openecomp.policy.xacml.api.pap.EcompPAPPolicy;
+import org.onap.policy.xacml.api.pap.OnapPAPPolicy;
 
-public class StdPAPPolicy implements EcompPAPPolicy, Serializable{
+public class StdPAPPolicy implements OnapPAPPolicy, Serializable{
 	private static final long serialVersionUID = 5260230629397322000L;
 
 	private String policyName = null;
 	private String oldPolicyFileName = null;
 	private String policyDescription = null;
-	private String ecompName = null;
+	private String onapName = null;
 	private String configName = null;
 	private Map<String, String> dyanamicFieldConfigAttributes = new HashMap<>();
 	private Map<String, String> dropDownMap = new HashMap<>();
@@ -99,9 +99,9 @@ public class StdPAPPolicy implements EcompPAPPolicy, Serializable{
 	}
 
 	//convenience constructor
-	public StdPAPPolicy(String configPolicyType, String policyName, String description, String ecompName, String configName, Map<String, String> attributes, String configType, 
+	public StdPAPPolicy(String configPolicyType, String policyName, String description, String onapName, String configName, Map<String, String> attributes, String configType, 
 			String body, Boolean editPolicy, String domain, String riskLevel, String riskType, String guard, String ttlDate){
-		this(configPolicyType, policyName, description, ecompName, configName, attributes, configType, 
+		this(configPolicyType, policyName, description, onapName, configName, attributes, configType, 
 				body, editPolicy, domain, 1, riskLevel, riskType, guard, ttlDate);
 	}
 
@@ -126,14 +126,14 @@ public class StdPAPPolicy implements EcompPAPPolicy, Serializable{
 	}
 
 	//Constructor for Create/Update Decision Policies from Admin Console
-	public StdPAPPolicy(String policyName, String description, String ecompName, String providerComboBox, Map<String, String> attributes, Map<String, String> settings, 
+	public StdPAPPolicy(String policyName, String description, String onapName, String providerComboBox, Map<String, String> attributes, Map<String, String> settings, 
 			List<String> dynamicRuleAlgorithmLabels, List<String> dynamicRuleAlgorithmCombo, List<String> dynamicRuleAlgorithmField1, 
 			List<String> dynamicRuleAlgorithmField2, Map<String, String> dropDownMap, List<Object> dynamicVariableList, 
 			List<String> dataTypeList, Boolean editPolicy, String domain, int highestVersion) {
 
 		this.policyName = policyName;
 		this.policyDescription = description;
-		this.ecompName = ecompName;
+		this.onapName = onapName;
 		this.setProviderComboBox(providerComboBox);
 		this.dyanamicFieldConfigAttributes = attributes;
 		this.dynamicSettingsMap = settings;
@@ -153,13 +153,13 @@ public class StdPAPPolicy implements EcompPAPPolicy, Serializable{
 
 	//Constructor for Create Config Policies from API and Admin Console
 	//Constructor for Updating Config Policies from the API
-	public StdPAPPolicy(String configPolicyType, String policyName, String description, String ecompName, String configName, Map<String, String> attributes, String configType, 
+	public StdPAPPolicy(String configPolicyType, String policyName, String description, String onapName, String configName, Map<String, String> attributes, String configType, 
 			String body, Boolean editPolicy, String domain, int highestVersion, String riskLevel, String riskType, String guard, String ttlDate) {
 
 		this.configPolicyType = configPolicyType;
 		this.policyName = policyName;
 		this.policyDescription = description;
-		this.ecompName = ecompName;
+		this.onapName = onapName;
 		this.configName = configName;
 		this.dyanamicFieldConfigAttributes = attributes;
 		this.configType = configType;
@@ -174,20 +174,20 @@ public class StdPAPPolicy implements EcompPAPPolicy, Serializable{
 	}
 
 	//convenience constructor
-	public StdPAPPolicy (String configPolicyType, String policyName, String description, String ecompName, String configName, Map<String, String> attributes, String body, String policyID, 
+	public StdPAPPolicy (String configPolicyType, String policyName, String description, String onapName, String configName, Map<String, String> attributes, String body, String policyID, 
 			String ruleID, String configType, Boolean editPolicy, String version, String domain, String riskLevel, String riskType, String guard, String ttlDate) {
-		this (configPolicyType, policyName, description, ecompName, configName, attributes, body, policyID, 
+		this (configPolicyType, policyName, description, onapName, configName, attributes, body, policyID, 
 				ruleID, configType, editPolicy, version, domain,  1, riskLevel, riskType, guard, ttlDate); 
 	}
 
 	//Constructor for Updating Config Policies from Admin Console
-	public StdPAPPolicy (String configPolicyType, String policyName, String description, String ecompName, String configName, Map<String, String> attributes, String body, String policyID, 
+	public StdPAPPolicy (String configPolicyType, String policyName, String description, String onapName, String configName, Map<String, String> attributes, String body, String policyID, 
 			String ruleID, String configType, Boolean editPolicy, String version, String domain,  int highestVersion, String riskLevel, String riskType, String guard, String ttlDate) {
 
 		this.configPolicyType = configPolicyType;
 		this.policyName = policyName;
 		this.policyDescription = description;
-		this.ecompName = ecompName;
+		this.onapName = onapName;
 		this.configName = configName;
 		this.dyanamicFieldConfigAttributes = attributes;
 		this.configBodyData = body;
@@ -236,7 +236,7 @@ public class StdPAPPolicy implements EcompPAPPolicy, Serializable{
 		this.domain = domain;
 		this.jsonBody = jsonBody;
 		this.highestVersion = highestVersion;
-		this.ecompName=eCompName;
+		this.onapName=eCompName;
 		this.riskLevel = riskLevel;
 		this.riskType = riskType;
 		this.guard = guard;	
@@ -257,7 +257,7 @@ public class StdPAPPolicy implements EcompPAPPolicy, Serializable{
 		this.domain = domain;
 		this.dyanamicFieldConfigAttributes = dyanamicFieldConfigAttributes;
 		this.highestVersion = highestVersion;
-		this.ecompName=eCompName;
+		this.onapName=eCompName;
 		this.configBodyData=configBodyData;
 		this.riskLevel = riskLevel;
 		this.riskType = riskType;
@@ -281,7 +281,7 @@ public class StdPAPPolicy implements EcompPAPPolicy, Serializable{
 		this.domain = domain;
 		this.dyanamicFieldConfigAttributes = dyanamicFieldConfigAttributes;
 		this.highestVersion = highestVersion;
-		this.ecompName=eCompName;
+		this.onapName=eCompName;
 		this.configBodyData=configBodyData;
 		this.drlRuleAndUIParams=drlRuleAndUIParams;
 		this.riskLevel = riskLevel;
@@ -293,14 +293,14 @@ public class StdPAPPolicy implements EcompPAPPolicy, Serializable{
 	}
 
 	//Constructor for Creating CloseLoop_Fault and Performance Metric Policies
-	public StdPAPPolicy (String configPolicyType, String policyName, String description, String ecompName, 
+	public StdPAPPolicy (String configPolicyType, String policyName, String description, String onapName, 
 			String jsonBody, Boolean draft, String oldPolicyFileName, String serviceType, Boolean editPolicy, 
 			String domain, Integer highestVersion, String riskLevel, String riskType, String guard, String ttlDate) {
 
 		this.configPolicyType = configPolicyType;
 		this.policyName = policyName;
 		this.policyDescription = description;
-		this.ecompName = ecompName;
+		this.onapName = onapName;
 		this.jsonBody = jsonBody;
 		this.draft = draft;
 		this.oldPolicyFileName = oldPolicyFileName;
@@ -336,14 +336,14 @@ public class StdPAPPolicy implements EcompPAPPolicy, Serializable{
 	}
 
 	//Constructor for Micro Service Creating/Updating Policies from the Admin Console
-	public StdPAPPolicy(String configPolicyType, String policyName, String description, String ecompName, String configName, String serviceType, String uuid, 
+	public StdPAPPolicy(String configPolicyType, String policyName, String description, String onapName, String configName, String serviceType, String uuid, 
 			String msLocation, String jsonBody, String priority, String version, Boolean editPolicy, String domain, int highestVersion, String riskLevel, 
 			String riskType, String guard, String ttlDate) {
 
 		this.configPolicyType = configPolicyType;
 		this.policyName = policyName;
 		this.policyDescription = description;
-		this.ecompName = ecompName;
+		this.onapName = onapName;
 		this.configName = configName;
 		this.serviceType = serviceType;
 		this.uuid = uuid;
@@ -377,7 +377,7 @@ public class StdPAPPolicy implements EcompPAPPolicy, Serializable{
 		this.version = version;
 		this.jsonBody = jsonBody;
 		this.highestVersion = highestVersion;
-		this.ecompName=eCompName;
+		this.onapName=eCompName;
 		this.riskLevel = riskLevel;
 		this.riskType = riskType;
 		this.guard = guard;	
@@ -402,7 +402,7 @@ public class StdPAPPolicy implements EcompPAPPolicy, Serializable{
 		this.version = version;
 		this.dyanamicFieldConfigAttributes = dyanamicFieldConfigAttributes;
 		this.highestVersion = highestVersion;
-		this.ecompName=eCompName;
+		this.onapName=eCompName;
 		this.configBodyData=configBodyData;
 		this.riskLevel = riskLevel;
 		this.riskType = riskType;
@@ -428,7 +428,7 @@ public class StdPAPPolicy implements EcompPAPPolicy, Serializable{
 		this.version = version;
 		this.dyanamicFieldConfigAttributes = dyanamicFieldConfigAttributes;
 		this.highestVersion = highestVersion;
-		this.ecompName=eCompName;
+		this.onapName=eCompName;
 		this.drlRuleAndUIParams=drlRuleAndUIParams;
 		this.riskLevel = riskLevel;
 		this.riskType = riskType;
@@ -460,8 +460,8 @@ public class StdPAPPolicy implements EcompPAPPolicy, Serializable{
 	}
 
 	@Override
-	public String getEcompName() {
-		return ecompName;
+	public String getOnapName() {
+		return onapName;
 	}
 
 	@Override
@@ -676,8 +676,8 @@ public class StdPAPPolicy implements EcompPAPPolicy, Serializable{
 
 	@Override
 	public String toString() {
-		return "StdPAPPolicy [policyName=" + policyName + ", policyDescription=" + policyDescription + ", ecompName="
-				+ ecompName + ", configName=" + configName + ", dyanamicFieldConfigAttributes=" + dyanamicFieldConfigAttributes + ", configBodyData=" + configBodyData
+		return "StdPAPPolicy [policyName=" + policyName + ", policyDescription=" + policyDescription + ", onapName="
+				+ onapName + ", configName=" + configName + ", dyanamicFieldConfigAttributes=" + dyanamicFieldConfigAttributes + ", configBodyData=" + configBodyData
 				+ ", policyID=" + policyID + ", ruleID=" + ruleID + ", configType=" + configType + ", editPolicy=" + ", version=" + ", domain=" + domain  
 				+ ", configPolicyType=" + configPolicyType + ", jsonBody=" + jsonBody + ", highestVersion=" + highestVersion + ", location=" + location 
 				+ ",dynamicRuleAlgorithmLabels=" + dynamicRuleAlgorithmLabels + ",dynamicRuleAlgorithmCombo=" + dynamicRuleAlgorithmCombo 
@@ -700,8 +700,8 @@ public class StdPAPPolicy implements EcompPAPPolicy, Serializable{
 		this.policyDescription = policyDescription;
 	}
 
-	public void setEcompName(String ecompName) {
-		this.ecompName = ecompName;
+	public void setOnapName(String onapName) {
+		this.onapName = onapName;
 	}
 
 	public void setConfigName(String configName) {
diff --git a/ECOMP-XACML/src/main/java/org/openecomp/policy/xacml/std/pap/StdPDP.java b/ONAP-XACML/src/main/java/org/onap/policy/xacml/std/pap/StdPDP.java
index 7e3c1e61a..20dbfae07 100644
--- a/ECOMP-XACML/src/main/java/org/openecomp/policy/xacml/std/pap/StdPDP.java
+++ b/ONAP-XACML/src/main/java/org/onap/policy/xacml/std/pap/StdPDP.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-XACML
+ * ONAP-XACML
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.xacml.std.pap;
+package org.onap.policy.xacml.std.pap;
 
 import java.io.Serializable;
 import java.util.Collections;
@@ -25,15 +25,15 @@ import java.util.HashSet;
 import java.util.Properties;
 import java.util.Set;
 
-import org.openecomp.policy.xacml.api.pap.EcompPDP;
+import org.onap.policy.xacml.api.pap.OnapPDP;
 
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger; 
-import org.openecomp.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.common.logging.flexlogger.FlexLogger; 
+import org.onap.policy.common.logging.flexlogger.Logger;
 import com.att.research.xacml.api.pap.PDPPIPConfig;
 import com.att.research.xacml.api.pap.PDPPolicy;
 import com.att.research.xacml.api.pap.PDPStatus;
 
-public class StdPDP extends StdPDPItemSetChangeNotifier implements EcompPDP, Comparable<StdPDP>, Serializable {
+public class StdPDP extends StdPDPItemSetChangeNotifier implements OnapPDP, Comparable<StdPDP>, Serializable {
 	private static final long serialVersionUID = 1L;
 	private static Logger	logger	= FlexLogger.getLogger(StdPDP.class);
 	
diff --git a/ECOMP-XACML/src/main/java/org/openecomp/policy/xacml/std/pap/StdPDPGroup.java b/ONAP-XACML/src/main/java/org/onap/policy/xacml/std/pap/StdPDPGroup.java
index b28c04e29..63cc4b4fc 100644
--- a/ECOMP-XACML/src/main/java/org/openecomp/policy/xacml/std/pap/StdPDPGroup.java
+++ b/ONAP-XACML/src/main/java/org/onap/policy/xacml/std/pap/StdPDPGroup.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-XACML
+ * ONAP-XACML
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.xacml.std.pap;
+package org.onap.policy.xacml.std.pap;
 
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -38,12 +38,12 @@ import java.util.TreeSet;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.openecomp.policy.common.logging.eelf.MessageCodes;
-import org.openecomp.policy.common.logging.eelf.PolicyLogger;
-import org.openecomp.policy.xacml.api.XACMLErrorConstants;
-import org.openecomp.policy.xacml.api.pap.EcompPDP;
-import org.openecomp.policy.xacml.api.pap.EcompPDPGroup;
-import org.openecomp.policy.xacml.std.pap.StdPDPItemSetChangeNotifier.StdItemSetChangeListener;
+import org.onap.policy.common.logging.eelf.MessageCodes;
+import org.onap.policy.common.logging.eelf.PolicyLogger;
+import org.onap.policy.xacml.api.XACMLErrorConstants;
+import org.onap.policy.xacml.api.pap.OnapPDP;
+import org.onap.policy.xacml.api.pap.OnapPDPGroup;
+import org.onap.policy.xacml.std.pap.StdPDPItemSetChangeNotifier.StdItemSetChangeListener;
 
 import com.att.research.xacml.api.pap.PAPException;
 import com.att.research.xacml.api.pap.PDP;
@@ -58,7 +58,7 @@ import com.google.common.base.Joiner;
 import com.google.common.base.Splitter;
 import com.google.common.io.ByteStreams;
 
-public class StdPDPGroup extends StdPDPItemSetChangeNotifier implements EcompPDPGroup, StdItemSetChangeListener, Comparable<Object>, Serializable {
+public class StdPDPGroup extends StdPDPItemSetChangeNotifier implements OnapPDPGroup, StdItemSetChangeListener, Comparable<Object>, Serializable {
 	private static final long serialVersionUID = 1L;
 	private static Log	logger	= LogFactory.getLog(StdPDPGroup.class);
 	
@@ -72,7 +72,7 @@ public class StdPDPGroup extends StdPDPItemSetChangeNotifier implements EcompPDP
 	
 	private StdPDPGroupStatus status = new StdPDPGroupStatus(Status.UNKNOWN);
 	
-	private Set<EcompPDP>	pdps = new HashSet<>();
+	private Set<OnapPDP>	pdps = new HashSet<>();
 	
 	private Set<PDPPolicy> policies = new HashSet<>();
 	
@@ -400,15 +400,15 @@ public class StdPDPGroup extends StdPDPItemSetChangeNotifier implements EcompPDP
 		return Collections.unmodifiableSet(pdps);
 	}
 
-	public void setEcompPdps(Set<EcompPDP> pdps) {
+	public void setOnapPdps(Set<OnapPDP> pdps) {
 		this.pdps = pdps;
 	}
 	
-	public Set<EcompPDP> getEcompPdps(){
+	public Set<OnapPDP> getOnapPdps(){
 		return Collections.unmodifiableSet(pdps);
 	}
 	
-	public boolean addPDP(EcompPDP pdp) {
+	public boolean addPDP(OnapPDP pdp) {
 		return this.pdps.add(pdp);
 	}
 	
@@ -922,12 +922,12 @@ public class StdPDPGroup extends StdPDPItemSetChangeNotifier implements EcompPDP
 	}
 
 	@Override
-	public void groupChanged(EcompPDPGroup group) {
+	public void groupChanged(OnapPDPGroup group) {
 		this.changed();
 	}
 
 	@Override
-	public void pdpChanged(EcompPDP pdp) {
+	public void pdpChanged(OnapPDP pdp) {
 		//
 		// If one of the group's PDP's changed, then the group changed
 		//
@@ -942,12 +942,12 @@ public class StdPDPGroup extends StdPDPItemSetChangeNotifier implements EcompPDP
 		
 	}
 	
-	public StdPDPGroup(EcompPDPGroup group) {
+	public StdPDPGroup(OnapPDPGroup group) {
 		this.id = group.getId();
 		this.name = group.getName();
 		this.description = group.getDescription();
 		this.isDefault = group.isDefaultGroup();
-		this.pdps = group.getEcompPdps();
+		this.pdps = group.getOnapPdps();
 		this.policies = group.getPolicies();
 		this.pipConfigs = group.getPipConfigs();
 	}
@@ -1036,7 +1036,7 @@ public class StdPDPGroup extends StdPDPItemSetChangeNotifier implements EcompPDP
 	private Properties setPIPProperties(Properties props){
 		props.setProperty("AAF.name", "AAFEngine");
 		props.setProperty("AAF.description", "AAFEngine to communicate with AAF to take decisions");
-		props.setProperty("AAF.classname","org.openecomp.policy.xacml.std.pip.engines.aaf.AAFEngine");
+		props.setProperty("AAF.classname","org.onap.policy.xacml.std.pip.engines.aaf.AAFEngine");
 		props.setProperty(XACMLProperties.PROP_PIP_ENGINES, "AAF");
 		// read from PIP properties file. 
 		Path file = Paths.get(StdEngine.pipPropertyFile);
diff --git a/ECOMP-XACML/src/main/java/org/openecomp/policy/xacml/std/pap/StdPDPGroupStatus.java b/ONAP-XACML/src/main/java/org/onap/policy/xacml/std/pap/StdPDPGroupStatus.java
index 6b248bf69..296f738f4 100644
--- a/ECOMP-XACML/src/main/java/org/openecomp/policy/xacml/std/pap/StdPDPGroupStatus.java
+++ b/ONAP-XACML/src/main/java/org/onap/policy/xacml/std/pap/StdPDPGroupStatus.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-XACML
+ * ONAP-XACML
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.xacml.std.pap;
+package org.onap.policy.xacml.std.pap;
 
 import java.util.Collections;
 import java.util.HashSet;
diff --git a/ECOMP-XACML/src/main/java/org/openecomp/policy/xacml/std/pap/StdPDPItemSetChangeNotifier.java b/ONAP-XACML/src/main/java/org/onap/policy/xacml/std/pap/StdPDPItemSetChangeNotifier.java
index a197d5f3d..d23501f26 100644
--- a/ECOMP-XACML/src/main/java/org/openecomp/policy/xacml/std/pap/StdPDPItemSetChangeNotifier.java
+++ b/ONAP-XACML/src/main/java/org/onap/policy/xacml/std/pap/StdPDPItemSetChangeNotifier.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-XACML
+ * ONAP-XACML
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,13 +17,13 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.xacml.std.pap;
+package org.onap.policy.xacml.std.pap;
 
 import java.util.Collection;
 import java.util.LinkedList;
 
-import org.openecomp.policy.xacml.api.pap.EcompPDP;
-import org.openecomp.policy.xacml.api.pap.EcompPDPGroup;
+import org.onap.policy.xacml.api.pap.OnapPDP;
+import org.onap.policy.xacml.api.pap.OnapPDPGroup;
 
 public class StdPDPItemSetChangeNotifier {
 	
@@ -33,9 +33,9 @@ public class StdPDPItemSetChangeNotifier {
 		
 		public void changed();
 		
-		public void groupChanged(EcompPDPGroup group);
+		public void groupChanged(OnapPDPGroup group);
 		
-		public void pdpChanged(EcompPDP pdp);
+		public void pdpChanged(OnapPDP pdp);
 
 	}
 	
@@ -61,7 +61,7 @@ public class StdPDPItemSetChangeNotifier {
 		}		
 	}
 
-	public void firePDPGroupChanged(EcompPDPGroup group) {
+	public void firePDPGroupChanged(OnapPDPGroup group) {
 		if (this.listeners == null) {
 			return;
 		}
@@ -70,7 +70,7 @@ public class StdPDPItemSetChangeNotifier {
 		}
 	}
 
-	public void firePDPChanged(EcompPDP pdp) {
+	public void firePDPChanged(OnapPDP pdp) {
 		if (this.listeners == null) {
 			return;
 		}
diff --git a/ECOMP-XACML/src/main/java/org/openecomp/policy/xacml/std/pap/StdPDPPIPConfig.java b/ONAP-XACML/src/main/java/org/onap/policy/xacml/std/pap/StdPDPPIPConfig.java
index 3a609fe07..f04384620 100644
--- a/ECOMP-XACML/src/main/java/org/openecomp/policy/xacml/std/pap/StdPDPPIPConfig.java
+++ b/ONAP-XACML/src/main/java/org/onap/policy/xacml/std/pap/StdPDPPIPConfig.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-XACML
+ * ONAP-XACML
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.xacml.std.pap;
+package org.onap.policy.xacml.std.pap;
 
 import java.io.Serializable;
 import java.util.Collections;
@@ -27,8 +27,8 @@ import java.util.Properties;
 
 import com.att.research.xacml.api.pap.PDPPIPConfig;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger; 
-import org.openecomp.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.common.logging.flexlogger.FlexLogger; 
+import org.onap.policy.common.logging.flexlogger.Logger;
 
 public class StdPDPPIPConfig implements PDPPIPConfig, Serializable {
 	private static final long serialVersionUID = 1L;
diff --git a/ECOMP-XACML/src/main/java/org/openecomp/policy/xacml/std/pap/StdPDPPolicy.java b/ONAP-XACML/src/main/java/org/onap/policy/xacml/std/pap/StdPDPPolicy.java
index 0300a3d06..892211a4c 100644
--- a/ECOMP-XACML/src/main/java/org/openecomp/policy/xacml/std/pap/StdPDPPolicy.java
+++ b/ONAP-XACML/src/main/java/org/onap/policy/xacml/std/pap/StdPDPPolicy.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-XACML
+ * ONAP-XACML
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,9 +17,9 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.xacml.std.pap;
+package org.onap.policy.xacml.std.pap;
 
-import org.openecomp.policy.common.logging.eelf.PolicyLogger;
+import org.onap.policy.common.logging.eelf.PolicyLogger;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -35,7 +35,7 @@ import oasis.names.tc.xacml._3_0.core.schema.wd_17.PolicyType;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.openecomp.policy.xacml.util.XACMLPolicyScanner;
+import org.onap.policy.xacml.util.XACMLPolicyScanner;
 
 import com.att.research.xacml.api.pap.PAPException;
 import com.att.research.xacml.api.pap.PDPPolicy;
diff --git a/ECOMP-XACML/src/main/java/org/openecomp/policy/xacml/std/pap/StdPDPStatus.java b/ONAP-XACML/src/main/java/org/onap/policy/xacml/std/pap/StdPDPStatus.java
index ddb799964..f8759956c 100644
--- a/ECOMP-XACML/src/main/java/org/openecomp/policy/xacml/std/pap/StdPDPStatus.java
+++ b/ONAP-XACML/src/main/java/org/onap/policy/xacml/std/pap/StdPDPStatus.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-XACML
+ * ONAP-XACML
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.xacml.std.pap;
+package org.onap.policy.xacml.std.pap;
 
 import java.io.Serializable;
 import java.util.Collections;
diff --git a/ECOMP-XACML/src/main/java/org/openecomp/policy/xacml/std/pip/engines/OperationHistoryEngine.java b/ONAP-XACML/src/main/java/org/onap/policy/xacml/std/pip/engines/OperationHistoryEngine.java
index 30b59cdd8..f99855cf9 100644
--- a/ECOMP-XACML/src/main/java/org/openecomp/policy/xacml/std/pip/engines/OperationHistoryEngine.java
+++ b/ONAP-XACML/src/main/java/org/onap/policy/xacml/std/pip/engines/OperationHistoryEngine.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-XACML
+ * ONAP-XACML
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.xacml.std.pip.engines;
+package org.onap.policy.xacml.std.pip.engines;
 
 import java.math.BigInteger;
 import java.util.ArrayList;
diff --git a/ECOMP-XACML/src/main/java/org/openecomp/policy/xacml/std/pip/engines/aaf/AAFEngine.java b/ONAP-XACML/src/main/java/org/onap/policy/xacml/std/pip/engines/aaf/AAFEngine.java
index bdf4d342d..ee75c5f8e 100644
--- a/ECOMP-XACML/src/main/java/org/openecomp/policy/xacml/std/pip/engines/aaf/AAFEngine.java
+++ b/ONAP-XACML/src/main/java/org/onap/policy/xacml/std/pip/engines/aaf/AAFEngine.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-XACML
+ * ONAP-XACML
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.xacml.std.pip.engines.aaf;
+package org.onap.policy.xacml.std.pip.engines.aaf;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -30,8 +30,8 @@ import java.util.Properties;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.openecomp.policy.utils.AAFPolicyClient;
-import org.openecomp.policy.utils.AAFPolicyException;
+import org.onap.policy.utils.AAFPolicyClient;
+import org.onap.policy.utils.AAFPolicyException;
 
 import com.att.research.xacml.api.Attribute;
 import com.att.research.xacml.api.AttributeValue;
diff --git a/ECOMP-XACML/src/main/java/org/openecomp/policy/xacml/util/MetricsUtil.java b/ONAP-XACML/src/main/java/org/onap/policy/xacml/util/MetricsUtil.java
index 45a51a191..91e99b88b 100644
--- a/ECOMP-XACML/src/main/java/org/openecomp/policy/xacml/util/MetricsUtil.java
+++ b/ONAP-XACML/src/main/java/org/onap/policy/xacml/util/MetricsUtil.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-XACML
+ * ONAP-XACML
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.xacml.util;
+package org.onap.policy.xacml.util;
 
 public class MetricsUtil {
 	
diff --git a/ECOMP-XACML/src/main/java/org/openecomp/policy/xacml/util/XACMLPolicyScanner.java b/ONAP-XACML/src/main/java/org/onap/policy/xacml/util/XACMLPolicyScanner.java
index 7b91426b5..b43299e4e 100644
--- a/ECOMP-XACML/src/main/java/org/openecomp/policy/xacml/util/XACMLPolicyScanner.java
+++ b/ONAP-XACML/src/main/java/org/onap/policy/xacml/util/XACMLPolicyScanner.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-XACML
+ * ONAP-XACML
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.xacml.util;
+package org.onap.policy.xacml.util;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -40,8 +40,8 @@ import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
-import org.openecomp.policy.common.logging.eelf.MessageCodes;
-import org.openecomp.policy.common.logging.eelf.PolicyLogger;
+import org.onap.policy.common.logging.eelf.MessageCodes;
+import org.onap.policy.common.logging.eelf.PolicyLogger;
 
 import com.att.research.xacml.api.AttributeAssignment;
 import com.att.research.xacml.std.IdentifierImpl;
diff --git a/ECOMP-XACML/src/main/java/org/openecomp/policy/xacml/util/XACMLPolicyWriter.java b/ONAP-XACML/src/main/java/org/onap/policy/xacml/util/XACMLPolicyWriter.java
index 3706bda3f..14c8ffde0 100644
--- a/ECOMP-XACML/src/main/java/org/openecomp/policy/xacml/util/XACMLPolicyWriter.java
+++ b/ONAP-XACML/src/main/java/org/onap/policy/xacml/util/XACMLPolicyWriter.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-XACML
+ * ONAP-XACML
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.xacml.util;
+package org.onap.policy.xacml.util;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -35,8 +35,8 @@ import javax.xml.bind.JAXBException;
 import javax.xml.bind.Marshaller;
 import javax.xml.bind.Unmarshaller;
 
-import org.openecomp.policy.common.logging.eelf.MessageCodes;
-import org.openecomp.policy.common.logging.eelf.PolicyLogger;
+import org.onap.policy.common.logging.eelf.MessageCodes;
+import org.onap.policy.common.logging.eelf.PolicyLogger;
 
 
 import oasis.names.tc.xacml._3_0.core.schema.wd_17.AdviceExpressionType;
diff --git a/ECOMP-XACML/src/main/resources/META-INF/operationHistoryPU.xml b/ONAP-XACML/src/main/resources/META-INF/operationHistoryPU.xml
index a3770d385..a3770d385 100644
--- a/ECOMP-XACML/src/main/resources/META-INF/operationHistoryPU.xml
+++ b/ONAP-XACML/src/main/resources/META-INF/operationHistoryPU.xml
diff --git a/ECOMP-XACML/src/main/resources/xacml.properties b/ONAP-XACML/src/main/resources/xacml.properties
index 9cdf680f2..5be3939cb 100644
--- a/ECOMP-XACML/src/main/resources/xacml.properties
+++ b/ONAP-XACML/src/main/resources/xacml.properties
@@ -1,6 +1,6 @@
 ###
 # ============LICENSE_START=======================================================
-# ECOMP-XACML
+# ONAP-XACML
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
@@ -21,10 +21,10 @@
 # Default XACML Properties File
 # Standard API Factories
 #
-xacml.dataTypeFactory=org.openecomp.policy.xacml.std.StdDataTypeFactory
+xacml.dataTypeFactory=org.onap.policy.xacml.std.StdDataTypeFactory
 xacml.pdpEngineFactory=com.att.research.xacmlatt.pdp.ATTPDPEngineFactory
-xacml.pepEngineFactory=org.openecomp.policy.xacml.std.pep.StdEngineFactory
-xacml.pipFinderFactory=org.openecomp.policy.xacml.std.pip.StdPIPFinderFactory
+xacml.pepEngineFactory=org.onap.policy.xacml.std.pep.StdEngineFactory
+xacml.pipFinderFactory=org.onap.policy.xacml.std.pip.StdPIPFinderFactory
 
 # If there is a standard set of PIPEngines:
 # xacml.pip.engines=engine1,engine2,...,engineN
diff --git a/ECOMP-XACML/src/test/java/org/openecomp/policy/xacml/test/std/pap/StdEngineFactoryTest.java b/ONAP-XACML/src/test/java/org/onap/policy/xacml/test/std/pap/StdEngineFactoryTest.java
index 3c1a3385b..3fa49551b 100644
--- a/ECOMP-XACML/src/test/java/org/openecomp/policy/xacml/test/std/pap/StdEngineFactoryTest.java
+++ b/ONAP-XACML/src/test/java/org/onap/policy/xacml/test/std/pap/StdEngineFactoryTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-XACML
+ * ONAP-XACML
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.xacml.test.std.pap;
+package org.onap.policy.xacml.test.std.pap;
 
 import static org.junit.Assert.assertTrue;
 
@@ -25,7 +25,7 @@ import java.io.IOException;
 import java.util.Properties;
 
 import org.junit.Test;
-import org.openecomp.policy.xacml.std.pap.StdEngineFactory;
+import org.onap.policy.xacml.std.pap.StdEngineFactory;
 
 import com.att.research.xacml.api.pap.PAPException;
 import com.att.research.xacml.util.FactoryException;
diff --git a/ECOMP-XACML/src/test/java/org/openecomp/policy/xacml/test/util/AAFEngineTest.java b/ONAP-XACML/src/test/java/org/onap/policy/xacml/test/util/AAFEngineTest.java
index a7f7817cd..65646e1e6 100644
--- a/ECOMP-XACML/src/test/java/org/openecomp/policy/xacml/test/util/AAFEngineTest.java
+++ b/ONAP-XACML/src/test/java/org/onap/policy/xacml/test/util/AAFEngineTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-XACML
+ * ONAP-XACML
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.xacml.test.util;
+package org.onap.policy.xacml.test.util;
 
 public class AAFEngineTest {
 
diff --git a/ECOMP-XACML/src/test/java/org/openecomp/policy/xacml/test/util/MetricsUtilTest.java b/ONAP-XACML/src/test/java/org/onap/policy/xacml/test/util/MetricsUtilTest.java
index 1c48d0c89..041acdee6 100644
--- a/ECOMP-XACML/src/test/java/org/openecomp/policy/xacml/test/util/MetricsUtilTest.java
+++ b/ONAP-XACML/src/test/java/org/onap/policy/xacml/test/util/MetricsUtilTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-XACML
+ * ONAP-XACML
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,12 +17,12 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.xacml.test.util;
+package org.onap.policy.xacml.test.util;
 
 import static org.junit.Assert.*;
 
 import org.junit.Test;
-import org.openecomp.policy.xacml.util.MetricsUtil;
+import org.onap.policy.xacml.util.MetricsUtil;
 
 public class MetricsUtilTest {
 	
diff --git a/ECOMP-XACML/src/test/java/org/openecomp/policy/xacml/test/util/XACMLPolicyScannerTest.java b/ONAP-XACML/src/test/java/org/onap/policy/xacml/test/util/XACMLPolicyScannerTest.java
index b7a12daa8..09dcf837f 100644
--- a/ECOMP-XACML/src/test/java/org/openecomp/policy/xacml/test/util/XACMLPolicyScannerTest.java
+++ b/ONAP-XACML/src/test/java/org/onap/policy/xacml/test/util/XACMLPolicyScannerTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-XACML
+ * ONAP-XACML
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.xacml.test.util;
+package org.onap.policy.xacml.test.util;
 
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
@@ -31,7 +31,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.junit.Before;
 import org.junit.Test;
-import org.openecomp.policy.xacml.util.XACMLPolicyScanner;
+import org.onap.policy.xacml.util.XACMLPolicyScanner;
 
 import com.att.research.xacml.util.XACMLPolicyScanner.Callback;
 
diff --git a/ECOMP-XACML/src/test/java/org/openecomp/policy/xacml/test/util/XACMLPolicyWriterTest.java b/ONAP-XACML/src/test/java/org/onap/policy/xacml/test/util/XACMLPolicyWriterTest.java
index 0a6fbf5e9..c948716dc 100644
--- a/ECOMP-XACML/src/test/java/org/openecomp/policy/xacml/test/util/XACMLPolicyWriterTest.java
+++ b/ONAP-XACML/src/test/java/org/onap/policy/xacml/test/util/XACMLPolicyWriterTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP-XACML
+ * ONAP-XACML
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.xacml.test.util;
+package org.onap.policy.xacml.test.util;
 
 import static org.junit.Assert.assertTrue;
 
@@ -29,7 +29,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.junit.Before;
 import org.junit.Test;
-import org.openecomp.policy.xacml.util.XACMLPolicyWriter;
+import org.onap.policy.xacml.util.XACMLPolicyWriter;
 
 public class XACMLPolicyWriterTest {
 	private static final Log logger				= LogFactory.getLog(XACMLPolicyWriterTest.class);
diff --git a/ECOMP-XACML/src/test/resources/Action_TestActionPolicy.1.xml b/ONAP-XACML/src/test/resources/Action_TestActionPolicy.1.xml
index 56f843c8d..a3b483f74 100644
--- a/ECOMP-XACML/src/test/resources/Action_TestActionPolicy.1.xml
+++ b/ONAP-XACML/src/test/resources/Action_TestActionPolicy.1.xml
@@ -4,7 +4,7 @@
      <Target>
          <AnyOf>
              <AllOf>
-                 <Match MatchId="org.openecomp.function.regex-match">
+                 <Match MatchId="org.onap.function.regex-match">
                      <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">12</AttributeValue>
                      <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="SamplTest" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                  </Match>
diff --git a/ECOMP-XACML/src/test/resources/CSVPolicy.xml b/ONAP-XACML/src/test/resources/CSVPolicy.xml
index 02a79b104..6396e66a1 100644
--- a/ECOMP-XACML/src/test/resources/CSVPolicy.xml
+++ b/ONAP-XACML/src/test/resources/CSVPolicy.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <!--
   ============LICENSE_START=======================================================
-  ECOMP-XACML
+  ONAP-XACML
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
   ================================================================================
@@ -38,7 +38,7 @@
             <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:integer-greater-than">
                 <Description>Load</Description>
                 <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:integer-one-and-only">
-                    <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="com:att:labs:ecomp:resource:vm:load" DataType="http://www.w3.org/2001/XMLSchema#integer" MustBePresent="true"/>
+                    <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="com:att:labs:onap:resource:vm:load" DataType="http://www.w3.org/2001/XMLSchema#integer" MustBePresent="true"/>
                 </Apply>
 				<AttributeValue DataType="http://www.w3.org/2001/XMLSchema#integer">95</AttributeValue>
                 <!--<Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:integer-one-and-only">
@@ -48,7 +48,7 @@
             <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:integer-greater-than">
                 <Description>CPU</Description>
                 <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:integer-one-and-only">
-                    <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="com:att:labs:ecomp:resource:vm:cpu" DataType="http://www.w3.org/2001/XMLSchema#integer" MustBePresent="true"/>
+                    <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="com:att:labs:onap:resource:vm:cpu" DataType="http://www.w3.org/2001/XMLSchema#integer" MustBePresent="true"/>
                 </Apply>
 				<AttributeValue DataType="http://www.w3.org/2001/XMLSchema#integer">95</AttributeValue>
                 <!-- <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:integer-one-and-only">
diff --git a/ECOMP-XACML/src/test/resources/Config_SampleTest1206.1.xml b/ONAP-XACML/src/test/resources/Config_SampleTest1206.1.xml
index 5390548d9..dcfd0c5eb 100644
--- a/ECOMP-XACML/src/test/resources/Config_SampleTest1206.1.xml
+++ b/ONAP-XACML/src/test/resources/Config_SampleTest1206.1.xml
@@ -4,33 +4,33 @@
     <Target>
         <AnyOf>
             <AllOf>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">com.Config_SampleTest1206.1.xml</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="PolicyName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
             </AllOf>
             <AllOf>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">success</AttributeValue>
-                    <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ECOMPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
+                    <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ONAPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">PROD</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="RiskType" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">1</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="RiskLevel" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">True</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="guard" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">08-06-2017</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="TTLDate" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">SampleTest1206</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ConfigName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
@@ -66,7 +66,7 @@
                 <AttributeAssignmentExpression AttributeId="VersionNumber" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">1</AttributeValue>
                 </AttributeAssignmentExpression>
-                <AttributeAssignmentExpression AttributeId="matching:ECOMPName" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
+                <AttributeAssignmentExpression AttributeId="matching:ONAPName" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">success</AttributeValue>
                 </AttributeAssignmentExpression>
                 <AttributeAssignmentExpression AttributeId="matching:ConfigName" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
diff --git a/ECOMP-XACML/src/test/resources/log4j.properties b/ONAP-XACML/src/test/resources/log4j.properties
index 4c9773d76..ee9cfa39b 100644
--- a/ECOMP-XACML/src/test/resources/log4j.properties
+++ b/ONAP-XACML/src/test/resources/log4j.properties
@@ -1,6 +1,6 @@
 ###
 # ============LICENSE_START=======================================================
-# ECOMP-XACML
+# ONAP-XACML
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
diff --git a/ECOMP-XACML/src/test/resources/logback.xml b/ONAP-XACML/src/test/resources/logback.xml
index 2f92f709b..cd8e69414 100644
--- a/ECOMP-XACML/src/test/resources/logback.xml
+++ b/ONAP-XACML/src/test/resources/logback.xml
@@ -1,6 +1,6 @@
 <!--
   ============LICENSE_START=======================================================
-  ECOMP-XACML
+  ONAP-XACML
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
   ================================================================================
@@ -27,7 +27,7 @@
   <property name="debugDir" value="logs" />
   
   <!--  specify the component name 
-    <ECOMP-component-name>::= "MSO" | "DCAE" | "ASDC " | "AAI" |"Policy" | "SDNC" | "AC"  -->
+    <ONAP-component-name>::= "MSO" | "DCAE" | "ASDC " | "AAI" |"Policy" | "SDNC" | "AC"  -->
   <property name="componentName" value="Policy"></property>
   <property name="subComponentName" value="XACML"></property>
   
diff --git a/ECOMP-XACML/src/test/resources/logging.properties b/ONAP-XACML/src/test/resources/logging.properties
index 6d1bd488e..ff9840ff7 100644
--- a/ECOMP-XACML/src/test/resources/logging.properties
+++ b/ONAP-XACML/src/test/resources/logging.properties
@@ -1,6 +1,6 @@
 ###
 # ============LICENSE_START=======================================================
-# ECOMP-XACML
+# ONAP-XACML
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
diff --git a/ECOMP-XACML/src/test/resources/pdps/default/com.Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.xml b/ONAP-XACML/src/test/resources/pdps/default/com.Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.xml
index 33c0c4a8d..e27f163b6 100644
--- a/ECOMP-XACML/src/test/resources/pdps/default/com.Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.xml
+++ b/ONAP-XACML/src/test/resources/pdps/default/com.Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.xml
@@ -4,33 +4,33 @@
     <Target>
         <AnyOf>
             <AllOf>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">com.Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.xml</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="PolicyName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
             </AllOf>
             <AllOf>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">DROOLS</AttributeValue>
-                    <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ECOMPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
+                    <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ONAPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">BRMS_PARAM_RULE</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ConfigName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">SampleRiskType</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="RiskType" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">1</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="RiskLevel" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">False</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="guard" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">NA</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="TTLDate" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
@@ -66,7 +66,7 @@
                 <AttributeAssignmentExpression AttributeId="VersionNumber" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">1</AttributeValue>
                 </AttributeAssignmentExpression>
-                <AttributeAssignmentExpression AttributeId="matching:ECOMPName" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
+                <AttributeAssignmentExpression AttributeId="matching:ONAPName" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">DROOLS</AttributeValue>
                 </AttributeAssignmentExpression>
                 <AttributeAssignmentExpression AttributeId="matching:ConfigName" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
diff --git a/ECOMP-XACML/src/test/resources/pdps/default/xacml.pip.properties b/ONAP-XACML/src/test/resources/pdps/default/xacml.pip.properties
index 4dba1f554..846848f28 100644
--- a/ECOMP-XACML/src/test/resources/pdps/default/xacml.pip.properties
+++ b/ONAP-XACML/src/test/resources/pdps/default/xacml.pip.properties
@@ -1,6 +1,6 @@
 #
 #Tue Feb 07 10:35:08 EST 2017
 AAF.description=AAFEngine to communicate with AAF to take decisions
-AAF.classname=org.openecomp.policy.xacml.std.pip.engines.aaf.AAFEngine
+AAF.classname=org.onap.policy.xacml.std.pip.engines.aaf.AAFEngine
 AAF.name=AAFEngine
 xacml.pip.engines=AAF
\ No newline at end of file
diff --git a/ECOMP-XACML/src/test/resources/pdps/default/xacml.policy.properties b/ONAP-XACML/src/test/resources/pdps/default/xacml.policy.properties
index 1dc2aabf4..1dc2aabf4 100644
--- a/ECOMP-XACML/src/test/resources/pdps/default/xacml.policy.properties
+++ b/ONAP-XACML/src/test/resources/pdps/default/xacml.policy.properties
diff --git a/ECOMP-XACML/src/test/resources/pdps/xacml.properties b/ONAP-XACML/src/test/resources/pdps/xacml.properties
index aa1ece0a3..aa1ece0a3 100644
--- a/ECOMP-XACML/src/test/resources/pdps/xacml.properties
+++ b/ONAP-XACML/src/test/resources/pdps/xacml.properties
diff --git a/ECOMP-XACML/src/test/resources/xacml.pip.properties b/ONAP-XACML/src/test/resources/xacml.pip.properties
index dbff01086..ac1747728 100644
--- a/ECOMP-XACML/src/test/resources/xacml.pip.properties
+++ b/ONAP-XACML/src/test/resources/xacml.pip.properties
@@ -1,6 +1,6 @@
 ###
 # ============LICENSE_START=======================================================
-# ECOMP-XACML
+# ONAP-XACML
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
diff --git a/ECOMP-XACML/src/test/resources/xacml.policy.properties b/ONAP-XACML/src/test/resources/xacml.policy.properties
index b1247cdfc..8538b2331 100644
--- a/ECOMP-XACML/src/test/resources/xacml.policy.properties
+++ b/ONAP-XACML/src/test/resources/xacml.policy.properties
@@ -1,6 +1,6 @@
 ###
 # ============LICENSE_START=======================================================
-# ECOMP-XACML
+# ONAP-XACML
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
diff --git a/ECOMP-XACML/testclient.properties b/ONAP-XACML/testclient.properties
index 84bcd4363..85d679e34 100644
--- a/ECOMP-XACML/testclient.properties
+++ b/ONAP-XACML/testclient.properties
@@ -1,6 +1,6 @@
 ###
 # ============LICENSE_START=======================================================
-# ECOMP-XACML
+# ONAP-XACML
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
diff --git a/ECOMP-XACML/testpdp.properties b/ONAP-XACML/testpdp.properties
index 500f8a406..23f02243a 100644
--- a/ECOMP-XACML/testpdp.properties
+++ b/ONAP-XACML/testpdp.properties
@@ -1,6 +1,6 @@
 ###
 # ============LICENSE_START=======================================================
-# ECOMP-XACML
+# ONAP-XACML
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
diff --git a/ECOMP-XACML/testsets/conformance/xacml3.0-ct-v.0.4/IIA001Response.xml b/ONAP-XACML/testsets/conformance/xacml3.0-ct-v.0.4/IIA001Response.xml
index 8c484e0a9..8c484e0a9 100644
--- a/ECOMP-XACML/testsets/conformance/xacml3.0-ct-v.0.4/IIA001Response.xml
+++ b/ONAP-XACML/testsets/conformance/xacml3.0-ct-v.0.4/IIA001Response.xml
diff --git a/ECOMP-XACML/xacml.pap.properties b/ONAP-XACML/xacml.pap.properties
index 15c5cfb9c..608ca232d 100644
--- a/ECOMP-XACML/xacml.pap.properties
+++ b/ONAP-XACML/xacml.pap.properties
@@ -1,6 +1,6 @@
 ###
 # ============LICENSE_START=======================================================
-# ECOMP-XACML
+# ONAP-XACML
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
@@ -21,7 +21,7 @@
 #
 # This is our factory that will create our engine
 #
-xacml.PAP.papEngineFactory=org.openecomp.policy.xacml.std.pap.StdEngineFactory
+xacml.PAP.papEngineFactory=org.onap.policy.xacml.std.pap.StdEngineFactory
 
 #
 # Where we store our PAP PDP Group/Node information
diff --git a/ECOMP-XACML/xacml.pdp.properties b/ONAP-XACML/xacml.pdp.properties
index fc731bf29..b2687848b 100644
--- a/ECOMP-XACML/xacml.pdp.properties
+++ b/ONAP-XACML/xacml.pdp.properties
@@ -1,6 +1,6 @@
 ###
 # ============LICENSE_START=======================================================
-# ECOMP-XACML
+# ONAP-XACML
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
@@ -25,7 +25,7 @@
 xacml.dataTypeFactory=com.att.research.xacml.std.StdDataTypeFactory
 xacml.pdpEngineFactory=com.att.research.xacmlatt.pdp.ATTPDPEngineFactory
 xacml.pepEngineFactory=com.att.research.xacml.std.pep.StdEngineFactory
-# NOT USED SEE BELOW xacml.pipFinderFactory=org.openecomp.policy.xacml.std.pip.StdPIPFinderFactory
+# NOT USED SEE BELOW xacml.pipFinderFactory=org.onap.policy.xacml.std.pip.StdPIPFinderFactory
 xacml.traceEngineFactory=com.att.research.xacml.std.trace.LoggingTraceEngineFactory
 #
 # AT&T PDP Implementation Factories
@@ -38,8 +38,8 @@ xacml.att.functionDefinitionFactory=com.att.research.xacmlatt.pdp.std.StdFunctio
 #
 # AT&T RESTful PDP Implementation Factories
 #
-xacml.pipFinderFactory=org.openecomp.policy.pdp.rest.impl.XACMLPdpPIPFinderFactory
-xacml.att.policyFinderFactory=org.openecomp.policy.pdp.rest.impl.XACMLPdpPolicyFinderFactory
+xacml.pipFinderFactory=org.onap.policy.pdp.rest.impl.XACMLPdpPIPFinderFactory
+xacml.att.policyFinderFactory=org.onap.policy.pdp.rest.impl.XACMLPdpPolicyFinderFactory
 #
 # When set to true, this flag tells the StdPolicyFinderFactory to combined all the root policy files into
 # into one PolicySet and use the given Policy Algorithm.
diff --git a/ECOMP-XACML/xacml.properties b/ONAP-XACML/xacml.properties
index 0c563028e..69f5a4fd6 100644
--- a/ECOMP-XACML/xacml.properties
+++ b/ONAP-XACML/xacml.properties
@@ -1,6 +1,6 @@
 ###
 # ============LICENSE_START=======================================================
-# ECOMP-XACML
+# ONAP-XACML
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
diff --git a/POLICY-SDK-APP/pom.xml b/POLICY-SDK-APP/pom.xml
index ae58bc182..b8ac94bd2 100644
--- a/POLICY-SDK-APP/pom.xml
+++ b/POLICY-SDK-APP/pom.xml
@@ -2,7 +2,7 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.openecomp.policy.engine</groupId>
+		<groupId>org.onap.policy.engine</groupId>
 		<artifactId>PolicyEngineSuite</artifactId>
 		<version>1.1.0-SNAPSHOT</version>
 	</parent>
@@ -171,8 +171,8 @@
 			</exclusions>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.policy.engine</groupId>
-			<artifactId>ECOMP-PDP</artifactId>
+			<groupId>org.onap.policy.engine</groupId>
+			<artifactId>ONAP-PDP</artifactId>
 			<version>${project.version}</version>
 			<exclusions>
 				<exclusion>
diff --git a/POLICY-SDK-APP/src/main/java/org/openecomp/policy/admin/CheckPDP.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/CheckPDP.java
index ca5aff193..f983c6650 100644
--- a/POLICY-SDK-APP/src/main/java/org/openecomp/policy/admin/CheckPDP.java
+++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/CheckPDP.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.admin;
+package org.onap.policy.admin;
 
 
 import java.io.FileInputStream;
@@ -36,10 +36,10 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Properties;
 
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.rest.XACMLRestProperties;
-import org.openecomp.policy.xacml.api.XACMLErrorConstants;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.rest.XACMLRestProperties;
+import org.onap.policy.xacml.api.XACMLErrorConstants;
 
 import com.att.research.xacml.util.XACMLProperties;
 
diff --git a/POLICY-SDK-APP/src/main/java/org/openecomp/policy/admin/PolicyAdapter.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/PolicyAdapter.java
index ef25376f3..ee4cbcc03 100644
--- a/POLICY-SDK-APP/src/main/java/org/openecomp/policy/admin/PolicyAdapter.java
+++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/PolicyAdapter.java
@@ -1,18 +1,18 @@
-package org.openecomp.policy.admin;
+package org.onap.policy.admin;
 
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.controller.ActionPolicyController;
-import org.openecomp.policy.controller.CreateBRMSParamController;
-import org.openecomp.policy.controller.CreateBRMSRawController;
-import org.openecomp.policy.controller.CreateClosedLoopFaultController;
-import org.openecomp.policy.controller.CreateClosedLoopPMController;
-import org.openecomp.policy.controller.CreateDcaeMicroServiceController;
-import org.openecomp.policy.controller.CreateFirewallController;
-import org.openecomp.policy.controller.CreatePolicyController;
-import org.openecomp.policy.controller.DecisionPolicyController;
-import org.openecomp.policy.rest.adapter.PolicyRestAdapter;
-import org.openecomp.policy.rest.jpa.PolicyEntity;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.controller.ActionPolicyController;
+import org.onap.policy.controller.CreateBRMSParamController;
+import org.onap.policy.controller.CreateBRMSRawController;
+import org.onap.policy.controller.CreateClosedLoopFaultController;
+import org.onap.policy.controller.CreateClosedLoopPMController;
+import org.onap.policy.controller.CreateDcaeMicroServiceController;
+import org.onap.policy.controller.CreateFirewallController;
+import org.onap.policy.controller.CreatePolicyController;
+import org.onap.policy.controller.DecisionPolicyController;
+import org.onap.policy.rest.adapter.PolicyRestAdapter;
+import org.onap.policy.rest.jpa.PolicyEntity;
 
 import com.att.research.xacml.util.XACMLProperties;
 
diff --git a/POLICY-SDK-APP/src/main/java/org/openecomp/policy/admin/PolicyManagerServlet.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/PolicyManagerServlet.java
index 1821e1031..036d13aa6 100644
--- a/POLICY-SDK-APP/src/main/java/org/openecomp/policy/admin/PolicyManagerServlet.java
+++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/PolicyManagerServlet.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.admin;
+package org.onap.policy.admin;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
@@ -61,24 +61,24 @@ import org.apache.http.HttpStatus;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.components.HumanPolicyComponent;
-import org.openecomp.policy.controller.PolicyController;
-import org.openecomp.policy.controller.PolicyExportAndImportController;
-import org.openecomp.policy.model.Roles;
-import org.openecomp.policy.rest.XACMLRest;
-import org.openecomp.policy.rest.XACMLRestProperties;
-import org.openecomp.policy.rest.adapter.PolicyRestAdapter;
-import org.openecomp.policy.rest.jpa.ActionBodyEntity;
-import org.openecomp.policy.rest.jpa.ConfigurationDataEntity;
-import org.openecomp.policy.rest.jpa.PolicyEditorScopes;
-import org.openecomp.policy.rest.jpa.PolicyEntity;
-import org.openecomp.policy.rest.jpa.PolicyVersion;
-import org.openecomp.policy.rest.jpa.UserInfo;
-import org.openecomp.policy.utils.PolicyUtils;
-import org.openecomp.policy.xacml.api.XACMLErrorConstants;
-import org.openecomp.policy.xacml.util.XACMLPolicyScanner;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.components.HumanPolicyComponent;
+import org.onap.policy.controller.PolicyController;
+import org.onap.policy.controller.PolicyExportAndImportController;
+import org.onap.policy.model.Roles;
+import org.onap.policy.rest.XACMLRest;
+import org.onap.policy.rest.XACMLRestProperties;
+import org.onap.policy.rest.adapter.PolicyRestAdapter;
+import org.onap.policy.rest.jpa.ActionBodyEntity;
+import org.onap.policy.rest.jpa.ConfigurationDataEntity;
+import org.onap.policy.rest.jpa.PolicyEditorScopes;
+import org.onap.policy.rest.jpa.PolicyEntity;
+import org.onap.policy.rest.jpa.PolicyVersion;
+import org.onap.policy.rest.jpa.UserInfo;
+import org.onap.policy.utils.PolicyUtils;
+import org.onap.policy.xacml.api.XACMLErrorConstants;
+import org.onap.policy.xacml.util.XACMLPolicyScanner;
 import org.openecomp.portalsdk.core.web.support.UserUtils;
 
 import com.att.research.xacml.util.XACMLProperties;
diff --git a/POLICY-SDK-APP/src/main/java/org/openecomp/policy/admin/PolicyNotificationMail.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/PolicyNotificationMail.java
index 1a535dc76..bf89c01ff 100644
--- a/POLICY-SDK-APP/src/main/java/org/openecomp/policy/admin/PolicyNotificationMail.java
+++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/PolicyNotificationMail.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.admin;
+package org.onap.policy.admin;
 
 import java.io.File;
 import java.text.DateFormat;
@@ -31,13 +31,13 @@ import javax.mail.MessagingException;
 import javax.mail.internet.InternetAddress;
 import javax.mail.internet.MimeMessage;
 
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.controller.PolicyController;
-import org.openecomp.policy.rest.dao.CommonClassDao;
-import org.openecomp.policy.rest.jpa.PolicyVersion;
-import org.openecomp.policy.rest.jpa.WatchPolicyNotificationTable;
-import org.openecomp.policy.xacml.api.XACMLErrorConstants;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.controller.PolicyController;
+import org.onap.policy.rest.dao.CommonClassDao;
+import org.onap.policy.rest.jpa.PolicyVersion;
+import org.onap.policy.rest.jpa.WatchPolicyNotificationTable;
+import org.onap.policy.xacml.api.XACMLErrorConstants;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
diff --git a/POLICY-SDK-APP/src/main/java/org/openecomp/policy/admin/PolicyRestController.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/PolicyRestController.java
index 08ef99f94..e99f35bde 100644
--- a/POLICY-SDK-APP/src/main/java/org/openecomp/policy/admin/PolicyRestController.java
+++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/PolicyRestController.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.admin;
+package org.onap.policy.admin;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;
@@ -40,18 +40,18 @@ import org.apache.commons.fileupload.disk.DiskFileItemFactory;
 import org.apache.commons.fileupload.servlet.ServletFileUpload;
 import org.apache.commons.io.IOUtils;
 import org.json.JSONObject;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.controller.CreateClosedLoopFaultController;
-import org.openecomp.policy.controller.CreateDcaeMicroServiceController;
-import org.openecomp.policy.controller.CreateFirewallController;
-import org.openecomp.policy.controller.PolicyController;
-import org.openecomp.policy.rest.XACMLRestProperties;
-import org.openecomp.policy.rest.adapter.PolicyRestAdapter;
-import org.openecomp.policy.rest.dao.CommonClassDao;
-import org.openecomp.policy.rest.jpa.PolicyVersion;
-import org.openecomp.policy.utils.PolicyUtils;
-import org.openecomp.policy.xacml.api.XACMLErrorConstants;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.controller.CreateClosedLoopFaultController;
+import org.onap.policy.controller.CreateDcaeMicroServiceController;
+import org.onap.policy.controller.CreateFirewallController;
+import org.onap.policy.controller.PolicyController;
+import org.onap.policy.rest.XACMLRestProperties;
+import org.onap.policy.rest.adapter.PolicyRestAdapter;
+import org.onap.policy.rest.dao.CommonClassDao;
+import org.onap.policy.rest.jpa.PolicyVersion;
+import org.onap.policy.utils.PolicyUtils;
+import org.onap.policy.xacml.api.XACMLErrorConstants;
 import org.openecomp.portalsdk.core.controller.RestrictedBaseController;
 import org.openecomp.portalsdk.core.web.support.UserUtils;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/POLICY-SDK-APP/src/main/java/org/openecomp/policy/admin/PolicyUserInfoController.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/PolicyUserInfoController.java
index 4e6201880..65312a957 100644
--- a/POLICY-SDK-APP/src/main/java/org/openecomp/policy/admin/PolicyUserInfoController.java
+++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/PolicyUserInfoController.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.admin;
+package org.onap.policy.admin;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -26,8 +26,8 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.json.JSONObject;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
 import org.openecomp.portalsdk.core.controller.RestrictedBaseController;
 import org.openecomp.portalsdk.core.web.support.JsonMessage;
 import org.openecomp.portalsdk.core.web.support.UserUtils;
diff --git a/POLICY-SDK-APP/src/main/java/org/openecomp/policy/admin/RESTfulPAPEngine.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/RESTfulPAPEngine.java
index 090476a93..d75af075d 100644
--- a/POLICY-SDK-APP/src/main/java/org/openecomp/policy/admin/RESTfulPAPEngine.java
+++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/RESTfulPAPEngine.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.admin;
+package org.onap.policy.admin;
 
 
 
@@ -39,18 +39,18 @@ import java.util.Map;
 import java.util.Set;
 
 import org.apache.commons.io.IOUtils;
-import org.openecomp.policy.rest.XACMLRestProperties;
-import org.openecomp.policy.rest.adapter.PolicyRestAdapter;
-import org.openecomp.policy.xacml.api.XACMLErrorConstants;
-import org.openecomp.policy.xacml.api.pap.EcompPDP;
-import org.openecomp.policy.xacml.api.pap.EcompPDPGroup;
-import org.openecomp.policy.xacml.api.pap.PAPPolicyEngine;
-import org.openecomp.policy.xacml.std.pap.StdPAPPolicy;
-import org.openecomp.policy.xacml.std.pap.StdPDP;
-import org.openecomp.policy.xacml.std.pap.StdPDPGroup;
-import org.openecomp.policy.xacml.std.pap.StdPDPItemSetChangeNotifier;
-import org.openecomp.policy.xacml.std.pap.StdPDPPolicy;
-import org.openecomp.policy.xacml.std.pap.StdPDPStatus;
+import org.onap.policy.rest.XACMLRestProperties;
+import org.onap.policy.rest.adapter.PolicyRestAdapter;
+import org.onap.policy.xacml.api.XACMLErrorConstants;
+import org.onap.policy.xacml.api.pap.OnapPDP;
+import org.onap.policy.xacml.api.pap.OnapPDPGroup;
+import org.onap.policy.xacml.api.pap.PAPPolicyEngine;
+import org.onap.policy.xacml.std.pap.StdPAPPolicy;
+import org.onap.policy.xacml.std.pap.StdPDP;
+import org.onap.policy.xacml.std.pap.StdPDPGroup;
+import org.onap.policy.xacml.std.pap.StdPDPItemSetChangeNotifier;
+import org.onap.policy.xacml.std.pap.StdPDPPolicy;
+import org.onap.policy.xacml.std.pap.StdPDPStatus;
 import com.att.research.xacml.api.pap.PAPException;
 import com.att.research.xacml.api.pap.PDPPolicy;
 import com.att.research.xacml.api.pap.PDPStatus;
@@ -58,8 +58,8 @@ import com.att.research.xacml.util.XACMLProperties;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.type.CollectionType;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger; 
-import org.openecomp.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.common.logging.flexlogger.FlexLogger; 
+import org.onap.policy.common.logging.flexlogger.Logger;
 
 /**
  * Implementation of the PAPEngine interface that communicates with a PAP engine in a remote servlet
@@ -114,27 +114,27 @@ public class RESTfulPAPEngine extends StdPDPItemSetChangeNotifier implements PAP
 	//
 	
 	@Override
-	public EcompPDPGroup getDefaultGroup() throws PAPException {
-		return (EcompPDPGroup)sendToPAP("GET", null, null, StdPDPGroup.class, groupID, "default=");
+	public OnapPDPGroup getDefaultGroup() throws PAPException {
+		return (OnapPDPGroup)sendToPAP("GET", null, null, StdPDPGroup.class, groupID, "default=");
 	}
 
 	@Override
-	public void SetDefaultGroup(EcompPDPGroup group) throws PAPException {
+	public void SetDefaultGroup(OnapPDPGroup group) throws PAPException {
 		sendToPAP("POST", null, null, null, groupID + group.getId(), "default=true");
 	}
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public Set<EcompPDPGroup> getEcompPDPGroups() throws PAPException {
-		Set<EcompPDPGroup> newGroupSet;
-		newGroupSet = (Set<EcompPDPGroup>) this.sendToPAP("GET", null, Set.class, StdPDPGroup.class, groupID);
+	public Set<OnapPDPGroup> getOnapPDPGroups() throws PAPException {
+		Set<OnapPDPGroup> newGroupSet;
+		newGroupSet = (Set<OnapPDPGroup>) this.sendToPAP("GET", null, Set.class, StdPDPGroup.class, groupID);
 		return Collections.unmodifiableSet(newGroupSet);
 	}
 
 
 	@Override
-	public EcompPDPGroup getGroup(String id) throws PAPException {
-		return (EcompPDPGroup)sendToPAP("GET", null, null, StdPDPGroup.class, groupID + id);
+	public OnapPDPGroup getGroup(String id) throws PAPException {
+		return (OnapPDPGroup)sendToPAP("GET", null, null, StdPDPGroup.class, groupID + id);
 	}
 
 	@Override
@@ -160,7 +160,7 @@ public class RESTfulPAPEngine extends StdPDPItemSetChangeNotifier implements PAP
 	 * @return
 	 * @throws PAPException
 	 */
-	public void updateGroup(EcompPDPGroup group) throws PAPException {
+	public void updateGroup(OnapPDPGroup group) throws PAPException {
 
 		try {
 			
@@ -188,7 +188,7 @@ public class RESTfulPAPEngine extends StdPDPItemSetChangeNotifier implements PAP
 	
 	
 	@Override
-	public void removeGroup(EcompPDPGroup group, EcompPDPGroup newGroup)
+	public void removeGroup(OnapPDPGroup group, OnapPDPGroup newGroup)
 			throws PAPException, NullPointerException {
 		String moveToGroupString = null;
 		if (newGroup != null) {
@@ -198,22 +198,22 @@ public class RESTfulPAPEngine extends StdPDPItemSetChangeNotifier implements PAP
 	}
 	
 	@Override
-	public EcompPDPGroup getPDPGroup(EcompPDP pdp) throws PAPException {
+	public OnapPDPGroup getPDPGroup(OnapPDP pdp) throws PAPException {
 		return getPDPGroup(pdp.getId());
 	}
 
 	
-	public EcompPDPGroup getPDPGroup(String pdpId) throws PAPException {
-		return (EcompPDPGroup)sendToPAP("GET", null, null, StdPDPGroup.class, groupID, "pdpId=" + pdpId, "getPDPGroup=");
+	public OnapPDPGroup getPDPGroup(String pdpId) throws PAPException {
+		return (OnapPDPGroup)sendToPAP("GET", null, null, StdPDPGroup.class, groupID, "pdpId=" + pdpId, "getPDPGroup=");
 	}
 
 	@Override
-	public EcompPDP getPDP(String pdpId) throws PAPException {
-		return (EcompPDP)sendToPAP("GET", null, null, StdPDP.class, groupID, "pdpId=" + pdpId);
+	public OnapPDP getPDP(String pdpId) throws PAPException {
+		return (OnapPDP)sendToPAP("GET", null, null, StdPDP.class, groupID, "pdpId=" + pdpId);
 	}
 	
 	@Override
-	public void newPDP(String id, EcompPDPGroup group, String name, String description, int jmxport) throws PAPException,
+	public void newPDP(String id, OnapPDPGroup group, String name, String description, int jmxport) throws PAPException,
 			NullPointerException {
 		StdPDP newPDP = new StdPDP(id, name, description, jmxport);
 		sendToPAP("PUT", newPDP, null, null, groupID + group.getId(), "pdpId=" + id);
@@ -221,21 +221,21 @@ public class RESTfulPAPEngine extends StdPDPItemSetChangeNotifier implements PAP
 	}
 
 	@Override
-	public void movePDP(EcompPDP pdp, EcompPDPGroup newGroup) throws PAPException {
+	public void movePDP(OnapPDP pdp, OnapPDPGroup newGroup) throws PAPException {
 		sendToPAP("POST", null, null, null, groupID + newGroup.getId(), "pdpId=" + pdp.getId());
 		return;
 	}
 
 	@Override
-	public void updatePDP(EcompPDP pdp) throws PAPException {
-		EcompPDPGroup group = getPDPGroup(pdp);
+	public void updatePDP(OnapPDP pdp) throws PAPException {
+		OnapPDPGroup group = getPDPGroup(pdp);
 		sendToPAP("PUT", pdp, null, null, groupID + group.getId(), "pdpId=" + pdp.getId());
 		return;
 	}
 	
 	@Override
-	public void removePDP(EcompPDP pdp) throws PAPException {
-		EcompPDPGroup group = getPDPGroup(pdp);
+	public void removePDP(OnapPDP pdp) throws PAPException {
+		OnapPDPGroup group = getPDPGroup(pdp);
 		sendToPAP("DELETE", null, null, null, groupID + group.getId(), "pdpId=" + pdp.getId());
 		return;
 	}
@@ -254,7 +254,7 @@ public class RESTfulPAPEngine extends StdPDPItemSetChangeNotifier implements PAP
 	
 	@Override
 	public void publishPolicy(String id, String name, boolean isRoot,
-			InputStream policy, EcompPDPGroup group) throws PAPException {
+			InputStream policy, OnapPDPGroup group) throws PAPException {
 		
 
 		// copy the (one) file into the target directory on the PAP servlet
@@ -280,7 +280,7 @@ public class RESTfulPAPEngine extends StdPDPItemSetChangeNotifier implements PAP
 	 * @return
 	 * @throws PAPException
 	 */
-	public void copyFile(String policyId, EcompPDPGroup group, InputStream policy) throws PAPException {
+	public void copyFile(String policyId, OnapPDPGroup group, InputStream policy) throws PAPException {
 		// send the policy file to the PAP Servlet
 		try {
 			sendToPAP("POST", policy, null, null, groupID + group.getId(), "policyId="+policyId);
@@ -293,7 +293,7 @@ public class RESTfulPAPEngine extends StdPDPItemSetChangeNotifier implements PAP
 	
 
 	@Override
-	public void	copyPolicy(PDPPolicy policy, EcompPDPGroup group) throws PAPException {
+	public void	copyPolicy(PDPPolicy policy, OnapPDPGroup group) throws PAPException {
 		if (policy == null || group == null) {
 			throw new PAPException("Null input policy="+policy+"  group="+group);
 		}
@@ -307,7 +307,7 @@ public class RESTfulPAPEngine extends StdPDPItemSetChangeNotifier implements PAP
 	}
 	
 	@Override
-	public void	removePolicy(PDPPolicy policy, EcompPDPGroup group) throws PAPException {
+	public void	removePolicy(PDPPolicy policy, OnapPDPGroup group) throws PAPException {
 		throw new PAPException("NOT IMPLEMENTED");
 
 	}
@@ -322,7 +322,7 @@ public class RESTfulPAPEngine extends StdPDPItemSetChangeNotifier implements PAP
 	 * @throws PAPException 
 	 */
 	
-	public PDPStatus getStatus(EcompPDP pdp) throws PAPException {
+	public PDPStatus getStatus(OnapPDP pdp) throws PAPException {
 		return (StdPDPStatus)sendToPAP("GET", pdp, null, StdPDPStatus.class);
 	}
 	
@@ -367,9 +367,9 @@ public class RESTfulPAPEngine extends StdPDPItemSetChangeNotifier implements PAP
 			}
 			
 			// special case - Status (actually the detailed status) comes from the PDP directly, not the PAP
-			if (method.equals("GET") &&	(content instanceof EcompPDP) &&	responseContentClass == StdPDPStatus.class) {
+			if (method.equals("GET") &&	(content instanceof OnapPDP) &&	responseContentClass == StdPDPStatus.class) {
 				// Adjust the url and properties appropriately
-				String pdpID =((EcompPDP)content).getId(); 
+				String pdpID =((OnapPDP)content).getId(); 
 				fullURL = pdpID + "?type=Status";
 				content = null;
 				if(CheckPDP.validateID(pdpID)){
diff --git a/POLICY-SDK-APP/src/main/java/org/openecomp/policy/components/HumanPolicyComponent.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/components/HumanPolicyComponent.java
index 5b4fdeb02..a0f1ba86d 100644
--- a/POLICY-SDK-APP/src/main/java/org/openecomp/policy/components/HumanPolicyComponent.java
+++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/components/HumanPolicyComponent.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.components;
+package org.onap.policy.components;
 
 
 import java.io.ByteArrayOutputStream;
@@ -39,13 +39,13 @@ import javax.xml.bind.JAXBElement;
 
 import org.apache.commons.io.FilenameUtils;
 import org.json.JSONObject;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.controller.PolicyController;
-import org.openecomp.policy.rest.jpa.FunctionDefinition;
-import org.openecomp.policy.utils.XACMLPolicyWriterWithPapNotify;
-import org.openecomp.policy.xacml.api.XACMLErrorConstants;
-import org.openecomp.policy.xacml.util.XACMLPolicyScanner;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.controller.PolicyController;
+import org.onap.policy.rest.jpa.FunctionDefinition;
+import org.onap.policy.utils.XACMLPolicyWriterWithPapNotify;
+import org.onap.policy.xacml.api.XACMLErrorConstants;
+import org.onap.policy.xacml.util.XACMLPolicyScanner;
 
 import com.att.research.xacml.api.AttributeValue;
 import com.att.research.xacml.std.IdentifierImpl;
@@ -89,7 +89,7 @@ public class HumanPolicyComponent{
 		public static final String FUNTION_INTEGER_ONE_AND_ONLY = "urn:oasis:names:tc:xacml:1.0:function:integer-one-and-only";
 		public static final String FUNCTION_STRING_ONE_AND_ONLY = "urn:oasis:names:tc:xacml:1.0:function:string-one-and-only";
 		public static final String FUNCTION_STRING_EQUAL = "urn:oasis:names:tc:xacml:1.0:function:string-equal";
-		public static final String FUNCTION_STRING_REGEX_MATCH = "org.openecomp.function.regex-match";
+		public static final String FUNCTION_STRING_REGEX_MATCH = "org.onap.function.regex-match";
 		public static final String FUNCTION_STRING_EQUAL_IGNORE = "urn:oasis:names:tc:xacml:3.0:function:string-equal-ignore-case";
 		public static final String INTEGER_DATATYPE = "http://www.w3.org/2001/XMLSchema#integer";
 		public static final String BOOLEAN_DATATYPE = "http://www.w3.org/2001/XMLSchema#boolean";
diff --git a/POLICY-SDK-APP/src/main/java/org/openecomp/policy/conf/HibernateSession.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/conf/HibernateSession.java
index 22ecb0e00..d70f199f0 100644
--- a/POLICY-SDK-APP/src/main/java/org/openecomp/policy/conf/HibernateSession.java
+++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/conf/HibernateSession.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.conf;
+package org.onap.policy.conf;
 
 /*
  * 
@@ -29,10 +29,10 @@ import java.util.Properties;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
 import org.hibernate.cfg.Configuration;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.controller.PolicyController;
-import org.openecomp.policy.rest.jpa.SystemLogDB;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.controller.PolicyController;
+import org.onap.policy.rest.jpa.SystemLogDB;
 
 @SuppressWarnings("deprecation")
 public class HibernateSession{
@@ -50,7 +50,7 @@ public class HibernateSession{
 			prop.setProperty("dialect", PolicyController.getLogdbDialect());
 			prop.setProperty("hibernate.connection.driver_class", PolicyController.getLogdbDriver());	
 			prop.setProperty("show_sql", "false");	
-			logSessionFactory = new Configuration().addPackage("org.openecomp.policy.*").addProperties(prop)
+			logSessionFactory = new Configuration().addPackage("org.onap.policy.*").addProperties(prop)
 				   .addAnnotatedClass(SystemLogDB.class).buildSessionFactory();
 		} catch (Exception ex) {
 			LOGGER.error("Exception Occured while creating Log database Hibernate session"+ex);
diff --git a/POLICY-SDK-APP/src/main/java/org/openecomp/policy/controller/ActionPolicyController.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/ActionPolicyController.java
index c88412b8b..0a985045d 100644
--- a/POLICY-SDK-APP/src/main/java/org/openecomp/policy/controller/ActionPolicyController.java
+++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/ActionPolicyController.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.controller;
+package org.onap.policy.controller;
 
 
 import java.util.ArrayList;
@@ -30,8 +30,8 @@ import java.util.Map;
 
 import javax.xml.bind.JAXBElement;
 
-import org.openecomp.policy.rest.adapter.PolicyRestAdapter;
-import org.openecomp.policy.rest.jpa.PolicyEntity;
+import org.onap.policy.rest.adapter.PolicyRestAdapter;
+import org.onap.policy.rest.jpa.PolicyEntity;
 import org.openecomp.portalsdk.core.controller.RestrictedBaseController;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -50,8 +50,8 @@ import oasis.names.tc.xacml._3_0.core.schema.wd_17.ObligationExpressionsType;
 import oasis.names.tc.xacml._3_0.core.schema.wd_17.PolicyType;
 import oasis.names.tc.xacml._3_0.core.schema.wd_17.RuleType;
 import oasis.names.tc.xacml._3_0.core.schema.wd_17.TargetType;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger; 
-import org.openecomp.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.common.logging.flexlogger.FlexLogger; 
+import org.onap.policy.common.logging.flexlogger.Logger;
 
 @Controller
 @RequestMapping({"/"})
diff --git a/POLICY-SDK-APP/src/main/java/org/openecomp/policy/controller/AdminTabController.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/AdminTabController.java
index 650b5872f..820a1ebd9 100644
--- a/POLICY-SDK-APP/src/main/java/org/openecomp/policy/controller/AdminTabController.java
+++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/AdminTabController.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.controller;
+package org.onap.policy.controller;
 
 
 import java.io.PrintWriter;
@@ -29,10 +29,10 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.json.JSONObject;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.rest.dao.CommonClassDao;
-import org.openecomp.policy.rest.jpa.GlobalRoleSettings;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.rest.dao.CommonClassDao;
+import org.onap.policy.rest.jpa.GlobalRoleSettings;
 import org.openecomp.portalsdk.core.controller.RestrictedBaseController;
 import org.openecomp.portalsdk.core.web.support.JsonMessage;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/POLICY-SDK-APP/src/main/java/org/openecomp/policy/controller/AutoPushController.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/AutoPushController.java
index a4387d19a..f78a79c9c 100644
--- a/POLICY-SDK-APP/src/main/java/org/openecomp/policy/controller/AutoPushController.java
+++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/AutoPushController.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.controller;
+package org.onap.policy.controller;
 
 
 import java.io.BufferedWriter;
@@ -42,19 +42,19 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.json.JSONObject;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.model.PDPGroupContainer;
-import org.openecomp.policy.model.PDPPolicyContainer;
-import org.openecomp.policy.model.Roles;
-import org.openecomp.policy.rest.adapter.AutoPushTabAdapter;
-import org.openecomp.policy.rest.dao.CommonClassDao;
-import org.openecomp.policy.rest.jpa.PolicyEntity;
-import org.openecomp.policy.rest.jpa.PolicyVersion;
-import org.openecomp.policy.xacml.api.XACMLErrorConstants;
-import org.openecomp.policy.xacml.api.pap.EcompPDPGroup;
-import org.openecomp.policy.xacml.std.pap.StdPDPGroup;
-import org.openecomp.policy.xacml.std.pap.StdPDPPolicy;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.model.PDPGroupContainer;
+import org.onap.policy.model.PDPPolicyContainer;
+import org.onap.policy.model.Roles;
+import org.onap.policy.rest.adapter.AutoPushTabAdapter;
+import org.onap.policy.rest.dao.CommonClassDao;
+import org.onap.policy.rest.jpa.PolicyEntity;
+import org.onap.policy.rest.jpa.PolicyVersion;
+import org.onap.policy.xacml.api.XACMLErrorConstants;
+import org.onap.policy.xacml.api.pap.OnapPDPGroup;
+import org.onap.policy.xacml.std.pap.StdPDPGroup;
+import org.onap.policy.xacml.std.pap.StdPDPPolicy;
 import org.openecomp.portalsdk.core.controller.RestrictedBaseController;
 import org.openecomp.portalsdk.core.web.support.JsonMessage;
 import org.openecomp.portalsdk.core.web.support.UserUtils;
@@ -81,7 +81,7 @@ public class AutoPushController extends RestrictedBaseController{
 	CommonClassDao commonClassDao;
 
 	private PDPGroupContainer container;
-	protected List<EcompPDPGroup> groups = Collections.synchronizedList(new ArrayList<EcompPDPGroup>());
+	protected List<OnapPDPGroup> groups = Collections.synchronizedList(new ArrayList<OnapPDPGroup>());
 	
 	private PDPPolicyContainer policyContainer;
 
@@ -101,7 +101,7 @@ public class AutoPushController extends RestrictedBaseController{
 			this.groups.clear();
 			try {
 				PolicyController controller = getPolicyControllerInstance();
-				this.groups.addAll(controller.getPapEngine().getEcompPDPGroups());
+				this.groups.addAll(controller.getPapEngine().getOnapPDPGroups());
 			} catch (PAPException e) {
 				String message = "Unable to retrieve Groups from server: " + e;
 				logger.error(XACMLErrorConstants.ERROR_DATA_ISSUE + message);
@@ -178,7 +178,7 @@ public class AutoPushController extends RestrictedBaseController{
 			ArrayList<Object> selectedPDPS = new ArrayList<>();
 			ArrayList<String> selectedPoliciesInUI = new ArrayList<>();
 			PolicyController controller = getPolicyControllerInstance();
-			this.groups.addAll(controller.getPapEngine().getEcompPDPGroups());
+			this.groups.addAll(controller.getPapEngine().getOnapPDPGroups());
 			ObjectMapper mapper = new ObjectMapper();
 			this.container = new PDPGroupContainer(controller.getPapEngine());
 			mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
@@ -186,7 +186,7 @@ public class AutoPushController extends RestrictedBaseController{
 			AutoPushTabAdapter adapter = mapper.readValue(root.get("pushTabData").toString(), AutoPushTabAdapter.class);
 			for (Object pdpGroupId :  adapter.getPdpDatas()) {
 				LinkedHashMap<?, ?> selectedPDP = (LinkedHashMap<?, ?>)pdpGroupId;
-				for(EcompPDPGroup pdpGroup : this.groups){
+				for(OnapPDPGroup pdpGroup : this.groups){
 					if(pdpGroup.getId().equals(selectedPDP.get("id"))){
 						selectedPDPS.add(pdpGroup);
 					}
@@ -254,7 +254,7 @@ public class AutoPushController extends RestrictedBaseController{
 					StdPDPGroup selectedGroup = (StdPDPGroup) pdpDestinationGroupId;
 					if (selectedPolicy != null) {
 						// Add Current policies from container
-						for (EcompPDPGroup group : container.getGroups()) {
+						for (OnapPDPGroup group : container.getGroups()) {
 							if (group.getId().equals(selectedGroup.getId())) {
 								currentPoliciesInGroup.addAll(group.getPolicies());
 							}
@@ -272,7 +272,7 @@ public class AutoPushController extends RestrictedBaseController{
 				}
 				StdPDPGroup pdpGroup = (StdPDPGroup) pdpDestinationGroupId;
 				StdPDPGroup updatedGroupObject = new StdPDPGroup(pdpGroup.getId(), pdpGroup.isDefaultGroup(), pdpGroup.getName(), pdpGroup.getDescription(), pdpGroup.getDirectory());
-				updatedGroupObject.setEcompPdps(pdpGroup.getEcompPdps());
+				updatedGroupObject.setOnapPdps(pdpGroup.getOnapPdps());
 				updatedGroupObject.setPipConfigs(pdpGroup.getPipConfigs());
 				updatedGroupObject.setStatus(pdpGroup.getStatus());
 
@@ -346,7 +346,7 @@ public class AutoPushController extends RestrictedBaseController{
 				changedPolicies.addAll((Collection<PDPPolicy>) this.policyContainer.getItemIds());
 				StdPDPGroup updatedGroupObject = new StdPDPGroup(group.getId(), group.isDefaultGroup(), group.getName(), group.getDescription(),null);
 				updatedGroupObject.setPolicies(changedPolicies);
-				updatedGroupObject.setEcompPdps(group.getEcompPdps());
+				updatedGroupObject.setOnapPdps(group.getOnapPdps());
 				updatedGroupObject.setPipConfigs(group.getPipConfigs());
 				updatedGroupObject.setStatus(group.getStatus());
 				this.container.updateGroup(updatedGroupObject);
diff --git a/POLICY-SDK-APP/src/main/java/org/openecomp/policy/controller/CreateBRMSParamController.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateBRMSParamController.java
index 18ad9fc58..3107950c9 100644
--- a/POLICY-SDK-APP/src/main/java/org/openecomp/policy/controller/CreateBRMSParamController.java
+++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateBRMSParamController.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.controller;
+package org.onap.policy.controller;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -42,13 +42,13 @@ import javax.servlet.http.HttpServletResponse;
 import javax.xml.bind.JAXBElement;
 
 import org.json.JSONObject;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.rest.adapter.PolicyRestAdapter;
-import org.openecomp.policy.rest.dao.CommonClassDao;
-import org.openecomp.policy.rest.jpa.BRMSParamTemplate;
-import org.openecomp.policy.rest.jpa.PolicyEntity;
-import org.openecomp.policy.xacml.api.XACMLErrorConstants;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.rest.adapter.PolicyRestAdapter;
+import org.onap.policy.rest.dao.CommonClassDao;
+import org.onap.policy.rest.jpa.BRMSParamTemplate;
+import org.onap.policy.rest.jpa.PolicyEntity;
+import org.onap.policy.xacml.api.XACMLErrorConstants;
 import org.openecomp.portalsdk.core.controller.RestrictedBaseController;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
diff --git a/POLICY-SDK-APP/src/main/java/org/openecomp/policy/controller/CreateBRMSRawController.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateBRMSRawController.java
index c5b97ad45..9851d3165 100644
--- a/POLICY-SDK-APP/src/main/java/org/openecomp/policy/controller/CreateBRMSRawController.java
+++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateBRMSRawController.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.controller;
+package org.onap.policy.controller;
 
 
 import java.util.ArrayList;
@@ -42,10 +42,10 @@ import oasis.names.tc.xacml._3_0.core.schema.wd_17.PolicyType;
 import oasis.names.tc.xacml._3_0.core.schema.wd_17.RuleType;
 import oasis.names.tc.xacml._3_0.core.schema.wd_17.TargetType;
 
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger; 
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.rest.adapter.PolicyRestAdapter;
-import org.openecomp.policy.rest.jpa.PolicyEntity;
+import org.onap.policy.common.logging.flexlogger.FlexLogger; 
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.rest.adapter.PolicyRestAdapter;
+import org.onap.policy.rest.jpa.PolicyEntity;
 
 public class CreateBRMSRawController{
 
diff --git a/POLICY-SDK-APP/src/main/java/org/openecomp/policy/controller/CreateClosedLoopFaultController.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateClosedLoopFaultController.java
index 08c0c38e7..a7ce45ec4 100644
--- a/POLICY-SDK-APP/src/main/java/org/openecomp/policy/controller/CreateClosedLoopFaultController.java
+++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateClosedLoopFaultController.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.controller;
+package org.onap.policy.controller;
 
 
 import java.io.UnsupportedEncodingException;
@@ -29,16 +29,16 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.rest.adapter.ClosedLoopFaultBody;
-import org.openecomp.policy.rest.adapter.ClosedLoopFaultTriggerUISignatures;
-import org.openecomp.policy.rest.adapter.ClosedLoopSignatures;
-import org.openecomp.policy.rest.adapter.PolicyRestAdapter;
-import org.openecomp.policy.rest.dao.CommonClassDao;
-import org.openecomp.policy.rest.jpa.EcompName;
-import org.openecomp.policy.rest.jpa.PolicyEntity;
-import org.openecomp.policy.rest.jpa.VarbindDictionary;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.rest.adapter.ClosedLoopFaultBody;
+import org.onap.policy.rest.adapter.ClosedLoopFaultTriggerUISignatures;
+import org.onap.policy.rest.adapter.ClosedLoopSignatures;
+import org.onap.policy.rest.adapter.PolicyRestAdapter;
+import org.onap.policy.rest.dao.CommonClassDao;
+import org.onap.policy.rest.jpa.OnapName;
+import org.onap.policy.rest.jpa.PolicyEntity;
+import org.onap.policy.rest.jpa.VarbindDictionary;
 import org.openecomp.portalsdk.core.controller.RestrictedBaseController;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -544,12 +544,12 @@ public class CreateClosedLoopFaultController extends RestrictedBaseController{
 										AttributeDesignatorType designator = match.getAttributeDesignator();
 										String attributeId = designator.getAttributeId();
 										
-										// First match in the target is EcompName, so set that value.
-										if (attributeId.equals("ECOMPName")) {
-											policyAdapter.setEcompName(value);
-											EcompName ecompName = new EcompName();
-											ecompName.setEcompName(value);
-											policyAdapter.setEcompNameField(ecompName);
+										// First match in the target is OnapName, so set that value.
+										if (attributeId.equals("ONAPName")) {
+											policyAdapter.setOnapName(value);
+											OnapName onapName = new OnapName();
+											onapName.setOnapName(value);
+											policyAdapter.setOnapNameField(onapName);
 										}
 										if (attributeId.equals("RiskType")){
 											policyAdapter.setRiskType(value);
diff --git a/POLICY-SDK-APP/src/main/java/org/openecomp/policy/controller/CreateClosedLoopPMController.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateClosedLoopPMController.java
index 39850d990..a4d6014c9 100644
--- a/POLICY-SDK-APP/src/main/java/org/openecomp/policy/controller/CreateClosedLoopPMController.java
+++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateClosedLoopPMController.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.controller;
+package org.onap.policy.controller;
 
 
 import java.io.IOException;
@@ -29,12 +29,12 @@ import java.util.List;
 import javax.json.JsonArray;
 import javax.json.JsonObject;
 
-import org.openecomp.policy.admin.PolicyManagerServlet;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.rest.adapter.ClosedLoopPMBody;
-import org.openecomp.policy.rest.adapter.PolicyRestAdapter;
-import org.openecomp.policy.rest.jpa.PolicyEntity;
+import org.onap.policy.admin.PolicyManagerServlet;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.rest.adapter.ClosedLoopPMBody;
+import org.onap.policy.rest.adapter.PolicyRestAdapter;
+import org.onap.policy.rest.jpa.PolicyEntity;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
@@ -97,9 +97,9 @@ public class CreateClosedLoopPMController{
 										AttributeDesignatorType designator = match.getAttributeDesignator();
 										String attributeId = designator.getAttributeId();
 
-										// First match in the target is EcompName, so set that value.
-										if (attributeId.equals("ECOMPName")) {
-											policyAdapter.setEcompName(value);
+										// First match in the target is OnapName, so set that value.
+										if (attributeId.equals("ONAPName")) {
+											policyAdapter.setOnapName(value);
 										}
 										if (attributeId.equals("RiskType")){
 											policyAdapter.setRiskType(value);
diff --git a/POLICY-SDK-APP/src/main/java/org/openecomp/policy/controller/CreateDcaeMicroServiceController.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateDcaeMicroServiceController.java
index 777fb89e3..609a45c20 100644
--- a/POLICY-SDK-APP/src/main/java/org/openecomp/policy/controller/CreateDcaeMicroServiceController.java
+++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateDcaeMicroServiceController.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.controller;
+package org.onap.policy.controller;
 
 
 import java.io.BufferedInputStream;
@@ -61,17 +61,17 @@ import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang.StringUtils;
 import org.json.JSONArray;
 import org.json.JSONObject;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.rest.XACMLRestProperties;
-import org.openecomp.policy.rest.adapter.PolicyRestAdapter;
-import org.openecomp.policy.rest.dao.CommonClassDao;
-import org.openecomp.policy.rest.jpa.GroupPolicyScopeList;
-import org.openecomp.policy.rest.jpa.MicroServiceModels;
-import org.openecomp.policy.rest.jpa.PolicyEntity;
-import org.openecomp.policy.rest.util.MSAttributeObject;
-import org.openecomp.policy.rest.util.MSModelUtils;
-import org.openecomp.policy.rest.util.MSModelUtils.MODEL_TYPE;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.rest.XACMLRestProperties;
+import org.onap.policy.rest.adapter.PolicyRestAdapter;
+import org.onap.policy.rest.dao.CommonClassDao;
+import org.onap.policy.rest.jpa.GroupPolicyScopeList;
+import org.onap.policy.rest.jpa.MicroServiceModels;
+import org.onap.policy.rest.jpa.PolicyEntity;
+import org.onap.policy.rest.util.MSAttributeObject;
+import org.onap.policy.rest.util.MSModelUtils;
+import org.onap.policy.rest.util.MSModelUtils.MODEL_TYPE;
 import org.openecomp.portalsdk.core.controller.RestrictedBaseController;
 import org.openecomp.portalsdk.core.web.support.JsonMessage;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -1100,9 +1100,9 @@ public class CreateDcaeMicroServiceController extends RestrictedBaseController {
 										String value = (String) attributeValue.getContent().get(0);
 										AttributeDesignatorType designator = match.getAttributeDesignator();
 										String attributeId = designator.getAttributeId();
-										// First match in the target is EcompName, so set that value.
-										if (attributeId.equals("ECOMPName")) {
-											policyAdapter.setEcompName(value);
+										// First match in the target is OnapName, so set that value.
+										if (attributeId.equals("ONAPName")) {
+											policyAdapter.setOnapName(value);
 										}
 										if (attributeId.equals("ConfigName")){
 											policyAdapter.setConfigName(value);
@@ -1438,7 +1438,7 @@ public class CreateDcaeMicroServiceController extends RestrictedBaseController {
 	
 	private void retreiveDependency(String workingFile, Boolean modelClass) {
 		
-		MSModelUtils utils = new MSModelUtils(PolicyController.getMsEcompName(), PolicyController.getMsPolicyName());
+		MSModelUtils utils = new MSModelUtils(PolicyController.getMsOnapName(), PolicyController.getMsPolicyName());
 	    HashMap<String, MSAttributeObject> tempMap = new HashMap<>();
 	    
 	    tempMap = utils.processEpackage(workingFile, MODEL_TYPE.XMI);
diff --git a/POLICY-SDK-APP/src/main/java/org/openecomp/policy/controller/CreateFirewallController.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateFirewallController.java
index 2232da608..828bc3886 100644
--- a/POLICY-SDK-APP/src/main/java/org/openecomp/policy/controller/CreateFirewallController.java
+++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateFirewallController.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.controller;
+package org.onap.policy.controller;
 import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -34,34 +34,34 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.hibernate.SessionFactory;
 import org.json.JSONObject;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.rest.adapter.AddressGroupJson;
-import org.openecomp.policy.rest.adapter.AddressJson;
-import org.openecomp.policy.rest.adapter.AddressMembers;
-import org.openecomp.policy.rest.adapter.DeployNowJson;
-import org.openecomp.policy.rest.adapter.IdMap;
-import org.openecomp.policy.rest.adapter.PolicyRestAdapter;
-import org.openecomp.policy.rest.adapter.PrefixIPList;
-import org.openecomp.policy.rest.adapter.ServiceGroupJson;
-import org.openecomp.policy.rest.adapter.ServiceListJson;
-import org.openecomp.policy.rest.adapter.ServiceMembers;
-import org.openecomp.policy.rest.adapter.ServicesJson;
-import org.openecomp.policy.rest.adapter.TagDefines;
-import org.openecomp.policy.rest.adapter.Tags;
-import org.openecomp.policy.rest.adapter.Term;
-import org.openecomp.policy.rest.adapter.TermCollector;
-import org.openecomp.policy.rest.adapter.VendorSpecificData;
-import org.openecomp.policy.rest.dao.CommonClassDao;
-import org.openecomp.policy.rest.jpa.AddressGroup;
-import org.openecomp.policy.rest.jpa.FWTagPicker;
-import org.openecomp.policy.rest.jpa.GroupServiceList;
-import org.openecomp.policy.rest.jpa.PolicyEntity;
-import org.openecomp.policy.rest.jpa.PrefixList;
-import org.openecomp.policy.rest.jpa.SecurityZone;
-import org.openecomp.policy.rest.jpa.ServiceList;
-import org.openecomp.policy.rest.jpa.TermList;
-import org.openecomp.policy.xacml.api.XACMLErrorConstants;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.rest.adapter.AddressGroupJson;
+import org.onap.policy.rest.adapter.AddressJson;
+import org.onap.policy.rest.adapter.AddressMembers;
+import org.onap.policy.rest.adapter.DeployNowJson;
+import org.onap.policy.rest.adapter.IdMap;
+import org.onap.policy.rest.adapter.PolicyRestAdapter;
+import org.onap.policy.rest.adapter.PrefixIPList;
+import org.onap.policy.rest.adapter.ServiceGroupJson;
+import org.onap.policy.rest.adapter.ServiceListJson;
+import org.onap.policy.rest.adapter.ServiceMembers;
+import org.onap.policy.rest.adapter.ServicesJson;
+import org.onap.policy.rest.adapter.TagDefines;
+import org.onap.policy.rest.adapter.Tags;
+import org.onap.policy.rest.adapter.Term;
+import org.onap.policy.rest.adapter.TermCollector;
+import org.onap.policy.rest.adapter.VendorSpecificData;
+import org.onap.policy.rest.dao.CommonClassDao;
+import org.onap.policy.rest.jpa.AddressGroup;
+import org.onap.policy.rest.jpa.FWTagPicker;
+import org.onap.policy.rest.jpa.GroupServiceList;
+import org.onap.policy.rest.jpa.PolicyEntity;
+import org.onap.policy.rest.jpa.PrefixList;
+import org.onap.policy.rest.jpa.SecurityZone;
+import org.onap.policy.rest.jpa.ServiceList;
+import org.onap.policy.rest.jpa.TermList;
+import org.onap.policy.xacml.api.XACMLErrorConstants;
 import org.openecomp.portalsdk.core.controller.RestrictedBaseController;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
diff --git a/POLICY-SDK-APP/src/main/java/org/openecomp/policy/controller/CreatePolicyController.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreatePolicyController.java
index 5049d2652..9c07876c1 100644
--- a/POLICY-SDK-APP/src/main/java/org/openecomp/policy/controller/CreatePolicyController.java
+++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreatePolicyController.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.controller;
+package org.onap.policy.controller;
 
 
 import java.util.ArrayList;
@@ -27,8 +27,8 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
-import org.openecomp.policy.rest.adapter.PolicyRestAdapter;
-import org.openecomp.policy.rest.jpa.PolicyEntity;
+import org.onap.policy.rest.adapter.PolicyRestAdapter;
+import org.onap.policy.rest.jpa.PolicyEntity;
 import org.openecomp.portalsdk.core.controller.RestrictedBaseController;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -113,9 +113,9 @@ public class CreatePolicyController extends RestrictedBaseController{
 										String value = (String) attributeValue.getContent().get(0);
 										AttributeDesignatorType designator = match.getAttributeDesignator();
 										String attributeId = designator.getAttributeId();
-										// First match in the target is EcompName, so set that value.
-										if (attributeId.equals("ECOMPName")) {
-											policyAdapter.setEcompName(value);
+										// First match in the target is OnapName, so set that value.
+										if (attributeId.equals("ONAPName")) {
+											policyAdapter.setOnapName(value);
 										}
 										if (attributeId.equals("RiskType")){
 											policyAdapter.setRiskType(value);
@@ -133,7 +133,7 @@ public class CreatePolicyController extends RestrictedBaseController{
 										if (attributeId.equals("ConfigName")){
 											policyAdapter.setConfigName(value);
 										}
-										// After Ecomp and Config it is optional to have attributes, so
+										// After Onap and Config it is optional to have attributes, so
 										// check weather dynamic values or there or not.
 										if (index >= 7) {
 											Map<String, String> attribute = new HashMap<>();
diff --git a/POLICY-SDK-APP/src/main/java/org/openecomp/policy/controller/DashboardController.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/DashboardController.java
index 230bbe611..d6d4a2c69 100644
--- a/POLICY-SDK-APP/src/main/java/org/openecomp/policy/controller/DashboardController.java
+++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/DashboardController.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.controller;
+package org.onap.policy.controller;
 
 
 import java.io.IOException;
@@ -44,10 +44,10 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.json.JSONObject;
-import org.openecomp.policy.dao.SystemLogDbDao;
-import org.openecomp.policy.model.PDPGroupContainer;
-import org.openecomp.policy.rest.XACMLRestProperties;
-import org.openecomp.policy.rest.dao.CommonClassDao;
+import org.onap.policy.dao.SystemLogDbDao;
+import org.onap.policy.model.PDPGroupContainer;
+import org.onap.policy.rest.XACMLRestProperties;
+import org.onap.policy.rest.dao.CommonClassDao;
 import org.openecomp.portalsdk.core.controller.RestrictedBaseController;
 import org.openecomp.portalsdk.core.web.support.JsonMessage;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -55,12 +55,12 @@ import org.springframework.http.MediaType;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
 import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
-import org.openecomp.policy.xacml.api.XACMLErrorConstants;
-import org.openecomp.policy.xacml.api.pap.EcompPDP;
-import org.openecomp.policy.xacml.api.pap.EcompPDPGroup;
+import org.onap.policy.xacml.api.XACMLErrorConstants;
+import org.onap.policy.xacml.api.pap.OnapPDP;
+import org.onap.policy.xacml.api.pap.OnapPDPGroup;
 
 import com.att.research.xacml.api.pap.PAPException;
 import com.att.research.xacml.api.pap.PDP;
@@ -192,7 +192,7 @@ public class DashboardController  extends RestrictedBaseController{
 		String papStatus = null;
 		try {
 			PolicyController controller = getPolicyControllerInstance();
-			Set<EcompPDPGroup> groups = controller.getPapEngine().getEcompPDPGroups();
+			Set<OnapPDPGroup> groups = controller.getPapEngine().getOnapPDPGroups();
 			if (groups == null) {
 				papStatus = "UNKNOWN";
 				throw new PAPException("PAP not running");		
@@ -226,9 +226,9 @@ public class DashboardController  extends RestrictedBaseController{
 		for (PDPGroup group : this.pdpConatiner.getGroups()){	
 			for (PDP pdp : group.getPdps()){
 				naCount = -1;
-				if ("UP_TO_DATE".equals(pdp.getStatus().getStatus().toString())  && ((EcompPDP) pdp).getJmxPort() != 0){
+				if ("UP_TO_DATE".equals(pdp.getStatus().getStatus().toString())  && ((OnapPDP) pdp).getJmxPort() != 0){
 					String pdpIpAddress = parseIPSystem(pdp.getId());
-					int port = ((EcompPDP) pdp).getJmxPort();
+					int port = ((OnapPDP) pdp).getJmxPort();
 					if (port != 0){
 						policyLogger.debug("Getting JMX Response Counts from " + pdpIpAddress + " at JMX port " + port);
 						naCount = getRequestCounts(pdpIpAddress, port, "pdpEvaluationNA");
@@ -339,9 +339,9 @@ public class DashboardController  extends RestrictedBaseController{
 			for (PDP pdp : group.getPdps()){		
 				// Add rows to the Policy Table
 				policyList = null;
-				if ("UP_TO_DATE".equals(pdp.getStatus().getStatus().toString()) && ((EcompPDP) pdp).getJmxPort() != 0){
+				if ("UP_TO_DATE".equals(pdp.getStatus().getStatus().toString()) && ((OnapPDP) pdp).getJmxPort() != 0){
 					String pdpIpAddress = parseIPSystem(pdp.getId());
-					policyList = getPolicy(pdpIpAddress, ((EcompPDP) pdp).getJmxPort(), "policyCount");
+					policyList = getPolicy(pdpIpAddress, ((OnapPDP) pdp).getJmxPort(), "policyCount");
 				}
 				if (policyList != null && policyList.toString().length() > 3){
 					String[]  splitPolicy = policyList.toString().split(",");
diff --git a/POLICY-SDK-APP/src/main/java/org/openecomp/policy/controller/DecisionPolicyController.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/DecisionPolicyController.java
index f959495c6..45369ce2f 100644
--- a/POLICY-SDK-APP/src/main/java/org/openecomp/policy/controller/DecisionPolicyController.java
+++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/DecisionPolicyController.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.controller;
+package org.onap.policy.controller;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -30,12 +30,12 @@ import java.util.Map;
 
 import javax.xml.bind.JAXBElement;
 
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.rest.adapter.PolicyRestAdapter;
-import org.openecomp.policy.rest.adapter.RainyDayParams;
-import org.openecomp.policy.rest.adapter.YAMLParams;
-import org.openecomp.policy.rest.jpa.PolicyEntity;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.rest.adapter.PolicyRestAdapter;
+import org.onap.policy.rest.adapter.RainyDayParams;
+import org.onap.policy.rest.adapter.YAMLParams;
+import org.onap.policy.rest.jpa.PolicyEntity;
 import org.openecomp.portalsdk.core.controller.RestrictedBaseController;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -122,9 +122,9 @@ public class DecisionPolicyController extends RestrictedBaseController {
 										String value = (String) attributeValue.getContent().get(0);
 										AttributeDesignatorType designator = match.getAttributeDesignator();
 										String attributeId = designator.getAttributeId();
-										// First match in the target is EcompName, so set that value.
-										if (attributeId.equals("ECOMPName")) {
-											policyAdapter.setEcompName(value);
+										// First match in the target is OnapName, so set that value.
+										if (attributeId.equals("ONAPName")) {
+											policyAdapter.setOnapName(value);
 										}
 										// Component attributes are saved under Target here we are fetching  them back.
 										// One row is default so we are not adding dynamic component at index 0.
diff --git a/POLICY-SDK-APP/src/main/java/org/openecomp/policy/controller/PDPController.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/PDPController.java
index c2c0bc867..0f8a3c988 100644
--- a/POLICY-SDK-APP/src/main/java/org/openecomp/policy/controller/PDPController.java
+++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/PDPController.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.controller;
+package org.onap.policy.controller;
 
 
 import java.io.File;
@@ -34,14 +34,14 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.json.JSONObject;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.model.PDPGroupContainer;
-import org.openecomp.policy.model.Roles;
-import org.openecomp.policy.xacml.api.XACMLErrorConstants;
-import org.openecomp.policy.xacml.api.pap.EcompPDPGroup;
-import org.openecomp.policy.xacml.std.pap.StdPDP;
-import org.openecomp.policy.xacml.std.pap.StdPDPGroup;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.model.PDPGroupContainer;
+import org.onap.policy.model.Roles;
+import org.onap.policy.xacml.api.XACMLErrorConstants;
+import org.onap.policy.xacml.api.pap.OnapPDPGroup;
+import org.onap.policy.xacml.std.pap.StdPDP;
+import org.onap.policy.xacml.std.pap.StdPDPGroup;
 import org.openecomp.portalsdk.core.controller.RestrictedBaseController;
 import org.openecomp.portalsdk.core.web.support.JsonMessage;
 import org.openecomp.portalsdk.core.web.support.UserUtils;
@@ -60,14 +60,14 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 public class PDPController extends RestrictedBaseController {
 	private static final  Logger policyLogger = FlexLogger.getLogger(PDPController.class);
 
-	protected List<EcompPDPGroup> groups = Collections.synchronizedList(new ArrayList<EcompPDPGroup>());
+	protected List<OnapPDPGroup> groups = Collections.synchronizedList(new ArrayList<OnapPDPGroup>());
 	private PDPGroupContainer container;
 
 	private static String SUPERADMIN = "super-admin";
 	private static String SUPEREDITOR = "super-editor";
 	private static String SUPERGUEST = "super-guest";
 
-	private Set<EcompPDPGroup> groupsData;
+	private Set<OnapPDPGroup> groupsData;
 
 	private boolean junit = false;
 
@@ -108,19 +108,19 @@ public class PDPController extends RestrictedBaseController {
 				}
 				if (roles.contains(SUPERADMIN) || roles.contains(SUPEREDITOR) || roles.contains(SUPERGUEST) ) {
 					if(!junit){
-						this.groups.addAll(controller.getPapEngine().getEcompPDPGroups());
+						this.groups.addAll(controller.getPapEngine().getOnapPDPGroups());
 					}else{
 						this.groups.addAll(this.getGroupsData());
 					}	
 				}else{
 					if(!userRoles.isEmpty()){
 						if(!scopes.isEmpty()){
-							this.groups.addAll(controller.getPapEngine().getEcompPDPGroups());
-							List<EcompPDPGroup> tempGroups = new ArrayList<>();
+							this.groups.addAll(controller.getPapEngine().getOnapPDPGroups());
+							List<OnapPDPGroup> tempGroups = new ArrayList<>();
 							if(!groups.isEmpty()){
-								Iterator<EcompPDPGroup> pdpGroup = groups.iterator();
+								Iterator<OnapPDPGroup> pdpGroup = groups.iterator();
 								while(pdpGroup.hasNext()){
-									EcompPDPGroup group = pdpGroup.next();
+									OnapPDPGroup group = pdpGroup.next();
 									Set<PDPPolicy> policies = group.getPolicies();
 									for(PDPPolicy policy : policies){
 										for(String scope : scopes){
@@ -352,11 +352,11 @@ public class PDPController extends RestrictedBaseController {
 		this.junit = junit;
 	}
 
-	public Set<EcompPDPGroup> getGroupsData() {
+	public Set<OnapPDPGroup> getGroupsData() {
 		return groupsData;
 	}
 
-	public void setGroupsData(Set<EcompPDPGroup> groupsData) {
+	public void setGroupsData(Set<OnapPDPGroup> groupsData) {
 		this.groupsData = groupsData;
 	}
 }
diff --git a/POLICY-SDK-APP/src/main/java/org/openecomp/policy/controller/PolicyController.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/PolicyController.java
index f89687493..aa1918967 100644
--- a/POLICY-SDK-APP/src/main/java/org/openecomp/policy/controller/PolicyController.java
+++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/PolicyController.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.controller;
+package org.onap.policy.controller;
 
 
 import java.io.File;
@@ -37,18 +37,18 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.json.JSONObject;
-import org.openecomp.policy.admin.PolicyNotificationMail;
-import org.openecomp.policy.admin.RESTfulPAPEngine;
-import org.openecomp.policy.model.PDPGroupContainer;
-import org.openecomp.policy.model.Roles;
-import org.openecomp.policy.rest.XACMLRestProperties;
-import org.openecomp.policy.rest.XacmlAdminAuthorization;
-import org.openecomp.policy.rest.dao.CommonClassDao;
-import org.openecomp.policy.rest.jpa.Datatype;
-import org.openecomp.policy.rest.jpa.FunctionDefinition;
-import org.openecomp.policy.rest.jpa.PolicyEntity;
-import org.openecomp.policy.rest.jpa.PolicyVersion;
-import org.openecomp.policy.rest.jpa.UserInfo;
+import org.onap.policy.admin.PolicyNotificationMail;
+import org.onap.policy.admin.RESTfulPAPEngine;
+import org.onap.policy.model.PDPGroupContainer;
+import org.onap.policy.model.Roles;
+import org.onap.policy.rest.XACMLRestProperties;
+import org.onap.policy.rest.XacmlAdminAuthorization;
+import org.onap.policy.rest.dao.CommonClassDao;
+import org.onap.policy.rest.jpa.Datatype;
+import org.onap.policy.rest.jpa.FunctionDefinition;
+import org.onap.policy.rest.jpa.PolicyEntity;
+import org.onap.policy.rest.jpa.PolicyVersion;
+import org.onap.policy.rest.jpa.UserInfo;
 import org.openecomp.portalsdk.core.controller.RestrictedBaseController;
 import org.openecomp.portalsdk.core.web.support.JsonMessage;
 import org.openecomp.portalsdk.core.web.support.UserUtils;
@@ -59,14 +59,14 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.servlet.ModelAndView;
 
-import org.openecomp.policy.xacml.api.XACMLErrorConstants;
-import org.openecomp.policy.xacml.api.pap.PAPPolicyEngine;
+import org.onap.policy.xacml.api.XACMLErrorConstants;
+import org.onap.policy.xacml.api.pap.PAPPolicyEngine;
 
 import com.att.research.xacml.util.XACMLProperties;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger; 
-import org.openecomp.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.common.logging.flexlogger.FlexLogger; 
+import org.onap.policy.common.logging.flexlogger.Logger;
 
 
 @Controller
@@ -138,7 +138,7 @@ public class PolicyController extends RestrictedBaseController {
 	private static String papUrl;
 	
 	//MicroService Model Properties
-	private static String msEcompName;
+	private static String msOnapName;
 	private static String msPolicyName;
 	
 	//WebApp directories
@@ -164,18 +164,18 @@ public class PolicyController extends RestrictedBaseController {
 			//pap url
 			setPapUrl(prop.getProperty("xacml.rest.pap.url")); 
 			// get the property values
-			setSmtpHost(prop.getProperty("ecomp.smtp.host"));
-			setSmtpPort(prop.getProperty("ecomp.smtp.port"));
-			setSmtpUsername(prop.getProperty("ecomp.smtp.userName"));
-			setSmtpPassword(prop.getProperty("ecomp.smtp.password"));
-			setSmtpApplicationName(prop.getProperty("ecomp.application.name"));
-			setSmtpEmailExtension(prop.getProperty("ecomp.smtp.emailExtension"));
+			setSmtpHost(prop.getProperty("onap.smtp.host"));
+			setSmtpPort(prop.getProperty("onap.smtp.port"));
+			setSmtpUsername(prop.getProperty("onap.smtp.userName"));
+			setSmtpPassword(prop.getProperty("onap.smtp.password"));
+			setSmtpApplicationName(prop.getProperty("onap.application.name"));
+			setSmtpEmailExtension(prop.getProperty("onap.smtp.emailExtension"));
 			//Log Database Properties
 			setLogdbDriver(prop.getProperty("xacml.log.db.driver"));
 			setLogdbUrl(prop.getProperty("xacml.log.db.url"));
 			setLogdbUserName(prop.getProperty("xacml.log.db.user"));
 			setLogdbPassword(prop.getProperty("xacml.log.db.password"));
-			setLogdbDialect(prop.getProperty("ecomp.dialect"));
+			setLogdbDialect(prop.getProperty("onap.dialect"));
 			//Xacml Database Properties
 			setXacmldbUrl(prop.getProperty("javax.persistence.jdbc.url"));
 			setXacmldbUserName(prop.getProperty("javax.persistence.jdbc.user"));
@@ -187,15 +187,15 @@ public class PolicyController extends RestrictedBaseController {
 			setAutoPushDSMicroservice(prop.getProperty("xacml.autopush.microservice"));
 			setAutoPushPDPGroup(prop.getProperty("xacml.autopush.pdpGroup"));
 			//Micro Service Properties
-			setMsEcompName(prop.getProperty("xacml.policy.msEcompName"));
+			setMsOnapName(prop.getProperty("xacml.policy.msOnapName"));
 			setMsPolicyName(prop.getProperty("xacml.policy.msPolicyName"));
 			//WebApp directories
 			setConfigHome(prop.getProperty("xacml.rest.config.webapps") + "Config");
 			setActionHome(prop.getProperty("xacml.rest.config.webapps") + "Action");
 			//Get the Property Values for Dashboard tab Limit 
 			try{
-				setLogTableLimit(prop.getProperty("xacml.ecomp.dashboard.logTableLimit"));
-				setSystemAlertTableLimit(prop.getProperty("xacml.ecomp.dashboard.systemAlertTableLimit"));
+				setLogTableLimit(prop.getProperty("xacml.onap.dashboard.logTableLimit"));
+				setSystemAlertTableLimit(prop.getProperty("xacml.onap.dashboard.systemAlertTableLimit"));
 			}catch(Exception e){
 				policyLogger.error(XACMLErrorConstants.ERROR_DATA_ISSUE+"Dashboard tab Property fields are missing" +e);
 				setLogTableLimit("5000");
@@ -641,12 +641,12 @@ public class PolicyController extends RestrictedBaseController {
 		PolicyController.papUrl = papUrl;
 	}
 
-	public static String getMsEcompName() {
-		return msEcompName;
+	public static String getMsOnapName() {
+		return msOnapName;
 	}
 
-	public static void setMsEcompName(String msEcompName) {
-		PolicyController.msEcompName = msEcompName;
+	public static void setMsOnapName(String msOnapName) {
+		PolicyController.msOnapName = msOnapName;
 	}
 
 	public static String getMsPolicyName() {
diff --git a/POLICY-SDK-APP/src/main/java/org/openecomp/policy/controller/PolicyExportAndImportController.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/PolicyExportAndImportController.java
index 8fe2d492f..92794dda9 100644
--- a/POLICY-SDK-APP/src/main/java/org/openecomp/policy/controller/PolicyExportAndImportController.java
+++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/PolicyExportAndImportController.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.controller;
+package org.onap.policy.controller;
 
 
 import java.io.File;
@@ -43,18 +43,18 @@ import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.json.JSONObject;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.model.Roles;
-import org.openecomp.policy.rest.adapter.PolicyExportAdapter;
-import org.openecomp.policy.rest.dao.CommonClassDao;
-import org.openecomp.policy.rest.jpa.ActionBodyEntity;
-import org.openecomp.policy.rest.jpa.ConfigurationDataEntity;
-import org.openecomp.policy.rest.jpa.PolicyEditorScopes;
-import org.openecomp.policy.rest.jpa.PolicyEntity;
-import org.openecomp.policy.rest.jpa.PolicyVersion;
-import org.openecomp.policy.rest.jpa.UserInfo;
-import org.openecomp.policy.xacml.api.XACMLErrorConstants;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.model.Roles;
+import org.onap.policy.rest.adapter.PolicyExportAdapter;
+import org.onap.policy.rest.dao.CommonClassDao;
+import org.onap.policy.rest.jpa.ActionBodyEntity;
+import org.onap.policy.rest.jpa.ConfigurationDataEntity;
+import org.onap.policy.rest.jpa.PolicyEditorScopes;
+import org.onap.policy.rest.jpa.PolicyEntity;
+import org.onap.policy.rest.jpa.PolicyVersion;
+import org.onap.policy.rest.jpa.UserInfo;
+import org.onap.policy.xacml.api.XACMLErrorConstants;
 import org.openecomp.portalsdk.core.controller.RestrictedBaseController;
 import org.openecomp.portalsdk.core.web.support.UserUtils;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/POLICY-SDK-APP/src/main/java/org/openecomp/policy/controller/PolicyNotificationController.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/PolicyNotificationController.java
index 768158453..f3291a79b 100644
--- a/POLICY-SDK-APP/src/main/java/org/openecomp/policy/controller/PolicyNotificationController.java
+++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/PolicyNotificationController.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.controller;
+package org.onap.policy.controller;
 
 
 /*
@@ -32,8 +32,8 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.json.JSONObject;
-import org.openecomp.policy.rest.dao.CommonClassDao;
-import org.openecomp.policy.rest.jpa.WatchPolicyNotificationTable;
+import org.onap.policy.rest.dao.CommonClassDao;
+import org.onap.policy.rest.jpa.WatchPolicyNotificationTable;
 import org.openecomp.portalsdk.core.controller.RestrictedBaseController;
 import org.openecomp.portalsdk.core.web.support.UserUtils;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/POLICY-SDK-APP/src/main/java/org/openecomp/policy/controller/PolicyRolesController.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/PolicyRolesController.java
index 219342063..6f8b3de8e 100644
--- a/POLICY-SDK-APP/src/main/java/org/openecomp/policy/controller/PolicyRolesController.java
+++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/PolicyRolesController.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.controller;
+package org.onap.policy.controller;
 
 
 import java.io.PrintWriter;
@@ -31,12 +31,12 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.json.JSONObject;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.rest.dao.CommonClassDao;
-import org.openecomp.policy.rest.jpa.PolicyEditorScopes;
-import org.openecomp.policy.rest.jpa.PolicyRoles;
-import org.openecomp.policy.rest.jpa.UserInfo;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.rest.dao.CommonClassDao;
+import org.onap.policy.rest.jpa.PolicyEditorScopes;
+import org.onap.policy.rest.jpa.PolicyRoles;
+import org.onap.policy.rest.jpa.UserInfo;
 import org.openecomp.portalsdk.core.controller.RestrictedBaseController;
 import org.openecomp.portalsdk.core.web.support.JsonMessage;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/POLICY-SDK-APP/src/main/java/org/openecomp/policy/controller/PolicyValidationController.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/PolicyValidationController.java
index 0f8b3795f..5fb0c1a7e 100644
--- a/POLICY-SDK-APP/src/main/java/org/openecomp/policy/controller/PolicyValidationController.java
+++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/PolicyValidationController.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.controller;
+package org.onap.policy.controller;
 
 
 import java.io.ByteArrayInputStream;
@@ -47,15 +47,15 @@ import javax.xml.parsers.SAXParserFactory;
 import org.apache.commons.lang.StringUtils;
 import org.dom4j.util.XMLErrorHandler;
 import org.json.JSONObject;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.rest.adapter.ClosedLoopFaultBody;
-import org.openecomp.policy.rest.adapter.ClosedLoopPMBody;
-import org.openecomp.policy.rest.adapter.PolicyRestAdapter;
-import org.openecomp.policy.rest.dao.CommonClassDao;
-import org.openecomp.policy.rest.jpa.MicroServiceModels;
-import org.openecomp.policy.rest.jpa.SafePolicyWarning;
-import org.openecomp.policy.utils.PolicyUtils;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.rest.adapter.ClosedLoopFaultBody;
+import org.onap.policy.rest.adapter.ClosedLoopPMBody;
+import org.onap.policy.rest.adapter.PolicyRestAdapter;
+import org.onap.policy.rest.dao.CommonClassDao;
+import org.onap.policy.rest.jpa.MicroServiceModels;
+import org.onap.policy.rest.jpa.SafePolicyWarning;
+import org.onap.policy.utils.PolicyUtils;
 import org.openecomp.portalsdk.core.controller.RestrictedBaseController;
 import org.openecomp.portalsdk.core.web.support.JsonMessage;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -126,14 +126,14 @@ public class PolicyValidationController extends RestrictedBaseController {
 			if(policyData.getPolicyType().equals(CONFIG_POLICY)){
 				if (policyData.getConfigPolicyType().equals("Base") || policyData.getConfigPolicyType().equals(CLOSEDLOOP_POLICY) 
 						||  policyData.getConfigPolicyType().equals(CLOSEDLOOP_PM) || policyData.getConfigPolicyType().equals(ENFORCER_CONFIG_POLICY) || policyData.getConfigPolicyType().equals(MICROSERVICES)) {
-					if(policyData.getEcompName() != null){
-						String ecompNameValidate = emptyValidator(policyData.getEcompName());
-						if(!ecompNameValidate.contains("success")){
-							responseString.append("EcompName:" +  ecompNameValidate + "<br>");
+					if(policyData.getOnapName() != null){
+						String onapNameValidate = emptyValidator(policyData.getOnapName());
+						if(!onapNameValidate.contains("success")){
+							responseString.append("OnapName:" +  onapNameValidate + "<br>");
 							valid = false;
 						}
 					}else{
-						responseString.append("Ecomp Name: Ecomp Name Should not be empty" + "<br>");
+						responseString.append("Onap Name: Onap Name Should not be empty" + "<br>");
 						valid = false;
 					}
 				}
@@ -426,14 +426,14 @@ public class PolicyValidationController extends RestrictedBaseController {
 				}	
 			}
 			if (policyData.getPolicyType().equals(DECISION_POLICY)){
-				if(policyData.getEcompName() != null){
-					String ecompNameValidate = emptyValidator(policyData.getEcompName());
-					if(!ecompNameValidate.contains("success")){
-						responseString.append("EcompName:" +  ecompNameValidate + "<br>");
+				if(policyData.getOnapName() != null){
+					String onapNameValidate = emptyValidator(policyData.getOnapName());
+					if(!onapNameValidate.contains("success")){
+						responseString.append("OnapName:" +  onapNameValidate + "<br>");
 						valid = false;
 					}
 				}else{
-					responseString.append("Ecomp Name: Ecomp Name Should not be empty" + "<br>");
+					responseString.append("Onap Name: Onap Name Should not be empty" + "<br>");
 					valid = false;
 				}
 				
diff --git a/POLICY-SDK-APP/src/main/java/org/openecomp/policy/dao/SystemLogDbDao.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/dao/SystemLogDbDao.java
index bdfdd8f0a..9cc6314dd 100644
--- a/POLICY-SDK-APP/src/main/java/org/openecomp/policy/dao/SystemLogDbDao.java
+++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/dao/SystemLogDbDao.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,12 +18,12 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.dao;
+package org.onap.policy.dao;
 
 
 import java.util.List;
 
-import org.openecomp.policy.rest.jpa.SystemLogDB;
+import org.onap.policy.rest.jpa.SystemLogDB;
 
 
 
diff --git a/POLICY-SDK-APP/src/main/java/org/openecomp/policy/daoImp/CommonClassDaoImpl.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/daoImp/CommonClassDaoImpl.java
index 477850a11..05bf50f1b 100644
--- a/POLICY-SDK-APP/src/main/java/org/openecomp/policy/daoImp/CommonClassDaoImpl.java
+++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/daoImp/CommonClassDaoImpl.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.daoImp;
+package org.onap.policy.daoImp;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -32,11 +32,11 @@ import org.hibernate.criterion.Conjunction;
 import org.hibernate.criterion.Disjunction;
 import org.hibernate.criterion.Projections;
 import org.hibernate.criterion.Restrictions;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.rest.dao.CommonClassDao;
-import org.openecomp.policy.rest.jpa.PolicyRoles;
-import org.openecomp.policy.xacml.api.XACMLErrorConstants;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.rest.dao.CommonClassDao;
+import org.onap.policy.rest.jpa.PolicyRoles;
+import org.onap.policy.xacml.api.XACMLErrorConstants;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/POLICY-SDK-APP/src/main/java/org/openecomp/policy/daoImp/SystemLogDbDaoImpl.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/daoImp/SystemLogDbDaoImpl.java
index fbca821d4..4fa64ceb3 100644
--- a/POLICY-SDK-APP/src/main/java/org/openecomp/policy/daoImp/SystemLogDbDaoImpl.java
+++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/daoImp/SystemLogDbDaoImpl.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.daoImp;
+package org.onap.policy.daoImp;
 
 
 import java.util.List;
@@ -27,16 +27,16 @@ import org.hibernate.Criteria;
 import org.hibernate.Session;
 import org.springframework.stereotype.Service;
 
-import org.openecomp.policy.xacml.api.XACMLErrorConstants;
+import org.onap.policy.xacml.api.XACMLErrorConstants;
 
 import org.hibernate.Transaction;
 import org.hibernate.criterion.Restrictions;
-import org.openecomp.policy.conf.HibernateSession;
-import org.openecomp.policy.controller.PolicyController;
-import org.openecomp.policy.dao.SystemLogDbDao;
-import org.openecomp.policy.rest.jpa.SystemLogDB;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger; 
-import org.openecomp.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.conf.HibernateSession;
+import org.onap.policy.controller.PolicyController;
+import org.onap.policy.dao.SystemLogDbDao;
+import org.onap.policy.rest.jpa.SystemLogDB;
+import org.onap.policy.common.logging.flexlogger.FlexLogger; 
+import org.onap.policy.common.logging.flexlogger.Logger;
 
 
 @Service("SystemLogDbDao")
diff --git a/POLICY-SDK-APP/src/main/java/org/openecomp/policy/model/PDPGroupContainer.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/model/PDPGroupContainer.java
index d048ded99..ae2144b10 100644
--- a/POLICY-SDK-APP/src/main/java/org/openecomp/policy/model/PDPGroupContainer.java
+++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/model/PDPGroupContainer.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.model;
+package org.onap.policy.model;
 
 
 import java.awt.Checkbox;
@@ -29,14 +29,14 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
 
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.utils.PolicyContainer;
-import org.openecomp.policy.utils.PolicyItemSetChangeNotifier;
-import org.openecomp.policy.xacml.api.XACMLErrorConstants;
-import org.openecomp.policy.xacml.api.pap.EcompPDP;
-import org.openecomp.policy.xacml.api.pap.EcompPDPGroup;
-import org.openecomp.policy.xacml.api.pap.PAPPolicyEngine;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.utils.PolicyContainer;
+import org.onap.policy.utils.PolicyItemSetChangeNotifier;
+import org.onap.policy.xacml.api.XACMLErrorConstants;
+import org.onap.policy.xacml.api.pap.OnapPDP;
+import org.onap.policy.xacml.api.pap.OnapPDPGroup;
+import org.onap.policy.xacml.api.pap.PAPPolicyEngine;
 
 import com.att.research.xacml.api.pap.PAPException;
 import com.att.research.xacml.api.pap.PDP;
@@ -99,7 +99,7 @@ public class PDPGroupContainer extends PolicyItemSetChangeNotifier implements Po
 	private static Collection<String> PDP_PROPERTIES;
 
  	private PAPPolicyEngine papEngine = null;
- 	protected List<EcompPDPGroup> groups = Collections.synchronizedList(new ArrayList<EcompPDPGroup>());
+ 	protected List<OnapPDPGroup> groups = Collections.synchronizedList(new ArrayList<OnapPDPGroup>());
  	
     public PDPGroupContainer(PAPPolicyEngine papPolicyEngine) {
 		super();
@@ -115,7 +115,7 @@ public class PDPGroupContainer extends PolicyItemSetChangeNotifier implements Po
 	}
     
     public boolean isSupported(Object itemId) {
-    	if (itemId instanceof EcompPDPGroup) {
+    	if (itemId instanceof OnapPDPGroup) {
     		return true;
     	}
     	return false;
@@ -125,7 +125,7 @@ public class PDPGroupContainer extends PolicyItemSetChangeNotifier implements Po
 		synchronized(this.groups) { 
 			this.groups.clear();
 			try {
-				this.groups.addAll(this.papEngine.getEcompPDPGroups());
+				this.groups.addAll(this.papEngine.getOnapPDPGroups());
 			} catch (PAPException e) {
 				String message = "Unable to retrieve Groups from server: " + e;
 				LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + message, e);
@@ -138,11 +138,11 @@ public class PDPGroupContainer extends PolicyItemSetChangeNotifier implements Po
 		this.fireItemSetChange();
 	}
 	
-	public List<EcompPDPGroup>	getGroups() {
+	public List<OnapPDPGroup>	getGroups() {
 		return Collections.unmodifiableList(this.groups);
 	}
 	
-	public void makeDefault(EcompPDPGroup group) {
+	public void makeDefault(OnapPDPGroup group) {
 		try {
 			this.papEngine.SetDefaultGroup(group);
 		} catch (PAPException e) {
@@ -152,7 +152,7 @@ public class PDPGroupContainer extends PolicyItemSetChangeNotifier implements Po
 		return;
 	}
 	
-	public void removeGroup(EcompPDPGroup group, EcompPDPGroup newGroup) throws PAPException {
+	public void removeGroup(OnapPDPGroup group, OnapPDPGroup newGroup) throws PAPException {
 		if (LOGGER.isTraceEnabled()) {
 			LOGGER.trace("removeGroup: " + group + " new group for PDPs: " + newGroup);
 		}
@@ -167,7 +167,7 @@ public class PDPGroupContainer extends PolicyItemSetChangeNotifier implements Po
 		}
 	}
 	
-	public void removePDP(EcompPDP pdp, EcompPDPGroup group) throws PAPException {
+	public void removePDP(OnapPDP pdp, OnapPDPGroup group) throws PAPException {
 		if (LOGGER.isTraceEnabled()) {
 			LOGGER.trace("removePDP: " + pdp + " from group: " + group);
 		}
@@ -179,7 +179,7 @@ public class PDPGroupContainer extends PolicyItemSetChangeNotifier implements Po
 		}
 	}
 	
-	public void updatePDP(EcompPDP pdp) {
+	public void updatePDP(OnapPDP pdp) {
 		try {
 			papEngine.updatePDP(pdp);
 		} catch (PAPException e) {
@@ -187,7 +187,7 @@ public class PDPGroupContainer extends PolicyItemSetChangeNotifier implements Po
 		}
 	}
 	
-	public void updateGroup(EcompPDPGroup group) {
+	public void updateGroup(OnapPDPGroup group) {
 		try {
 			papEngine.updateGroup(group);
 		} catch (PAPException e) {
@@ -270,14 +270,14 @@ public class PDPGroupContainer extends PolicyItemSetChangeNotifier implements Po
 		this.papEngine.newGroup(name, description);
 	}
 	
-	public void addNewPDP(String id, EcompPDPGroup group, String name, String description, int jmxport) throws NullPointerException, PAPException {
+	public void addNewPDP(String id, OnapPDPGroup group, String name, String description, int jmxport) throws NullPointerException, PAPException {
 		if (LOGGER.isTraceEnabled()) {
 			LOGGER.trace("addNewPDP " + id + " " + name + " " + description + " " + jmxport);
 		}
 		this.papEngine.newPDP(id, group, name, description, jmxport);
 	}
 	
-	public void movePDP(EcompPDP pdp, EcompPDPGroup group) {
+	public void movePDP(OnapPDP pdp, OnapPDPGroup group) {
 		try {
 			this.papEngine.movePDP(pdp, group);
 		} catch (PAPException e) {
@@ -446,14 +446,14 @@ public class PDPGroupContainer extends PolicyItemSetChangeNotifier implements Po
 		//
 		// You cannot remove the default group
 		//
-		if (((EcompPDPGroup) itemId).getId().equals("Default")) {
+		if (((OnapPDPGroup) itemId).getId().equals("Default")) {
 			throw new UnsupportedOperationException("You can't remove the Default Group.");
 		}
 		//
 		// Remove PDPGroup and  move any PDP's in it into the default group
 		//
 		try {
-			this.papEngine.removeGroup((EcompPDPGroup) itemId, this.papEngine.getDefaultGroup());
+			this.papEngine.removeGroup((OnapPDPGroup) itemId, this.papEngine.getDefaultGroup());
 			return true;
 		} catch (NullPointerException | PAPException e) {
 			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + "Failed to remove group", e);
@@ -462,9 +462,9 @@ public class PDPGroupContainer extends PolicyItemSetChangeNotifier implements Po
 	}
 
 	public class PDPGroupItem{
-		private final EcompPDPGroup group;
+		private final OnapPDPGroup group;
 		
-		public PDPGroupItem(EcompPDPGroup itemId) {
+		public PDPGroupItem(OnapPDPGroup itemId) {
 			this.group = itemId;
 		}
 
diff --git a/POLICY-SDK-APP/src/main/java/org/openecomp/policy/model/PDPPolicyContainer.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/model/PDPPolicyContainer.java
index 1cdf7d6a3..864078439 100644
--- a/POLICY-SDK-APP/src/main/java/org/openecomp/policy/model/PDPPolicyContainer.java
+++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/model/PDPPolicyContainer.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.model;
+package org.onap.policy.model;
 
 
 import java.util.ArrayList;
@@ -27,15 +27,15 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 
-import org.openecomp.policy.utils.PolicyContainer;
-import org.openecomp.policy.utils.PolicyItemSetChangeNotifier;
-import org.openecomp.policy.common.logging.flexlogger.*;
+import org.onap.policy.utils.PolicyContainer;
+import org.onap.policy.utils.PolicyItemSetChangeNotifier;
+import org.onap.policy.common.logging.flexlogger.*;
 
-import org.openecomp.policy.xacml.api.XACMLErrorConstants;
+import org.onap.policy.xacml.api.XACMLErrorConstants;
 import com.att.research.xacml.api.pap.PDP;
 import com.att.research.xacml.api.pap.PDPGroup;
 import com.att.research.xacml.api.pap.PDPPolicy;
-import org.openecomp.policy.xacml.std.pap.StdPDPPolicy;
+import org.onap.policy.xacml.std.pap.StdPDPPolicy;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
diff --git a/POLICY-SDK-APP/src/main/java/org/openecomp/policy/model/Roles.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/model/Roles.java
index 9cb554a2a..51e78d0e5 100644
--- a/POLICY-SDK-APP/src/main/java/org/openecomp/policy/model/Roles.java
+++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/model/Roles.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.model;
+package org.onap.policy.model;
 
 
 import java.io.Serializable;
diff --git a/POLICY-SDK-APP/src/main/java/org/openecomp/policy/utils/ConfigurableRESTUtils.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/utils/ConfigurableRESTUtils.java
index 58d53a1f4..3e935dd74 100644
--- a/POLICY-SDK-APP/src/main/java/org/openecomp/policy/utils/ConfigurableRESTUtils.java
+++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/utils/ConfigurableRESTUtils.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.utils;
+package org.onap.policy.utils;
 
 
 import java.io.IOException;
@@ -28,8 +28,8 @@ import java.net.HttpURLConnection;
 import java.net.URL;
 import java.util.Map;
 
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger; 
-import org.openecomp.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.common.logging.flexlogger.FlexLogger; 
+import org.onap.policy.common.logging.flexlogger.Logger;
 
 
 public class ConfigurableRESTUtils  {
diff --git a/POLICY-SDK-APP/src/main/java/org/openecomp/policy/utils/PolicyContainer.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/utils/PolicyContainer.java
index fdca336ea..d014af031 100644
--- a/POLICY-SDK-APP/src/main/java/org/openecomp/policy/utils/PolicyContainer.java
+++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/utils/PolicyContainer.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.utils;
+package org.onap.policy.utils;
 
 import java.io.Serializable;
 import java.util.Collection;
diff --git a/POLICY-SDK-APP/src/main/java/org/openecomp/policy/utils/PolicyItemSetChangeNotifier.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/utils/PolicyItemSetChangeNotifier.java
index 934c30564..92764aa4f 100644
--- a/POLICY-SDK-APP/src/main/java/org/openecomp/policy/utils/PolicyItemSetChangeNotifier.java
+++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/utils/PolicyItemSetChangeNotifier.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.utils;
+package org.onap.policy.utils;
 
 
 import java.io.Serializable;
@@ -26,8 +26,8 @@ import java.util.Collection;
 import java.util.EventObject;
 import java.util.LinkedList;
 
-import org.openecomp.policy.utils.PolicyContainer.ItemSetChangeEvent;
-import org.openecomp.policy.utils.PolicyContainer.ItemSetChangeListener;
+import org.onap.policy.utils.PolicyContainer.ItemSetChangeEvent;
+import org.onap.policy.utils.PolicyContainer.ItemSetChangeListener;
 
 
 
diff --git a/POLICY-SDK-APP/src/main/java/org/openecomp/policy/utils/XACMLPolicyWriterWithPapNotify.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/utils/XACMLPolicyWriterWithPapNotify.java
index 0abd874f6..f3e72cb92 100644
--- a/POLICY-SDK-APP/src/main/java/org/openecomp/policy/utils/XACMLPolicyWriterWithPapNotify.java
+++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/utils/XACMLPolicyWriterWithPapNotify.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.utils;
+package org.onap.policy.utils;
 
 
 import java.io.IOException;
@@ -37,17 +37,17 @@ import java.nio.file.Path;
 import java.util.Base64;
 import java.util.UUID;
 
-import org.openecomp.policy.rest.XACMLRestProperties;
+import org.onap.policy.rest.XACMLRestProperties;
 
-import org.openecomp.policy.xacml.api.XACMLErrorConstants;
-import org.openecomp.policy.xacml.util.XACMLPolicyWriter;
+import org.onap.policy.xacml.api.XACMLErrorConstants;
+import org.onap.policy.xacml.util.XACMLPolicyWriter;
 import com.att.research.xacml.util.XACMLProperties;
 
 import oasis.names.tc.xacml._3_0.core.schema.wd_17.PolicySetType;
 import oasis.names.tc.xacml._3_0.core.schema.wd_17.PolicyType;
 
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger; 
-import org.openecomp.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.common.logging.flexlogger.FlexLogger; 
+import org.onap.policy.common.logging.flexlogger.Logger;
 
 /**
  * Helper static class that wraps XACMLPolicyWriter
diff --git a/POLICY-SDK-APP/src/main/webapp/WEB-INF/conf/system.properties b/POLICY-SDK-APP/src/main/webapp/WEB-INF/conf/system.properties
index cc0b602cc..43b2de708 100644
--- a/POLICY-SDK-APP/src/main/webapp/WEB-INF/conf/system.properties
+++ b/POLICY-SDK-APP/src/main/webapp/WEB-INF/conf/system.properties
@@ -1,4 +1,4 @@
-# Properties read by ECOMP Core library, ecompSDK-core.jar
+# Properties read by ONAP Core library, onapSDK-core.jar
 
 ##########################################################################
 # The following properties should NOT be changed by partner applications.
@@ -24,7 +24,7 @@ decryption_key				  = AGLDdG4D04BKm2IxIWEr8o==
 ##########################################################################
 #Mysql
 db.driver = com.mysql.jdbc.Driver
-db.connectionURL = jdbc:mysql://localhost:3306/ecompsdk1707
+db.connectionURL = jdbc:mysql://localhost:3306/onapsdk1707
 db.userName = root
 db.password = 
 db.hib.dialect = org.hibernate.dialect.MySQLDialect
@@ -49,8 +49,8 @@ mylogins_feed_cron            = 0 0/60 * * * ?;
 #sessiontimeout_feed_cron	  = 0 * * * * ? *
 my_login_feed_output_dir      = /tmp/MyLogins
 
-# ECOMP Portal Shared Context REST API URL
-ecomp_shared_context_rest_url= todo_add_Shared_context_rest_url
+# ONAP Portal Shared Context REST API URL
+onap_shared_context_rest_url= todo_add_Shared_context_rest_url
 
 # Link shown in Help menu
 contact_us_link = todo_Add_contact_link
@@ -60,7 +60,7 @@ camunda_cockpit_link = todo_Add_camunda_cockpit_link
 # An Unique 128-bit value defined to identify a specific version
 # of an application deployed on a specific virtual machine.
 # This value must be generated and updated by the application 
-# which is using the ECOMP SDK at the time of its deployment.
+# which is using the ONAP SDK at the time of its deployment.
 # Online Unique UUID generator - https://www.uuidgenerator.net/
 instance_uuid=8da691c9-987d-43ed-a358-00ac2f35685d
 
diff --git a/POLICY-SDK-APP/src/main/webapp/WEB-INF/fusion/orm/RNoteBookIntegration.hbm.xml b/POLICY-SDK-APP/src/main/webapp/WEB-INF/fusion/orm/RNoteBookIntegration.hbm.xml
index 6638b4bc7..984e2369b 100644
--- a/POLICY-SDK-APP/src/main/webapp/WEB-INF/fusion/orm/RNoteBookIntegration.hbm.xml
+++ b/POLICY-SDK-APP/src/main/webapp/WEB-INF/fusion/orm/RNoteBookIntegration.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
   ================================================================================
-  eCOMP Portal SDK
+  onap Portal SDK
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property
   ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/WEB-INF/index.jsp b/POLICY-SDK-APP/src/main/webapp/WEB-INF/index.jsp
index f6030c979..ac19fd94a 100644
--- a/POLICY-SDK-APP/src/main/webapp/WEB-INF/index.jsp
+++ b/POLICY-SDK-APP/src/main/webapp/WEB-INF/index.jsp
@@ -1,6 +1,6 @@
 <%--
   ================================================================================
-  eCOMP Portal SDK
+  onap Portal SDK
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property
   ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/WEB-INF/jsp/login.jsp b/POLICY-SDK-APP/src/main/webapp/WEB-INF/jsp/login.jsp
index 6e63b1256..981c42138 100644
--- a/POLICY-SDK-APP/src/main/webapp/WEB-INF/jsp/login.jsp
+++ b/POLICY-SDK-APP/src/main/webapp/WEB-INF/jsp/login.jsp
@@ -1,6 +1,6 @@
 <%--
   ================================================================================
-  eCOMP Portal SDK
+  onap Portal SDK
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property
   ================================================================================
@@ -53,8 +53,8 @@
 				<div align="center" id="errorInfo" style="display:none;float:left;font-size:12px;margin-left:5px"><span style="color:red">Invaild username or password, Please try again</span></div>
 				<br/>
 				<div align="center" style="margin-left:auto;margin-right:auto;width:40%;padding:6px;opacity:0.7;background-color:white">
-	          		<img src="static/fusion/images/ecomp_trans.png"/>
-					<h2> ECOMP Portal </h2>
+	          		<img src="static/fusion/images/onap_trans.png"/>
+					<h2> ONAP Portal </h2>
 					<label>
 						&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<label class="form-field__label">Login ID:</label>
 					</label>
diff --git a/POLICY-SDK-APP/src/main/webapp/WEB-INF/web.xml b/POLICY-SDK-APP/src/main/webapp/WEB-INF/web.xml
index 0290f1fc8..31b096049 100644
--- a/POLICY-SDK-APP/src/main/webapp/WEB-INF/web.xml
+++ b/POLICY-SDK-APP/src/main/webapp/WEB-INF/web.xml
@@ -4,7 +4,7 @@
          xmlns:web="http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
          version="3.1" xmlns="http://xmlns.jcp.org/xml/ns/javaee">
 
-	<display-name>ecomp-sdk-app-os</display-name>
+	<display-name>onap-sdk-app-os</display-name>
 
 	<!-- The app can function on a HA cluster -->
 	<distributable />
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/CSS/UIGrid/ui-grid.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/CSS/UIGrid/ui-grid.js
index 363a54596..af636803d 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/CSS/UIGrid/ui-grid.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/CSS/UIGrid/ui-grid.js
@@ -272,7 +272,7 @@ angular.module('ui.grid').directive('uiGridCell', ['$compile', '$parse', 'gridUt
           // No controller, compile the element manually (for unit tests)
           else {
             if ( uiGridCtrl && !$scope.col.compiledElementFn ){
-              // gridUtil.logError('Render has been called before precompile.  Please log a ui-grid issue');  
+              // gridUtil.logError('Render has been called before pronapile.  Please log a ui-grid issue');  
 
               $scope.col.getCompiledElementFn()
                 .then(function (compiledElementFn) {
@@ -4658,7 +4658,7 @@ angular.module('ui.grid')
  * @ngdoc function
  * @name preCompileCellTemplates
  * @methodOf ui.grid.class:Grid
- * @description precompiles all cell templates
+ * @description pronapiles all cell templates
  */
   Grid.prototype.preCompileCellTemplates = function() {
     var self = this;
@@ -8110,7 +8110,7 @@ angular.module('ui.grid')
        * <pre>  $scope.gridOptions.headerTemplate = 'header_template.html';</pre>
        * inline html
        * <pre>  $scope.gridOptions.headerTemplate = '<div class="ui-grid-top-panel" style="text-align: center">I am a Custom Grid Header</div>'</pre>
-       * or the id of a precompiled template (TBD how to use this).
+       * or the id of a pronapiled template (TBD how to use this).
        * </br>Refer to the custom header tutorial for more information.
        * If you want no header at all, you can set to an empty div:
        * <pre>  $scope.gridOptions.headerTemplate = '<div></div>';</pre>
@@ -8130,7 +8130,7 @@ angular.module('ui.grid')
        * aggregation totals.
        * When provided, this setting uses a custom footer template. Can be set to either the name of a template file 'footer_template.html', inline html
        * <pre>'<div class="ui-grid-bottom-panel" style="text-align: center">I am a Custom Grid Footer</div>'</pre>, or the id
-       * of a precompiled template (TBD how to use this).  Refer to the custom footer tutorial for more information.
+       * of a pronapiled template (TBD how to use this).  Refer to the custom footer tutorial for more information.
        */
       baseOptions.footerTemplate = baseOptions.footerTemplate || 'ui-grid/ui-grid-footer';
 
@@ -8152,7 +8152,7 @@ angular.module('ui.grid')
        * <pre> $scope.gridOptions.rowTemplate = 'row_template.html';</pre>
        * inline html
        * <pre>  $scope.gridOptions.rowTemplate = '<div style="background-color: aquamarine" ng-click="grid.appScope.fnOne(row)" ng-repeat="col in colContainer.renderedColumns track by col.colDef.name" class="ui-grid-cell" ui-grid-cell></div>';</pre>
-       * or the id of a precompiled template (TBD how to use this) can be provided.
+       * or the id of a pronapiled template (TBD how to use this) can be provided.
        * </br>Refer to the custom row template tutorial for more information.
        */
       baseOptions.rowTemplate = baseOptions.rowTemplate || 'ui-grid/ui-grid-row';
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/CSS/b2b-angular.css b/POLICY-SDK-APP/src/main/webapp/app/policyApp/CSS/b2b-angular.css
index a894691ca..a2d43a1d3 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/CSS/b2b-angular.css
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/CSS/b2b-angular.css
@@ -73,7 +73,7 @@
   .b2b-subnav-content > li li > a.active {
     color: #0574ac;
     text-decoration: none;
-    font-family: "Omnes-ECOMP-W02", Arial; } }
+    font-family: "Omnes-ONAP-W02", Arial; } }
 
 .b2b-list-box-item {
   white-space: nowrap;
@@ -404,7 +404,7 @@
       color: #009fdb;
       font-size: 18px;
       font-style: normal;
-      font-family: "Omnes-ECOMP-W02-Medium", Arial;
+      font-family: "Omnes-ONAP-W02-Medium", Arial;
       line-height: 23.9px;
       margin: 0; }
     .b2b-footer-container .footer-columns li {
@@ -414,7 +414,7 @@
     .b2b-footer-container .footer-columns li a {
       color: #fff;
       font-size: 16px;
-      font-family: "Omnes-ECOMP-W02", Arial; }
+      font-family: "Omnes-ONAP-W02", Arial; }
   .b2b-footer-container .footer-nav-content {
     padding-bottom: 10px; }
     .b2b-footer-container .footer-nav-content li {
@@ -427,7 +427,7 @@
         font-size: 14px;
         vertical-align: middle;
         margin-right: 5px;
-        font-family: "Omnes-ECOMP-W02", Arial; }
+        font-family: "Omnes-ONAP-W02", Arial; }
 
 .b2b-footer-wrapper .b2b-footer-container hr {
   background: #d2d2d2;
@@ -454,7 +454,7 @@
   color: #fff;
   font-size: 11px;
   text-align: left;
-  font-family: "Omnes-ECOMP-W02", Arial; }
+  font-family: "Omnes-ONAP-W02", Arial; }
   .b2b-footer-wrapper .copyright-text a {
     color: #fff;
     text-decoration: underline;
@@ -512,9 +512,9 @@
     top: 0;
     transition: none; }
     .btn-switch input[type="checkbox"] + .switch-overlay .btn-slider-on .activo {
-      font: 0px/0 "Omnes-ECOMP-W02", Arial; }
+      font: 0px/0 "Omnes-ONAP-W02", Arial; }
     .btn-switch input[type="checkbox"] + .switch-overlay .btn-slider-on + .btn + .btn-slider-off .inactivo {
-      font: 0px/0 "Omnes-ECOMP-W02", Arial; }
+      font: 0px/0 "Omnes-ONAP-W02", Arial; }
   .btn-switch input:checked + .switch-overlay {
     left: 0;
     transition: all .3s linear .0s; }
@@ -581,7 +581,7 @@
     .btn-switch input[type="checkbox"][disabled] + .switch-overlay .btn-slider-on .activo {
       border: medium none;
       color: #666;
-      font: 16px/32px "Omnes-ECOMP-W02", Arial;
+      font: 16px/32px "Omnes-ONAP-W02", Arial;
       height: auto;
       margin: 0 auto;
       width: auto; }
@@ -595,7 +595,7 @@
       .btn-switch input[type="checkbox"][disabled] + .switch-overlay .btn-slider-on + .switch-handle + .btn-slider-off .inactivo {
         border: medium none;
         color: #666;
-        font: 16px/32px "Omnes-ECOMP-W02", Arial;
+        font: 16px/32px "Omnes-ONAP-W02", Arial;
         height: auto;
         margin: 0 auto;
         width: auto; }
@@ -628,7 +628,7 @@
   text-align: left;
   padding-left: 12px;
   display: inline-block;
-  font-family: "Omnes-ECOMP-W02", Arial;
+  font-family: "Omnes-ONAP-W02", Arial;
   height: 32px;
   line-height: 32px;
   position: absolute;
@@ -637,7 +637,7 @@
 
 .btn-slider-off {
   display: inline-block;
-  font-family: "Omnes-ECOMP-W02", Arial;
+  font-family: "Omnes-ONAP-W02", Arial;
   height: 32px;
   line-height: 32px;
   position: absolute;
@@ -708,7 +708,7 @@
   text-align: left;
   width: auto;
   font-size: 14px;
-  font-family: "Omnes-ECOMP-W02", Arial;
+  font-family: "Omnes-ONAP-W02", Arial;
   cursor: pointer;
   padding: 0 15px 4px 15px;
   /*margin-top:-3px;*/
@@ -841,7 +841,7 @@
 
 .b2b-header-tabs .header-quarternary li {
   padding-left: 15px;
-  font-family: "Omnes-ECOMP-W02", Arial;
+  font-family: "Omnes-ONAP-W02", Arial;
   display: none; }
 
 .b2b-header-tabs .header-quarternary li.active {
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/CSS/bootstrap/docs/_includes/getting-started/download.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/CSS/bootstrap/docs/_includes/getting-started/download.html
index 290731fae..89ec1485c 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/CSS/bootstrap/docs/_includes/getting-started/download.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/CSS/bootstrap/docs/_includes/getting-started/download.html
@@ -51,9 +51,9 @@
   <p>Bootstrap's <code>package.json</code> contains some additional metadata under the following keys:</p>
   <ul>
     <li><code>less</code> - path to Bootstrap's main <a href="http://lesscss.org">Less</a> source file</li>
-    <li><code>style</code> - path to Bootstrap's non-minified CSS that's been precompiled using the default settings (no customization)</li>
+    <li><code>style</code> - path to Bootstrap's non-minified CSS that's been pronapiled using the default settings (no customization)</li>
   </ul>
 
   <h2 id="download-autoprefixer">Autoprefixer required for Less/Sass</h2>
-  <p>Bootstrap uses <a href="https://github.com/postcss/autoprefixer">Autoprefixer</a> to deal with <a href="http://webdesign.about.com/od/css/a/css-vendor-prefixes.htm">CSS vendor prefixes</a>. If you're compiling Bootstrap from its Less/Sass source and not using our Gruntfile, you'll need to integrate Autoprefixer into your build process yourself. If you're using precompiled Bootstrap or using our Gruntfile, you don't need to worry about this because Autoprefixer is already integrated into our Gruntfile.</p>
+  <p>Bootstrap uses <a href="https://github.com/postcss/autoprefixer">Autoprefixer</a> to deal with <a href="http://webdesign.about.com/od/css/a/css-vendor-prefixes.htm">CSS vendor prefixes</a>. If you're compiling Bootstrap from its Less/Sass source and not using our Gruntfile, you'll need to integrate Autoprefixer into your build process yourself. If you're using pronapiled Bootstrap or using our Gruntfile, you don't need to worry about this because Autoprefixer is already integrated into our Gruntfile.</p>
 </div>
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/CSS/bootstrap/docs/_includes/getting-started/grunt.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/CSS/bootstrap/docs/_includes/getting-started/grunt.html
index a700c2f03..f1cb18427 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/CSS/bootstrap/docs/_includes/getting-started/grunt.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/CSS/bootstrap/docs/_includes/getting-started/grunt.html
@@ -19,7 +19,7 @@
   <p>Regenerates the <code>/dist/</code> directory with compiled and minified CSS and JavaScript files. As a Bootstrap user, this is normally the command you want.</p>
 
   <h3><code>grunt watch</code> (Watch)</h3>
-  <p>Watches the Less source files and automatically recompiles them to CSS whenever you save a change.</p>
+  <p>Watches the Less source files and automatically ronapiles them to CSS whenever you save a change.</p>
 
   <h3><code>grunt test</code> (Run tests)</h3>
   <p>Runs <a href="http://jshint.com">JSHint</a> and runs the <a href="http://qunitjs.com">QUnit</a> tests headlessly in <a href="http://phantomjs.org">PhantomJS</a>.</p>
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/CSS/bootstrap/docs/_includes/getting-started/whats-included.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/CSS/bootstrap/docs/_includes/getting-started/whats-included.html
index 8aa8cf2a9..a05db45c9 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/CSS/bootstrap/docs/_includes/getting-started/whats-included.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/CSS/bootstrap/docs/_includes/getting-started/whats-included.html
@@ -8,7 +8,7 @@
     <p>Please note that <strong>all JavaScript plugins require jQuery</strong> to be included, as shown in the <a href="#template">starter template</a>. <a href="{{ site.repo }}/blob/v{{ site.current_version }}/bower.json">Consult our <code>bower.json</code></a> to see which versions of jQuery are supported.</p>
   </div>
 
-  <h2 id="whats-included-precompiled">Precompiled Bootstrap</h2>
+  <h2 id="whats-included-pronapiled">Pronapiled Bootstrap</h2>
   <p>Once downloaded, unzip the compressed folder to see the structure of (the compiled) Bootstrap. You'll see something like this:</p>
 <!-- NOTE: This info is intentionally duplicated in the README.
 Copy any changes made here over to the README too. -->
@@ -33,10 +33,10 @@ bootstrap/
 {% endhighlight %}
 <!-- NOTE: This info is intentionally duplicated in the README.
 Copy any changes made here over to the README too. -->
-  <p>This is the most basic form of Bootstrap: precompiled files for quick drop-in usage in nearly any web project. We provide compiled CSS and JS (<code>bootstrap.*</code>), as well as compiled and minified CSS and JS (<code>bootstrap.min.*</code>). CSS <a href="https://developers.google.com/chrome-developer-tools/docs/css-preprocessors">source maps</a> (<code>bootstrap.*.map</code>) are available for use with certain browsers' developer tools. Fonts from Glyphicons are included, as is the optional Bootstrap theme.</p>
+  <p>This is the most basic form of Bootstrap: pronapiled files for quick drop-in usage in nearly any web project. We provide compiled CSS and JS (<code>bootstrap.*</code>), as well as compiled and minified CSS and JS (<code>bootstrap.min.*</code>). CSS <a href="https://developers.google.com/chrome-developer-tools/docs/css-preprocessors">source maps</a> (<code>bootstrap.*.map</code>) are available for use with certain browsers' developer tools. Fonts from Glyphicons are included, as is the optional Bootstrap theme.</p>
 
   <h2 id="whats-included-source">Bootstrap source code</h2>
-  <p>The Bootstrap source code download includes the precompiled CSS, JavaScript, and font assets, along with source Less, JavaScript, and documentation. More specifically, it includes the following and more:</p>
+  <p>The Bootstrap source code download includes the pronapiled CSS, JavaScript, and font assets, along with source Less, JavaScript, and documentation. More specifically, it includes the following and more:</p>
 {% highlight bash %}
 bootstrap/
 ├── less/
@@ -49,5 +49,5 @@ bootstrap/
 └── docs/
     └── examples/
 {% endhighlight %}
-  <p>The <code>less/</code>, <code>js/</code>, and <code>fonts/</code> are the source code for our CSS, JS, and icon fonts (respectively). The <code>dist/</code> folder includes everything listed in the precompiled download section above. The <code>docs/</code> folder includes the source code for our documentation, and <code>examples/</code> of Bootstrap usage. Beyond that, any other included file provides support for packages, license information, and development.</p>
+  <p>The <code>less/</code>, <code>js/</code>, and <code>fonts/</code> are the source code for our CSS, JS, and icon fonts (respectively). The <code>dist/</code> folder includes everything listed in the pronapiled download section above. The <code>docs/</code> folder includes the source code for our documentation, and <code>examples/</code> of Bootstrap usage. Beyond that, any other included file provides support for packages, license information, and development.</p>
 </div>
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/CSS/bootstrap/docs/_includes/nav/getting-started.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/CSS/bootstrap/docs/_includes/nav/getting-started.html
index 4a07fe79c..f983d47c5 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/CSS/bootstrap/docs/_includes/nav/getting-started.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/CSS/bootstrap/docs/_includes/nav/getting-started.html
@@ -4,7 +4,7 @@
 <li>
   <a href="#whats-included">What's included</a>
   <ul class="nav">
-    <li><a href="#whats-included-precompiled">Precompiled</a></li>
+    <li><a href="#whats-included-pronapiled">Pronapiled</a></li>
     <li><a href="#whats-included-source">Source code</a></li>
   </ul>
 </li>
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/CSS/bootstrap/docs/assets/js/customize.min.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/CSS/bootstrap/docs/assets/js/customize.min.js
index 877085c06..83c69598a 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/CSS/bootstrap/docs/assets/js/customize.min.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/CSS/bootstrap/docs/assets/js/customize.min.js
@@ -58,7 +58,7 @@ Dual licenced under the MIT license or GPLv3. See https://raw.github.com/Stuk/js
 JSZip uses the library pako released under the MIT license :
 https://github.com/nodeca/pako/blob/master/LICENSE
 */
-!function(a){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=a();else if("function"==typeof define&&define.amd)define([],a);else{var b;"undefined"!=typeof window?b=window:"undefined"!=typeof global?b=global:"undefined"!=typeof self&&(b=self),b.JSZip=a()}}(function(){return function a(b,c,d){function e(g,h){if(!c[g]){if(!b[g]){var i="function"==typeof require&&require;if(!h&&i)return i(g,!0);if(f)return f(g,!0);throw new Error("Cannot find module '"+g+"'")}var j=c[g]={exports:{}};b[g][0].call(j.exports,function(a){var c=b[g][1][a];return e(c?c:a)},j,j.exports,a,b,c,d)}return c[g].exports}for(var f="function"==typeof require&&require,g=0;g<d.length;g++)e(d[g]);return e}({1:[function(a,b,c){"use strict";var d="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";c.encode=function(a){for(var b,c,e,f,g,h,i,j="",k=0;k<a.length;)b=a.charCodeAt(k++),c=a.charCodeAt(k++),e=a.charCodeAt(k++),f=b>>2,g=(3&b)<<4|c>>4,h=(15&c)<<2|e>>6,i=63&e,isNaN(c)?h=i=64:isNaN(e)&&(i=64),j=j+d.charAt(f)+d.charAt(g)+d.charAt(h)+d.charAt(i);return j},c.decode=function(a){var b,c,e,f,g,h,i,j="",k=0;for(a=a.replace(/[^A-Za-z0-9\+\/\=]/g,"");k<a.length;)f=d.indexOf(a.charAt(k++)),g=d.indexOf(a.charAt(k++)),h=d.indexOf(a.charAt(k++)),i=d.indexOf(a.charAt(k++)),b=f<<2|g>>4,c=(15&g)<<4|h>>2,e=(3&h)<<6|i,j+=String.fromCharCode(b),64!=h&&(j+=String.fromCharCode(c)),64!=i&&(j+=String.fromCharCode(e));return j}},{}],2:[function(a,b){"use strict";function c(){this.compressedSize=0,this.uncompressedSize=0,this.crc32=0,this.compressionMethod=null,this.compressedContent=null}c.prototype={getContent:function(){return null},getCompressedContent:function(){return null}},b.exports=c},{}],3:[function(a,b,c){"use strict";c.STORE={magic:"\x00\x00",compress:function(a){return a},uncompress:function(a){return a},compressInputType:null,uncompressInputType:null},c.DEFLATE=a("./flate")},{"./flate":8}],4:[function(a,b){"use strict";var c=a("./utils"),d=[0,1996959894,3993919788,2567524794,124634137,1886057615,3915621685,2657392035,249268274,2044508324,3772115230,2547177864,162941995,2125561021,3887607047,2428444049,498536548,1789927666,4089016648,2227061214,450548861,1843258603,4107580753,2211677639,325883990,1684777152,4251122042,2321926636,335633487,1661365465,4195302755,2366115317,997073096,1281953886,3579855332,2724688242,1006888145,1258607687,3524101629,2768942443,901097722,1119000684,3686517206,2898065728,853044451,1172266101,3705015759,2882616665,651767980,1373503546,3369554304,3218104598,565507253,1454621731,3485111705,3099436303,671266974,1594198024,3322730930,2970347812,795835527,1483230225,3244367275,3060149565,1994146192,31158534,2563907772,4023717930,1907459465,112637215,2680153253,3904427059,2013776290,251722036,2517215374,3775830040,2137656763,141376813,2439277719,3865271297,1802195444,476864866,2238001368,4066508878,1812370925,453092731,2181625025,4111451223,1706088902,314042704,2344532202,4240017532,1658658271,366619977,2362670323,4224994405,1303535960,984961486,2747007092,3569037538,1256170817,1037604311,2765210733,3554079995,1131014506,879679996,2909243462,3663771856,1141124467,855842277,2852801631,3708648649,1342533948,654459306,3188396048,3373015174,1466479909,544179635,3110523913,3462522015,1591671054,702138776,2966460450,3352799412,1504918807,783551873,3082640443,3233442989,3988292384,2596254646,62317068,1957810842,3939845945,2647816111,81470997,1943803523,3814918930,2489596804,225274430,2053790376,3826175755,2466906013,167816743,2097651377,4027552580,2265490386,503444072,1762050814,4150417245,2154129355,426522225,1852507879,4275313526,2312317920,282753626,1742555852,4189708143,2394877945,397917763,1622183637,3604390888,2714866558,953729732,1340076626,3518719985,2797360999,1068828381,1219638859,3624741850,2936675148,906185462,1090812512,3747672003,2825379669,829329135,1181335161,3412177804,3160834842,628085408,1382605366,3423369109,3138078467,570562233,1426400815,3317316542,2998733608,733239954,1555261956,3268935591,3050360625,752459403,1541320221,2607071920,3965973030,1969922972,40735498,2617837225,3943577151,1913087877,83908371,2512341634,3803740692,2075208622,213261112,2463272603,3855990285,2094854071,198958881,2262029012,4057260610,1759359992,534414190,2176718541,4139329115,1873836001,414664567,2282248934,4279200368,1711684554,285281116,2405801727,4167216745,1634467795,376229701,2685067896,3608007406,1308918612,956543938,2808555105,3495958263,1231636301,1047427035,2932959818,3654703836,1088359270,936918e3,2847714899,3736837829,1202900863,817233897,3183342108,3401237130,1404277552,615818150,3134207493,3453421203,1423857449,601450431,3009837614,3294710456,1567103746,711928724,3020668471,3272380065,1510334235,755167117];b.exports=function(a,b){if("undefined"==typeof a||!a.length)return 0;var e="string"!==c.getTypeOf(a);"undefined"==typeof b&&(b=0);var f=0,g=0,h=0;b=-1^b;for(var i=0,j=a.length;j>i;i++)h=e?a[i]:a.charCodeAt(i),g=255&(b^h),f=d[g],b=b>>>8^f;return-1^b}},{"./utils":21}],5:[function(a,b){"use strict";function c(){this.data=null,this.length=0,this.index=0}var d=a("./utils");c.prototype={checkOffset:function(a){this.checkIndex(this.index+a)},checkIndex:function(a){if(this.length<a||0>a)throw new Error("End of data reached (data length = "+this.length+", asked index = "+a+"). Corrupted zip ?")},setIndex:function(a){this.checkIndex(a),this.index=a},skip:function(a){this.setIndex(this.index+a)},byteAt:function(){},readInt:function(a){var b,c=0;for(this.checkOffset(a),b=this.index+a-1;b>=this.index;b--)c=(c<<8)+this.byteAt(b);return this.index+=a,c},readString:function(a){return d.transformTo("string",this.readData(a))},readData:function(){},lastIndexOfSignature:function(){},readDate:function(){var a=this.readInt(4);return new Date((a>>25&127)+1980,(a>>21&15)-1,a>>16&31,a>>11&31,a>>5&63,(31&a)<<1)}},b.exports=c},{"./utils":21}],6:[function(a,b,c){"use strict";c.base64=!1,c.binary=!1,c.dir=!1,c.createFolders=!1,c.date=null,c.compression=null,c.comment=null},{}],7:[function(a,b,c){"use strict";var d=a("./utils");c.string2binary=function(a){return d.string2binary(a)},c.string2Uint8Array=function(a){return d.transformTo("uint8array",a)},c.uint8Array2String=function(a){return d.transformTo("string",a)},c.string2Blob=function(a){var b=d.transformTo("arraybuffer",a);return d.arrayBuffer2Blob(b)},c.arrayBuffer2Blob=function(a){return d.arrayBuffer2Blob(a)},c.transformTo=function(a,b){return d.transformTo(a,b)},c.getTypeOf=function(a){return d.getTypeOf(a)},c.checkSupport=function(a){return d.checkSupport(a)},c.MAX_VALUE_16BITS=d.MAX_VALUE_16BITS,c.MAX_VALUE_32BITS=d.MAX_VALUE_32BITS,c.pretty=function(a){return d.pretty(a)},c.findCompression=function(a){return d.findCompression(a)},c.isRegExp=function(a){return d.isRegExp(a)}},{"./utils":21}],8:[function(a,b,c){"use strict";var d="undefined"!=typeof Uint8Array&&"undefined"!=typeof Uint16Array&&"undefined"!=typeof Uint32Array,e=a("pako");c.uncompressInputType=d?"uint8array":"array",c.compressInputType=d?"uint8array":"array",c.magic="\b\x00",c.compress=function(a){return e.deflateRaw(a)},c.uncompress=function(a){return e.inflateRaw(a)}},{pako:24}],9:[function(a,b){"use strict";function c(a,b){return this instanceof c?(this.files={},this.comment=null,this.root="",a&&this.load(a,b),void(this.clone=function(){var a=new c;for(var b in this)"function"!=typeof this[b]&&(a[b]=this[b]);return a})):new c(a,b)}var d=a("./base64");c.prototype=a("./object"),c.prototype.load=a("./load"),c.support=a("./support"),c.defaults=a("./defaults"),c.utils=a("./deprecatedPublicUtils"),c.base64={encode:function(a){return d.encode(a)},decode:function(a){return d.decode(a)}},c.compressions=a("./compressions"),b.exports=c},{"./base64":1,"./compressions":3,"./defaults":6,"./deprecatedPublicUtils":7,"./load":10,"./object":13,"./support":17}],10:[function(a,b){"use strict";var c=a("./base64"),d=a("./zipEntries");b.exports=function(a,b){var e,f,g,h;for(b=b||{},b.base64&&(a=c.decode(a)),f=new d(a,b),e=f.files,g=0;g<e.length;g++)h=e[g],this.file(h.fileName,h.decompressed,{binary:!0,optimizedBinaryString:!0,date:h.date,dir:h.dir,comment:h.fileComment.length?h.fileComment:null,createFolders:b.createFolders});return f.zipComment.length&&(this.comment=f.zipComment),this}},{"./base64":1,"./zipEntries":22}],11:[function(a,b){(function(a){"use strict";b.exports=function(b,c){return new a(b,c)},b.exports.test=function(b){return a.isBuffer(b)}}).call(this,"undefined"!=typeof Buffer?Buffer:void 0)},{}],12:[function(a,b){"use strict";function c(a){this.data=a,this.length=this.data.length,this.index=0}var d=a("./uint8ArrayReader");c.prototype=new d,c.prototype.readData=function(a){this.checkOffset(a);var b=this.data.slice(this.index,this.index+a);return this.index+=a,b},b.exports=c},{"./uint8ArrayReader":18}],13:[function(a,b){"use strict";var c=a("./support"),d=a("./utils"),e=a("./crc32"),f=a("./signature"),g=a("./defaults"),h=a("./base64"),i=a("./compressions"),j=a("./compressedObject"),k=a("./nodeBuffer"),l=a("./utf8"),m=a("./stringWriter"),n=a("./uint8ArrayWriter"),o=function(a){if(a._data instanceof j&&(a._data=a._data.getContent(),a.options.binary=!0,a.options.base64=!1,"uint8array"===d.getTypeOf(a._data))){var b=a._data;a._data=new Uint8Array(b.length),0!==b.length&&a._data.set(b,0)}return a._data},p=function(a){var b=o(a),e=d.getTypeOf(b);return"string"===e?!a.options.binary&&c.nodebuffer?k(b,"utf-8"):a.asBinary():b},q=function(a){var b=o(this);return null===b||"undefined"==typeof b?"":(this.options.base64&&(b=h.decode(b)),b=a&&this.options.binary?A.utf8decode(b):d.transformTo("string",b),a||this.options.binary||(b=d.transformTo("string",A.utf8encode(b))),b)},r=function(a,b,c){this.name=a,this.dir=c.dir,this.date=c.date,this.comment=c.comment,this._data=b,this.options=c,this._initialMetadata={dir:c.dir,date:c.date}};r.prototype={asText:function(){return q.call(this,!0)},asBinary:function(){return q.call(this,!1)},asNodeBuffer:function(){var a=p(this);return d.transformTo("nodebuffer",a)},asUint8Array:function(){var a=p(this);return d.transformTo("uint8array",a)},asArrayBuffer:function(){return this.asUint8Array().buffer}};var s=function(a,b){var c,d="";for(c=0;b>c;c++)d+=String.fromCharCode(255&a),a>>>=8;return d},t=function(){var a,b,c={};for(a=0;a<arguments.length;a++)for(b in arguments[a])arguments[a].hasOwnProperty(b)&&"undefined"==typeof c[b]&&(c[b]=arguments[a][b]);return c},u=function(a){return a=a||{},a.base64!==!0||null!==a.binary&&void 0!==a.binary||(a.binary=!0),a=t(a,g),a.date=a.date||new Date,null!==a.compression&&(a.compression=a.compression.toUpperCase()),a},v=function(a,b,c){var e,f=d.getTypeOf(b);if(c=u(c),c.createFolders&&(e=w(a))&&x.call(this,e,!0),c.dir||null===b||"undefined"==typeof b)c.base64=!1,c.binary=!1,b=null;else if("string"===f)c.binary&&!c.base64&&c.optimizedBinaryString!==!0&&(b=d.string2binary(b));else{if(c.base64=!1,c.binary=!0,!(f||b instanceof j))throw new Error("The data of '"+a+"' is in an unsupported format !");"arraybuffer"===f&&(b=d.transformTo("uint8array",b))}var g=new r(a,b,c);return this.files[a]=g,g},w=function(a){"/"==a.slice(-1)&&(a=a.substring(0,a.length-1));var b=a.lastIndexOf("/");return b>0?a.substring(0,b):""},x=function(a,b){return"/"!=a.slice(-1)&&(a+="/"),b="undefined"!=typeof b?b:!1,this.files[a]||v.call(this,a,null,{dir:!0,createFolders:b}),this.files[a]},y=function(a,b){var c,f=new j;return a._data instanceof j?(f.uncompressedSize=a._data.uncompressedSize,f.crc32=a._data.crc32,0===f.uncompressedSize||a.dir?(b=i.STORE,f.compressedContent="",f.crc32=0):a._data.compressionMethod===b.magic?f.compressedContent=a._data.getCompressedContent():(c=a._data.getContent(),f.compressedContent=b.compress(d.transformTo(b.compressInputType,c)))):(c=p(a),(!c||0===c.length||a.dir)&&(b=i.STORE,c=""),f.uncompressedSize=c.length,f.crc32=e(c),f.compressedContent=b.compress(d.transformTo(b.compressInputType,c))),f.compressedSize=f.compressedContent.length,f.compressionMethod=b.magic,f},z=function(a,b,c,g){var h,i,j,k,m=(c.compressedContent,d.transformTo("string",l.utf8encode(b.name))),n=b.comment||"",o=d.transformTo("string",l.utf8encode(n)),p=m.length!==b.name.length,q=o.length!==n.length,r=b.options,t="",u="",v="";j=b._initialMetadata.dir!==b.dir?b.dir:r.dir,k=b._initialMetadata.date!==b.date?b.date:r.date,h=k.getHours(),h<<=6,h|=k.getMinutes(),h<<=5,h|=k.getSeconds()/2,i=k.getFullYear()-1980,i<<=4,i|=k.getMonth()+1,i<<=5,i|=k.getDate(),p&&(u=s(1,1)+s(e(m),4)+m,t+="up"+s(u.length,2)+u),q&&(v=s(1,1)+s(this.crc32(o),4)+o,t+="uc"+s(v.length,2)+v);var w="";w+="\n\x00",w+=p||q?"\x00\b":"\x00\x00",w+=c.compressionMethod,w+=s(h,2),w+=s(i,2),w+=s(c.crc32,4),w+=s(c.compressedSize,4),w+=s(c.uncompressedSize,4),w+=s(m.length,2),w+=s(t.length,2);var x=f.LOCAL_FILE_HEADER+w+m+t,y=f.CENTRAL_FILE_HEADER+"\x00"+w+s(o.length,2)+"\x00\x00\x00\x00"+(j===!0?"\x00\x00\x00":"\x00\x00\x00\x00")+s(g,4)+m+t+o;return{fileRecord:x,dirRecord:y,compressedObject:c}},A={load:function(){throw new Error("Load method is not defined. Is the file jszip-load.js included ?")},filter:function(a){var b,c,d,e,f=[];for(b in this.files)this.files.hasOwnProperty(b)&&(d=this.files[b],e=new r(d.name,d._data,t(d.options)),c=b.slice(this.root.length,b.length),b.slice(0,this.root.length)===this.root&&a(c,e)&&f.push(e));return f},file:function(a,b,c){if(1===arguments.length){if(d.isRegExp(a)){var e=a;return this.filter(function(a,b){return!b.dir&&e.test(a)})}return this.filter(function(b,c){return!c.dir&&b===a})[0]||null}return a=this.root+a,v.call(this,a,b,c),this},folder:function(a){if(!a)return this;if(d.isRegExp(a))return this.filter(function(b,c){return c.dir&&a.test(b)});var b=this.root+a,c=x.call(this,b),e=this.clone();return e.root=c.name,e},remove:function(a){a=this.root+a;var b=this.files[a];if(b||("/"!=a.slice(-1)&&(a+="/"),b=this.files[a]),b&&!b.dir)delete this.files[a];else for(var c=this.filter(function(b,c){return c.name.slice(0,a.length)===a}),d=0;d<c.length;d++)delete this.files[c[d].name];return this},generate:function(a){a=t(a||{},{base64:!0,compression:"STORE",type:"base64",comment:null}),d.checkSupport(a.type);var b,c,e=[],g=0,j=0,k=d.transformTo("string",this.utf8encode(a.comment||this.comment||""));for(var l in this.files)if(this.files.hasOwnProperty(l)){var o=this.files[l],p=o.options.compression||a.compression.toUpperCase(),q=i[p];if(!q)throw new Error(p+" is not a valid compression method !");var r=y.call(this,o,q),u=z.call(this,l,o,r,g);g+=u.fileRecord.length+r.compressedSize,j+=u.dirRecord.length,e.push(u)}var v="";v=f.CENTRAL_DIRECTORY_END+"\x00\x00\x00\x00"+s(e.length,2)+s(e.length,2)+s(j,4)+s(g,4)+s(k.length,2)+k;var w=a.type.toLowerCase();for(b="uint8array"===w||"arraybuffer"===w||"blob"===w||"nodebuffer"===w?new n(g+j+v.length):new m(g+j+v.length),c=0;c<e.length;c++)b.append(e[c].fileRecord),b.append(e[c].compressedObject.compressedContent);for(c=0;c<e.length;c++)b.append(e[c].dirRecord);b.append(v);var x=b.finalize();switch(a.type.toLowerCase()){case"uint8array":case"arraybuffer":case"nodebuffer":return d.transformTo(a.type.toLowerCase(),x);case"blob":return d.arrayBuffer2Blob(d.transformTo("arraybuffer",x));case"base64":return a.base64?h.encode(x):x;default:return x}},crc32:function(a,b){return e(a,b)},utf8encode:function(a){return d.transformTo("string",l.utf8encode(a))},utf8decode:function(a){return l.utf8decode(a)}};b.exports=A},{"./base64":1,"./compressedObject":2,"./compressions":3,"./crc32":4,"./defaults":6,"./nodeBuffer":11,"./signature":14,"./stringWriter":16,"./support":17,"./uint8ArrayWriter":19,"./utf8":20,"./utils":21}],14:[function(a,b,c){"use strict";c.LOCAL_FILE_HEADER="PK",c.CENTRAL_FILE_HEADER="PK
",c.CENTRAL_DIRECTORY_END="PK",c.ZIP64_CENTRAL_DIRECTORY_LOCATOR="PK",c.ZIP64_CENTRAL_DIRECTORY_END="PK",c.DATA_DESCRIPTOR="PK\b"},{}],15:[function(a,b){"use strict";function c(a,b){this.data=a,b||(this.data=e.string2binary(this.data)),this.length=this.data.length,this.index=0}var d=a("./dataReader"),e=a("./utils");c.prototype=new d,c.prototype.byteAt=function(a){return this.data.charCodeAt(a)},c.prototype.lastIndexOfSignature=function(a){return this.data.lastIndexOf(a)},c.prototype.readData=function(a){this.checkOffset(a);var b=this.data.slice(this.index,this.index+a);return this.index+=a,b},b.exports=c},{"./dataReader":5,"./utils":21}],16:[function(a,b){"use strict";var c=a("./utils"),d=function(){this.data=[]};d.prototype={append:function(a){a=c.transformTo("string",a),this.data.push(a)},finalize:function(){return this.data.join("")}},b.exports=d},{"./utils":21}],17:[function(a,b,c){(function(a){"use strict";if(c.base64=!0,c.array=!0,c.string=!0,c.arraybuffer="undefined"!=typeof ArrayBuffer&&"undefined"!=typeof Uint8Array,c.nodebuffer="undefined"!=typeof a,c.uint8array="undefined"!=typeof Uint8Array,"undefined"==typeof ArrayBuffer)c.blob=!1;else{var b=new ArrayBuffer(0);try{c.blob=0===new Blob([b],{type:"application/zip"}).size}catch(d){try{var e=window.BlobBuilder||window.WebKitBlobBuilder||window.MozBlobBuilder||window.MSBlobBuilder,f=new e;f.append(b),c.blob=0===f.getBlob("application/zip").size}catch(d){c.blob=!1}}}}).call(this,"undefined"!=typeof Buffer?Buffer:void 0)},{}],18:[function(a,b){"use strict";function c(a){a&&(this.data=a,this.length=this.data.length,this.index=0)}var d=a("./dataReader");c.prototype=new d,c.prototype.byteAt=function(a){return this.data[a]},c.prototype.lastIndexOfSignature=function(a){for(var b=a.charCodeAt(0),c=a.charCodeAt(1),d=a.charCodeAt(2),e=a.charCodeAt(3),f=this.length-4;f>=0;--f)if(this.data[f]===b&&this.data[f+1]===c&&this.data[f+2]===d&&this.data[f+3]===e)return f;return-1},c.prototype.readData=function(a){if(this.checkOffset(a),0===a)return new Uint8Array(0);var b=this.data.subarray(this.index,this.index+a);return this.index+=a,b},b.exports=c},{"./dataReader":5}],19:[function(a,b){"use strict";var c=a("./utils"),d=function(a){this.data=new Uint8Array(a),this.index=0};d.prototype={append:function(a){0!==a.length&&(a=c.transformTo("uint8array",a),this.data.set(a,this.index),this.index+=a.length)},finalize:function(){return this.data}},b.exports=d},{"./utils":21}],20:[function(a,b,c){"use strict";for(var d=a("./utils"),e=a("./support"),f=a("./nodeBuffer"),g=new Array(256),h=0;256>h;h++)g[h]=h>=252?6:h>=248?5:h>=240?4:h>=224?3:h>=192?2:1;g[254]=g[254]=1;var i=function(a){var b,c,d,f,g,h=a.length,i=0;for(f=0;h>f;f++)c=a.charCodeAt(f),55296===(64512&c)&&h>f+1&&(d=a.charCodeAt(f+1),56320===(64512&d)&&(c=65536+(c-55296<<10)+(d-56320),f++)),i+=128>c?1:2048>c?2:65536>c?3:4;for(b=e.uint8array?new Uint8Array(i):new Array(i),g=0,f=0;i>g;f++)c=a.charCodeAt(f),55296===(64512&c)&&h>f+1&&(d=a.charCodeAt(f+1),56320===(64512&d)&&(c=65536+(c-55296<<10)+(d-56320),f++)),128>c?b[g++]=c:2048>c?(b[g++]=192|c>>>6,b[g++]=128|63&c):65536>c?(b[g++]=224|c>>>12,b[g++]=128|c>>>6&63,b[g++]=128|63&c):(b[g++]=240|c>>>18,b[g++]=128|c>>>12&63,b[g++]=128|c>>>6&63,b[g++]=128|63&c);return b},j=function(a,b){var c;for(b=b||a.length,b>a.length&&(b=a.length),c=b-1;c>=0&&128===(192&a[c]);)c--;return 0>c?b:0===c?b:c+g[a[c]]>b?c:b},k=function(a){var b,c,e,f,h=a.length,i=new Array(2*h);for(c=0,b=0;h>b;)if(e=a[b++],128>e)i[c++]=e;else if(f=g[e],f>4)i[c++]=65533,b+=f-1;else{for(e&=2===f?31:3===f?15:7;f>1&&h>b;)e=e<<6|63&a[b++],f--;f>1?i[c++]=65533:65536>e?i[c++]=e:(e-=65536,i[c++]=55296|e>>10&1023,i[c++]=56320|1023&e)}return i.length!==c&&(i.subarray?i=i.subarray(0,c):i.length=c),d.applyFromCharCode(i)};c.utf8encode=function(a){return e.nodebuffer?f(a,"utf-8"):i(a)},c.utf8decode=function(a){if(e.nodebuffer)return d.transformTo("nodebuffer",a).toString("utf-8");a=d.transformTo(e.uint8array?"uint8array":"array",a);for(var b=[],c=0,f=a.length,g=65536;f>c;){var h=j(a,Math.min(c+g,f));b.push(k(e.uint8array?a.subarray(c,h):a.slice(c,h))),c=h}return b.join("")}},{"./nodeBuffer":11,"./support":17,"./utils":21}],21:[function(a,b,c){"use strict";function d(a){return a}function e(a,b){for(var c=0;c<a.length;++c)b[c]=255&a.charCodeAt(c);return b}function f(a){var b=65536,d=[],e=a.length,f=c.getTypeOf(a),g=0,h=!0;try{switch(f){case"uint8array":String.fromCharCode.apply(null,new Uint8Array(0));break;case"nodebuffer":String.fromCharCode.apply(null,j(0))}}catch(i){h=!1}if(!h){for(var k="",l=0;l<a.length;l++)k+=String.fromCharCode(a[l]);return k}for(;e>g&&b>1;)try{d.push("array"===f||"nodebuffer"===f?String.fromCharCode.apply(null,a.slice(g,Math.min(g+b,e))):String.fromCharCode.apply(null,a.subarray(g,Math.min(g+b,e)))),g+=b}catch(i){b=Math.floor(b/2)}return d.join("")}function g(a,b){for(var c=0;c<a.length;c++)b[c]=a[c];return b}var h=a("./support"),i=a("./compressions"),j=a("./nodeBuffer");c.string2binary=function(a){for(var b="",c=0;c<a.length;c++)b+=String.fromCharCode(255&a.charCodeAt(c));return b},c.arrayBuffer2Blob=function(a){c.checkSupport("blob");try{return new Blob([a],{type:"application/zip"})}catch(b){try{var d=window.BlobBuilder||window.WebKitBlobBuilder||window.MozBlobBuilder||window.MSBlobBuilder,e=new d;return e.append(a),e.getBlob("application/zip")}catch(b){throw new Error("Bug : can't construct the Blob.")}}},c.applyFromCharCode=f;var k={};k.string={string:d,array:function(a){return e(a,new Array(a.length))},arraybuffer:function(a){return k.string.uint8array(a).buffer},uint8array:function(a){return e(a,new Uint8Array(a.length))},nodebuffer:function(a){return e(a,j(a.length))}},k.array={string:f,array:d,arraybuffer:function(a){return new Uint8Array(a).buffer},uint8array:function(a){return new Uint8Array(a)},nodebuffer:function(a){return j(a)}},k.arraybuffer={string:function(a){return f(new Uint8Array(a))},array:function(a){return g(new Uint8Array(a),new Array(a.byteLength))},arraybuffer:d,uint8array:function(a){return new Uint8Array(a)},nodebuffer:function(a){return j(new Uint8Array(a))}},k.uint8array={string:f,array:function(a){return g(a,new Array(a.length))},arraybuffer:function(a){return a.buffer},uint8array:d,nodebuffer:function(a){return j(a)}},k.nodebuffer={string:f,array:function(a){return g(a,new Array(a.length))},arraybuffer:function(a){return k.nodebuffer.uint8array(a).buffer},uint8array:function(a){return g(a,new Uint8Array(a.length))},nodebuffer:d},c.transformTo=function(a,b){if(b||(b=""),!a)return b;c.checkSupport(a);var d=c.getTypeOf(b),e=k[d][a](b);return e},c.getTypeOf=function(a){return"string"==typeof a?"string":"[object Array]"===Object.prototype.toString.call(a)?"array":h.nodebuffer&&j.test(a)?"nodebuffer":h.uint8array&&a instanceof Uint8Array?"uint8array":h.arraybuffer&&a instanceof ArrayBuffer?"arraybuffer":void 0},c.checkSupport=function(a){var b=h[a.toLowerCase()];if(!b)throw new Error(a+" is not supported by this browser")},c.MAX_VALUE_16BITS=65535,c.MAX_VALUE_32BITS=-1,c.pretty=function(a){var b,c,d="";for(c=0;c<(a||"").length;c++)b=a.charCodeAt(c),d+="\\x"+(16>b?"0":"")+b.toString(16).toUpperCase();return d},c.findCompression=function(a){for(var b in i)if(i.hasOwnProperty(b)&&i[b].magic===a)return i[b];return null},c.isRegExp=function(a){return"[object RegExp]"===Object.prototype.toString.call(a)}},{"./compressions":3,"./nodeBuffer":11,"./support":17}],22:[function(a,b){"use strict";function c(a,b){this.files=[],this.loadOptions=b,a&&this.load(a)}var d=a("./stringReader"),e=a("./nodeBufferReader"),f=a("./uint8ArrayReader"),g=a("./utils"),h=a("./signature"),i=a("./zipEntry"),j=a("./support"),k=a("./object");c.prototype={checkSignature:function(a){var b=this.reader.readString(4);if(b!==a)throw new Error("Corrupted zip or bug : unexpected signature ("+g.pretty(b)+", expected "+g.pretty(a)+")")},readBlockEndOfCentral:function(){this.diskNumber=this.reader.readInt(2),this.diskWithCentralDirStart=this.reader.readInt(2),this.centralDirRecordsOnThisDisk=this.reader.readInt(2),this.centralDirRecords=this.reader.readInt(2),this.centralDirSize=this.reader.readInt(4),this.centralDirOffset=this.reader.readInt(4),this.zipCommentLength=this.reader.readInt(2),this.zipComment=this.reader.readString(this.zipCommentLength),this.zipComment=k.utf8decode(this.zipComment)},readBlockZip64EndOfCentral:function(){this.zip64EndOfCentralSize=this.reader.readInt(8),this.versionMadeBy=this.reader.readString(2),this.versionNeeded=this.reader.readInt(2),this.diskNumber=this.reader.readInt(4),this.diskWithCentralDirStart=this.reader.readInt(4),this.centralDirRecordsOnThisDisk=this.reader.readInt(8),this.centralDirRecords=this.reader.readInt(8),this.centralDirSize=this.reader.readInt(8),this.centralDirOffset=this.reader.readInt(8),this.zip64ExtensibleData={};for(var a,b,c,d=this.zip64EndOfCentralSize-44,e=0;d>e;)a=this.reader.readInt(2),b=this.reader.readInt(4),c=this.reader.readString(b),this.zip64ExtensibleData[a]={id:a,length:b,value:c}},readBlockZip64EndOfCentralLocator:function(){if(this.diskWithZip64CentralDirStart=this.reader.readInt(4),this.relativeOffsetEndOfZip64CentralDir=this.reader.readInt(8),this.disksCount=this.reader.readInt(4),this.disksCount>1)throw new Error("Multi-volumes zip are not supported")},readLocalFiles:function(){var a,b;for(a=0;a<this.files.length;a++)b=this.files[a],this.reader.setIndex(b.localHeaderOffset),this.checkSignature(h.LOCAL_FILE_HEADER),b.readLocalPart(this.reader),b.handleUTF8()},readCentralDir:function(){var a;for(this.reader.setIndex(this.centralDirOffset);this.reader.readString(4)===h.CENTRAL_FILE_HEADER;)a=new i({zip64:this.zip64},this.loadOptions),a.readCentralPart(this.reader),this.files.push(a)},readEndOfCentral:function(){var a=this.reader.lastIndexOfSignature(h.CENTRAL_DIRECTORY_END);if(-1===a)throw new Error("Corrupted zip : can't find end of central directory");if(this.reader.setIndex(a),this.checkSignature(h.CENTRAL_DIRECTORY_END),this.readBlockEndOfCentral(),this.diskNumber===g.MAX_VALUE_16BITS||this.diskWithCentralDirStart===g.MAX_VALUE_16BITS||this.centralDirRecordsOnThisDisk===g.MAX_VALUE_16BITS||this.centralDirRecords===g.MAX_VALUE_16BITS||this.centralDirSize===g.MAX_VALUE_32BITS||this.centralDirOffset===g.MAX_VALUE_32BITS){if(this.zip64=!0,a=this.reader.lastIndexOfSignature(h.ZIP64_CENTRAL_DIRECTORY_LOCATOR),-1===a)throw new Error("Corrupted zip : can't find the ZIP64 end of central directory locator");this.reader.setIndex(a),this.checkSignature(h.ZIP64_CENTRAL_DIRECTORY_LOCATOR),this.readBlockZip64EndOfCentralLocator(),this.reader.setIndex(this.relativeOffsetEndOfZip64CentralDir),this.checkSignature(h.ZIP64_CENTRAL_DIRECTORY_END),this.readBlockZip64EndOfCentral()}},prepareReader:function(a){var b=g.getTypeOf(a);this.reader="string"!==b||j.uint8array?"nodebuffer"===b?new e(a):new f(g.transformTo("uint8array",a)):new d(a,this.loadOptions.optimizedBinaryString)},load:function(a){this.prepareReader(a),this.readEndOfCentral(),this.readCentralDir(),this.readLocalFiles()}},b.exports=c},{"./nodeBufferReader":12,"./object":13,"./signature":14,"./stringReader":15,"./support":17,"./uint8ArrayReader":18,"./utils":21,"./zipEntry":23}],23:[function(a,b){"use strict";function c(a,b){this.options=a,this.loadOptions=b}var d=a("./stringReader"),e=a("./utils"),f=a("./compressedObject"),g=a("./object");c.prototype={isEncrypted:function(){return 1===(1&this.bitFlag)},useUTF8:function(){return 2048===(2048&this.bitFlag)},prepareCompressedContent:function(a,b,c){return function(){var d=a.index;a.setIndex(b);var e=a.readData(c);return a.setIndex(d),e}},prepareContent:function(a,b,c,d,f){return function(){var a=e.transformTo(d.uncompressInputType,this.getCompressedContent()),b=d.uncompress(a);if(b.length!==f)throw new Error("Bug : uncompressed data size mismatch");return b}},readLocalPart:function(a){var b,c;if(a.skip(22),this.fileNameLength=a.readInt(2),c=a.readInt(2),this.fileName=a.readString(this.fileNameLength),a.skip(c),-1==this.compressedSize||-1==this.uncompressedSize)throw new Error("Bug or corrupted zip : didn't get enough informations from the central directory (compressedSize == -1 || uncompressedSize == -1)");if(b=e.findCompression(this.compressionMethod),null===b)throw new Error("Corrupted zip : compression "+e.pretty(this.compressionMethod)+" unknown (inner file : "+this.fileName+")");if(this.decompressed=new f,this.decompressed.compressedSize=this.compressedSize,this.decompressed.uncompressedSize=this.uncompressedSize,this.decompressed.crc32=this.crc32,this.decompressed.compressionMethod=this.compressionMethod,this.decompressed.getCompressedContent=this.prepareCompressedContent(a,a.index,this.compressedSize,b),this.decompressed.getContent=this.prepareContent(a,a.index,this.compressedSize,b,this.uncompressedSize),this.loadOptions.checkCRC32&&(this.decompressed=e.transformTo("string",this.decompressed.getContent()),g.crc32(this.decompressed)!==this.crc32))throw new Error("Corrupted zip : CRC32 mismatch")},readCentralPart:function(a){if(this.versionMadeBy=a.readString(2),this.versionNeeded=a.readInt(2),this.bitFlag=a.readInt(2),this.compressionMethod=a.readString(2),this.date=a.readDate(),this.crc32=a.readInt(4),this.compressedSize=a.readInt(4),this.uncompressedSize=a.readInt(4),this.fileNameLength=a.readInt(2),this.extraFieldsLength=a.readInt(2),this.fileCommentLength=a.readInt(2),this.diskNumberStart=a.readInt(2),this.internalFileAttributes=a.readInt(2),this.externalFileAttributes=a.readInt(4),this.localHeaderOffset=a.readInt(4),this.isEncrypted())throw new Error("Encrypted zip are not supported");this.fileName=a.readString(this.fileNameLength),this.readExtraFields(a),this.parseZIP64ExtraField(a),this.fileComment=a.readString(this.fileCommentLength),this.dir=16&this.externalFileAttributes?!0:!1},parseZIP64ExtraField:function(){if(this.extraFields[1]){var a=new d(this.extraFields[1].value);this.uncompressedSize===e.MAX_VALUE_32BITS&&(this.uncompressedSize=a.readInt(8)),this.compressedSize===e.MAX_VALUE_32BITS&&(this.compressedSize=a.readInt(8)),this.localHeaderOffset===e.MAX_VALUE_32BITS&&(this.localHeaderOffset=a.readInt(8)),this.diskNumberStart===e.MAX_VALUE_32BITS&&(this.diskNumberStart=a.readInt(4))}},readExtraFields:function(a){var b,c,d,e=a.index;for(this.extraFields=this.extraFields||{};a.index<e+this.extraFieldsLength;)b=a.readInt(2),c=a.readInt(2),d=a.readString(c),this.extraFields[b]={id:b,length:c,value:d}},handleUTF8:function(){if(this.useUTF8())this.fileName=g.utf8decode(this.fileName),this.fileComment=g.utf8decode(this.fileComment);else{var a=this.findExtraFieldUnicodePath();null!==a&&(this.fileName=a);var b=this.findExtraFieldUnicodeComment();null!==b&&(this.fileComment=b)}},findExtraFieldUnicodePath:function(){var a=this.extraFields[28789];if(a){var b=new d(a.value);return 1!==b.readInt(1)?null:g.crc32(this.fileName)!==b.readInt(4)?null:g.utf8decode(b.readString(a.length-5))}return null},findExtraFieldUnicodeComment:function(){var a=this.extraFields[25461];if(a){var b=new d(a.value);return 1!==b.readInt(1)?null:g.crc32(this.fileComment)!==b.readInt(4)?null:g.utf8decode(b.readString(a.length-5))}return null}},b.exports=c},{"./compressedObject":2,"./object":13,"./stringReader":15,"./utils":21}],24:[function(a,b){"use strict";var c=a("./lib/utils/common").assign,d=a("./lib/deflate"),e=a("./lib/inflate"),f=a("./lib/zlib/constants"),g={};c(g,d,e,f),b.exports=g},{"./lib/deflate":25,"./lib/inflate":26,"./lib/utils/common":27,"./lib/zlib/constants":30}],25:[function(a,b,c){"use strict";function d(a,b){var c=new s(b);if(c.push(a,!0),c.err)throw c.msg;return c.result}function e(a,b){return b=b||{},b.raw=!0,d(a,b)}function f(a,b){return b=b||{},b.gzip=!0,d(a,b)}var g=a("./zlib/deflate.js"),h=a("./utils/common"),i=a("./utils/strings"),j=a("./zlib/messages"),k=a("./zlib/zstream"),l=0,m=4,n=0,o=1,p=-1,q=0,r=8,s=function(a){this.options=h.assign({level:p,method:r,chunkSize:16384,windowBits:15,memLevel:8,strategy:q,to:""},a||{});var b=this.options;b.raw&&b.windowBits>0?b.windowBits=-b.windowBits:b.gzip&&b.windowBits>0&&b.windowBits<16&&(b.windowBits+=16),this.err=0,this.msg="",this.ended=!1,this.chunks=[],this.strm=new k,this.strm.avail_out=0;var c=g.deflateInit2(this.strm,b.level,b.method,b.windowBits,b.memLevel,b.strategy);if(c!==n)throw new Error(j[c]);b.header&&g.deflateSetHeader(this.strm,b.header);
+!function(a){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=a();else if("function"==typeof define&&define.amd)define([],a);else{var b;"undefined"!=typeof window?b=window:"undefined"!=typeof global?b=global:"undefined"!=typeof self&&(b=self),b.JSZip=a()}}(function(){return function a(b,c,d){function e(g,h){if(!c[g]){if(!b[g]){var i="function"==typeof require&&require;if(!h&&i)return i(g,!0);if(f)return f(g,!0);throw new Error("Cannot find module '"+g+"'")}var j=c[g]={exports:{}};b[g][0].call(j.exports,function(a){var c=b[g][1][a];return e(c?c:a)},j,j.exports,a,b,c,d)}return c[g].exports}for(var f="function"==typeof require&&require,g=0;g<d.length;g++)e(d[g]);return e}({1:[function(a,b,c){"use strict";var d="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";c.encode=function(a){for(var b,c,e,f,g,h,i,j="",k=0;k<a.length;)b=a.charCodeAt(k++),c=a.charCodeAt(k++),e=a.charCodeAt(k++),f=b>>2,g=(3&b)<<4|c>>4,h=(15&c)<<2|e>>6,i=63&e,isNaN(c)?h=i=64:isNaN(e)&&(i=64),j=j+d.charAt(f)+d.charAt(g)+d.charAt(h)+d.charAt(i);return j},c.decode=function(a){var b,c,e,f,g,h,i,j="",k=0;for(a=a.replace(/[^A-Za-z0-9\+\/\=]/g,"");k<a.length;)f=d.indexOf(a.charAt(k++)),g=d.indexOf(a.charAt(k++)),h=d.indexOf(a.charAt(k++)),i=d.indexOf(a.charAt(k++)),b=f<<2|g>>4,c=(15&g)<<4|h>>2,e=(3&h)<<6|i,j+=String.fromCharCode(b),64!=h&&(j+=String.fromCharCode(c)),64!=i&&(j+=String.fromCharCode(e));return j}},{}],2:[function(a,b){"use strict";function c(){this.compressedSize=0,this.uncompressedSize=0,this.crc32=0,this.compressionMethod=null,this.compressedContent=null}c.prototype={getContent:function(){return null},getCompressedContent:function(){return null}},b.exports=c},{}],3:[function(a,b,c){"use strict";c.STORE={magic:"\x00\x00",compress:function(a){return a},uncompress:function(a){return a},compressInputType:null,uncompressInputType:null},c.DEFLATE=a("./flate")},{"./flate":8}],4:[function(a,b){"use strict";var c=a("./utils"),d=[0,1996959894,3993919788,2567524794,124634137,1886057615,3915621685,2657392035,249268274,2044508324,3772115230,2547177864,162941995,2125561021,3887607047,2428444049,498536548,1789927666,4089016648,2227061214,450548861,1843258603,4107580753,2211677639,325883990,1684777152,4251122042,2321926636,335633487,1661365465,4195302755,2366115317,997073096,1281953886,3579855332,2724688242,1006888145,1258607687,3524101629,2768942443,901097722,1119000684,3686517206,2898065728,853044451,1172266101,3705015759,2882616665,651767980,1373503546,3369554304,3218104598,565507253,1454621731,3485111705,3099436303,671266974,1594198024,3322730930,2970347812,795835527,1483230225,3244367275,3060149565,1994146192,31158534,2563907772,4023717930,1907459465,112637215,2680153253,3904427059,2013776290,251722036,2517215374,3775830040,2137656763,141376813,2439277719,3865271297,1802195444,476864866,2238001368,4066508878,1812370925,453092731,2181625025,4111451223,1706088902,314042704,2344532202,4240017532,1658658271,366619977,2362670323,4224994405,1303535960,984961486,2747007092,3569037538,1256170817,1037604311,2765210733,3554079995,1131014506,879679996,2909243462,3663771856,1141124467,855842277,2852801631,3708648649,1342533948,654459306,3188396048,3373015174,1466479909,544179635,3110523913,3462522015,1591671054,702138776,2966460450,3352799412,1504918807,783551873,3082640443,3233442989,3988292384,2596254646,62317068,1957810842,3939845945,2647816111,81470997,1943803523,3814918930,2489596804,225274430,2053790376,3826175755,2466906013,167816743,2097651377,4027552580,2265490386,503444072,1762050814,4150417245,2154129355,426522225,1852507879,4275313526,2312317920,282753626,1742555852,4189708143,2394877945,397917763,1622183637,3604390888,2714866558,953729732,1340076626,3518719985,2797360999,1068828381,1219638859,3624741850,2936675148,906185462,1090812512,3747672003,2825379669,829329135,1181335161,3412177804,3160834842,628085408,1382605366,3423369109,3138078467,570562233,1426400815,3317316542,2998733608,733239954,1555261956,3268935591,3050360625,752459403,1541320221,2607071920,3965973030,1969922972,40735498,2617837225,3943577151,1913087877,83908371,2512341634,3803740692,2075208622,213261112,2463272603,3855990285,2094854071,198958881,2262029012,4057260610,1759359992,534414190,2176718541,4139329115,1873836001,414664567,2282248934,4279200368,1711684554,285281116,2405801727,4167216745,1634467795,376229701,2685067896,3608007406,1308918612,956543938,2808555105,3495958263,1231636301,1047427035,2932959818,3654703836,1088359270,936918e3,2847714899,3736837829,1202900863,817233897,3183342108,3401237130,1404277552,615818150,3134207493,3453421203,1423857449,601450431,3009837614,3294710456,1567103746,711928724,3020668471,3272380065,1510334235,755167117];b.exports=function(a,b){if("undefined"==typeof a||!a.length)return 0;var e="string"!==c.getTypeOf(a);"undefined"==typeof b&&(b=0);var f=0,g=0,h=0;b=-1^b;for(var i=0,j=a.length;j>i;i++)h=e?a[i]:a.charCodeAt(i),g=255&(b^h),f=d[g],b=b>>>8^f;return-1^b}},{"./utils":21}],5:[function(a,b){"use strict";function c(){this.data=null,this.length=0,this.index=0}var d=a("./utils");c.prototype={checkOffset:function(a){this.checkIndex(this.index+a)},checkIndex:function(a){if(this.length<a||0>a)throw new Error("End of data reached (data length = "+this.length+", asked index = "+a+"). Corrupted zip ?")},setIndex:function(a){this.checkIndex(a),this.index=a},skip:function(a){this.setIndex(this.index+a)},byteAt:function(){},readInt:function(a){var b,c=0;for(this.checkOffset(a),b=this.index+a-1;b>=this.index;b--)c=(c<<8)+this.byteAt(b);return this.index+=a,c},readString:function(a){return d.transformTo("string",this.readData(a))},readData:function(){},lastIndexOfSignature:function(){},readDate:function(){var a=this.readInt(4);return new Date((a>>25&127)+1980,(a>>21&15)-1,a>>16&31,a>>11&31,a>>5&63,(31&a)<<1)}},b.exports=c},{"./utils":21}],6:[function(a,b,c){"use strict";c.base64=!1,c.binary=!1,c.dir=!1,c.createFolders=!1,c.date=null,c.compression=null,c.comment=null},{}],7:[function(a,b,c){"use strict";var d=a("./utils");c.string2binary=function(a){return d.string2binary(a)},c.string2Uint8Array=function(a){return d.transformTo("uint8array",a)},c.uint8Array2String=function(a){return d.transformTo("string",a)},c.string2Blob=function(a){var b=d.transformTo("arraybuffer",a);return d.arrayBuffer2Blob(b)},c.arrayBuffer2Blob=function(a){return d.arrayBuffer2Blob(a)},c.transformTo=function(a,b){return d.transformTo(a,b)},c.getTypeOf=function(a){return d.getTypeOf(a)},c.checkSupport=function(a){return d.checkSupport(a)},c.MAX_VALUE_16BITS=d.MAX_VALUE_16BITS,c.MAX_VALUE_32BITS=d.MAX_VALUE_32BITS,c.pretty=function(a){return d.pretty(a)},c.findCompression=function(a){return d.findCompression(a)},c.isRegExp=function(a){return d.isRegExp(a)}},{"./utils":21}],8:[function(a,b,c){"use strict";var d="undefined"!=typeof Uint8Array&&"undefined"!=typeof Uint16Array&&"undefined"!=typeof Uint32Array,e=a("pako");c.uncompressInputType=d?"uint8array":"array",c.compressInputType=d?"uint8array":"array",c.magic="\b\x00",c.compress=function(a){return e.deflateRaw(a)},c.uncompress=function(a){return e.inflateRaw(a)}},{pako:24}],9:[function(a,b){"use strict";function c(a,b){return this instanceof c?(this.files={},this.comment=null,this.root="",a&&this.load(a,b),void(this.clone=function(){var a=new c;for(var b in this)"function"!=typeof this[b]&&(a[b]=this[b]);return a})):new c(a,b)}var d=a("./base64");c.prototype=a("./object"),c.prototype.load=a("./load"),c.support=a("./support"),c.defaults=a("./defaults"),c.utils=a("./deprecatedPublicUtils"),c.base64={encode:function(a){return d.encode(a)},decode:function(a){return d.decode(a)}},c.compressions=a("./compressions"),b.exports=c},{"./base64":1,"./compressions":3,"./defaults":6,"./deprecatedPublicUtils":7,"./load":10,"./object":13,"./support":17}],10:[function(a,b){"use strict";var c=a("./base64"),d=a("./zipEntries");b.exports=function(a,b){var e,f,g,h;for(b=b||{},b.base64&&(a=c.decode(a)),f=new d(a,b),e=f.files,g=0;g<e.length;g++)h=e[g],this.file(h.fileName,h.donapressed,{binary:!0,optimizedBinaryString:!0,date:h.date,dir:h.dir,comment:h.fileComment.length?h.fileComment:null,createFolders:b.createFolders});return f.zipComment.length&&(this.comment=f.zipComment),this}},{"./base64":1,"./zipEntries":22}],11:[function(a,b){(function(a){"use strict";b.exports=function(b,c){return new a(b,c)},b.exports.test=function(b){return a.isBuffer(b)}}).call(this,"undefined"!=typeof Buffer?Buffer:void 0)},{}],12:[function(a,b){"use strict";function c(a){this.data=a,this.length=this.data.length,this.index=0}var d=a("./uint8ArrayReader");c.prototype=new d,c.prototype.readData=function(a){this.checkOffset(a);var b=this.data.slice(this.index,this.index+a);return this.index+=a,b},b.exports=c},{"./uint8ArrayReader":18}],13:[function(a,b){"use strict";var c=a("./support"),d=a("./utils"),e=a("./crc32"),f=a("./signature"),g=a("./defaults"),h=a("./base64"),i=a("./compressions"),j=a("./compressedObject"),k=a("./nodeBuffer"),l=a("./utf8"),m=a("./stringWriter"),n=a("./uint8ArrayWriter"),o=function(a){if(a._data instanceof j&&(a._data=a._data.getContent(),a.options.binary=!0,a.options.base64=!1,"uint8array"===d.getTypeOf(a._data))){var b=a._data;a._data=new Uint8Array(b.length),0!==b.length&&a._data.set(b,0)}return a._data},p=function(a){var b=o(a),e=d.getTypeOf(b);return"string"===e?!a.options.binary&&c.nodebuffer?k(b,"utf-8"):a.asBinary():b},q=function(a){var b=o(this);return null===b||"undefined"==typeof b?"":(this.options.base64&&(b=h.decode(b)),b=a&&this.options.binary?A.utf8decode(b):d.transformTo("string",b),a||this.options.binary||(b=d.transformTo("string",A.utf8encode(b))),b)},r=function(a,b,c){this.name=a,this.dir=c.dir,this.date=c.date,this.comment=c.comment,this._data=b,this.options=c,this._initialMetadata={dir:c.dir,date:c.date}};r.prototype={asText:function(){return q.call(this,!0)},asBinary:function(){return q.call(this,!1)},asNodeBuffer:function(){var a=p(this);return d.transformTo("nodebuffer",a)},asUint8Array:function(){var a=p(this);return d.transformTo("uint8array",a)},asArrayBuffer:function(){return this.asUint8Array().buffer}};var s=function(a,b){var c,d="";for(c=0;b>c;c++)d+=String.fromCharCode(255&a),a>>>=8;return d},t=function(){var a,b,c={};for(a=0;a<arguments.length;a++)for(b in arguments[a])arguments[a].hasOwnProperty(b)&&"undefined"==typeof c[b]&&(c[b]=arguments[a][b]);return c},u=function(a){return a=a||{},a.base64!==!0||null!==a.binary&&void 0!==a.binary||(a.binary=!0),a=t(a,g),a.date=a.date||new Date,null!==a.compression&&(a.compression=a.compression.toUpperCase()),a},v=function(a,b,c){var e,f=d.getTypeOf(b);if(c=u(c),c.createFolders&&(e=w(a))&&x.call(this,e,!0),c.dir||null===b||"undefined"==typeof b)c.base64=!1,c.binary=!1,b=null;else if("string"===f)c.binary&&!c.base64&&c.optimizedBinaryString!==!0&&(b=d.string2binary(b));else{if(c.base64=!1,c.binary=!0,!(f||b instanceof j))throw new Error("The data of '"+a+"' is in an unsupported format !");"arraybuffer"===f&&(b=d.transformTo("uint8array",b))}var g=new r(a,b,c);return this.files[a]=g,g},w=function(a){"/"==a.slice(-1)&&(a=a.substring(0,a.length-1));var b=a.lastIndexOf("/");return b>0?a.substring(0,b):""},x=function(a,b){return"/"!=a.slice(-1)&&(a+="/"),b="undefined"!=typeof b?b:!1,this.files[a]||v.call(this,a,null,{dir:!0,createFolders:b}),this.files[a]},y=function(a,b){var c,f=new j;return a._data instanceof j?(f.uncompressedSize=a._data.uncompressedSize,f.crc32=a._data.crc32,0===f.uncompressedSize||a.dir?(b=i.STORE,f.compressedContent="",f.crc32=0):a._data.compressionMethod===b.magic?f.compressedContent=a._data.getCompressedContent():(c=a._data.getContent(),f.compressedContent=b.compress(d.transformTo(b.compressInputType,c)))):(c=p(a),(!c||0===c.length||a.dir)&&(b=i.STORE,c=""),f.uncompressedSize=c.length,f.crc32=e(c),f.compressedContent=b.compress(d.transformTo(b.compressInputType,c))),f.compressedSize=f.compressedContent.length,f.compressionMethod=b.magic,f},z=function(a,b,c,g){var h,i,j,k,m=(c.compressedContent,d.transformTo("string",l.utf8encode(b.name))),n=b.comment||"",o=d.transformTo("string",l.utf8encode(n)),p=m.length!==b.name.length,q=o.length!==n.length,r=b.options,t="",u="",v="";j=b._initialMetadata.dir!==b.dir?b.dir:r.dir,k=b._initialMetadata.date!==b.date?b.date:r.date,h=k.getHours(),h<<=6,h|=k.getMinutes(),h<<=5,h|=k.getSeconds()/2,i=k.getFullYear()-1980,i<<=4,i|=k.getMonth()+1,i<<=5,i|=k.getDate(),p&&(u=s(1,1)+s(e(m),4)+m,t+="up"+s(u.length,2)+u),q&&(v=s(1,1)+s(this.crc32(o),4)+o,t+="uc"+s(v.length,2)+v);var w="";w+="\n\x00",w+=p||q?"\x00\b":"\x00\x00",w+=c.compressionMethod,w+=s(h,2),w+=s(i,2),w+=s(c.crc32,4),w+=s(c.compressedSize,4),w+=s(c.uncompressedSize,4),w+=s(m.length,2),w+=s(t.length,2);var x=f.LOCAL_FILE_HEADER+w+m+t,y=f.CENTRAL_FILE_HEADER+"\x00"+w+s(o.length,2)+"\x00\x00\x00\x00"+(j===!0?"\x00\x00\x00":"\x00\x00\x00\x00")+s(g,4)+m+t+o;return{fileRecord:x,dirRecord:y,compressedObject:c}},A={load:function(){throw new Error("Load method is not defined. Is the file jszip-load.js included ?")},filter:function(a){var b,c,d,e,f=[];for(b in this.files)this.files.hasOwnProperty(b)&&(d=this.files[b],e=new r(d.name,d._data,t(d.options)),c=b.slice(this.root.length,b.length),b.slice(0,this.root.length)===this.root&&a(c,e)&&f.push(e));return f},file:function(a,b,c){if(1===arguments.length){if(d.isRegExp(a)){var e=a;return this.filter(function(a,b){return!b.dir&&e.test(a)})}return this.filter(function(b,c){return!c.dir&&b===a})[0]||null}return a=this.root+a,v.call(this,a,b,c),this},folder:function(a){if(!a)return this;if(d.isRegExp(a))return this.filter(function(b,c){return c.dir&&a.test(b)});var b=this.root+a,c=x.call(this,b),e=this.clone();return e.root=c.name,e},remove:function(a){a=this.root+a;var b=this.files[a];if(b||("/"!=a.slice(-1)&&(a+="/"),b=this.files[a]),b&&!b.dir)delete this.files[a];else for(var c=this.filter(function(b,c){return c.name.slice(0,a.length)===a}),d=0;d<c.length;d++)delete this.files[c[d].name];return this},generate:function(a){a=t(a||{},{base64:!0,compression:"STORE",type:"base64",comment:null}),d.checkSupport(a.type);var b,c,e=[],g=0,j=0,k=d.transformTo("string",this.utf8encode(a.comment||this.comment||""));for(var l in this.files)if(this.files.hasOwnProperty(l)){var o=this.files[l],p=o.options.compression||a.compression.toUpperCase(),q=i[p];if(!q)throw new Error(p+" is not a valid compression method !");var r=y.call(this,o,q),u=z.call(this,l,o,r,g);g+=u.fileRecord.length+r.compressedSize,j+=u.dirRecord.length,e.push(u)}var v="";v=f.CENTRAL_DIRECTORY_END+"\x00\x00\x00\x00"+s(e.length,2)+s(e.length,2)+s(j,4)+s(g,4)+s(k.length,2)+k;var w=a.type.toLowerCase();for(b="uint8array"===w||"arraybuffer"===w||"blob"===w||"nodebuffer"===w?new n(g+j+v.length):new m(g+j+v.length),c=0;c<e.length;c++)b.append(e[c].fileRecord),b.append(e[c].compressedObject.compressedContent);for(c=0;c<e.length;c++)b.append(e[c].dirRecord);b.append(v);var x=b.finalize();switch(a.type.toLowerCase()){case"uint8array":case"arraybuffer":case"nodebuffer":return d.transformTo(a.type.toLowerCase(),x);case"blob":return d.arrayBuffer2Blob(d.transformTo("arraybuffer",x));case"base64":return a.base64?h.encode(x):x;default:return x}},crc32:function(a,b){return e(a,b)},utf8encode:function(a){return d.transformTo("string",l.utf8encode(a))},utf8decode:function(a){return l.utf8decode(a)}};b.exports=A},{"./base64":1,"./compressedObject":2,"./compressions":3,"./crc32":4,"./defaults":6,"./nodeBuffer":11,"./signature":14,"./stringWriter":16,"./support":17,"./uint8ArrayWriter":19,"./utf8":20,"./utils":21}],14:[function(a,b,c){"use strict";c.LOCAL_FILE_HEADER="PK",c.CENTRAL_FILE_HEADER="PK
",c.CENTRAL_DIRECTORY_END="PK",c.ZIP64_CENTRAL_DIRECTORY_LOCATOR="PK",c.ZIP64_CENTRAL_DIRECTORY_END="PK",c.DATA_DESCRIPTOR="PK\b"},{}],15:[function(a,b){"use strict";function c(a,b){this.data=a,b||(this.data=e.string2binary(this.data)),this.length=this.data.length,this.index=0}var d=a("./dataReader"),e=a("./utils");c.prototype=new d,c.prototype.byteAt=function(a){return this.data.charCodeAt(a)},c.prototype.lastIndexOfSignature=function(a){return this.data.lastIndexOf(a)},c.prototype.readData=function(a){this.checkOffset(a);var b=this.data.slice(this.index,this.index+a);return this.index+=a,b},b.exports=c},{"./dataReader":5,"./utils":21}],16:[function(a,b){"use strict";var c=a("./utils"),d=function(){this.data=[]};d.prototype={append:function(a){a=c.transformTo("string",a),this.data.push(a)},finalize:function(){return this.data.join("")}},b.exports=d},{"./utils":21}],17:[function(a,b,c){(function(a){"use strict";if(c.base64=!0,c.array=!0,c.string=!0,c.arraybuffer="undefined"!=typeof ArrayBuffer&&"undefined"!=typeof Uint8Array,c.nodebuffer="undefined"!=typeof a,c.uint8array="undefined"!=typeof Uint8Array,"undefined"==typeof ArrayBuffer)c.blob=!1;else{var b=new ArrayBuffer(0);try{c.blob=0===new Blob([b],{type:"application/zip"}).size}catch(d){try{var e=window.BlobBuilder||window.WebKitBlobBuilder||window.MozBlobBuilder||window.MSBlobBuilder,f=new e;f.append(b),c.blob=0===f.getBlob("application/zip").size}catch(d){c.blob=!1}}}}).call(this,"undefined"!=typeof Buffer?Buffer:void 0)},{}],18:[function(a,b){"use strict";function c(a){a&&(this.data=a,this.length=this.data.length,this.index=0)}var d=a("./dataReader");c.prototype=new d,c.prototype.byteAt=function(a){return this.data[a]},c.prototype.lastIndexOfSignature=function(a){for(var b=a.charCodeAt(0),c=a.charCodeAt(1),d=a.charCodeAt(2),e=a.charCodeAt(3),f=this.length-4;f>=0;--f)if(this.data[f]===b&&this.data[f+1]===c&&this.data[f+2]===d&&this.data[f+3]===e)return f;return-1},c.prototype.readData=function(a){if(this.checkOffset(a),0===a)return new Uint8Array(0);var b=this.data.subarray(this.index,this.index+a);return this.index+=a,b},b.exports=c},{"./dataReader":5}],19:[function(a,b){"use strict";var c=a("./utils"),d=function(a){this.data=new Uint8Array(a),this.index=0};d.prototype={append:function(a){0!==a.length&&(a=c.transformTo("uint8array",a),this.data.set(a,this.index),this.index+=a.length)},finalize:function(){return this.data}},b.exports=d},{"./utils":21}],20:[function(a,b,c){"use strict";for(var d=a("./utils"),e=a("./support"),f=a("./nodeBuffer"),g=new Array(256),h=0;256>h;h++)g[h]=h>=252?6:h>=248?5:h>=240?4:h>=224?3:h>=192?2:1;g[254]=g[254]=1;var i=function(a){var b,c,d,f,g,h=a.length,i=0;for(f=0;h>f;f++)c=a.charCodeAt(f),55296===(64512&c)&&h>f+1&&(d=a.charCodeAt(f+1),56320===(64512&d)&&(c=65536+(c-55296<<10)+(d-56320),f++)),i+=128>c?1:2048>c?2:65536>c?3:4;for(b=e.uint8array?new Uint8Array(i):new Array(i),g=0,f=0;i>g;f++)c=a.charCodeAt(f),55296===(64512&c)&&h>f+1&&(d=a.charCodeAt(f+1),56320===(64512&d)&&(c=65536+(c-55296<<10)+(d-56320),f++)),128>c?b[g++]=c:2048>c?(b[g++]=192|c>>>6,b[g++]=128|63&c):65536>c?(b[g++]=224|c>>>12,b[g++]=128|c>>>6&63,b[g++]=128|63&c):(b[g++]=240|c>>>18,b[g++]=128|c>>>12&63,b[g++]=128|c>>>6&63,b[g++]=128|63&c);return b},j=function(a,b){var c;for(b=b||a.length,b>a.length&&(b=a.length),c=b-1;c>=0&&128===(192&a[c]);)c--;return 0>c?b:0===c?b:c+g[a[c]]>b?c:b},k=function(a){var b,c,e,f,h=a.length,i=new Array(2*h);for(c=0,b=0;h>b;)if(e=a[b++],128>e)i[c++]=e;else if(f=g[e],f>4)i[c++]=65533,b+=f-1;else{for(e&=2===f?31:3===f?15:7;f>1&&h>b;)e=e<<6|63&a[b++],f--;f>1?i[c++]=65533:65536>e?i[c++]=e:(e-=65536,i[c++]=55296|e>>10&1023,i[c++]=56320|1023&e)}return i.length!==c&&(i.subarray?i=i.subarray(0,c):i.length=c),d.applyFromCharCode(i)};c.utf8encode=function(a){return e.nodebuffer?f(a,"utf-8"):i(a)},c.utf8decode=function(a){if(e.nodebuffer)return d.transformTo("nodebuffer",a).toString("utf-8");a=d.transformTo(e.uint8array?"uint8array":"array",a);for(var b=[],c=0,f=a.length,g=65536;f>c;){var h=j(a,Math.min(c+g,f));b.push(k(e.uint8array?a.subarray(c,h):a.slice(c,h))),c=h}return b.join("")}},{"./nodeBuffer":11,"./support":17,"./utils":21}],21:[function(a,b,c){"use strict";function d(a){return a}function e(a,b){for(var c=0;c<a.length;++c)b[c]=255&a.charCodeAt(c);return b}function f(a){var b=65536,d=[],e=a.length,f=c.getTypeOf(a),g=0,h=!0;try{switch(f){case"uint8array":String.fromCharCode.apply(null,new Uint8Array(0));break;case"nodebuffer":String.fromCharCode.apply(null,j(0))}}catch(i){h=!1}if(!h){for(var k="",l=0;l<a.length;l++)k+=String.fromCharCode(a[l]);return k}for(;e>g&&b>1;)try{d.push("array"===f||"nodebuffer"===f?String.fromCharCode.apply(null,a.slice(g,Math.min(g+b,e))):String.fromCharCode.apply(null,a.subarray(g,Math.min(g+b,e)))),g+=b}catch(i){b=Math.floor(b/2)}return d.join("")}function g(a,b){for(var c=0;c<a.length;c++)b[c]=a[c];return b}var h=a("./support"),i=a("./compressions"),j=a("./nodeBuffer");c.string2binary=function(a){for(var b="",c=0;c<a.length;c++)b+=String.fromCharCode(255&a.charCodeAt(c));return b},c.arrayBuffer2Blob=function(a){c.checkSupport("blob");try{return new Blob([a],{type:"application/zip"})}catch(b){try{var d=window.BlobBuilder||window.WebKitBlobBuilder||window.MozBlobBuilder||window.MSBlobBuilder,e=new d;return e.append(a),e.getBlob("application/zip")}catch(b){throw new Error("Bug : can't construct the Blob.")}}},c.applyFromCharCode=f;var k={};k.string={string:d,array:function(a){return e(a,new Array(a.length))},arraybuffer:function(a){return k.string.uint8array(a).buffer},uint8array:function(a){return e(a,new Uint8Array(a.length))},nodebuffer:function(a){return e(a,j(a.length))}},k.array={string:f,array:d,arraybuffer:function(a){return new Uint8Array(a).buffer},uint8array:function(a){return new Uint8Array(a)},nodebuffer:function(a){return j(a)}},k.arraybuffer={string:function(a){return f(new Uint8Array(a))},array:function(a){return g(new Uint8Array(a),new Array(a.byteLength))},arraybuffer:d,uint8array:function(a){return new Uint8Array(a)},nodebuffer:function(a){return j(new Uint8Array(a))}},k.uint8array={string:f,array:function(a){return g(a,new Array(a.length))},arraybuffer:function(a){return a.buffer},uint8array:d,nodebuffer:function(a){return j(a)}},k.nodebuffer={string:f,array:function(a){return g(a,new Array(a.length))},arraybuffer:function(a){return k.nodebuffer.uint8array(a).buffer},uint8array:function(a){return g(a,new Uint8Array(a.length))},nodebuffer:d},c.transformTo=function(a,b){if(b||(b=""),!a)return b;c.checkSupport(a);var d=c.getTypeOf(b),e=k[d][a](b);return e},c.getTypeOf=function(a){return"string"==typeof a?"string":"[object Array]"===Object.prototype.toString.call(a)?"array":h.nodebuffer&&j.test(a)?"nodebuffer":h.uint8array&&a instanceof Uint8Array?"uint8array":h.arraybuffer&&a instanceof ArrayBuffer?"arraybuffer":void 0},c.checkSupport=function(a){var b=h[a.toLowerCase()];if(!b)throw new Error(a+" is not supported by this browser")},c.MAX_VALUE_16BITS=65535,c.MAX_VALUE_32BITS=-1,c.pretty=function(a){var b,c,d="";for(c=0;c<(a||"").length;c++)b=a.charCodeAt(c),d+="\\x"+(16>b?"0":"")+b.toString(16).toUpperCase();return d},c.findCompression=function(a){for(var b in i)if(i.hasOwnProperty(b)&&i[b].magic===a)return i[b];return null},c.isRegExp=function(a){return"[object RegExp]"===Object.prototype.toString.call(a)}},{"./compressions":3,"./nodeBuffer":11,"./support":17}],22:[function(a,b){"use strict";function c(a,b){this.files=[],this.loadOptions=b,a&&this.load(a)}var d=a("./stringReader"),e=a("./nodeBufferReader"),f=a("./uint8ArrayReader"),g=a("./utils"),h=a("./signature"),i=a("./zipEntry"),j=a("./support"),k=a("./object");c.prototype={checkSignature:function(a){var b=this.reader.readString(4);if(b!==a)throw new Error("Corrupted zip or bug : unexpected signature ("+g.pretty(b)+", expected "+g.pretty(a)+")")},readBlockEndOfCentral:function(){this.diskNumber=this.reader.readInt(2),this.diskWithCentralDirStart=this.reader.readInt(2),this.centralDirRecordsOnThisDisk=this.reader.readInt(2),this.centralDirRecords=this.reader.readInt(2),this.centralDirSize=this.reader.readInt(4),this.centralDirOffset=this.reader.readInt(4),this.zipCommentLength=this.reader.readInt(2),this.zipComment=this.reader.readString(this.zipCommentLength),this.zipComment=k.utf8decode(this.zipComment)},readBlockZip64EndOfCentral:function(){this.zip64EndOfCentralSize=this.reader.readInt(8),this.versionMadeBy=this.reader.readString(2),this.versionNeeded=this.reader.readInt(2),this.diskNumber=this.reader.readInt(4),this.diskWithCentralDirStart=this.reader.readInt(4),this.centralDirRecordsOnThisDisk=this.reader.readInt(8),this.centralDirRecords=this.reader.readInt(8),this.centralDirSize=this.reader.readInt(8),this.centralDirOffset=this.reader.readInt(8),this.zip64ExtensibleData={};for(var a,b,c,d=this.zip64EndOfCentralSize-44,e=0;d>e;)a=this.reader.readInt(2),b=this.reader.readInt(4),c=this.reader.readString(b),this.zip64ExtensibleData[a]={id:a,length:b,value:c}},readBlockZip64EndOfCentralLocator:function(){if(this.diskWithZip64CentralDirStart=this.reader.readInt(4),this.relativeOffsetEndOfZip64CentralDir=this.reader.readInt(8),this.disksCount=this.reader.readInt(4),this.disksCount>1)throw new Error("Multi-volumes zip are not supported")},readLocalFiles:function(){var a,b;for(a=0;a<this.files.length;a++)b=this.files[a],this.reader.setIndex(b.localHeaderOffset),this.checkSignature(h.LOCAL_FILE_HEADER),b.readLocalPart(this.reader),b.handleUTF8()},readCentralDir:function(){var a;for(this.reader.setIndex(this.centralDirOffset);this.reader.readString(4)===h.CENTRAL_FILE_HEADER;)a=new i({zip64:this.zip64},this.loadOptions),a.readCentralPart(this.reader),this.files.push(a)},readEndOfCentral:function(){var a=this.reader.lastIndexOfSignature(h.CENTRAL_DIRECTORY_END);if(-1===a)throw new Error("Corrupted zip : can't find end of central directory");if(this.reader.setIndex(a),this.checkSignature(h.CENTRAL_DIRECTORY_END),this.readBlockEndOfCentral(),this.diskNumber===g.MAX_VALUE_16BITS||this.diskWithCentralDirStart===g.MAX_VALUE_16BITS||this.centralDirRecordsOnThisDisk===g.MAX_VALUE_16BITS||this.centralDirRecords===g.MAX_VALUE_16BITS||this.centralDirSize===g.MAX_VALUE_32BITS||this.centralDirOffset===g.MAX_VALUE_32BITS){if(this.zip64=!0,a=this.reader.lastIndexOfSignature(h.ZIP64_CENTRAL_DIRECTORY_LOCATOR),-1===a)throw new Error("Corrupted zip : can't find the ZIP64 end of central directory locator");this.reader.setIndex(a),this.checkSignature(h.ZIP64_CENTRAL_DIRECTORY_LOCATOR),this.readBlockZip64EndOfCentralLocator(),this.reader.setIndex(this.relativeOffsetEndOfZip64CentralDir),this.checkSignature(h.ZIP64_CENTRAL_DIRECTORY_END),this.readBlockZip64EndOfCentral()}},prepareReader:function(a){var b=g.getTypeOf(a);this.reader="string"!==b||j.uint8array?"nodebuffer"===b?new e(a):new f(g.transformTo("uint8array",a)):new d(a,this.loadOptions.optimizedBinaryString)},load:function(a){this.prepareReader(a),this.readEndOfCentral(),this.readCentralDir(),this.readLocalFiles()}},b.exports=c},{"./nodeBufferReader":12,"./object":13,"./signature":14,"./stringReader":15,"./support":17,"./uint8ArrayReader":18,"./utils":21,"./zipEntry":23}],23:[function(a,b){"use strict";function c(a,b){this.options=a,this.loadOptions=b}var d=a("./stringReader"),e=a("./utils"),f=a("./compressedObject"),g=a("./object");c.prototype={isEncrypted:function(){return 1===(1&this.bitFlag)},useUTF8:function(){return 2048===(2048&this.bitFlag)},prepareCompressedContent:function(a,b,c){return function(){var d=a.index;a.setIndex(b);var e=a.readData(c);return a.setIndex(d),e}},prepareContent:function(a,b,c,d,f){return function(){var a=e.transformTo(d.uncompressInputType,this.getCompressedContent()),b=d.uncompress(a);if(b.length!==f)throw new Error("Bug : uncompressed data size mismatch");return b}},readLocalPart:function(a){var b,c;if(a.skip(22),this.fileNameLength=a.readInt(2),c=a.readInt(2),this.fileName=a.readString(this.fileNameLength),a.skip(c),-1==this.compressedSize||-1==this.uncompressedSize)throw new Error("Bug or corrupted zip : didn't get enough informations from the central directory (compressedSize == -1 || uncompressedSize == -1)");if(b=e.findCompression(this.compressionMethod),null===b)throw new Error("Corrupted zip : compression "+e.pretty(this.compressionMethod)+" unknown (inner file : "+this.fileName+")");if(this.donapressed=new f,this.donapressed.compressedSize=this.compressedSize,this.donapressed.uncompressedSize=this.uncompressedSize,this.donapressed.crc32=this.crc32,this.donapressed.compressionMethod=this.compressionMethod,this.donapressed.getCompressedContent=this.prepareCompressedContent(a,a.index,this.compressedSize,b),this.donapressed.getContent=this.prepareContent(a,a.index,this.compressedSize,b,this.uncompressedSize),this.loadOptions.checkCRC32&&(this.donapressed=e.transformTo("string",this.donapressed.getContent()),g.crc32(this.donapressed)!==this.crc32))throw new Error("Corrupted zip : CRC32 mismatch")},readCentralPart:function(a){if(this.versionMadeBy=a.readString(2),this.versionNeeded=a.readInt(2),this.bitFlag=a.readInt(2),this.compressionMethod=a.readString(2),this.date=a.readDate(),this.crc32=a.readInt(4),this.compressedSize=a.readInt(4),this.uncompressedSize=a.readInt(4),this.fileNameLength=a.readInt(2),this.extraFieldsLength=a.readInt(2),this.fileCommentLength=a.readInt(2),this.diskNumberStart=a.readInt(2),this.internalFileAttributes=a.readInt(2),this.externalFileAttributes=a.readInt(4),this.localHeaderOffset=a.readInt(4),this.isEncrypted())throw new Error("Encrypted zip are not supported");this.fileName=a.readString(this.fileNameLength),this.readExtraFields(a),this.parseZIP64ExtraField(a),this.fileComment=a.readString(this.fileCommentLength),this.dir=16&this.externalFileAttributes?!0:!1},parseZIP64ExtraField:function(){if(this.extraFields[1]){var a=new d(this.extraFields[1].value);this.uncompressedSize===e.MAX_VALUE_32BITS&&(this.uncompressedSize=a.readInt(8)),this.compressedSize===e.MAX_VALUE_32BITS&&(this.compressedSize=a.readInt(8)),this.localHeaderOffset===e.MAX_VALUE_32BITS&&(this.localHeaderOffset=a.readInt(8)),this.diskNumberStart===e.MAX_VALUE_32BITS&&(this.diskNumberStart=a.readInt(4))}},readExtraFields:function(a){var b,c,d,e=a.index;for(this.extraFields=this.extraFields||{};a.index<e+this.extraFieldsLength;)b=a.readInt(2),c=a.readInt(2),d=a.readString(c),this.extraFields[b]={id:b,length:c,value:d}},handleUTF8:function(){if(this.useUTF8())this.fileName=g.utf8decode(this.fileName),this.fileComment=g.utf8decode(this.fileComment);else{var a=this.findExtraFieldUnicodePath();null!==a&&(this.fileName=a);var b=this.findExtraFieldUnicodeComment();null!==b&&(this.fileComment=b)}},findExtraFieldUnicodePath:function(){var a=this.extraFields[28789];if(a){var b=new d(a.value);return 1!==b.readInt(1)?null:g.crc32(this.fileName)!==b.readInt(4)?null:g.utf8decode(b.readString(a.length-5))}return null},findExtraFieldUnicodeComment:function(){var a=this.extraFields[25461];if(a){var b=new d(a.value);return 1!==b.readInt(1)?null:g.crc32(this.fileComment)!==b.readInt(4)?null:g.utf8decode(b.readString(a.length-5))}return null}},b.exports=c},{"./compressedObject":2,"./object":13,"./stringReader":15,"./utils":21}],24:[function(a,b){"use strict";var c=a("./lib/utils/common").assign,d=a("./lib/deflate"),e=a("./lib/inflate"),f=a("./lib/zlib/constants"),g={};c(g,d,e,f),b.exports=g},{"./lib/deflate":25,"./lib/inflate":26,"./lib/utils/common":27,"./lib/zlib/constants":30}],25:[function(a,b,c){"use strict";function d(a,b){var c=new s(b);if(c.push(a,!0),c.err)throw c.msg;return c.result}function e(a,b){return b=b||{},b.raw=!0,d(a,b)}function f(a,b){return b=b||{},b.gzip=!0,d(a,b)}var g=a("./zlib/deflate.js"),h=a("./utils/common"),i=a("./utils/strings"),j=a("./zlib/messages"),k=a("./zlib/zstream"),l=0,m=4,n=0,o=1,p=-1,q=0,r=8,s=function(a){this.options=h.assign({level:p,method:r,chunkSize:16384,windowBits:15,memLevel:8,strategy:q,to:""},a||{});var b=this.options;b.raw&&b.windowBits>0?b.windowBits=-b.windowBits:b.gzip&&b.windowBits>0&&b.windowBits<16&&(b.windowBits+=16),this.err=0,this.msg="",this.ended=!1,this.chunks=[],this.strm=new k,this.strm.avail_out=0;var c=g.deflateInit2(this.strm,b.level,b.method,b.windowBits,b.memLevel,b.strategy);if(c!==n)throw new Error(j[c]);b.header&&g.deflateSetHeader(this.strm,b.header);
 
 };s.prototype.push=function(a,b){var c,d,e=this.strm,f=this.options.chunkSize;if(this.ended)return!1;d=b===~~b?b:b===!0?m:l,e.input="string"==typeof a?i.string2buf(a):a,e.next_in=0,e.avail_in=e.input.length;do{if(0===e.avail_out&&(e.output=new h.Buf8(f),e.next_out=0,e.avail_out=f),c=g.deflate(e,d),c!==o&&c!==n)return this.onEnd(c),this.ended=!0,!1;(0===e.avail_out||0===e.avail_in&&d===m)&&this.onData("string"===this.options.to?i.buf2binstring(h.shrinkBuf(e.output,e.next_out)):h.shrinkBuf(e.output,e.next_out))}while((e.avail_in>0||0===e.avail_out)&&c!==o);return d===m?(c=g.deflateEnd(this.strm),this.onEnd(c),this.ended=!0,c===n):!0},s.prototype.onData=function(a){this.chunks.push(a)},s.prototype.onEnd=function(a){a===n&&(this.result="string"===this.options.to?this.chunks.join(""):h.flattenChunks(this.chunks)),this.chunks=[],this.err=a,this.msg=this.strm.msg},c.Deflate=s,c.deflate=d,c.deflateRaw=e,c.gzip=f},{"./utils/common":27,"./utils/strings":28,"./zlib/deflate.js":32,"./zlib/messages":37,"./zlib/zstream":39}],26:[function(a,b,c){"use strict";function d(a,b){var c=new m(b);if(c.push(a,!0),c.err)throw c.msg;return c.result}function e(a,b){return b=b||{},b.raw=!0,d(a,b)}var f=a("./zlib/inflate.js"),g=a("./utils/common"),h=a("./utils/strings"),i=a("./zlib/constants"),j=a("./zlib/messages"),k=a("./zlib/zstream"),l=a("./zlib/gzheader"),m=function(a){this.options=g.assign({chunkSize:16384,windowBits:0,to:""},a||{});var b=this.options;b.raw&&b.windowBits>=0&&b.windowBits<16&&(b.windowBits=-b.windowBits,0===b.windowBits&&(b.windowBits=-15)),!(b.windowBits>=0&&b.windowBits<16)||a&&a.windowBits||(b.windowBits+=32),b.windowBits>15&&b.windowBits<48&&0===(15&b.windowBits)&&(b.windowBits|=15),this.err=0,this.msg="",this.ended=!1,this.chunks=[],this.strm=new k,this.strm.avail_out=0;var c=f.inflateInit2(this.strm,b.windowBits);if(c!==i.Z_OK)throw new Error(j[c]);this.header=new l,f.inflateGetHeader(this.strm,this.header)};m.prototype.push=function(a,b){var c,d,e,j,k,l=this.strm,m=this.options.chunkSize;if(this.ended)return!1;d=b===~~b?b:b===!0?i.Z_FINISH:i.Z_NO_FLUSH,l.input="string"==typeof a?h.binstring2buf(a):a,l.next_in=0,l.avail_in=l.input.length;do{if(0===l.avail_out&&(l.output=new g.Buf8(m),l.next_out=0,l.avail_out=m),c=f.inflate(l,i.Z_NO_FLUSH),c!==i.Z_STREAM_END&&c!==i.Z_OK)return this.onEnd(c),this.ended=!0,!1;l.next_out&&(0===l.avail_out||c===i.Z_STREAM_END||0===l.avail_in&&d===i.Z_FINISH)&&("string"===this.options.to?(e=h.utf8border(l.output,l.next_out),j=l.next_out-e,k=h.buf2string(l.output,e),l.next_out=j,l.avail_out=m-j,j&&g.arraySet(l.output,l.output,e,j,0),this.onData(k)):this.onData(g.shrinkBuf(l.output,l.next_out)))}while(l.avail_in>0&&c!==i.Z_STREAM_END);return c===i.Z_STREAM_END&&(d=i.Z_FINISH),d===i.Z_FINISH?(c=f.inflateEnd(this.strm),this.onEnd(c),this.ended=!0,c===i.Z_OK):!0},m.prototype.onData=function(a){this.chunks.push(a)},m.prototype.onEnd=function(a){a===i.Z_OK&&(this.result="string"===this.options.to?this.chunks.join(""):g.flattenChunks(this.chunks)),this.chunks=[],this.err=a,this.msg=this.strm.msg},c.Inflate=m,c.inflate=d,c.inflateRaw=e,c.ungzip=d},{"./utils/common":27,"./utils/strings":28,"./zlib/constants":30,"./zlib/gzheader":33,"./zlib/inflate.js":35,"./zlib/messages":37,"./zlib/zstream":39}],27:[function(a,b,c){"use strict";var d="undefined"!=typeof Uint8Array&&"undefined"!=typeof Uint16Array&&"undefined"!=typeof Int32Array;c.assign=function(a){for(var b=Array.prototype.slice.call(arguments,1);b.length;){var c=b.shift();if(c){if("object"!=typeof c)throw new TypeError(c+"must be non-object");for(var d in c)c.hasOwnProperty(d)&&(a[d]=c[d])}}return a},c.shrinkBuf=function(a,b){return a.length===b?a:a.subarray?a.subarray(0,b):(a.length=b,a)};var e={arraySet:function(a,b,c,d,e){if(b.subarray&&a.subarray)return void a.set(b.subarray(c,c+d),e);for(var f=0;d>f;f++)a[e+f]=b[c+f]},flattenChunks:function(a){var b,c,d,e,f,g;for(d=0,b=0,c=a.length;c>b;b++)d+=a[b].length;for(g=new Uint8Array(d),e=0,b=0,c=a.length;c>b;b++)f=a[b],g.set(f,e),e+=f.length;return g}},f={arraySet:function(a,b,c,d,e){for(var f=0;d>f;f++)a[e+f]=b[c+f]},flattenChunks:function(a){return[].concat.apply([],a)}};c.setTyped=function(a){a?(c.Buf8=Uint8Array,c.Buf16=Uint16Array,c.Buf32=Int32Array,c.assign(c,e)):(c.Buf8=Array,c.Buf16=Array,c.Buf32=Array,c.assign(c,f))},c.setTyped(d)},{}],28:[function(a,b,c){"use strict";function d(a,b){if(65537>b&&(a.subarray&&g||!a.subarray&&f))return String.fromCharCode.apply(null,e.shrinkBuf(a,b));for(var c="",d=0;b>d;d++)c+=String.fromCharCode(a[d]);return c}var e=a("./common"),f=!0,g=!0;try{String.fromCharCode.apply(null,[0])}catch(h){f=!1}try{String.fromCharCode.apply(null,new Uint8Array(1))}catch(h){g=!1}for(var i=new e.Buf8(256),j=0;256>j;j++)i[j]=j>=252?6:j>=248?5:j>=240?4:j>=224?3:j>=192?2:1;i[254]=i[254]=1,c.string2buf=function(a){var b,c,d,f,g,h=a.length,i=0;for(f=0;h>f;f++)c=a.charCodeAt(f),55296===(64512&c)&&h>f+1&&(d=a.charCodeAt(f+1),56320===(64512&d)&&(c=65536+(c-55296<<10)+(d-56320),f++)),i+=128>c?1:2048>c?2:65536>c?3:4;for(b=new e.Buf8(i),g=0,f=0;i>g;f++)c=a.charCodeAt(f),55296===(64512&c)&&h>f+1&&(d=a.charCodeAt(f+1),56320===(64512&d)&&(c=65536+(c-55296<<10)+(d-56320),f++)),128>c?b[g++]=c:2048>c?(b[g++]=192|c>>>6,b[g++]=128|63&c):65536>c?(b[g++]=224|c>>>12,b[g++]=128|c>>>6&63,b[g++]=128|63&c):(b[g++]=240|c>>>18,b[g++]=128|c>>>12&63,b[g++]=128|c>>>6&63,b[g++]=128|63&c);return b},c.buf2binstring=function(a){return d(a,a.length)},c.binstring2buf=function(a){for(var b=new e.Buf8(a.length),c=0,d=b.length;d>c;c++)b[c]=a.charCodeAt(c);return b},c.buf2string=function(a,b){var c,e,f,g,h=b||a.length,j=new Array(2*h);for(e=0,c=0;h>c;)if(f=a[c++],128>f)j[e++]=f;else if(g=i[f],g>4)j[e++]=65533,c+=g-1;else{for(f&=2===g?31:3===g?15:7;g>1&&h>c;)f=f<<6|63&a[c++],g--;g>1?j[e++]=65533:65536>f?j[e++]=f:(f-=65536,j[e++]=55296|f>>10&1023,j[e++]=56320|1023&f)}return d(j,e)},c.utf8border=function(a,b){var c;for(b=b||a.length,b>a.length&&(b=a.length),c=b-1;c>=0&&128===(192&a[c]);)c--;return 0>c?b:0===c?b:c+i[a[c]]>b?c:b}},{"./common":27}],29:[function(a,b){"use strict";function c(a,b,c,d){for(var e=65535&a|0,f=a>>>16&65535|0,g=0;0!==c;){g=c>2e3?2e3:c,c-=g;do e=e+b[d++]|0,f=f+e|0;while(--g);e%=65521,f%=65521}return e|f<<16|0}b.exports=c},{}],30:[function(a,b){b.exports={Z_NO_FLUSH:0,Z_PARTIAL_FLUSH:1,Z_SYNC_FLUSH:2,Z_FULL_FLUSH:3,Z_FINISH:4,Z_BLOCK:5,Z_TREES:6,Z_OK:0,Z_STREAM_END:1,Z_NEED_DICT:2,Z_ERRNO:-1,Z_STREAM_ERROR:-2,Z_DATA_ERROR:-3,Z_BUF_ERROR:-5,Z_NO_COMPRESSION:0,Z_BEST_SPEED:1,Z_BEST_COMPRESSION:9,Z_DEFAULT_COMPRESSION:-1,Z_FILTERED:1,Z_HUFFMAN_ONLY:2,Z_RLE:3,Z_FIXED:4,Z_DEFAULT_STRATEGY:0,Z_BINARY:0,Z_TEXT:1,Z_UNKNOWN:2,Z_DEFLATED:8}},{}],31:[function(a,b){"use strict";function c(){for(var a,b=[],c=0;256>c;c++){a=c;for(var d=0;8>d;d++)a=1&a?3988292384^a>>>1:a>>>1;b[c]=a}return b}function d(a,b,c,d){var f=e,g=d+c;a=-1^a;for(var h=d;g>h;h++)a=a>>>8^f[255&(a^b[h])];return-1^a}var e=c();b.exports=d},{}],32:[function(a,b,c){"use strict";function d(a,b){return a.msg=G[b],b}function e(a){return(a<<1)-(a>4?9:0)}function f(a){for(var b=a.length;--b>=0;)a[b]=0}function g(a){var b=a.state,c=b.pending;c>a.avail_out&&(c=a.avail_out),0!==c&&(C.arraySet(a.output,b.pending_buf,b.pending_out,c,a.next_out),a.next_out+=c,b.pending_out+=c,a.total_out+=c,a.avail_out-=c,b.pending-=c,0===b.pending&&(b.pending_out=0))}function h(a,b){D._tr_flush_block(a,a.block_start>=0?a.block_start:-1,a.strstart-a.block_start,b),a.block_start=a.strstart,g(a.strm)}function i(a,b){a.pending_buf[a.pending++]=b}function j(a,b){a.pending_buf[a.pending++]=b>>>8&255,a.pending_buf[a.pending++]=255&b}function k(a,b,c,d){var e=a.avail_in;return e>d&&(e=d),0===e?0:(a.avail_in-=e,C.arraySet(b,a.input,a.next_in,e,c),1===a.state.wrap?a.adler=E(a.adler,b,e,c):2===a.state.wrap&&(a.adler=F(a.adler,b,e,c)),a.next_in+=e,a.total_in+=e,e)}function l(a,b){var c,d,e=a.max_chain_length,f=a.strstart,g=a.prev_length,h=a.nice_match,i=a.strstart>a.w_size-ja?a.strstart-(a.w_size-ja):0,j=a.window,k=a.w_mask,l=a.prev,m=a.strstart+ia,n=j[f+g-1],o=j[f+g];a.prev_length>=a.good_match&&(e>>=2),h>a.lookahead&&(h=a.lookahead);do if(c=b,j[c+g]===o&&j[c+g-1]===n&&j[c]===j[f]&&j[++c]===j[f+1]){f+=2,c++;do;while(j[++f]===j[++c]&&j[++f]===j[++c]&&j[++f]===j[++c]&&j[++f]===j[++c]&&j[++f]===j[++c]&&j[++f]===j[++c]&&j[++f]===j[++c]&&j[++f]===j[++c]&&m>f);if(d=ia-(m-f),f=m-ia,d>g){if(a.match_start=b,g=d,d>=h)break;n=j[f+g-1],o=j[f+g]}}while((b=l[b&k])>i&&0!==--e);return g<=a.lookahead?g:a.lookahead}function m(a){var b,c,d,e,f,g=a.w_size;do{if(e=a.window_size-a.lookahead-a.strstart,a.strstart>=g+(g-ja)){C.arraySet(a.window,a.window,g,g,0),a.match_start-=g,a.strstart-=g,a.block_start-=g,c=a.hash_size,b=c;do d=a.head[--b],a.head[b]=d>=g?d-g:0;while(--c);c=g,b=c;do d=a.prev[--b],a.prev[b]=d>=g?d-g:0;while(--c);e+=g}if(0===a.strm.avail_in)break;if(c=k(a.strm,a.window,a.strstart+a.lookahead,e),a.lookahead+=c,a.lookahead+a.insert>=ha)for(f=a.strstart-a.insert,a.ins_h=a.window[f],a.ins_h=(a.ins_h<<a.hash_shift^a.window[f+1])&a.hash_mask;a.insert&&(a.ins_h=(a.ins_h<<a.hash_shift^a.window[f+ha-1])&a.hash_mask,a.prev[f&a.w_mask]=a.head[a.ins_h],a.head[a.ins_h]=f,f++,a.insert--,!(a.lookahead+a.insert<ha)););}while(a.lookahead<ja&&0!==a.strm.avail_in)}function n(a,b){var c=65535;for(c>a.pending_buf_size-5&&(c=a.pending_buf_size-5);;){if(a.lookahead<=1){if(m(a),0===a.lookahead&&b===H)return sa;if(0===a.lookahead)break}a.strstart+=a.lookahead,a.lookahead=0;var d=a.block_start+c;if((0===a.strstart||a.strstart>=d)&&(a.lookahead=a.strstart-d,a.strstart=d,h(a,!1),0===a.strm.avail_out))return sa;if(a.strstart-a.block_start>=a.w_size-ja&&(h(a,!1),0===a.strm.avail_out))return sa}return a.insert=0,b===K?(h(a,!0),0===a.strm.avail_out?ua:va):a.strstart>a.block_start&&(h(a,!1),0===a.strm.avail_out)?sa:sa}function o(a,b){for(var c,d;;){if(a.lookahead<ja){if(m(a),a.lookahead<ja&&b===H)return sa;if(0===a.lookahead)break}if(c=0,a.lookahead>=ha&&(a.ins_h=(a.ins_h<<a.hash_shift^a.window[a.strstart+ha-1])&a.hash_mask,c=a.prev[a.strstart&a.w_mask]=a.head[a.ins_h],a.head[a.ins_h]=a.strstart),0!==c&&a.strstart-c<=a.w_size-ja&&(a.match_length=l(a,c)),a.match_length>=ha)if(d=D._tr_tally(a,a.strstart-a.match_start,a.match_length-ha),a.lookahead-=a.match_length,a.match_length<=a.max_lazy_match&&a.lookahead>=ha){a.match_length--;do a.strstart++,a.ins_h=(a.ins_h<<a.hash_shift^a.window[a.strstart+ha-1])&a.hash_mask,c=a.prev[a.strstart&a.w_mask]=a.head[a.ins_h],a.head[a.ins_h]=a.strstart;while(0!==--a.match_length);a.strstart++}else a.strstart+=a.match_length,a.match_length=0,a.ins_h=a.window[a.strstart],a.ins_h=(a.ins_h<<a.hash_shift^a.window[a.strstart+1])&a.hash_mask;else d=D._tr_tally(a,0,a.window[a.strstart]),a.lookahead--,a.strstart++;if(d&&(h(a,!1),0===a.strm.avail_out))return sa}return a.insert=a.strstart<ha-1?a.strstart:ha-1,b===K?(h(a,!0),0===a.strm.avail_out?ua:va):a.last_lit&&(h(a,!1),0===a.strm.avail_out)?sa:ta}function p(a,b){for(var c,d,e;;){if(a.lookahead<ja){if(m(a),a.lookahead<ja&&b===H)return sa;if(0===a.lookahead)break}if(c=0,a.lookahead>=ha&&(a.ins_h=(a.ins_h<<a.hash_shift^a.window[a.strstart+ha-1])&a.hash_mask,c=a.prev[a.strstart&a.w_mask]=a.head[a.ins_h],a.head[a.ins_h]=a.strstart),a.prev_length=a.match_length,a.prev_match=a.match_start,a.match_length=ha-1,0!==c&&a.prev_length<a.max_lazy_match&&a.strstart-c<=a.w_size-ja&&(a.match_length=l(a,c),a.match_length<=5&&(a.strategy===S||a.match_length===ha&&a.strstart-a.match_start>4096)&&(a.match_length=ha-1)),a.prev_length>=ha&&a.match_length<=a.prev_length){e=a.strstart+a.lookahead-ha,d=D._tr_tally(a,a.strstart-1-a.prev_match,a.prev_length-ha),a.lookahead-=a.prev_length-1,a.prev_length-=2;do++a.strstart<=e&&(a.ins_h=(a.ins_h<<a.hash_shift^a.window[a.strstart+ha-1])&a.hash_mask,c=a.prev[a.strstart&a.w_mask]=a.head[a.ins_h],a.head[a.ins_h]=a.strstart);while(0!==--a.prev_length);if(a.match_available=0,a.match_length=ha-1,a.strstart++,d&&(h(a,!1),0===a.strm.avail_out))return sa}else if(a.match_available){if(d=D._tr_tally(a,0,a.window[a.strstart-1]),d&&h(a,!1),a.strstart++,a.lookahead--,0===a.strm.avail_out)return sa}else a.match_available=1,a.strstart++,a.lookahead--}return a.match_available&&(d=D._tr_tally(a,0,a.window[a.strstart-1]),a.match_available=0),a.insert=a.strstart<ha-1?a.strstart:ha-1,b===K?(h(a,!0),0===a.strm.avail_out?ua:va):a.last_lit&&(h(a,!1),0===a.strm.avail_out)?sa:ta}function q(a,b){for(var c,d,e,f,g=a.window;;){if(a.lookahead<=ia){if(m(a),a.lookahead<=ia&&b===H)return sa;if(0===a.lookahead)break}if(a.match_length=0,a.lookahead>=ha&&a.strstart>0&&(e=a.strstart-1,d=g[e],d===g[++e]&&d===g[++e]&&d===g[++e])){f=a.strstart+ia;do;while(d===g[++e]&&d===g[++e]&&d===g[++e]&&d===g[++e]&&d===g[++e]&&d===g[++e]&&d===g[++e]&&d===g[++e]&&f>e);a.match_length=ia-(f-e),a.match_length>a.lookahead&&(a.match_length=a.lookahead)}if(a.match_length>=ha?(c=D._tr_tally(a,1,a.match_length-ha),a.lookahead-=a.match_length,a.strstart+=a.match_length,a.match_length=0):(c=D._tr_tally(a,0,a.window[a.strstart]),a.lookahead--,a.strstart++),c&&(h(a,!1),0===a.strm.avail_out))return sa}return a.insert=0,b===K?(h(a,!0),0===a.strm.avail_out?ua:va):a.last_lit&&(h(a,!1),0===a.strm.avail_out)?sa:ta}function r(a,b){for(var c;;){if(0===a.lookahead&&(m(a),0===a.lookahead)){if(b===H)return sa;break}if(a.match_length=0,c=D._tr_tally(a,0,a.window[a.strstart]),a.lookahead--,a.strstart++,c&&(h(a,!1),0===a.strm.avail_out))return sa}return a.insert=0,b===K?(h(a,!0),0===a.strm.avail_out?ua:va):a.last_lit&&(h(a,!1),0===a.strm.avail_out)?sa:ta}function s(a){a.window_size=2*a.w_size,f(a.head),a.max_lazy_match=B[a.level].max_lazy,a.good_match=B[a.level].good_length,a.nice_match=B[a.level].nice_length,a.max_chain_length=B[a.level].max_chain,a.strstart=0,a.block_start=0,a.lookahead=0,a.insert=0,a.match_length=a.prev_length=ha-1,a.match_available=0,a.ins_h=0}function t(){this.strm=null,this.status=0,this.pending_buf=null,this.pending_buf_size=0,this.pending_out=0,this.pending=0,this.wrap=0,this.gzhead=null,this.gzindex=0,this.method=Y,this.last_flush=-1,this.w_size=0,this.w_bits=0,this.w_mask=0,this.window=null,this.window_size=0,this.prev=null,this.head=null,this.ins_h=0,this.hash_size=0,this.hash_bits=0,this.hash_mask=0,this.hash_shift=0,this.block_start=0,this.match_length=0,this.prev_match=0,this.match_available=0,this.strstart=0,this.match_start=0,this.lookahead=0,this.prev_length=0,this.max_chain_length=0,this.max_lazy_match=0,this.level=0,this.strategy=0,this.good_match=0,this.nice_match=0,this.dyn_ltree=new C.Buf16(2*fa),this.dyn_dtree=new C.Buf16(2*(2*da+1)),this.bl_tree=new C.Buf16(2*(2*ea+1)),f(this.dyn_ltree),f(this.dyn_dtree),f(this.bl_tree),this.l_desc=null,this.d_desc=null,this.bl_desc=null,this.bl_count=new C.Buf16(ga+1),this.heap=new C.Buf16(2*ca+1),f(this.heap),this.heap_len=0,this.heap_max=0,this.depth=new C.Buf16(2*ca+1),f(this.depth),this.l_buf=0,this.lit_bufsize=0,this.last_lit=0,this.d_buf=0,this.opt_len=0,this.static_len=0,this.matches=0,this.insert=0,this.bi_buf=0,this.bi_valid=0}function u(a){var b;return a&&a.state?(a.total_in=a.total_out=0,a.data_type=X,b=a.state,b.pending=0,b.pending_out=0,b.wrap<0&&(b.wrap=-b.wrap),b.status=b.wrap?la:qa,a.adler=2===b.wrap?0:1,b.last_flush=H,D._tr_init(b),M):d(a,O)}function v(a){var b=u(a);return b===M&&s(a.state),b}function w(a,b){return a&&a.state?2!==a.state.wrap?O:(a.state.gzhead=b,M):O}function x(a,b,c,e,f,g){if(!a)return O;var h=1;if(b===R&&(b=6),0>e?(h=0,e=-e):e>15&&(h=2,e-=16),1>f||f>Z||c!==Y||8>e||e>15||0>b||b>9||0>g||g>V)return d(a,O);8===e&&(e=9);var i=new t;return a.state=i,i.strm=a,i.wrap=h,i.gzhead=null,i.w_bits=e,i.w_size=1<<i.w_bits,i.w_mask=i.w_size-1,i.hash_bits=f+7,i.hash_size=1<<i.hash_bits,i.hash_mask=i.hash_size-1,i.hash_shift=~~((i.hash_bits+ha-1)/ha),i.window=new C.Buf8(2*i.w_size),i.head=new C.Buf16(i.hash_size),i.prev=new C.Buf16(i.w_size),i.lit_bufsize=1<<f+6,i.pending_buf_size=4*i.lit_bufsize,i.pending_buf=new C.Buf8(i.pending_buf_size),i.d_buf=i.lit_bufsize>>1,i.l_buf=3*i.lit_bufsize,i.level=b,i.strategy=g,i.method=c,v(a)}function y(a,b){return x(a,b,Y,$,_,W)}function z(a,b){var c,h,k,l;if(!a||!a.state||b>L||0>b)return a?d(a,O):O;if(h=a.state,!a.output||!a.input&&0!==a.avail_in||h.status===ra&&b!==K)return d(a,0===a.avail_out?Q:O);if(h.strm=a,c=h.last_flush,h.last_flush=b,h.status===la)if(2===h.wrap)a.adler=0,i(h,31),i(h,139),i(h,8),h.gzhead?(i(h,(h.gzhead.text?1:0)+(h.gzhead.hcrc?2:0)+(h.gzhead.extra?4:0)+(h.gzhead.name?8:0)+(h.gzhead.comment?16:0)),i(h,255&h.gzhead.time),i(h,h.gzhead.time>>8&255),i(h,h.gzhead.time>>16&255),i(h,h.gzhead.time>>24&255),i(h,9===h.level?2:h.strategy>=T||h.level<2?4:0),i(h,255&h.gzhead.os),h.gzhead.extra&&h.gzhead.extra.length&&(i(h,255&h.gzhead.extra.length),i(h,h.gzhead.extra.length>>8&255)),h.gzhead.hcrc&&(a.adler=F(a.adler,h.pending_buf,h.pending,0)),h.gzindex=0,h.status=ma):(i(h,0),i(h,0),i(h,0),i(h,0),i(h,0),i(h,9===h.level?2:h.strategy>=T||h.level<2?4:0),i(h,wa),h.status=qa);else{var m=Y+(h.w_bits-8<<4)<<8,n=-1;n=h.strategy>=T||h.level<2?0:h.level<6?1:6===h.level?2:3,m|=n<<6,0!==h.strstart&&(m|=ka),m+=31-m%31,h.status=qa,j(h,m),0!==h.strstart&&(j(h,a.adler>>>16),j(h,65535&a.adler)),a.adler=1}if(h.status===ma)if(h.gzhead.extra){for(k=h.pending;h.gzindex<(65535&h.gzhead.extra.length)&&(h.pending!==h.pending_buf_size||(h.gzhead.hcrc&&h.pending>k&&(a.adler=F(a.adler,h.pending_buf,h.pending-k,k)),g(a),k=h.pending,h.pending!==h.pending_buf_size));)i(h,255&h.gzhead.extra[h.gzindex]),h.gzindex++;h.gzhead.hcrc&&h.pending>k&&(a.adler=F(a.adler,h.pending_buf,h.pending-k,k)),h.gzindex===h.gzhead.extra.length&&(h.gzindex=0,h.status=na)}else h.status=na;if(h.status===na)if(h.gzhead.name){k=h.pending;do{if(h.pending===h.pending_buf_size&&(h.gzhead.hcrc&&h.pending>k&&(a.adler=F(a.adler,h.pending_buf,h.pending-k,k)),g(a),k=h.pending,h.pending===h.pending_buf_size)){l=1;break}l=h.gzindex<h.gzhead.name.length?255&h.gzhead.name.charCodeAt(h.gzindex++):0,i(h,l)}while(0!==l);h.gzhead.hcrc&&h.pending>k&&(a.adler=F(a.adler,h.pending_buf,h.pending-k,k)),0===l&&(h.gzindex=0,h.status=oa)}else h.status=oa;if(h.status===oa)if(h.gzhead.comment){k=h.pending;do{if(h.pending===h.pending_buf_size&&(h.gzhead.hcrc&&h.pending>k&&(a.adler=F(a.adler,h.pending_buf,h.pending-k,k)),g(a),k=h.pending,h.pending===h.pending_buf_size)){l=1;break}l=h.gzindex<h.gzhead.comment.length?255&h.gzhead.comment.charCodeAt(h.gzindex++):0,i(h,l)}while(0!==l);h.gzhead.hcrc&&h.pending>k&&(a.adler=F(a.adler,h.pending_buf,h.pending-k,k)),0===l&&(h.status=pa)}else h.status=pa;if(h.status===pa&&(h.gzhead.hcrc?(h.pending+2>h.pending_buf_size&&g(a),h.pending+2<=h.pending_buf_size&&(i(h,255&a.adler),i(h,a.adler>>8&255),a.adler=0,h.status=qa)):h.status=qa),0!==h.pending){if(g(a),0===a.avail_out)return h.last_flush=-1,M}else if(0===a.avail_in&&e(b)<=e(c)&&b!==K)return d(a,Q);if(h.status===ra&&0!==a.avail_in)return d(a,Q);if(0!==a.avail_in||0!==h.lookahead||b!==H&&h.status!==ra){var o=h.strategy===T?r(h,b):h.strategy===U?q(h,b):B[h.level].func(h,b);if((o===ua||o===va)&&(h.status=ra),o===sa||o===ua)return 0===a.avail_out&&(h.last_flush=-1),M;if(o===ta&&(b===I?D._tr_align(h):b!==L&&(D._tr_stored_block(h,0,0,!1),b===J&&(f(h.head),0===h.lookahead&&(h.strstart=0,h.block_start=0,h.insert=0))),g(a),0===a.avail_out))return h.last_flush=-1,M}return b!==K?M:h.wrap<=0?N:(2===h.wrap?(i(h,255&a.adler),i(h,a.adler>>8&255),i(h,a.adler>>16&255),i(h,a.adler>>24&255),i(h,255&a.total_in),i(h,a.total_in>>8&255),i(h,a.total_in>>16&255),i(h,a.total_in>>24&255)):(j(h,a.adler>>>16),j(h,65535&a.adler)),g(a),h.wrap>0&&(h.wrap=-h.wrap),0!==h.pending?M:N)}function A(a){var b;return a&&a.state?(b=a.state.status,b!==la&&b!==ma&&b!==na&&b!==oa&&b!==pa&&b!==qa&&b!==ra?d(a,O):(a.state=null,b===qa?d(a,P):M)):O}var B,C=a("../utils/common"),D=a("./trees"),E=a("./adler32"),F=a("./crc32"),G=a("./messages"),H=0,I=1,J=3,K=4,L=5,M=0,N=1,O=-2,P=-3,Q=-5,R=-1,S=1,T=2,U=3,V=4,W=0,X=2,Y=8,Z=9,$=15,_=8,aa=29,ba=256,ca=ba+1+aa,da=30,ea=19,fa=2*ca+1,ga=15,ha=3,ia=258,ja=ia+ha+1,ka=32,la=42,ma=69,na=73,oa=91,pa=103,qa=113,ra=666,sa=1,ta=2,ua=3,va=4,wa=3,xa=function(a,b,c,d,e){this.good_length=a,this.max_lazy=b,this.nice_length=c,this.max_chain=d,this.func=e};B=[new xa(0,0,0,0,n),new xa(4,4,8,4,o),new xa(4,5,16,8,o),new xa(4,6,32,32,o),new xa(4,4,16,16,p),new xa(8,16,32,32,p),new xa(8,16,128,128,p),new xa(8,32,128,256,p),new xa(32,128,258,1024,p),new xa(32,258,258,4096,p)],c.deflateInit=y,c.deflateInit2=x,c.deflateReset=v,c.deflateResetKeep=u,c.deflateSetHeader=w,c.deflate=z,c.deflateEnd=A,c.deflateInfo="pako deflate (from Nodeca project)"},{"../utils/common":27,"./adler32":29,"./crc32":31,"./messages":37,"./trees":38}],33:[function(a,b){"use strict";function c(){this.text=0,this.time=0,this.xflags=0,this.os=0,this.extra=null,this.extra_len=0,this.name="",this.comment="",this.hcrc=0,this.done=!1}b.exports=c},{}],34:[function(a,b){"use strict";var c=30,d=12;b.exports=function(a,b){var e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,A,B,C;e=a.state,f=a.next_in,B=a.input,g=f+(a.avail_in-5),h=a.next_out,C=a.output,i=h-(b-a.avail_out),j=h+(a.avail_out-257),k=e.dmax,l=e.wsize,m=e.whave,n=e.wnext,o=e.window,p=e.hold,q=e.bits,r=e.lencode,s=e.distcode,t=(1<<e.lenbits)-1,u=(1<<e.distbits)-1;a:do{15>q&&(p+=B[f++]<<q,q+=8,p+=B[f++]<<q,q+=8),v=r[p&t];b:for(;;){if(w=v>>>24,p>>>=w,q-=w,w=v>>>16&255,0===w)C[h++]=65535&v;else{if(!(16&w)){if(0===(64&w)){v=r[(65535&v)+(p&(1<<w)-1)];continue b}if(32&w){e.mode=d;break a}a.msg="invalid literal/length code",e.mode=c;break a}x=65535&v,w&=15,w&&(w>q&&(p+=B[f++]<<q,q+=8),x+=p&(1<<w)-1,p>>>=w,q-=w),15>q&&(p+=B[f++]<<q,q+=8,p+=B[f++]<<q,q+=8),v=s[p&u];c:for(;;){if(w=v>>>24,p>>>=w,q-=w,w=v>>>16&255,!(16&w)){if(0===(64&w)){v=s[(65535&v)+(p&(1<<w)-1)];continue c}a.msg="invalid distance code",e.mode=c;break a}if(y=65535&v,w&=15,w>q&&(p+=B[f++]<<q,q+=8,w>q&&(p+=B[f++]<<q,q+=8)),y+=p&(1<<w)-1,y>k){a.msg="invalid distance too far back",e.mode=c;break a}if(p>>>=w,q-=w,w=h-i,y>w){if(w=y-w,w>m&&e.sane){a.msg="invalid distance too far back",e.mode=c;break a}if(z=0,A=o,0===n){if(z+=l-w,x>w){x-=w;do C[h++]=o[z++];while(--w);z=h-y,A=C}}else if(w>n){if(z+=l+n-w,w-=n,x>w){x-=w;do C[h++]=o[z++];while(--w);if(z=0,x>n){w=n,x-=w;do C[h++]=o[z++];while(--w);z=h-y,A=C}}}else if(z+=n-w,x>w){x-=w;do C[h++]=o[z++];while(--w);z=h-y,A=C}for(;x>2;)C[h++]=A[z++],C[h++]=A[z++],C[h++]=A[z++],x-=3;x&&(C[h++]=A[z++],x>1&&(C[h++]=A[z++]))}else{z=h-y;do C[h++]=C[z++],C[h++]=C[z++],C[h++]=C[z++],x-=3;while(x>2);x&&(C[h++]=C[z++],x>1&&(C[h++]=C[z++]))}break}}break}}while(g>f&&j>h);x=q>>3,f-=x,q-=x<<3,p&=(1<<q)-1,a.next_in=f,a.next_out=h,a.avail_in=g>f?5+(g-f):5-(f-g),a.avail_out=j>h?257+(j-h):257-(h-j),e.hold=p,e.bits=q}},{}],35:[function(a,b,c){"use strict";function d(a){return(a>>>24&255)+(a>>>8&65280)+((65280&a)<<8)+((255&a)<<24)}function e(){this.mode=0,this.last=!1,this.wrap=0,this.havedict=!1,this.flags=0,this.dmax=0,this.check=0,this.total=0,this.head=null,this.wbits=0,this.wsize=0,this.whave=0,this.wnext=0,this.window=null,this.hold=0,this.bits=0,this.length=0,this.offset=0,this.extra=0,this.lencode=null,this.distcode=null,this.lenbits=0,this.distbits=0,this.ncode=0,this.nlen=0,this.ndist=0,this.have=0,this.next=null,this.lens=new r.Buf16(320),this.work=new r.Buf16(288),this.lendyn=null,this.distdyn=null,this.sane=0,this.back=0,this.was=0}function f(a){var b;return a&&a.state?(b=a.state,a.total_in=a.total_out=b.total=0,a.msg="",b.wrap&&(a.adler=1&b.wrap),b.mode=K,b.last=0,b.havedict=0,b.dmax=32768,b.head=null,b.hold=0,b.bits=0,b.lencode=b.lendyn=new r.Buf32(oa),b.distcode=b.distdyn=new r.Buf32(pa),b.sane=1,b.back=-1,C):F}function g(a){var b;return a&&a.state?(b=a.state,b.wsize=0,b.whave=0,b.wnext=0,f(a)):F}function h(a,b){var c,d;return a&&a.state?(d=a.state,0>b?(c=0,b=-b):(c=(b>>4)+1,48>b&&(b&=15)),b&&(8>b||b>15)?F:(null!==d.window&&d.wbits!==b&&(d.window=null),d.wrap=c,d.wbits=b,g(a))):F}function i(a,b){var c,d;return a?(d=new e,a.state=d,d.window=null,c=h(a,b),c!==C&&(a.state=null),c):F}function j(a){return i(a,ra)}function k(a){if(sa){var b;for(p=new r.Buf32(512),q=new r.Buf32(32),b=0;144>b;)a.lens[b++]=8;for(;256>b;)a.lens[b++]=9;for(;280>b;)a.lens[b++]=7;for(;288>b;)a.lens[b++]=8;for(v(x,a.lens,0,288,p,0,a.work,{bits:9}),b=0;32>b;)a.lens[b++]=5;v(y,a.lens,0,32,q,0,a.work,{bits:5}),sa=!1}a.lencode=p,a.lenbits=9,a.distcode=q,a.distbits=5}function l(a,b,c,d){var e,f=a.state;return null===f.window&&(f.wsize=1<<f.wbits,f.wnext=0,f.whave=0,f.window=new r.Buf8(f.wsize)),d>=f.wsize?(r.arraySet(f.window,b,c-f.wsize,f.wsize,0),f.wnext=0,f.whave=f.wsize):(e=f.wsize-f.wnext,e>d&&(e=d),r.arraySet(f.window,b,c-d,e,f.wnext),d-=e,d?(r.arraySet(f.window,b,c-d,d,0),f.wnext=d,f.whave=f.wsize):(f.wnext+=e,f.wnext===f.wsize&&(f.wnext=0),f.whave<f.wsize&&(f.whave+=e))),0}function m(a,b){var c,e,f,g,h,i,j,m,n,o,p,q,oa,pa,qa,ra,sa,ta,ua,va,wa,xa,ya,za,Aa=0,Ba=new r.Buf8(4),Ca=[16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15];if(!a||!a.state||!a.output||!a.input&&0!==a.avail_in)return F;c=a.state,c.mode===V&&(c.mode=W),h=a.next_out,f=a.output,j=a.avail_out,g=a.next_in,e=a.input,i=a.avail_in,m=c.hold,n=c.bits,o=i,p=j,xa=C;a:for(;;)switch(c.mode){case K:if(0===c.wrap){c.mode=W;break}for(;16>n;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}if(2&c.wrap&&35615===m){c.check=0,Ba[0]=255&m,Ba[1]=m>>>8&255,c.check=t(c.check,Ba,2,0),m=0,n=0,c.mode=L;break}if(c.flags=0,c.head&&(c.head.done=!1),!(1&c.wrap)||(((255&m)<<8)+(m>>8))%31){a.msg="incorrect header check",c.mode=la;break}if((15&m)!==J){a.msg="unknown compression method",c.mode=la;break}if(m>>>=4,n-=4,wa=(15&m)+8,0===c.wbits)c.wbits=wa;else if(wa>c.wbits){a.msg="invalid window size",c.mode=la;break}c.dmax=1<<wa,a.adler=c.check=1,c.mode=512&m?T:V,m=0,n=0;break;case L:for(;16>n;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}if(c.flags=m,(255&c.flags)!==J){a.msg="unknown compression method",c.mode=la;break}if(57344&c.flags){a.msg="unknown header flags set",c.mode=la;break}c.head&&(c.head.text=m>>8&1),512&c.flags&&(Ba[0]=255&m,Ba[1]=m>>>8&255,c.check=t(c.check,Ba,2,0)),m=0,n=0,c.mode=M;case M:for(;32>n;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}c.head&&(c.head.time=m),512&c.flags&&(Ba[0]=255&m,Ba[1]=m>>>8&255,Ba[2]=m>>>16&255,Ba[3]=m>>>24&255,c.check=t(c.check,Ba,4,0)),m=0,n=0,c.mode=N;case N:for(;16>n;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}c.head&&(c.head.xflags=255&m,c.head.os=m>>8),512&c.flags&&(Ba[0]=255&m,Ba[1]=m>>>8&255,c.check=t(c.check,Ba,2,0)),m=0,n=0,c.mode=O;case O:if(1024&c.flags){for(;16>n;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}c.length=m,c.head&&(c.head.extra_len=m),512&c.flags&&(Ba[0]=255&m,Ba[1]=m>>>8&255,c.check=t(c.check,Ba,2,0)),m=0,n=0}else c.head&&(c.head.extra=null);c.mode=P;case P:if(1024&c.flags&&(q=c.length,q>i&&(q=i),q&&(c.head&&(wa=c.head.extra_len-c.length,c.head.extra||(c.head.extra=new Array(c.head.extra_len)),r.arraySet(c.head.extra,e,g,q,wa)),512&c.flags&&(c.check=t(c.check,e,q,g)),i-=q,g+=q,c.length-=q),c.length))break a;c.length=0,c.mode=Q;case Q:if(2048&c.flags){if(0===i)break a;q=0;do wa=e[g+q++],c.head&&wa&&c.length<65536&&(c.head.name+=String.fromCharCode(wa));while(wa&&i>q);if(512&c.flags&&(c.check=t(c.check,e,q,g)),i-=q,g+=q,wa)break a}else c.head&&(c.head.name=null);c.length=0,c.mode=R;case R:if(4096&c.flags){if(0===i)break a;q=0;do wa=e[g+q++],c.head&&wa&&c.length<65536&&(c.head.comment+=String.fromCharCode(wa));while(wa&&i>q);if(512&c.flags&&(c.check=t(c.check,e,q,g)),i-=q,g+=q,wa)break a}else c.head&&(c.head.comment=null);c.mode=S;case S:if(512&c.flags){for(;16>n;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}if(m!==(65535&c.check)){a.msg="header crc mismatch",c.mode=la;break}m=0,n=0}c.head&&(c.head.hcrc=c.flags>>9&1,c.head.done=!0),a.adler=c.check=0,c.mode=V;break;case T:for(;32>n;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}a.adler=c.check=d(m),m=0,n=0,c.mode=U;case U:if(0===c.havedict)return a.next_out=h,a.avail_out=j,a.next_in=g,a.avail_in=i,c.hold=m,c.bits=n,E;a.adler=c.check=1,c.mode=V;case V:if(b===A||b===B)break a;case W:if(c.last){m>>>=7&n,n-=7&n,c.mode=ia;break}for(;3>n;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}switch(c.last=1&m,m>>>=1,n-=1,3&m){case 0:c.mode=X;break;case 1:if(k(c),c.mode=ba,b===B){m>>>=2,n-=2;break a}break;case 2:c.mode=$;break;case 3:a.msg="invalid block type",c.mode=la}m>>>=2,n-=2;break;case X:for(m>>>=7&n,n-=7&n;32>n;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}if((65535&m)!==(m>>>16^65535)){a.msg="invalid stored block lengths",c.mode=la;break}if(c.length=65535&m,m=0,n=0,c.mode=Y,b===B)break a;case Y:c.mode=Z;case Z:if(q=c.length){if(q>i&&(q=i),q>j&&(q=j),0===q)break a;r.arraySet(f,e,g,q,h),i-=q,g+=q,j-=q,h+=q,c.length-=q;break}c.mode=V;break;case $:for(;14>n;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}if(c.nlen=(31&m)+257,m>>>=5,n-=5,c.ndist=(31&m)+1,m>>>=5,n-=5,c.ncode=(15&m)+4,m>>>=4,n-=4,c.nlen>286||c.ndist>30){a.msg="too many length or distance symbols",c.mode=la;break}c.have=0,c.mode=_;case _:for(;c.have<c.ncode;){for(;3>n;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}c.lens[Ca[c.have++]]=7&m,m>>>=3,n-=3}for(;c.have<19;)c.lens[Ca[c.have++]]=0;if(c.lencode=c.lendyn,c.lenbits=7,ya={bits:c.lenbits},xa=v(w,c.lens,0,19,c.lencode,0,c.work,ya),c.lenbits=ya.bits,xa){a.msg="invalid code lengths set",c.mode=la;break}c.have=0,c.mode=aa;case aa:for(;c.have<c.nlen+c.ndist;){for(;Aa=c.lencode[m&(1<<c.lenbits)-1],qa=Aa>>>24,ra=Aa>>>16&255,sa=65535&Aa,!(n>=qa);){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}if(16>sa)m>>>=qa,n-=qa,c.lens[c.have++]=sa;else{if(16===sa){for(za=qa+2;za>n;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}if(m>>>=qa,n-=qa,0===c.have){a.msg="invalid bit length repeat",c.mode=la;break}wa=c.lens[c.have-1],q=3+(3&m),m>>>=2,n-=2}else if(17===sa){for(za=qa+3;za>n;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}m>>>=qa,n-=qa,wa=0,q=3+(7&m),m>>>=3,n-=3}else{for(za=qa+7;za>n;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}m>>>=qa,n-=qa,wa=0,q=11+(127&m),m>>>=7,n-=7}if(c.have+q>c.nlen+c.ndist){a.msg="invalid bit length repeat",c.mode=la;break}for(;q--;)c.lens[c.have++]=wa}}if(c.mode===la)break;if(0===c.lens[256]){a.msg="invalid code -- missing end-of-block",c.mode=la;break}if(c.lenbits=9,ya={bits:c.lenbits},xa=v(x,c.lens,0,c.nlen,c.lencode,0,c.work,ya),c.lenbits=ya.bits,xa){a.msg="invalid literal/lengths set",c.mode=la;break}if(c.distbits=6,c.distcode=c.distdyn,ya={bits:c.distbits},xa=v(y,c.lens,c.nlen,c.ndist,c.distcode,0,c.work,ya),c.distbits=ya.bits,xa){a.msg="invalid distances set",c.mode=la;break}if(c.mode=ba,b===B)break a;case ba:c.mode=ca;case ca:if(i>=6&&j>=258){a.next_out=h,a.avail_out=j,a.next_in=g,a.avail_in=i,c.hold=m,c.bits=n,u(a,p),h=a.next_out,f=a.output,j=a.avail_out,g=a.next_in,e=a.input,i=a.avail_in,m=c.hold,n=c.bits,c.mode===V&&(c.back=-1);break}for(c.back=0;Aa=c.lencode[m&(1<<c.lenbits)-1],qa=Aa>>>24,ra=Aa>>>16&255,sa=65535&Aa,!(n>=qa);){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}if(ra&&0===(240&ra)){for(ta=qa,ua=ra,va=sa;Aa=c.lencode[va+((m&(1<<ta+ua)-1)>>ta)],qa=Aa>>>24,ra=Aa>>>16&255,sa=65535&Aa,!(n>=ta+qa);){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}m>>>=ta,n-=ta,c.back+=ta}if(m>>>=qa,n-=qa,c.back+=qa,c.length=sa,0===ra){c.mode=ha;break}if(32&ra){c.back=-1,c.mode=V;break}if(64&ra){a.msg="invalid literal/length code",c.mode=la;break}c.extra=15&ra,c.mode=da;case da:if(c.extra){for(za=c.extra;za>n;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}c.length+=m&(1<<c.extra)-1,m>>>=c.extra,n-=c.extra,c.back+=c.extra}c.was=c.length,c.mode=ea;case ea:for(;Aa=c.distcode[m&(1<<c.distbits)-1],qa=Aa>>>24,ra=Aa>>>16&255,sa=65535&Aa,!(n>=qa);){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}if(0===(240&ra)){for(ta=qa,ua=ra,va=sa;Aa=c.distcode[va+((m&(1<<ta+ua)-1)>>ta)],qa=Aa>>>24,ra=Aa>>>16&255,sa=65535&Aa,!(n>=ta+qa);){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}m>>>=ta,n-=ta,c.back+=ta}if(m>>>=qa,n-=qa,c.back+=qa,64&ra){a.msg="invalid distance code",c.mode=la;break}c.offset=sa,c.extra=15&ra,c.mode=fa;case fa:if(c.extra){for(za=c.extra;za>n;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}c.offset+=m&(1<<c.extra)-1,m>>>=c.extra,n-=c.extra,c.back+=c.extra}if(c.offset>c.dmax){a.msg="invalid distance too far back",c.mode=la;break}c.mode=ga;case ga:if(0===j)break a;
 
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/CSS/bootstrap/docs/assets/js/vendor/jszip.min.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/CSS/bootstrap/docs/assets/js/vendor/jszip.min.js
index 767d8c11d..35646cd9e 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/CSS/bootstrap/docs/assets/js/vendor/jszip.min.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/CSS/bootstrap/docs/assets/js/vendor/jszip.min.js
@@ -9,6 +9,6 @@ Dual licenced under the MIT license or GPLv3. See https://raw.github.com/Stuk/js
 JSZip uses the library pako released under the MIT license :
 https://github.com/nodeca/pako/blob/master/LICENSE
 */
-!function(a){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=a();else if("function"==typeof define&&define.amd)define([],a);else{var b;"undefined"!=typeof window?b=window:"undefined"!=typeof global?b=global:"undefined"!=typeof self&&(b=self),b.JSZip=a()}}(function(){return function a(b,c,d){function e(g,h){if(!c[g]){if(!b[g]){var i="function"==typeof require&&require;if(!h&&i)return i(g,!0);if(f)return f(g,!0);throw new Error("Cannot find module '"+g+"'")}var j=c[g]={exports:{}};b[g][0].call(j.exports,function(a){var c=b[g][1][a];return e(c?c:a)},j,j.exports,a,b,c,d)}return c[g].exports}for(var f="function"==typeof require&&require,g=0;g<d.length;g++)e(d[g]);return e}({1:[function(a,b,c){"use strict";var d="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";c.encode=function(a){for(var b,c,e,f,g,h,i,j="",k=0;k<a.length;)b=a.charCodeAt(k++),c=a.charCodeAt(k++),e=a.charCodeAt(k++),f=b>>2,g=(3&b)<<4|c>>4,h=(15&c)<<2|e>>6,i=63&e,isNaN(c)?h=i=64:isNaN(e)&&(i=64),j=j+d.charAt(f)+d.charAt(g)+d.charAt(h)+d.charAt(i);return j},c.decode=function(a){var b,c,e,f,g,h,i,j="",k=0;for(a=a.replace(/[^A-Za-z0-9\+\/\=]/g,"");k<a.length;)f=d.indexOf(a.charAt(k++)),g=d.indexOf(a.charAt(k++)),h=d.indexOf(a.charAt(k++)),i=d.indexOf(a.charAt(k++)),b=f<<2|g>>4,c=(15&g)<<4|h>>2,e=(3&h)<<6|i,j+=String.fromCharCode(b),64!=h&&(j+=String.fromCharCode(c)),64!=i&&(j+=String.fromCharCode(e));return j}},{}],2:[function(a,b){"use strict";function c(){this.compressedSize=0,this.uncompressedSize=0,this.crc32=0,this.compressionMethod=null,this.compressedContent=null}c.prototype={getContent:function(){return null},getCompressedContent:function(){return null}},b.exports=c},{}],3:[function(a,b,c){"use strict";c.STORE={magic:"\x00\x00",compress:function(a){return a},uncompress:function(a){return a},compressInputType:null,uncompressInputType:null},c.DEFLATE=a("./flate")},{"./flate":8}],4:[function(a,b){"use strict";var c=a("./utils"),d=[0,1996959894,3993919788,2567524794,124634137,1886057615,3915621685,2657392035,249268274,2044508324,3772115230,2547177864,162941995,2125561021,3887607047,2428444049,498536548,1789927666,4089016648,2227061214,450548861,1843258603,4107580753,2211677639,325883990,1684777152,4251122042,2321926636,335633487,1661365465,4195302755,2366115317,997073096,1281953886,3579855332,2724688242,1006888145,1258607687,3524101629,2768942443,901097722,1119000684,3686517206,2898065728,853044451,1172266101,3705015759,2882616665,651767980,1373503546,3369554304,3218104598,565507253,1454621731,3485111705,3099436303,671266974,1594198024,3322730930,2970347812,795835527,1483230225,3244367275,3060149565,1994146192,31158534,2563907772,4023717930,1907459465,112637215,2680153253,3904427059,2013776290,251722036,2517215374,3775830040,2137656763,141376813,2439277719,3865271297,1802195444,476864866,2238001368,4066508878,1812370925,453092731,2181625025,4111451223,1706088902,314042704,2344532202,4240017532,1658658271,366619977,2362670323,4224994405,1303535960,984961486,2747007092,3569037538,1256170817,1037604311,2765210733,3554079995,1131014506,879679996,2909243462,3663771856,1141124467,855842277,2852801631,3708648649,1342533948,654459306,3188396048,3373015174,1466479909,544179635,3110523913,3462522015,1591671054,702138776,2966460450,3352799412,1504918807,783551873,3082640443,3233442989,3988292384,2596254646,62317068,1957810842,3939845945,2647816111,81470997,1943803523,3814918930,2489596804,225274430,2053790376,3826175755,2466906013,167816743,2097651377,4027552580,2265490386,503444072,1762050814,4150417245,2154129355,426522225,1852507879,4275313526,2312317920,282753626,1742555852,4189708143,2394877945,397917763,1622183637,3604390888,2714866558,953729732,1340076626,3518719985,2797360999,1068828381,1219638859,3624741850,2936675148,906185462,1090812512,3747672003,2825379669,829329135,1181335161,3412177804,3160834842,628085408,1382605366,3423369109,3138078467,570562233,1426400815,3317316542,2998733608,733239954,1555261956,3268935591,3050360625,752459403,1541320221,2607071920,3965973030,1969922972,40735498,2617837225,3943577151,1913087877,83908371,2512341634,3803740692,2075208622,213261112,2463272603,3855990285,2094854071,198958881,2262029012,4057260610,1759359992,534414190,2176718541,4139329115,1873836001,414664567,2282248934,4279200368,1711684554,285281116,2405801727,4167216745,1634467795,376229701,2685067896,3608007406,1308918612,956543938,2808555105,3495958263,1231636301,1047427035,2932959818,3654703836,1088359270,936918e3,2847714899,3736837829,1202900863,817233897,3183342108,3401237130,1404277552,615818150,3134207493,3453421203,1423857449,601450431,3009837614,3294710456,1567103746,711928724,3020668471,3272380065,1510334235,755167117];b.exports=function(a,b){if("undefined"==typeof a||!a.length)return 0;var e="string"!==c.getTypeOf(a);"undefined"==typeof b&&(b=0);var f=0,g=0,h=0;b=-1^b;for(var i=0,j=a.length;j>i;i++)h=e?a[i]:a.charCodeAt(i),g=255&(b^h),f=d[g],b=b>>>8^f;return-1^b}},{"./utils":21}],5:[function(a,b){"use strict";function c(){this.data=null,this.length=0,this.index=0}var d=a("./utils");c.prototype={checkOffset:function(a){this.checkIndex(this.index+a)},checkIndex:function(a){if(this.length<a||0>a)throw new Error("End of data reached (data length = "+this.length+", asked index = "+a+"). Corrupted zip ?")},setIndex:function(a){this.checkIndex(a),this.index=a},skip:function(a){this.setIndex(this.index+a)},byteAt:function(){},readInt:function(a){var b,c=0;for(this.checkOffset(a),b=this.index+a-1;b>=this.index;b--)c=(c<<8)+this.byteAt(b);return this.index+=a,c},readString:function(a){return d.transformTo("string",this.readData(a))},readData:function(){},lastIndexOfSignature:function(){},readDate:function(){var a=this.readInt(4);return new Date((a>>25&127)+1980,(a>>21&15)-1,a>>16&31,a>>11&31,a>>5&63,(31&a)<<1)}},b.exports=c},{"./utils":21}],6:[function(a,b,c){"use strict";c.base64=!1,c.binary=!1,c.dir=!1,c.createFolders=!1,c.date=null,c.compression=null,c.comment=null},{}],7:[function(a,b,c){"use strict";var d=a("./utils");c.string2binary=function(a){return d.string2binary(a)},c.string2Uint8Array=function(a){return d.transformTo("uint8array",a)},c.uint8Array2String=function(a){return d.transformTo("string",a)},c.string2Blob=function(a){var b=d.transformTo("arraybuffer",a);return d.arrayBuffer2Blob(b)},c.arrayBuffer2Blob=function(a){return d.arrayBuffer2Blob(a)},c.transformTo=function(a,b){return d.transformTo(a,b)},c.getTypeOf=function(a){return d.getTypeOf(a)},c.checkSupport=function(a){return d.checkSupport(a)},c.MAX_VALUE_16BITS=d.MAX_VALUE_16BITS,c.MAX_VALUE_32BITS=d.MAX_VALUE_32BITS,c.pretty=function(a){return d.pretty(a)},c.findCompression=function(a){return d.findCompression(a)},c.isRegExp=function(a){return d.isRegExp(a)}},{"./utils":21}],8:[function(a,b,c){"use strict";var d="undefined"!=typeof Uint8Array&&"undefined"!=typeof Uint16Array&&"undefined"!=typeof Uint32Array,e=a("pako");c.uncompressInputType=d?"uint8array":"array",c.compressInputType=d?"uint8array":"array",c.magic="\b\x00",c.compress=function(a){return e.deflateRaw(a)},c.uncompress=function(a){return e.inflateRaw(a)}},{pako:24}],9:[function(a,b){"use strict";function c(a,b){return this instanceof c?(this.files={},this.comment=null,this.root="",a&&this.load(a,b),void(this.clone=function(){var a=new c;for(var b in this)"function"!=typeof this[b]&&(a[b]=this[b]);return a})):new c(a,b)}var d=a("./base64");c.prototype=a("./object"),c.prototype.load=a("./load"),c.support=a("./support"),c.defaults=a("./defaults"),c.utils=a("./deprecatedPublicUtils"),c.base64={encode:function(a){return d.encode(a)},decode:function(a){return d.decode(a)}},c.compressions=a("./compressions"),b.exports=c},{"./base64":1,"./compressions":3,"./defaults":6,"./deprecatedPublicUtils":7,"./load":10,"./object":13,"./support":17}],10:[function(a,b){"use strict";var c=a("./base64"),d=a("./zipEntries");b.exports=function(a,b){var e,f,g,h;for(b=b||{},b.base64&&(a=c.decode(a)),f=new d(a,b),e=f.files,g=0;g<e.length;g++)h=e[g],this.file(h.fileName,h.decompressed,{binary:!0,optimizedBinaryString:!0,date:h.date,dir:h.dir,comment:h.fileComment.length?h.fileComment:null,createFolders:b.createFolders});return f.zipComment.length&&(this.comment=f.zipComment),this}},{"./base64":1,"./zipEntries":22}],11:[function(a,b){(function(a){"use strict";b.exports=function(b,c){return new a(b,c)},b.exports.test=function(b){return a.isBuffer(b)}}).call(this,"undefined"!=typeof Buffer?Buffer:void 0)},{}],12:[function(a,b){"use strict";function c(a){this.data=a,this.length=this.data.length,this.index=0}var d=a("./uint8ArrayReader");c.prototype=new d,c.prototype.readData=function(a){this.checkOffset(a);var b=this.data.slice(this.index,this.index+a);return this.index+=a,b},b.exports=c},{"./uint8ArrayReader":18}],13:[function(a,b){"use strict";var c=a("./support"),d=a("./utils"),e=a("./crc32"),f=a("./signature"),g=a("./defaults"),h=a("./base64"),i=a("./compressions"),j=a("./compressedObject"),k=a("./nodeBuffer"),l=a("./utf8"),m=a("./stringWriter"),n=a("./uint8ArrayWriter"),o=function(a){if(a._data instanceof j&&(a._data=a._data.getContent(),a.options.binary=!0,a.options.base64=!1,"uint8array"===d.getTypeOf(a._data))){var b=a._data;a._data=new Uint8Array(b.length),0!==b.length&&a._data.set(b,0)}return a._data},p=function(a){var b=o(a),e=d.getTypeOf(b);return"string"===e?!a.options.binary&&c.nodebuffer?k(b,"utf-8"):a.asBinary():b},q=function(a){var b=o(this);return null===b||"undefined"==typeof b?"":(this.options.base64&&(b=h.decode(b)),b=a&&this.options.binary?A.utf8decode(b):d.transformTo("string",b),a||this.options.binary||(b=d.transformTo("string",A.utf8encode(b))),b)},r=function(a,b,c){this.name=a,this.dir=c.dir,this.date=c.date,this.comment=c.comment,this._data=b,this.options=c,this._initialMetadata={dir:c.dir,date:c.date}};r.prototype={asText:function(){return q.call(this,!0)},asBinary:function(){return q.call(this,!1)},asNodeBuffer:function(){var a=p(this);return d.transformTo("nodebuffer",a)},asUint8Array:function(){var a=p(this);return d.transformTo("uint8array",a)},asArrayBuffer:function(){return this.asUint8Array().buffer}};var s=function(a,b){var c,d="";for(c=0;b>c;c++)d+=String.fromCharCode(255&a),a>>>=8;return d},t=function(){var a,b,c={};for(a=0;a<arguments.length;a++)for(b in arguments[a])arguments[a].hasOwnProperty(b)&&"undefined"==typeof c[b]&&(c[b]=arguments[a][b]);return c},u=function(a){return a=a||{},a.base64!==!0||null!==a.binary&&void 0!==a.binary||(a.binary=!0),a=t(a,g),a.date=a.date||new Date,null!==a.compression&&(a.compression=a.compression.toUpperCase()),a},v=function(a,b,c){var e,f=d.getTypeOf(b);if(c=u(c),c.createFolders&&(e=w(a))&&x.call(this,e,!0),c.dir||null===b||"undefined"==typeof b)c.base64=!1,c.binary=!1,b=null;else if("string"===f)c.binary&&!c.base64&&c.optimizedBinaryString!==!0&&(b=d.string2binary(b));else{if(c.base64=!1,c.binary=!0,!(f||b instanceof j))throw new Error("The data of '"+a+"' is in an unsupported format !");"arraybuffer"===f&&(b=d.transformTo("uint8array",b))}var g=new r(a,b,c);return this.files[a]=g,g},w=function(a){"/"==a.slice(-1)&&(a=a.substring(0,a.length-1));var b=a.lastIndexOf("/");return b>0?a.substring(0,b):""},x=function(a,b){return"/"!=a.slice(-1)&&(a+="/"),b="undefined"!=typeof b?b:!1,this.files[a]||v.call(this,a,null,{dir:!0,createFolders:b}),this.files[a]},y=function(a,b){var c,f=new j;return a._data instanceof j?(f.uncompressedSize=a._data.uncompressedSize,f.crc32=a._data.crc32,0===f.uncompressedSize||a.dir?(b=i.STORE,f.compressedContent="",f.crc32=0):a._data.compressionMethod===b.magic?f.compressedContent=a._data.getCompressedContent():(c=a._data.getContent(),f.compressedContent=b.compress(d.transformTo(b.compressInputType,c)))):(c=p(a),(!c||0===c.length||a.dir)&&(b=i.STORE,c=""),f.uncompressedSize=c.length,f.crc32=e(c),f.compressedContent=b.compress(d.transformTo(b.compressInputType,c))),f.compressedSize=f.compressedContent.length,f.compressionMethod=b.magic,f},z=function(a,b,c,g){var h,i,j,k,m=(c.compressedContent,d.transformTo("string",l.utf8encode(b.name))),n=b.comment||"",o=d.transformTo("string",l.utf8encode(n)),p=m.length!==b.name.length,q=o.length!==n.length,r=b.options,t="",u="",v="";j=b._initialMetadata.dir!==b.dir?b.dir:r.dir,k=b._initialMetadata.date!==b.date?b.date:r.date,h=k.getHours(),h<<=6,h|=k.getMinutes(),h<<=5,h|=k.getSeconds()/2,i=k.getFullYear()-1980,i<<=4,i|=k.getMonth()+1,i<<=5,i|=k.getDate(),p&&(u=s(1,1)+s(e(m),4)+m,t+="up"+s(u.length,2)+u),q&&(v=s(1,1)+s(this.crc32(o),4)+o,t+="uc"+s(v.length,2)+v);var w="";w+="\n\x00",w+=p||q?"\x00\b":"\x00\x00",w+=c.compressionMethod,w+=s(h,2),w+=s(i,2),w+=s(c.crc32,4),w+=s(c.compressedSize,4),w+=s(c.uncompressedSize,4),w+=s(m.length,2),w+=s(t.length,2);var x=f.LOCAL_FILE_HEADER+w+m+t,y=f.CENTRAL_FILE_HEADER+"\x00"+w+s(o.length,2)+"\x00\x00\x00\x00"+(j===!0?"\x00\x00\x00":"\x00\x00\x00\x00")+s(g,4)+m+t+o;return{fileRecord:x,dirRecord:y,compressedObject:c}},A={load:function(){throw new Error("Load method is not defined. Is the file jszip-load.js included ?")},filter:function(a){var b,c,d,e,f=[];for(b in this.files)this.files.hasOwnProperty(b)&&(d=this.files[b],e=new r(d.name,d._data,t(d.options)),c=b.slice(this.root.length,b.length),b.slice(0,this.root.length)===this.root&&a(c,e)&&f.push(e));return f},file:function(a,b,c){if(1===arguments.length){if(d.isRegExp(a)){var e=a;return this.filter(function(a,b){return!b.dir&&e.test(a)})}return this.filter(function(b,c){return!c.dir&&b===a})[0]||null}return a=this.root+a,v.call(this,a,b,c),this},folder:function(a){if(!a)return this;if(d.isRegExp(a))return this.filter(function(b,c){return c.dir&&a.test(b)});var b=this.root+a,c=x.call(this,b),e=this.clone();return e.root=c.name,e},remove:function(a){a=this.root+a;var b=this.files[a];if(b||("/"!=a.slice(-1)&&(a+="/"),b=this.files[a]),b&&!b.dir)delete this.files[a];else for(var c=this.filter(function(b,c){return c.name.slice(0,a.length)===a}),d=0;d<c.length;d++)delete this.files[c[d].name];return this},generate:function(a){a=t(a||{},{base64:!0,compression:"STORE",type:"base64",comment:null}),d.checkSupport(a.type);var b,c,e=[],g=0,j=0,k=d.transformTo("string",this.utf8encode(a.comment||this.comment||""));for(var l in this.files)if(this.files.hasOwnProperty(l)){var o=this.files[l],p=o.options.compression||a.compression.toUpperCase(),q=i[p];if(!q)throw new Error(p+" is not a valid compression method !");var r=y.call(this,o,q),u=z.call(this,l,o,r,g);g+=u.fileRecord.length+r.compressedSize,j+=u.dirRecord.length,e.push(u)}var v="";v=f.CENTRAL_DIRECTORY_END+"\x00\x00\x00\x00"+s(e.length,2)+s(e.length,2)+s(j,4)+s(g,4)+s(k.length,2)+k;var w=a.type.toLowerCase();for(b="uint8array"===w||"arraybuffer"===w||"blob"===w||"nodebuffer"===w?new n(g+j+v.length):new m(g+j+v.length),c=0;c<e.length;c++)b.append(e[c].fileRecord),b.append(e[c].compressedObject.compressedContent);for(c=0;c<e.length;c++)b.append(e[c].dirRecord);b.append(v);var x=b.finalize();switch(a.type.toLowerCase()){case"uint8array":case"arraybuffer":case"nodebuffer":return d.transformTo(a.type.toLowerCase(),x);case"blob":return d.arrayBuffer2Blob(d.transformTo("arraybuffer",x));case"base64":return a.base64?h.encode(x):x;default:return x}},crc32:function(a,b){return e(a,b)},utf8encode:function(a){return d.transformTo("string",l.utf8encode(a))},utf8decode:function(a){return l.utf8decode(a)}};b.exports=A},{"./base64":1,"./compressedObject":2,"./compressions":3,"./crc32":4,"./defaults":6,"./nodeBuffer":11,"./signature":14,"./stringWriter":16,"./support":17,"./uint8ArrayWriter":19,"./utf8":20,"./utils":21}],14:[function(a,b,c){"use strict";c.LOCAL_FILE_HEADER="PK",c.CENTRAL_FILE_HEADER="PK
",c.CENTRAL_DIRECTORY_END="PK",c.ZIP64_CENTRAL_DIRECTORY_LOCATOR="PK",c.ZIP64_CENTRAL_DIRECTORY_END="PK",c.DATA_DESCRIPTOR="PK\b"},{}],15:[function(a,b){"use strict";function c(a,b){this.data=a,b||(this.data=e.string2binary(this.data)),this.length=this.data.length,this.index=0}var d=a("./dataReader"),e=a("./utils");c.prototype=new d,c.prototype.byteAt=function(a){return this.data.charCodeAt(a)},c.prototype.lastIndexOfSignature=function(a){return this.data.lastIndexOf(a)},c.prototype.readData=function(a){this.checkOffset(a);var b=this.data.slice(this.index,this.index+a);return this.index+=a,b},b.exports=c},{"./dataReader":5,"./utils":21}],16:[function(a,b){"use strict";var c=a("./utils"),d=function(){this.data=[]};d.prototype={append:function(a){a=c.transformTo("string",a),this.data.push(a)},finalize:function(){return this.data.join("")}},b.exports=d},{"./utils":21}],17:[function(a,b,c){(function(a){"use strict";if(c.base64=!0,c.array=!0,c.string=!0,c.arraybuffer="undefined"!=typeof ArrayBuffer&&"undefined"!=typeof Uint8Array,c.nodebuffer="undefined"!=typeof a,c.uint8array="undefined"!=typeof Uint8Array,"undefined"==typeof ArrayBuffer)c.blob=!1;else{var b=new ArrayBuffer(0);try{c.blob=0===new Blob([b],{type:"application/zip"}).size}catch(d){try{var e=window.BlobBuilder||window.WebKitBlobBuilder||window.MozBlobBuilder||window.MSBlobBuilder,f=new e;f.append(b),c.blob=0===f.getBlob("application/zip").size}catch(d){c.blob=!1}}}}).call(this,"undefined"!=typeof Buffer?Buffer:void 0)},{}],18:[function(a,b){"use strict";function c(a){a&&(this.data=a,this.length=this.data.length,this.index=0)}var d=a("./dataReader");c.prototype=new d,c.prototype.byteAt=function(a){return this.data[a]},c.prototype.lastIndexOfSignature=function(a){for(var b=a.charCodeAt(0),c=a.charCodeAt(1),d=a.charCodeAt(2),e=a.charCodeAt(3),f=this.length-4;f>=0;--f)if(this.data[f]===b&&this.data[f+1]===c&&this.data[f+2]===d&&this.data[f+3]===e)return f;return-1},c.prototype.readData=function(a){if(this.checkOffset(a),0===a)return new Uint8Array(0);var b=this.data.subarray(this.index,this.index+a);return this.index+=a,b},b.exports=c},{"./dataReader":5}],19:[function(a,b){"use strict";var c=a("./utils"),d=function(a){this.data=new Uint8Array(a),this.index=0};d.prototype={append:function(a){0!==a.length&&(a=c.transformTo("uint8array",a),this.data.set(a,this.index),this.index+=a.length)},finalize:function(){return this.data}},b.exports=d},{"./utils":21}],20:[function(a,b,c){"use strict";for(var d=a("./utils"),e=a("./support"),f=a("./nodeBuffer"),g=new Array(256),h=0;256>h;h++)g[h]=h>=252?6:h>=248?5:h>=240?4:h>=224?3:h>=192?2:1;g[254]=g[254]=1;var i=function(a){var b,c,d,f,g,h=a.length,i=0;for(f=0;h>f;f++)c=a.charCodeAt(f),55296===(64512&c)&&h>f+1&&(d=a.charCodeAt(f+1),56320===(64512&d)&&(c=65536+(c-55296<<10)+(d-56320),f++)),i+=128>c?1:2048>c?2:65536>c?3:4;for(b=e.uint8array?new Uint8Array(i):new Array(i),g=0,f=0;i>g;f++)c=a.charCodeAt(f),55296===(64512&c)&&h>f+1&&(d=a.charCodeAt(f+1),56320===(64512&d)&&(c=65536+(c-55296<<10)+(d-56320),f++)),128>c?b[g++]=c:2048>c?(b[g++]=192|c>>>6,b[g++]=128|63&c):65536>c?(b[g++]=224|c>>>12,b[g++]=128|c>>>6&63,b[g++]=128|63&c):(b[g++]=240|c>>>18,b[g++]=128|c>>>12&63,b[g++]=128|c>>>6&63,b[g++]=128|63&c);return b},j=function(a,b){var c;for(b=b||a.length,b>a.length&&(b=a.length),c=b-1;c>=0&&128===(192&a[c]);)c--;return 0>c?b:0===c?b:c+g[a[c]]>b?c:b},k=function(a){var b,c,e,f,h=a.length,i=new Array(2*h);for(c=0,b=0;h>b;)if(e=a[b++],128>e)i[c++]=e;else if(f=g[e],f>4)i[c++]=65533,b+=f-1;else{for(e&=2===f?31:3===f?15:7;f>1&&h>b;)e=e<<6|63&a[b++],f--;f>1?i[c++]=65533:65536>e?i[c++]=e:(e-=65536,i[c++]=55296|e>>10&1023,i[c++]=56320|1023&e)}return i.length!==c&&(i.subarray?i=i.subarray(0,c):i.length=c),d.applyFromCharCode(i)};c.utf8encode=function(a){return e.nodebuffer?f(a,"utf-8"):i(a)},c.utf8decode=function(a){if(e.nodebuffer)return d.transformTo("nodebuffer",a).toString("utf-8");a=d.transformTo(e.uint8array?"uint8array":"array",a);for(var b=[],c=0,f=a.length,g=65536;f>c;){var h=j(a,Math.min(c+g,f));b.push(e.uint8array?k(a.subarray(c,h)):k(a.slice(c,h))),c=h}return b.join("")}},{"./nodeBuffer":11,"./support":17,"./utils":21}],21:[function(a,b,c){"use strict";function d(a){return a}function e(a,b){for(var c=0;c<a.length;++c)b[c]=255&a.charCodeAt(c);return b}function f(a){var b=65536,d=[],e=a.length,f=c.getTypeOf(a),g=0,h=!0;try{switch(f){case"uint8array":String.fromCharCode.apply(null,new Uint8Array(0));break;case"nodebuffer":String.fromCharCode.apply(null,j(0))}}catch(i){h=!1}if(!h){for(var k="",l=0;l<a.length;l++)k+=String.fromCharCode(a[l]);return k}for(;e>g&&b>1;)try{d.push("array"===f||"nodebuffer"===f?String.fromCharCode.apply(null,a.slice(g,Math.min(g+b,e))):String.fromCharCode.apply(null,a.subarray(g,Math.min(g+b,e)))),g+=b}catch(i){b=Math.floor(b/2)}return d.join("")}function g(a,b){for(var c=0;c<a.length;c++)b[c]=a[c];return b}var h=a("./support"),i=a("./compressions"),j=a("./nodeBuffer");c.string2binary=function(a){for(var b="",c=0;c<a.length;c++)b+=String.fromCharCode(255&a.charCodeAt(c));return b},c.arrayBuffer2Blob=function(a){c.checkSupport("blob");try{return new Blob([a],{type:"application/zip"})}catch(b){try{var d=window.BlobBuilder||window.WebKitBlobBuilder||window.MozBlobBuilder||window.MSBlobBuilder,e=new d;return e.append(a),e.getBlob("application/zip")}catch(b){throw new Error("Bug : can't construct the Blob.")}}},c.applyFromCharCode=f;var k={};k.string={string:d,array:function(a){return e(a,new Array(a.length))},arraybuffer:function(a){return k.string.uint8array(a).buffer},uint8array:function(a){return e(a,new Uint8Array(a.length))},nodebuffer:function(a){return e(a,j(a.length))}},k.array={string:f,array:d,arraybuffer:function(a){return new Uint8Array(a).buffer},uint8array:function(a){return new Uint8Array(a)},nodebuffer:function(a){return j(a)}},k.arraybuffer={string:function(a){return f(new Uint8Array(a))},array:function(a){return g(new Uint8Array(a),new Array(a.byteLength))},arraybuffer:d,uint8array:function(a){return new Uint8Array(a)},nodebuffer:function(a){return j(new Uint8Array(a))}},k.uint8array={string:f,array:function(a){return g(a,new Array(a.length))},arraybuffer:function(a){return a.buffer},uint8array:d,nodebuffer:function(a){return j(a)}},k.nodebuffer={string:f,array:function(a){return g(a,new Array(a.length))},arraybuffer:function(a){return k.nodebuffer.uint8array(a).buffer},uint8array:function(a){return g(a,new Uint8Array(a.length))},nodebuffer:d},c.transformTo=function(a,b){if(b||(b=""),!a)return b;c.checkSupport(a);var d=c.getTypeOf(b),e=k[d][a](b);return e},c.getTypeOf=function(a){return"string"==typeof a?"string":"[object Array]"===Object.prototype.toString.call(a)?"array":h.nodebuffer&&j.test(a)?"nodebuffer":h.uint8array&&a instanceof Uint8Array?"uint8array":h.arraybuffer&&a instanceof ArrayBuffer?"arraybuffer":void 0},c.checkSupport=function(a){var b=h[a.toLowerCase()];if(!b)throw new Error(a+" is not supported by this browser")},c.MAX_VALUE_16BITS=65535,c.MAX_VALUE_32BITS=-1,c.pretty=function(a){var b,c,d="";for(c=0;c<(a||"").length;c++)b=a.charCodeAt(c),d+="\\x"+(16>b?"0":"")+b.toString(16).toUpperCase();return d},c.findCompression=function(a){for(var b in i)if(i.hasOwnProperty(b)&&i[b].magic===a)return i[b];return null},c.isRegExp=function(a){return"[object RegExp]"===Object.prototype.toString.call(a)}},{"./compressions":3,"./nodeBuffer":11,"./support":17}],22:[function(a,b){"use strict";function c(a,b){this.files=[],this.loadOptions=b,a&&this.load(a)}var d=a("./stringReader"),e=a("./nodeBufferReader"),f=a("./uint8ArrayReader"),g=a("./utils"),h=a("./signature"),i=a("./zipEntry"),j=a("./support"),k=a("./object");c.prototype={checkSignature:function(a){var b=this.reader.readString(4);if(b!==a)throw new Error("Corrupted zip or bug : unexpected signature ("+g.pretty(b)+", expected "+g.pretty(a)+")")},readBlockEndOfCentral:function(){this.diskNumber=this.reader.readInt(2),this.diskWithCentralDirStart=this.reader.readInt(2),this.centralDirRecordsOnThisDisk=this.reader.readInt(2),this.centralDirRecords=this.reader.readInt(2),this.centralDirSize=this.reader.readInt(4),this.centralDirOffset=this.reader.readInt(4),this.zipCommentLength=this.reader.readInt(2),this.zipComment=this.reader.readString(this.zipCommentLength),this.zipComment=k.utf8decode(this.zipComment)},readBlockZip64EndOfCentral:function(){this.zip64EndOfCentralSize=this.reader.readInt(8),this.versionMadeBy=this.reader.readString(2),this.versionNeeded=this.reader.readInt(2),this.diskNumber=this.reader.readInt(4),this.diskWithCentralDirStart=this.reader.readInt(4),this.centralDirRecordsOnThisDisk=this.reader.readInt(8),this.centralDirRecords=this.reader.readInt(8),this.centralDirSize=this.reader.readInt(8),this.centralDirOffset=this.reader.readInt(8),this.zip64ExtensibleData={};for(var a,b,c,d=this.zip64EndOfCentralSize-44,e=0;d>e;)a=this.reader.readInt(2),b=this.reader.readInt(4),c=this.reader.readString(b),this.zip64ExtensibleData[a]={id:a,length:b,value:c}},readBlockZip64EndOfCentralLocator:function(){if(this.diskWithZip64CentralDirStart=this.reader.readInt(4),this.relativeOffsetEndOfZip64CentralDir=this.reader.readInt(8),this.disksCount=this.reader.readInt(4),this.disksCount>1)throw new Error("Multi-volumes zip are not supported")},readLocalFiles:function(){var a,b;for(a=0;a<this.files.length;a++)b=this.files[a],this.reader.setIndex(b.localHeaderOffset),this.checkSignature(h.LOCAL_FILE_HEADER),b.readLocalPart(this.reader),b.handleUTF8()},readCentralDir:function(){var a;for(this.reader.setIndex(this.centralDirOffset);this.reader.readString(4)===h.CENTRAL_FILE_HEADER;)a=new i({zip64:this.zip64},this.loadOptions),a.readCentralPart(this.reader),this.files.push(a)},readEndOfCentral:function(){var a=this.reader.lastIndexOfSignature(h.CENTRAL_DIRECTORY_END);if(-1===a)throw new Error("Corrupted zip : can't find end of central directory");if(this.reader.setIndex(a),this.checkSignature(h.CENTRAL_DIRECTORY_END),this.readBlockEndOfCentral(),this.diskNumber===g.MAX_VALUE_16BITS||this.diskWithCentralDirStart===g.MAX_VALUE_16BITS||this.centralDirRecordsOnThisDisk===g.MAX_VALUE_16BITS||this.centralDirRecords===g.MAX_VALUE_16BITS||this.centralDirSize===g.MAX_VALUE_32BITS||this.centralDirOffset===g.MAX_VALUE_32BITS){if(this.zip64=!0,a=this.reader.lastIndexOfSignature(h.ZIP64_CENTRAL_DIRECTORY_LOCATOR),-1===a)throw new Error("Corrupted zip : can't find the ZIP64 end of central directory locator");this.reader.setIndex(a),this.checkSignature(h.ZIP64_CENTRAL_DIRECTORY_LOCATOR),this.readBlockZip64EndOfCentralLocator(),this.reader.setIndex(this.relativeOffsetEndOfZip64CentralDir),this.checkSignature(h.ZIP64_CENTRAL_DIRECTORY_END),this.readBlockZip64EndOfCentral()}},prepareReader:function(a){var b=g.getTypeOf(a);this.reader="string"!==b||j.uint8array?"nodebuffer"===b?new e(a):new f(g.transformTo("uint8array",a)):new d(a,this.loadOptions.optimizedBinaryString)},load:function(a){this.prepareReader(a),this.readEndOfCentral(),this.readCentralDir(),this.readLocalFiles()}},b.exports=c},{"./nodeBufferReader":12,"./object":13,"./signature":14,"./stringReader":15,"./support":17,"./uint8ArrayReader":18,"./utils":21,"./zipEntry":23}],23:[function(a,b){"use strict";function c(a,b){this.options=a,this.loadOptions=b}var d=a("./stringReader"),e=a("./utils"),f=a("./compressedObject"),g=a("./object");c.prototype={isEncrypted:function(){return 1===(1&this.bitFlag)},useUTF8:function(){return 2048===(2048&this.bitFlag)},prepareCompressedContent:function(a,b,c){return function(){var d=a.index;a.setIndex(b);var e=a.readData(c);return a.setIndex(d),e}},prepareContent:function(a,b,c,d,f){return function(){var a=e.transformTo(d.uncompressInputType,this.getCompressedContent()),b=d.uncompress(a);if(b.length!==f)throw new Error("Bug : uncompressed data size mismatch");return b}},readLocalPart:function(a){var b,c;if(a.skip(22),this.fileNameLength=a.readInt(2),c=a.readInt(2),this.fileName=a.readString(this.fileNameLength),a.skip(c),-1==this.compressedSize||-1==this.uncompressedSize)throw new Error("Bug or corrupted zip : didn't get enough informations from the central directory (compressedSize == -1 || uncompressedSize == -1)");if(b=e.findCompression(this.compressionMethod),null===b)throw new Error("Corrupted zip : compression "+e.pretty(this.compressionMethod)+" unknown (inner file : "+this.fileName+")");if(this.decompressed=new f,this.decompressed.compressedSize=this.compressedSize,this.decompressed.uncompressedSize=this.uncompressedSize,this.decompressed.crc32=this.crc32,this.decompressed.compressionMethod=this.compressionMethod,this.decompressed.getCompressedContent=this.prepareCompressedContent(a,a.index,this.compressedSize,b),this.decompressed.getContent=this.prepareContent(a,a.index,this.compressedSize,b,this.uncompressedSize),this.loadOptions.checkCRC32&&(this.decompressed=e.transformTo("string",this.decompressed.getContent()),g.crc32(this.decompressed)!==this.crc32))throw new Error("Corrupted zip : CRC32 mismatch")},readCentralPart:function(a){if(this.versionMadeBy=a.readString(2),this.versionNeeded=a.readInt(2),this.bitFlag=a.readInt(2),this.compressionMethod=a.readString(2),this.date=a.readDate(),this.crc32=a.readInt(4),this.compressedSize=a.readInt(4),this.uncompressedSize=a.readInt(4),this.fileNameLength=a.readInt(2),this.extraFieldsLength=a.readInt(2),this.fileCommentLength=a.readInt(2),this.diskNumberStart=a.readInt(2),this.internalFileAttributes=a.readInt(2),this.externalFileAttributes=a.readInt(4),this.localHeaderOffset=a.readInt(4),this.isEncrypted())throw new Error("Encrypted zip are not supported");this.fileName=a.readString(this.fileNameLength),this.readExtraFields(a),this.parseZIP64ExtraField(a),this.fileComment=a.readString(this.fileCommentLength),this.dir=16&this.externalFileAttributes?!0:!1},parseZIP64ExtraField:function(){if(this.extraFields[1]){var a=new d(this.extraFields[1].value);this.uncompressedSize===e.MAX_VALUE_32BITS&&(this.uncompressedSize=a.readInt(8)),this.compressedSize===e.MAX_VALUE_32BITS&&(this.compressedSize=a.readInt(8)),this.localHeaderOffset===e.MAX_VALUE_32BITS&&(this.localHeaderOffset=a.readInt(8)),this.diskNumberStart===e.MAX_VALUE_32BITS&&(this.diskNumberStart=a.readInt(4))}},readExtraFields:function(a){var b,c,d,e=a.index;for(this.extraFields=this.extraFields||{};a.index<e+this.extraFieldsLength;)b=a.readInt(2),c=a.readInt(2),d=a.readString(c),this.extraFields[b]={id:b,length:c,value:d}},handleUTF8:function(){if(this.useUTF8())this.fileName=g.utf8decode(this.fileName),this.fileComment=g.utf8decode(this.fileComment);else{var a=this.findExtraFieldUnicodePath();null!==a&&(this.fileName=a);var b=this.findExtraFieldUnicodeComment();null!==b&&(this.fileComment=b)}},findExtraFieldUnicodePath:function(){var a=this.extraFields[28789];if(a){var b=new d(a.value);return 1!==b.readInt(1)?null:g.crc32(this.fileName)!==b.readInt(4)?null:g.utf8decode(b.readString(a.length-5))}return null},findExtraFieldUnicodeComment:function(){var a=this.extraFields[25461];if(a){var b=new d(a.value);return 1!==b.readInt(1)?null:g.crc32(this.fileComment)!==b.readInt(4)?null:g.utf8decode(b.readString(a.length-5))}return null}},b.exports=c},{"./compressedObject":2,"./object":13,"./stringReader":15,"./utils":21}],24:[function(a,b){"use strict";var c=a("./lib/utils/common").assign,d=a("./lib/deflate"),e=a("./lib/inflate"),f=a("./lib/zlib/constants"),g={};c(g,d,e,f),b.exports=g},{"./lib/deflate":25,"./lib/inflate":26,"./lib/utils/common":27,"./lib/zlib/constants":30}],25:[function(a,b,c){"use strict";function d(a,b){var c=new s(b);if(c.push(a,!0),c.err)throw c.msg;return c.result}function e(a,b){return b=b||{},b.raw=!0,d(a,b)}function f(a,b){return b=b||{},b.gzip=!0,d(a,b)}var g=a("./zlib/deflate.js"),h=a("./utils/common"),i=a("./utils/strings"),j=a("./zlib/messages"),k=a("./zlib/zstream"),l=0,m=4,n=0,o=1,p=-1,q=0,r=8,s=function(a){this.options=h.assign({level:p,method:r,chunkSize:16384,windowBits:15,memLevel:8,strategy:q,to:""},a||{});var b=this.options;b.raw&&b.windowBits>0?b.windowBits=-b.windowBits:b.gzip&&b.windowBits>0&&b.windowBits<16&&(b.windowBits+=16),this.err=0,this.msg="",this.ended=!1,this.chunks=[],this.strm=new k,this.strm.avail_out=0;var c=g.deflateInit2(this.strm,b.level,b.method,b.windowBits,b.memLevel,b.strategy);if(c!==n)throw new Error(j[c]);b.header&&g.deflateSetHeader(this.strm,b.header)
+!function(a){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=a();else if("function"==typeof define&&define.amd)define([],a);else{var b;"undefined"!=typeof window?b=window:"undefined"!=typeof global?b=global:"undefined"!=typeof self&&(b=self),b.JSZip=a()}}(function(){return function a(b,c,d){function e(g,h){if(!c[g]){if(!b[g]){var i="function"==typeof require&&require;if(!h&&i)return i(g,!0);if(f)return f(g,!0);throw new Error("Cannot find module '"+g+"'")}var j=c[g]={exports:{}};b[g][0].call(j.exports,function(a){var c=b[g][1][a];return e(c?c:a)},j,j.exports,a,b,c,d)}return c[g].exports}for(var f="function"==typeof require&&require,g=0;g<d.length;g++)e(d[g]);return e}({1:[function(a,b,c){"use strict";var d="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";c.encode=function(a){for(var b,c,e,f,g,h,i,j="",k=0;k<a.length;)b=a.charCodeAt(k++),c=a.charCodeAt(k++),e=a.charCodeAt(k++),f=b>>2,g=(3&b)<<4|c>>4,h=(15&c)<<2|e>>6,i=63&e,isNaN(c)?h=i=64:isNaN(e)&&(i=64),j=j+d.charAt(f)+d.charAt(g)+d.charAt(h)+d.charAt(i);return j},c.decode=function(a){var b,c,e,f,g,h,i,j="",k=0;for(a=a.replace(/[^A-Za-z0-9\+\/\=]/g,"");k<a.length;)f=d.indexOf(a.charAt(k++)),g=d.indexOf(a.charAt(k++)),h=d.indexOf(a.charAt(k++)),i=d.indexOf(a.charAt(k++)),b=f<<2|g>>4,c=(15&g)<<4|h>>2,e=(3&h)<<6|i,j+=String.fromCharCode(b),64!=h&&(j+=String.fromCharCode(c)),64!=i&&(j+=String.fromCharCode(e));return j}},{}],2:[function(a,b){"use strict";function c(){this.compressedSize=0,this.uncompressedSize=0,this.crc32=0,this.compressionMethod=null,this.compressedContent=null}c.prototype={getContent:function(){return null},getCompressedContent:function(){return null}},b.exports=c},{}],3:[function(a,b,c){"use strict";c.STORE={magic:"\x00\x00",compress:function(a){return a},uncompress:function(a){return a},compressInputType:null,uncompressInputType:null},c.DEFLATE=a("./flate")},{"./flate":8}],4:[function(a,b){"use strict";var c=a("./utils"),d=[0,1996959894,3993919788,2567524794,124634137,1886057615,3915621685,2657392035,249268274,2044508324,3772115230,2547177864,162941995,2125561021,3887607047,2428444049,498536548,1789927666,4089016648,2227061214,450548861,1843258603,4107580753,2211677639,325883990,1684777152,4251122042,2321926636,335633487,1661365465,4195302755,2366115317,997073096,1281953886,3579855332,2724688242,1006888145,1258607687,3524101629,2768942443,901097722,1119000684,3686517206,2898065728,853044451,1172266101,3705015759,2882616665,651767980,1373503546,3369554304,3218104598,565507253,1454621731,3485111705,3099436303,671266974,1594198024,3322730930,2970347812,795835527,1483230225,3244367275,3060149565,1994146192,31158534,2563907772,4023717930,1907459465,112637215,2680153253,3904427059,2013776290,251722036,2517215374,3775830040,2137656763,141376813,2439277719,3865271297,1802195444,476864866,2238001368,4066508878,1812370925,453092731,2181625025,4111451223,1706088902,314042704,2344532202,4240017532,1658658271,366619977,2362670323,4224994405,1303535960,984961486,2747007092,3569037538,1256170817,1037604311,2765210733,3554079995,1131014506,879679996,2909243462,3663771856,1141124467,855842277,2852801631,3708648649,1342533948,654459306,3188396048,3373015174,1466479909,544179635,3110523913,3462522015,1591671054,702138776,2966460450,3352799412,1504918807,783551873,3082640443,3233442989,3988292384,2596254646,62317068,1957810842,3939845945,2647816111,81470997,1943803523,3814918930,2489596804,225274430,2053790376,3826175755,2466906013,167816743,2097651377,4027552580,2265490386,503444072,1762050814,4150417245,2154129355,426522225,1852507879,4275313526,2312317920,282753626,1742555852,4189708143,2394877945,397917763,1622183637,3604390888,2714866558,953729732,1340076626,3518719985,2797360999,1068828381,1219638859,3624741850,2936675148,906185462,1090812512,3747672003,2825379669,829329135,1181335161,3412177804,3160834842,628085408,1382605366,3423369109,3138078467,570562233,1426400815,3317316542,2998733608,733239954,1555261956,3268935591,3050360625,752459403,1541320221,2607071920,3965973030,1969922972,40735498,2617837225,3943577151,1913087877,83908371,2512341634,3803740692,2075208622,213261112,2463272603,3855990285,2094854071,198958881,2262029012,4057260610,1759359992,534414190,2176718541,4139329115,1873836001,414664567,2282248934,4279200368,1711684554,285281116,2405801727,4167216745,1634467795,376229701,2685067896,3608007406,1308918612,956543938,2808555105,3495958263,1231636301,1047427035,2932959818,3654703836,1088359270,936918e3,2847714899,3736837829,1202900863,817233897,3183342108,3401237130,1404277552,615818150,3134207493,3453421203,1423857449,601450431,3009837614,3294710456,1567103746,711928724,3020668471,3272380065,1510334235,755167117];b.exports=function(a,b){if("undefined"==typeof a||!a.length)return 0;var e="string"!==c.getTypeOf(a);"undefined"==typeof b&&(b=0);var f=0,g=0,h=0;b=-1^b;for(var i=0,j=a.length;j>i;i++)h=e?a[i]:a.charCodeAt(i),g=255&(b^h),f=d[g],b=b>>>8^f;return-1^b}},{"./utils":21}],5:[function(a,b){"use strict";function c(){this.data=null,this.length=0,this.index=0}var d=a("./utils");c.prototype={checkOffset:function(a){this.checkIndex(this.index+a)},checkIndex:function(a){if(this.length<a||0>a)throw new Error("End of data reached (data length = "+this.length+", asked index = "+a+"). Corrupted zip ?")},setIndex:function(a){this.checkIndex(a),this.index=a},skip:function(a){this.setIndex(this.index+a)},byteAt:function(){},readInt:function(a){var b,c=0;for(this.checkOffset(a),b=this.index+a-1;b>=this.index;b--)c=(c<<8)+this.byteAt(b);return this.index+=a,c},readString:function(a){return d.transformTo("string",this.readData(a))},readData:function(){},lastIndexOfSignature:function(){},readDate:function(){var a=this.readInt(4);return new Date((a>>25&127)+1980,(a>>21&15)-1,a>>16&31,a>>11&31,a>>5&63,(31&a)<<1)}},b.exports=c},{"./utils":21}],6:[function(a,b,c){"use strict";c.base64=!1,c.binary=!1,c.dir=!1,c.createFolders=!1,c.date=null,c.compression=null,c.comment=null},{}],7:[function(a,b,c){"use strict";var d=a("./utils");c.string2binary=function(a){return d.string2binary(a)},c.string2Uint8Array=function(a){return d.transformTo("uint8array",a)},c.uint8Array2String=function(a){return d.transformTo("string",a)},c.string2Blob=function(a){var b=d.transformTo("arraybuffer",a);return d.arrayBuffer2Blob(b)},c.arrayBuffer2Blob=function(a){return d.arrayBuffer2Blob(a)},c.transformTo=function(a,b){return d.transformTo(a,b)},c.getTypeOf=function(a){return d.getTypeOf(a)},c.checkSupport=function(a){return d.checkSupport(a)},c.MAX_VALUE_16BITS=d.MAX_VALUE_16BITS,c.MAX_VALUE_32BITS=d.MAX_VALUE_32BITS,c.pretty=function(a){return d.pretty(a)},c.findCompression=function(a){return d.findCompression(a)},c.isRegExp=function(a){return d.isRegExp(a)}},{"./utils":21}],8:[function(a,b,c){"use strict";var d="undefined"!=typeof Uint8Array&&"undefined"!=typeof Uint16Array&&"undefined"!=typeof Uint32Array,e=a("pako");c.uncompressInputType=d?"uint8array":"array",c.compressInputType=d?"uint8array":"array",c.magic="\b\x00",c.compress=function(a){return e.deflateRaw(a)},c.uncompress=function(a){return e.inflateRaw(a)}},{pako:24}],9:[function(a,b){"use strict";function c(a,b){return this instanceof c?(this.files={},this.comment=null,this.root="",a&&this.load(a,b),void(this.clone=function(){var a=new c;for(var b in this)"function"!=typeof this[b]&&(a[b]=this[b]);return a})):new c(a,b)}var d=a("./base64");c.prototype=a("./object"),c.prototype.load=a("./load"),c.support=a("./support"),c.defaults=a("./defaults"),c.utils=a("./deprecatedPublicUtils"),c.base64={encode:function(a){return d.encode(a)},decode:function(a){return d.decode(a)}},c.compressions=a("./compressions"),b.exports=c},{"./base64":1,"./compressions":3,"./defaults":6,"./deprecatedPublicUtils":7,"./load":10,"./object":13,"./support":17}],10:[function(a,b){"use strict";var c=a("./base64"),d=a("./zipEntries");b.exports=function(a,b){var e,f,g,h;for(b=b||{},b.base64&&(a=c.decode(a)),f=new d(a,b),e=f.files,g=0;g<e.length;g++)h=e[g],this.file(h.fileName,h.donapressed,{binary:!0,optimizedBinaryString:!0,date:h.date,dir:h.dir,comment:h.fileComment.length?h.fileComment:null,createFolders:b.createFolders});return f.zipComment.length&&(this.comment=f.zipComment),this}},{"./base64":1,"./zipEntries":22}],11:[function(a,b){(function(a){"use strict";b.exports=function(b,c){return new a(b,c)},b.exports.test=function(b){return a.isBuffer(b)}}).call(this,"undefined"!=typeof Buffer?Buffer:void 0)},{}],12:[function(a,b){"use strict";function c(a){this.data=a,this.length=this.data.length,this.index=0}var d=a("./uint8ArrayReader");c.prototype=new d,c.prototype.readData=function(a){this.checkOffset(a);var b=this.data.slice(this.index,this.index+a);return this.index+=a,b},b.exports=c},{"./uint8ArrayReader":18}],13:[function(a,b){"use strict";var c=a("./support"),d=a("./utils"),e=a("./crc32"),f=a("./signature"),g=a("./defaults"),h=a("./base64"),i=a("./compressions"),j=a("./compressedObject"),k=a("./nodeBuffer"),l=a("./utf8"),m=a("./stringWriter"),n=a("./uint8ArrayWriter"),o=function(a){if(a._data instanceof j&&(a._data=a._data.getContent(),a.options.binary=!0,a.options.base64=!1,"uint8array"===d.getTypeOf(a._data))){var b=a._data;a._data=new Uint8Array(b.length),0!==b.length&&a._data.set(b,0)}return a._data},p=function(a){var b=o(a),e=d.getTypeOf(b);return"string"===e?!a.options.binary&&c.nodebuffer?k(b,"utf-8"):a.asBinary():b},q=function(a){var b=o(this);return null===b||"undefined"==typeof b?"":(this.options.base64&&(b=h.decode(b)),b=a&&this.options.binary?A.utf8decode(b):d.transformTo("string",b),a||this.options.binary||(b=d.transformTo("string",A.utf8encode(b))),b)},r=function(a,b,c){this.name=a,this.dir=c.dir,this.date=c.date,this.comment=c.comment,this._data=b,this.options=c,this._initialMetadata={dir:c.dir,date:c.date}};r.prototype={asText:function(){return q.call(this,!0)},asBinary:function(){return q.call(this,!1)},asNodeBuffer:function(){var a=p(this);return d.transformTo("nodebuffer",a)},asUint8Array:function(){var a=p(this);return d.transformTo("uint8array",a)},asArrayBuffer:function(){return this.asUint8Array().buffer}};var s=function(a,b){var c,d="";for(c=0;b>c;c++)d+=String.fromCharCode(255&a),a>>>=8;return d},t=function(){var a,b,c={};for(a=0;a<arguments.length;a++)for(b in arguments[a])arguments[a].hasOwnProperty(b)&&"undefined"==typeof c[b]&&(c[b]=arguments[a][b]);return c},u=function(a){return a=a||{},a.base64!==!0||null!==a.binary&&void 0!==a.binary||(a.binary=!0),a=t(a,g),a.date=a.date||new Date,null!==a.compression&&(a.compression=a.compression.toUpperCase()),a},v=function(a,b,c){var e,f=d.getTypeOf(b);if(c=u(c),c.createFolders&&(e=w(a))&&x.call(this,e,!0),c.dir||null===b||"undefined"==typeof b)c.base64=!1,c.binary=!1,b=null;else if("string"===f)c.binary&&!c.base64&&c.optimizedBinaryString!==!0&&(b=d.string2binary(b));else{if(c.base64=!1,c.binary=!0,!(f||b instanceof j))throw new Error("The data of '"+a+"' is in an unsupported format !");"arraybuffer"===f&&(b=d.transformTo("uint8array",b))}var g=new r(a,b,c);return this.files[a]=g,g},w=function(a){"/"==a.slice(-1)&&(a=a.substring(0,a.length-1));var b=a.lastIndexOf("/");return b>0?a.substring(0,b):""},x=function(a,b){return"/"!=a.slice(-1)&&(a+="/"),b="undefined"!=typeof b?b:!1,this.files[a]||v.call(this,a,null,{dir:!0,createFolders:b}),this.files[a]},y=function(a,b){var c,f=new j;return a._data instanceof j?(f.uncompressedSize=a._data.uncompressedSize,f.crc32=a._data.crc32,0===f.uncompressedSize||a.dir?(b=i.STORE,f.compressedContent="",f.crc32=0):a._data.compressionMethod===b.magic?f.compressedContent=a._data.getCompressedContent():(c=a._data.getContent(),f.compressedContent=b.compress(d.transformTo(b.compressInputType,c)))):(c=p(a),(!c||0===c.length||a.dir)&&(b=i.STORE,c=""),f.uncompressedSize=c.length,f.crc32=e(c),f.compressedContent=b.compress(d.transformTo(b.compressInputType,c))),f.compressedSize=f.compressedContent.length,f.compressionMethod=b.magic,f},z=function(a,b,c,g){var h,i,j,k,m=(c.compressedContent,d.transformTo("string",l.utf8encode(b.name))),n=b.comment||"",o=d.transformTo("string",l.utf8encode(n)),p=m.length!==b.name.length,q=o.length!==n.length,r=b.options,t="",u="",v="";j=b._initialMetadata.dir!==b.dir?b.dir:r.dir,k=b._initialMetadata.date!==b.date?b.date:r.date,h=k.getHours(),h<<=6,h|=k.getMinutes(),h<<=5,h|=k.getSeconds()/2,i=k.getFullYear()-1980,i<<=4,i|=k.getMonth()+1,i<<=5,i|=k.getDate(),p&&(u=s(1,1)+s(e(m),4)+m,t+="up"+s(u.length,2)+u),q&&(v=s(1,1)+s(this.crc32(o),4)+o,t+="uc"+s(v.length,2)+v);var w="";w+="\n\x00",w+=p||q?"\x00\b":"\x00\x00",w+=c.compressionMethod,w+=s(h,2),w+=s(i,2),w+=s(c.crc32,4),w+=s(c.compressedSize,4),w+=s(c.uncompressedSize,4),w+=s(m.length,2),w+=s(t.length,2);var x=f.LOCAL_FILE_HEADER+w+m+t,y=f.CENTRAL_FILE_HEADER+"\x00"+w+s(o.length,2)+"\x00\x00\x00\x00"+(j===!0?"\x00\x00\x00":"\x00\x00\x00\x00")+s(g,4)+m+t+o;return{fileRecord:x,dirRecord:y,compressedObject:c}},A={load:function(){throw new Error("Load method is not defined. Is the file jszip-load.js included ?")},filter:function(a){var b,c,d,e,f=[];for(b in this.files)this.files.hasOwnProperty(b)&&(d=this.files[b],e=new r(d.name,d._data,t(d.options)),c=b.slice(this.root.length,b.length),b.slice(0,this.root.length)===this.root&&a(c,e)&&f.push(e));return f},file:function(a,b,c){if(1===arguments.length){if(d.isRegExp(a)){var e=a;return this.filter(function(a,b){return!b.dir&&e.test(a)})}return this.filter(function(b,c){return!c.dir&&b===a})[0]||null}return a=this.root+a,v.call(this,a,b,c),this},folder:function(a){if(!a)return this;if(d.isRegExp(a))return this.filter(function(b,c){return c.dir&&a.test(b)});var b=this.root+a,c=x.call(this,b),e=this.clone();return e.root=c.name,e},remove:function(a){a=this.root+a;var b=this.files[a];if(b||("/"!=a.slice(-1)&&(a+="/"),b=this.files[a]),b&&!b.dir)delete this.files[a];else for(var c=this.filter(function(b,c){return c.name.slice(0,a.length)===a}),d=0;d<c.length;d++)delete this.files[c[d].name];return this},generate:function(a){a=t(a||{},{base64:!0,compression:"STORE",type:"base64",comment:null}),d.checkSupport(a.type);var b,c,e=[],g=0,j=0,k=d.transformTo("string",this.utf8encode(a.comment||this.comment||""));for(var l in this.files)if(this.files.hasOwnProperty(l)){var o=this.files[l],p=o.options.compression||a.compression.toUpperCase(),q=i[p];if(!q)throw new Error(p+" is not a valid compression method !");var r=y.call(this,o,q),u=z.call(this,l,o,r,g);g+=u.fileRecord.length+r.compressedSize,j+=u.dirRecord.length,e.push(u)}var v="";v=f.CENTRAL_DIRECTORY_END+"\x00\x00\x00\x00"+s(e.length,2)+s(e.length,2)+s(j,4)+s(g,4)+s(k.length,2)+k;var w=a.type.toLowerCase();for(b="uint8array"===w||"arraybuffer"===w||"blob"===w||"nodebuffer"===w?new n(g+j+v.length):new m(g+j+v.length),c=0;c<e.length;c++)b.append(e[c].fileRecord),b.append(e[c].compressedObject.compressedContent);for(c=0;c<e.length;c++)b.append(e[c].dirRecord);b.append(v);var x=b.finalize();switch(a.type.toLowerCase()){case"uint8array":case"arraybuffer":case"nodebuffer":return d.transformTo(a.type.toLowerCase(),x);case"blob":return d.arrayBuffer2Blob(d.transformTo("arraybuffer",x));case"base64":return a.base64?h.encode(x):x;default:return x}},crc32:function(a,b){return e(a,b)},utf8encode:function(a){return d.transformTo("string",l.utf8encode(a))},utf8decode:function(a){return l.utf8decode(a)}};b.exports=A},{"./base64":1,"./compressedObject":2,"./compressions":3,"./crc32":4,"./defaults":6,"./nodeBuffer":11,"./signature":14,"./stringWriter":16,"./support":17,"./uint8ArrayWriter":19,"./utf8":20,"./utils":21}],14:[function(a,b,c){"use strict";c.LOCAL_FILE_HEADER="PK",c.CENTRAL_FILE_HEADER="PK
",c.CENTRAL_DIRECTORY_END="PK",c.ZIP64_CENTRAL_DIRECTORY_LOCATOR="PK",c.ZIP64_CENTRAL_DIRECTORY_END="PK",c.DATA_DESCRIPTOR="PK\b"},{}],15:[function(a,b){"use strict";function c(a,b){this.data=a,b||(this.data=e.string2binary(this.data)),this.length=this.data.length,this.index=0}var d=a("./dataReader"),e=a("./utils");c.prototype=new d,c.prototype.byteAt=function(a){return this.data.charCodeAt(a)},c.prototype.lastIndexOfSignature=function(a){return this.data.lastIndexOf(a)},c.prototype.readData=function(a){this.checkOffset(a);var b=this.data.slice(this.index,this.index+a);return this.index+=a,b},b.exports=c},{"./dataReader":5,"./utils":21}],16:[function(a,b){"use strict";var c=a("./utils"),d=function(){this.data=[]};d.prototype={append:function(a){a=c.transformTo("string",a),this.data.push(a)},finalize:function(){return this.data.join("")}},b.exports=d},{"./utils":21}],17:[function(a,b,c){(function(a){"use strict";if(c.base64=!0,c.array=!0,c.string=!0,c.arraybuffer="undefined"!=typeof ArrayBuffer&&"undefined"!=typeof Uint8Array,c.nodebuffer="undefined"!=typeof a,c.uint8array="undefined"!=typeof Uint8Array,"undefined"==typeof ArrayBuffer)c.blob=!1;else{var b=new ArrayBuffer(0);try{c.blob=0===new Blob([b],{type:"application/zip"}).size}catch(d){try{var e=window.BlobBuilder||window.WebKitBlobBuilder||window.MozBlobBuilder||window.MSBlobBuilder,f=new e;f.append(b),c.blob=0===f.getBlob("application/zip").size}catch(d){c.blob=!1}}}}).call(this,"undefined"!=typeof Buffer?Buffer:void 0)},{}],18:[function(a,b){"use strict";function c(a){a&&(this.data=a,this.length=this.data.length,this.index=0)}var d=a("./dataReader");c.prototype=new d,c.prototype.byteAt=function(a){return this.data[a]},c.prototype.lastIndexOfSignature=function(a){for(var b=a.charCodeAt(0),c=a.charCodeAt(1),d=a.charCodeAt(2),e=a.charCodeAt(3),f=this.length-4;f>=0;--f)if(this.data[f]===b&&this.data[f+1]===c&&this.data[f+2]===d&&this.data[f+3]===e)return f;return-1},c.prototype.readData=function(a){if(this.checkOffset(a),0===a)return new Uint8Array(0);var b=this.data.subarray(this.index,this.index+a);return this.index+=a,b},b.exports=c},{"./dataReader":5}],19:[function(a,b){"use strict";var c=a("./utils"),d=function(a){this.data=new Uint8Array(a),this.index=0};d.prototype={append:function(a){0!==a.length&&(a=c.transformTo("uint8array",a),this.data.set(a,this.index),this.index+=a.length)},finalize:function(){return this.data}},b.exports=d},{"./utils":21}],20:[function(a,b,c){"use strict";for(var d=a("./utils"),e=a("./support"),f=a("./nodeBuffer"),g=new Array(256),h=0;256>h;h++)g[h]=h>=252?6:h>=248?5:h>=240?4:h>=224?3:h>=192?2:1;g[254]=g[254]=1;var i=function(a){var b,c,d,f,g,h=a.length,i=0;for(f=0;h>f;f++)c=a.charCodeAt(f),55296===(64512&c)&&h>f+1&&(d=a.charCodeAt(f+1),56320===(64512&d)&&(c=65536+(c-55296<<10)+(d-56320),f++)),i+=128>c?1:2048>c?2:65536>c?3:4;for(b=e.uint8array?new Uint8Array(i):new Array(i),g=0,f=0;i>g;f++)c=a.charCodeAt(f),55296===(64512&c)&&h>f+1&&(d=a.charCodeAt(f+1),56320===(64512&d)&&(c=65536+(c-55296<<10)+(d-56320),f++)),128>c?b[g++]=c:2048>c?(b[g++]=192|c>>>6,b[g++]=128|63&c):65536>c?(b[g++]=224|c>>>12,b[g++]=128|c>>>6&63,b[g++]=128|63&c):(b[g++]=240|c>>>18,b[g++]=128|c>>>12&63,b[g++]=128|c>>>6&63,b[g++]=128|63&c);return b},j=function(a,b){var c;for(b=b||a.length,b>a.length&&(b=a.length),c=b-1;c>=0&&128===(192&a[c]);)c--;return 0>c?b:0===c?b:c+g[a[c]]>b?c:b},k=function(a){var b,c,e,f,h=a.length,i=new Array(2*h);for(c=0,b=0;h>b;)if(e=a[b++],128>e)i[c++]=e;else if(f=g[e],f>4)i[c++]=65533,b+=f-1;else{for(e&=2===f?31:3===f?15:7;f>1&&h>b;)e=e<<6|63&a[b++],f--;f>1?i[c++]=65533:65536>e?i[c++]=e:(e-=65536,i[c++]=55296|e>>10&1023,i[c++]=56320|1023&e)}return i.length!==c&&(i.subarray?i=i.subarray(0,c):i.length=c),d.applyFromCharCode(i)};c.utf8encode=function(a){return e.nodebuffer?f(a,"utf-8"):i(a)},c.utf8decode=function(a){if(e.nodebuffer)return d.transformTo("nodebuffer",a).toString("utf-8");a=d.transformTo(e.uint8array?"uint8array":"array",a);for(var b=[],c=0,f=a.length,g=65536;f>c;){var h=j(a,Math.min(c+g,f));b.push(e.uint8array?k(a.subarray(c,h)):k(a.slice(c,h))),c=h}return b.join("")}},{"./nodeBuffer":11,"./support":17,"./utils":21}],21:[function(a,b,c){"use strict";function d(a){return a}function e(a,b){for(var c=0;c<a.length;++c)b[c]=255&a.charCodeAt(c);return b}function f(a){var b=65536,d=[],e=a.length,f=c.getTypeOf(a),g=0,h=!0;try{switch(f){case"uint8array":String.fromCharCode.apply(null,new Uint8Array(0));break;case"nodebuffer":String.fromCharCode.apply(null,j(0))}}catch(i){h=!1}if(!h){for(var k="",l=0;l<a.length;l++)k+=String.fromCharCode(a[l]);return k}for(;e>g&&b>1;)try{d.push("array"===f||"nodebuffer"===f?String.fromCharCode.apply(null,a.slice(g,Math.min(g+b,e))):String.fromCharCode.apply(null,a.subarray(g,Math.min(g+b,e)))),g+=b}catch(i){b=Math.floor(b/2)}return d.join("")}function g(a,b){for(var c=0;c<a.length;c++)b[c]=a[c];return b}var h=a("./support"),i=a("./compressions"),j=a("./nodeBuffer");c.string2binary=function(a){for(var b="",c=0;c<a.length;c++)b+=String.fromCharCode(255&a.charCodeAt(c));return b},c.arrayBuffer2Blob=function(a){c.checkSupport("blob");try{return new Blob([a],{type:"application/zip"})}catch(b){try{var d=window.BlobBuilder||window.WebKitBlobBuilder||window.MozBlobBuilder||window.MSBlobBuilder,e=new d;return e.append(a),e.getBlob("application/zip")}catch(b){throw new Error("Bug : can't construct the Blob.")}}},c.applyFromCharCode=f;var k={};k.string={string:d,array:function(a){return e(a,new Array(a.length))},arraybuffer:function(a){return k.string.uint8array(a).buffer},uint8array:function(a){return e(a,new Uint8Array(a.length))},nodebuffer:function(a){return e(a,j(a.length))}},k.array={string:f,array:d,arraybuffer:function(a){return new Uint8Array(a).buffer},uint8array:function(a){return new Uint8Array(a)},nodebuffer:function(a){return j(a)}},k.arraybuffer={string:function(a){return f(new Uint8Array(a))},array:function(a){return g(new Uint8Array(a),new Array(a.byteLength))},arraybuffer:d,uint8array:function(a){return new Uint8Array(a)},nodebuffer:function(a){return j(new Uint8Array(a))}},k.uint8array={string:f,array:function(a){return g(a,new Array(a.length))},arraybuffer:function(a){return a.buffer},uint8array:d,nodebuffer:function(a){return j(a)}},k.nodebuffer={string:f,array:function(a){return g(a,new Array(a.length))},arraybuffer:function(a){return k.nodebuffer.uint8array(a).buffer},uint8array:function(a){return g(a,new Uint8Array(a.length))},nodebuffer:d},c.transformTo=function(a,b){if(b||(b=""),!a)return b;c.checkSupport(a);var d=c.getTypeOf(b),e=k[d][a](b);return e},c.getTypeOf=function(a){return"string"==typeof a?"string":"[object Array]"===Object.prototype.toString.call(a)?"array":h.nodebuffer&&j.test(a)?"nodebuffer":h.uint8array&&a instanceof Uint8Array?"uint8array":h.arraybuffer&&a instanceof ArrayBuffer?"arraybuffer":void 0},c.checkSupport=function(a){var b=h[a.toLowerCase()];if(!b)throw new Error(a+" is not supported by this browser")},c.MAX_VALUE_16BITS=65535,c.MAX_VALUE_32BITS=-1,c.pretty=function(a){var b,c,d="";for(c=0;c<(a||"").length;c++)b=a.charCodeAt(c),d+="\\x"+(16>b?"0":"")+b.toString(16).toUpperCase();return d},c.findCompression=function(a){for(var b in i)if(i.hasOwnProperty(b)&&i[b].magic===a)return i[b];return null},c.isRegExp=function(a){return"[object RegExp]"===Object.prototype.toString.call(a)}},{"./compressions":3,"./nodeBuffer":11,"./support":17}],22:[function(a,b){"use strict";function c(a,b){this.files=[],this.loadOptions=b,a&&this.load(a)}var d=a("./stringReader"),e=a("./nodeBufferReader"),f=a("./uint8ArrayReader"),g=a("./utils"),h=a("./signature"),i=a("./zipEntry"),j=a("./support"),k=a("./object");c.prototype={checkSignature:function(a){var b=this.reader.readString(4);if(b!==a)throw new Error("Corrupted zip or bug : unexpected signature ("+g.pretty(b)+", expected "+g.pretty(a)+")")},readBlockEndOfCentral:function(){this.diskNumber=this.reader.readInt(2),this.diskWithCentralDirStart=this.reader.readInt(2),this.centralDirRecordsOnThisDisk=this.reader.readInt(2),this.centralDirRecords=this.reader.readInt(2),this.centralDirSize=this.reader.readInt(4),this.centralDirOffset=this.reader.readInt(4),this.zipCommentLength=this.reader.readInt(2),this.zipComment=this.reader.readString(this.zipCommentLength),this.zipComment=k.utf8decode(this.zipComment)},readBlockZip64EndOfCentral:function(){this.zip64EndOfCentralSize=this.reader.readInt(8),this.versionMadeBy=this.reader.readString(2),this.versionNeeded=this.reader.readInt(2),this.diskNumber=this.reader.readInt(4),this.diskWithCentralDirStart=this.reader.readInt(4),this.centralDirRecordsOnThisDisk=this.reader.readInt(8),this.centralDirRecords=this.reader.readInt(8),this.centralDirSize=this.reader.readInt(8),this.centralDirOffset=this.reader.readInt(8),this.zip64ExtensibleData={};for(var a,b,c,d=this.zip64EndOfCentralSize-44,e=0;d>e;)a=this.reader.readInt(2),b=this.reader.readInt(4),c=this.reader.readString(b),this.zip64ExtensibleData[a]={id:a,length:b,value:c}},readBlockZip64EndOfCentralLocator:function(){if(this.diskWithZip64CentralDirStart=this.reader.readInt(4),this.relativeOffsetEndOfZip64CentralDir=this.reader.readInt(8),this.disksCount=this.reader.readInt(4),this.disksCount>1)throw new Error("Multi-volumes zip are not supported")},readLocalFiles:function(){var a,b;for(a=0;a<this.files.length;a++)b=this.files[a],this.reader.setIndex(b.localHeaderOffset),this.checkSignature(h.LOCAL_FILE_HEADER),b.readLocalPart(this.reader),b.handleUTF8()},readCentralDir:function(){var a;for(this.reader.setIndex(this.centralDirOffset);this.reader.readString(4)===h.CENTRAL_FILE_HEADER;)a=new i({zip64:this.zip64},this.loadOptions),a.readCentralPart(this.reader),this.files.push(a)},readEndOfCentral:function(){var a=this.reader.lastIndexOfSignature(h.CENTRAL_DIRECTORY_END);if(-1===a)throw new Error("Corrupted zip : can't find end of central directory");if(this.reader.setIndex(a),this.checkSignature(h.CENTRAL_DIRECTORY_END),this.readBlockEndOfCentral(),this.diskNumber===g.MAX_VALUE_16BITS||this.diskWithCentralDirStart===g.MAX_VALUE_16BITS||this.centralDirRecordsOnThisDisk===g.MAX_VALUE_16BITS||this.centralDirRecords===g.MAX_VALUE_16BITS||this.centralDirSize===g.MAX_VALUE_32BITS||this.centralDirOffset===g.MAX_VALUE_32BITS){if(this.zip64=!0,a=this.reader.lastIndexOfSignature(h.ZIP64_CENTRAL_DIRECTORY_LOCATOR),-1===a)throw new Error("Corrupted zip : can't find the ZIP64 end of central directory locator");this.reader.setIndex(a),this.checkSignature(h.ZIP64_CENTRAL_DIRECTORY_LOCATOR),this.readBlockZip64EndOfCentralLocator(),this.reader.setIndex(this.relativeOffsetEndOfZip64CentralDir),this.checkSignature(h.ZIP64_CENTRAL_DIRECTORY_END),this.readBlockZip64EndOfCentral()}},prepareReader:function(a){var b=g.getTypeOf(a);this.reader="string"!==b||j.uint8array?"nodebuffer"===b?new e(a):new f(g.transformTo("uint8array",a)):new d(a,this.loadOptions.optimizedBinaryString)},load:function(a){this.prepareReader(a),this.readEndOfCentral(),this.readCentralDir(),this.readLocalFiles()}},b.exports=c},{"./nodeBufferReader":12,"./object":13,"./signature":14,"./stringReader":15,"./support":17,"./uint8ArrayReader":18,"./utils":21,"./zipEntry":23}],23:[function(a,b){"use strict";function c(a,b){this.options=a,this.loadOptions=b}var d=a("./stringReader"),e=a("./utils"),f=a("./compressedObject"),g=a("./object");c.prototype={isEncrypted:function(){return 1===(1&this.bitFlag)},useUTF8:function(){return 2048===(2048&this.bitFlag)},prepareCompressedContent:function(a,b,c){return function(){var d=a.index;a.setIndex(b);var e=a.readData(c);return a.setIndex(d),e}},prepareContent:function(a,b,c,d,f){return function(){var a=e.transformTo(d.uncompressInputType,this.getCompressedContent()),b=d.uncompress(a);if(b.length!==f)throw new Error("Bug : uncompressed data size mismatch");return b}},readLocalPart:function(a){var b,c;if(a.skip(22),this.fileNameLength=a.readInt(2),c=a.readInt(2),this.fileName=a.readString(this.fileNameLength),a.skip(c),-1==this.compressedSize||-1==this.uncompressedSize)throw new Error("Bug or corrupted zip : didn't get enough informations from the central directory (compressedSize == -1 || uncompressedSize == -1)");if(b=e.findCompression(this.compressionMethod),null===b)throw new Error("Corrupted zip : compression "+e.pretty(this.compressionMethod)+" unknown (inner file : "+this.fileName+")");if(this.donapressed=new f,this.donapressed.compressedSize=this.compressedSize,this.donapressed.uncompressedSize=this.uncompressedSize,this.donapressed.crc32=this.crc32,this.donapressed.compressionMethod=this.compressionMethod,this.donapressed.getCompressedContent=this.prepareCompressedContent(a,a.index,this.compressedSize,b),this.donapressed.getContent=this.prepareContent(a,a.index,this.compressedSize,b,this.uncompressedSize),this.loadOptions.checkCRC32&&(this.donapressed=e.transformTo("string",this.donapressed.getContent()),g.crc32(this.donapressed)!==this.crc32))throw new Error("Corrupted zip : CRC32 mismatch")},readCentralPart:function(a){if(this.versionMadeBy=a.readString(2),this.versionNeeded=a.readInt(2),this.bitFlag=a.readInt(2),this.compressionMethod=a.readString(2),this.date=a.readDate(),this.crc32=a.readInt(4),this.compressedSize=a.readInt(4),this.uncompressedSize=a.readInt(4),this.fileNameLength=a.readInt(2),this.extraFieldsLength=a.readInt(2),this.fileCommentLength=a.readInt(2),this.diskNumberStart=a.readInt(2),this.internalFileAttributes=a.readInt(2),this.externalFileAttributes=a.readInt(4),this.localHeaderOffset=a.readInt(4),this.isEncrypted())throw new Error("Encrypted zip are not supported");this.fileName=a.readString(this.fileNameLength),this.readExtraFields(a),this.parseZIP64ExtraField(a),this.fileComment=a.readString(this.fileCommentLength),this.dir=16&this.externalFileAttributes?!0:!1},parseZIP64ExtraField:function(){if(this.extraFields[1]){var a=new d(this.extraFields[1].value);this.uncompressedSize===e.MAX_VALUE_32BITS&&(this.uncompressedSize=a.readInt(8)),this.compressedSize===e.MAX_VALUE_32BITS&&(this.compressedSize=a.readInt(8)),this.localHeaderOffset===e.MAX_VALUE_32BITS&&(this.localHeaderOffset=a.readInt(8)),this.diskNumberStart===e.MAX_VALUE_32BITS&&(this.diskNumberStart=a.readInt(4))}},readExtraFields:function(a){var b,c,d,e=a.index;for(this.extraFields=this.extraFields||{};a.index<e+this.extraFieldsLength;)b=a.readInt(2),c=a.readInt(2),d=a.readString(c),this.extraFields[b]={id:b,length:c,value:d}},handleUTF8:function(){if(this.useUTF8())this.fileName=g.utf8decode(this.fileName),this.fileComment=g.utf8decode(this.fileComment);else{var a=this.findExtraFieldUnicodePath();null!==a&&(this.fileName=a);var b=this.findExtraFieldUnicodeComment();null!==b&&(this.fileComment=b)}},findExtraFieldUnicodePath:function(){var a=this.extraFields[28789];if(a){var b=new d(a.value);return 1!==b.readInt(1)?null:g.crc32(this.fileName)!==b.readInt(4)?null:g.utf8decode(b.readString(a.length-5))}return null},findExtraFieldUnicodeComment:function(){var a=this.extraFields[25461];if(a){var b=new d(a.value);return 1!==b.readInt(1)?null:g.crc32(this.fileComment)!==b.readInt(4)?null:g.utf8decode(b.readString(a.length-5))}return null}},b.exports=c},{"./compressedObject":2,"./object":13,"./stringReader":15,"./utils":21}],24:[function(a,b){"use strict";var c=a("./lib/utils/common").assign,d=a("./lib/deflate"),e=a("./lib/inflate"),f=a("./lib/zlib/constants"),g={};c(g,d,e,f),b.exports=g},{"./lib/deflate":25,"./lib/inflate":26,"./lib/utils/common":27,"./lib/zlib/constants":30}],25:[function(a,b,c){"use strict";function d(a,b){var c=new s(b);if(c.push(a,!0),c.err)throw c.msg;return c.result}function e(a,b){return b=b||{},b.raw=!0,d(a,b)}function f(a,b){return b=b||{},b.gzip=!0,d(a,b)}var g=a("./zlib/deflate.js"),h=a("./utils/common"),i=a("./utils/strings"),j=a("./zlib/messages"),k=a("./zlib/zstream"),l=0,m=4,n=0,o=1,p=-1,q=0,r=8,s=function(a){this.options=h.assign({level:p,method:r,chunkSize:16384,windowBits:15,memLevel:8,strategy:q,to:""},a||{});var b=this.options;b.raw&&b.windowBits>0?b.windowBits=-b.windowBits:b.gzip&&b.windowBits>0&&b.windowBits<16&&(b.windowBits+=16),this.err=0,this.msg="",this.ended=!1,this.chunks=[],this.strm=new k,this.strm.avail_out=0;var c=g.deflateInit2(this.strm,b.level,b.method,b.windowBits,b.memLevel,b.strategy);if(c!==n)throw new Error(j[c]);b.header&&g.deflateSetHeader(this.strm,b.header)
 };s.prototype.push=function(a,b){var c,d,e=this.strm,f=this.options.chunkSize;if(this.ended)return!1;d=b===~~b?b:b===!0?m:l,e.input="string"==typeof a?i.string2buf(a):a,e.next_in=0,e.avail_in=e.input.length;do{if(0===e.avail_out&&(e.output=new h.Buf8(f),e.next_out=0,e.avail_out=f),c=g.deflate(e,d),c!==o&&c!==n)return this.onEnd(c),this.ended=!0,!1;(0===e.avail_out||0===e.avail_in&&d===m)&&this.onData("string"===this.options.to?i.buf2binstring(h.shrinkBuf(e.output,e.next_out)):h.shrinkBuf(e.output,e.next_out))}while((e.avail_in>0||0===e.avail_out)&&c!==o);return d===m?(c=g.deflateEnd(this.strm),this.onEnd(c),this.ended=!0,c===n):!0},s.prototype.onData=function(a){this.chunks.push(a)},s.prototype.onEnd=function(a){a===n&&(this.result="string"===this.options.to?this.chunks.join(""):h.flattenChunks(this.chunks)),this.chunks=[],this.err=a,this.msg=this.strm.msg},c.Deflate=s,c.deflate=d,c.deflateRaw=e,c.gzip=f},{"./utils/common":27,"./utils/strings":28,"./zlib/deflate.js":32,"./zlib/messages":37,"./zlib/zstream":39}],26:[function(a,b,c){"use strict";function d(a,b){var c=new m(b);if(c.push(a,!0),c.err)throw c.msg;return c.result}function e(a,b){return b=b||{},b.raw=!0,d(a,b)}var f=a("./zlib/inflate.js"),g=a("./utils/common"),h=a("./utils/strings"),i=a("./zlib/constants"),j=a("./zlib/messages"),k=a("./zlib/zstream"),l=a("./zlib/gzheader"),m=function(a){this.options=g.assign({chunkSize:16384,windowBits:0,to:""},a||{});var b=this.options;b.raw&&b.windowBits>=0&&b.windowBits<16&&(b.windowBits=-b.windowBits,0===b.windowBits&&(b.windowBits=-15)),!(b.windowBits>=0&&b.windowBits<16)||a&&a.windowBits||(b.windowBits+=32),b.windowBits>15&&b.windowBits<48&&0===(15&b.windowBits)&&(b.windowBits|=15),this.err=0,this.msg="",this.ended=!1,this.chunks=[],this.strm=new k,this.strm.avail_out=0;var c=f.inflateInit2(this.strm,b.windowBits);if(c!==i.Z_OK)throw new Error(j[c]);this.header=new l,f.inflateGetHeader(this.strm,this.header)};m.prototype.push=function(a,b){var c,d,e,j,k,l=this.strm,m=this.options.chunkSize;if(this.ended)return!1;d=b===~~b?b:b===!0?i.Z_FINISH:i.Z_NO_FLUSH,l.input="string"==typeof a?h.binstring2buf(a):a,l.next_in=0,l.avail_in=l.input.length;do{if(0===l.avail_out&&(l.output=new g.Buf8(m),l.next_out=0,l.avail_out=m),c=f.inflate(l,i.Z_NO_FLUSH),c!==i.Z_STREAM_END&&c!==i.Z_OK)return this.onEnd(c),this.ended=!0,!1;l.next_out&&(0===l.avail_out||c===i.Z_STREAM_END||0===l.avail_in&&d===i.Z_FINISH)&&("string"===this.options.to?(e=h.utf8border(l.output,l.next_out),j=l.next_out-e,k=h.buf2string(l.output,e),l.next_out=j,l.avail_out=m-j,j&&g.arraySet(l.output,l.output,e,j,0),this.onData(k)):this.onData(g.shrinkBuf(l.output,l.next_out)))}while(l.avail_in>0&&c!==i.Z_STREAM_END);return c===i.Z_STREAM_END&&(d=i.Z_FINISH),d===i.Z_FINISH?(c=f.inflateEnd(this.strm),this.onEnd(c),this.ended=!0,c===i.Z_OK):!0},m.prototype.onData=function(a){this.chunks.push(a)},m.prototype.onEnd=function(a){a===i.Z_OK&&(this.result="string"===this.options.to?this.chunks.join(""):g.flattenChunks(this.chunks)),this.chunks=[],this.err=a,this.msg=this.strm.msg},c.Inflate=m,c.inflate=d,c.inflateRaw=e,c.ungzip=d},{"./utils/common":27,"./utils/strings":28,"./zlib/constants":30,"./zlib/gzheader":33,"./zlib/inflate.js":35,"./zlib/messages":37,"./zlib/zstream":39}],27:[function(a,b,c){"use strict";var d="undefined"!=typeof Uint8Array&&"undefined"!=typeof Uint16Array&&"undefined"!=typeof Int32Array;c.assign=function(a){for(var b=Array.prototype.slice.call(arguments,1);b.length;){var c=b.shift();if(c){if("object"!=typeof c)throw new TypeError(c+"must be non-object");for(var d in c)c.hasOwnProperty(d)&&(a[d]=c[d])}}return a},c.shrinkBuf=function(a,b){return a.length===b?a:a.subarray?a.subarray(0,b):(a.length=b,a)};var e={arraySet:function(a,b,c,d,e){if(b.subarray&&a.subarray)return void a.set(b.subarray(c,c+d),e);for(var f=0;d>f;f++)a[e+f]=b[c+f]},flattenChunks:function(a){var b,c,d,e,f,g;for(d=0,b=0,c=a.length;c>b;b++)d+=a[b].length;for(g=new Uint8Array(d),e=0,b=0,c=a.length;c>b;b++)f=a[b],g.set(f,e),e+=f.length;return g}},f={arraySet:function(a,b,c,d,e){for(var f=0;d>f;f++)a[e+f]=b[c+f]},flattenChunks:function(a){return[].concat.apply([],a)}};c.setTyped=function(a){a?(c.Buf8=Uint8Array,c.Buf16=Uint16Array,c.Buf32=Int32Array,c.assign(c,e)):(c.Buf8=Array,c.Buf16=Array,c.Buf32=Array,c.assign(c,f))},c.setTyped(d)},{}],28:[function(a,b,c){"use strict";function d(a,b){if(65537>b&&(a.subarray&&g||!a.subarray&&f))return String.fromCharCode.apply(null,e.shrinkBuf(a,b));for(var c="",d=0;b>d;d++)c+=String.fromCharCode(a[d]);return c}var e=a("./common"),f=!0,g=!0;try{String.fromCharCode.apply(null,[0])}catch(h){f=!1}try{String.fromCharCode.apply(null,new Uint8Array(1))}catch(h){g=!1}for(var i=new e.Buf8(256),j=0;256>j;j++)i[j]=j>=252?6:j>=248?5:j>=240?4:j>=224?3:j>=192?2:1;i[254]=i[254]=1,c.string2buf=function(a){var b,c,d,f,g,h=a.length,i=0;for(f=0;h>f;f++)c=a.charCodeAt(f),55296===(64512&c)&&h>f+1&&(d=a.charCodeAt(f+1),56320===(64512&d)&&(c=65536+(c-55296<<10)+(d-56320),f++)),i+=128>c?1:2048>c?2:65536>c?3:4;for(b=new e.Buf8(i),g=0,f=0;i>g;f++)c=a.charCodeAt(f),55296===(64512&c)&&h>f+1&&(d=a.charCodeAt(f+1),56320===(64512&d)&&(c=65536+(c-55296<<10)+(d-56320),f++)),128>c?b[g++]=c:2048>c?(b[g++]=192|c>>>6,b[g++]=128|63&c):65536>c?(b[g++]=224|c>>>12,b[g++]=128|c>>>6&63,b[g++]=128|63&c):(b[g++]=240|c>>>18,b[g++]=128|c>>>12&63,b[g++]=128|c>>>6&63,b[g++]=128|63&c);return b},c.buf2binstring=function(a){return d(a,a.length)},c.binstring2buf=function(a){for(var b=new e.Buf8(a.length),c=0,d=b.length;d>c;c++)b[c]=a.charCodeAt(c);return b},c.buf2string=function(a,b){var c,e,f,g,h=b||a.length,j=new Array(2*h);for(e=0,c=0;h>c;)if(f=a[c++],128>f)j[e++]=f;else if(g=i[f],g>4)j[e++]=65533,c+=g-1;else{for(f&=2===g?31:3===g?15:7;g>1&&h>c;)f=f<<6|63&a[c++],g--;g>1?j[e++]=65533:65536>f?j[e++]=f:(f-=65536,j[e++]=55296|f>>10&1023,j[e++]=56320|1023&f)}return d(j,e)},c.utf8border=function(a,b){var c;for(b=b||a.length,b>a.length&&(b=a.length),c=b-1;c>=0&&128===(192&a[c]);)c--;return 0>c?b:0===c?b:c+i[a[c]]>b?c:b}},{"./common":27}],29:[function(a,b){"use strict";function c(a,b,c,d){for(var e=65535&a|0,f=a>>>16&65535|0,g=0;0!==c;){g=c>2e3?2e3:c,c-=g;do e=e+b[d++]|0,f=f+e|0;while(--g);e%=65521,f%=65521}return e|f<<16|0}b.exports=c},{}],30:[function(a,b){b.exports={Z_NO_FLUSH:0,Z_PARTIAL_FLUSH:1,Z_SYNC_FLUSH:2,Z_FULL_FLUSH:3,Z_FINISH:4,Z_BLOCK:5,Z_TREES:6,Z_OK:0,Z_STREAM_END:1,Z_NEED_DICT:2,Z_ERRNO:-1,Z_STREAM_ERROR:-2,Z_DATA_ERROR:-3,Z_BUF_ERROR:-5,Z_NO_COMPRESSION:0,Z_BEST_SPEED:1,Z_BEST_COMPRESSION:9,Z_DEFAULT_COMPRESSION:-1,Z_FILTERED:1,Z_HUFFMAN_ONLY:2,Z_RLE:3,Z_FIXED:4,Z_DEFAULT_STRATEGY:0,Z_BINARY:0,Z_TEXT:1,Z_UNKNOWN:2,Z_DEFLATED:8}},{}],31:[function(a,b){"use strict";function c(){for(var a,b=[],c=0;256>c;c++){a=c;for(var d=0;8>d;d++)a=1&a?3988292384^a>>>1:a>>>1;b[c]=a}return b}function d(a,b,c,d){var f=e,g=d+c;a=-1^a;for(var h=d;g>h;h++)a=a>>>8^f[255&(a^b[h])];return-1^a}var e=c();b.exports=d},{}],32:[function(a,b,c){"use strict";function d(a,b){return a.msg=G[b],b}function e(a){return(a<<1)-(a>4?9:0)}function f(a){for(var b=a.length;--b>=0;)a[b]=0}function g(a){var b=a.state,c=b.pending;c>a.avail_out&&(c=a.avail_out),0!==c&&(C.arraySet(a.output,b.pending_buf,b.pending_out,c,a.next_out),a.next_out+=c,b.pending_out+=c,a.total_out+=c,a.avail_out-=c,b.pending-=c,0===b.pending&&(b.pending_out=0))}function h(a,b){D._tr_flush_block(a,a.block_start>=0?a.block_start:-1,a.strstart-a.block_start,b),a.block_start=a.strstart,g(a.strm)}function i(a,b){a.pending_buf[a.pending++]=b}function j(a,b){a.pending_buf[a.pending++]=b>>>8&255,a.pending_buf[a.pending++]=255&b}function k(a,b,c,d){var e=a.avail_in;return e>d&&(e=d),0===e?0:(a.avail_in-=e,C.arraySet(b,a.input,a.next_in,e,c),1===a.state.wrap?a.adler=E(a.adler,b,e,c):2===a.state.wrap&&(a.adler=F(a.adler,b,e,c)),a.next_in+=e,a.total_in+=e,e)}function l(a,b){var c,d,e=a.max_chain_length,f=a.strstart,g=a.prev_length,h=a.nice_match,i=a.strstart>a.w_size-jb?a.strstart-(a.w_size-jb):0,j=a.window,k=a.w_mask,l=a.prev,m=a.strstart+ib,n=j[f+g-1],o=j[f+g];a.prev_length>=a.good_match&&(e>>=2),h>a.lookahead&&(h=a.lookahead);do if(c=b,j[c+g]===o&&j[c+g-1]===n&&j[c]===j[f]&&j[++c]===j[f+1]){f+=2,c++;do;while(j[++f]===j[++c]&&j[++f]===j[++c]&&j[++f]===j[++c]&&j[++f]===j[++c]&&j[++f]===j[++c]&&j[++f]===j[++c]&&j[++f]===j[++c]&&j[++f]===j[++c]&&m>f);if(d=ib-(m-f),f=m-ib,d>g){if(a.match_start=b,g=d,d>=h)break;n=j[f+g-1],o=j[f+g]}}while((b=l[b&k])>i&&0!==--e);return g<=a.lookahead?g:a.lookahead}function m(a){var b,c,d,e,f,g=a.w_size;do{if(e=a.window_size-a.lookahead-a.strstart,a.strstart>=g+(g-jb)){C.arraySet(a.window,a.window,g,g,0),a.match_start-=g,a.strstart-=g,a.block_start-=g,c=a.hash_size,b=c;do d=a.head[--b],a.head[b]=d>=g?d-g:0;while(--c);c=g,b=c;do d=a.prev[--b],a.prev[b]=d>=g?d-g:0;while(--c);e+=g}if(0===a.strm.avail_in)break;if(c=k(a.strm,a.window,a.strstart+a.lookahead,e),a.lookahead+=c,a.lookahead+a.insert>=hb)for(f=a.strstart-a.insert,a.ins_h=a.window[f],a.ins_h=(a.ins_h<<a.hash_shift^a.window[f+1])&a.hash_mask;a.insert&&(a.ins_h=(a.ins_h<<a.hash_shift^a.window[f+hb-1])&a.hash_mask,a.prev[f&a.w_mask]=a.head[a.ins_h],a.head[a.ins_h]=f,f++,a.insert--,!(a.lookahead+a.insert<hb)););}while(a.lookahead<jb&&0!==a.strm.avail_in)}function n(a,b){var c=65535;for(c>a.pending_buf_size-5&&(c=a.pending_buf_size-5);;){if(a.lookahead<=1){if(m(a),0===a.lookahead&&b===H)return sb;if(0===a.lookahead)break}a.strstart+=a.lookahead,a.lookahead=0;var d=a.block_start+c;if((0===a.strstart||a.strstart>=d)&&(a.lookahead=a.strstart-d,a.strstart=d,h(a,!1),0===a.strm.avail_out))return sb;if(a.strstart-a.block_start>=a.w_size-jb&&(h(a,!1),0===a.strm.avail_out))return sb}return a.insert=0,b===K?(h(a,!0),0===a.strm.avail_out?ub:vb):a.strstart>a.block_start&&(h(a,!1),0===a.strm.avail_out)?sb:sb}function o(a,b){for(var c,d;;){if(a.lookahead<jb){if(m(a),a.lookahead<jb&&b===H)return sb;if(0===a.lookahead)break}if(c=0,a.lookahead>=hb&&(a.ins_h=(a.ins_h<<a.hash_shift^a.window[a.strstart+hb-1])&a.hash_mask,c=a.prev[a.strstart&a.w_mask]=a.head[a.ins_h],a.head[a.ins_h]=a.strstart),0!==c&&a.strstart-c<=a.w_size-jb&&(a.match_length=l(a,c)),a.match_length>=hb)if(d=D._tr_tally(a,a.strstart-a.match_start,a.match_length-hb),a.lookahead-=a.match_length,a.match_length<=a.max_lazy_match&&a.lookahead>=hb){a.match_length--;do a.strstart++,a.ins_h=(a.ins_h<<a.hash_shift^a.window[a.strstart+hb-1])&a.hash_mask,c=a.prev[a.strstart&a.w_mask]=a.head[a.ins_h],a.head[a.ins_h]=a.strstart;while(0!==--a.match_length);a.strstart++}else a.strstart+=a.match_length,a.match_length=0,a.ins_h=a.window[a.strstart],a.ins_h=(a.ins_h<<a.hash_shift^a.window[a.strstart+1])&a.hash_mask;else d=D._tr_tally(a,0,a.window[a.strstart]),a.lookahead--,a.strstart++;if(d&&(h(a,!1),0===a.strm.avail_out))return sb}return a.insert=a.strstart<hb-1?a.strstart:hb-1,b===K?(h(a,!0),0===a.strm.avail_out?ub:vb):a.last_lit&&(h(a,!1),0===a.strm.avail_out)?sb:tb}function p(a,b){for(var c,d,e;;){if(a.lookahead<jb){if(m(a),a.lookahead<jb&&b===H)return sb;if(0===a.lookahead)break}if(c=0,a.lookahead>=hb&&(a.ins_h=(a.ins_h<<a.hash_shift^a.window[a.strstart+hb-1])&a.hash_mask,c=a.prev[a.strstart&a.w_mask]=a.head[a.ins_h],a.head[a.ins_h]=a.strstart),a.prev_length=a.match_length,a.prev_match=a.match_start,a.match_length=hb-1,0!==c&&a.prev_length<a.max_lazy_match&&a.strstart-c<=a.w_size-jb&&(a.match_length=l(a,c),a.match_length<=5&&(a.strategy===S||a.match_length===hb&&a.strstart-a.match_start>4096)&&(a.match_length=hb-1)),a.prev_length>=hb&&a.match_length<=a.prev_length){e=a.strstart+a.lookahead-hb,d=D._tr_tally(a,a.strstart-1-a.prev_match,a.prev_length-hb),a.lookahead-=a.prev_length-1,a.prev_length-=2;do++a.strstart<=e&&(a.ins_h=(a.ins_h<<a.hash_shift^a.window[a.strstart+hb-1])&a.hash_mask,c=a.prev[a.strstart&a.w_mask]=a.head[a.ins_h],a.head[a.ins_h]=a.strstart);while(0!==--a.prev_length);if(a.match_available=0,a.match_length=hb-1,a.strstart++,d&&(h(a,!1),0===a.strm.avail_out))return sb}else if(a.match_available){if(d=D._tr_tally(a,0,a.window[a.strstart-1]),d&&h(a,!1),a.strstart++,a.lookahead--,0===a.strm.avail_out)return sb}else a.match_available=1,a.strstart++,a.lookahead--}return a.match_available&&(d=D._tr_tally(a,0,a.window[a.strstart-1]),a.match_available=0),a.insert=a.strstart<hb-1?a.strstart:hb-1,b===K?(h(a,!0),0===a.strm.avail_out?ub:vb):a.last_lit&&(h(a,!1),0===a.strm.avail_out)?sb:tb}function q(a,b){for(var c,d,e,f,g=a.window;;){if(a.lookahead<=ib){if(m(a),a.lookahead<=ib&&b===H)return sb;if(0===a.lookahead)break}if(a.match_length=0,a.lookahead>=hb&&a.strstart>0&&(e=a.strstart-1,d=g[e],d===g[++e]&&d===g[++e]&&d===g[++e])){f=a.strstart+ib;do;while(d===g[++e]&&d===g[++e]&&d===g[++e]&&d===g[++e]&&d===g[++e]&&d===g[++e]&&d===g[++e]&&d===g[++e]&&f>e);a.match_length=ib-(f-e),a.match_length>a.lookahead&&(a.match_length=a.lookahead)}if(a.match_length>=hb?(c=D._tr_tally(a,1,a.match_length-hb),a.lookahead-=a.match_length,a.strstart+=a.match_length,a.match_length=0):(c=D._tr_tally(a,0,a.window[a.strstart]),a.lookahead--,a.strstart++),c&&(h(a,!1),0===a.strm.avail_out))return sb}return a.insert=0,b===K?(h(a,!0),0===a.strm.avail_out?ub:vb):a.last_lit&&(h(a,!1),0===a.strm.avail_out)?sb:tb}function r(a,b){for(var c;;){if(0===a.lookahead&&(m(a),0===a.lookahead)){if(b===H)return sb;break}if(a.match_length=0,c=D._tr_tally(a,0,a.window[a.strstart]),a.lookahead--,a.strstart++,c&&(h(a,!1),0===a.strm.avail_out))return sb}return a.insert=0,b===K?(h(a,!0),0===a.strm.avail_out?ub:vb):a.last_lit&&(h(a,!1),0===a.strm.avail_out)?sb:tb}function s(a){a.window_size=2*a.w_size,f(a.head),a.max_lazy_match=B[a.level].max_lazy,a.good_match=B[a.level].good_length,a.nice_match=B[a.level].nice_length,a.max_chain_length=B[a.level].max_chain,a.strstart=0,a.block_start=0,a.lookahead=0,a.insert=0,a.match_length=a.prev_length=hb-1,a.match_available=0,a.ins_h=0}function t(){this.strm=null,this.status=0,this.pending_buf=null,this.pending_buf_size=0,this.pending_out=0,this.pending=0,this.wrap=0,this.gzhead=null,this.gzindex=0,this.method=Y,this.last_flush=-1,this.w_size=0,this.w_bits=0,this.w_mask=0,this.window=null,this.window_size=0,this.prev=null,this.head=null,this.ins_h=0,this.hash_size=0,this.hash_bits=0,this.hash_mask=0,this.hash_shift=0,this.block_start=0,this.match_length=0,this.prev_match=0,this.match_available=0,this.strstart=0,this.match_start=0,this.lookahead=0,this.prev_length=0,this.max_chain_length=0,this.max_lazy_match=0,this.level=0,this.strategy=0,this.good_match=0,this.nice_match=0,this.dyn_ltree=new C.Buf16(2*fb),this.dyn_dtree=new C.Buf16(2*(2*db+1)),this.bl_tree=new C.Buf16(2*(2*eb+1)),f(this.dyn_ltree),f(this.dyn_dtree),f(this.bl_tree),this.l_desc=null,this.d_desc=null,this.bl_desc=null,this.bl_count=new C.Buf16(gb+1),this.heap=new C.Buf16(2*cb+1),f(this.heap),this.heap_len=0,this.heap_max=0,this.depth=new C.Buf16(2*cb+1),f(this.depth),this.l_buf=0,this.lit_bufsize=0,this.last_lit=0,this.d_buf=0,this.opt_len=0,this.static_len=0,this.matches=0,this.insert=0,this.bi_buf=0,this.bi_valid=0}function u(a){var b;return a&&a.state?(a.total_in=a.total_out=0,a.data_type=X,b=a.state,b.pending=0,b.pending_out=0,b.wrap<0&&(b.wrap=-b.wrap),b.status=b.wrap?lb:qb,a.adler=2===b.wrap?0:1,b.last_flush=H,D._tr_init(b),M):d(a,O)}function v(a){var b=u(a);return b===M&&s(a.state),b}function w(a,b){return a&&a.state?2!==a.state.wrap?O:(a.state.gzhead=b,M):O}function x(a,b,c,e,f,g){if(!a)return O;var h=1;if(b===R&&(b=6),0>e?(h=0,e=-e):e>15&&(h=2,e-=16),1>f||f>Z||c!==Y||8>e||e>15||0>b||b>9||0>g||g>V)return d(a,O);8===e&&(e=9);var i=new t;return a.state=i,i.strm=a,i.wrap=h,i.gzhead=null,i.w_bits=e,i.w_size=1<<i.w_bits,i.w_mask=i.w_size-1,i.hash_bits=f+7,i.hash_size=1<<i.hash_bits,i.hash_mask=i.hash_size-1,i.hash_shift=~~((i.hash_bits+hb-1)/hb),i.window=new C.Buf8(2*i.w_size),i.head=new C.Buf16(i.hash_size),i.prev=new C.Buf16(i.w_size),i.lit_bufsize=1<<f+6,i.pending_buf_size=4*i.lit_bufsize,i.pending_buf=new C.Buf8(i.pending_buf_size),i.d_buf=i.lit_bufsize>>1,i.l_buf=3*i.lit_bufsize,i.level=b,i.strategy=g,i.method=c,v(a)}function y(a,b){return x(a,b,Y,$,_,W)}function z(a,b){var c,h,k,l;if(!a||!a.state||b>L||0>b)return a?d(a,O):O;if(h=a.state,!a.output||!a.input&&0!==a.avail_in||h.status===rb&&b!==K)return d(a,0===a.avail_out?Q:O);if(h.strm=a,c=h.last_flush,h.last_flush=b,h.status===lb)if(2===h.wrap)a.adler=0,i(h,31),i(h,139),i(h,8),h.gzhead?(i(h,(h.gzhead.text?1:0)+(h.gzhead.hcrc?2:0)+(h.gzhead.extra?4:0)+(h.gzhead.name?8:0)+(h.gzhead.comment?16:0)),i(h,255&h.gzhead.time),i(h,h.gzhead.time>>8&255),i(h,h.gzhead.time>>16&255),i(h,h.gzhead.time>>24&255),i(h,9===h.level?2:h.strategy>=T||h.level<2?4:0),i(h,255&h.gzhead.os),h.gzhead.extra&&h.gzhead.extra.length&&(i(h,255&h.gzhead.extra.length),i(h,h.gzhead.extra.length>>8&255)),h.gzhead.hcrc&&(a.adler=F(a.adler,h.pending_buf,h.pending,0)),h.gzindex=0,h.status=mb):(i(h,0),i(h,0),i(h,0),i(h,0),i(h,0),i(h,9===h.level?2:h.strategy>=T||h.level<2?4:0),i(h,wb),h.status=qb);else{var m=Y+(h.w_bits-8<<4)<<8,n=-1;n=h.strategy>=T||h.level<2?0:h.level<6?1:6===h.level?2:3,m|=n<<6,0!==h.strstart&&(m|=kb),m+=31-m%31,h.status=qb,j(h,m),0!==h.strstart&&(j(h,a.adler>>>16),j(h,65535&a.adler)),a.adler=1}if(h.status===mb)if(h.gzhead.extra){for(k=h.pending;h.gzindex<(65535&h.gzhead.extra.length)&&(h.pending!==h.pending_buf_size||(h.gzhead.hcrc&&h.pending>k&&(a.adler=F(a.adler,h.pending_buf,h.pending-k,k)),g(a),k=h.pending,h.pending!==h.pending_buf_size));)i(h,255&h.gzhead.extra[h.gzindex]),h.gzindex++;h.gzhead.hcrc&&h.pending>k&&(a.adler=F(a.adler,h.pending_buf,h.pending-k,k)),h.gzindex===h.gzhead.extra.length&&(h.gzindex=0,h.status=nb)}else h.status=nb;if(h.status===nb)if(h.gzhead.name){k=h.pending;do{if(h.pending===h.pending_buf_size&&(h.gzhead.hcrc&&h.pending>k&&(a.adler=F(a.adler,h.pending_buf,h.pending-k,k)),g(a),k=h.pending,h.pending===h.pending_buf_size)){l=1;break}l=h.gzindex<h.gzhead.name.length?255&h.gzhead.name.charCodeAt(h.gzindex++):0,i(h,l)}while(0!==l);h.gzhead.hcrc&&h.pending>k&&(a.adler=F(a.adler,h.pending_buf,h.pending-k,k)),0===l&&(h.gzindex=0,h.status=ob)}else h.status=ob;if(h.status===ob)if(h.gzhead.comment){k=h.pending;do{if(h.pending===h.pending_buf_size&&(h.gzhead.hcrc&&h.pending>k&&(a.adler=F(a.adler,h.pending_buf,h.pending-k,k)),g(a),k=h.pending,h.pending===h.pending_buf_size)){l=1;break}l=h.gzindex<h.gzhead.comment.length?255&h.gzhead.comment.charCodeAt(h.gzindex++):0,i(h,l)}while(0!==l);h.gzhead.hcrc&&h.pending>k&&(a.adler=F(a.adler,h.pending_buf,h.pending-k,k)),0===l&&(h.status=pb)}else h.status=pb;if(h.status===pb&&(h.gzhead.hcrc?(h.pending+2>h.pending_buf_size&&g(a),h.pending+2<=h.pending_buf_size&&(i(h,255&a.adler),i(h,a.adler>>8&255),a.adler=0,h.status=qb)):h.status=qb),0!==h.pending){if(g(a),0===a.avail_out)return h.last_flush=-1,M}else if(0===a.avail_in&&e(b)<=e(c)&&b!==K)return d(a,Q);if(h.status===rb&&0!==a.avail_in)return d(a,Q);if(0!==a.avail_in||0!==h.lookahead||b!==H&&h.status!==rb){var o=h.strategy===T?r(h,b):h.strategy===U?q(h,b):B[h.level].func(h,b);if((o===ub||o===vb)&&(h.status=rb),o===sb||o===ub)return 0===a.avail_out&&(h.last_flush=-1),M;if(o===tb&&(b===I?D._tr_align(h):b!==L&&(D._tr_stored_block(h,0,0,!1),b===J&&(f(h.head),0===h.lookahead&&(h.strstart=0,h.block_start=0,h.insert=0))),g(a),0===a.avail_out))return h.last_flush=-1,M}return b!==K?M:h.wrap<=0?N:(2===h.wrap?(i(h,255&a.adler),i(h,a.adler>>8&255),i(h,a.adler>>16&255),i(h,a.adler>>24&255),i(h,255&a.total_in),i(h,a.total_in>>8&255),i(h,a.total_in>>16&255),i(h,a.total_in>>24&255)):(j(h,a.adler>>>16),j(h,65535&a.adler)),g(a),h.wrap>0&&(h.wrap=-h.wrap),0!==h.pending?M:N)}function A(a){var b;return a&&a.state?(b=a.state.status,b!==lb&&b!==mb&&b!==nb&&b!==ob&&b!==pb&&b!==qb&&b!==rb?d(a,O):(a.state=null,b===qb?d(a,P):M)):O}var B,C=a("../utils/common"),D=a("./trees"),E=a("./adler32"),F=a("./crc32"),G=a("./messages"),H=0,I=1,J=3,K=4,L=5,M=0,N=1,O=-2,P=-3,Q=-5,R=-1,S=1,T=2,U=3,V=4,W=0,X=2,Y=8,Z=9,$=15,_=8,ab=29,bb=256,cb=bb+1+ab,db=30,eb=19,fb=2*cb+1,gb=15,hb=3,ib=258,jb=ib+hb+1,kb=32,lb=42,mb=69,nb=73,ob=91,pb=103,qb=113,rb=666,sb=1,tb=2,ub=3,vb=4,wb=3,xb=function(a,b,c,d,e){this.good_length=a,this.max_lazy=b,this.nice_length=c,this.max_chain=d,this.func=e};B=[new xb(0,0,0,0,n),new xb(4,4,8,4,o),new xb(4,5,16,8,o),new xb(4,6,32,32,o),new xb(4,4,16,16,p),new xb(8,16,32,32,p),new xb(8,16,128,128,p),new xb(8,32,128,256,p),new xb(32,128,258,1024,p),new xb(32,258,258,4096,p)],c.deflateInit=y,c.deflateInit2=x,c.deflateReset=v,c.deflateResetKeep=u,c.deflateSetHeader=w,c.deflate=z,c.deflateEnd=A,c.deflateInfo="pako deflate (from Nodeca project)"},{"../utils/common":27,"./adler32":29,"./crc32":31,"./messages":37,"./trees":38}],33:[function(a,b){"use strict";function c(){this.text=0,this.time=0,this.xflags=0,this.os=0,this.extra=null,this.extra_len=0,this.name="",this.comment="",this.hcrc=0,this.done=!1}b.exports=c},{}],34:[function(a,b){"use strict";var c=30,d=12;b.exports=function(a,b){var e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,A,B,C;e=a.state,f=a.next_in,B=a.input,g=f+(a.avail_in-5),h=a.next_out,C=a.output,i=h-(b-a.avail_out),j=h+(a.avail_out-257),k=e.dmax,l=e.wsize,m=e.whave,n=e.wnext,o=e.window,p=e.hold,q=e.bits,r=e.lencode,s=e.distcode,t=(1<<e.lenbits)-1,u=(1<<e.distbits)-1;a:do{15>q&&(p+=B[f++]<<q,q+=8,p+=B[f++]<<q,q+=8),v=r[p&t];b:for(;;){if(w=v>>>24,p>>>=w,q-=w,w=v>>>16&255,0===w)C[h++]=65535&v;else{if(!(16&w)){if(0===(64&w)){v=r[(65535&v)+(p&(1<<w)-1)];continue b}if(32&w){e.mode=d;break a}a.msg="invalid literal/length code",e.mode=c;break a}x=65535&v,w&=15,w&&(w>q&&(p+=B[f++]<<q,q+=8),x+=p&(1<<w)-1,p>>>=w,q-=w),15>q&&(p+=B[f++]<<q,q+=8,p+=B[f++]<<q,q+=8),v=s[p&u];c:for(;;){if(w=v>>>24,p>>>=w,q-=w,w=v>>>16&255,!(16&w)){if(0===(64&w)){v=s[(65535&v)+(p&(1<<w)-1)];continue c}a.msg="invalid distance code",e.mode=c;break a}if(y=65535&v,w&=15,w>q&&(p+=B[f++]<<q,q+=8,w>q&&(p+=B[f++]<<q,q+=8)),y+=p&(1<<w)-1,y>k){a.msg="invalid distance too far back",e.mode=c;break a}if(p>>>=w,q-=w,w=h-i,y>w){if(w=y-w,w>m&&e.sane){a.msg="invalid distance too far back",e.mode=c;break a}if(z=0,A=o,0===n){if(z+=l-w,x>w){x-=w;do C[h++]=o[z++];while(--w);z=h-y,A=C}}else if(w>n){if(z+=l+n-w,w-=n,x>w){x-=w;do C[h++]=o[z++];while(--w);if(z=0,x>n){w=n,x-=w;do C[h++]=o[z++];while(--w);z=h-y,A=C}}}else if(z+=n-w,x>w){x-=w;do C[h++]=o[z++];while(--w);z=h-y,A=C}for(;x>2;)C[h++]=A[z++],C[h++]=A[z++],C[h++]=A[z++],x-=3;x&&(C[h++]=A[z++],x>1&&(C[h++]=A[z++]))}else{z=h-y;do C[h++]=C[z++],C[h++]=C[z++],C[h++]=C[z++],x-=3;while(x>2);x&&(C[h++]=C[z++],x>1&&(C[h++]=C[z++]))}break}}break}}while(g>f&&j>h);x=q>>3,f-=x,q-=x<<3,p&=(1<<q)-1,a.next_in=f,a.next_out=h,a.avail_in=g>f?5+(g-f):5-(f-g),a.avail_out=j>h?257+(j-h):257-(h-j),e.hold=p,e.bits=q}},{}],35:[function(a,b,c){"use strict";function d(a){return(a>>>24&255)+(a>>>8&65280)+((65280&a)<<8)+((255&a)<<24)}function e(){this.mode=0,this.last=!1,this.wrap=0,this.havedict=!1,this.flags=0,this.dmax=0,this.check=0,this.total=0,this.head=null,this.wbits=0,this.wsize=0,this.whave=0,this.wnext=0,this.window=null,this.hold=0,this.bits=0,this.length=0,this.offset=0,this.extra=0,this.lencode=null,this.distcode=null,this.lenbits=0,this.distbits=0,this.ncode=0,this.nlen=0,this.ndist=0,this.have=0,this.next=null,this.lens=new r.Buf16(320),this.work=new r.Buf16(288),this.lendyn=null,this.distdyn=null,this.sane=0,this.back=0,this.was=0}function f(a){var b;return a&&a.state?(b=a.state,a.total_in=a.total_out=b.total=0,a.msg="",b.wrap&&(a.adler=1&b.wrap),b.mode=K,b.last=0,b.havedict=0,b.dmax=32768,b.head=null,b.hold=0,b.bits=0,b.lencode=b.lendyn=new r.Buf32(ob),b.distcode=b.distdyn=new r.Buf32(pb),b.sane=1,b.back=-1,C):F}function g(a){var b;return a&&a.state?(b=a.state,b.wsize=0,b.whave=0,b.wnext=0,f(a)):F}function h(a,b){var c,d;return a&&a.state?(d=a.state,0>b?(c=0,b=-b):(c=(b>>4)+1,48>b&&(b&=15)),b&&(8>b||b>15)?F:(null!==d.window&&d.wbits!==b&&(d.window=null),d.wrap=c,d.wbits=b,g(a))):F}function i(a,b){var c,d;return a?(d=new e,a.state=d,d.window=null,c=h(a,b),c!==C&&(a.state=null),c):F}function j(a){return i(a,rb)}function k(a){if(sb){var b;for(p=new r.Buf32(512),q=new r.Buf32(32),b=0;144>b;)a.lens[b++]=8;for(;256>b;)a.lens[b++]=9;for(;280>b;)a.lens[b++]=7;for(;288>b;)a.lens[b++]=8;for(v(x,a.lens,0,288,p,0,a.work,{bits:9}),b=0;32>b;)a.lens[b++]=5;v(y,a.lens,0,32,q,0,a.work,{bits:5}),sb=!1}a.lencode=p,a.lenbits=9,a.distcode=q,a.distbits=5}function l(a,b,c,d){var e,f=a.state;return null===f.window&&(f.wsize=1<<f.wbits,f.wnext=0,f.whave=0,f.window=new r.Buf8(f.wsize)),d>=f.wsize?(r.arraySet(f.window,b,c-f.wsize,f.wsize,0),f.wnext=0,f.whave=f.wsize):(e=f.wsize-f.wnext,e>d&&(e=d),r.arraySet(f.window,b,c-d,e,f.wnext),d-=e,d?(r.arraySet(f.window,b,c-d,d,0),f.wnext=d,f.whave=f.wsize):(f.wnext+=e,f.wnext===f.wsize&&(f.wnext=0),f.whave<f.wsize&&(f.whave+=e))),0}function m(a,b){var c,e,f,g,h,i,j,m,n,o,p,q,ob,pb,qb,rb,sb,tb,ub,vb,wb,xb,yb,zb,Ab=0,Bb=new r.Buf8(4),Cb=[16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15];if(!a||!a.state||!a.output||!a.input&&0!==a.avail_in)return F;c=a.state,c.mode===V&&(c.mode=W),h=a.next_out,f=a.output,j=a.avail_out,g=a.next_in,e=a.input,i=a.avail_in,m=c.hold,n=c.bits,o=i,p=j,xb=C;a:for(;;)switch(c.mode){case K:if(0===c.wrap){c.mode=W;break}for(;16>n;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}if(2&c.wrap&&35615===m){c.check=0,Bb[0]=255&m,Bb[1]=m>>>8&255,c.check=t(c.check,Bb,2,0),m=0,n=0,c.mode=L;break}if(c.flags=0,c.head&&(c.head.done=!1),!(1&c.wrap)||(((255&m)<<8)+(m>>8))%31){a.msg="incorrect header check",c.mode=lb;break}if((15&m)!==J){a.msg="unknown compression method",c.mode=lb;break}if(m>>>=4,n-=4,wb=(15&m)+8,0===c.wbits)c.wbits=wb;else if(wb>c.wbits){a.msg="invalid window size",c.mode=lb;break}c.dmax=1<<wb,a.adler=c.check=1,c.mode=512&m?T:V,m=0,n=0;break;case L:for(;16>n;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}if(c.flags=m,(255&c.flags)!==J){a.msg="unknown compression method",c.mode=lb;break}if(57344&c.flags){a.msg="unknown header flags set",c.mode=lb;break}c.head&&(c.head.text=m>>8&1),512&c.flags&&(Bb[0]=255&m,Bb[1]=m>>>8&255,c.check=t(c.check,Bb,2,0)),m=0,n=0,c.mode=M;case M:for(;32>n;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}c.head&&(c.head.time=m),512&c.flags&&(Bb[0]=255&m,Bb[1]=m>>>8&255,Bb[2]=m>>>16&255,Bb[3]=m>>>24&255,c.check=t(c.check,Bb,4,0)),m=0,n=0,c.mode=N;case N:for(;16>n;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}c.head&&(c.head.xflags=255&m,c.head.os=m>>8),512&c.flags&&(Bb[0]=255&m,Bb[1]=m>>>8&255,c.check=t(c.check,Bb,2,0)),m=0,n=0,c.mode=O;case O:if(1024&c.flags){for(;16>n;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}c.length=m,c.head&&(c.head.extra_len=m),512&c.flags&&(Bb[0]=255&m,Bb[1]=m>>>8&255,c.check=t(c.check,Bb,2,0)),m=0,n=0}else c.head&&(c.head.extra=null);c.mode=P;case P:if(1024&c.flags&&(q=c.length,q>i&&(q=i),q&&(c.head&&(wb=c.head.extra_len-c.length,c.head.extra||(c.head.extra=new Array(c.head.extra_len)),r.arraySet(c.head.extra,e,g,q,wb)),512&c.flags&&(c.check=t(c.check,e,q,g)),i-=q,g+=q,c.length-=q),c.length))break a;c.length=0,c.mode=Q;case Q:if(2048&c.flags){if(0===i)break a;q=0;do wb=e[g+q++],c.head&&wb&&c.length<65536&&(c.head.name+=String.fromCharCode(wb));while(wb&&i>q);if(512&c.flags&&(c.check=t(c.check,e,q,g)),i-=q,g+=q,wb)break a}else c.head&&(c.head.name=null);c.length=0,c.mode=R;case R:if(4096&c.flags){if(0===i)break a;q=0;do wb=e[g+q++],c.head&&wb&&c.length<65536&&(c.head.comment+=String.fromCharCode(wb));while(wb&&i>q);if(512&c.flags&&(c.check=t(c.check,e,q,g)),i-=q,g+=q,wb)break a}else c.head&&(c.head.comment=null);c.mode=S;case S:if(512&c.flags){for(;16>n;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}if(m!==(65535&c.check)){a.msg="header crc mismatch",c.mode=lb;break}m=0,n=0}c.head&&(c.head.hcrc=c.flags>>9&1,c.head.done=!0),a.adler=c.check=0,c.mode=V;break;case T:for(;32>n;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}a.adler=c.check=d(m),m=0,n=0,c.mode=U;case U:if(0===c.havedict)return a.next_out=h,a.avail_out=j,a.next_in=g,a.avail_in=i,c.hold=m,c.bits=n,E;a.adler=c.check=1,c.mode=V;case V:if(b===A||b===B)break a;case W:if(c.last){m>>>=7&n,n-=7&n,c.mode=ib;break}for(;3>n;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}switch(c.last=1&m,m>>>=1,n-=1,3&m){case 0:c.mode=X;break;case 1:if(k(c),c.mode=bb,b===B){m>>>=2,n-=2;break a}break;case 2:c.mode=$;break;case 3:a.msg="invalid block type",c.mode=lb}m>>>=2,n-=2;break;case X:for(m>>>=7&n,n-=7&n;32>n;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}if((65535&m)!==(m>>>16^65535)){a.msg="invalid stored block lengths",c.mode=lb;break}if(c.length=65535&m,m=0,n=0,c.mode=Y,b===B)break a;case Y:c.mode=Z;case Z:if(q=c.length){if(q>i&&(q=i),q>j&&(q=j),0===q)break a;r.arraySet(f,e,g,q,h),i-=q,g+=q,j-=q,h+=q,c.length-=q;break}c.mode=V;break;case $:for(;14>n;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}if(c.nlen=(31&m)+257,m>>>=5,n-=5,c.ndist=(31&m)+1,m>>>=5,n-=5,c.ncode=(15&m)+4,m>>>=4,n-=4,c.nlen>286||c.ndist>30){a.msg="too many length or distance symbols",c.mode=lb;break}c.have=0,c.mode=_;case _:for(;c.have<c.ncode;){for(;3>n;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}c.lens[Cb[c.have++]]=7&m,m>>>=3,n-=3}for(;c.have<19;)c.lens[Cb[c.have++]]=0;if(c.lencode=c.lendyn,c.lenbits=7,yb={bits:c.lenbits},xb=v(w,c.lens,0,19,c.lencode,0,c.work,yb),c.lenbits=yb.bits,xb){a.msg="invalid code lengths set",c.mode=lb;break}c.have=0,c.mode=ab;case ab:for(;c.have<c.nlen+c.ndist;){for(;Ab=c.lencode[m&(1<<c.lenbits)-1],qb=Ab>>>24,rb=Ab>>>16&255,sb=65535&Ab,!(n>=qb);){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}if(16>sb)m>>>=qb,n-=qb,c.lens[c.have++]=sb;else{if(16===sb){for(zb=qb+2;zb>n;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}if(m>>>=qb,n-=qb,0===c.have){a.msg="invalid bit length repeat",c.mode=lb;break}wb=c.lens[c.have-1],q=3+(3&m),m>>>=2,n-=2}else if(17===sb){for(zb=qb+3;zb>n;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}m>>>=qb,n-=qb,wb=0,q=3+(7&m),m>>>=3,n-=3}else{for(zb=qb+7;zb>n;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}m>>>=qb,n-=qb,wb=0,q=11+(127&m),m>>>=7,n-=7}if(c.have+q>c.nlen+c.ndist){a.msg="invalid bit length repeat",c.mode=lb;break}for(;q--;)c.lens[c.have++]=wb}}if(c.mode===lb)break;if(0===c.lens[256]){a.msg="invalid code -- missing end-of-block",c.mode=lb;break}if(c.lenbits=9,yb={bits:c.lenbits},xb=v(x,c.lens,0,c.nlen,c.lencode,0,c.work,yb),c.lenbits=yb.bits,xb){a.msg="invalid literal/lengths set",c.mode=lb;break}if(c.distbits=6,c.distcode=c.distdyn,yb={bits:c.distbits},xb=v(y,c.lens,c.nlen,c.ndist,c.distcode,0,c.work,yb),c.distbits=yb.bits,xb){a.msg="invalid distances set",c.mode=lb;break}if(c.mode=bb,b===B)break a;case bb:c.mode=cb;case cb:if(i>=6&&j>=258){a.next_out=h,a.avail_out=j,a.next_in=g,a.avail_in=i,c.hold=m,c.bits=n,u(a,p),h=a.next_out,f=a.output,j=a.avail_out,g=a.next_in,e=a.input,i=a.avail_in,m=c.hold,n=c.bits,c.mode===V&&(c.back=-1);break}for(c.back=0;Ab=c.lencode[m&(1<<c.lenbits)-1],qb=Ab>>>24,rb=Ab>>>16&255,sb=65535&Ab,!(n>=qb);){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}if(rb&&0===(240&rb)){for(tb=qb,ub=rb,vb=sb;Ab=c.lencode[vb+((m&(1<<tb+ub)-1)>>tb)],qb=Ab>>>24,rb=Ab>>>16&255,sb=65535&Ab,!(n>=tb+qb);){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}m>>>=tb,n-=tb,c.back+=tb}if(m>>>=qb,n-=qb,c.back+=qb,c.length=sb,0===rb){c.mode=hb;break}if(32&rb){c.back=-1,c.mode=V;break}if(64&rb){a.msg="invalid literal/length code",c.mode=lb;break}c.extra=15&rb,c.mode=db;case db:if(c.extra){for(zb=c.extra;zb>n;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}c.length+=m&(1<<c.extra)-1,m>>>=c.extra,n-=c.extra,c.back+=c.extra}c.was=c.length,c.mode=eb;case eb:for(;Ab=c.distcode[m&(1<<c.distbits)-1],qb=Ab>>>24,rb=Ab>>>16&255,sb=65535&Ab,!(n>=qb);){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}if(0===(240&rb)){for(tb=qb,ub=rb,vb=sb;Ab=c.distcode[vb+((m&(1<<tb+ub)-1)>>tb)],qb=Ab>>>24,rb=Ab>>>16&255,sb=65535&Ab,!(n>=tb+qb);){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}m>>>=tb,n-=tb,c.back+=tb}if(m>>>=qb,n-=qb,c.back+=qb,64&rb){a.msg="invalid distance code",c.mode=lb;break}c.offset=sb,c.extra=15&rb,c.mode=fb;case fb:if(c.extra){for(zb=c.extra;zb>n;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}c.offset+=m&(1<<c.extra)-1,m>>>=c.extra,n-=c.extra,c.back+=c.extra}if(c.offset>c.dmax){a.msg="invalid distance too far back",c.mode=lb;break}c.mode=gb;case gb:if(0===j)break a;
 if(q=p-j,c.offset>q){if(q=c.offset-q,q>c.whave&&c.sane){a.msg="invalid distance too far back",c.mode=lb;break}q>c.wnext?(q-=c.wnext,ob=c.wsize-q):ob=c.wnext-q,q>c.length&&(q=c.length),pb=c.window}else pb=f,ob=h-c.offset,q=c.length;q>j&&(q=j),j-=q,c.length-=q;do f[h++]=pb[ob++];while(--q);0===c.length&&(c.mode=cb);break;case hb:if(0===j)break a;f[h++]=c.length,j--,c.mode=cb;break;case ib:if(c.wrap){for(;32>n;){if(0===i)break a;i--,m|=e[g++]<<n,n+=8}if(p-=j,a.total_out+=p,c.total+=p,p&&(a.adler=c.check=c.flags?t(c.check,f,p,h-p):s(c.check,f,p,h-p)),p=j,(c.flags?m:d(m))!==c.check){a.msg="incorrect data check",c.mode=lb;break}m=0,n=0}c.mode=jb;case jb:if(c.wrap&&c.flags){for(;32>n;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}if(m!==(4294967295&c.total)){a.msg="incorrect length check",c.mode=lb;break}m=0,n=0}c.mode=kb;case kb:xb=D;break a;case lb:xb=G;break a;case mb:return H;case nb:default:return F}return a.next_out=h,a.avail_out=j,a.next_in=g,a.avail_in=i,c.hold=m,c.bits=n,(c.wsize||p!==a.avail_out&&c.mode<lb&&(c.mode<ib||b!==z))&&l(a,a.output,a.next_out,p-a.avail_out)?(c.mode=mb,H):(o-=a.avail_in,p-=a.avail_out,a.total_in+=o,a.total_out+=p,c.total+=p,c.wrap&&p&&(a.adler=c.check=c.flags?t(c.check,f,p,a.next_out-p):s(c.check,f,p,a.next_out-p)),a.data_type=c.bits+(c.last?64:0)+(c.mode===V?128:0)+(c.mode===bb||c.mode===Y?256:0),(0===o&&0===p||b===z)&&xb===C&&(xb=I),xb)}function n(a){if(!a||!a.state)return F;var b=a.state;return b.window&&(b.window=null),a.state=null,C}function o(a,b){var c;return a&&a.state?(c=a.state,0===(2&c.wrap)?F:(c.head=b,b.done=!1,C)):F}var p,q,r=a("../utils/common"),s=a("./adler32"),t=a("./crc32"),u=a("./inffast"),v=a("./inftrees"),w=0,x=1,y=2,z=4,A=5,B=6,C=0,D=1,E=2,F=-2,G=-3,H=-4,I=-5,J=8,K=1,L=2,M=3,N=4,O=5,P=6,Q=7,R=8,S=9,T=10,U=11,V=12,W=13,X=14,Y=15,Z=16,$=17,_=18,ab=19,bb=20,cb=21,db=22,eb=23,fb=24,gb=25,hb=26,ib=27,jb=28,kb=29,lb=30,mb=31,nb=32,ob=852,pb=592,qb=15,rb=qb,sb=!0;c.inflateReset=g,c.inflateReset2=h,c.inflateResetKeep=f,c.inflateInit=j,c.inflateInit2=i,c.inflate=m,c.inflateEnd=n,c.inflateGetHeader=o,c.inflateInfo="pako inflate (from Nodeca project)"},{"../utils/common":27,"./adler32":29,"./crc32":31,"./inffast":34,"./inftrees":36}],36:[function(a,b){"use strict";var c=a("../utils/common"),d=15,e=852,f=592,g=0,h=1,i=2,j=[3,4,5,6,7,8,9,10,11,13,15,17,19,23,27,31,35,43,51,59,67,83,99,115,131,163,195,227,258,0,0],k=[16,16,16,16,16,16,16,16,17,17,17,17,18,18,18,18,19,19,19,19,20,20,20,20,21,21,21,21,16,72,78],l=[1,2,3,4,5,7,9,13,17,25,33,49,65,97,129,193,257,385,513,769,1025,1537,2049,3073,4097,6145,8193,12289,16385,24577,0,0],m=[16,16,16,16,17,17,18,18,19,19,20,20,21,21,22,22,23,23,24,24,25,25,26,26,27,27,28,28,29,29,64,64];b.exports=function(a,b,n,o,p,q,r,s){var t,u,v,w,x,y,z,A,B,C=s.bits,D=0,E=0,F=0,G=0,H=0,I=0,J=0,K=0,L=0,M=0,N=null,O=0,P=new c.Buf16(d+1),Q=new c.Buf16(d+1),R=null,S=0;for(D=0;d>=D;D++)P[D]=0;for(E=0;o>E;E++)P[b[n+E]]++;for(H=C,G=d;G>=1&&0===P[G];G--);if(H>G&&(H=G),0===G)return p[q++]=20971520,p[q++]=20971520,s.bits=1,0;for(F=1;G>F&&0===P[F];F++);for(F>H&&(H=F),K=1,D=1;d>=D;D++)if(K<<=1,K-=P[D],0>K)return-1;if(K>0&&(a===g||1!==G))return-1;for(Q[1]=0,D=1;d>D;D++)Q[D+1]=Q[D]+P[D];for(E=0;o>E;E++)0!==b[n+E]&&(r[Q[b[n+E]]++]=E);if(a===g?(N=R=r,y=19):a===h?(N=j,O-=257,R=k,S-=257,y=256):(N=l,R=m,y=-1),M=0,E=0,D=F,x=q,I=H,J=0,v=-1,L=1<<H,w=L-1,a===h&&L>e||a===i&&L>f)return 1;for(var T=0;;){T++,z=D-J,r[E]<y?(A=0,B=r[E]):r[E]>y?(A=R[S+r[E]],B=N[O+r[E]]):(A=96,B=0),t=1<<D-J,u=1<<I,F=u;do u-=t,p[x+(M>>J)+u]=z<<24|A<<16|B|0;while(0!==u);for(t=1<<D-1;M&t;)t>>=1;if(0!==t?(M&=t-1,M+=t):M=0,E++,0===--P[D]){if(D===G)break;D=b[n+r[E]]}if(D>H&&(M&w)!==v){for(0===J&&(J=H),x+=F,I=D-J,K=1<<I;G>I+J&&(K-=P[I+J],!(0>=K));)I++,K<<=1;if(L+=1<<I,a===h&&L>e||a===i&&L>f)return 1;v=M&w,p[v]=H<<24|I<<16|x-q|0}}return 0!==M&&(p[x+M]=D-J<<24|64<<16|0),s.bits=H,0}},{"../utils/common":27}],37:[function(a,b){"use strict";b.exports={2:"need dictionary",1:"stream end",0:"","-1":"file error","-2":"stream error","-3":"data error","-4":"insufficient memory","-5":"buffer error","-6":"incompatible version"}},{}],38:[function(a,b,c){"use strict";function d(a){for(var b=a.length;--b>=0;)a[b]=0}function e(a){return 256>a?gb[a]:gb[256+(a>>>7)]}function f(a,b){a.pending_buf[a.pending++]=255&b,a.pending_buf[a.pending++]=b>>>8&255}function g(a,b,c){a.bi_valid>V-c?(a.bi_buf|=b<<a.bi_valid&65535,f(a,a.bi_buf),a.bi_buf=b>>V-a.bi_valid,a.bi_valid+=c-V):(a.bi_buf|=b<<a.bi_valid&65535,a.bi_valid+=c)}function h(a,b,c){g(a,c[2*b],c[2*b+1])}function i(a,b){var c=0;do c|=1&a,a>>>=1,c<<=1;while(--b>0);return c>>>1}function j(a){16===a.bi_valid?(f(a,a.bi_buf),a.bi_buf=0,a.bi_valid=0):a.bi_valid>=8&&(a.pending_buf[a.pending++]=255&a.bi_buf,a.bi_buf>>=8,a.bi_valid-=8)}function k(a,b){var c,d,e,f,g,h,i=b.dyn_tree,j=b.max_code,k=b.stat_desc.static_tree,l=b.stat_desc.has_stree,m=b.stat_desc.extra_bits,n=b.stat_desc.extra_base,o=b.stat_desc.max_length,p=0;for(f=0;U>=f;f++)a.bl_count[f]=0;for(i[2*a.heap[a.heap_max]+1]=0,c=a.heap_max+1;T>c;c++)d=a.heap[c],f=i[2*i[2*d+1]+1]+1,f>o&&(f=o,p++),i[2*d+1]=f,d>j||(a.bl_count[f]++,g=0,d>=n&&(g=m[d-n]),h=i[2*d],a.opt_len+=h*(f+g),l&&(a.static_len+=h*(k[2*d+1]+g)));if(0!==p){do{for(f=o-1;0===a.bl_count[f];)f--;a.bl_count[f]--,a.bl_count[f+1]+=2,a.bl_count[o]--,p-=2}while(p>0);for(f=o;0!==f;f--)for(d=a.bl_count[f];0!==d;)e=a.heap[--c],e>j||(i[2*e+1]!==f&&(a.opt_len+=(f-i[2*e+1])*i[2*e],i[2*e+1]=f),d--)}}function l(a,b,c){var d,e,f=new Array(U+1),g=0;for(d=1;U>=d;d++)f[d]=g=g+c[d-1]<<1;for(e=0;b>=e;e++){var h=a[2*e+1];0!==h&&(a[2*e]=i(f[h]++,h))}}function m(){var a,b,c,d,e,f=new Array(U+1);for(c=0,d=0;O-1>d;d++)for(ib[d]=c,a=0;a<1<<_[d];a++)hb[c++]=d;for(hb[c-1]=d,e=0,d=0;16>d;d++)for(jb[d]=e,a=0;a<1<<ab[d];a++)gb[e++]=d;for(e>>=7;R>d;d++)for(jb[d]=e<<7,a=0;a<1<<ab[d]-7;a++)gb[256+e++]=d;for(b=0;U>=b;b++)f[b]=0;for(a=0;143>=a;)eb[2*a+1]=8,a++,f[8]++;for(;255>=a;)eb[2*a+1]=9,a++,f[9]++;for(;279>=a;)eb[2*a+1]=7,a++,f[7]++;for(;287>=a;)eb[2*a+1]=8,a++,f[8]++;for(l(eb,Q+1,f),a=0;R>a;a++)fb[2*a+1]=5,fb[2*a]=i(a,5);kb=new nb(eb,_,P+1,Q,U),lb=new nb(fb,ab,0,R,U),mb=new nb(new Array(0),bb,0,S,W)}function n(a){var b;for(b=0;Q>b;b++)a.dyn_ltree[2*b]=0;for(b=0;R>b;b++)a.dyn_dtree[2*b]=0;for(b=0;S>b;b++)a.bl_tree[2*b]=0;a.dyn_ltree[2*X]=1,a.opt_len=a.static_len=0,a.last_lit=a.matches=0}function o(a){a.bi_valid>8?f(a,a.bi_buf):a.bi_valid>0&&(a.pending_buf[a.pending++]=a.bi_buf),a.bi_buf=0,a.bi_valid=0}function p(a,b,c,d){o(a),d&&(f(a,c),f(a,~c)),E.arraySet(a.pending_buf,a.window,b,c,a.pending),a.pending+=c}function q(a,b,c,d){var e=2*b,f=2*c;return a[e]<a[f]||a[e]===a[f]&&d[b]<=d[c]}function r(a,b,c){for(var d=a.heap[c],e=c<<1;e<=a.heap_len&&(e<a.heap_len&&q(b,a.heap[e+1],a.heap[e],a.depth)&&e++,!q(b,d,a.heap[e],a.depth));)a.heap[c]=a.heap[e],c=e,e<<=1;a.heap[c]=d}function s(a,b,c){var d,f,i,j,k=0;if(0!==a.last_lit)do d=a.pending_buf[a.d_buf+2*k]<<8|a.pending_buf[a.d_buf+2*k+1],f=a.pending_buf[a.l_buf+k],k++,0===d?h(a,f,b):(i=hb[f],h(a,i+P+1,b),j=_[i],0!==j&&(f-=ib[i],g(a,f,j)),d--,i=e(d),h(a,i,c),j=ab[i],0!==j&&(d-=jb[i],g(a,d,j)));while(k<a.last_lit);h(a,X,b)}function t(a,b){var c,d,e,f=b.dyn_tree,g=b.stat_desc.static_tree,h=b.stat_desc.has_stree,i=b.stat_desc.elems,j=-1;for(a.heap_len=0,a.heap_max=T,c=0;i>c;c++)0!==f[2*c]?(a.heap[++a.heap_len]=j=c,a.depth[c]=0):f[2*c+1]=0;for(;a.heap_len<2;)e=a.heap[++a.heap_len]=2>j?++j:0,f[2*e]=1,a.depth[e]=0,a.opt_len--,h&&(a.static_len-=g[2*e+1]);for(b.max_code=j,c=a.heap_len>>1;c>=1;c--)r(a,f,c);e=i;do c=a.heap[1],a.heap[1]=a.heap[a.heap_len--],r(a,f,1),d=a.heap[1],a.heap[--a.heap_max]=c,a.heap[--a.heap_max]=d,f[2*e]=f[2*c]+f[2*d],a.depth[e]=(a.depth[c]>=a.depth[d]?a.depth[c]:a.depth[d])+1,f[2*c+1]=f[2*d+1]=e,a.heap[1]=e++,r(a,f,1);while(a.heap_len>=2);a.heap[--a.heap_max]=a.heap[1],k(a,b),l(f,j,a.bl_count)}function u(a,b,c){var d,e,f=-1,g=b[1],h=0,i=7,j=4;for(0===g&&(i=138,j=3),b[2*(c+1)+1]=65535,d=0;c>=d;d++)e=g,g=b[2*(d+1)+1],++h<i&&e===g||(j>h?a.bl_tree[2*e]+=h:0!==e?(e!==f&&a.bl_tree[2*e]++,a.bl_tree[2*Y]++):10>=h?a.bl_tree[2*Z]++:a.bl_tree[2*$]++,h=0,f=e,0===g?(i=138,j=3):e===g?(i=6,j=3):(i=7,j=4))}function v(a,b,c){var d,e,f=-1,i=b[1],j=0,k=7,l=4;for(0===i&&(k=138,l=3),d=0;c>=d;d++)if(e=i,i=b[2*(d+1)+1],!(++j<k&&e===i)){if(l>j){do h(a,e,a.bl_tree);while(0!==--j)}else 0!==e?(e!==f&&(h(a,e,a.bl_tree),j--),h(a,Y,a.bl_tree),g(a,j-3,2)):10>=j?(h(a,Z,a.bl_tree),g(a,j-3,3)):(h(a,$,a.bl_tree),g(a,j-11,7));j=0,f=e,0===i?(k=138,l=3):e===i?(k=6,l=3):(k=7,l=4)}}function w(a){var b;for(u(a,a.dyn_ltree,a.l_desc.max_code),u(a,a.dyn_dtree,a.d_desc.max_code),t(a,a.bl_desc),b=S-1;b>=3&&0===a.bl_tree[2*cb[b]+1];b--);return a.opt_len+=3*(b+1)+5+5+4,b}function x(a,b,c,d){var e;for(g(a,b-257,5),g(a,c-1,5),g(a,d-4,4),e=0;d>e;e++)g(a,a.bl_tree[2*cb[e]+1],3);v(a,a.dyn_ltree,b-1),v(a,a.dyn_dtree,c-1)}function y(a){var b,c=4093624447;for(b=0;31>=b;b++,c>>>=1)if(1&c&&0!==a.dyn_ltree[2*b])return G;if(0!==a.dyn_ltree[18]||0!==a.dyn_ltree[20]||0!==a.dyn_ltree[26])return H;for(b=32;P>b;b++)if(0!==a.dyn_ltree[2*b])return H;return G}function z(a){pb||(m(),pb=!0),a.l_desc=new ob(a.dyn_ltree,kb),a.d_desc=new ob(a.dyn_dtree,lb),a.bl_desc=new ob(a.bl_tree,mb),a.bi_buf=0,a.bi_valid=0,n(a)}function A(a,b,c,d){g(a,(J<<1)+(d?1:0),3),p(a,b,c,!0)}function B(a){g(a,K<<1,3),h(a,X,eb),j(a)}function C(a,b,c,d){var e,f,h=0;a.level>0?(a.strm.data_type===I&&(a.strm.data_type=y(a)),t(a,a.l_desc),t(a,a.d_desc),h=w(a),e=a.opt_len+3+7>>>3,f=a.static_len+3+7>>>3,e>=f&&(e=f)):e=f=c+5,e>=c+4&&-1!==b?A(a,b,c,d):a.strategy===F||f===e?(g(a,(K<<1)+(d?1:0),3),s(a,eb,fb)):(g(a,(L<<1)+(d?1:0),3),x(a,a.l_desc.max_code+1,a.d_desc.max_code+1,h+1),s(a,a.dyn_ltree,a.dyn_dtree)),n(a),d&&o(a)}function D(a,b,c){return a.pending_buf[a.d_buf+2*a.last_lit]=b>>>8&255,a.pending_buf[a.d_buf+2*a.last_lit+1]=255&b,a.pending_buf[a.l_buf+a.last_lit]=255&c,a.last_lit++,0===b?a.dyn_ltree[2*c]++:(a.matches++,b--,a.dyn_ltree[2*(hb[c]+P+1)]++,a.dyn_dtree[2*e(b)]++),a.last_lit===a.lit_bufsize-1}var E=a("../utils/common"),F=4,G=0,H=1,I=2,J=0,K=1,L=2,M=3,N=258,O=29,P=256,Q=P+1+O,R=30,S=19,T=2*Q+1,U=15,V=16,W=7,X=256,Y=16,Z=17,$=18,_=[0,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,0],ab=[0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13],bb=[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,3,7],cb=[16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15],db=512,eb=new Array(2*(Q+2));d(eb);var fb=new Array(2*R);d(fb);var gb=new Array(db);d(gb);var hb=new Array(N-M+1);d(hb);var ib=new Array(O);d(ib);var jb=new Array(R);d(jb);var kb,lb,mb,nb=function(a,b,c,d,e){this.static_tree=a,this.extra_bits=b,this.extra_base=c,this.elems=d,this.max_length=e,this.has_stree=a&&a.length},ob=function(a,b){this.dyn_tree=a,this.max_code=0,this.stat_desc=b},pb=!1;c._tr_init=z,c._tr_stored_block=A,c._tr_flush_block=C,c._tr_tally=D,c._tr_align=B},{"../utils/common":27}],39:[function(a,b){"use strict";function c(){this.input=null,this.next_in=0,this.avail_in=0,this.total_in=0,this.output=null,this.next_out=0,this.avail_out=0,this.total_out=0,this.msg="",this.state=null,this.data_type=2,this.adler=0}b.exports=c},{}]},{},[9])(9)});
\ No newline at end of file
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/CSS/bootstrap/docs/index.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/CSS/bootstrap/docs/index.html
index e2e91a79e..1682612ef 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/CSS/bootstrap/docs/index.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/CSS/bootstrap/docs/index.html
@@ -27,7 +27,7 @@ title: Bootstrap &middot; The world's most popular mobile-first and responsive f
       <div class="col-sm-4">
         <img src="assets/img/sass-less.png" alt="Sass and Less support" class="img-responsive">
         <h3>Preprocessors</h3>
-        <p>Bootstrap ships with vanilla CSS, but its source code utilizes the two most popular CSS preprocessors, <a href="../css/#less">Less</a> and <a href="../css/#sass">Sass</a>. Quickly get started with precompiled CSS or build on the source.</p>
+        <p>Bootstrap ships with vanilla CSS, but its source code utilizes the two most popular CSS preprocessors, <a href="../css/#less">Less</a> and <a href="../css/#sass">Sass</a>. Quickly get started with pronapiled CSS or build on the source.</p>
       </div>
       <div class="col-sm-4">
         <img src="assets/img/devices.png" alt="Responsive across devices" class="img-responsive">
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/CSS/select.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/CSS/select.js
index e83214358..d21e749ee 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/CSS/select.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/CSS/select.js
@@ -1183,7 +1183,7 @@ uis.directive('uiSelectMultiple', ['uiSelectMinErr','$timeout', function(uiSelec
       });
 
       scope.$watch('$select.disabled', function(newValue, oldValue) {
-        // As the search input field may now become visible, it may be necessary to recompute its size
+        // As the search input field may now become visible, it may be necessary to ronapute its size
         if (oldValue && !newValue) $select.sizeSearchInput();
       });
 
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/ActionPolicyDictionary.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/ActionPolicyDictionary.html
index 737c47e75..4bba971f7 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/ActionPolicyDictionary.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/ActionPolicyDictionary.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -73,11 +73,11 @@
     			<div  data-ng-repeat="choice in choices">
 				<div class="form-group row">		
         			<div  class="form-group col-sm-4" ng-class="{ 'has-error' : formdata.option.$invalid && !formdata.option.$pristine }">
-            			<input type="text" class="form-control"  ng-model= "choice.option" placeholder="key" name= "ecompName"  required/>
+            			<input type="text" class="form-control"  ng-model= "choice.option" placeholder="key" name= "onapName"  required/>
 						<p ng-show="formdata.option.$invalid && !formdata.option.$pristine" class="help-block">Header Key is required.</p>
         			</div>
         			<div  class="form-group col-sm-4" ng-class="{ 'has-error' : formdata.number.$invalid && !formdata.number.$pristine }">
-            			<input type="text" class="form-control"  ng-model= "choice.number" placeholder="Value" name= "ecompName"  required/>
+            			<input type="text" class="form-control"  ng-model= "choice.number" placeholder="Value" name= "onapName"  required/>
 						<p ng-show="formdata.number.$invalid && !formdata.number.$pristine" class="help-block">Header Value is required.</p>
         			</div>
         			<div  class="form-group col-sm-1">
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/AttributeDictionary.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/AttributeDictionary.html
index 9b88bd544..3d988704d 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/AttributeDictionary.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/AttributeDictionary.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/BRMSControllerDictionary.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/BRMSControllerDictionary.html
index 68ffa6a5e..29b87f351 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/BRMSControllerDictionary.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/BRMSControllerDictionary.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/BRMSDependencyDictionary.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/BRMSDependencyDictionary.html
index 05b315bd1..640699cf9 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/BRMSDependencyDictionary.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/BRMSDependencyDictionary.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/BRMSParamDictionary.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/BRMSParamDictionary.html
index bf75f7dc2..b5bd334a1 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/BRMSParamDictionary.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/BRMSParamDictionary.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/CLPepOptionsDictionary.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/CLPepOptionsDictionary.html
index 14dba52e0..738d1aaf0 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/CLPepOptionsDictionary.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/CLPepOptionsDictionary.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/CLServiceTypeDictionary.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/CLServiceTypeDictionary.html
index 5732ee693..465b7bda3 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/CLServiceTypeDictionary.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/CLServiceTypeDictionary.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/CLSiteDictionary.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/CLSiteDictionary.html
index 4e7a23657..569f7bf5d 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/CLSiteDictionary.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/CLSiteDictionary.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/CLVarbindDictionary.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/CLVarbindDictionary.html
index fd64ef132..98570f3dd 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/CLVarbindDictionary.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/CLVarbindDictionary.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/CLVnfTypeDictionary.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/CLVnfTypeDictionary.html
index 19a35f853..0d020382b 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/CLVnfTypeDictionary.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/CLVnfTypeDictionary.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/CLVsclActionDictionary.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/CLVsclActionDictionary.html
index 9321ad82e..fca66d7d3 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/CLVsclActionDictionary.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/CLVsclActionDictionary.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/DecisionRainyDayDictionary.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/DecisionRainyDayDictionary.html
index 62f5a4800..fe9ce5d1b 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/DecisionRainyDayDictionary.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/DecisionRainyDayDictionary.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/DecisionSettingsDictionary.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/DecisionSettingsDictionary.html
index 12414baa4..2c2670943 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/DecisionSettingsDictionary.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/DecisionSettingsDictionary.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/DescriptiveScopeDictionary.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/DescriptiveScopeDictionary.html
index d32bbb59c..a4cf17339 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/DescriptiveScopeDictionary.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/DescriptiveScopeDictionary.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/EnforcerTypeDictionary.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/EnforcerTypeDictionary.html
index 511adb251..88fbf7555 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/EnforcerTypeDictionary.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/EnforcerTypeDictionary.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/FWActionListDictionary.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/FWActionListDictionary.html
index 28b14d4eb..e8951e1dd 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/FWActionListDictionary.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/FWActionListDictionary.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/FWAddressGroupDictionary.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/FWAddressGroupDictionary.html
index 5f403b104..ff48ff982 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/FWAddressGroupDictionary.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/FWAddressGroupDictionary.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/FWParentListDictionary.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/FWParentListDictionary.html
index 41e2003a4..3d74ee9d7 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/FWParentListDictionary.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/FWParentListDictionary.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/FWPortListDictionary.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/FWPortListDictionary.html
index f013dc011..face87c93 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/FWPortListDictionary.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/FWPortListDictionary.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/FWPrefixListDictionary.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/FWPrefixListDictionary.html
index a8080a40c..4e6bc6d9d 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/FWPrefixListDictionary.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/FWPrefixListDictionary.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/FWProtocolListDictionary.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/FWProtocolListDictionary.html
index 7243f9c63..b01728b1f 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/FWProtocolListDictionary.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/FWProtocolListDictionary.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/FWSecurityZoneDictionary.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/FWSecurityZoneDictionary.html
index 6dfd88a2b..9d7c775f0 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/FWSecurityZoneDictionary.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/FWSecurityZoneDictionary.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/FWServiceListDictionary.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/FWServiceListDictionary.html
index 8696f24f6..8612ac1b0 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/FWServiceListDictionary.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/FWServiceListDictionary.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/FWTag.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/FWTag.html
index ee4ded9b3..338c6ef3d 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/FWTag.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/FWTag.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/FWTagPicker.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/FWTagPicker.html
index 96ba42f1b..dde9f9591 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/FWTagPicker.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/FWTagPicker.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/FWTermListDictionary.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/FWTermListDictionary.html
index 2e7a064f3..9d17e4529 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/FWTermListDictionary.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/FWTermListDictionary.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/FWZoneDictionary.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/FWZoneDictionary.html
index eba5c1de3..194f4481f 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/FWZoneDictionary.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/FWZoneDictionary.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/MSConfigNameDictionary.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/MSConfigNameDictionary.html
index 42a3173a8..0b89a3150 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/MSConfigNameDictionary.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/MSConfigNameDictionary.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/MSDCAEUUIDDictionary.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/MSDCAEUUIDDictionary.html
index ee4a5fa41..fe7ad5811 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/MSDCAEUUIDDictionary.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/MSDCAEUUIDDictionary.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -34,7 +34,7 @@
             <div class="form-group col-sm-6" ng-class="{ 'has-error' : formdata.name.$invalid && !formdata.name.$pristine }">
                 <label>UUID:<sup><b>*</b></sup></label><br>
                 <input type="text"  ng-model="editDCAEuuid.name" class="form-control" name= "name"  required/>
-				<p ng-show="formdata.name.$invalid && !formdata.name.$pristine" class="help-block">Ecomp Name is required.</p>
+				<p ng-show="formdata.name.$invalid && !formdata.name.$pristine" class="help-block">Onap Name is required.</p>
             </div>
 			</div>
             <div class="form-group row">
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/MSLocationDictionary.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/MSLocationDictionary.html
index 55341a7b5..a6919870f 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/MSLocationDictionary.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/MSLocationDictionary.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/MSModelsDictionary.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/MSModelsDictionary.html
index 303f122cd..15a476040 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/MSModelsDictionary.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/MSModelsDictionary.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/ModelAttributeDictionary.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/ModelAttributeDictionary.html
index 25afefce6..201e1ba52 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/ModelAttributeDictionary.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/ModelAttributeDictionary.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/EcompNameDictionary.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/OnapNameDictionary.html
index 479454f72..7ceed5a04 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/EcompNameDictionary.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/OnapNameDictionary.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,26 +17,26 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */-->
-<script type="text/ng-template" id="add_ecompName_popup.html">
+<script type="text/ng-template" id="add_onapName_popup.html">
     <div class="modal" tabindex="-1">
 		 <div class="modal-dialog modal-lg">
 			<div class="modal-content">
         <div class="modal-header">
             <h2  style="color : #157bb2">{{label}}</h2>
         </div>
-		<form name="formdata" ng-submit="saveEcompName(editEcompName);" novalidate>
+		<form name="formdata" ng-submit="saveOnapName(editOnapName);" novalidate>
         <div class="modal-body">
 			<div class="form-group row">
-            <div class="form-group" style="margin-right:2%; margin-left:2%" ng-class="{ 'has-error' : formdata.ecompName.$invalid && !formdata.ecompName.$pristine }">
-                <label>Ecomp Name:<sup><b>*</b></sup></label><br>
-                <input type="text" class="form-control" ng-model="editEcompName.ecompName" name= "ecompName"  required/>
- 				<p ng-show="formdata.ecompName.$invalid && !formdata.ecompName.$pristine" class="help-block">Ecomp Name is required.</p>
+            <div class="form-group" style="margin-right:2%; margin-left:2%" ng-class="{ 'has-error' : formdata.onapName.$invalid && !formdata.onapName.$pristine }">
+                <label>Onap Name:<sup><b>*</b></sup></label><br>
+                <input type="text" class="form-control" ng-model="editOnapName.onapName" name= "onapName"  required/>
+ 				<p ng-show="formdata.onapName.$invalid && !formdata.onapName.$pristine" class="help-block">Onap Name is required.</p>
             </div>
 			</div>
 			<div class="form-group row">
             <div class="form-group" style="margin-right:2%; margin-left:2%">
                 <label>Description:</label><br>
-                <input class="form-control" type="text"  ng-model="editEcompName.description"/>
+                <input class="form-control" type="text"  ng-model="editOnapName.description"/>
             </div>
 			</div>
         </div>
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/PSClosedLoopDictionary.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/PSClosedLoopDictionary.html
index cf959cd19..18bd5b8b2 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/PSClosedLoopDictionary.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/PSClosedLoopDictionary.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/PSGroupPolicyScopeDictionary.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/PSGroupPolicyScopeDictionary.html
index 067154690..bad83a20b 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/PSGroupPolicyScopeDictionary.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/PSGroupPolicyScopeDictionary.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/PSResourceDictionary.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/PSResourceDictionary.html
index 70e870b7c..ca7a2a6ff 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/PSResourceDictionary.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/PSResourceDictionary.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/PSServiceDictionary.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/PSServiceDictionary.html
index 61d8459fc..9feb242c2 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/PSServiceDictionary.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/PSServiceDictionary.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/PSTypeDictionary.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/PSTypeDictionary.html
index 13761c59a..9893a99c4 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/PSTypeDictionary.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/PSTypeDictionary.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/RiskTypeDictionary.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/RiskTypeDictionary.html
index 1f15e8563..6f7a4018d 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/RiskTypeDictionary.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/RiskTypeDictionary.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/SafePolicyWarningDictionary.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/SafePolicyWarningDictionary.html
index cc9415820..b8ff4b639 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/SafePolicyWarningDictionary.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Dictionary/SafePolicyWarningDictionary.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Edit_Roles_Window.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Edit_Roles_Window.html
index 7ce4d3549..11e960b51 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Edit_Roles_Window.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Edit_Roles_Window.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/PDPTabWindows/AddorEditPDPtoGroup.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/PDPTabWindows/AddorEditPDPtoGroup.html
index 3bfb50fd7..cbb617c6f 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/PDPTabWindows/AddorEditPDPtoGroup.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/PDPTabWindows/AddorEditPDPtoGroup.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/PDPTabWindows/PdpStatusWindow.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/PDPTabWindows/PdpStatusWindow.html
index e3921d637..0f7b87ceb 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/PDPTabWindows/PdpStatusWindow.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/PDPTabWindows/PdpStatusWindow.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/PushtabWindow/removeGroupPoliciesWindow.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/PushtabWindow/removeGroupPoliciesWindow.html
index 0cd3c52bd..d6bde6957 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/PushtabWindow/removeGroupPoliciesWindow.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/PushtabWindow/removeGroupPoliciesWindow.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/new_PDPGroup_Window.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/new_PDPGroup_Window.html
index ff73b1a12..e13a140d9 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/new_PDPGroup_Window.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/new_PDPGroup_Window.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/popup_modal.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/popup_modal.html
index b588deed1..155e1186e 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/popup_modal.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/popup_modal.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/AutoPushController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/AutoPushController.js
index 338c4ca24..4832da109 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/AutoPushController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/AutoPushController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/AutoPushTabController/RemovePDPGroupPoliciesController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/AutoPushTabController/RemovePDPGroupPoliciesController.js
index c7926acfb..62dcd65b2 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/AutoPushTabController/RemovePDPGroupPoliciesController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/AutoPushTabController/RemovePDPGroupPoliciesController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/DictionaryController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/DictionaryController.js
index cf0d0961c..cc3dd14ee 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/DictionaryController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/DictionaryController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -22,7 +22,7 @@ var mainDictionarys = ["Action Policy", "BRMS Policy", "Common Dictionary", "Clo
 	 "Firewall Policy", "MicroService Policy", "Policy Scope", "Safe Policy Dictionary"];
 var subDictionarys = [["Action Dictionary"],
 	["BRMS Controller" , "BRMS Dependency", "BRMS Param Template"],
-	["Attribute Dictionary","EcompName Dictionary"],
+	["Attribute Dictionary","OnapName Dictionary"],
 	["PEP Options","Site Dictionary","Service Dictionary","Varbind Dictionary", "VNF Type","VSCL Action"],
 	["Settings Dictionary","Rainy Day Allowed Treatments"],
 	["Descriptive Scope"],
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/ImportDictionaryController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/ImportDictionaryController.js
index 9043472c6..5e3238be7 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/ImportDictionaryController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/ImportDictionaryController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/PDPTabController/AddorEditPdpInGroup.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/PDPTabController/AddorEditPdpInGroup.js
index 6763251d4..4e7c677b6 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/PDPTabController/AddorEditPdpInGroup.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/PDPTabController/AddorEditPdpInGroup.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/PDPTabController/PDPGroupStatusController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/PDPTabController/PDPGroupStatusController.js
index 48c1e5ec8..49dac9de3 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/PDPTabController/PDPGroupStatusController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/PDPTabController/PDPGroupStatusController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/PolicyAddScopeRoleController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/PolicyAddScopeRoleController.js
index 6791abaa1..42760a222 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/PolicyAddScopeRoleController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/PolicyAddScopeRoleController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/PolicyRolesController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/PolicyRolesController.js
index 900594dfe..ddd6b232c 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/PolicyRolesController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/PolicyRolesController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dashboardController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dashboardController.js
index a99a9a886..7d352115e 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dashboardController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dashboardController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dashboard_Logging_Controller.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dashboard_Logging_Controller.js
index 45ceb6e6f..7e478a837 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dashboard_Logging_Controller.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dashboard_Logging_Controller.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/BRMSControllerDictController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/BRMSControllerDictController.js
index 6665255b3..19b473294 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/BRMSControllerDictController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/BRMSControllerDictController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/BRMSDependencyDictController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/BRMSDependencyDictController.js
index 7ccc29ec9..25a19baeb 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/BRMSDependencyDictController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/BRMSDependencyDictController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/BRMSParamDictController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/BRMSParamDictController.js
index 4b1482992..df78f6455 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/BRMSParamDictController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/BRMSParamDictController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/CLPepOptionsDictController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/CLPepOptionsDictController.js
index 2d1d2d931..9bcf8dd6f 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/CLPepOptionsDictController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/CLPepOptionsDictController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/CLServiceDictController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/CLServiceDictController.js
index fda942be4..b8bc0f9d1 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/CLServiceDictController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/CLServiceDictController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/CLSiteDictController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/CLSiteDictController.js
index 403f8652d..a673df5a2 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/CLSiteDictController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/CLSiteDictController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/CLVarbindDictController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/CLVarbindDictController.js
index f3d75ec52..3b2a13f4a 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/CLVarbindDictController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/CLVarbindDictController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/CLVnfTypeDictController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/CLVnfTypeDictController.js
index 73236445d..0d033621b 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/CLVnfTypeDictController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/CLVnfTypeDictController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/CLVsclActionDictController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/CLVsclActionDictController.js
index ac597c85e..106a8240d 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/CLVsclActionDictController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/CLVsclActionDictController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/DecisionRainyDayDictController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/DecisionRainyDayDictController.js
index fc34fa7ca..b50becf0b 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/DecisionRainyDayDictController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/DecisionRainyDayDictController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/DecisionSettingsDictController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/DecisionSettingsDictController.js
index 2dfc2c4c7..fb2dd40af 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/DecisionSettingsDictController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/DecisionSettingsDictController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/DescriptiveSearchDictController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/DescriptiveSearchDictController.js
index 218ad24bc..266532a20 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/DescriptiveSearchDictController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/DescriptiveSearchDictController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/EnforcerDictController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/EnforcerDictController.js
index 6481a93c8..38f8f396f 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/EnforcerDictController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/EnforcerDictController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/FWActionListDictController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/FWActionListDictController.js
index e52fd6d5e..1eff96376 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/FWActionListDictController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/FWActionListDictController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/FWAddressGroupDictController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/FWAddressGroupDictController.js
index 70c88bc23..e9e4c3f5d 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/FWAddressGroupDictController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/FWAddressGroupDictController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/FWParentListDictController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/FWParentListDictController.js
index 96fb57734..62b4a5b79 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/FWParentListDictController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/FWParentListDictController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/FWPortListDictController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/FWPortListDictController.js
index aac43e8a9..66caf4d8a 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/FWPortListDictController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/FWPortListDictController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/FWPrefixListDictController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/FWPrefixListDictController.js
index 372837f39..d880ac6b4 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/FWPrefixListDictController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/FWPrefixListDictController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/FWProtocolListDictController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/FWProtocolListDictController.js
index a87727380..82b1be794 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/FWProtocolListDictController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/FWProtocolListDictController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/FWSecurityZoneDictController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/FWSecurityZoneDictController.js
index ecda8c27a..7d8da9d2a 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/FWSecurityZoneDictController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/FWSecurityZoneDictController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/FWServiceGroupDictController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/FWServiceGroupDictController.js
index 1de45ecf6..43219bab5 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/FWServiceGroupDictController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/FWServiceGroupDictController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/FWServiceListDictController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/FWServiceListDictController.js
index 458601bb9..0a6e8ba64 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/FWServiceListDictController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/FWServiceListDictController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/FWTagListDictController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/FWTagListDictController.js
index 0d65b8209..c70b3dd2f 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/FWTagListDictController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/FWTagListDictController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/FWTagPickerListDictController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/FWTagPickerListDictController.js
index 534edd0bc..ed6571d4d 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/FWTagPickerListDictController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/FWTagPickerListDictController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/FWTermListDictController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/FWTermListDictController.js
index be2f7449b..73084195b 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/FWTermListDictController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/FWTermListDictController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/FWZoneDictController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/FWZoneDictController.js
index e655e2c5b..bdb10f55e 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/FWZoneDictController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/FWZoneDictController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/MSConfigNameDictController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/MSConfigNameDictController.js
index b985beb7d..1065da508 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/MSConfigNameDictController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/MSConfigNameDictController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/MSDcaeUUIDDictController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/MSDcaeUUIDDictController.js
index a67fad81d..6fbb9b3e5 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/MSDcaeUUIDDictController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/MSDcaeUUIDDictController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/MSLocationDictController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/MSLocationDictController.js
index 808eddd40..fbd8e35e2 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/MSLocationDictController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/MSLocationDictController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/MSModelsDictController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/MSModelsDictController.js
index 67b68eca8..a010044c4 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/MSModelsDictController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/MSModelsDictController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/ModelAttributeDictController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/ModelAttributeDictController.js
index 1eae88daa..242615e09 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/ModelAttributeDictController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/ModelAttributeDictController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/PSClosedLoopDictController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/PSClosedLoopDictController.js
index 746eb44ed..8377a87f9 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/PSClosedLoopDictController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/PSClosedLoopDictController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/PSGroupPolicyScopeDictController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/PSGroupPolicyScopeDictController.js
index 5ddf1489f..b456c57a0 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/PSGroupPolicyScopeDictController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/PSGroupPolicyScopeDictController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/PSResourceDictController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/PSResourceDictController.js
index d5afa347a..7aa028397 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/PSResourceDictController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/PSResourceDictController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/PSServiceDictController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/PSServiceDictController.js
index b3813656e..53c6776f5 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/PSServiceDictController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/PSServiceDictController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/PSTypeDictController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/PSTypeDictController.js
index bb7ef00c3..9305e23e2 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/PSTypeDictController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/PSTypeDictController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/RiskTypeDictController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/RiskTypeDictController.js
index b5fe5f38a..48ff66339 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/RiskTypeDictController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/RiskTypeDictController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/SafePolicyWarningDictController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/SafePolicyWarningDictController.js
index 9d9a500b3..e07262298 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/SafePolicyWarningDictController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/SafePolicyWarningDictController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/actionPolicyDictController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/actionPolicyDictController.js
index 36bc73929..572211997 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/actionPolicyDictController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/actionPolicyDictController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/attributeDictController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/attributeDictController.js
index db81da0e5..4ca3b2266 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/attributeDictController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/attributeDictController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/ecompNameEditorController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/onapNameEditorController.js
index 04c8d812a..2a2e743fb 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/ecompNameEditorController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/onapNameEditorController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,14 +17,14 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-app.controller('editEcompNameController' ,  function ($scope, $modalInstance, message, UserInfoServiceDS2, Notification){
-    if(message.ecompNameDictionaryData==null)
-        $scope.label='Add New Ecomp Name'
+app.controller('editOnapNameController' ,  function ($scope, $modalInstance, message, UserInfoServiceDS2, Notification){
+    if(message.onapNameDictionaryData==null)
+        $scope.label='Add New Onap Name'
     else{
-        $scope.label='Edit Ecomp Name'
+        $scope.label='Edit Onap Name'
         $scope.disableCd=true;
     }
-    $scope.editEcompName = message.ecompNameDictionaryData;
+    $scope.editOnapName = message.onapNameDictionaryData;
     
 	
 	/*getting user info from session*/
@@ -34,13 +34,13 @@ app.controller('editEcompNameController' ,  function ($scope, $modalInstance, me
 	  		userid = response.userid;	  	
 	 });
    
-    $scope.saveEcompName = function(ecompNameDictionaryData) {
+    $scope.saveOnapName = function(onapNameDictionaryData) {
     	var regex = new RegExp("^[a-zA-Z0-9_]*$");
-		if(!regex.test(ecompNameDictionaryData.ecompName)) {
-			Notification.error("Enter Valid Ecomp Name without spaces or special characters");
+		if(!regex.test(onapNameDictionaryData.onapName)) {
+			Notification.error("Enter Valid Onap Name without spaces or special characters");
 		}else{
-			var uuu = "saveDictionary/ecomp_dictionary/save_ecompName";
-			var postData={ecompNameDictionaryData: ecompNameDictionaryData, userid: userid};
+			var uuu = "saveDictionary/onap_dictionary/save_onapName";
+			var postData={onapNameDictionaryData: onapNameDictionaryData, userid: userid};
 			$.ajax({
 				type : 'POST',
 				url : uuu,
@@ -49,12 +49,12 @@ app.controller('editEcompNameController' ,  function ($scope, $modalInstance, me
 				data: JSON.stringify(postData),
 				success : function(data){
 					$scope.$apply(function(){
-						$scope.ecompNameDictionaryDatas=data.ecompNameDictionaryDatas;});
-					if($scope.ecompNameDictionaryDatas == "Duplicate"){
-						Notification.error("EcompName Dictionary exists with Same Ecomp Name.")
+						$scope.onapNameDictionaryDatas=data.onapNameDictionaryDatas;});
+					if($scope.onapNameDictionaryDatas == "Duplicate"){
+						Notification.error("OnapName Dictionary exists with Same Onap Name.")
 					}else{      
-						console.log($scope.ecompNameDictionaryDatas);
-						$modalInstance.close({ecompNameDictionaryDatas:$scope.ecompNameDictionaryDatas});
+						console.log($scope.onapNameDictionaryDatas);
+						$modalInstance.close({onapNameDictionaryDatas:$scope.onapNameDictionaryDatas});
 					}
 				},
 				error : function(data){
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/BRMSControllerDictGridController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/BRMSControllerDictGridController.js
index 98ae6e71e..27c95a78d 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/BRMSControllerDictGridController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/BRMSControllerDictGridController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/BRMSDependencyDictGridController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/BRMSDependencyDictGridController.js
index e3e7dcfa2..a22b1121c 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/BRMSDependencyDictGridController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/BRMSDependencyDictGridController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/BRMSParamDictGridController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/BRMSParamDictGridController.js
index af195738c..496a71a39 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/BRMSParamDictGridController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/BRMSParamDictGridController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/CLPepOptionsDictGridController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/CLPepOptionsDictGridController.js
index 076704b08..cb79d6d44 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/CLPepOptionsDictGridController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/CLPepOptionsDictGridController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -99,7 +99,7 @@ app.controller('pepOptionsDictGridController', function ($scope, PolicyAppServic
 
 	$scope.editPEPOptions = null;
 	$scope.createNewPEPOptionsWindow = function(){
-		$scope.editEcompName = null;
+		$scope.editOnapName = null;
 		var modalInstance = $modal.open({
 			backdrop: 'static', keyboard: false,
 			templateUrl : 'add_PEPOptions_popup.html',
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/CLServiceDictGridController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/CLServiceDictGridController.js
index b63cec043..e60b6744e 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/CLServiceDictGridController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/CLServiceDictGridController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/CLSiteDictGridController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/CLSiteDictGridController.js
index 638fd84ad..62121d9e0 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/CLSiteDictGridController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/CLSiteDictGridController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/CLVarbindDictGridController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/CLVarbindDictGridController.js
index 02fdcd94a..4e13b9779 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/CLVarbindDictGridController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/CLVarbindDictGridController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/CLVnfTypeDictGridController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/CLVnfTypeDictGridController.js
index 7dc4472c8..08d4662da 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/CLVnfTypeDictGridController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/CLVnfTypeDictGridController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/CLVsclActionDictGridController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/CLVsclActionDictGridController.js
index 7898bd9e7..1c26c21b0 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/CLVsclActionDictGridController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/CLVsclActionDictGridController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/DecisionRainyDayDictGridController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/DecisionRainyDayDictGridController.js
index e4fa18645..ab957b52b 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/DecisionRainyDayDictGridController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/DecisionRainyDayDictGridController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/DecisionSettingsDictGridController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/DecisionSettingsDictGridController.js
index 57f64b890..83ad1b2d0 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/DecisionSettingsDictGridController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/DecisionSettingsDictGridController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/DescriptiveScopeDictGridController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/DescriptiveScopeDictGridController.js
index 8a086e34e..f707bb4e3 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/DescriptiveScopeDictGridController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/DescriptiveScopeDictGridController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/EnforcerTypeDictGridController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/EnforcerTypeDictGridController.js
index 1012a64e2..d9626ae8e 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/EnforcerTypeDictGridController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/EnforcerTypeDictGridController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/FWActionListDictGridController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/FWActionListDictGridController.js
index 73a2a8d02..e24a4a561 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/FWActionListDictGridController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/FWActionListDictGridController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/FWAddressGroupDictGridController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/FWAddressGroupDictGridController.js
index 183bc02e4..5bca88b19 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/FWAddressGroupDictGridController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/FWAddressGroupDictGridController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/FWParentListDictGridController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/FWParentListDictGridController.js
index 7261aa3f0..546775cb4 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/FWParentListDictGridController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/FWParentListDictGridController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/FWPortListDictGridController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/FWPortListDictGridController.js
index 3787a5e6b..717c28b2d 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/FWPortListDictGridController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/FWPortListDictGridController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/FWPrefixListDictGridController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/FWPrefixListDictGridController.js
index d39729689..a33bfb9c5 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/FWPrefixListDictGridController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/FWPrefixListDictGridController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/FWProtocolListDictGridController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/FWProtocolListDictGridController.js
index a4a3ea8c0..a174a5e7f 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/FWProtocolListDictGridController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/FWProtocolListDictGridController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/FWSecurityZoneDictGridController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/FWSecurityZoneDictGridController.js
index 0923581a7..3d9198439 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/FWSecurityZoneDictGridController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/FWSecurityZoneDictGridController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/FWServiceGroupDictGridController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/FWServiceGroupDictGridController.js
index d7dc43348..69f02bfe1 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/FWServiceGroupDictGridController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/FWServiceGroupDictGridController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/FWServiceListDictGridController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/FWServiceListDictGridController.js
index dfd96e817..bc1558024 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/FWServiceListDictGridController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/FWServiceListDictGridController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/FWTagListDictGridController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/FWTagListDictGridController.js
index 74618e086..a5d3c3408 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/FWTagListDictGridController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/FWTagListDictGridController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/FWTagPickerListDictGridController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/FWTagPickerListDictGridController.js
index b34a7892a..e4e2a1429 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/FWTagPickerListDictGridController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/FWTagPickerListDictGridController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/FWTermListDictGridController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/FWTermListDictGridController.js
index 2a351059b..c51da8c04 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/FWTermListDictGridController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/FWTermListDictGridController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/FWZoneDictGridController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/FWZoneDictGridController.js
index b10a9b820..38c52ab6b 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/FWZoneDictGridController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/FWZoneDictGridController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/MSConfigNameDictGridController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/MSConfigNameDictGridController.js
index c9850e238..8b4d014f1 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/MSConfigNameDictGridController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/MSConfigNameDictGridController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/MSDcaeUUIDDictGridController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/MSDcaeUUIDDictGridController.js
index 550505b91..2a790b031 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/MSDcaeUUIDDictGridController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/MSDcaeUUIDDictGridController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/MSLocationDictGridController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/MSLocationDictGridController.js
index a2c447309..d1b0c4ac6 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/MSLocationDictGridController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/MSLocationDictGridController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/MSModelDictGridController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/MSModelDictGridController.js
index a90b00a1e..bbce9ddcb 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/MSModelDictGridController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/MSModelDictGridController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/ModelAttributeDictGridController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/ModelAttributeDictGridController.js
index cb5cb89b8..46e1794a2 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/ModelAttributeDictGridController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/ModelAttributeDictGridController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/PSClosedLoopDictGridController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/PSClosedLoopDictGridController.js
index 3a8370b72..c1944e27e 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/PSClosedLoopDictGridController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/PSClosedLoopDictGridController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/PSGroupPolicyScopeDictGridController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/PSGroupPolicyScopeDictGridController.js
index a331bfa83..0841e88fb 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/PSGroupPolicyScopeDictGridController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/PSGroupPolicyScopeDictGridController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/PSResourceDictGridController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/PSResourceDictGridController.js
index 9c0159446..0b5222e84 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/PSResourceDictGridController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/PSResourceDictGridController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/PSServiceDictGridController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/PSServiceDictGridController.js
index d516e1e64..204acabcb 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/PSServiceDictGridController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/PSServiceDictGridController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/PSTypeDictGridController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/PSTypeDictGridController.js
index 465db4af7..b8eb634d5 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/PSTypeDictGridController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/PSTypeDictGridController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/RiskTypeDictGridController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/RiskTypeDictGridController.js
index 9213f9c39..4d1d07539 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/RiskTypeDictGridController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/RiskTypeDictGridController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -140,7 +140,7 @@ app.controller('riskTypeDictGridController', function ($scope, PolicyAppService,
     };
 
     $scope.deleteRiskType = function(data) {
-        modalService.popupConfirmWin("Confirm","You are about to delete the Ecomp Name  "+data.riskType+". Do you want to continue?",
+        modalService.popupConfirmWin("Confirm","You are about to delete the Onap Name  "+data.riskType+". Do you want to continue?",
             function(){
                 var uuu = "deleteDictionary/sp_dictionary/remove_riskType";
                 var postData={data: data};
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/SafePolicyWarningDictGridController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/SafePolicyWarningDictGridController.js
index d24610591..35648767b 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/SafePolicyWarningDictGridController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/SafePolicyWarningDictGridController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/actionPolicyDictGridController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/actionPolicyDictGridController.js
index 17ba68a43..d8a7bf55a 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/actionPolicyDictGridController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/actionPolicyDictGridController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/attributeDictGridController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/attributeDictGridController.js
index c7b317460..760418553 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/attributeDictGridController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/attributeDictGridController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/ecompNameDictGridController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/onapNameDictGridController.js
index d010e41b6..4dd1df8c3 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/ecompNameDictGridController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/onapNameDictGridController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,15 +17,15 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-app.controller('ecompNameDictGridController', function ($scope, PolicyAppService, modalService, $modal, uiGridConstants,Grid){
+app.controller('onapNameDictGridController', function ($scope, PolicyAppService, modalService, $modal, uiGridConstants,Grid){
     $( "#dialog" ).hide();
     
-    PolicyAppService.getData('getDictionary/get_EcompNameData').then(function (data) {
+    PolicyAppService.getData('getDictionary/get_OnapNameData').then(function (data) {
     	var j = data;
     	$scope.data = JSON.parse(j.data);
     	console.log($scope.data);
-    	$scope.ecompNameDictionaryDatas = JSON.parse($scope.data.ecompNameDictionaryDatas);
-    	console.log($scope.ecompNameDictionaryDatas);
+    	$scope.onapNameDictionaryDatas = JSON.parse($scope.data.onapNameDictionaryDatas);
+    	console.log($scope.onapNameDictionaryDatas);
     }, function (error) {
     	console.log("failed");
     });
@@ -35,30 +35,30 @@ app.controller('ecompNameDictGridController', function ($scope, PolicyAppService
 		 $scope.data = JSON.parse(j.data);
 		 $scope.lockdowndata = JSON.parse($scope.data.lockdowndata);
 		 if($scope.lockdowndata[0].lockdown == true){
-			 $scope.ecompNameDictionaryGrid.columnDefs[0].visible = false;
+			 $scope.onapNameDictionaryGrid.columnDefs[0].visible = false;
 			 $scope.gridApi.grid.refresh();
 		 }else{
-			 $scope.ecompNameDictionaryGrid.columnDefs[0].visible = true;
+			 $scope.onapNameDictionaryGrid.columnDefs[0].visible = true;
 			 $scope.gridApi.grid.refresh();
 		 }
 	 },function(error){
 		 console.log("failed");
 	 });
 	
-    $scope.ecompNameDictionaryGrid = {
-        data : 'ecompNameDictionaryDatas',
+    $scope.onapNameDictionaryGrid = {
+        data : 'onapNameDictionaryDatas',
         enableFiltering: true,
-        exporterCsvFilename: 'EcompName.csv',
+        exporterCsvFilename: 'OnapName.csv',
         enableGridMenu: true,
         enableSelectAll: true,
         columnDefs: [{
             field: 'id', enableFiltering: false, headerCellTemplate: '' +
-            '<button id=\'New\' ng-click="grid.appScope.createNewEcompName()" class="btn btn-success">' + 'Create</button>',
+            '<button id=\'New\' ng-click="grid.appScope.createNewOnapName()" class="btn btn-success">' + 'Create</button>',
             cellTemplate:
-            '<button  type="button"  class="btn btn-primary"  ng-click="grid.appScope.editEcompNameWindow(row.entity)"><i class="fa fa-pencil-square-o"></i></button> ' +
-            '<button  type="button"  class="btn btn-danger"  ng-click="grid.appScope.deleteEcompName(row.entity)" ><i class="fa fa-trash-o"></i></button> ',  width: '8%'
+            '<button  type="button"  class="btn btn-primary"  ng-click="grid.appScope.editOnapNameWindow(row.entity)"><i class="fa fa-pencil-square-o"></i></button> ' +
+            '<button  type="button"  class="btn btn-danger"  ng-click="grid.appScope.deleteOnapName(row.entity)" ><i class="fa fa-trash-o"></i></button> ',  width: '8%'
         },
-            { field: 'ecompName', displayName : 'Ecomp Name', sort: { direction: 'asc', priority: 0 } },
+            { field: 'onapName', displayName : 'Onap Name', sort: { direction: 'asc', priority: 0 } },
             { field: 'description', width: '20%' },
             {field: 'userCreatedBy.userName', displayName : 'Created By'},
             {field: 'userModifiedBy.userName', displayName : 'Modified By' },
@@ -97,17 +97,17 @@ app.controller('ecompNameDictGridController', function ($scope, PolicyAppService
     };
 
 
-    $scope.editEcompName = null;
-    $scope.createNewEcompName = function(){
-        $scope.editEcompName = null;
+    $scope.editOnapName = null;
+    $scope.createNewOnapName = function(){
+        $scope.editOnapName = null;
         var modalInstance = $modal.open({
         	backdrop: 'static', keyboard: false,
-            templateUrl : 'add_ecompName_popup.html',
-            controller: 'editEcompNameController',
+            templateUrl : 'add_onapName_popup.html',
+            controller: 'editOnapNameController',
             resolve: {
                 message: function () {
                     var message = {
-                        ecompNameDictionaryDatas: $scope.editEcompName
+                        onapNameDictionaryDatas: $scope.editOnapName
                     };
                     return message;
                 }
@@ -115,20 +115,20 @@ app.controller('ecompNameDictGridController', function ($scope, PolicyAppService
         });
         modalInstance.result.then(function(response){
             console.log('response', response);
-            $scope.ecompNameDictionaryDatas=response.ecompNameDictionaryDatas;
+            $scope.onapNameDictionaryDatas=response.onapNameDictionaryDatas;
         });
     };
 
-    $scope.editEcompNameWindow = function(ecompNameDictionaryData) {
-        $scope.editEcompName = ecompNameDictionaryData;
+    $scope.editOnapNameWindow = function(onapNameDictionaryData) {
+        $scope.editOnapName = onapNameDictionaryData;
         var modalInstance = $modal.open({
         	backdrop: 'static', keyboard: false,
-            templateUrl : 'add_ecompName_popup.html',
-            controller: 'editEcompNameController',
+            templateUrl : 'add_onapName_popup.html',
+            controller: 'editOnapNameController',
             resolve: {
                 message: function () {
                     var message = {
-                        ecompNameDictionaryData: $scope.editEcompName
+                        onapNameDictionaryData: $scope.editOnapName
                     };
                     return message;
                 }
@@ -136,13 +136,13 @@ app.controller('ecompNameDictGridController', function ($scope, PolicyAppService
         });
         modalInstance.result.then(function(response){
             console.log('response', response);
-            $scope.ecompNameDictionaryDatas = response.ecompNameDictionaryDatas;
+            $scope.onapNameDictionaryDatas = response.onapNameDictionaryDatas;
         });
     };
 
-    $scope.deleteEcompName = function(data) {
+    $scope.deleteOnapName = function(data) {
     	var uuu = "searchDictionary";
-    	var postData={data: data, type: "ecompName"};
+    	var postData={data: data, type: "onapName"};
     	var searchString = "\n";
     	$.ajax({
     		type : 'POST',
@@ -167,9 +167,9 @@ app.controller('ecompNameDictGridController', function ($scope, PolicyAppService
 
     			console.log($scope.list);
     			if($scope.success){
-    				modalService.popupConfirmWin("Confirm","You are about to delete the Ecomp Name  "+data.ecompName+".\n "+searchString+" \n  Do you want to continue?",
+    				modalService.popupConfirmWin("Confirm","You are about to delete the Onap Name  "+data.onapName+".\n "+searchString+" \n  Do you want to continue?",
     						function(){
-    					var uuu = "deleteDictionary/ecomp_dictionary/remove_ecomp";
+    					var uuu = "deleteDictionary/onap_dictionary/remove_onap";
     					var postData={data: data};
     					$.ajax({
     						type : 'POST',
@@ -178,7 +178,7 @@ app.controller('ecompNameDictGridController', function ($scope, PolicyAppService
     						contentType: 'application/json',
     						data: JSON.stringify(postData),
     						success : function(data){
-    							$scope.$apply(function(){$scope.ecompNameDictionaryDatas=data.ecompNameDictionaryDatas;});
+    							$scope.$apply(function(){$scope.onapNameDictionaryDatas=data.onapNameDictionaryDatas;});
     						},
     						error : function(data){
     							console.log(data);
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/pdpController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/pdpController.js
index 0135172e9..cab5d26c0 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/pdpController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/pdpController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/pdpGroupPopUpController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/pdpGroupPopUpController.js
index e1079379e..4b2747635 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/pdpGroupPopUpController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/pdpGroupPopUpController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/policyAdminTabController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/policyAdminTabController.js
index 483bdcaf4..4fabc458d 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/policyAdminTabController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/policyAdminTabController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/policyController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/policyController.js
index 4699512be..a340c6764 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/policyController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/policyController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/libs/bower_components/angular/angular.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/libs/bower_components/angular/angular.js
index 2445ab55e..21b3e0966 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/libs/bower_components/angular/angular.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/libs/bower_components/angular/angular.js
@@ -25956,7 +25956,7 @@ var selectDirective = ['$compile', '$parse', function($compile,   $parse) {
           // compile the element since there might be bindings in it
           $compile(nullOption)(scope);
 
-          // remove the class, which is added automatically because we recompile the element and it
+          // remove the class, which is added automatically because we ronapile the element and it
           // becomes the compilation root
           nullOption.removeClass('ng-scope');
 
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/libs/bower_components/jquery/dist/jquery.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/libs/bower_components/jquery/dist/jquery.js
index eed17778c..9502e6d7d 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/libs/bower_components/jquery/dist/jquery.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/libs/bower_components/jquery/dist/jquery.js
@@ -2493,7 +2493,7 @@ select = Sizzle.select = function( selector, context, results, seed ) {
 			if ( !context ) {
 				return results;
 
-			// Precompiled matchers will still verify ancestry, so step up a level
+			// Pronapiled matchers will still verify ancestry, so step up a level
 			} else if ( compiled ) {
 				context = context.parentNode;
 			}
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/libs/bower_components/jquery/src/sizzle/dist/sizzle.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/libs/bower_components/jquery/src/sizzle/dist/sizzle.js
index 89aecbc2f..d6e08253f 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/libs/bower_components/jquery/src/sizzle/dist/sizzle.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/libs/bower_components/jquery/src/sizzle/dist/sizzle.js
@@ -1940,7 +1940,7 @@ select = Sizzle.select = function( selector, context, results, seed ) {
 			if ( !context ) {
 				return results;
 
-			// Precompiled matchers will still verify ancestry, so step up a level
+			// Pronapiled matchers will still verify ancestry, so step up a level
 			} else if ( compiled ) {
 				context = context.parentNode;
 			}
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/main/modalPopupController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/main/modalPopupController.js
index e0ed29ec2..7eb2b450e 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/main/modalPopupController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/main/modalPopupController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/main/policyEditor.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/main/policyEditor.html
index 50a1e53f5..1c43444dd 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/main/policyEditor.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/main/policyEditor.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -123,7 +123,7 @@
 	<!--------------------------Dictionary resources--------------------------------->
 	<script src= "app/policyApp/controller/dictionaryGridController/actionPolicyDictGridController.js"></script>
 	<script src= "app/policyApp/controller/dictionaryGridController/attributeDictGridController.js"></script>
-	<script src= "app/policyApp/controller/dictionaryGridController/ecompNameDictGridController.js"></script>
+	<script src= "app/policyApp/controller/dictionaryGridController/onapNameDictGridController.js"></script>
 	<script src= "app/policyApp/controller/dictionaryGridController/BRMSParamDictGridController.js"></script>
 	<script src= "app/policyApp/controller/dictionaryGridController/BRMSDependencyDictGridController.js"></script>
 	<script src= "app/policyApp/controller/dictionaryGridController/BRMSControllerDictGridController.js"></script>
@@ -166,7 +166,7 @@
 
 	<script src= "app/policyApp/controller/dictionaryController/actionPolicyDictController.js"></script>
 	<script src= "app/policyApp/controller/dictionaryController/attributeDictController.js"></script>
-	<script src= "app/policyApp/controller/dictionaryController/ecompNameEditorController.js"></script>
+	<script src= "app/policyApp/controller/dictionaryController/onapNameEditorController.js"></script>
 	<script src= "app/policyApp/controller/dictionaryController/BRMSParamDictController.js"></script>
 	<script src= "app/policyApp/controller/dictionaryController/BRMSDependencyDictController.js"></script>
 	<script src= "app/policyApp/controller/dictionaryController/BRMSControllerDictController.js"></script>
@@ -216,7 +216,7 @@
 	
 	<!---------------------------DS2 ICONS-------------------------------->
 	<link rel="stylesheet" href="app/fusion/external/ds2/css/digital-ng-library/ionicons.css">	
-	<link rel="stylesheet" href="app/fusion/styles/ecomp.css">
+	<link rel="stylesheet" href="app/fusion/styles/onap.css">
 	<link rel="stylesheet" href="app/fusion/external/angular-gridster/dist/angular-gridster.min.css">
 	<script src= "app/policyApp/CSS/UIGrid/ui-grid.eot"></script>
 	<link rel="stylesheet" href="app/policyApp/CSS/UIGrid/ui-grid.svg">
@@ -244,7 +244,7 @@
 	    <div ng-include src="'app/policyApp/Windows/Dictionary/DecisionSettingsDictionary.html'"></div>
 	    <div ng-include src="'app/policyApp/Windows/Dictionary/DecisionRainyDayDictionary.html'"></div>
 	    <div ng-include src="'app/policyApp/Windows/Dictionary/DescriptiveScopeDictionary.html'"></div>
-	    <div ng-include src="'app/policyApp/Windows/Dictionary/EcompNameDictionary.html'"></div>
+	    <div ng-include src="'app/policyApp/Windows/Dictionary/OnapNameDictionary.html'"></div>
 	    <div ng-include src="'app/policyApp/Windows/Dictionary/EnforcerTypeDictionary.html'"></div>
 	    <div ng-include src="'app/policyApp/Windows/Dictionary/FWActionListDictionary.html'"></div>
 	    <div ng-include src="'app/policyApp/Windows/Dictionary/FWAddressGroupDictionary.html'"></div>
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/ActionPolicyDictionary.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/ActionPolicyDictionary.html
index 6c5348c4d..f33ba9313 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/ActionPolicyDictionary.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/ActionPolicyDictionary.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/AttributeDictionary.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/AttributeDictionary.html
index 01f5cfb30..0ba49513f 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/AttributeDictionary.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/AttributeDictionary.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/BRMSControllerDictionary.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/BRMSControllerDictionary.html
index d2c4958fb..fea7d09f0 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/BRMSControllerDictionary.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/BRMSControllerDictionary.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/BRMSDependencyDictionary.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/BRMSDependencyDictionary.html
index e4395b5d8..b021a049e 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/BRMSDependencyDictionary.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/BRMSDependencyDictionary.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/BRMSParamDictionary.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/BRMSParamDictionary.html
index 2357d3bf6..dda76bb76 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/BRMSParamDictionary.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/BRMSParamDictionary.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/CLPepOptionsDictionary.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/CLPepOptionsDictionary.html
index 713263601..23781d486 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/CLPepOptionsDictionary.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/CLPepOptionsDictionary.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/CLServiceDictionary.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/CLServiceDictionary.html
index 93a11ea48..0d011da10 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/CLServiceDictionary.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/CLServiceDictionary.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/CLSiteDictionary.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/CLSiteDictionary.html
index bb2b2ea7e..6e82402d9 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/CLSiteDictionary.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/CLSiteDictionary.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/CLVNFTypeDictionary.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/CLVNFTypeDictionary.html
index dc6e49f1e..f26bb71cf 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/CLVNFTypeDictionary.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/CLVNFTypeDictionary.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/CLVSCLActionDictionary.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/CLVSCLActionDictionary.html
index 7b5c9a183..c024ce7c9 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/CLVSCLActionDictionary.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/CLVSCLActionDictionary.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/CLVarbindDictionary.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/CLVarbindDictionary.html
index 3ac1e42ca..e30330372 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/CLVarbindDictionary.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/CLVarbindDictionary.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/DecisionRainyDayDictionary.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/DecisionRainyDayDictionary.html
index a81111518..e6e9dd31d 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/DecisionRainyDayDictionary.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/DecisionRainyDayDictionary.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/DecisionSettingsDictionary.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/DecisionSettingsDictionary.html
index 74b7672de..663c7a3cc 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/DecisionSettingsDictionary.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/DecisionSettingsDictionary.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/DescriptiveScopeDictionary.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/DescriptiveScopeDictionary.html
index 7a162bd1f..bc4a397d6 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/DescriptiveScopeDictionary.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/DescriptiveScopeDictionary.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/EnforcerTypeDictionary.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/EnforcerTypeDictionary.html
index df514bf17..62ac85bbb 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/EnforcerTypeDictionary.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/EnforcerTypeDictionary.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/FWActionLisdtDictionary.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/FWActionLisdtDictionary.html
index 544dc6f2f..65ddaed5e 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/FWActionLisdtDictionary.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/FWActionLisdtDictionary.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/FWActionListDictionary.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/FWActionListDictionary.html
index 544dc6f2f..65ddaed5e 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/FWActionListDictionary.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/FWActionListDictionary.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/FWAddressGroupDictionary.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/FWAddressGroupDictionary.html
index 7d750f8ca..38766837e 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/FWAddressGroupDictionary.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/FWAddressGroupDictionary.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/FWParentListDictionary.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/FWParentListDictionary.html
index 3da917b8d..c8c9cfd01 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/FWParentListDictionary.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/FWParentListDictionary.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/FWPortListDictionary.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/FWPortListDictionary.html
index 1347963a1..520dc6985 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/FWPortListDictionary.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/FWPortListDictionary.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/FWPrefixListDictionary.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/FWPrefixListDictionary.html
index ec47506b8..252dcaf9b 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/FWPrefixListDictionary.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/FWPrefixListDictionary.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/FWProtocolListDictionary.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/FWProtocolListDictionary.html
index 705d300f1..aa54a943d 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/FWProtocolListDictionary.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/FWProtocolListDictionary.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/FWSecurityZoneDictionary.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/FWSecurityZoneDictionary.html
index 900936dcd..b0526fad6 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/FWSecurityZoneDictionary.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/FWSecurityZoneDictionary.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/FWServiceGroupDictionary.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/FWServiceGroupDictionary.html
index 878b21f35..9c2f4b38e 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/FWServiceGroupDictionary.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/FWServiceGroupDictionary.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/FWServiceListDictionary.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/FWServiceListDictionary.html
index f0ba13853..d2f755a11 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/FWServiceListDictionary.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/FWServiceListDictionary.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/FWTagListDictionary.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/FWTagListDictionary.html
index aebf43172..515333cc9 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/FWTagListDictionary.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/FWTagListDictionary.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/FWTagPickerListDictionary.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/FWTagPickerListDictionary.html
index 072699348..5bc048e40 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/FWTagPickerListDictionary.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/FWTagPickerListDictionary.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/FWTermListDictionary.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/FWTermListDictionary.html
index 2e3e03315..a17f59269 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/FWTermListDictionary.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/FWTermListDictionary.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/FWZoneDictionary.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/FWZoneDictionary.html
index 6878e1f30..d52038fac 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/FWZoneDictionary.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/FWZoneDictionary.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/MSConfigNameDictionary.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/MSConfigNameDictionary.html
index bd1888850..f3c4f494d 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/MSConfigNameDictionary.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/MSConfigNameDictionary.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/MSDcaeUUIDDictionary.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/MSDcaeUUIDDictionary.html
index 1948b5bb5..2e73bab65 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/MSDcaeUUIDDictionary.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/MSDcaeUUIDDictionary.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/MSLocationDictionary.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/MSLocationDictionary.html
index 0f6b75a33..e5e185481 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/MSLocationDictionary.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/MSLocationDictionary.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/MSModelDictionary.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/MSModelDictionary.html
index 268130ced..3133b5ee0 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/MSModelDictionary.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/MSModelDictionary.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/ModelAttributeDictionary.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/ModelAttributeDictionary.html
index fcf4ce9df..f29af8272 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/ModelAttributeDictionary.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/ModelAttributeDictionary.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/EcompNameDictionary.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/OnapNameDictionary.html
index cc674bac1..92804e2c7 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/EcompNameDictionary.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/OnapNameDictionary.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,6 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */-->
-<div ng-app ng-controller = "ecompNameDictGridController">
-    <div  ui-grid = "ecompNameDictionaryGrid" ui-grid-pagination ui-grid-selection ui-grid-resize-columns ui-grid-exporter></div>
+<div ng-app ng-controller = "onapNameDictGridController">
+    <div  ui-grid = "onapNameDictionaryGrid" ui-grid-pagination ui-grid-selection ui-grid-resize-columns ui-grid-exporter></div>
 </div>
\ No newline at end of file
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/PSClosedLoopDictionary.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/PSClosedLoopDictionary.html
index f50f317e5..7645cc63f 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/PSClosedLoopDictionary.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/PSClosedLoopDictionary.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/PSGroupPolicyScopeDictionary.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/PSGroupPolicyScopeDictionary.html
index 6f4fd34aa..67fcc28f8 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/PSGroupPolicyScopeDictionary.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/PSGroupPolicyScopeDictionary.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/PSResourceDictionary.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/PSResourceDictionary.html
index 53318384a..d64c6396e 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/PSResourceDictionary.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/PSResourceDictionary.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/PSServiceDictionary.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/PSServiceDictionary.html
index 1c5037d5c..c67fcc25b 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/PSServiceDictionary.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/PSServiceDictionary.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/PSTypeDictionary.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/PSTypeDictionary.html
index 7584adb14..ee52d3773 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/PSTypeDictionary.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/PSTypeDictionary.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/RiskTypeDictionary.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/RiskTypeDictionary.html
index 71108994f..6289c96cf 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/RiskTypeDictionary.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/RiskTypeDictionary.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/SafePolicyWarningDictionary.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/SafePolicyWarningDictionary.html
index c80f1b72f..4d0d14ba6 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/SafePolicyWarningDictionary.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Dictionary/SafePolicyWarningDictionary.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/ActionPolicyController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/ActionPolicyController.js
index 398b285e6..2892936f8 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/ActionPolicyController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/ActionPolicyController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/BRMSParamPolicyController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/BRMSParamPolicyController.js
index 323a9bfa0..eb3bfce4c 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/BRMSParamPolicyController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/BRMSParamPolicyController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/BRMSRawPolicyController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/BRMSRawPolicyController.js
index ecf3dec30..451d2ea4f 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/BRMSRawPolicyController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/BRMSRawPolicyController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/BaseConfigPolicyController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/BaseConfigPolicyController.js
index 9dc7e9247..54ce401f6 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/BaseConfigPolicyController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/BaseConfigPolicyController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -37,12 +37,12 @@ app.controller('baseConfigController', ['$scope', 'PolicyAppService', 'policyNav
         return $('#' + id).modal(hide ? 'hide' : 'show');
     };
     
-    PolicyAppService.getData('getDictionary/get_EcompNameDataByName').then(function (data) {
+    PolicyAppService.getData('getDictionary/get_OnapNameDataByName').then(function (data) {
     	var j = data;  
     	$scope.data = JSON.parse(j.data);
     	console.log($scope.data);
-    	$scope.ecompNameDictionaryDatas = JSON.parse($scope.data.ecompNameDictionaryDatas);
-    	console.log($scope.ecompNameDictionaryDatas);
+    	$scope.onapNameDictionaryDatas = JSON.parse($scope.data.onapNameDictionaryDatas);
+    	console.log($scope.onapNameDictionaryDatas);
     }, function (error) {
     	console.log("failed");
     });
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/ClosedLoopFaultController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/ClosedLoopFaultController.js
index 8f054edd1..a6fa7b291 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/ClosedLoopFaultController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/ClosedLoopFaultController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -429,12 +429,12 @@ angular.module("abs").controller('clFaultController', ['$scope', '$window', 'Pol
 	}
 	
 
-	PolicyAppService.getData('getDictionary/get_EcompNameDataByName').then(function (data) {
+	PolicyAppService.getData('getDictionary/get_OnapNameDataByName').then(function (data) {
 		var j = data;
 		$scope.data = JSON.parse(j.data);
 		console.log($scope.data);
-		$scope.ecompNameDictionaryDatas = JSON.parse($scope.data.ecompNameDictionaryDatas);
-		console.log($scope.ecompNameDictionaryDatas);
+		$scope.onapNameDictionaryDatas = JSON.parse($scope.data.onapNameDictionaryDatas);
+		console.log($scope.onapNameDictionaryDatas);
 	}, function (error) {
 		console.log("failed");
 	});
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/ClosedLoopPMController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/ClosedLoopPMController.js
index b74f1b39b..c81f4655a 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/ClosedLoopPMController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/ClosedLoopPMController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -36,12 +36,12 @@ angular.module("abs").controller('clPMController', ['$scope', '$window', '$timeo
 	      return $('#' + id).modal(hide ? 'hide' : 'show');
 	  };
 	 
-	 PolicyAppService.getData('getDictionary/get_EcompNameDataByName').then(function (data) {
+	 PolicyAppService.getData('getDictionary/get_OnapNameDataByName').then(function (data) {
 		 var j = data;
 		 $scope.data = JSON.parse(j.data);
 		 console.log($scope.data);
-		 $scope.ecompNameDictionaryDatas = JSON.parse($scope.data.ecompNameDictionaryDatas);
-		 console.log($scope.ecompNameDictionaryDatas);
+		 $scope.onapNameDictionaryDatas = JSON.parse($scope.data.onapNameDictionaryDatas);
+		 console.log($scope.onapNameDictionaryDatas);
 	 }, function (error) {
 		 console.log("failed");
 	 });
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/DCAEMicroServicePolicyController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/DCAEMicroServicePolicyController.js
index 94c1bc998..5d81bc10d 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/DCAEMicroServicePolicyController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/DCAEMicroServicePolicyController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -47,12 +47,12 @@ angular.module('abs').controller('dcaeMicroServiceController', ['$scope', '$wind
 		$scope.isCheck = false;
 	}
 		
-	PolicyAppService.getData('getDictionary/get_EcompNameDataByName').then(function (data) {
+	PolicyAppService.getData('getDictionary/get_OnapNameDataByName').then(function (data) {
 		var j = data;
 		$scope.data = JSON.parse(j.data);
 		console.log($scope.data);
-		$scope.ecompNameDictionaryDatas = JSON.parse($scope.data.ecompNameDictionaryDatas);
-		console.log($scope.ecompNameDictionaryDatas);
+		$scope.onapNameDictionaryDatas = JSON.parse($scope.data.onapNameDictionaryDatas);
+		console.log($scope.onapNameDictionaryDatas);
 	}, function (error) {
 		console.log("failed");
 	});
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/DecisionPolicyController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/DecisionPolicyController.js
index 72b6f06ca..fb10a2cc9 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/DecisionPolicyController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/DecisionPolicyController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -40,12 +40,12 @@ angular.module('abs').controller('decisionPolicyController', ['$scope', 'PolicyA
 		$scope.temp.policy.ruleProvider="Custom";
 	}
 		
-	PolicyAppService.getData('getDictionary/get_EcompNameDataByName').then(function (data) {
+	PolicyAppService.getData('getDictionary/get_OnapNameDataByName').then(function (data) {
 		var j = data;
 		$scope.data = JSON.parse(j.data);
 		console.log($scope.data);
-		$scope.ecompNameDictionaryDatas = JSON.parse($scope.data.ecompNameDictionaryDatas);
-		console.log($scope.ecompNameDictionaryDatas);
+		$scope.onapNameDictionaryDatas = JSON.parse($scope.data.onapNameDictionaryDatas);
+		console.log($scope.onapNameDictionaryDatas);
 	}, function (error) {
 		console.log("failed");
 	});
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/ExportPolicyController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/ExportPolicyController.js
index 7c0300c9f..f3974f863 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/ExportPolicyController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/ExportPolicyController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/FirewallPolicyController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/FirewallPolicyController.js
index 2978a43fa..86c685429 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/FirewallPolicyController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/FirewallPolicyController.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplates/BasePolicyTemplate.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplates/BasePolicyTemplate.html
index 1ecfd2fbd..790a16be4 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplates/BasePolicyTemplate.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplates/BasePolicyTemplate.html
@@ -17,11 +17,11 @@
 			</div>
 			<div class="form-group row">
 				<div class="form-group col-sm-3">
-					<label>Ecomp Name:<sup><b>*</b></sup></label> <select
+					<label>Onap Name:<sup><b>*</b></sup></label> <select
 						class="form-control" ng-disabled="temp.policy.readOnly"
-						ng-model="temp.policy.ecompName"
-						ng-options="option for option in ecompNameDictionaryDatas track by option"
-						required pattern="\S+" title="EcompName is required"></select>
+						ng-model="temp.policy.onapName"
+						ng-options="option for option in onapNameDictionaryDatas track by option"
+						required pattern="\S+" title="OnapName is required"></select>
 				</div>
 				<div class="form-group col-sm-3">
 					<label>Config Name:<sup><b>*</b></sup></label> <input type="text"
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplates/ClosedLoopFaultPolicyTemplate.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplates/ClosedLoopFaultPolicyTemplate.html
index fad038ddc..8f1c10e35 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplates/ClosedLoopFaultPolicyTemplate.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplates/ClosedLoopFaultPolicyTemplate.html
@@ -43,11 +43,11 @@
 						<option>False</option></select>
 				</div>
 				<div class="form-group col-sm-3">
-					<label>Ecomp Name:<sup><b>*</b></sup></label> <select
+					<label>Onap Name:<sup><b>*</b></sup></label> <select
 						class="form-control" ng-disabled="temp.policy.readOnly"
-						ng-model="temp.policy.ecompName"
-						ng-options="option for option in ecompNameDictionaryDatas track by option"
-						required pattern="\S+" title="EcompName is required"></select>
+						ng-model="temp.policy.onapName"
+						ng-options="option for option in onapNameDictionaryDatas track by option"
+						required pattern="\S+" title="OnapName is required"></select>
 				</div>
 			</div>
 			<div class="form-group row">
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplates/ClosedLoopPMPolicyTemplate.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplates/ClosedLoopPMPolicyTemplate.html
index 20781a369..2fc60b719 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplates/ClosedLoopPMPolicyTemplate.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplates/ClosedLoopPMPolicyTemplate.html
@@ -17,11 +17,11 @@
 			</div>
 			<div class="form-group row">
 				<div class="form-group col-sm-3">
-					<label>Ecomp Name:<sup><b>*</b></sup></label> <select
+					<label>Onap Name:<sup><b>*</b></sup></label> <select
 						class="form-control" ng-disabled="temp.policy.readOnly"
-						ng-model="temp.policy.ecompName"
-						ng-options="option for option in ecompNameDictionaryDatas track by option"
-						required pattern="\S+" title="EcompName is required"></select>
+						ng-model="temp.policy.onapName"
+						ng-options="option for option in onapNameDictionaryDatas track by option"
+						required pattern="\S+" title="OnapName is required"></select>
 				</div>
 				<div class="form-group col-sm-3">
 					<label>Time to Live Date:</label> <input type="date"
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplates/DCAEMicroServicePolicyTemplate.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplates/DCAEMicroServicePolicyTemplate.html
index f621f2cba..4e3521902 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplates/DCAEMicroServicePolicyTemplate.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplates/DCAEMicroServicePolicyTemplate.html
@@ -17,11 +17,11 @@
 			</div>
 			<div class="form-group row">
 				<div class="form-group col-sm-3">
-					<label>Ecomp Name:<sup><b>*</b></sup></label> <select
+					<label>Onap Name:<sup><b>*</b></sup></label> <select
 						class="form-control" ng-disabled="temp.policy.readOnly"
-						ng-model="temp.policy.ecompName"
-						ng-options="option for option in ecompNameDictionaryDatas track by option"
-						required pattern="\S+" title="EcompName is required"></select>
+						ng-model="temp.policy.onapName"
+						ng-options="option for option in onapNameDictionaryDatas track by option"
+						required pattern="\S+" title="OnapName is required"></select>
 				</div>
 				<div class="form-group col-sm-3">
 					<label>Time to Live Date:</label> <input type="date"
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplates/DecisionPolicyTemplate.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplates/DecisionPolicyTemplate.html
index 973a7afc2..60f3e6dc1 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplates/DecisionPolicyTemplate.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplates/DecisionPolicyTemplate.html
@@ -17,11 +17,11 @@
 			</div>
 			<div class="form-group row">
 				<div class="form-group col-sm-6">
-					<label>Ecomp Name:<sup><b>*</b></sup></label> <select
+					<label>Onap Name:<sup><b>*</b></sup></label> <select
 						class="form-control" ng-disabled="temp.policy.readOnly"
-						ng-model="temp.policy.ecompName"
-						ng-options="option for option in ecompNameDictionaryDatas track by option"
-						required pattern="\S+" title="EcompName is required"></select>
+						ng-model="temp.policy.onapName"
+						ng-options="option for option in onapNameDictionaryDatas track by option"
+						required pattern="\S+" title="OnapName is required"></select>
 				</div>
 				<div class="form-group col-sm-6">
 					<label>Rule Provider:<sup><b>*</b></sup></label><select
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplates/PolicyTypeTemplate.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplates/PolicyTypeTemplate.html
index acbc4eec5..861e9d660 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplates/PolicyTypeTemplate.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplates/PolicyTypeTemplate.html
@@ -1,6 +1,6 @@
 <!--
   ============LICENSE_START=======================================================
-  ECOMP Policy Engine
+  ONAP Policy Engine
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
   ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/css/animations.css b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/css/animations.css
index 50db9b001..67235f958 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/css/animations.css
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/css/animations.css
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/css/dialogs.css b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/css/dialogs.css
index 60690c4fe..b45f8e36d 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/css/dialogs.css
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/css/dialogs.css
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/css/main.css b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/css/main.css
index 1122b6f1b..ec19f0d7f 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/css/main.css
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/css/main.css
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/css/normalize-legacy.css b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/css/normalize-legacy.css
index 021e5fb81..bbe0c504e 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/css/normalize-legacy.css
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/css/normalize-legacy.css
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/css/normalize.css b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/css/normalize.css
index 9bfd183d3..a7f89dfe1 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/css/normalize.css
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/css/normalize.css
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/css/styles.css b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/css/styles.css
index 9ce7ace9d..63a24961a 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/css/styles.css
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/css/styles.css
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/js/app.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/js/app.js
index 476da957d..ad45f175a 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/js/app.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/js/app.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/js/controllers/policyManager.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/js/controllers/policyManager.js
index d471f2763..52ca96454 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/js/controllers/policyManager.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/js/controllers/policyManager.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -58,11 +58,11 @@ app.controller('PolicyManagerController', [
         	console.log("failed");
         });
 
-        PolicyAppService.getData('getDictionary/get_EcompNameDataByName').then(function(data){
+        PolicyAppService.getData('getDictionary/get_OnapNameDataByName').then(function(data){
         	var j = data;
         	$scope.data = JSON.parse(j.data);
         	console.log($scope.data);
-        	$scope.ecompNameDictionaryDatas = JSON.parse($scope.data.ecompNameDictionaryDatas);	
+        	$scope.onapNameDictionaryDatas = JSON.parse($scope.data.onapNameDictionaryDatas);	
         }, function (error) {
         	console.log("failed");
         });
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/js/controllers/policySearchManager.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/js/controllers/policySearchManager.js
index 445309f4c..f973a236a 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/js/controllers/policySearchManager.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/js/controllers/policySearchManager.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -58,11 +58,11 @@ app.controller('PolicySearchController', [
         	console.log("failed");
         });
 
-        PolicyAppService.getData('getDictionary/get_EcompNameDataByName').then(function(data){
+        PolicyAppService.getData('getDictionary/get_OnapNameDataByName').then(function(data){
         	var j = data;
         	$scope.data = JSON.parse(j.data);
         	console.log($scope.data);
-        	$scope.ecompNameDictionaryDatas = JSON.parse($scope.data.ecompNameDictionaryDatas);	
+        	$scope.onapNameDictionaryDatas = JSON.parse($scope.data.onapNameDictionaryDatas);	
         }, function (error) {
         	console.log("failed");
         });
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/js/controllers/selector-controller.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/js/controllers/selector-controller.js
index 438036341..93e628ae0 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/js/controllers/selector-controller.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/js/controllers/selector-controller.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/js/directives/directives.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/js/directives/directives.js
index 308a634db..de209b630 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/js/directives/directives.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/js/directives/directives.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/js/entities/item.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/js/entities/item.js
index 21762ce77..b96a4f732 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/js/entities/item.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/js/entities/item.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/js/filters/filters.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/js/filters/filters.js
index 4d897c9c0..b62836817 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/js/filters/filters.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/js/filters/filters.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/js/providers/config.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/js/providers/config.js
index 6afabe136..8b0e3b600 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/js/providers/config.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/js/providers/config.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/js/services/RolesService.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/js/services/RolesService.js
index 2d3426fc3..b98983d67 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/js/services/RolesService.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/js/services/RolesService.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/js/services/policynavigator.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/js/services/policynavigator.js
index 1435afe8a..e38133113 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/js/services/policynavigator.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/js/services/policynavigator.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/js/services/policyuploader.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/js/services/policyuploader.js
index de7d4c15e..47a9c5b74 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/js/services/policyuploader.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/js/services/policyuploader.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/templates/searchNavbar.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/templates/searchNavbar.html
index 768fe5e19..891e27b9c 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/templates/searchNavbar.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/templates/searchNavbar.html
@@ -96,9 +96,9 @@ body {
 															</select>
 														</div>
 														<div class="form-group col-sm-6">
-															<label>Ecomp Name:</label><BR> <select
-																class="form-control" ng-model="search.ecompName"
-																ng-options="option for option in ecompNameDictionaryDatas track by option"></select>
+															<label>Onap Name:</label><BR> <select
+																class="form-control" ng-model="search.onapName"
+																ng-options="option for option in onapNameDictionaryDatas track by option"></select>
 														</div>
 													</div>
 													<div class="form-group row">
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/policy_AdminTab.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/policy_AdminTab.html
index 80c0df618..75ad7ca93 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/policy_AdminTab.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/policy_AdminTab.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/policy_AutoPush.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/policy_AutoPush.html
index 070cafc8b..af135dc23 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/policy_AutoPush.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/policy_AutoPush.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -71,7 +71,7 @@
 						<b>Policies</b>
 					</h4>
 					<img id="mySpinner"
-						src="/ecomp/app/policyApp/images/loading_bar.gif"
+						src="/onap/app/policyApp/images/loading_bar.gif"
 						ng-show="loading" />
 				</div>
 				<div class="panel-body">
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/policy_DashboardHealth.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/policy_DashboardHealth.html
index 393e2c751..5fbdf528d 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/policy_DashboardHealth.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/policy_DashboardHealth.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/policy_DashboardLogging.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/policy_DashboardLogging.html
index efc05cc42..a42427fb5 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/policy_DashboardLogging.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/policy_DashboardLogging.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -34,8 +34,8 @@
 		</div>
 	</div>
 	<br>
-	<h4 style="text-align: left; color: #157bb2">Log Files From Cluster ECOMP</h4>
-	<img id="mySpinner" src="/ecomp/app/policyApp/images/loading_bar.gif"
+	<h4 style="text-align: left; color: #157bb2">Log Files From Cluster ONAP</h4>
+	<img id="mySpinner" src="/onap/app/policyApp/images/loading_bar.gif"
 		ng-show="loading" />
 	<div ui-grid="availableGridLoggingDatas" ui-grid-pagination
 		ui-grid-selection ui-grid-resize-columns ui-grid-exporter class="grid">
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/policy_Dictionary.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/policy_Dictionary.html
index 7d7793617..5086ccfdb 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/policy_Dictionary.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/policy_Dictionary.html
@@ -1,6 +1,6 @@
 <!--
   ============LICENSE_START=======================================================
-  ECOMP Policy Engine
+  ONAP Policy Engine
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
   ================================================================================
@@ -63,7 +63,7 @@
 	</div>
 	<!--Common Dictionary-->
 	<div  ng-if="option2 == 'Attribute Dictionary'" ng-include = "'app/policyApp/policy-models/Dictionary/AttributeDictionary.html'" ></div>
-	<div  ng-if="option2 == 'EcompName Dictionary'" ng-include = "'app/policyApp/policy-models/Dictionary/EcompNameDictionary.html'" ></div>
+	<div  ng-if="option2 == 'OnapName Dictionary'" ng-include = "'app/policyApp/policy-models/Dictionary/OnapNameDictionary.html'" ></div>
 	<!--Action Policy Dictionary-->
 	<div  ng-if="option2 == 'Action Dictionary'" ng-include = "'app/policyApp/policy-models/Dictionary/ActionPolicyDictionary.html'"></div>
 	<!--ClosedLoop Dictionary's-->
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/policy_PDPManagement.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/policy_PDPManagement.html
index 613eb6d4c..55e7a07cd 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/policy_PDPManagement.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/policy_PDPManagement.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/policy_Roles.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/policy_Roles.html
index 2c112477d..0e5c683d0 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/policy_Roles.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/policy_Roles.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/policy_SearchFilter.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/policy_SearchFilter.html
index c8072a312..4cce4a7c9 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/policy_SearchFilter.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/policy_SearchFilter.html
@@ -1,6 +1,6 @@
 <!--/*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/service/PolicyAppService.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/service/PolicyAppService.js
index 51904bf26..44826fd80 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/service/PolicyAppService.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/service/PolicyAppService.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/service/modalService.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/service/modalService.js
index 86ac5f00f..381db7f9a 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/service/modalService.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/service/modalService.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/service/userInfoServiceDS2.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/service/userInfoServiceDS2.js
index b3d7cd9ae..90d7cd1d3 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/service/userInfoServiceDS2.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/service/userInfoServiceDS2.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
diff --git a/POLICY-SDK-APP/src/test/java/org/openecomp/policy/admin/PolicyManagerServletTest.java b/POLICY-SDK-APP/src/test/java/org/onap/policy/admin/PolicyManagerServletTest.java
index 9fd1801ae..e61742f1c 100644
--- a/POLICY-SDK-APP/src/test/java/org/openecomp/policy/admin/PolicyManagerServletTest.java
+++ b/POLICY-SDK-APP/src/test/java/org/onap/policy/admin/PolicyManagerServletTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.admin;
+package org.onap.policy.admin;
 
 import static org.junit.Assert.fail;
 
@@ -36,19 +36,19 @@ import org.apache.commons.io.IOUtils;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.controller.CreateDcaeMicroServiceController;
-import org.openecomp.policy.controller.PolicyController;
-import org.openecomp.policy.model.Roles;
-import org.openecomp.policy.rest.dao.CommonClassDao;
-import org.openecomp.policy.rest.jpa.ActionBodyEntity;
-import org.openecomp.policy.rest.jpa.ConfigurationDataEntity;
-import org.openecomp.policy.rest.jpa.GroupPolicyScopeList;
-import org.openecomp.policy.rest.jpa.PolicyEditorScopes;
-import org.openecomp.policy.rest.jpa.PolicyEntity;
-import org.openecomp.policy.rest.jpa.PolicyVersion;
-import org.openecomp.policy.rest.jpa.UserInfo;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.controller.CreateDcaeMicroServiceController;
+import org.onap.policy.controller.PolicyController;
+import org.onap.policy.model.Roles;
+import org.onap.policy.rest.dao.CommonClassDao;
+import org.onap.policy.rest.jpa.ActionBodyEntity;
+import org.onap.policy.rest.jpa.ConfigurationDataEntity;
+import org.onap.policy.rest.jpa.GroupPolicyScopeList;
+import org.onap.policy.rest.jpa.PolicyEditorScopes;
+import org.onap.policy.rest.jpa.PolicyEntity;
+import org.onap.policy.rest.jpa.PolicyVersion;
+import org.onap.policy.rest.jpa.UserInfo;
 
 public class PolicyManagerServletTest extends Mockito{
 	
diff --git a/POLICY-SDK-APP/src/test/java/org/openecomp/policy/controller/AdminTabControllerTest.java b/POLICY-SDK-APP/src/test/java/org/onap/policy/controller/AdminTabControllerTest.java
index 07bd54939..0109cb503 100644
--- a/POLICY-SDK-APP/src/test/java/org/openecomp/policy/controller/AdminTabControllerTest.java
+++ b/POLICY-SDK-APP/src/test/java/org/onap/policy/controller/AdminTabControllerTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.controller;
+package org.onap.policy.controller;
 
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.mock;
@@ -33,10 +33,10 @@ import javax.servlet.http.HttpServletRequest;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.rest.dao.CommonClassDao;
-import org.openecomp.policy.rest.jpa.GlobalRoleSettings;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.rest.dao.CommonClassDao;
+import org.onap.policy.rest.jpa.GlobalRoleSettings;
 import org.springframework.mock.web.MockHttpServletResponse;
 
 public class AdminTabControllerTest {
diff --git a/POLICY-SDK-APP/src/test/java/org/openecomp/policy/controller/CreateDcaeMicroServiceControllerTest.java b/POLICY-SDK-APP/src/test/java/org/onap/policy/controller/CreateDcaeMicroServiceControllerTest.java
index b4619b852..a90e1b7dd 100644
--- a/POLICY-SDK-APP/src/test/java/org/openecomp/policy/controller/CreateDcaeMicroServiceControllerTest.java
+++ b/POLICY-SDK-APP/src/test/java/org/onap/policy/controller/CreateDcaeMicroServiceControllerTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.controller;
+package org.onap.policy.controller;
 
 
 import static org.easymock.EasyMock.createMock;
@@ -48,13 +48,13 @@ import javax.servlet.http.HttpServletRequest;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.rest.adapter.PolicyRestAdapter;
-import org.openecomp.policy.rest.dao.CommonClassDao;
-import org.openecomp.policy.rest.jpa.ConfigurationDataEntity;
-import org.openecomp.policy.rest.jpa.MicroServiceModels;
-import org.openecomp.policy.rest.jpa.PolicyEntity;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.rest.adapter.PolicyRestAdapter;
+import org.onap.policy.rest.dao.CommonClassDao;
+import org.onap.policy.rest.jpa.ConfigurationDataEntity;
+import org.onap.policy.rest.jpa.MicroServiceModels;
+import org.onap.policy.rest.jpa.PolicyEntity;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
 
@@ -98,7 +98,7 @@ public class CreateDcaeMicroServiceControllerTest {
         commonClassDao = mock(CommonClassDao.class);
         List<Object> microServiceModelsData = new ArrayList<Object>();
         MicroServiceModels testData = new MicroServiceModels();
-        testData.setVersion("OpenEcomp-Junit");        
+        testData.setVersion("OpenOnap-Junit");        
         microServiceModelsData.add(testData);
 
         // mock the getDataById() call
@@ -109,7 +109,7 @@ public class CreateDcaeMicroServiceControllerTest {
 				+ " \"version\": \"\",\"createdBy\": \"someone\",	\"modifiedBy\": \"someone\",	\"content\": \"\",\"recursive\": false},"
 				+ " \"tempModel\": {\"name\": \"testingdata\",\"subScopename\": \"\"	},"
 				+ " \"policy\": {\"policyType\": \"Config\",\"configPolicyType\": \"Micro Service\",\"policyName\": \"may1501\", "
-				+ "	\"policyDescription\": \"testing input\", \"ecompName\": \"RaviTest\",\"guard\": \"False\",\"riskType\": \"Risk12345\",\"riskLevel\": \"2\","
+				+ "	\"policyDescription\": \"testing input\", \"onapName\": \"RaviTest\",\"guard\": \"False\",\"riskType\": \"Risk12345\",\"riskLevel\": \"2\","
 				+ "	\"priority\": \"6\",\"serviceType\": \"DkatPolicyBody\",\"version\": \"1707.41.02\",\"ruleGridData\": [	[\"fileId\"]],\"ttlDate\": null}}, "
 				+ "	\"policyJSON\": {\"pmTableName\": \"test\",	\"dmdTopic\": \"1\",\"fileId\": \"56\"} }";
 
diff --git a/POLICY-SDK-APP/src/test/java/org/openecomp/policy/controller/PDPControllerTest.java b/POLICY-SDK-APP/src/test/java/org/onap/policy/controller/PDPControllerTest.java
index a27ad4b57..55a2288c7 100644
--- a/POLICY-SDK-APP/src/test/java/org/openecomp/policy/controller/PDPControllerTest.java
+++ b/POLICY-SDK-APP/src/test/java/org/onap/policy/controller/PDPControllerTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.controller;
+package org.onap.policy.controller;
 
 import static org.junit.Assert.assertTrue;
 
@@ -32,12 +32,12 @@ import javax.servlet.http.HttpServletRequest;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.model.Roles;
-import org.openecomp.policy.xacml.api.pap.EcompPDPGroup;
-import org.openecomp.policy.xacml.std.pap.StdPDPGroup;
-import org.openecomp.policy.xacml.std.pap.StdPDPGroupStatus;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.model.Roles;
+import org.onap.policy.xacml.api.pap.OnapPDPGroup;
+import org.onap.policy.xacml.std.pap.StdPDPGroup;
+import org.onap.policy.xacml.std.pap.StdPDPGroupStatus;
 import org.springframework.mock.web.MockHttpServletResponse;
 
 
@@ -45,7 +45,7 @@ import org.springframework.mock.web.MockHttpServletResponse;
 public class PDPControllerTest extends Mockito{
 
 	private static Logger logger = FlexLogger.getLogger(PDPControllerTest.class);
-	private Set<EcompPDPGroup> groupsData;
+	private Set<OnapPDPGroup> groupsData;
 	private Set<StdPDPGroup> groups;
 	private static List<Object> rolesdata;
 	
@@ -72,7 +72,7 @@ public class PDPControllerTest extends Mockito{
 		group.setStatus(new StdPDPGroupStatus());
 		groups.add(group);
 		groupsData = new HashSet<>();
-		for (EcompPDPGroup g : this.groups) {
+		for (OnapPDPGroup g : this.groups) {
 			groupsData.add(g);
 		}
 	}
diff --git a/POLICY-SDK-APP/src/test/java/org/openecomp/policy/controller/PolicyControllerTest.java b/POLICY-SDK-APP/src/test/java/org/onap/policy/controller/PolicyControllerTest.java
index 73f8d755a..817a624b7 100644
--- a/POLICY-SDK-APP/src/test/java/org/openecomp/policy/controller/PolicyControllerTest.java
+++ b/POLICY-SDK-APP/src/test/java/org/onap/policy/controller/PolicyControllerTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.controller;
+package org.onap.policy.controller;
 
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -28,10 +28,10 @@ import java.util.List;
 import org.apache.commons.io.IOUtils;
 import org.junit.Before;
 import org.junit.Test;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.rest.dao.CommonClassDao;
-import org.openecomp.policy.rest.jpa.PolicyEntity;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.rest.dao.CommonClassDao;
+import org.onap.policy.rest.jpa.PolicyEntity;
 
 public class PolicyControllerTest {
 
diff --git a/POLICY-SDK-APP/src/test/resources/Action_TestActionPolicy.1.xml b/POLICY-SDK-APP/src/test/resources/Action_TestActionPolicy.1.xml
index 77c9367aa..82f02e0ff 100644
--- a/POLICY-SDK-APP/src/test/resources/Action_TestActionPolicy.1.xml
+++ b/POLICY-SDK-APP/src/test/resources/Action_TestActionPolicy.1.xml
@@ -4,7 +4,7 @@
      <Target>
          <AnyOf>
              <AllOf>
-                 <Match MatchId="org.openecomp.function.regex-match">
+                 <Match MatchId="org.onap.function.regex-match">
                      <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">12</AttributeValue>
                      <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="SamplTest" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                  </Match>
diff --git a/POLICY-SDK-APP/src/test/resources/Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.xml b/POLICY-SDK-APP/src/test/resources/Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.xml
index ddf1864e4..d66704920 100644
--- a/POLICY-SDK-APP/src/test/resources/Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.xml
+++ b/POLICY-SDK-APP/src/test/resources/Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.xml
@@ -4,33 +4,33 @@
     <Target>
         <AnyOf>
             <AllOf>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">com.Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.xml</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="PolicyName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
             </AllOf>
             <AllOf>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">DROOLS</AttributeValue>
-                    <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ECOMPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
+                    <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ONAPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">BRMS_PARAM_RULE</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ConfigName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">SampleRiskType</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="RiskType" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">1</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="RiskLevel" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">False</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="guard" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">08-06-2017</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="TTLDate" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
@@ -66,7 +66,7 @@
                 <AttributeAssignmentExpression AttributeId="VersionNumber" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">1</AttributeValue>
                 </AttributeAssignmentExpression>
-                <AttributeAssignmentExpression AttributeId="matching:ECOMPName" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
+                <AttributeAssignmentExpression AttributeId="matching:ONAPName" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">DROOLS</AttributeValue>
                 </AttributeAssignmentExpression>
                 <AttributeAssignmentExpression AttributeId="matching:ConfigName" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
diff --git a/POLICY-SDK-APP/src/test/resources/Config_BRMS_Raw_TestBRMSRawPolicy.1.xml b/POLICY-SDK-APP/src/test/resources/Config_BRMS_Raw_TestBRMSRawPolicy.1.xml
index aa8abc4c9..e9b38cc13 100644
--- a/POLICY-SDK-APP/src/test/resources/Config_BRMS_Raw_TestBRMSRawPolicy.1.xml
+++ b/POLICY-SDK-APP/src/test/resources/Config_BRMS_Raw_TestBRMSRawPolicy.1.xml
@@ -4,33 +4,33 @@
      <Target>
          <AnyOf>
              <AllOf>
-                 <Match MatchId="org.openecomp.function.regex-match">
+                 <Match MatchId="org.onap.function.regex-match">
                      <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">com.Config_BRMS_Raw_TestBRMSRawPolicy.1.xml</AttributeValue>
                      <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="PolicyName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                  </Match>
              </AllOf>
              <AllOf>
-                 <Match MatchId="org.openecomp.function.regex-match">
+                 <Match MatchId="org.onap.function.regex-match">
                      <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">DROOLS</AttributeValue>
-                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ECOMPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
+                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ONAPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                  </Match>
-                 <Match MatchId="org.openecomp.function.regex-match">
+                 <Match MatchId="org.onap.function.regex-match">
                      <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">BRMS_RAW_RULE</AttributeValue>
                      <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ConfigName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                  </Match>
-                 <Match MatchId="org.openecomp.function.regex-match">
+                 <Match MatchId="org.onap.function.regex-match">
                      <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">High</AttributeValue>
                      <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="RiskType" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                  </Match>
-                 <Match MatchId="org.openecomp.function.regex-match">
+                 <Match MatchId="org.onap.function.regex-match">
                      <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">2</AttributeValue>
                      <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="RiskLevel" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                  </Match>
-                 <Match MatchId="org.openecomp.function.regex-match">
+                 <Match MatchId="org.onap.function.regex-match">
                      <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">True</AttributeValue>
                      <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="guard" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                  </Match>
-                 <Match MatchId="org.openecomp.function.regex-match">
+                 <Match MatchId="org.onap.function.regex-match">
                      <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">08-06-2017</AttributeValue>
                      <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="TTLDate" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                  </Match>
@@ -66,7 +66,7 @@
                  <AttributeAssignmentExpression AttributeId="VersionNumber" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
                      <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">1</AttributeValue>
                  </AttributeAssignmentExpression>
-                 <AttributeAssignmentExpression AttributeId="matching:ECOMPName" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
+                 <AttributeAssignmentExpression AttributeId="matching:ONAPName" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
                      <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">DROOLS</AttributeValue>
                  </AttributeAssignmentExpression>
                  <AttributeAssignmentExpression AttributeId="matching:ConfigName" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
@@ -75,7 +75,7 @@
                  <AttributeAssignmentExpression AttributeId="controller:TestController" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
                      <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">{
      "artifactId": "testing",
-     "groupId" : "org.openecomp"
+     "groupId" : "org.onap"
  }</AttributeValue>
                  </AttributeAssignmentExpression>
                  <AttributeAssignmentExpression AttributeId="dependencies:TestBRMSDependency," Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
diff --git a/POLICY-SDK-APP/src/test/resources/Config_FW_TestFireWallPolicy.1.xml b/POLICY-SDK-APP/src/test/resources/Config_FW_TestFireWallPolicy.1.xml
index f334cae46..71e3221cb 100644
--- a/POLICY-SDK-APP/src/test/resources/Config_FW_TestFireWallPolicy.1.xml
+++ b/POLICY-SDK-APP/src/test/resources/Config_FW_TestFireWallPolicy.1.xml
@@ -4,29 +4,29 @@
      <Target>
          <AnyOf>
              <AllOf>
-                 <Match MatchId="org.openecomp.function.regex-match">
+                 <Match MatchId="org.onap.function.regex-match">
                      <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">com.Config_FW_TestFireWallPolicy.1.xml</AttributeValue>
                      <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="PolicyName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                  </Match>
              </AllOf>
              <AllOf>
-                 <Match MatchId="org.openecomp.function.regex-match">
+                 <Match MatchId="org.onap.function.regex-match">
                      <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">TestFireWallPolicy</AttributeValue>
                      <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ConfigName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                  </Match>
-                 <Match MatchId="org.openecomp.function.regex-match">
+                 <Match MatchId="org.onap.function.regex-match">
                      <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">SampleRiskType</AttributeValue>
                      <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="RiskType" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                  </Match>
-                 <Match MatchId="org.openecomp.function.regex-match">
+                 <Match MatchId="org.onap.function.regex-match">
                      <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">1</AttributeValue>
                      <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="RiskLevel" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                  </Match>
-                 <Match MatchId="org.openecomp.function.regex-match">
+                 <Match MatchId="org.onap.function.regex-match">
                      <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">True</AttributeValue>
                      <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="guard" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                  </Match>
-                 <Match MatchId="org.openecomp.function.regex-match">
+                 <Match MatchId="org.onap.function.regex-match">
                      <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">08-06-2017</AttributeValue>
                      <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="TTLDate" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                  </Match>
@@ -62,7 +62,7 @@
                  <AttributeAssignmentExpression AttributeId="VersionNumber" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
                      <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">1</AttributeValue>
                  </AttributeAssignmentExpression>
-                 <AttributeAssignmentExpression AttributeId="matching:ECOMPName" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
+                 <AttributeAssignmentExpression AttributeId="matching:ONAPName" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
                      <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string"/>
                  </AttributeAssignmentExpression>
                  <AttributeAssignmentExpression AttributeId="matching:ConfigName" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
diff --git a/POLICY-SDK-APP/src/test/resources/Config_Fault_TestClosedLoopPolicy.1.xml b/POLICY-SDK-APP/src/test/resources/Config_Fault_TestClosedLoopPolicy.1.xml
index 82be3420e..faeed916c 100644
--- a/POLICY-SDK-APP/src/test/resources/Config_Fault_TestClosedLoopPolicy.1.xml
+++ b/POLICY-SDK-APP/src/test/resources/Config_Fault_TestClosedLoopPolicy.1.xml
@@ -4,29 +4,29 @@
      <Target>
          <AnyOf>
              <AllOf>
-                 <Match MatchId="org.openecomp.function.regex-match">
+                 <Match MatchId="org.onap.function.regex-match">
                      <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">com.Config_Fault_TestClosedLoopPolicy.1.xml</AttributeValue>
                      <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="PolicyName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                  </Match>
              </AllOf>
              <AllOf>
-                 <Match MatchId="org.openecomp.function.regex-match">
+                 <Match MatchId="org.onap.function.regex-match">
                      <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">DCAE</AttributeValue>
-                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ECOMPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
+                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ONAPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                  </Match>
-                 <Match MatchId="org.openecomp.function.regex-match">
+                 <Match MatchId="org.onap.function.regex-match">
                      <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">SampleRiskType</AttributeValue>
                      <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="RiskType" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                  </Match>
-                 <Match MatchId="org.openecomp.function.regex-match">
+                 <Match MatchId="org.onap.function.regex-match">
                      <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">1</AttributeValue>
                      <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="RiskLevel" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                  </Match>
-                 <Match MatchId="org.openecomp.function.regex-match">
+                 <Match MatchId="org.onap.function.regex-match">
                      <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">True</AttributeValue>
                      <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="guard" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                  </Match>
-                 <Match MatchId="org.openecomp.function.regex-match">
+                 <Match MatchId="org.onap.function.regex-match">
                      <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">07-06-2017</AttributeValue>
                      <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="TTLDate" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                  </Match>
@@ -62,7 +62,7 @@
                  <AttributeAssignmentExpression AttributeId="VersionNumber" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
                      <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">1</AttributeValue>
                  </AttributeAssignmentExpression>
-                 <AttributeAssignmentExpression AttributeId="matching:ECOMPName" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
+                 <AttributeAssignmentExpression AttributeId="matching:ONAPName" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
                      <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">DCAE</AttributeValue>
                  </AttributeAssignmentExpression>
                  <AttributeAssignmentExpression AttributeId="RiskType" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
diff --git a/POLICY-SDK-APP/src/test/resources/Config_MS_vFirewall.1.xml b/POLICY-SDK-APP/src/test/resources/Config_MS_vFirewall.1.xml
index 4fd0b7b5c..ba3d9c215 100644
--- a/POLICY-SDK-APP/src/test/resources/Config_MS_vFirewall.1.xml
+++ b/POLICY-SDK-APP/src/test/resources/Config_MS_vFirewall.1.xml
@@ -4,45 +4,45 @@
     <Target>
         <AnyOf>
             <AllOf>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">com.Config_MS_vFirewall.1.xml</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="PolicyName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
             </AllOf>
             <AllOf>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">DCAE</AttributeValue>
-                    <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ECOMPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
+                    <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ONAPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">SampleConfigName</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ConfigName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">TcaMetrics-v1.0.0.5</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="service" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">/services/cdap-tca-hi-lo/instances/demo/configuration/metricsPerFunctionalRole/vFirewall</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="uuid" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">SampleServiceLocation</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="location" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">SampleRiskType</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="RiskType" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">1</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="RiskLevel" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">False</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="guard" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">07-06-2017</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="TTLDate" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
@@ -78,7 +78,7 @@
                 <AttributeAssignmentExpression AttributeId="VersionNumber" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">1</AttributeValue>
                 </AttributeAssignmentExpression>
-                <AttributeAssignmentExpression AttributeId="matching:ECOMPName" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
+                <AttributeAssignmentExpression AttributeId="matching:ONAPName" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">DCAE</AttributeValue>
                 </AttributeAssignmentExpression>
                 <AttributeAssignmentExpression AttributeId="matching:ConfigName" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
diff --git a/POLICY-SDK-APP/src/test/resources/Config_PM_TestClosedLoopPMPolicy.1.xml b/POLICY-SDK-APP/src/test/resources/Config_PM_TestClosedLoopPMPolicy.1.xml
index ca56cf4f7..370ff365f 100644
--- a/POLICY-SDK-APP/src/test/resources/Config_PM_TestClosedLoopPMPolicy.1.xml
+++ b/POLICY-SDK-APP/src/test/resources/Config_PM_TestClosedLoopPMPolicy.1.xml
@@ -4,33 +4,33 @@
      <Target>
          <AnyOf>
              <AllOf>
-                 <Match MatchId="org.openecomp.function.regex-match">
+                 <Match MatchId="org.onap.function.regex-match">
                      <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">com.Config_PM_TestClosedLoopPMPolicy.1.xml</AttributeValue>
                      <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="PolicyName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                  </Match>
              </AllOf>
              <AllOf>
-                 <Match MatchId="org.openecomp.function.regex-match">
+                 <Match MatchId="org.onap.function.regex-match">
                      <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">Test</AttributeValue>
-                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ECOMPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
+                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ONAPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                  </Match>
-                 <Match MatchId="org.openecomp.function.regex-match">
+                 <Match MatchId="org.onap.function.regex-match">
                      <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">SampleRiskType</AttributeValue>
                      <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="RiskType" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                  </Match>
-                 <Match MatchId="org.openecomp.function.regex-match">
+                 <Match MatchId="org.onap.function.regex-match">
                      <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">1</AttributeValue>
                      <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="RiskLevel" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                  </Match>
-                 <Match MatchId="org.openecomp.function.regex-match">
+                 <Match MatchId="org.onap.function.regex-match">
                      <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">True</AttributeValue>
                      <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="guard" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                  </Match>
-                 <Match MatchId="org.openecomp.function.regex-match">
+                 <Match MatchId="org.onap.function.regex-match">
                      <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">08-06-2017</AttributeValue>
                      <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="TTLDate" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                  </Match>
-                 <Match MatchId="org.openecomp.function.regex-match">
+                 <Match MatchId="org.onap.function.regex-match">
                      <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">Registration Failure(Trinity)</AttributeValue>
                      <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ServiceType" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                  </Match>
@@ -66,7 +66,7 @@
                  <AttributeAssignmentExpression AttributeId="VersionNumber" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
                      <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">1</AttributeValue>
                  </AttributeAssignmentExpression>
-                 <AttributeAssignmentExpression AttributeId="matching:ECOMPName" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
+                 <AttributeAssignmentExpression AttributeId="matching:ONAPName" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
                      <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">Test</AttributeValue>
                  </AttributeAssignmentExpression>
                  <AttributeAssignmentExpression AttributeId="matching:ServiceType" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
diff --git a/POLICY-SDK-APP/src/test/resources/Config_SampleTest1206.1.xml b/POLICY-SDK-APP/src/test/resources/Config_SampleTest1206.1.xml
index 5390548d9..dcfd0c5eb 100644
--- a/POLICY-SDK-APP/src/test/resources/Config_SampleTest1206.1.xml
+++ b/POLICY-SDK-APP/src/test/resources/Config_SampleTest1206.1.xml
@@ -4,33 +4,33 @@
     <Target>
         <AnyOf>
             <AllOf>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">com.Config_SampleTest1206.1.xml</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="PolicyName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
             </AllOf>
             <AllOf>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">success</AttributeValue>
-                    <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ECOMPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
+                    <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ONAPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">PROD</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="RiskType" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">1</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="RiskLevel" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">True</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="guard" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">08-06-2017</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="TTLDate" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">SampleTest1206</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ConfigName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
@@ -66,7 +66,7 @@
                 <AttributeAssignmentExpression AttributeId="VersionNumber" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">1</AttributeValue>
                 </AttributeAssignmentExpression>
-                <AttributeAssignmentExpression AttributeId="matching:ECOMPName" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
+                <AttributeAssignmentExpression AttributeId="matching:ONAPName" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">success</AttributeValue>
                 </AttributeAssignmentExpression>
                 <AttributeAssignmentExpression AttributeId="matching:ConfigName" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
diff --git a/POLICY-SDK-APP/src/test/resources/Decision_TestDecisionPolicyWithRuleAlgorithms.1.xml b/POLICY-SDK-APP/src/test/resources/Decision_TestDecisionPolicyWithRuleAlgorithms.1.xml
index 74a0e6842..5e8dcac36 100644
--- a/POLICY-SDK-APP/src/test/resources/Decision_TestDecisionPolicyWithRuleAlgorithms.1.xml
+++ b/POLICY-SDK-APP/src/test/resources/Decision_TestDecisionPolicyWithRuleAlgorithms.1.xml
@@ -4,17 +4,17 @@
      <Target>
          <AnyOf>
              <AllOf>
-                 <Match MatchId="org.openecomp.function.regex-match">
+                 <Match MatchId="org.onap.function.regex-match">
                      <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">com.Decision_TestDecisionPolicyWithRuleAlgorithms.1.xml</AttributeValue>
                      <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="PolicyName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                  </Match>
              </AllOf>
              <AllOf>
-                 <Match MatchId="org.openecomp.function.regex-match">
+                 <Match MatchId="org.onap.function.regex-match">
                      <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">Test</AttributeValue>
-                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ECOMPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
+                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ONAPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                  </Match>
-                 <Match MatchId="org.openecomp.function.regex-match">
+                 <Match MatchId="org.onap.function.regex-match">
                      <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">test</AttributeValue>
                      <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="SamplTest" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                  </Match>
diff --git a/POLICY-SDK-APP/src/test/resources/com.Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.txt b/POLICY-SDK-APP/src/test/resources/com.Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.txt
index 955afbd0f..6ff244ea4 100644
--- a/POLICY-SDK-APP/src/test/resources/com.Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.txt
+++ b/POLICY-SDK-APP/src/test/resources/com.Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.txt
@@ -23,7 +23,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.controlloop;
+package org.onap.policy.controlloop;
 
 import java.util.List;
 import java.util.LinkedList;
@@ -31,59 +31,59 @@ import java.util.Map;
 import java.util.HashMap;
 import java.util.UUID;
 
-import org.openecomp.policy.controlloop.VirtualControlLoopEvent;
-import org.openecomp.policy.controlloop.ControlLoopEventStatus;
-import org.openecomp.policy.controlloop.VirtualControlLoopNotification;
-import org.openecomp.policy.controlloop.ControlLoopNotificationType;
-import org.openecomp.policy.controlloop.ControlLoopOperation;
-import org.openecomp.policy.controlloop.ControlLoopOperationWrapper;
-import org.openecomp.policy.template.demo.ControlLoopException;
+import org.onap.policy.controlloop.VirtualControlLoopEvent;
+import org.onap.policy.controlloop.ControlLoopEventStatus;
+import org.onap.policy.controlloop.VirtualControlLoopNotification;
+import org.onap.policy.controlloop.ControlLoopNotificationType;
+import org.onap.policy.controlloop.ControlLoopOperation;
+import org.onap.policy.controlloop.ControlLoopOperationWrapper;
+import org.onap.policy.template.demo.ControlLoopException;
 
-import org.openecomp.policy.aai.AAINQF199.AAINQF199CloudRegion;
-import org.openecomp.policy.aai.AAINQF199.AAINQF199ExtraProperties;
-import org.openecomp.policy.aai.AAINQF199.AAINQF199ExtraProperty;
-import org.openecomp.policy.aai.AAINQF199.AAINQF199GenericVNF;
-import org.openecomp.policy.aai.AAINQF199.AAINQF199InstanceFilters;
-import org.openecomp.policy.aai.AAINQF199.AAINQF199InventoryResponseItem;
-import org.openecomp.policy.aai.AAINQF199.AAINQF199InventoryResponseItems;
-import org.openecomp.policy.aai.AAINQF199.AAINQF199Manager;
-import org.openecomp.policy.aai.AAINQF199.AAINQF199NamedQuery;
-import org.openecomp.policy.aai.AAINQF199.AAINQF199QueryParameters;
-import org.openecomp.policy.aai.AAINQF199.AAINQF199Request;
-import org.openecomp.policy.aai.AAINQF199.AAINQF199RequestWrapper;
-import org.openecomp.policy.aai.AAINQF199.AAINQF199Response;
-import org.openecomp.policy.aai.AAINQF199.AAINQF199ResponseWrapper;
-import org.openecomp.policy.aai.AAINQF199.AAINQF199ServiceInstance;
-import org.openecomp.policy.aai.AAINQF199.AAINQF199Tenant;
-import org.openecomp.policy.aai.AAINQF199.AAINQF199VfModule;
-import org.openecomp.policy.aai.AAINQF199.AAINQF199VServer;
-import org.openecomp.policy.aai.util.Serialization;
+import org.onap.policy.aai.AAINQF199.AAINQF199CloudRegion;
+import org.onap.policy.aai.AAINQF199.AAINQF199ExtraProperties;
+import org.onap.policy.aai.AAINQF199.AAINQF199ExtraProperty;
+import org.onap.policy.aai.AAINQF199.AAINQF199GenericVNF;
+import org.onap.policy.aai.AAINQF199.AAINQF199InstanceFilters;
+import org.onap.policy.aai.AAINQF199.AAINQF199InventoryResponseItem;
+import org.onap.policy.aai.AAINQF199.AAINQF199InventoryResponseItems;
+import org.onap.policy.aai.AAINQF199.AAINQF199Manager;
+import org.onap.policy.aai.AAINQF199.AAINQF199NamedQuery;
+import org.onap.policy.aai.AAINQF199.AAINQF199QueryParameters;
+import org.onap.policy.aai.AAINQF199.AAINQF199Request;
+import org.onap.policy.aai.AAINQF199.AAINQF199RequestWrapper;
+import org.onap.policy.aai.AAINQF199.AAINQF199Response;
+import org.onap.policy.aai.AAINQF199.AAINQF199ResponseWrapper;
+import org.onap.policy.aai.AAINQF199.AAINQF199ServiceInstance;
+import org.onap.policy.aai.AAINQF199.AAINQF199Tenant;
+import org.onap.policy.aai.AAINQF199.AAINQF199VfModule;
+import org.onap.policy.aai.AAINQF199.AAINQF199VServer;
+import org.onap.policy.aai.util.Serialization;
 
-import org.openecomp.policy.appc.CommonHeader;
-import org.openecomp.policy.appc.Request;
-import org.openecomp.policy.appc.Response;
-import org.openecomp.policy.appc.ResponseCode;
-import org.openecomp.policy.appc.ResponseStatus;
-import org.openecomp.policy.appc.ResponseValue;
+import org.onap.policy.appc.CommonHeader;
+import org.onap.policy.appc.Request;
+import org.onap.policy.appc.Response;
+import org.onap.policy.appc.ResponseCode;
+import org.onap.policy.appc.ResponseStatus;
+import org.onap.policy.appc.ResponseValue;
 
-import org.openecomp.policy.template.demo.EventManager;
-import org.openecomp.policy.vnf.trafficgenerator.PGRequest;
-import org.openecomp.policy.vnf.trafficgenerator.PGStream;
-import org.openecomp.policy.vnf.trafficgenerator.PGStreams;
+import org.onap.policy.template.demo.EventManager;
+import org.onap.policy.vnf.trafficgenerator.PGRequest;
+import org.onap.policy.vnf.trafficgenerator.PGStream;
+import org.onap.policy.vnf.trafficgenerator.PGStreams;
 
-import org.openecomp.policy.mso.MSOManager;
-import org.openecomp.policy.mso.MSORequest;
-import org.openecomp.policy.mso.MSORequestStatus;
-import org.openecomp.policy.mso.MSORequestDetails;
-import org.openecomp.policy.mso.MSOModelInfo;
-import org.openecomp.policy.mso.MSOCloudConfiguration;
-import org.openecomp.policy.mso.MSORequestInfo;
-import org.openecomp.policy.mso.MSORequestParameters;
-import org.openecomp.policy.mso.MSORelatedInstanceListElement;
-import org.openecomp.policy.mso.MSORelatedInstance;
-import org.openecomp.policy.mso.MSOResponse;
+import org.onap.policy.mso.MSOManager;
+import org.onap.policy.mso.MSORequest;
+import org.onap.policy.mso.MSORequestStatus;
+import org.onap.policy.mso.MSORequestDetails;
+import org.onap.policy.mso.MSOModelInfo;
+import org.onap.policy.mso.MSOCloudConfiguration;
+import org.onap.policy.mso.MSORequestInfo;
+import org.onap.policy.mso.MSORequestParameters;
+import org.onap.policy.mso.MSORelatedInstanceListElement;
+import org.onap.policy.mso.MSORelatedInstance;
+import org.onap.policy.mso.MSOResponse;
 
-import org.openecomp.policy.drools.system.PolicyEngine;
+import org.onap.policy.drools.system.PolicyEngine;
 
 //
 // These parameters are required to build the runtime policy
@@ -106,7 +106,7 @@ end
 /*
 *
 * Called once and only once to insert the parameters into working memory for this Closed Loop policy.
-* (Comment SETUP rule out for the first ECOMP opensource release since policy BRMS_GW already puts a Params fact in there)
+* (Comment SETUP rule out for the first ONAP opensource release since policy BRMS_GW already puts a Params fact in there)
 *
 *
 *rule "BRMSParamvFWDemoPolicy.SETUP"
diff --git a/POLICY-SDK-APP/src/test/resources/com.Config_Fault_TestClosedLoopPolicy.1.json b/POLICY-SDK-APP/src/test/resources/com.Config_Fault_TestClosedLoopPolicy.1.json
index f7e25ca47..dbd3649c0 100644
--- a/POLICY-SDK-APP/src/test/resources/com.Config_Fault_TestClosedLoopPolicy.1.json
+++ b/POLICY-SDK-APP/src/test/resources/com.Config_Fault_TestClosedLoopPolicy.1.json
@@ -1 +1 @@
-{"trinity":false,"vUSP":true,"mcr":false,"gama":false,"vDNS":false,"vnfType":"SampleVNF","vServices":null,"closedLoopPolicyStatus":"Active","triggerSignatures":{"signatures":"((NOT(NOT(1.0.2.3)AND(1.0.2.3)), Time = 11)AND((NOT(1.0.2.3)AND(1.0.2.3)), Time = 12))","timeWindow":11,"trapMaxAge":12},"actions":"SampleVSCL","timeInterval":11,"timeOutvPRO":11,"timeOutRuby":11,"retrys":1,"agingWindow":1,"geoLink":"TEST","emailAddress":"aa@test.con","verificationSignatures":{"signatures":"(NOT(1.0.2.3)AND(1.0.2.3))","timeWindow":12},"conditions":"SEND","triggerSignaturesUsedForUI":{"signatures":"NOT@!SampleVarbind@!AND@!SampleVarbind#!?!NOT@!SampleVarbind@!OR@!SampleVarbind#!NOT@!A1@!AND@!SampleVarbind#!NOT@!A1@!AND@!A2#!?!","connectSignatures":"NOT@!Trap1@!11@!AND@!Trap1@!12#!?!"},"verificationSignaturesUsedForUI":{"signatures":"NOT@!SampleVarbind@!AND@!SampleVarbind#!?!","connectSignatures":null},"triggerTimeWindowUsedForUI":11,"verfificationTimeWindowUsedForUI":12,"pepName":null,"pepAction":null,"templateVersion":null,"trapMaxAgeUsedForUI":12,"ecompname":null}
+{"trinity":false,"vUSP":true,"mcr":false,"gama":false,"vDNS":false,"vnfType":"SampleVNF","vServices":null,"closedLoopPolicyStatus":"Active","triggerSignatures":{"signatures":"((NOT(NOT(1.0.2.3)AND(1.0.2.3)), Time = 11)AND((NOT(1.0.2.3)AND(1.0.2.3)), Time = 12))","timeWindow":11,"trapMaxAge":12},"actions":"SampleVSCL","timeInterval":11,"timeOutvPRO":11,"timeOutRuby":11,"retrys":1,"agingWindow":1,"geoLink":"TEST","emailAddress":"aa@test.con","verificationSignatures":{"signatures":"(NOT(1.0.2.3)AND(1.0.2.3))","timeWindow":12},"conditions":"SEND","triggerSignaturesUsedForUI":{"signatures":"NOT@!SampleVarbind@!AND@!SampleVarbind#!?!NOT@!SampleVarbind@!OR@!SampleVarbind#!NOT@!A1@!AND@!SampleVarbind#!NOT@!A1@!AND@!A2#!?!","connectSignatures":"NOT@!Trap1@!11@!AND@!Trap1@!12#!?!"},"verificationSignaturesUsedForUI":{"signatures":"NOT@!SampleVarbind@!AND@!SampleVarbind#!?!","connectSignatures":null},"triggerTimeWindowUsedForUI":11,"verfificationTimeWindowUsedForUI":12,"pepName":null,"pepAction":null,"templateVersion":null,"trapMaxAgeUsedForUI":12,"onapname":null}
diff --git a/POLICY-SDK-APP/src/test/resources/logback.xml b/POLICY-SDK-APP/src/test/resources/logback.xml
index b119a4e3b..3e5f1b6a6 100644
--- a/POLICY-SDK-APP/src/test/resources/logback.xml
+++ b/POLICY-SDK-APP/src/test/resources/logback.xml
@@ -1,6 +1,6 @@
 <!--
   ============LICENSE_START=======================================================
-  ECOMP-PAP-REST
+  ONAP-PAP-REST
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
   ================================================================================
@@ -27,7 +27,7 @@
   <property name="debugDir" value="logs" />
   
   <!--  specify the component name 
-    <ECOMP-component-name>::= "MSO" | "DCAE" | "ASDC " | "AAI" |"Policy" | "SDNC" | "AC"  -->
+    <ONAP-component-name>::= "MSO" | "DCAE" | "ASDC " | "AAI" |"Policy" | "SDNC" | "AC"  -->
   <property name="componentName" value="Policy"></property>
   <property name="subComponentName" value="XACML-PAP-REST"></property>
   
diff --git a/POLICY-SDK-APP/src/test/resources/schedulerPolicies1707.xmi b/POLICY-SDK-APP/src/test/resources/schedulerPolicies1707.xmi
index 22afa23a2..2288ae718 100644
--- a/POLICY-SDK-APP/src/test/resources/schedulerPolicies1707.xmi
+++ b/POLICY-SDK-APP/src/test/resources/schedulerPolicies1707.xmi
@@ -2,61 +2,61 @@
 Content-Disposition: form-data; name="file"; filename="schedulerPolicies1707.xmi"
 
 <?xml version="1.0" encoding="ASCII"?>
-<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="scheduler" nsURI="org.ecomp.test.scheduler" nsPrefix="scheduler">
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="scheduler" nsURI="org.onap.test.scheduler" nsPrefix="scheduler">
   <eAnnotations source="http://www.eclipse.org/emf/2011/Xcore">
-    <details key="ecomp" value="http://ecomp.org.com"/>
-    <details key="policy" value="http://ecomp.org.com/policy"/>
+    <details key="onap" value="http://onap.org.com"/>
+    <details key="policy" value="http://onap.org.com/policy"/>
   </eAnnotations>
   <eClassifiers xsi:type="ecore:EClass" name="TimeLimitAndVerticalTopology" eSuperTypes="//SniroPolicyMetaInfo">
-    <eAnnotations source="http://ecomp.org.com/policy">
+    <eAnnotations source="http://onap.org.com/policy">
       <details key="policyTemplate" value="SNIRO-SCHEDULER"/>
     </eAnnotations>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" unique="false" eType="//TimeLimitNVerticalTopologyType">
-      <eAnnotations source="http://ecomp.org.com/policy">
+      <eAnnotations source="http://onap.org.com/policy">
         <details key="matching" value="true"/>
       </eAnnotations>
-      <eAnnotations source="http://ecomp.org.com">
+      <eAnnotations source="http://onap.org.com">
         <details key="type" value="configuration"/>
       </eAnnotations>
     </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="serviceType" unique="false">
-      <eAnnotations source="http://ecomp.org.com">
+      <eAnnotations source="http://onap.org.com">
         <details key="type" value="configuration"/>
       </eAnnotations>
       <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="nodeType" unique="false" upperBound="-1" eType="//EntityType">
-      <eAnnotations source="http://ecomp.org.com">
+      <eAnnotations source="http://onap.org.com">
         <details key="type" value="configuration"/>
       </eAnnotations>
     </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="conflictScope" unique="false" eType="//ConflictScope">
-      <eAnnotations source="http://ecomp.org.com">
+      <eAnnotations source="http://onap.org.com">
         <details key="type" value="configuration"/>
       </eAnnotations>
     </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EReference" name="timeSchedule" eType="//TimeSchedule" containment="true" resolveProxies="false">
-      <eAnnotations source="http://ecomp.org.com">
+      <eAnnotations source="http://onap.org.com">
         <details key="type" value="configuration"/>
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="TimeSchedule">
     <eStructuralFeatures xsi:type="ecore:EReference" name="allowedPeriodicTime" upperBound="-1" eType="//AllowedPeriodicTime" containment="true" resolveProxies="false">
-      <eAnnotations source="http://ecomp.org.com">
+      <eAnnotations source="http://onap.org.com">
         <details key="type" value="configuration"/>
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="TimeRange">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="start_time" unique="false">
-      <eAnnotations source="http://ecomp.org.com">
+      <eAnnotations source="http://onap.org.com">
         <details key="type" value="configuration"/>
       </eAnnotations>
       <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="end_time" unique="false">
-      <eAnnotations source="http://ecomp.org.com">
+      <eAnnotations source="http://onap.org.com">
         <details key="type" value="configuration"/>
       </eAnnotations>
       <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
@@ -64,48 +64,48 @@ Content-Disposition: form-data; name="file"; filename="schedulerPolicies1707.xmi
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="AllowedPeriodicTime">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="day" unique="false" eType="//DayType">
-      <eAnnotations source="http://ecomp.org.com">
+      <eAnnotations source="http://onap.org.com">
         <details key="type" value="configuration"/>
       </eAnnotations>
     </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EReference" name="timeRange" upperBound="-1" eType="//TimeRange" containment="true" resolveProxies="false">
-      <eAnnotations source="http://ecomp.org.com">
+      <eAnnotations source="http://onap.org.com">
         <details key="type" value="configuration"/>
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="SniroPolicyMetaInfo">
-    <eAnnotations source="http://ecomp.org.com/policy">
+    <eAnnotations source="http://onap.org.com/policy">
       <details key="policyTemplate" value="SNIRO"/>
     </eAnnotations>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="identity" unique="false">
-      <eAnnotations source="http://ecomp.org.com">
+      <eAnnotations source="http://onap.org.com">
         <details key="type" value="configuration"/>
       </eAnnotations>
       <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EReference" name="policyScope" eType="//Scope" containment="true" resolveProxies="false">
-      <eAnnotations source="http://ecomp.org.com/policy">
+      <eAnnotations source="http://onap.org.com/policy">
         <details key="matching" value="true"/>
       </eAnnotations>
-      <eAnnotations source="http://ecomp.org.com">
+      <eAnnotations source="http://onap.org.com">
         <details key="type" value="configuration"/>
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Scope">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="serviceType" unique="false" upperBound="-1" eType="//ServiceType">
-      <eAnnotations source="http://ecomp.org.com">
+      <eAnnotations source="http://onap.org.com">
         <details key="type" value="configuration"/>
       </eAnnotations>
     </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="entityType" unique="false" upperBound="-1" eType="//EntityType">
-      <eAnnotations source="http://ecomp.org.com">
+      <eAnnotations source="http://onap.org.com">
         <details key="type" value="configuration"/>
       </eAnnotations>
     </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="aicZone" unique="false" upperBound="-1">
-      <eAnnotations source="http://ecomp.org.com">
+      <eAnnotations source="http://onap.org.com">
         <details key="type" value="configuration"/>
       </eAnnotations>
       <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
diff --git a/PolicyEngineAPI/Test/PDP_settings/test_PolicyEngine.xml b/PolicyEngineAPI/Test/PDP_settings/test_PolicyEngine.xml
index 343ec7c55..4eebf154f 100644
--- a/PolicyEngineAPI/Test/PDP_settings/test_PolicyEngine.xml
+++ b/PolicyEngineAPI/Test/PDP_settings/test_PolicyEngine.xml
@@ -28,14 +28,14 @@
             <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:integer-greater-than">
                 <Description>CPU</Description>
                 <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:integer-one-and-only">
-                    <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="com:att:labs:ecomp:resource:vm:cpu" DataType="http://www.w3.org/2001/XMLSchema#integer" MustBePresent="true"/>
+                    <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="com:att:labs:onap:resource:vm:cpu" DataType="http://www.w3.org/2001/XMLSchema#integer" MustBePresent="true"/>
                 </Apply>
                 <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#integer">95</AttributeValue>
             </Apply>
             <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:integer-greater-than">
                 <Description>Memory</Description>
                 <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:integer-one-and-only">
-                    <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="com:att:labs:ecomp:resource:vm:memory" DataType="http://www.w3.org/2001/XMLSchema#integer" MustBePresent="true"/>
+                    <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="com:att:labs:onap:resource:vm:memory" DataType="http://www.w3.org/2001/XMLSchema#integer" MustBePresent="true"/>
                 </Apply>
                 <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#integer">95</AttributeValue>
             </Apply>
@@ -47,14 +47,14 @@
             <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:integer-greater-than">
                 <Description>CPU</Description>
                 <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:integer-one-and-only">
-                    <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="com:att:labs:ecomp:resource:vm:cpu" DataType="http://www.w3.org/2001/XMLSchema#integer" MustBePresent="true"/>
+                    <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="com:att:labs:onap:resource:vm:cpu" DataType="http://www.w3.org/2001/XMLSchema#integer" MustBePresent="true"/>
                 </Apply>
                 <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#integer">90</AttributeValue>
             </Apply>
             <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:integer-greater-than">
                 <Description>Memory</Description>
                 <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:integer-one-and-only">
-                    <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="com:att:labs:ecomp:resource:vm:memory" DataType="http://www.w3.org/2001/XMLSchema#integer" MustBePresent="true"/>
+                    <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="com:att:labs:onap:resource:vm:memory" DataType="http://www.w3.org/2001/XMLSchema#integer" MustBePresent="true"/>
                 </Apply>
                 <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#integer">90</AttributeValue>
             </Apply>
@@ -81,11 +81,11 @@
             </AnyOf>
         </Target>
         <AdviceExpressions>
-            <AdviceExpression AdviceId="com.att.labs.ecomp.advice.config" AppliesTo="Permit">
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+            <AdviceExpression AdviceId="com.att.labs.onap.advice.config" AppliesTo="Permit">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">Configuration</AttributeValue>
                 </AttributeAssignmentExpression>
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#anyURI">http://localhost:5443/config/test_json.json</AttributeValue>
                 </AttributeAssignmentExpression>
             </AdviceExpression>
@@ -116,11 +116,11 @@
             </AnyOf>
         </Target>
         <AdviceExpressions>
-            <AdviceExpression AdviceId="com.att.labs.ecomp.advice.config" AppliesTo="Permit">
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+            <AdviceExpression AdviceId="com.att.labs.onap.advice.config" AppliesTo="Permit">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">Configuration</AttributeValue>
                 </AttributeAssignmentExpression>
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#anyURI">http://localhost:5443/config/test_json.json</AttributeValue>
                 </AttributeAssignmentExpression>
             </AdviceExpression>
@@ -147,11 +147,11 @@
             </AnyOf>
         </Target>
         <AdviceExpressions>
-            <AdviceExpression AdviceId="com.att.labs.ecomp.advice.config" AppliesTo="Permit">
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+            <AdviceExpression AdviceId="com.att.labs.onap.advice.config" AppliesTo="Permit">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">Configuration</AttributeValue>
                 </AttributeAssignmentExpression>
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#anyURI">http://localhost:5443/config/test_xml.xml</AttributeValue>
                 </AttributeAssignmentExpression>
             </AdviceExpression>
@@ -182,11 +182,11 @@
             </AnyOf>
         </Target>
         <AdviceExpressions>
-            <AdviceExpression AdviceId="com.att.labs.ecomp.advice.config" AppliesTo="Permit">
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+            <AdviceExpression AdviceId="com.att.labs.onap.advice.config" AppliesTo="Permit">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">Configuration</AttributeValue>
                 </AttributeAssignmentExpression>
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#anyURI">http://localhost:5443/config/test_xml.xml</AttributeValue>
                 </AttributeAssignmentExpression>
             </AdviceExpression>
@@ -213,11 +213,11 @@
             </AnyOf>
         </Target>
         <AdviceExpressions>
-            <AdviceExpression AdviceId="com.att.labs.ecomp.advice.config" AppliesTo="Permit">
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+            <AdviceExpression AdviceId="com.att.labs.onap.advice.config" AppliesTo="Permit">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">Configuration</AttributeValue>
                 </AttributeAssignmentExpression>
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#anyURI">http://localhost:5443/config/test_prop.properties</AttributeValue>
                 </AttributeAssignmentExpression>
             </AdviceExpression>
@@ -248,11 +248,11 @@
             </AnyOf>
         </Target>
         <AdviceExpressions>
-            <AdviceExpression AdviceId="com.att.labs.ecomp.advice.config" AppliesTo="Permit">
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+            <AdviceExpression AdviceId="com.att.labs.onap.advice.config" AppliesTo="Permit">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">Configuration</AttributeValue>
                 </AttributeAssignmentExpression>
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#anyURI">http://localhost:5443/config/test_prop.properties</AttributeValue>
                 </AttributeAssignmentExpression>
             </AdviceExpression>
@@ -279,11 +279,11 @@
             </AnyOf>
         </Target>
         <AdviceExpressions>
-            <AdviceExpression AdviceId="com.att.labs.ecomp.advice.config" AppliesTo="Permit">
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+            <AdviceExpression AdviceId="com.att.labs.onap.advice.config" AppliesTo="Permit">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">Configuration</AttributeValue>
                 </AttributeAssignmentExpression>
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#anyURI">http://localhost:5443/config/test_other.txt</AttributeValue>
                 </AttributeAssignmentExpression>
             </AdviceExpression>
@@ -314,11 +314,11 @@
             </AnyOf>
         </Target>
         <AdviceExpressions>
-            <AdviceExpression AdviceId="com.att.labs.ecomp.advice.config" AppliesTo="Permit">
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+            <AdviceExpression AdviceId="com.att.labs.onap.advice.config" AppliesTo="Permit">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">Configuration</AttributeValue>
                 </AttributeAssignmentExpression>
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#anyURI">http://localhost:5443/config/test_other.txt</AttributeValue>
                 </AttributeAssignmentExpression>
             </AdviceExpression>
@@ -361,11 +361,11 @@
             </AnyOf>
         </Target>
         <AdviceExpressions>
-            <AdviceExpression AdviceId="com.att.labs.ecomp.advice.config" AppliesTo="Permit">
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+            <AdviceExpression AdviceId="com.att.labs.onap.advice.config" AppliesTo="Permit">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">Configuration</AttributeValue>
                 </AttributeAssignmentExpression>
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#anyURI">http://localhost:5443/config/test_json.json</AttributeValue>
                 </AttributeAssignmentExpression>
             </AdviceExpression>
@@ -408,11 +408,11 @@
             </AnyOf>
         </Target>
         <AdviceExpressions>
-            <AdviceExpression AdviceId="com.att.labs.ecomp.advice.config" AppliesTo="Permit">
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+            <AdviceExpression AdviceId="com.att.labs.onap.advice.config" AppliesTo="Permit">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">Configuration</AttributeValue>
                 </AttributeAssignmentExpression>
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#anyURI">http://localhost:5443/config/test_xml.xml</AttributeValue>
                 </AttributeAssignmentExpression>
             </AdviceExpression>
@@ -455,11 +455,11 @@
             </AnyOf>
         </Target>
         <AdviceExpressions>
-            <AdviceExpression AdviceId="com.att.labs.ecomp.advice.config" AppliesTo="Permit">
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+            <AdviceExpression AdviceId="com.att.labs.onap.advice.config" AppliesTo="Permit">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">Configuration</AttributeValue>
                 </AttributeAssignmentExpression>
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#anyURI">http://localhost:5443/config/test_prop.properties</AttributeValue>
                 </AttributeAssignmentExpression>
             </AdviceExpression>
@@ -502,11 +502,11 @@
             </AnyOf>
         </Target>
         <AdviceExpressions>
-            <AdviceExpression AdviceId="com.att.labs.ecomp.advice.config" AppliesTo="Permit">
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+            <AdviceExpression AdviceId="com.att.labs.onap.advice.config" AppliesTo="Permit">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">Configuration</AttributeValue>
                 </AttributeAssignmentExpression>
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#anyURI">http://localhost:5443/config/test_other.txt</AttributeValue>
                 </AttributeAssignmentExpression>
             </AdviceExpression>
@@ -536,12 +536,12 @@
             </Apply>
         </Condition>
         <ObligationExpressions>
-            <ObligationExpression ObligationId="com.att.labs.ecomp.obligation" FulfillOn="Permit">
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.obligation.restart" Category="urn:oasis:names:tc:xacml:1.0:subject-category:recipient-subject">
+            <ObligationExpression ObligationId="com.att.labs.onap.obligation" FulfillOn="Permit">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.obligation.restart" Category="urn:oasis:names:tc:xacml:1.0:subject-category:recipient-subject">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">Restart</AttributeValue>
                 </AttributeAssignmentExpression>
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.obligation.server" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
-                    <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="com:att:labs:ecomp:resource:server:name" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="true"/>
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.obligation.server" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+                    <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="com:att:labs:onap:resource:server:name" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="true"/>
                 </AttributeAssignmentExpression>
             </ObligationExpression>
         </ObligationExpressions>
@@ -566,8 +566,8 @@
             </Apply>
         </Condition>
         <ObligationExpressions>
-            <ObligationExpression ObligationId="com.att.labs.ecomp.obligation" FulfillOn="Permit">
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.obligation.spinoff" Category="urn:oasis:names:tc:xacml:1.0:subject-category:recipient-subject">
+            <ObligationExpression ObligationId="com.att.labs.onap.obligation" FulfillOn="Permit">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.obligation.spinoff" Category="urn:oasis:names:tc:xacml:1.0:subject-category:recipient-subject">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">SpinOff</AttributeValue>
                 </AttributeAssignmentExpression>
 				<AttributeAssignmentExpression AttributeId="performer" Category="urn:oasis:names:tc:xacml:1.0:subject-category:recipient-subject">
@@ -576,14 +576,14 @@
                 <AttributeAssignmentExpression AttributeId="type" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">REST</AttributeValue>
                 </AttributeAssignmentExpression>
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.obligation.server" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
-                    <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="com:att:labs:ecomp:resource:server:name" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="true"/>
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.obligation.server" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+                    <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="com:att:labs:onap:resource:server:name" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="true"/>
                 </AttributeAssignmentExpression>
 				<AttributeAssignmentExpression AttributeId="method" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">GET</AttributeValue>
                 </AttributeAssignmentExpression>
 				<AttributeAssignmentExpression AttributeId="URL" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
-                    <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#anyURI">http://localhost:8635/RESTjson/PDP/VM/$com.att.labs.ecomp.obligation.spinoff/$com.att.labs.ecomp.obligation.server</AttributeValue>
+                    <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#anyURI">http://localhost:8635/RESTjson/PDP/VM/$com.att.labs.onap.obligation.spinoff/$com.att.labs.onap.obligation.server</AttributeValue>
                 </AttributeAssignmentExpression>
             </ObligationExpression>
         </ObligationExpressions>
diff --git a/PolicyEngineAPI/Test/test_PolicyEngine.xml b/PolicyEngineAPI/Test/test_PolicyEngine.xml
index d83c12a4c..1c1abf19e 100644
--- a/PolicyEngineAPI/Test/test_PolicyEngine.xml
+++ b/PolicyEngineAPI/Test/test_PolicyEngine.xml
@@ -28,14 +28,14 @@
             <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:integer-greater-than">
                 <Description>CPU</Description>
                 <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:integer-one-and-only">
-                    <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="com:att:labs:ecomp:resource:vm:cpu" DataType="http://www.w3.org/2001/XMLSchema#integer" MustBePresent="true"/>
+                    <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="com:att:labs:onap:resource:vm:cpu" DataType="http://www.w3.org/2001/XMLSchema#integer" MustBePresent="true"/>
                 </Apply>
                 <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#integer">95</AttributeValue>
             </Apply>
             <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:integer-greater-than">
                 <Description>Memory</Description>
                 <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:integer-one-and-only">
-                    <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="com:att:labs:ecomp:resource:vm:memory" DataType="http://www.w3.org/2001/XMLSchema#integer" MustBePresent="true"/>
+                    <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="com:att:labs:onap:resource:vm:memory" DataType="http://www.w3.org/2001/XMLSchema#integer" MustBePresent="true"/>
                 </Apply>
                 <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#integer">95</AttributeValue>
             </Apply>
@@ -47,14 +47,14 @@
             <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:integer-greater-than">
                 <Description>CPU</Description>
                 <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:integer-one-and-only">
-                    <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="com:att:labs:ecomp:resource:vm:cpu" DataType="http://www.w3.org/2001/XMLSchema#integer" MustBePresent="true"/>
+                    <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="com:att:labs:onap:resource:vm:cpu" DataType="http://www.w3.org/2001/XMLSchema#integer" MustBePresent="true"/>
                 </Apply>
                 <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#integer">90</AttributeValue>
             </Apply>
             <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:integer-greater-than">
                 <Description>Memory</Description>
                 <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:integer-one-and-only">
-                    <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="com:att:labs:ecomp:resource:vm:memory" DataType="http://www.w3.org/2001/XMLSchema#integer" MustBePresent="true"/>
+                    <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="com:att:labs:onap:resource:vm:memory" DataType="http://www.w3.org/2001/XMLSchema#integer" MustBePresent="true"/>
                 </Apply>
                 <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#integer">90</AttributeValue>
             </Apply>
@@ -81,11 +81,11 @@
             </AnyOf>
         </Target>
         <AdviceExpressions>
-            <AdviceExpression AdviceId="com.att.labs.ecomp.advice.config" AppliesTo="Permit">
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+            <AdviceExpression AdviceId="com.att.labs.onap.advice.config" AppliesTo="Permit">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">Configuration</AttributeValue>
                 </AttributeAssignmentExpression>
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#anyURI">http://10.01.10.01:5443/config/test_json.json</AttributeValue>
                 </AttributeAssignmentExpression>
             </AdviceExpression>
@@ -116,11 +116,11 @@
             </AnyOf>
         </Target>
         <AdviceExpressions>
-            <AdviceExpression AdviceId="com.att.labs.ecomp.advice.config" AppliesTo="Permit">
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+            <AdviceExpression AdviceId="com.att.labs.onap.advice.config" AppliesTo="Permit">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">Configuration</AttributeValue>
                 </AttributeAssignmentExpression>
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#anyURI">http://10.01.10.01:5443/config/test_json.json</AttributeValue>
                 </AttributeAssignmentExpression>
             </AdviceExpression>
@@ -147,11 +147,11 @@
             </AnyOf>
         </Target>
         <AdviceExpressions>
-            <AdviceExpression AdviceId="com.att.labs.ecomp.advice.config" AppliesTo="Permit">
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+            <AdviceExpression AdviceId="com.att.labs.onap.advice.config" AppliesTo="Permit">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">Configuration</AttributeValue>
                 </AttributeAssignmentExpression>
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#anyURI">http://10.01.10.01:5443/config/test_xml.xml</AttributeValue>
                 </AttributeAssignmentExpression>
             </AdviceExpression>
@@ -182,11 +182,11 @@
             </AnyOf>
         </Target>
         <AdviceExpressions>
-            <AdviceExpression AdviceId="com.att.labs.ecomp.advice.config" AppliesTo="Permit">
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+            <AdviceExpression AdviceId="com.att.labs.onap.advice.config" AppliesTo="Permit">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">Configuration</AttributeValue>
                 </AttributeAssignmentExpression>
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#anyURI">http://10.01.10.01:5443/config/test_xml.xml</AttributeValue>
                 </AttributeAssignmentExpression>
             </AdviceExpression>
@@ -213,11 +213,11 @@
             </AnyOf>
         </Target>
         <AdviceExpressions>
-            <AdviceExpression AdviceId="com.att.labs.ecomp.advice.config" AppliesTo="Permit">
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+            <AdviceExpression AdviceId="com.att.labs.onap.advice.config" AppliesTo="Permit">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">Configuration</AttributeValue>
                 </AttributeAssignmentExpression>
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#anyURI">http://10.01.10.01:5443/config/test_prop.properties</AttributeValue>
                 </AttributeAssignmentExpression>
             </AdviceExpression>
@@ -248,11 +248,11 @@
             </AnyOf>
         </Target>
         <AdviceExpressions>
-            <AdviceExpression AdviceId="com.att.labs.ecomp.advice.config" AppliesTo="Permit">
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+            <AdviceExpression AdviceId="com.att.labs.onap.advice.config" AppliesTo="Permit">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">Configuration</AttributeValue>
                 </AttributeAssignmentExpression>
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#anyURI">http://10.01.10.01:5443/config/test_prop.properties</AttributeValue>
                 </AttributeAssignmentExpression>
             </AdviceExpression>
@@ -279,11 +279,11 @@
             </AnyOf>
         </Target>
         <AdviceExpressions>
-            <AdviceExpression AdviceId="com.att.labs.ecomp.advice.config" AppliesTo="Permit">
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+            <AdviceExpression AdviceId="com.att.labs.onap.advice.config" AppliesTo="Permit">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">Configuration</AttributeValue>
                 </AttributeAssignmentExpression>
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#anyURI">http://10.01.10.01:5443/config/test_other.txt</AttributeValue>
                 </AttributeAssignmentExpression>
             </AdviceExpression>
@@ -314,11 +314,11 @@
             </AnyOf>
         </Target>
         <AdviceExpressions>
-            <AdviceExpression AdviceId="com.att.labs.ecomp.advice.config" AppliesTo="Permit">
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+            <AdviceExpression AdviceId="com.att.labs.onap.advice.config" AppliesTo="Permit">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">Configuration</AttributeValue>
                 </AttributeAssignmentExpression>
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#anyURI">http://10.01.10.01:5443/config/test_other.txt</AttributeValue>
                 </AttributeAssignmentExpression>
             </AdviceExpression>
@@ -361,11 +361,11 @@
             </AnyOf>
         </Target>
         <AdviceExpressions>
-            <AdviceExpression AdviceId="com.att.labs.ecomp.advice.config" AppliesTo="Permit">
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+            <AdviceExpression AdviceId="com.att.labs.onap.advice.config" AppliesTo="Permit">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">Configuration</AttributeValue>
                 </AttributeAssignmentExpression>
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#anyURI">http://10.01.10.01:5443/config/test_json.json</AttributeValue>
                 </AttributeAssignmentExpression>
             </AdviceExpression>
@@ -408,11 +408,11 @@
             </AnyOf>
         </Target>
         <AdviceExpressions>
-            <AdviceExpression AdviceId="com.att.labs.ecomp.advice.config" AppliesTo="Permit">
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+            <AdviceExpression AdviceId="com.att.labs.onap.advice.config" AppliesTo="Permit">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">Configuration</AttributeValue>
                 </AttributeAssignmentExpression>
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#anyURI">http://10.01.10.01:5443/config/test_xml.xml</AttributeValue>
                 </AttributeAssignmentExpression>
             </AdviceExpression>
@@ -455,11 +455,11 @@
             </AnyOf>
         </Target>
         <AdviceExpressions>
-            <AdviceExpression AdviceId="com.att.labs.ecomp.advice.config" AppliesTo="Permit">
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+            <AdviceExpression AdviceId="com.att.labs.onap.advice.config" AppliesTo="Permit">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">Configuration</AttributeValue>
                 </AttributeAssignmentExpression>
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#anyURI">http://10.01.10.01:5443/config/test_prop.properties</AttributeValue>
                 </AttributeAssignmentExpression>
             </AdviceExpression>
@@ -502,11 +502,11 @@
             </AnyOf>
         </Target>
         <AdviceExpressions>
-            <AdviceExpression AdviceId="com.att.labs.ecomp.advice.config" AppliesTo="Permit">
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+            <AdviceExpression AdviceId="com.att.labs.onap.advice.config" AppliesTo="Permit">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.key" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">Configuration</AttributeValue>
                 </AttributeAssignmentExpression>
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.advice.value" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#anyURI">http://10.01.10.01:5443/config/test_other.txt</AttributeValue>
                 </AttributeAssignmentExpression>
             </AdviceExpression>
@@ -536,12 +536,12 @@
             </Apply>
         </Condition>
         <ObligationExpressions>
-            <ObligationExpression ObligationId="com.att.labs.ecomp.obligation" FulfillOn="Permit">
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.obligation.restart" Category="urn:oasis:names:tc:xacml:1.0:subject-category:recipient-subject">
+            <ObligationExpression ObligationId="com.att.labs.onap.obligation" FulfillOn="Permit">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.obligation.restart" Category="urn:oasis:names:tc:xacml:1.0:subject-category:recipient-subject">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">Restart</AttributeValue>
                 </AttributeAssignmentExpression>
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.obligation.server" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
-                    <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="com:att:labs:ecomp:resource:server:name" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="true"/>
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.obligation.server" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+                    <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="com:att:labs:onap:resource:server:name" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="true"/>
                 </AttributeAssignmentExpression>
             </ObligationExpression>
         </ObligationExpressions>
@@ -566,8 +566,8 @@
             </Apply>
         </Condition>
         <ObligationExpressions>
-            <ObligationExpression ObligationId="com.att.labs.ecomp.obligation" FulfillOn="Permit">
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.obligation.spinoff" Category="urn:oasis:names:tc:xacml:1.0:subject-category:recipient-subject">
+            <ObligationExpression ObligationId="com.att.labs.onap.obligation" FulfillOn="Permit">
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.obligation.spinoff" Category="urn:oasis:names:tc:xacml:1.0:subject-category:recipient-subject">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">SpinOff</AttributeValue>
                 </AttributeAssignmentExpression>
 				<AttributeAssignmentExpression AttributeId="performer" Category="urn:oasis:names:tc:xacml:1.0:subject-category:recipient-subject">
@@ -576,14 +576,14 @@
                 <AttributeAssignmentExpression AttributeId="type" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">REST</AttributeValue>
                 </AttributeAssignmentExpression>
-                <AttributeAssignmentExpression AttributeId="com.att.labs.ecomp.obligation.server" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
-                    <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="com:att:labs:ecomp:resource:server:name" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="true"/>
+                <AttributeAssignmentExpression AttributeId="com.att.labs.onap.obligation.server" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
+                    <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="com:att:labs:onap:resource:server:name" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="true"/>
                 </AttributeAssignmentExpression>
 				<AttributeAssignmentExpression AttributeId="method" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">GET</AttributeValue>
                 </AttributeAssignmentExpression>
 				<AttributeAssignmentExpression AttributeId="URL" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource">
-                    <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#anyURI">http://localhost:8635/RESTjson/PDP/VM/$org.ecomp.obligation.spinoff/$org.ecomp.obligation.server</AttributeValue>
+                    <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#anyURI">http://localhost:8635/RESTjson/PDP/VM/$org.onap.obligation.spinoff/$org.onap.obligation.server</AttributeValue>
                 </AttributeAssignmentExpression>
             </ObligationExpression>
         </ObligationExpressions>
diff --git a/PolicyEngineAPI/pom.xml b/PolicyEngineAPI/pom.xml
index 60e603bf4..e5af8d7d3 100644
--- a/PolicyEngineAPI/pom.xml
+++ b/PolicyEngineAPI/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   ============LICENSE_START=======================================================
-  ECOMP Policy Engine
+  ONAP Policy Engine
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
   ================================================================================
@@ -24,7 +24,7 @@
 	<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>
@@ -109,8 +109,8 @@
   			</exclusions>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.policy.engine</groupId>
-			<artifactId>ECOMP-XACML</artifactId>
+			<groupId>org.onap.policy.engine</groupId>
+			<artifactId>ONAP-XACML</artifactId>
 			<version>${project.version}</version>
 			<exclusions>
 				<exclusion>
diff --git a/PolicyEngineAPI/src/main/java/org/openecomp/policy/api/AttributeType.java b/PolicyEngineAPI/src/main/java/org/onap/policy/api/AttributeType.java
index 44cf441ca..8cfa51212 100644
--- a/PolicyEngineAPI/src/main/java/org/openecomp/policy/api/AttributeType.java
+++ b/PolicyEngineAPI/src/main/java/org/onap/policy/api/AttributeType.java
@@ -18,13 +18,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.api;
+package org.onap.policy.api;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 
 /**
  * Enumeration of the Attribute Types that is used as a part of
- * {@link org.openecomp.policy.api.PolicyParameters}.
+ * {@link org.onap.policy.api.PolicyParameters}.
  * 
  * @version 0.1
  */
diff --git a/PolicyEngineAPI/src/main/java/org/openecomp/policy/api/ConfigRequestParameters.java b/PolicyEngineAPI/src/main/java/org/onap/policy/api/ConfigRequestParameters.java
index 1830679e0..cdee9672b 100644
--- a/PolicyEngineAPI/src/main/java/org/openecomp/policy/api/ConfigRequestParameters.java
+++ b/PolicyEngineAPI/src/main/java/org/onap/policy/api/ConfigRequestParameters.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.api;
+package org.onap.policy.api;
 
 import java.util.Map;
 import java.util.UUID;
@@ -31,7 +31,7 @@ import java.util.UUID;
  */
 public class ConfigRequestParameters {
 	private String policyName;
-	private String eCOMPComponentName;
+	private String onapComponentName;
 	private String configName;
 	private Map<String,String> configAttributes;
 	private UUID requestID;
@@ -47,12 +47,12 @@ public class ConfigRequestParameters {
 	}
 	
 	/**
-	 * Sets the ECOMP Component Name of the Config policy which needs to be retrieved. 
+	 * Sets the ONAP Component Name of the Config policy which needs to be retrieved. 
 	 * 
-	 * @param eCOMPComponentName the <code>String</code> format of the eCOMPComponentName whose configuration is required.
+	 * @param onapComponentName the <code>String</code> format of the onapComponentName whose configuration is required.
 	 */
-	public void setEcompName(String eCOMPComponentName){
-		this.eCOMPComponentName = eCOMPComponentName;
+	public void setOnapName(String onapComponentName){
+		this.onapComponentName = onapComponentName;
 	}
 	
 	/**
@@ -74,9 +74,9 @@ public class ConfigRequestParameters {
 	}
 	
 	/**
-	 * Sets the Request ID of the ECOMP request. 
+	 * Sets the Request ID of the ONAP request. 
 	 * 
-	 * @param requestID unique <code>UUID</code> requestID which will be passed throughout the ECOMP components to correlate logging messages.
+	 * @param requestID unique <code>UUID</code> requestID which will be passed throughout the ONAP components to correlate logging messages.
 	 */
 	public void setRequestID(UUID requestID){
 		this.requestID = requestID;
@@ -92,12 +92,12 @@ public class ConfigRequestParameters {
 	}
 	
 	/**
-	 * Gets the ECOMP Component Name of the Request Parameters. 
+	 * Gets the ONAP Component Name of the Request Parameters. 
 	 * 
-	 * @return <code>String</code> format of the ECOMP Component Name. 
+	 * @return <code>String</code> format of the ONAP Component Name. 
 	 */
-	public String getEcompName(){
-		return eCOMPComponentName;
+	public String getOnapName(){
+		return onapComponentName;
 	}
 	
 	/**
diff --git a/PolicyEngineAPI/src/main/java/org/openecomp/policy/api/DecisionRequestParameters.java b/PolicyEngineAPI/src/main/java/org/onap/policy/api/DecisionRequestParameters.java
index dc485f7b3..27e419fb1 100644
--- a/PolicyEngineAPI/src/main/java/org/openecomp/policy/api/DecisionRequestParameters.java
+++ b/PolicyEngineAPI/src/main/java/org/onap/policy/api/DecisionRequestParameters.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.api;
+package org.onap.policy.api;
 
 import java.util.Map;
 import java.util.UUID;
@@ -30,7 +30,7 @@ import java.util.UUID;
  * @version 0.1
  */
 public class DecisionRequestParameters {
-	private String eCOMPComponentName;
+	private String onapComponentName;
 	private Map<String,String> decisionAttributes;
 	private UUID requestID;
 	
@@ -43,31 +43,31 @@ public class DecisionRequestParameters {
 	/**
 	 * Constructor with Parameters
 	 * 
-	 * @param eCOMPComponentName the <code>String</code> format of the eCOMPComponentName whose Decision is required.
+	 * @param onapComponentName the <code>String</code> format of the onapComponentName whose Decision is required.
 	 * @param decisionAttributes the <code>Map</code> of <code>String,String</code> format of the decisionAttributes that contain the ID and values.
-	 * @param requestID unique request ID which will be passed throughout the ECOMP components to correlate logging messages.
+	 * @param requestID unique request ID which will be passed throughout the ONAP components to correlate logging messages.
 	 */
-	public DecisionRequestParameters(String eCOMPComponentName, Map<String,String> decisionAttributes, UUID requestID){
-		this.eCOMPComponentName = eCOMPComponentName;
+	public DecisionRequestParameters(String onapComponentName, Map<String,String> decisionAttributes, UUID requestID){
+		this.onapComponentName = onapComponentName;
 		this.decisionAttributes = decisionAttributes;
 		this.requestID = requestID;
 	}
 	
 	/**
-	 * Gets the ECOMPComponentName of the Decision Request Parameters. 
+	 * Gets the ONAPComponentName of the Decision Request Parameters. 
 	 * 
-	 * @return ECOMPComponentName the <code>String</code> format of the eCOMPComponentName of the Decision Request Parameters.
+	 * @return ONAPComponentName the <code>String</code> format of the onapComponentName of the Decision Request Parameters.
 	 */
-	public String getECOMPComponentName() {
-		return eCOMPComponentName;
+	public String getONAPComponentName() {
+		return onapComponentName;
 	}
 	/**
-	 * Sets the ECOMPComponentName of the Decision Request parameters.  
+	 * Sets the ONAPComponentName of the Decision Request parameters.  
 	 * 
-	 * @param eCOMPComponentName the <code>String</code> format of the eCOMPComponentName whose Decision is required.
+	 * @param onapComponentName the <code>String</code> format of the onapComponentName whose Decision is required.
 	 */
-	public void setECOMPComponentName(String eCOMPComponentName) {
-		this.eCOMPComponentName = eCOMPComponentName;
+	public void setONAPComponentName(String onapComponentName) {
+		this.onapComponentName = onapComponentName;
 	}
 	/**
 	 * Gets the Decision Attributes from Decision Request Parameters. 
@@ -88,15 +88,15 @@ public class DecisionRequestParameters {
 	/**
 	 * Gets the request ID of Decision Request Parameters. 
 	 * 
-	 * @return the requestID unique request ID which will be passed throughout the ECOMP components to correlate logging messages.
+	 * @return the requestID unique request ID which will be passed throughout the ONAP components to correlate logging messages.
 	 */
 	public UUID getRequestID() {
 		return requestID;
 	}
 	/**
-	 * Sets the ReqestID of Decision Request Parameters which will be passed around ECOMP requests.
+	 * Sets the ReqestID of Decision Request Parameters which will be passed around ONAP requests.
 	 * 
-	 * @param requestID unique request ID which will be passed throughout the ECOMP components to correlate logging messages.
+	 * @param requestID unique request ID which will be passed throughout the ONAP components to correlate logging messages.
 	 */
 	public void setRequestID(UUID requestID) {
 		this.requestID = requestID;
diff --git a/PolicyEngineAPI/src/main/java/org/openecomp/policy/api/DecisionResponse.java b/PolicyEngineAPI/src/main/java/org/onap/policy/api/DecisionResponse.java
index caa9fda74..78e80f07b 100644
--- a/PolicyEngineAPI/src/main/java/org/openecomp/policy/api/DecisionResponse.java
+++ b/PolicyEngineAPI/src/main/java/org/onap/policy/api/DecisionResponse.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.api;
+package org.onap.policy.api;
 
 /**
  * Defines the Object that represents the Policy Decision Response elements.
@@ -30,7 +30,7 @@ public interface DecisionResponse {
 	/**
 	 * Gets the Decision of the Policy, Either a Permit or Deny. 
 	 * 
-	 * @return {@link org.openecomp.policy.api.PolicyDecision} Enumeration. 
+	 * @return {@link org.onap.policy.api.PolicyDecision} Enumeration. 
 	 */
 	public PolicyDecision getDecision();
 	
diff --git a/PolicyEngineAPI/src/main/java/org/openecomp/policy/api/DeletePolicyCondition.java b/PolicyEngineAPI/src/main/java/org/onap/policy/api/DeletePolicyCondition.java
index 4ef348c7d..4001d3fa6 100644
--- a/PolicyEngineAPI/src/main/java/org/openecomp/policy/api/DeletePolicyCondition.java
+++ b/PolicyEngineAPI/src/main/java/org/onap/policy/api/DeletePolicyCondition.java
@@ -18,13 +18,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.api;
+package org.onap.policy.api;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 
 /**
  * Enumeration of the Policy Delete Condition that is used as a part of
- * {@link org.openecomp.policy.api.DeletePolicyParameters}.
+ * {@link org.onap.policy.api.DeletePolicyParameters}.
  * 
  * @version 0.1
  */
diff --git a/PolicyEngineAPI/src/main/java/org/openecomp/policy/api/DeletePolicyParameters.java b/PolicyEngineAPI/src/main/java/org/onap/policy/api/DeletePolicyParameters.java
index 3121297e1..4f6779291 100644
--- a/PolicyEngineAPI/src/main/java/org/openecomp/policy/api/DeletePolicyParameters.java
+++ b/PolicyEngineAPI/src/main/java/org/onap/policy/api/DeletePolicyParameters.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.api;
+package org.onap.policy.api;
 
 import java.util.UUID;
 
diff --git a/PolicyEngineAPI/src/main/java/org/openecomp/policy/api/DictionaryParameters.java b/PolicyEngineAPI/src/main/java/org/onap/policy/api/DictionaryParameters.java
index cf70caf07..e4aa5e1a5 100644
--- a/PolicyEngineAPI/src/main/java/org/openecomp/policy/api/DictionaryParameters.java
+++ b/PolicyEngineAPI/src/main/java/org/onap/policy/api/DictionaryParameters.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.api;
+package org.onap.policy.api;
 
 import java.util.UUID;
 
diff --git a/PolicyEngineAPI/src/main/java/org/openecomp/policy/api/DictionaryResponse.java b/PolicyEngineAPI/src/main/java/org/onap/policy/api/DictionaryResponse.java
index dd7379871..4381e694f 100644
--- a/PolicyEngineAPI/src/main/java/org/openecomp/policy/api/DictionaryResponse.java
+++ b/PolicyEngineAPI/src/main/java/org/onap/policy/api/DictionaryResponse.java
@@ -1,4 +1,4 @@
-package org.openecomp.policy.api;
+package org.onap.policy.api;
 
 import java.util.Map;
 
diff --git a/PolicyEngineAPI/src/main/java/org/openecomp/policy/api/DictionaryType.java b/PolicyEngineAPI/src/main/java/org/onap/policy/api/DictionaryType.java
index 823a56ba9..5ac6d5ed8 100644
--- a/PolicyEngineAPI/src/main/java/org/openecomp/policy/api/DictionaryType.java
+++ b/PolicyEngineAPI/src/main/java/org/onap/policy/api/DictionaryType.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.api;
+package org.onap.policy.api;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 
diff --git a/PolicyEngineAPI/src/main/java/org/openecomp/policy/api/EventRequestParameters.java b/PolicyEngineAPI/src/main/java/org/onap/policy/api/EventRequestParameters.java
index 155d9c6a5..6e4bbbd51 100644
--- a/PolicyEngineAPI/src/main/java/org/openecomp/policy/api/EventRequestParameters.java
+++ b/PolicyEngineAPI/src/main/java/org/onap/policy/api/EventRequestParameters.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.api;
+package org.onap.policy.api;
 
 import java.util.Map;
 import java.util.UUID;
@@ -43,7 +43,7 @@ public class EventRequestParameters {
 	 * Constructor with Parameters
 	 * 
 	 * @param eventAttributes the <code>Map</code> of <code>String,String</code> format of the eventAttributes that contains the event ID and values.
-	 * @param requestID unique request ID which will be passed throughout the ECOMP components to correlate logging messages.
+	 * @param requestID unique request ID which will be passed throughout the ONAP components to correlate logging messages.
 	 */
 	public EventRequestParameters(Map<String,String> eventAttributes, UUID requestID){
 		this.eventAttributes = eventAttributes;
@@ -69,18 +69,18 @@ public class EventRequestParameters {
 	}
 	
 	/**
-	 * Gets the ReqestID of Event Request Parameters which will be passed around ECOMP requests. 
+	 * Gets the ReqestID of Event Request Parameters which will be passed around ONAP requests. 
 	 * 
-	 * @return requestID unique request ID which will be passed throughout the ECOMP components to correlate logging messages.
+	 * @return requestID unique request ID which will be passed throughout the ONAP components to correlate logging messages.
 	 */
 	public UUID getRequestID() {
 		return requestID;
 	}
 	
 	/**
-	 * Sets the ReqestID of Event Request Parameters which will be passed around ECOMP requests.
+	 * Sets the ReqestID of Event Request Parameters which will be passed around ONAP requests.
 	 * 
-	 * @param requestID unique request ID which will be passed throughout the ECOMP components to correlate logging messages.
+	 * @param requestID unique request ID which will be passed throughout the ONAP components to correlate logging messages.
 	 */
 	public void setRequestID(UUID requestID) {
 		this.requestID = requestID;
diff --git a/PolicyEngineAPI/src/main/java/org/openecomp/policy/api/ImportParameters.java b/PolicyEngineAPI/src/main/java/org/onap/policy/api/ImportParameters.java
index 882379397..3914864bf 100644
--- a/PolicyEngineAPI/src/main/java/org/openecomp/policy/api/ImportParameters.java
+++ b/PolicyEngineAPI/src/main/java/org/onap/policy/api/ImportParameters.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.api;
+package org.onap.policy.api;
 
 import java.util.UUID;
 
@@ -47,7 +47,7 @@ public class ImportParameters {
 	 * 
 	 * @param serviceName the <code>String</code> format of the Service Name
 	 * @param description the <code>String</code> format of the i Description
-	 * @param requestID unique request ID which will be passed throughout the ECOMP components to correlate logging messages.
+	 * @param requestID unique request ID which will be passed throughout the ONAP components to correlate logging messages.
 	 * @param filePath the <code>List</code> format of the file paths for the service files
 	 * @param importType the {@link IMPORT_TYPE} format of the Policy Service List
 	 * @param version the <code>String</code> format of the Policy Import Version
@@ -103,7 +103,7 @@ public class ImportParameters {
 	/**
 	 * Gets the requestID of the Policy Parameters. 
 	 * 
-	 * @return unique request ID which will be passed throughout the ECOMP components to correlate logging messages.
+	 * @return unique request ID which will be passed throughout the ONAP components to correlate logging messages.
 	 */
 	public UUID getRequestID() {
 		return requestID;
@@ -112,7 +112,7 @@ public class ImportParameters {
 	/**
 	 * Sets the requestID of the Policy Parameters. 
 	 * 
-	 * @param requestID unique request ID which will be passed throughout the ECOMP components to correlate logging messages.
+	 * @param requestID unique request ID which will be passed throughout the ONAP components to correlate logging messages.
 	 */
 	public void setRequestID(UUID requestID) {
 		this.requestID = requestID;
diff --git a/PolicyEngineAPI/src/main/java/org/openecomp/policy/api/MetricsRequestParameters.java b/PolicyEngineAPI/src/main/java/org/onap/policy/api/MetricsRequestParameters.java
index 4c10f391f..8820ca31c 100644
--- a/PolicyEngineAPI/src/main/java/org/openecomp/policy/api/MetricsRequestParameters.java
+++ b/PolicyEngineAPI/src/main/java/org/onap/policy/api/MetricsRequestParameters.java
@@ -1,4 +1,4 @@
-package org.openecomp.policy.api;
+package org.onap.policy.api;
 
 import java.util.UUID;
 
diff --git a/PolicyEngineAPI/src/main/java/org/openecomp/policy/api/MetricsResponse.java b/PolicyEngineAPI/src/main/java/org/onap/policy/api/MetricsResponse.java
index d96a6dc9c..dc48caf1f 100644
--- a/PolicyEngineAPI/src/main/java/org/openecomp/policy/api/MetricsResponse.java
+++ b/PolicyEngineAPI/src/main/java/org/onap/policy/api/MetricsResponse.java
@@ -1,4 +1,4 @@
-package org.openecomp.policy.api;
+package org.onap.policy.api;
 
 public interface MetricsResponse {
 
diff --git a/PolicyEngineAPI/src/main/java/org/openecomp/policy/api/NotificationScheme.java b/PolicyEngineAPI/src/main/java/org/onap/policy/api/NotificationScheme.java
index 2e88d9c38..4df83e5e7 100644
--- a/PolicyEngineAPI/src/main/java/org/openecomp/policy/api/NotificationScheme.java
+++ b/PolicyEngineAPI/src/main/java/org/onap/policy/api/NotificationScheme.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.api;
+package org.onap.policy.api;
 
 /**
  * Enumeration of <code>NotificationScheme</code> describes the Notification Scheme that will be used by the PolicyEngine.
diff --git a/PolicyEngineAPI/src/main/java/org/openecomp/policy/api/PolicyChangeResponse.java b/PolicyEngineAPI/src/main/java/org/onap/policy/api/PolicyChangeResponse.java
index 98bfdc2e3..249cf24a2 100644
--- a/PolicyEngineAPI/src/main/java/org/openecomp/policy/api/PolicyChangeResponse.java
+++ b/PolicyEngineAPI/src/main/java/org/onap/policy/api/PolicyChangeResponse.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.api;
+package org.onap.policy.api;
 
 /**
  * <code>PolicyChangeResponse</code> defines the Policy Response
diff --git a/PolicyEngineAPI/src/main/java/org/openecomp/policy/api/PolicyClass.java b/PolicyEngineAPI/src/main/java/org/onap/policy/api/PolicyClass.java
index 8b87f408b..5132a44be 100644
--- a/PolicyEngineAPI/src/main/java/org/openecomp/policy/api/PolicyClass.java
+++ b/PolicyEngineAPI/src/main/java/org/onap/policy/api/PolicyClass.java
@@ -18,13 +18,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.api;
+package org.onap.policy.api;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 
 /**
  * Enumeration of the Policy Types that is used as a part of
- * {@link org.openecomp.policy.api.PolicyParameters}.
+ * {@link org.onap.policy.api.PolicyParameters}.
  * 
  * @version 0.1
  */
diff --git a/PolicyEngineAPI/src/main/java/org/openecomp/policy/api/PolicyConfig.java b/PolicyEngineAPI/src/main/java/org/onap/policy/api/PolicyConfig.java
index 5cb7d8176..652fd4da3 100644
--- a/PolicyEngineAPI/src/main/java/org/openecomp/policy/api/PolicyConfig.java
+++ b/PolicyEngineAPI/src/main/java/org/onap/policy/api/PolicyConfig.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.api;
+package org.onap.policy.api;
 
 import java.util.Map;
 import java.util.Properties;
@@ -35,7 +35,7 @@ import org.w3c.dom.Document;
 
 public interface PolicyConfig {
 	/**
-	 * Gets the {@link org.openecomp.policy.api.PolicyType} associated with <code>PolicyConfig</code> 
+	 * Gets the {@link org.onap.policy.api.PolicyType} associated with <code>PolicyConfig</code> 
 	 * 
 	 * @return the <code>PolicyType</code> associated with this <code>PolicyConfig</code> 
 	 */
@@ -70,7 +70,7 @@ public interface PolicyConfig {
 	public String toOther();
 	
 	/**
-	 * Gets the {@link org.openecomp.policy.api.PolicyConfigStatus} associated with this <code>PolicyConfig</code>.
+	 * Gets the {@link org.onap.policy.api.PolicyConfigStatus} associated with this <code>PolicyConfig</code>.
 	 * 
 	 * @return the <code>PolicyConfigStatus</code> associated with this <code>PolicyConfig</code>
 	 */
diff --git a/PolicyEngineAPI/src/main/java/org/openecomp/policy/api/PolicyConfigException.java b/PolicyEngineAPI/src/main/java/org/onap/policy/api/PolicyConfigException.java
index ad6948e77..b42d8b280 100644
--- a/PolicyEngineAPI/src/main/java/org/openecomp/policy/api/PolicyConfigException.java
+++ b/PolicyEngineAPI/src/main/java/org/onap/policy/api/PolicyConfigException.java
@@ -18,10 +18,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.api;
+package org.onap.policy.api;
 
 /**
- * PolicyConfigException extends <code>Exception</code> to implement exceptions thrown by {@link org.openecomp.policy.api.PolicyEngine}
+ * PolicyConfigException extends <code>Exception</code> to implement exceptions thrown by {@link org.onap.policy.api.PolicyEngine}
  * 
  * @version 0.1
  */
diff --git a/PolicyEngineAPI/src/main/java/org/openecomp/policy/api/PolicyConfigStatus.java b/PolicyEngineAPI/src/main/java/org/onap/policy/api/PolicyConfigStatus.java
index 95d890de8..23291c9b9 100644
--- a/PolicyEngineAPI/src/main/java/org/openecomp/policy/api/PolicyConfigStatus.java
+++ b/PolicyEngineAPI/src/main/java/org/onap/policy/api/PolicyConfigStatus.java
@@ -18,13 +18,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.api;
+package org.onap.policy.api;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 
 /**
  * Enumeration of PolicyConfigStatus that can be returned as a part of 
- * {@link org.openecomp.policy.api.PolicyConfig}.
+ * {@link org.onap.policy.api.PolicyConfig}.
  * 
  * @version 0.1
  */
diff --git a/PolicyEngineAPI/src/main/java/org/openecomp/policy/api/PolicyConfigType.java b/PolicyEngineAPI/src/main/java/org/onap/policy/api/PolicyConfigType.java
index 028696462..77c978da4 100644
--- a/PolicyEngineAPI/src/main/java/org/openecomp/policy/api/PolicyConfigType.java
+++ b/PolicyEngineAPI/src/main/java/org/onap/policy/api/PolicyConfigType.java
@@ -18,13 +18,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.api;
+package org.onap.policy.api;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 
 /**
  * Enumeration of the Policy Config Types that is used as a part of
- * {@link org.openecomp.policy.api.PolicyParameters}.
+ * {@link org.onap.policy.api.PolicyParameters}.
  * 
  * @version 0.1
  */
diff --git a/PolicyEngineAPI/src/main/java/org/openecomp/policy/api/PolicyDecision.java b/PolicyEngineAPI/src/main/java/org/onap/policy/api/PolicyDecision.java
index a6b4bd2b4..b5fdc1e01 100644
--- a/PolicyEngineAPI/src/main/java/org/openecomp/policy/api/PolicyDecision.java
+++ b/PolicyEngineAPI/src/main/java/org/onap/policy/api/PolicyDecision.java
@@ -18,13 +18,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.api;
+package org.onap.policy.api;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 
 /**
  * Enumeration of PolicyDecision that can be returned as a part of 
- * {@link org.openecomp.policy.api.DecisionResponse} getDecision().
+ * {@link org.onap.policy.api.DecisionResponse} getDecision().
  * 
  * @version 0.1
  */
diff --git a/PolicyEngineAPI/src/main/java/org/openecomp/policy/api/PolicyDecisionException.java b/PolicyEngineAPI/src/main/java/org/onap/policy/api/PolicyDecisionException.java
index 7f08fcb36..38081de7e 100644
--- a/PolicyEngineAPI/src/main/java/org/openecomp/policy/api/PolicyDecisionException.java
+++ b/PolicyEngineAPI/src/main/java/org/onap/policy/api/PolicyDecisionException.java
@@ -18,10 +18,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.api;
+package org.onap.policy.api;
 
 /**
- * PolicyDecisionException extends <code>Exception</code> to implement exceptions thrown by {@link org.openecomp.policy.api.PolicyEngine}
+ * PolicyDecisionException extends <code>Exception</code> to implement exceptions thrown by {@link org.onap.policy.api.PolicyEngine}
  * 
  * @version 0.1
  */
diff --git a/PolicyEngineAPI/src/main/java/org/openecomp/policy/api/PolicyEngine.java b/PolicyEngineAPI/src/main/java/org/onap/policy/api/PolicyEngine.java
index 4e2c092c1..bfb4f1e4f 100644
--- a/PolicyEngineAPI/src/main/java/org/openecomp/policy/api/PolicyEngine.java
+++ b/PolicyEngineAPI/src/main/java/org/onap/policy/api/PolicyEngine.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.api;
+package org.onap.policy.api;
 
 import java.util.Collection;
 import java.util.Map;
@@ -26,9 +26,9 @@ import java.util.UUID;
 
 import javax.json.JsonObject;
 
-import org.openecomp.policy.api.NotificationHandler;
-import org.openecomp.policy.api.PDPNotification;
-import org.openecomp.policy.std.StdPolicyEngine;
+import org.onap.policy.api.NotificationHandler;
+import org.onap.policy.api.PDPNotification;
+import org.onap.policy.std.StdPolicyEngine;
 
 /**
  * PolicyEngine is the Interface that applications use to make policy queries against a PEPEngine 
@@ -68,7 +68,7 @@ public class PolicyEngine{
 	 * PolicyEngine Constructor with <code>String</code> format of PropertiesFilePathname and <code>NotificationScheme</code>
 	 * 
 	 * @param propertiesFilePathname the <code>String</code> format of the propertiesFilePathname
-	 * @param scheme the <code>NotificationScheme</code> of {@link org.openecomp.policy.api.NotificationScheme} which defines the Notification Scheme
+	 * @param scheme the <code>NotificationScheme</code> of {@link org.onap.policy.api.NotificationScheme} which defines the Notification Scheme
 	 * @throws PolicyEngineException PolicyEngine Exception
 	 */
 	public PolicyEngine(String propertiesFilePathname, NotificationScheme scheme) throws PolicyEngineException{
@@ -81,8 +81,8 @@ public class PolicyEngine{
 	 * PolicyEngine Constructor with <code>String</code> format of PropertiesFilePathname, <code>NotificationScheme</code> and <code>NotificationHandler</code>
 	 *  
 	 *  @param propertiesFilePathname the <code>String</code> format of the propertiesFilePathname 
-	 *  @param scheme the <code>NotificationScheme</code> of {@link org.openecomp.policy.api.NotificationScheme} which defines the Notification Scheme
-	 *  @param handler the <code>NotificationHandler</code> of {@link org.openecomp.policy.api.NotificationHandler} which defines what should happen when a notification is received.
+	 *  @param scheme the <code>NotificationScheme</code> of {@link org.onap.policy.api.NotificationScheme} which defines the Notification Scheme
+	 *  @param handler the <code>NotificationHandler</code> of {@link org.onap.policy.api.NotificationHandler} which defines what should happen when a notification is received.
 	 *  @throws PolicyEngineException PolicyEngine Exception
 	 */
 	public PolicyEngine(String propertiesFilePathname, NotificationScheme scheme, NotificationHandler handler) throws PolicyEngineException {
@@ -96,7 +96,7 @@ public class PolicyEngine{
 	 * Gets the configuration from the PolicyDecisionPoint(PDP) for the <code>String</code> which represents the Policy File Name 
 	 * 
 	 * @param policyName the <code>String</code> format of the PolicyFile Name whose configuration is required. 
-	 * @return <code>Collection</code> of {@link org.openecomp.policy.api.PolicyConfig} which has the configuration. 
+	 * @return <code>Collection</code> of {@link org.onap.policy.api.PolicyConfig} which has the configuration. 
 	 * @throws PolicyConfigException PolicyConfig Exception
 	 * @deprecated use {@link #getConfig(ConfigRequestParameters configRequestParameters)} Instead.
 	 */
@@ -109,9 +109,9 @@ public class PolicyEngine{
 	 * Gets the configuration from the PolicyDecisionPoint(PDP) for the <code>String</code> which represents the Policy File Name 
 	 * 
 	 * @param policyName the <code>String</code> format of the PolicyFile Name whose configuration is required. 
-	 * @param requestID unique request ID which will be passed throughout the ECOMP components to correlate logging messages.
+	 * @param requestID unique request ID which will be passed throughout the ONAP components to correlate logging messages.
 	 * A different request ID should be passed for each request.
-	 * @return <code>Collection</code> of {@link org.openecomp.policy.api.PolicyConfig} which has the configuration. 
+	 * @return <code>Collection</code> of {@link org.onap.policy.api.PolicyConfig} which has the configuration. 
 	 * @throws PolicyConfigException PolicyConfig Exception
 	 * @deprecated use {@link #getConfig(ConfigRequestParameters configRequestParameters)} Instead.
 	 */
@@ -121,109 +121,109 @@ public class PolicyEngine{
 	}
 	
 	/**
-	 * Gets the configuration from the PolicyDecisionPoint(PDP) for the <code>String</code> which represents the eCOMPComponentName 
+	 * Gets the configuration from the PolicyDecisionPoint(PDP) for the <code>String</code> which represents the onapComponentName 
 	 * 
-	 * @param eCOMPComponentName the <code>String</code> format of the eCOMPComponentName whose configuration is required. 
-	 * @return <code>Collection</code> of {@link org.openecomp.policy.api.PolicyConfig} which has the configuration.
+	 * @param onapComponentName the <code>String</code> format of the onapComponentName whose configuration is required. 
+	 * @return <code>Collection</code> of {@link org.onap.policy.api.PolicyConfig} which has the configuration.
 	 * @throws PolicyConfigException PolicyConfig Exception
 	 * @deprecated use {@link #getConfig(ConfigRequestParameters)} Instead.
 	 */
 	@Deprecated
-	public Collection<PolicyConfig> getConfig(String eCOMPComponentName) throws PolicyConfigException {
-		return getConfig(setConfigRequestParameters(null, eCOMPComponentName, null, null, null));
+	public Collection<PolicyConfig> getConfig(String onapComponentName) throws PolicyConfigException {
+		return getConfig(setConfigRequestParameters(null, onapComponentName, null, null, null));
 	}
 	
 	/**
-	 * Gets the configuration from the PolicyDecisionPoint(PDP) for the <code>String</code> which represents the eCOMPComponentName 
+	 * Gets the configuration from the PolicyDecisionPoint(PDP) for the <code>String</code> which represents the onapComponentName 
 	 * 
-	 * @param eCOMPComponentName the <code>String</code> format of the eCOMPComponentName whose configuration is required. 
-	 * @return <code>Collection</code> of {@link org.openecomp.policy.api.PolicyConfig} which has the configuration.
-	 * @param requestID unique request ID which will be passed throughout the ECOMP components to correlate logging messages.
+	 * @param onapComponentName the <code>String</code> format of the onapComponentName whose configuration is required. 
+	 * @return <code>Collection</code> of {@link org.onap.policy.api.PolicyConfig} which has the configuration.
+	 * @param requestID unique request ID which will be passed throughout the ONAP components to correlate logging messages.
 	 * A different request ID should be passed for each request.
 	 * @throws PolicyConfigException PolicyConfig Exception
 	 * @deprecated use {@link #getConfig(ConfigRequestParameters)} Instead.
 	 */
 	@Deprecated
-	public Collection<PolicyConfig> getConfig(String eCOMPComponentName, UUID requestID) throws PolicyConfigException {
-		return getConfig(setConfigRequestParameters(null, eCOMPComponentName, null, null, requestID));
+	public Collection<PolicyConfig> getConfig(String onapComponentName, UUID requestID) throws PolicyConfigException {
+		return getConfig(setConfigRequestParameters(null, onapComponentName, null, null, requestID));
 	}
 	
 	/**
-	 * Requests the configuration of the <code>String</code> which represents the eCOMPComponentName and <code>String</code>
+	 * Requests the configuration of the <code>String</code> which represents the onapComponentName and <code>String</code>
 	 * which represents the configName and returns the configuration if different Configurations exist for the
-	 * particular eCOMPComponentName.  
+	 * particular onapComponentName.  
 	 * 
-	 * @param eCOMPComponentName the <code>String</code> format of the eCOMPComponentName whose configuration is required.
+	 * @param onapComponentName the <code>String</code> format of the onapComponentName whose configuration is required.
 	 * @param configName the <code>String</code> format of the configurationName whose configuration is required.
-	 * @return <code>Collection</code> of {@link org.openecomp.policy.api.PolicyConfig} which has the configuration. 
+	 * @return <code>Collection</code> of {@link org.onap.policy.api.PolicyConfig} which has the configuration. 
 	 * @throws PolicyConfigException PolicyConfig Exception
 	 * @deprecated use {@link #getConfig(ConfigRequestParameters)} Instead.
 	 */
 	@Deprecated
-	public Collection<PolicyConfig> getConfig(String eCOMPComponentName, String configName) throws PolicyConfigException {
-		return getConfig(setConfigRequestParameters(null, eCOMPComponentName, configName, null, null));
+	public Collection<PolicyConfig> getConfig(String onapComponentName, String configName) throws PolicyConfigException {
+		return getConfig(setConfigRequestParameters(null, onapComponentName, configName, null, null));
 	}
 	
 	/**
-	 * Requests the configuration of the <code>String</code> which represents the eCOMPComponentName and <code>String</code>
+	 * Requests the configuration of the <code>String</code> which represents the onapComponentName and <code>String</code>
 	 * which represents the configName and returns the configuration if different Configurations exist for the
-	 * particular eCOMPComponentName.  
+	 * particular onapComponentName.  
 	 * 
-	 * @param eCOMPComponentName the <code>String</code> format of the eCOMPComponentName whose configuration is required.
+	 * @param onapComponentName the <code>String</code> format of the onapComponentName whose configuration is required.
 	 * @param configName the <code>String</code> format of the configurationName whose configuration is required.
-	 * @param requestID unique request ID which will be passed throughout the ECOMP components to correlate logging messages.
+	 * @param requestID unique request ID which will be passed throughout the ONAP components to correlate logging messages.
 	 * A different request ID should be passed for each request.
-	 * @return <code>Collection</code> of {@link org.openecomp.policy.api.PolicyConfig} which has the configuration. 
+	 * @return <code>Collection</code> of {@link org.onap.policy.api.PolicyConfig} which has the configuration. 
 	 * @throws PolicyConfigException PolicyConfig Exception
 	 * @deprecated use {@link #getConfig(ConfigRequestParameters)} Instead.
 	 */
 	@Deprecated
-	public Collection<PolicyConfig> getConfig(String eCOMPComponentName, String configName, UUID requestID) throws PolicyConfigException {
-		return getConfig(setConfigRequestParameters(null, eCOMPComponentName, configName, null, requestID));
+	public Collection<PolicyConfig> getConfig(String onapComponentName, String configName, UUID requestID) throws PolicyConfigException {
+		return getConfig(setConfigRequestParameters(null, onapComponentName, configName, null, requestID));
 	}
 	
 	/**
-	 * Requests the configuration of the <code>String</code> which represents the eCOMPComponentName, <code>String</code>
+	 * Requests the configuration of the <code>String</code> which represents the onapComponentName, <code>String</code>
 	 * which represents the configName and <code>Map</code> of <code>String,String</code> which has the configAttribute and returns the specific 
 	 * configuration related to the configAttributes mentioned.
 	 * 
-	 * @param eCOMPComponentName the <code>String</code> format of the eCOMPComponentName whose configuration is required.
+	 * @param onapComponentName the <code>String</code> format of the onapComponentName whose configuration is required.
 	 * @param configName the <code>String</code> format of the configurationName whose configuration is required.
 	 * @param configAttributes the <code>Map</code> of <code>String,String</code> format of the configuration attributes which are required.
-	 * @return <code>Collection</code> of {@link org.openecomp.policy.api.PolicyConfig} which has the configuration.
+	 * @return <code>Collection</code> of {@link org.onap.policy.api.PolicyConfig} which has the configuration.
 	 * @throws PolicyConfigException PolicyConfig Exception
 	 * @deprecated use {@link #getConfig(ConfigRequestParameters)} Instead.
 	 */
 	@Deprecated
-	public Collection<PolicyConfig> getConfig(String eCOMPComponentName, String configName, Map<String, String> configAttributes) throws PolicyConfigException{
-		return getConfig(setConfigRequestParameters(null, eCOMPComponentName, configName, configAttributes, null));
+	public Collection<PolicyConfig> getConfig(String onapComponentName, String configName, Map<String, String> configAttributes) throws PolicyConfigException{
+		return getConfig(setConfigRequestParameters(null, onapComponentName, configName, configAttributes, null));
 	}
 	
 	/**
-	 * Requests the configuration of the <code>String</code> which represents the eCOMPComponentName, <code>String</code>
+	 * Requests the configuration of the <code>String</code> which represents the onapComponentName, <code>String</code>
 	 * which represents the configName and <code>Map</code> of <code>String,String</code> which has the configAttribute and returns the specific 
 	 * configuration related to the configAttributes mentioned.
 	 * 
-	 * @param eCOMPComponentName the <code>String</code> format of the eCOMPComponentName whose configuration is required.
+	 * @param onapComponentName the <code>String</code> format of the onapComponentName whose configuration is required.
 	 * @param configName the <code>String</code> format of the configurationName whose configuration is required.
 	 * @param configAttributes the <code>Map</code> of <code>String,String</code> format of the configuration attributes which are required.
-	 * @param requestID unique request ID which will be passed throughout the ECOMP components to correlate logging messages.
+	 * @param requestID unique request ID which will be passed throughout the ONAP components to correlate logging messages.
 	 * A different request ID should be passed for each request.
-	 * @return <code>Collection</code> of {@link org.openecomp.policy.api.PolicyConfig} which has the configuration.
+	 * @return <code>Collection</code> of {@link org.onap.policy.api.PolicyConfig} which has the configuration.
 	 * @throws PolicyConfigException PolicyConfig Exception
 	 * @deprecated use {@link #getConfig(ConfigRequestParameters)} Instead.
 	 */
 	@Deprecated
-	public Collection<PolicyConfig> getConfig(String eCOMPComponentName, String configName, Map<String, String> configAttributes, UUID requestID) throws PolicyConfigException{
-		return getConfig(setConfigRequestParameters(null, eCOMPComponentName, configName, configAttributes, requestID));
+	public Collection<PolicyConfig> getConfig(String onapComponentName, String configName, Map<String, String> configAttributes, UUID requestID) throws PolicyConfigException{
+		return getConfig(setConfigRequestParameters(null, onapComponentName, configName, configAttributes, requestID));
 	}
 	
 	/**
 	 * Requests the configuration of the <code>ConfigRequestParameters</code> which represents the Config policy request parameters 
 	 * and returns the specific configuration related to the matching parameters. 
 	 * 
-	 * @param configRequestParameters {@link org.openecomp.policy.api.ConfigRequestParameters} which represents the Config policy request parameters. 
-	 * @return <code>Collection</code> of {@link org.openecomp.policy.api.PolicyConfig} which has the configuration.
+	 * @param configRequestParameters {@link org.onap.policy.api.ConfigRequestParameters} which represents the Config policy request parameters. 
+	 * @return <code>Collection</code> of {@link org.onap.policy.api.PolicyConfig} which has the configuration.
 	 * @throws PolicyConfigException PolicyConfig Exception
 	 */
 	public Collection<PolicyConfig> getConfig(ConfigRequestParameters configRequestParameters)  throws PolicyConfigException{
@@ -234,7 +234,7 @@ public class PolicyEngine{
 	 * Requests the list of policies based on the <code>ConfigRequestParameters</code> which represents the policy request parameters 
 	 * and returns the list of policies filtered by the parameters. 
 	 * 
-	 * @param configRequestParameters {@link org.openecomp.policy.api.ConfigRequestParameters} which represents the List Policy request parameters. 
+	 * @param configRequestParameters {@link org.onap.policy.api.ConfigRequestParameters} which represents the List Policy request parameters. 
 	 * @return <code>Collection</code> of <code>String</code> which returns the list of policies.
 	 * @throws PolicyConfigException PolicyConfig Exception
 	 */
@@ -247,7 +247,7 @@ public class PolicyEngine{
 	 * Sends the Events specified to the PEP and returns back the PolicyResponse. 
 	 * 
 	 * @param eventAttributes the <code>Map</code> of <code>String,String</code> format of the eventAttributes that must contain the event ID and values.
-	 * @return <code>Collection</code> of {@link org.openecomp.policy.api.PolicyResponse} which has the Response. 
+	 * @return <code>Collection</code> of {@link org.onap.policy.api.PolicyResponse} which has the Response. 
 	 * @throws PolicyEventException PolicyEvent Exception
 	 * @deprecated use {@link #sendEvent(EventRequestParameters)} Instead.
 	 */
@@ -260,9 +260,9 @@ public class PolicyEngine{
 	 * Sends the Events specified to the PEP and returns back the PolicyResponse. 
 	 * 
 	 * @param eventAttributes the <code>Map</code> of <code>String,String</code> format of the eventAttributes that must contain the event ID and values.
-	 * @param requestID unique request ID which will be passed throughout the ECOMP components to correlate logging messages.
+	 * @param requestID unique request ID which will be passed throughout the ONAP components to correlate logging messages.
 	 * A different request ID should be passed for each request.
-	 * @return <code>Collection</code> of {@link org.openecomp.policy.api.PolicyResponse} which has the Response. 
+	 * @return <code>Collection</code> of {@link org.onap.policy.api.PolicyResponse} which has the Response. 
 	 * @throws PolicyEventException PolicyEvent Exception
 	 * @deprecated use {@link #sendEvent(EventRequestParameters)} Instead.
 	 */
@@ -274,8 +274,8 @@ public class PolicyEngine{
 	/**
 	 * Sends the Events specified to the PEP and returns back the PolicyResponse.
 	 * 
-	 * @param eventRequestParameters {@link org.openecomp.policy.api.EventRequestParameters} which represents the Event Request Parameters. 
-	 * @return <code>Collection</code> of {@link org.openecomp.policy.api.PolicyResponse} which has the Response.
+	 * @param eventRequestParameters {@link org.onap.policy.api.EventRequestParameters} which represents the Event Request Parameters. 
+	 * @return <code>Collection</code> of {@link org.onap.policy.api.PolicyResponse} which has the Response.
 	 * @throws PolicyEventException PolicyEvent Exception
 	 */
 	public Collection<PolicyResponse> sendEvent(EventRequestParameters eventRequestParameters) throws PolicyEventException {
@@ -285,38 +285,38 @@ public class PolicyEngine{
 	/**
 	 * Sends the decision Attributes specified to the PEP and returns back the PolicyDecision. 
 	 * 
-	 * @param eCOMPComponentName the <code>String</code> format of the eCOMPComponentName whose Decision is required.
+	 * @param onapComponentName the <code>String</code> format of the onapComponentName whose Decision is required.
 	 * @param decisionAttributes the <code>Map</code> of <code>String,String</code> format of the decisionAttributes that must contain the ID and values.
-	 * @return {@link org.openecomp.policy.api.DecisionResponse} which has the Decision. 
+	 * @return {@link org.onap.policy.api.DecisionResponse} which has the Decision. 
 	 * @throws PolicyDecisionException PolicyDecision Exception
 	 * @deprecated use {@link #getDecision(DecisionRequestParameters)} Instead.
 	 */
 	@Deprecated
-	public DecisionResponse getDecision(String eCOMPComponentName, Map<String,String> decisionAttributes) throws PolicyDecisionException {
-		return stdPolicyEngine.getDecision(eCOMPComponentName, decisionAttributes, null);
+	public DecisionResponse getDecision(String onapComponentName, Map<String,String> decisionAttributes) throws PolicyDecisionException {
+		return stdPolicyEngine.getDecision(onapComponentName, decisionAttributes, null);
 	}
 	
 	/**
 	 * Sends the decision Attributes specified to the PEP and returns back the PolicyDecision. 
 	 * 
-	 * @param eCOMPComponentName the <code>String</code> format of the eCOMPComponentName whose Decision is required.
+	 * @param onapComponentName the <code>String</code> format of the onapComponentName whose Decision is required.
 	 * @param decisionAttributes the <code>Map</code> of <code>String,String</code> format of the decisionAttributes that must contain the ID and values.
-	 * @param requestID unique request ID which will be passed throughout the ECOMP components to correlate logging messages.
+	 * @param requestID unique request ID which will be passed throughout the ONAP components to correlate logging messages.
 	 * A different request ID should be passed for each request.
-	 * @return {@link org.openecomp.policy.api.DecisionResponse} which has the Decision. 
+	 * @return {@link org.onap.policy.api.DecisionResponse} which has the Decision. 
 	 * @throws PolicyDecisionException PolicyDecision Exception
 	 * @deprecated use {@link #getDecision(DecisionRequestParameters)} Instead.
 	 */
 	@Deprecated
-	public DecisionResponse getDecision(String eCOMPComponentName, Map<String,String> decisionAttributes, UUID requestID) throws PolicyDecisionException {
-		return stdPolicyEngine.getDecision(eCOMPComponentName, decisionAttributes, requestID);
+	public DecisionResponse getDecision(String onapComponentName, Map<String,String> decisionAttributes, UUID requestID) throws PolicyDecisionException {
+		return stdPolicyEngine.getDecision(onapComponentName, decisionAttributes, requestID);
 	}
 	
 	/**
 	 * Sends the decision Attributes specified to the PEP and returns back the PolicyDecision. 
 	 * 
-	 * @param decisionRequestParameters {@link org.openecomp.policy.api.DecisionRequestParameters} which represents the Decision Request Parameters.
-	 * @return {@link org.openecomp.policy.api.DecisionResponse} which has the Decision.
+	 * @param decisionRequestParameters {@link org.onap.policy.api.DecisionRequestParameters} which represents the Decision Request Parameters.
+	 * @return {@link org.onap.policy.api.DecisionResponse} which has the Decision.
 	 * @throws PolicyDecisionException PolicyDecision Exception
 	 */
 	public DecisionResponse getDecision(DecisionRequestParameters decisionRequestParameters) throws PolicyDecisionException {
@@ -326,8 +326,8 @@ public class PolicyEngine{
 	/**
 	 * Retrieves the count of policies on the PAP, PDP, and Policy Engine as a whole
 	 * 
-	 * @param parameters {@link  org.openecomp.policy.api.MetricsRequestParameters} which represents the Parameters required to get the Policy Metrics 
-	 * @return {@link org.openecomp.policy.api.MetricsResponse} which consists of the response related to getMetrics Request. 
+	 * @param parameters {@link  org.onap.policy.api.MetricsRequestParameters} which represents the Parameters required to get the Policy Metrics 
+	 * @return {@link org.onap.policy.api.MetricsResponse} which consists of the response related to getMetrics Request. 
 	 * @throws PolicyException PolicyException related to the operation	 
 	 * 
 	 * */
@@ -339,13 +339,13 @@ public class PolicyEngine{
 	 * Creates a Config Policy based on given arguments
 	 * @param policyName the <code>String</code> format of the Policy Name
 	 * @param policyDescription the <code>String</code> format of the Policy Description
-	 * @param ecompName the <code>String</code> format of the ECOMP Name
+	 * @param onapName the <code>String</code> format of the ONAP Name
 	 * @param configName the <code>String</code> format of the Config Name
 	 * @param configAttributes the <code>List</code> the <code>Map</code> Attributes that must contain the key and value.
 	 * @param configType the <code>String</code> format of the Config Type
 	 * @param body the <code>String</code> format of the Policy Body
 	 * @param policyScope the <code>String</code> value of the sub scope directory where the policy will be created and stored
-	 * @param requestID unique request ID which will be passed throughout the ECOMP components to correlate logging messages.
+	 * @param requestID unique request ID which will be passed throughout the ONAP components to correlate logging messages.
 	 * A different request ID should be passed for each request.
 	 * @param riskLevel the <code>String</code> value of risk Level. 
 	 * @param riskType the <code>String</code> value of risk Type. 
@@ -356,10 +356,10 @@ public class PolicyEngine{
 	 * @deprecated use {@link #createPolicy(PolicyParameters)} Instead.
 	 */
 	@Deprecated
-	public String createConfigPolicy(String policyName, String policyDescription, String ecompName, String configName, 
+	public String createConfigPolicy(String policyName, String policyDescription, String onapName, String configName, 
 												Map<String, String> configAttributes, String configType, String body, String policyScope, UUID requestID,
 												String riskLevel, String riskType, String guard, String ttlDate) throws PolicyException {
-		return stdPolicyEngine.createUpdateConfigPolicy(policyName, policyDescription, ecompName, configName, 
+		return stdPolicyEngine.createUpdateConfigPolicy(policyName, policyDescription, onapName, configName, 
 				configAttributes, configType, body, policyScope, requestID,
 				riskLevel, riskType, guard, ttlDate, false);
 	}
@@ -368,13 +368,13 @@ public class PolicyEngine{
 	 * Creates a Config Policy based on given arguments
 	 * @param policyName the <code>String</code> format of the Policy Name
 	 * @param policyDescription the <code>String</code> format of the Policy Description
-	 * @param ecompName the <code>String</code> format of the ECOMP Name
+	 * @param onapName the <code>String</code> format of the ONAP Name
 	 * @param configName the <code>String</code> format of the Config Name
 	 * @param configAttributes the <code>List</code> the <code>Map</code> Attributes that must contain the key and value.
 	 * @param configType the <code>String</code> format of the Config Type
 	 * @param body the <code>String</code> format of the Policy Body
 	 * @param policyScope the <code>String</code> value of the sub scope directory where the policy will be created and stored
-	 * @param requestID unique request ID which will be passed throughout the ECOMP components to correlate logging messages.
+	 * @param requestID unique request ID which will be passed throughout the ONAP components to correlate logging messages.
 	 * A different request ID should be passed for each request.
 	 * @param riskLevel the <code>String</code> value of risk Level. 
 	 * @param riskType the <code>String</code> value of risk Type. 
@@ -385,10 +385,10 @@ public class PolicyEngine{
 	 * @deprecated use {@link #updatePolicy(PolicyParameters)} Instead.
 	 */
 	@Deprecated
-	public String updateConfigPolicy(String policyName, String policyDescription, String ecompName, String configName, 
+	public String updateConfigPolicy(String policyName, String policyDescription, String onapName, String configName, 
 												Map<String, String> configAttributes, String configType, String body, String policyScope, UUID requestID,
 												String riskLevel, String riskType, String guard, String ttlDate) throws PolicyException {
-		return stdPolicyEngine.createUpdateConfigPolicy(policyName, policyDescription, ecompName, configName, 
+		return stdPolicyEngine.createUpdateConfigPolicy(policyName, policyDescription, onapName, configName, 
 				configAttributes, configType, body, policyScope, requestID,riskLevel, riskType, guard, ttlDate, true);
 	}
 	
@@ -397,7 +397,7 @@ public class PolicyEngine{
 	 * @param policyName the <code>String</code> format of the Policy Name
 	 * @param firewallJson the <code>JsonObject</code> representation of the Firewall Rules List
 	 * @param policyScope the <code>String</code> value of the sub scope directory where the policy will be created and stored
-	 * @param requestID unique request ID which will be passed throughout the ECOMP components to correlate logging messages.
+	 * @param requestID unique request ID which will be passed throughout the ONAP components to correlate logging messages.
 	 * A different request ID should be passed for each request.
 	 * @param riskLevel the <code>String</code> value of risk Level. 
 	 * @param riskType the <code>String</code> value of risk Type. 
@@ -419,7 +419,7 @@ public class PolicyEngine{
 	 * @param policyName the <code>String</code> format of the Policy Name
 	 * @param firewallJson the <code>JsonObject</code> representation of the Firewall Rules List
 	 * @param policyScope the <code>String</code> value of the sub scope directory where the policy will be created and stored
-	 * @param requestID unique request ID which will be passed throughout the ECOMP components to correlate logging messages.
+	 * @param requestID unique request ID which will be passed throughout the ONAP components to correlate logging messages.
 	 * A different request ID should be passed for each request.
 	 * @param riskLevel the <code>String</code> value of risk Level. 
 	 * @param riskType the <code>String</code> value of risk Type. 
@@ -438,8 +438,8 @@ public class PolicyEngine{
 	/**
 	 * Retrieves Dictionary Items for a specified dictionary
 	 * 
-	 * @param parameters {@link org.openecomp.policy.api.DictionaryParameters} which represents the Dictionary Parameters required to create a Dictionary Item. 
-	 * @return {@link org.openecomp.policy.api.DictionaryResponse} which consists of the response related to create dictionary item Request. 
+	 * @param parameters {@link org.onap.policy.api.DictionaryParameters} which represents the Dictionary Parameters required to create a Dictionary Item. 
+	 * @return {@link org.onap.policy.api.DictionaryResponse} which consists of the response related to create dictionary item Request. 
 	 * @throws PolicyException PolicyException related to the operation	 
 	 * 
 	 * */
@@ -450,8 +450,8 @@ public class PolicyEngine{
 	/**
 	 * Creates a Dictionary Item based on given Dictionary Parameters
 	 * 
-	 * @param parameters {@link org.openecomp.policy.api.DictionaryParameters} which represents the Dictionary Parameters required to create a Dictionary Item. 
-	 * @return {@link org.openecomp.policy.api.PolicyChangeResponse} which consists of the response related to create dictionary item Request. 
+	 * @param parameters {@link org.onap.policy.api.DictionaryParameters} which represents the Dictionary Parameters required to create a Dictionary Item. 
+	 * @return {@link org.onap.policy.api.PolicyChangeResponse} which consists of the response related to create dictionary item Request. 
 	 * @throws PolicyException  PolicyException related to the operation. 
 	 */
 	public PolicyChangeResponse createDictionaryItem(DictionaryParameters parameters) throws PolicyException {
@@ -461,8 +461,8 @@ public class PolicyEngine{
 	/**
 	 * Updates a Dictionary Item based on given Dictionary Parameters
 	 * 
-	 * @param  parameters {@link org.openecomp.policy.api.DictionaryParameters} which represents the Dictionary Parameters required to update a Dictionary Item. 
-	 * @return {@link org.openecomp.policy.api.PolicyChangeResponse} which consists of the response related to update dictionary item Request. 
+	 * @param  parameters {@link org.onap.policy.api.DictionaryParameters} which represents the Dictionary Parameters required to update a Dictionary Item. 
+	 * @return {@link org.onap.policy.api.PolicyChangeResponse} which consists of the response related to update dictionary item Request. 
 	 * @throws PolicyException PolicyException related to the operation. 
 	 */
 	public PolicyChangeResponse updateDictionaryItem(DictionaryParameters parameters) throws PolicyException {
@@ -472,8 +472,8 @@ public class PolicyEngine{
 	/**
 	 * Creates a Policy based on given Policy Parameters. 
 	 * 
-	 * @param policyParameters {@link org.openecomp.policy.api.PolicyParameters} which represents the Policy Parameters required to create a Policy. 
-	 * @return {@link org.openecomp.policy.api.PolicyChangeResponse} which consists of the response related to create policy Request. 
+	 * @param policyParameters {@link org.onap.policy.api.PolicyParameters} which represents the Policy Parameters required to create a Policy. 
+	 * @return {@link org.onap.policy.api.PolicyChangeResponse} which consists of the response related to create policy Request. 
 	 * @throws PolicyException  PolicyException related to the operation. 
 	 */
 	public PolicyChangeResponse createPolicy(PolicyParameters policyParameters) throws PolicyException {
@@ -483,8 +483,8 @@ public class PolicyEngine{
 	/**
 	 * Update Policy based on given Policy Parameters. 
 	 * 
-	 * @param policyParameters {@link org.openecomp.policy.api.PolicyParameters} which represents the Policy Parameters required to update a Policy. 
-	 * @return {@link org.openecomp.policy.api.PolicyChangeResponse} which consists of the response related to create policy Request. 
+	 * @param policyParameters {@link org.onap.policy.api.PolicyParameters} which represents the Policy Parameters required to update a Policy. 
+	 * @return {@link org.onap.policy.api.PolicyChangeResponse} which consists of the response related to create policy Request. 
 	 * @throws PolicyException  PolicyException related to the operation. 
 	 */
 	public PolicyChangeResponse updatePolicy(PolicyParameters policyParameters) throws PolicyException {
@@ -498,7 +498,7 @@ public class PolicyEngine{
 	 * @param policyName the <code>String</code> format of the Policy Name being pushed. 
 	 * @param policyType the <code>String</code> format of the Policy Type which is being pushed.  
 	 * @param pdpGroup the <code>String</code> format of the PDP Group name to which the policy needs to be pushed to. 
-	 * @param requestID unique request ID which will be passed throughout the ECOMP components to correlate logging messages.
+	 * @param requestID unique request ID which will be passed throughout the ONAP components to correlate logging messages.
 	 * @return <code>String</code> format of the response related to the push Policy Request. 
 	 * @throws PolicyException  PolicyException related to the operation. 
 	 * @deprecated use {@link #pushPolicy(PushPolicyParameters)} instead. 
@@ -511,8 +511,8 @@ public class PolicyEngine{
 	/**
 	 * Pushes the specified policy to the PDP Group. If no PDP group is selected default is used. 
 	 * 
-	 * @param pushPolicyParameters {@link org.openecomp.policy.api.PushPolicyParameters} which represents the Push Policy parameters required to push a policy. 
-	 * @return {@link org.openecomp.policy.api.PolicyChangeResponse} which consists of the response related to the push Policy Request. 
+	 * @param pushPolicyParameters {@link org.onap.policy.api.PushPolicyParameters} which represents the Push Policy parameters required to push a policy. 
+	 * @return {@link org.onap.policy.api.PolicyChangeResponse} which consists of the response related to the push Policy Request. 
 	 * @throws PolicyException  PolicyException related to the operation. 
 	 */
 	public PolicyChangeResponse pushPolicy(PushPolicyParameters pushPolicyParameters) throws PolicyException {
@@ -522,8 +522,8 @@ public class PolicyEngine{
 	/**
 	 * Deletes the specified policy from the PAP or PDP.
 	 * 
-	 * @param deletePolicyParameters {@link org.openecomp.policy.api.DeletePolicyParameters} which represents the Delete Policy parameters to delete a policy.
-	 * @return {@link org.openecomp.policy.api.PolicyChangeResponse} which consists of the response related to the Delete Policy Request.
+	 * @param deletePolicyParameters {@link org.onap.policy.api.DeletePolicyParameters} which represents the Delete Policy parameters to delete a policy.
+	 * @return {@link org.onap.policy.api.PolicyChangeResponse} which consists of the response related to the Delete Policy Request.
 	 * @throws PolicyException PolicyException related to the operation. 
 	 */
 	public PolicyChangeResponse deletePolicy(DeletePolicyParameters deletePolicyParameters) throws PolicyException {
@@ -533,8 +533,8 @@ public class PolicyEngine{
 	/**
 	 * Creates a new Policy Service based on given Service Parameters. 
 	 * 
-	 * @param importParameters {@link org.openecomp.policy.api.ImportParameters} which represents the Service Parameters required to create a Policy Service. 
-	 * @return {@link org.openecomp.policy.api.PolicyChangeResponse} which consists of the response related to create import Service. 
+	 * @param importParameters {@link org.onap.policy.api.ImportParameters} which represents the Service Parameters required to create a Policy Service. 
+	 * @return {@link org.onap.policy.api.PolicyChangeResponse} which consists of the response related to create import Service. 
 	 * @throws PolicyException PolicyException related to the operation. 
 	 */
 	public PolicyChangeResponse policyEngineImport(ImportParameters importParameters) throws PolicyException {
@@ -544,8 +544,8 @@ public class PolicyEngine{
 	/**
 	 * <code>setNotification</code> allows changes to the Notification Scheme and Notification Handler
 	 * 
-	 * @param scheme the <code>NotificationScheme</code> of {@link org.openecomp.policy.api.NotificationScheme} which defines the Notification Scheme
-	 * @param handler the <code>NotificationHandler</code> of {@link org.openecomp.policy.api.NotificationHandler} which defines what should happen when a notification is received.
+	 * @param scheme the <code>NotificationScheme</code> of {@link org.onap.policy.api.NotificationScheme} which defines the Notification Scheme
+	 * @param handler the <code>NotificationHandler</code> of {@link org.onap.policy.api.NotificationHandler} which defines what should happen when a notification is received.
 	 */
 	public void setNotification(NotificationScheme scheme, NotificationHandler handler) {
 		this.scheme = scheme;
@@ -563,7 +563,7 @@ public class PolicyEngine{
 	/**
 	 * <code>setNotification</code> allows changes to the Notification Scheme
 	 * 
-	 * @param scheme the <code>NotificationScheme</code> of {@link org.openecomp.policy.api.NotificationScheme} which defines the Notification Scheme
+	 * @param scheme the <code>NotificationScheme</code> of {@link org.onap.policy.api.NotificationScheme} which defines the Notification Scheme
 	 */
 	public void setScheme(NotificationScheme scheme){
 		this.scheme = scheme;
@@ -573,7 +573,7 @@ public class PolicyEngine{
 	/**
 	 * Gets the <code>PDPNotification</code> if there is one exists. This is used for Polling Patterns. 
 	 * 
-	 * @return <code>PDPNotification</code> of {@link org.openecomp.policy.api.PDPNotification} which has the Notification. 
+	 * @return <code>PDPNotification</code> of {@link org.onap.policy.api.PDPNotification} which has the Notification. 
 	 */
 	public PDPNotification getNotification() {
 		return stdPolicyEngine.getNotification();
@@ -590,10 +590,10 @@ public class PolicyEngine{
 	}
 	
 	// Internal Setter Method to help build configRequestParameters.
-	private ConfigRequestParameters setConfigRequestParameters(String policyName, String eCOMPComponentName, String configName, Map<String, String> configAttributes, UUID requestID){
+	private ConfigRequestParameters setConfigRequestParameters(String policyName, String onapComponentName, String configName, Map<String, String> configAttributes, UUID requestID){
 		ConfigRequestParameters configRequestParameters = new ConfigRequestParameters();
 		configRequestParameters.setPolicyName(policyName);
-		configRequestParameters.setEcompName(eCOMPComponentName);
+		configRequestParameters.setOnapName(onapComponentName);
 		configRequestParameters.setConfigName(configName);
 		configRequestParameters.setConfigAttributes(configAttributes);
 		configRequestParameters.setRequestID(requestID);
diff --git a/PolicyEngineAPI/src/main/java/org/openecomp/policy/api/PolicyEngineException.java b/PolicyEngineAPI/src/main/java/org/onap/policy/api/PolicyEngineException.java
index e80513ad8..6529a159e 100644
--- a/PolicyEngineAPI/src/main/java/org/openecomp/policy/api/PolicyEngineException.java
+++ b/PolicyEngineAPI/src/main/java/org/onap/policy/api/PolicyEngineException.java
@@ -18,10 +18,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.api;
+package org.onap.policy.api;
 
 /**
- * PolicyEngineException extends <code>Exception</code> to implement exceptions thrown by {@link org.openecomp.policy.api.PolicyEngine}
+ * PolicyEngineException extends <code>Exception</code> to implement exceptions thrown by {@link org.onap.policy.api.PolicyEngine}
  * 
  * @version 0.1
  */
diff --git a/PolicyEngineAPI/src/main/java/org/openecomp/policy/api/PolicyEventException.java b/PolicyEngineAPI/src/main/java/org/onap/policy/api/PolicyEventException.java
index 8e4c81990..335c4905b 100644
--- a/PolicyEngineAPI/src/main/java/org/openecomp/policy/api/PolicyEventException.java
+++ b/PolicyEngineAPI/src/main/java/org/onap/policy/api/PolicyEventException.java
@@ -18,10 +18,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.api;
+package org.onap.policy.api;
 
 /**
- * PolicyEventException extends <code>Exception</code> to implement exceptions thrown by {@link org.openecomp.policy.api.PolicyEngine}
+ * PolicyEventException extends <code>Exception</code> to implement exceptions thrown by {@link org.onap.policy.api.PolicyEngine}
  * 
  * @version 0.1
  */
diff --git a/PolicyEngineAPI/src/main/java/org/openecomp/policy/api/PolicyException.java b/PolicyEngineAPI/src/main/java/org/onap/policy/api/PolicyException.java
index f4a99fd32..e61560146 100644
--- a/PolicyEngineAPI/src/main/java/org/openecomp/policy/api/PolicyException.java
+++ b/PolicyEngineAPI/src/main/java/org/onap/policy/api/PolicyException.java
@@ -1,7 +1,7 @@
-package org.openecomp.policy.api;
+package org.onap.policy.api;
 
 /**
- * PolicyException extends <code>Exception</code> to implement exceptions thrown by {@link org.openecomp.policy.api.PolicyEngine}
+ * PolicyException extends <code>Exception</code> to implement exceptions thrown by {@link org.onap.policy.api.PolicyEngine}
  * 
  * @version 0.1
  */
diff --git a/PolicyEngineAPI/src/main/java/org/openecomp/policy/api/PolicyParameters.java b/PolicyEngineAPI/src/main/java/org/onap/policy/api/PolicyParameters.java
index 0f34de0d1..0d76d8f13 100644
--- a/PolicyEngineAPI/src/main/java/org/openecomp/policy/api/PolicyParameters.java
+++ b/PolicyEngineAPI/src/main/java/org/onap/policy/api/PolicyParameters.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.api;
+package org.onap.policy.api;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -37,7 +37,7 @@ public class PolicyParameters {
 	private PolicyConfigType policyConfigType;
 	private String policyName;
 	private String policyDescription;
-	private String ecompName;
+	private String onapName;
 	private String configName;
 	private Map<AttributeType, Map<String,String>> attributes;
 	private String configBody;
@@ -62,23 +62,23 @@ public class PolicyParameters {
 	/**
 	 * Sets Config Policy Parameters.
 	 * 
-	 * @param policyConfigType the {@link org.openecomp.policy.api.PolicyConfigType} Enum format of the Config Type
+	 * @param policyConfigType the {@link org.onap.policy.api.PolicyConfigType} Enum format of the Config Type
 	 * @param policyName the <code>String</code> format of the Policy Name
 	 * @param policyDescription the <code>String</code> format of the Policy Description
-	 * @param ecompName the <code>String</code> format of the ECOMP Name
+	 * @param onapName the <code>String</code> format of the ONAP Name
 	 * @param configName the <code>String</code> format of the Config Name
 	 * @param attributes the <code>Map</code> Attributes that must contain the AttributeType and Map of key,value pairs corresponding to it.
-	 * @param configBodyType the {@link org.openecomp.policy.api.PolicyType} Enum format of the config Body Type. 
+	 * @param configBodyType the {@link org.onap.policy.api.PolicyType} Enum format of the config Body Type. 
 	 * @param configBody the <code>String</code> format of the Policy Body
-	 * @param requestID unique request ID which will be passed throughout the ECOMP components to correlate logging messages.
+	 * @param requestID unique request ID which will be passed throughout the ONAP components to correlate logging messages.
 	 * A different request ID should be passed for each request.
 	 */
-	public void setConfigPolicyParameters(PolicyConfigType policyConfigType, String policyName, String policyDescription, String ecompName, String configName, 
+	public void setConfigPolicyParameters(PolicyConfigType policyConfigType, String policyName, String policyDescription, String onapName, String configName, 
 			Map<AttributeType, Map<String, String>> attributes, PolicyType configBodyType, String configBody, UUID requestID){
 		this.setPolicyConfigType(policyConfigType);
 		this.setPolicyName(policyName);
 		this.setPolicyDescription(policyDescription);
-		this.setEcompName(ecompName);
+		this.setOnapName(onapName);
 		this.setConfigName(configName);
 		this.setAttributes(attributes);
 		this.setConfigBody(configBody);
@@ -91,7 +91,7 @@ public class PolicyParameters {
 	 * 
 	 * @param policyName the <code>String</code> format of the Policy Name
 	 * @param firewallJson the <code>String</code> representation of the Firewall Rules List
-	 * @param requestID unique request ID which will be passed throughout the ECOMP components to correlate logging messages.
+	 * @param requestID unique request ID which will be passed throughout the ONAP components to correlate logging messages.
 	 * A different request ID should be passed for each request.
 	 */
 	public void setConfigFirewallPolicyParameters(String policyName, String firewallJson, UUID requestID){
@@ -139,21 +139,21 @@ public class PolicyParameters {
 	}
 
 	/**
-	 * Gets the ECOMP Name value of the Policy Paramters. 
+	 * Gets the ONAP Name value of the Policy Paramters. 
 	 * 
-	 * @return <code>String</code> format of the ECOMP Name
+	 * @return <code>String</code> format of the ONAP Name
 	 */
-	public String getEcompName() {
-		return ecompName;
+	public String getOnapName() {
+		return onapName;
 	}
 
 	/**
-	 * Sets the ECOMP Name field of the Policy Parameters. 
+	 * Sets the ONAP Name field of the Policy Parameters. 
 	 * 
-	 * @param ecompName the <code>String</code> format of the ECOMP Name
+	 * @param onapName the <code>String</code> format of the ONAP Name
 	 */
-	public void setEcompName(String ecompName) {
-		this.ecompName = ecompName;
+	public void setOnapName(String onapName) {
+		this.onapName = onapName;
 	}
 
 	/**
@@ -195,7 +195,7 @@ public class PolicyParameters {
 	/**
 	 * Gets the Policy Config Type value the Policy parameters. 
 	 * 
-	 * @return {@link org.openecomp.policy.api.PolicyConfigType} Enum of the Config Type
+	 * @return {@link org.onap.policy.api.PolicyConfigType} Enum of the Config Type
 	 */
 	public PolicyConfigType getPolicyConfigType() {
 		return policyConfigType;
@@ -204,7 +204,7 @@ public class PolicyParameters {
 	/**
 	 * Sets the Policy Config Type field of the policy Parameters. 
 	 * 
-	 * @param policyConfigType the {@link org.openecomp.policy.api.PolicyConfigType} Enum format of the Config Type
+	 * @param policyConfigType the {@link org.onap.policy.api.PolicyConfigType} Enum format of the Config Type
 	 */
 	public void setPolicyConfigType(PolicyConfigType policyConfigType) {
 		if(policyConfigType!=null){
@@ -252,7 +252,7 @@ public class PolicyParameters {
 	/**
 	 * Gets the requestID of the Policy Parameters. 
 	 * 
-	 * @return unique request ID which will be passed throughout the ECOMP components to correlate logging messages.
+	 * @return unique request ID which will be passed throughout the ONAP components to correlate logging messages.
 	 */
 	public UUID getRequestID() {
 		return requestID;
@@ -261,7 +261,7 @@ public class PolicyParameters {
 	/**
 	 * Sets the requestID of the Policy Parameters. 
 	 * 
-	 * @param requestID unique request ID which will be passed throughout the ECOMP components to correlate logging messages.
+	 * @param requestID unique request ID which will be passed throughout the ONAP components to correlate logging messages.
 	 */
 	public void setRequestID(UUID requestID) {
 		this.requestID = requestID;
@@ -270,7 +270,7 @@ public class PolicyParameters {
 	/**
 	 * Gets the Policy Class of the Policy Parameters. 
 	 * 
-	 * @return {@link org.openecomp.policy.api.PolicyClass} of the Policy Parameters. 
+	 * @return {@link org.onap.policy.api.PolicyClass} of the Policy Parameters. 
 	 */
 	public PolicyClass getPolicyClass() {
 		return policyClass;
@@ -279,7 +279,7 @@ public class PolicyParameters {
 	/**
 	 * Sets the Policy Class of the Policy Parameters. 
 	 * 
-	 * @param policyClass the Enum {@link org.openecomp.policy.api.PolicyClass} to set Policy Class Type of Policy parameters. 
+	 * @param policyClass the Enum {@link org.onap.policy.api.PolicyClass} to set Policy Class Type of Policy parameters. 
 	 */
 	public void setPolicyClass(PolicyClass policyClass) {
 		this.policyClass = policyClass;
@@ -546,7 +546,7 @@ public class PolicyParameters {
 	}
 	
 	public String toString() {
-		return "PolicyParameters [ policyName=" + policyName + ", policyDescription=" + policyDescription + ", ecompName="+ ecompName 
+		return "PolicyParameters [ policyName=" + policyName + ", policyDescription=" + policyDescription + ", onapName="+ onapName 
 				+ ", configName=" + configName + ", attributes=" + attributes + ", configBody=" + configBody 
 				+ ",dynamicRuleAlgorithmLabels=" + dynamicRuleAlgorithmLabels + ",dynamicRuleAlgorithmFunctions=" + dynamicRuleAlgorithmFunctions 
 				+ ",dynamicRuleAlgorithmField1=" + dynamicRuleAlgorithmField1 + ",dynamicRuleAlgorithmField2=" + dynamicRuleAlgorithmField2 
diff --git a/PolicyEngineAPI/src/main/java/org/openecomp/policy/api/PolicyResponse.java b/PolicyEngineAPI/src/main/java/org/onap/policy/api/PolicyResponse.java
index 316f7dd83..ae29585de 100644
--- a/PolicyEngineAPI/src/main/java/org/openecomp/policy/api/PolicyResponse.java
+++ b/PolicyEngineAPI/src/main/java/org/onap/policy/api/PolicyResponse.java
@@ -19,7 +19,7 @@
  */
 
 
-package org.openecomp.policy.api;
+package org.onap.policy.api;
 
 import java.util.Map;
 
@@ -31,7 +31,7 @@ import java.util.Map;
  */
 public interface PolicyResponse {
 	/**
-	 * Gets the {@link org.openecomp.policy.api.PolicyResponseStatus} associated with this <code>PolicyResponse</code>.
+	 * Gets the {@link org.onap.policy.api.PolicyResponseStatus} associated with this <code>PolicyResponse</code>.
 	 * 
 	 * @return the <code>PolicyResponseStatus</code> associated with this <code>PolicyResponse</code>
 	 */
diff --git a/PolicyEngineAPI/src/main/java/org/openecomp/policy/api/PolicyResponseStatus.java b/PolicyEngineAPI/src/main/java/org/onap/policy/api/PolicyResponseStatus.java
index 84fac733d..4368b646d 100644
--- a/PolicyEngineAPI/src/main/java/org/openecomp/policy/api/PolicyResponseStatus.java
+++ b/PolicyEngineAPI/src/main/java/org/onap/policy/api/PolicyResponseStatus.java
@@ -18,13 +18,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.api;
+package org.onap.policy.api;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 
 /**
  * Enumeration of PolicyResponseStatus that can be returned as a part of
- * {@link org.openecomp.policy.api.PolicyResponse}.
+ * {@link org.onap.policy.api.PolicyResponse}.
  * 
  * @version 0.2
  */
diff --git a/PolicyEngineAPI/src/main/java/org/openecomp/policy/api/PolicyType.java b/PolicyEngineAPI/src/main/java/org/onap/policy/api/PolicyType.java
index a0566e039..f026596e9 100644
--- a/PolicyEngineAPI/src/main/java/org/openecomp/policy/api/PolicyType.java
+++ b/PolicyEngineAPI/src/main/java/org/onap/policy/api/PolicyType.java
@@ -18,13 +18,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.api;
+package org.onap.policy.api;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 
 /**
  * Enumeration of the Policy Return Types that can be returned as part of a
- * {@link org.openecomp.policy.api.PolicyConfig}.
+ * {@link org.onap.policy.api.PolicyConfig}.
  * 
  * @version 0.2
  */
diff --git a/PolicyEngineAPI/src/main/java/org/openecomp/policy/api/PushPolicyParameters.java b/PolicyEngineAPI/src/main/java/org/onap/policy/api/PushPolicyParameters.java
index 8a822065b..211be7e65 100644
--- a/PolicyEngineAPI/src/main/java/org/openecomp/policy/api/PushPolicyParameters.java
+++ b/PolicyEngineAPI/src/main/java/org/onap/policy/api/PushPolicyParameters.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.api;
+package org.onap.policy.api;
 
 import java.util.UUID;
 
@@ -46,7 +46,7 @@ public class PushPolicyParameters {
 	 * @param policyName the <code>String</code> format of the Policy Name
 	 * @param policyType the <code>String</code> format of the Policy Type
 	 * @param pdpGroup the <code>String</code> format of the PDPGroup
-	 * @param requestID unique request ID which will be passed throughout the ECOMP components to correlate logging messages.
+	 * @param requestID unique request ID which will be passed throughout the ONAP components to correlate logging messages.
 	 */
 	public PushPolicyParameters(String policyName, String policyType, String pdpGroup, UUID requestID){
 		this.policyName = policyName;
@@ -112,7 +112,7 @@ public class PushPolicyParameters {
 	/**
 	 * Gets the requestID of the Push Policy Parameters. 
 	 * 
-	 * @return unique request ID which will be passed throughout the ECOMP components to correlate logging messages.
+	 * @return unique request ID which will be passed throughout the ONAP components to correlate logging messages.
 	 */
 	public UUID getRequestID() {
 		return requestID;
@@ -121,7 +121,7 @@ public class PushPolicyParameters {
 	/**
 	 * Sets the requestID of the Push Policy Parameters. 
 	 * 
-	 * @param requestID unique request ID which will be passed throughout the ECOMP components to correlate logging messages.
+	 * @param requestID unique request ID which will be passed throughout the ONAP components to correlate logging messages.
 	 */
 	public void setRequestID(UUID requestID) {
 		this.requestID = requestID;
diff --git a/PolicyEngineAPI/src/main/java/org/openecomp/policy/api/RuleProvider.java b/PolicyEngineAPI/src/main/java/org/onap/policy/api/RuleProvider.java
index 99f075a30..c34e05e89 100644
--- a/PolicyEngineAPI/src/main/java/org/openecomp/policy/api/RuleProvider.java
+++ b/PolicyEngineAPI/src/main/java/org/onap/policy/api/RuleProvider.java
@@ -18,13 +18,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.api;
+package org.onap.policy.api;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 
 /**
  * Enumeration of the Attribute Types that is used as a part of
- * {@link org.openecomp.policy.api.PolicyParameters}.
+ * {@link org.onap.policy.api.PolicyParameters}.
  * 
  * @version 0.1
  */
diff --git a/PolicyEngineAPI/src/main/java/org/openecomp/policy/api/package-info.java b/PolicyEngineAPI/src/main/java/org/onap/policy/api/package-info.java
index 982dbb47c..07875bc4c 100644
--- a/PolicyEngineAPI/src/main/java/org/openecomp/policy/api/package-info.java
+++ b/PolicyEngineAPI/src/main/java/org/onap/policy/api/package-info.java
@@ -19,10 +19,10 @@
  */
 
 
-package org.openecomp.policy.api;
+package org.onap.policy.api;
 
 /**
- * org.openecomp.policy.api contains the API for the PolicyEngine ProtoType
+ * org.onap.policy.api contains the API for the PolicyEngine ProtoType
  *
  * @version 0.9
  * 
diff --git a/PolicyEngineAPI/src/main/java/org/openecomp/policy/models/APIConfigResponse.java b/PolicyEngineAPI/src/main/java/org/onap/policy/models/APIConfigResponse.java
index 664522615..a83f743e8 100644
--- a/PolicyEngineAPI/src/main/java/org/openecomp/policy/models/APIConfigResponse.java
+++ b/PolicyEngineAPI/src/main/java/org/onap/policy/models/APIConfigResponse.java
@@ -17,12 +17,12 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.models;
+package org.onap.policy.models;
 
 import java.util.Map;
 
-import org.openecomp.policy.api.PolicyConfigStatus;
-import org.openecomp.policy.api.PolicyType;
+import org.onap.policy.api.PolicyConfigStatus;
+import org.onap.policy.api.PolicyType;
 
 public interface APIConfigResponse {
     public String getPolicyConfigMessage();
diff --git a/PolicyEngineAPI/src/main/java/org/openecomp/policy/models/APIDictionaryResponse.java b/PolicyEngineAPI/src/main/java/org/onap/policy/models/APIDictionaryResponse.java
index 4829bfac8..050f36bf4 100644
--- a/PolicyEngineAPI/src/main/java/org/openecomp/policy/models/APIDictionaryResponse.java
+++ b/PolicyEngineAPI/src/main/java/org/onap/policy/models/APIDictionaryResponse.java
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.models;
+package org.onap.policy.models;
 
 public class APIDictionaryResponse {
     private Object dictionaryData;
diff --git a/PolicyEngineAPI/src/main/java/org/openecomp/policy/models/APIPolicyConfigResponse.java b/PolicyEngineAPI/src/main/java/org/onap/policy/models/APIPolicyConfigResponse.java
index 7be932162..7efee00b8 100644
--- a/PolicyEngineAPI/src/main/java/org/openecomp/policy/models/APIPolicyConfigResponse.java
+++ b/PolicyEngineAPI/src/main/java/org/onap/policy/models/APIPolicyConfigResponse.java
@@ -17,12 +17,12 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.models;
+package org.onap.policy.models;
 
 import java.util.Map;
 
-import org.openecomp.policy.api.PolicyConfigStatus;
-import org.openecomp.policy.api.PolicyType;
+import org.onap.policy.api.PolicyConfigStatus;
+import org.onap.policy.api.PolicyType;
 
 public class APIPolicyConfigResponse implements APIConfigResponse {
     private String policyConfigMessage;
diff --git a/PolicyEngineAPI/src/main/java/org/openecomp/policy/std/AutoClientDMAAP.java b/PolicyEngineAPI/src/main/java/org/onap/policy/std/AutoClientDMAAP.java
index 563cd85ca..3699bfcfb 100644
--- a/PolicyEngineAPI/src/main/java/org/openecomp/policy/std/AutoClientDMAAP.java
+++ b/PolicyEngineAPI/src/main/java/org/onap/policy/std/AutoClientDMAAP.java
@@ -1,16 +1,16 @@
-package org.openecomp.policy.std;
+package org.onap.policy.std;
 
 import java.util.List;
 import java.util.UUID;
 
-import org.openecomp.policy.api.NotificationHandler;
-import org.openecomp.policy.api.NotificationScheme;
-import org.openecomp.policy.api.NotificationType;
-import org.openecomp.policy.api.PDPNotification;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.utils.BusConsumer;
-import org.openecomp.policy.xacml.api.XACMLErrorConstants;
+import org.onap.policy.api.NotificationHandler;
+import org.onap.policy.api.NotificationScheme;
+import org.onap.policy.api.NotificationType;
+import org.onap.policy.api.PDPNotification;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.utils.BusConsumer;
+import org.onap.policy.xacml.api.XACMLErrorConstants;
 
 public class AutoClientDMAAP implements Runnable {
 	private static StdPDPNotification notification = null;
diff --git a/PolicyEngineAPI/src/main/java/org/openecomp/policy/std/AutoClientEnd.java b/PolicyEngineAPI/src/main/java/org/onap/policy/std/AutoClientEnd.java
index 06a2e471e..976b57058 100644
--- a/PolicyEngineAPI/src/main/java/org/openecomp/policy/std/AutoClientEnd.java
+++ b/PolicyEngineAPI/src/main/java/org/onap/policy/std/AutoClientEnd.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.std;
+package org.onap.policy.std;
 
 import java.io.IOException;
 import java.net.URI;
@@ -34,17 +34,17 @@ import javax.websocket.Session;
 
 //import org.apache.log4j.Logger;
 import org.glassfish.tyrus.client.ClientManager;
-import org.openecomp.policy.api.NotificationHandler;
-import org.openecomp.policy.api.NotificationScheme;
-import org.openecomp.policy.api.NotificationType;
-import org.openecomp.policy.api.PDPNotification;
-import org.openecomp.policy.std.NotificationStore;
-import org.openecomp.policy.std.StdPDPNotification;
+import org.onap.policy.api.NotificationHandler;
+import org.onap.policy.api.NotificationScheme;
+import org.onap.policy.api.NotificationType;
+import org.onap.policy.api.PDPNotification;
+import org.onap.policy.std.NotificationStore;
+import org.onap.policy.std.StdPDPNotification;
 
-import org.openecomp.policy.xacml.api.XACMLErrorConstants;
+import org.onap.policy.xacml.api.XACMLErrorConstants;
 import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.databind.JsonMappingException;
-import org.openecomp.policy.common.logging.flexlogger.*; 
+import org.onap.policy.common.logging.flexlogger.*; 
 
 @ClientEndpoint
 public class AutoClientEnd {
diff --git a/PolicyEngineAPI/src/main/java/org/openecomp/policy/std/AutoClientUEB.java b/PolicyEngineAPI/src/main/java/org/onap/policy/std/AutoClientUEB.java
index 782187720..37413f416 100644
--- a/PolicyEngineAPI/src/main/java/org/openecomp/policy/std/AutoClientUEB.java
+++ b/PolicyEngineAPI/src/main/java/org/onap/policy/std/AutoClientUEB.java
@@ -18,20 +18,20 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.std;
+package org.onap.policy.std;
 
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.List;
 import java.util.UUID;
 
-import org.openecomp.policy.api.NotificationHandler;
-import org.openecomp.policy.api.NotificationScheme;
-import org.openecomp.policy.api.NotificationType;
-import org.openecomp.policy.api.PDPNotification;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.xacml.api.XACMLErrorConstants;
+import org.onap.policy.api.NotificationHandler;
+import org.onap.policy.api.NotificationScheme;
+import org.onap.policy.api.NotificationType;
+import org.onap.policy.api.PDPNotification;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.xacml.api.XACMLErrorConstants;
 
 import com.att.nsa.cambria.client.CambriaClientBuilders;
 import com.att.nsa.cambria.client.CambriaClientBuilders.ConsumerBuilder;
diff --git a/PolicyEngineAPI/src/main/java/org/openecomp/policy/std/ManualClientEnd.java b/PolicyEngineAPI/src/main/java/org/onap/policy/std/ManualClientEnd.java
index c006b057b..7e4ba07e8 100644
--- a/PolicyEngineAPI/src/main/java/org/openecomp/policy/std/ManualClientEnd.java
+++ b/PolicyEngineAPI/src/main/java/org/onap/policy/std/ManualClientEnd.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.std;
+package org.onap.policy.std;
 
 import java.io.IOException;
 import java.net.URI;
@@ -35,14 +35,14 @@ import javax.websocket.Session;
 
 //import org.apache.log4j.Logger;
 import org.glassfish.tyrus.client.ClientManager;
-import org.openecomp.policy.api.NotificationScheme;
-import org.openecomp.policy.api.NotificationType;
-import org.openecomp.policy.api.PDPNotification;
-import org.openecomp.policy.std.StdPDPNotification;
+import org.onap.policy.api.NotificationScheme;
+import org.onap.policy.api.NotificationType;
+import org.onap.policy.api.PDPNotification;
+import org.onap.policy.std.StdPDPNotification;
 
-import org.openecomp.policy.xacml.api.XACMLErrorConstants;
+import org.onap.policy.xacml.api.XACMLErrorConstants;
 
-import org.openecomp.policy.common.logging.flexlogger.*; 
+import org.onap.policy.common.logging.flexlogger.*; 
 
 @ClientEndpoint
 public class ManualClientEnd {
diff --git a/PolicyEngineAPI/src/main/java/org/openecomp/policy/std/ManualClientEndDMAAP.java b/PolicyEngineAPI/src/main/java/org/onap/policy/std/ManualClientEndDMAAP.java
index f4a218d66..72ad7ce4a 100644
--- a/PolicyEngineAPI/src/main/java/org/openecomp/policy/std/ManualClientEndDMAAP.java
+++ b/PolicyEngineAPI/src/main/java/org/onap/policy/std/ManualClientEndDMAAP.java
@@ -1,16 +1,16 @@
-package org.openecomp.policy.std;
+package org.onap.policy.std;
 
 import java.util.List;
 
 import org.json.JSONObject;
-import org.openecomp.policy.api.NotificationScheme;
-import org.openecomp.policy.api.NotificationType;
-import org.openecomp.policy.api.PDPNotification;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.utils.BusConsumer;
-import org.openecomp.policy.utils.BusPublisher;
-import org.openecomp.policy.xacml.api.XACMLErrorConstants;
+import org.onap.policy.api.NotificationScheme;
+import org.onap.policy.api.NotificationType;
+import org.onap.policy.api.PDPNotification;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.utils.BusConsumer;
+import org.onap.policy.utils.BusPublisher;
+import org.onap.policy.xacml.api.XACMLErrorConstants;
 
 public class ManualClientEndDMAAP {
 	private static StdPDPNotification notification = null;
diff --git a/PolicyEngineAPI/src/main/java/org/openecomp/policy/std/ManualClientEndUEB.java b/PolicyEngineAPI/src/main/java/org/onap/policy/std/ManualClientEndUEB.java
index 85d5659e8..dcd86eb1f 100644
--- a/PolicyEngineAPI/src/main/java/org/openecomp/policy/std/ManualClientEndUEB.java
+++ b/PolicyEngineAPI/src/main/java/org/onap/policy/std/ManualClientEndUEB.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.std;
+package org.onap.policy.std;
 
 import java.io.IOException;
 import java.net.MalformedURLException;
@@ -26,11 +26,11 @@ import java.net.URL;
 import java.util.List;
 
 import org.json.JSONObject;
-import org.openecomp.policy.api.NotificationScheme;
-import org.openecomp.policy.api.NotificationType;
-import org.openecomp.policy.api.PDPNotification;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.api.NotificationScheme;
+import org.onap.policy.api.NotificationType;
+import org.onap.policy.api.PDPNotification;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
 
 import com.att.nsa.cambria.client.CambriaClientFactory;
 import com.att.nsa.cambria.client.CambriaConsumer;
diff --git a/PolicyEngineAPI/src/main/java/org/openecomp/policy/std/MatchStore.java b/PolicyEngineAPI/src/main/java/org/onap/policy/std/MatchStore.java
index 1459dd9d9..a243c1fc1 100644
--- a/PolicyEngineAPI/src/main/java/org/openecomp/policy/std/MatchStore.java
+++ b/PolicyEngineAPI/src/main/java/org/onap/policy/std/MatchStore.java
@@ -18,20 +18,20 @@
  * ============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.openecomp.policy.std.StdLoadedPolicy;
-import org.openecomp.policy.std.StdPDPNotification;
-import org.openecomp.policy.std.StdRemovedPolicy;
+import org.onap.policy.api.LoadedPolicy;
+import org.onap.policy.api.NotificationType;
+import org.onap.policy.api.PDPNotification;
+import org.onap.policy.api.RemovedPolicy;
+import org.onap.policy.std.StdLoadedPolicy;
+import org.onap.policy.std.StdPDPNotification;
+import org.onap.policy.std.StdRemovedPolicy;
 
-import org.openecomp.policy.common.logging.flexlogger.*; 
+import org.onap.policy.common.logging.flexlogger.*; 
 
 public class MatchStore {
 	private static HashSet<Matches> matchStore = new HashSet<>();
@@ -50,8 +50,8 @@ public class MatchStore {
 				// Check if it is a new Match
 				Boolean match = false;
 				for(Matches oldMatch: matchStore){
-					// Compare ECOMPName
-					if(oldMatch.getEcompName().equals(newMatch.getEcompName())){
+					// Compare ONAPName
+					if(oldMatch.getOnapName().equals(newMatch.getOnapName())){
 						// Compare ConfigName if it exists. 
 						if(newMatch.getConfigName()!=null && oldMatch.getConfigName()!=null){
 							if(oldMatch.getConfigName().equals(newMatch.getConfigName())){
@@ -138,14 +138,14 @@ public class MatchStore {
 						// Again Better way would be comparing sizes first.
 						// Matches are different need to check if has configAttributes
 						if(match.getConfigAttributes()!=null && !match.getConfigAttributes().isEmpty()){
-							// adding ecomp and config to config-attributes. 
+							// adding onap and config to config-attributes. 
 							int compValues = match.getConfigAttributes().size() + 2;
 							if(updatedPolicy.getMatches().size()== compValues){
 								// Comparing both the values.. 
 								boolean matchAttributes = false;
 								for(String newKey: updatedPolicy.getMatches().keySet()){
-									if(newKey.equals("ECOMPName")){
-										if(updatedPolicy.getMatches().get(newKey).equals(match.getEcompName())){
+									if(newKey.equals("ONAPName")){
+										if(updatedPolicy.getMatches().get(newKey).equals(match.getOnapName())){
 											matchAttributes = true;
 										}else {
 											matchAttributes = false;
@@ -184,7 +184,7 @@ public class MatchStore {
 						}else if(match.getConfigName()!=null){
 							// If there are no config Attributes then check if it has Config Name
 							if(updatedPolicy.getMatches().size()== 2){
-								if(updatedPolicy.getMatches().get("ECOMPName").equals(match.getEcompName())){
+								if(updatedPolicy.getMatches().get("ONAPName").equals(match.getOnapName())){
 									if(updatedPolicy.getMatches().get("ConfigName").equals(match.getConfigName())){
 										// Match..
 										matched = true;
@@ -198,9 +198,9 @@ public class MatchStore {
 								break;
 							}
 						}else {
-							// If non exist then assuming the ECOMP Name to be there. 
+							// If non exist then assuming the ONAP Name to be there. 
 							if(updatedPolicy.getMatches().size()== 1){
-								if(updatedPolicy.getMatches().get("ECOMPName").equals(match.getEcompName())){
+								if(updatedPolicy.getMatches().get("ONAPName").equals(match.getOnapName())){
 									// Match.. 
 									matched = true;
 								}else {
diff --git a/PolicyEngineAPI/src/main/java/org/openecomp/policy/std/Matches.java b/PolicyEngineAPI/src/main/java/org/onap/policy/std/Matches.java
index 8e6a8ee97..eb382a63d 100644
--- a/PolicyEngineAPI/src/main/java/org/openecomp/policy/std/Matches.java
+++ b/PolicyEngineAPI/src/main/java/org/onap/policy/std/Matches.java
@@ -18,19 +18,19 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.std;
+package org.onap.policy.std;
 
 import java.util.Map;
 
 public class Matches {
-	private String ecompName = null;
+	private String onapName = null;
 	private String configName = null;
 	private Map<String,String> configAttributes = null;
-	public String getEcompName() {
-		return ecompName;
+	public String getOnapName() {
+		return onapName;
 	}
-	public void setEcompName(String ecompName) {
-		this.ecompName = ecompName;
+	public void setOnapName(String onapName) {
+		this.onapName = onapName;
 	}
 	public String getConfigName() {
 		return configName;
diff --git a/PolicyEngineAPI/src/main/java/org/openecomp/policy/std/NotificationUnMarshal.java b/PolicyEngineAPI/src/main/java/org/onap/policy/std/NotificationUnMarshal.java
index 196f89b3d..2ec174c84 100644
--- a/PolicyEngineAPI/src/main/java/org/openecomp/policy/std/NotificationUnMarshal.java
+++ b/PolicyEngineAPI/src/main/java/org/onap/policy/std/NotificationUnMarshal.java
@@ -18,16 +18,16 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.std;
+package org.onap.policy.std;
 
 import java.util.ArrayList;
 import java.util.Collection;
 
-import org.openecomp.policy.api.LoadedPolicy;
-import org.openecomp.policy.api.RemovedPolicy;
-import org.openecomp.policy.api.UpdateType;
-import org.openecomp.policy.std.StdLoadedPolicy;
-import org.openecomp.policy.std.StdPDPNotification;
+import org.onap.policy.api.LoadedPolicy;
+import org.onap.policy.api.RemovedPolicy;
+import org.onap.policy.api.UpdateType;
+import org.onap.policy.std.StdLoadedPolicy;
+import org.onap.policy.std.StdPDPNotification;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
diff --git a/PolicyEngineAPI/src/main/java/org/openecomp/policy/std/StdDecisionResponse.java b/PolicyEngineAPI/src/main/java/org/onap/policy/std/StdDecisionResponse.java
index 1f4cf65d0..ee3f18e9f 100644
--- a/PolicyEngineAPI/src/main/java/org/openecomp/policy/std/StdDecisionResponse.java
+++ b/PolicyEngineAPI/src/main/java/org/onap/policy/std/StdDecisionResponse.java
@@ -19,10 +19,10 @@
  */
 
 
-package org.openecomp.policy.std;
+package org.onap.policy.std;
 
-import org.openecomp.policy.api.DecisionResponse;
-import org.openecomp.policy.api.PolicyDecision;
+import org.onap.policy.api.DecisionResponse;
+import org.onap.policy.api.PolicyDecision;
 
 /**
  * Decision Response Implementation Class. 
diff --git a/PolicyEngineAPI/src/main/java/org/openecomp/policy/std/StdDictionaryResponse.java b/PolicyEngineAPI/src/main/java/org/onap/policy/std/StdDictionaryResponse.java
index 74eebc354..9e0f93d23 100644
--- a/PolicyEngineAPI/src/main/java/org/openecomp/policy/std/StdDictionaryResponse.java
+++ b/PolicyEngineAPI/src/main/java/org/onap/policy/std/StdDictionaryResponse.java
@@ -18,13 +18,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.std;
+package org.onap.policy.std;
 
 import java.util.Map;
 
 import javax.json.JsonObject;
 
-import org.openecomp.policy.api.DictionaryResponse;
+import org.onap.policy.api.DictionaryResponse;
 
 public class StdDictionaryResponse implements DictionaryResponse {
 	private String dictionaryMessage;
diff --git a/PolicyEngineAPI/src/main/java/org/openecomp/policy/std/StdMetricsResponse.java b/PolicyEngineAPI/src/main/java/org/onap/policy/std/StdMetricsResponse.java
index 8c89e4a9d..539863d60 100644
--- a/PolicyEngineAPI/src/main/java/org/openecomp/policy/std/StdMetricsResponse.java
+++ b/PolicyEngineAPI/src/main/java/org/onap/policy/std/StdMetricsResponse.java
@@ -18,9 +18,9 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.std;
+package org.onap.policy.std;
 
-import org.openecomp.policy.api.MetricsResponse;
+import org.onap.policy.api.MetricsResponse;
 
 public class StdMetricsResponse implements MetricsResponse {
 	private String responseMessage;
diff --git a/PolicyEngineAPI/src/main/java/org/openecomp/policy/std/StdPolicyChangeResponse.java b/PolicyEngineAPI/src/main/java/org/onap/policy/std/StdPolicyChangeResponse.java
index 2fec8605c..240a53c3d 100644
--- a/PolicyEngineAPI/src/main/java/org/openecomp/policy/std/StdPolicyChangeResponse.java
+++ b/PolicyEngineAPI/src/main/java/org/onap/policy/std/StdPolicyChangeResponse.java
@@ -18,9 +18,9 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.std;
+package org.onap.policy.std;
 
-import org.openecomp.policy.api.PolicyChangeResponse;
+import org.onap.policy.api.PolicyChangeResponse;
 
 public class StdPolicyChangeResponse implements PolicyChangeResponse{
 	private String responseMessage = null;
diff --git a/PolicyEngineAPI/src/main/java/org/openecomp/policy/std/StdPolicyConfig.java b/PolicyEngineAPI/src/main/java/org/onap/policy/std/StdPolicyConfig.java
index ec205dab2..8a9b0a0b4 100644
--- a/PolicyEngineAPI/src/main/java/org/openecomp/policy/std/StdPolicyConfig.java
+++ b/PolicyEngineAPI/src/main/java/org/onap/policy/std/StdPolicyConfig.java
@@ -19,16 +19,16 @@
  */
 
 
-package org.openecomp.policy.std;
+package org.onap.policy.std;
 
 import java.util.Map;
 import java.util.Properties;
 
 import javax.json.JsonObject;
 
-import org.openecomp.policy.api.PolicyConfig;
-import org.openecomp.policy.api.PolicyConfigStatus;
-import org.openecomp.policy.api.PolicyType;
+import org.onap.policy.api.PolicyConfig;
+import org.onap.policy.api.PolicyConfigStatus;
+import org.onap.policy.api.PolicyType;
 import org.w3c.dom.Document;
 
 /**
diff --git a/PolicyEngineAPI/src/main/java/org/openecomp/policy/std/StdPolicyEngine.java b/PolicyEngineAPI/src/main/java/org/onap/policy/std/StdPolicyEngine.java
index 0732c3cf5..608bb8de0 100644
--- a/PolicyEngineAPI/src/main/java/org/openecomp/policy/std/StdPolicyEngine.java
+++ b/PolicyEngineAPI/src/main/java/org/onap/policy/std/StdPolicyEngine.java
@@ -19,7 +19,7 @@
  */
 
 
-package org.openecomp.policy.std;
+package org.onap.policy.std;
 
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -51,40 +51,40 @@ import javax.json.JsonReader;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 
-import org.openecomp.policy.api.AttributeType;
-import org.openecomp.policy.api.ConfigRequestParameters;
-import org.openecomp.policy.api.DecisionRequestParameters;
-import org.openecomp.policy.api.DecisionResponse;
-import org.openecomp.policy.api.DeletePolicyParameters;
-import org.openecomp.policy.api.DictionaryParameters;
-import org.openecomp.policy.api.DictionaryResponse;
-import org.openecomp.policy.api.EventRequestParameters;
-import org.openecomp.policy.api.ImportParameters;
-import org.openecomp.policy.api.MetricsRequestParameters;
-import org.openecomp.policy.api.MetricsResponse;
-import org.openecomp.policy.api.NotificationHandler;
-import org.openecomp.policy.api.NotificationScheme;
-import org.openecomp.policy.api.PDPNotification;
-import org.openecomp.policy.api.PolicyChangeResponse;
-import org.openecomp.policy.api.PolicyClass;
-import org.openecomp.policy.api.PolicyConfig;
-import org.openecomp.policy.api.PolicyConfigException;
-import org.openecomp.policy.api.PolicyConfigType;
-import org.openecomp.policy.api.PolicyDecisionException;
-import org.openecomp.policy.api.PolicyEngineException;
-import org.openecomp.policy.api.PolicyEventException;
-import org.openecomp.policy.api.PolicyException;
-import org.openecomp.policy.api.PolicyParameters;
-import org.openecomp.policy.api.PolicyResponse;
-import org.openecomp.policy.api.PolicyType;
-import org.openecomp.policy.api.PushPolicyParameters;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.models.APIDictionaryResponse;
-import org.openecomp.policy.models.APIPolicyConfigResponse;
-import org.openecomp.policy.utils.AAFEnvironment;
-import org.openecomp.policy.utils.PolicyUtils;
-import org.openecomp.policy.xacml.api.XACMLErrorConstants;
+import org.onap.policy.api.AttributeType;
+import org.onap.policy.api.ConfigRequestParameters;
+import org.onap.policy.api.DecisionRequestParameters;
+import org.onap.policy.api.DecisionResponse;
+import org.onap.policy.api.DeletePolicyParameters;
+import org.onap.policy.api.DictionaryParameters;
+import org.onap.policy.api.DictionaryResponse;
+import org.onap.policy.api.EventRequestParameters;
+import org.onap.policy.api.ImportParameters;
+import org.onap.policy.api.MetricsRequestParameters;
+import org.onap.policy.api.MetricsResponse;
+import org.onap.policy.api.NotificationHandler;
+import org.onap.policy.api.NotificationScheme;
+import org.onap.policy.api.PDPNotification;
+import org.onap.policy.api.PolicyChangeResponse;
+import org.onap.policy.api.PolicyClass;
+import org.onap.policy.api.PolicyConfig;
+import org.onap.policy.api.PolicyConfigException;
+import org.onap.policy.api.PolicyConfigType;
+import org.onap.policy.api.PolicyDecisionException;
+import org.onap.policy.api.PolicyEngineException;
+import org.onap.policy.api.PolicyEventException;
+import org.onap.policy.api.PolicyException;
+import org.onap.policy.api.PolicyParameters;
+import org.onap.policy.api.PolicyResponse;
+import org.onap.policy.api.PolicyType;
+import org.onap.policy.api.PushPolicyParameters;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.models.APIDictionaryResponse;
+import org.onap.policy.models.APIPolicyConfigResponse;
+import org.onap.policy.utils.AAFEnvironment;
+import org.onap.policy.utils.PolicyUtils;
+import org.onap.policy.xacml.api.XACMLErrorConstants;
 import org.springframework.core.io.FileSystemResource;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
@@ -205,8 +205,8 @@ public class StdPolicyEngine {
 	/*
 	 * getDecision using the decision Attributes.
 	 */
-	public DecisionResponse getDecision(String eCOMPComponentName, Map<String, String> decisionAttributes, UUID requestID) throws PolicyDecisionException {
-		return getDecisionImpl(eCOMPComponentName, decisionAttributes, requestID);
+	public DecisionResponse getDecision(String onapComponentName, Map<String, String> decisionAttributes, UUID requestID) throws PolicyDecisionException {
+		return getDecisionImpl(onapComponentName, decisionAttributes, requestID);
 	}
 	
 	/*
@@ -218,7 +218,7 @@ public class StdPolicyEngine {
 			LOGGER.error(message);
 			throw new PolicyDecisionException(message);
 		}
-		return getDecisionImpl(decisionRequestParameters.getECOMPComponentName(), decisionRequestParameters.getDecisionAttributes(), decisionRequestParameters.getRequestID());
+		return getDecisionImpl(decisionRequestParameters.getONAPComponentName(), decisionRequestParameters.getDecisionAttributes(), decisionRequestParameters.getRequestID());
 	}
 	
 	/*
@@ -523,7 +523,7 @@ public class StdPolicyEngine {
         }
     }
 
-    public DecisionResponse getDecisionImpl(String eCOMPComponentName,
+    public DecisionResponse getDecisionImpl(String onapComponentName,
 											Map<String, String> decisionAttributes,
 											UUID requestID) throws PolicyDecisionException {
 		String resource= "getDecision";
@@ -533,7 +533,7 @@ public class StdPolicyEngine {
         try {
             DecisionRequestParameters decisionRequestParameters = new DecisionRequestParameters();
             decisionRequestParameters.setDecisionAttributes(decisionAttributes);
-            decisionRequestParameters.setECOMPComponentName(eCOMPComponentName);
+            decisionRequestParameters.setONAPComponentName(onapComponentName);
             decisionRequestParameters.setRequestID(requestID);
             body = PolicyUtils.objectToJsonString(decisionRequestParameters);
         } catch (JsonProcessingException e) {
@@ -650,8 +650,8 @@ public class StdPolicyEngine {
         HashMap<String, String> configAttributes = new HashMap<>();
         try{
             for(String key: matchingConditions.keySet()){
-                if(key.equalsIgnoreCase("ECOMPName")){
-                    match.setEcompName(matchingConditions.get(key));
+                if(key.equalsIgnoreCase("ONAPName")){
+                    match.setOnapName(matchingConditions.get(key));
                 }else if(key.equalsIgnoreCase("ConfigName")){
                     match.setConfigName(matchingConditions.get(key));
                 }else{
@@ -663,8 +663,8 @@ public class StdPolicyEngine {
             }
             MatchStore.storeMatch(match);
         }catch(Exception e){
-            LOGGER.info("StoreMatch failed for Ecomp:"
-                    + match.getEcompName() + " Config: "
+            LOGGER.info("StoreMatch failed for Onap:"
+                    + match.getOnapName() + " Config: "
                     + match.getConfigName());
         }
     }
@@ -1138,10 +1138,10 @@ public class StdPolicyEngine {
 		return pushPolicyImpl(pushPolicyParameters).getResponseMessage();
 	}
 	
-	public String createUpdateConfigPolicy(String policyName, String policyDescription, String ecompName, String configName,
+	public String createUpdateConfigPolicy(String policyName, String policyDescription, String onapName, String configName,
 			Map<String, String> configAttributes, String configType, String body, String policyScope, UUID requestID,
 			String riskLevel, String riskType, String guard, String ttlDate, boolean updateFlag) throws PolicyException {
-		return createUpdateConfigPolicyImpl(policyName, policyDescription, ecompName, configName,
+		return createUpdateConfigPolicyImpl(policyName, policyDescription, onapName, configName,
 				configAttributes, configType, body, policyScope, requestID,
 				riskLevel, riskType, guard, ttlDate, updateFlag);
 	}
@@ -1149,7 +1149,7 @@ public class StdPolicyEngine {
 	/*
 	 * Create Config Policy API Implementation
 	 */
-	public String createUpdateConfigPolicyImpl(String policyName, String policyDescription, String ecompName, String configName,
+	public String createUpdateConfigPolicyImpl(String policyName, String policyDescription, String onapName, String configName,
 			Map<String, String> configAttributes, String configType, String body, String policyScope, UUID requestID,
 			String riskLevel, String riskType, String guard, String ttlDate, boolean updateFlag) throws PolicyException {
 		PolicyParameters policyParameters = new PolicyParameters();
@@ -1167,7 +1167,7 @@ public class StdPolicyEngine {
 		}
 		policyParameters.setPolicyName(policyScope+"."+policyName);
 		policyParameters.setPolicyDescription(policyDescription);
-		policyParameters.setEcompName(ecompName);
+		policyParameters.setOnapName(onapName);
 		policyParameters.setConfigName(configName);
 		Map<AttributeType, Map<String, String>> attributes = new HashMap<AttributeType, Map<String, String>>();
 		attributes.put(AttributeType.MATCHING, configAttributes);
diff --git a/PolicyEngineAPI/src/main/java/org/openecomp/policy/std/StdPolicyResponse.java b/PolicyEngineAPI/src/main/java/org/onap/policy/std/StdPolicyResponse.java
index eed40ba2e..3ab57f2be 100644
--- a/PolicyEngineAPI/src/main/java/org/openecomp/policy/std/StdPolicyResponse.java
+++ b/PolicyEngineAPI/src/main/java/org/onap/policy/std/StdPolicyResponse.java
@@ -19,12 +19,12 @@
  */
 
 
-package org.openecomp.policy.std;
+package org.onap.policy.std;
 
 import java.util.Map;
 
-import org.openecomp.policy.api.PolicyResponse;
-import org.openecomp.policy.api.PolicyResponseStatus;
+import org.onap.policy.api.PolicyResponse;
+import org.onap.policy.api.PolicyResponseStatus;
 
 /**
  * PolicyResponse Implementation class. 
diff --git a/PolicyEngineAPI/src/main/java/org/openecomp/policy/std/StdStatus.java b/PolicyEngineAPI/src/main/java/org/onap/policy/std/StdStatus.java
index a7d22b7cb..798cbde37 100644
--- a/PolicyEngineAPI/src/main/java/org/openecomp/policy/std/StdStatus.java
+++ b/PolicyEngineAPI/src/main/java/org/onap/policy/std/StdStatus.java
@@ -19,20 +19,20 @@
  */
 
 
-package org.openecomp.policy.std;
+package org.onap.policy.std;
 
 import java.util.Map;
 import java.util.Properties;
 
 import javax.json.JsonObject;
 
-import org.openecomp.policy.api.DecisionResponse;
-import org.openecomp.policy.api.PolicyConfig;
-import org.openecomp.policy.api.PolicyConfigStatus;
-import org.openecomp.policy.api.PolicyDecision;
-import org.openecomp.policy.api.PolicyResponse;
-import org.openecomp.policy.api.PolicyResponseStatus;
-import org.openecomp.policy.api.PolicyType;
+import org.onap.policy.api.DecisionResponse;
+import org.onap.policy.api.PolicyConfig;
+import org.onap.policy.api.PolicyConfigStatus;
+import org.onap.policy.api.PolicyDecision;
+import org.onap.policy.api.PolicyResponse;
+import org.onap.policy.api.PolicyResponseStatus;
+import org.onap.policy.api.PolicyType;
 import org.w3c.dom.Document;
 
 public class StdStatus extends StdPolicyResponse implements PolicyConfig, PolicyResponse, DecisionResponse{
diff --git a/PolicyEngineAPI/src/main/java/org/openecomp/policy/std/package-info.java b/PolicyEngineAPI/src/main/java/org/onap/policy/std/package-info.java
index a10f347e9..5d6bbcb92 100644
--- a/PolicyEngineAPI/src/main/java/org/openecomp/policy/std/package-info.java
+++ b/PolicyEngineAPI/src/main/java/org/onap/policy/std/package-info.java
@@ -18,9 +18,9 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.std;
+package org.onap.policy.std;
 /**
- * Provides standard implementations of the interfaces from the {@link org.openecomp.policy.api} package.
+ * Provides standard implementations of the interfaces from the {@link org.onap.policy.api} package.
  *
  * @version 0.3 
  *
diff --git a/PolicyEngineAPI/src/main/resources/logback.xml b/PolicyEngineAPI/src/main/resources/logback.xml
index 098db5a54..9f725493e 100644
--- a/PolicyEngineAPI/src/main/resources/logback.xml
+++ b/PolicyEngineAPI/src/main/resources/logback.xml
@@ -27,7 +27,7 @@
   <property name="debugDir" value="logs" />
   
   <!--  specify the component name 
-    <ECOMP-component-name>::= "MSO" | "DCAE" | "ASDC " | "AAI" |"Policy" | "SDNC" | "AC"  -->
+    <ONAP-component-name>::= "MSO" | "DCAE" | "ASDC " | "AAI" |"Policy" | "SDNC" | "AC"  -->
   <property name="componentName" value="Policy"></property>
   <property name="subComponentName" value="PolicyEngineAPI"></property>
   
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/AutoClientEndTest.java b/PolicyEngineAPI/src/test/java/org/onap/policy/std/test/AutoClientEndTest.java
index 86f15992a..203b9f54f 100644
--- a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/AutoClientEndTest.java
+++ b/PolicyEngineAPI/src/test/java/org/onap/policy/std/test/AutoClientEndTest.java
@@ -18,17 +18,17 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.std.test;
+package org.onap.policy.std.test;
 
 import static org.junit.Assert.assertNotNull;
 
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.openecomp.policy.api.NotificationHandler;
-import org.openecomp.policy.api.NotificationScheme;
-import org.openecomp.policy.std.AutoClientEnd;
-import org.openecomp.policy.std.StdPolicyEngine;
+import org.onap.policy.api.NotificationHandler;
+import org.onap.policy.api.NotificationScheme;
+import org.onap.policy.std.AutoClientEnd;
+import org.onap.policy.std.StdPolicyEngine;
 
 /**
  * The class <code>AutoClientEndTest</code> contains tests for the class <code>{@link AutoClientEnd}</code>.
@@ -81,7 +81,7 @@ public class AutoClientEndTest {
 
 		// add additional test code here
 		// An unexpected exception was thrown in user code while executing this test:
-		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.AutoClientEnd
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.onap.policy.std.AutoClientEnd
 		assertNotNull(result);
 	}
 
@@ -105,7 +105,7 @@ public class AutoClientEndTest {
 		// An unexpected exception was thrown in user code while executing this test:
 		//    java.lang.ExceptionInInitializerError
 		//       at org.apache.log4j.Logger.getLogger(Logger.java:104)
-		//       at org.openecomp.policy.std.AutoClientEnd.<clinit>(AutoClientEnd.java:39)
+		//       at org.onap.policy.std.AutoClientEnd.<clinit>(AutoClientEnd.java:39)
 	}
 
 	/**
@@ -140,7 +140,7 @@ public class AutoClientEndTest {
 
 		// add additional test code here
 		// An unexpected exception was thrown in user code while executing this test:
-		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.AutoClientEnd
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.onap.policy.std.AutoClientEnd
 	}
 
 
@@ -160,7 +160,7 @@ public class AutoClientEndTest {
 
 		// add additional test code here
 		// An unexpected exception was thrown in user code while executing this test:
-		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.AutoClientEnd
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.onap.policy.std.AutoClientEnd
 	}
 
 	/**
@@ -178,7 +178,7 @@ public class AutoClientEndTest {
 
 		// add additional test code here
 		// An unexpected exception was thrown in user code while executing this test:
-		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.AutoClientEnd
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.onap.policy.std.AutoClientEnd
 	}
 
 	/**
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/AutoClientUEBTest.java b/PolicyEngineAPI/src/test/java/org/onap/policy/std/test/AutoClientUEBTest.java
index 28889677b..94c2ac781 100644
--- a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/AutoClientUEBTest.java
+++ b/PolicyEngineAPI/src/test/java/org/onap/policy/std/test/AutoClientUEBTest.java
@@ -18,15 +18,15 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.std.test;
+package org.onap.policy.std.test;
 
 import java.util.LinkedList;
 import java.util.List;
 
 import org.junit.*;
-import org.openecomp.policy.api.NotificationHandler;
-import org.openecomp.policy.api.NotificationScheme;
-import org.openecomp.policy.std.AutoClientUEB;
+import org.onap.policy.api.NotificationHandler;
+import org.onap.policy.api.NotificationScheme;
+import org.onap.policy.std.AutoClientUEB;
 
 import static org.junit.Assert.*;
 
@@ -58,7 +58,7 @@ public class AutoClientUEBTest {
 		// An unexpected exception was thrown in user code while executing this test:
 		//    java.lang.ExceptionInInitializerError
 		//       at org.apache.log4j.Logger.getLogger(Logger.java:104)
-		//       at org.openecomp.policy.std.AutoClientUEB.<clinit>(AutoClientUEB.java:39)
+		//       at org.onap.policy.std.AutoClientUEB.<clinit>(AutoClientUEB.java:39)
 		assertNotNull(result);
 	}
 
@@ -77,7 +77,7 @@ public class AutoClientUEBTest {
 
 		// add additional test code here
 		// An unexpected exception was thrown in user code while executing this test:
-		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.AutoClientUEB
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.onap.policy.std.AutoClientUEB
 		assertNull(result);
 	}
 
@@ -96,7 +96,7 @@ public class AutoClientUEBTest {
 
 		// add additional test code here
 		// An unexpected exception was thrown in user code while executing this test:
-		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.AutoClientUEB
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.onap.policy.std.AutoClientUEB
 		assertFalse(result);
 	}
 
@@ -115,7 +115,7 @@ public class AutoClientUEBTest {
 
 		// add additional test code here
 		// An unexpected exception was thrown in user code while executing this test:
-		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.AutoClientUEB
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.onap.policy.std.AutoClientUEB
 		assertNotNull(result);
 	}
 
@@ -136,7 +136,7 @@ public class AutoClientUEBTest {
 
 		// add additional test code here
 		// An unexpected exception was thrown in user code while executing this test:
-		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.AutoClientUEB
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.onap.policy.std.AutoClientUEB
 		assertTrue(result);
 	}
 
@@ -157,7 +157,7 @@ public class AutoClientUEBTest {
 
 		// add additional test code here
 		// An unexpected exception was thrown in user code while executing this test:
-		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.AutoClientUEB
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.onap.policy.std.AutoClientUEB
 	}
 
 	/**
@@ -177,7 +177,7 @@ public class AutoClientUEBTest {
 
 		// add additional test code here
 		// An unexpected exception was thrown in user code while executing this test:
-		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.AutoClientUEB
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.onap.policy.std.AutoClientUEB
 	}
 
 	/**
@@ -197,7 +197,7 @@ public class AutoClientUEBTest {
 
 		// add additional test code here
 		// An unexpected exception was thrown in user code while executing this test:
-		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.AutoClientUEB
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.onap.policy.std.AutoClientUEB
 	}
 
 	/**
@@ -217,7 +217,7 @@ public class AutoClientUEBTest {
 
 		// add additional test code here
 		// An unexpected exception was thrown in user code while executing this test:
-		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.AutoClientUEB
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.onap.policy.std.AutoClientUEB
 	}
 
 	/**
@@ -237,7 +237,7 @@ public class AutoClientUEBTest {
 
 		// add additional test code here
 		// An unexpected exception was thrown in user code while executing this test:
-		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.AutoClientUEB
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.onap.policy.std.AutoClientUEB
 	}
 
 	/**
@@ -257,7 +257,7 @@ public class AutoClientUEBTest {
 
 		// add additional test code here
 		// An unexpected exception was thrown in user code while executing this test:
-		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.AutoClientUEB
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.onap.policy.std.AutoClientUEB
 	}
 
 	/**
@@ -277,7 +277,7 @@ public class AutoClientUEBTest {
 
 		// add additional test code here
 		// An unexpected exception was thrown in user code while executing this test:
-		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.AutoClientUEB
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.onap.policy.std.AutoClientUEB
 	}
 
 	/**
@@ -297,7 +297,7 @@ public class AutoClientUEBTest {
 
 		// add additional test code here
 		// An unexpected exception was thrown in user code while executing this test:
-		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.AutoClientUEB
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.onap.policy.std.AutoClientUEB
 	}
 
 	/**
@@ -317,7 +317,7 @@ public class AutoClientUEBTest {
 
 		// add additional test code here
 		// An unexpected exception was thrown in user code while executing this test:
-		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.AutoClientUEB
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.onap.policy.std.AutoClientUEB
 	}
 
 	/**
@@ -337,7 +337,7 @@ public class AutoClientUEBTest {
 
 		// add additional test code here
 		// An unexpected exception was thrown in user code while executing this test:
-		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.AutoClientUEB
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.onap.policy.std.AutoClientUEB
 	}
 
 	/**
@@ -357,7 +357,7 @@ public class AutoClientUEBTest {
 
 		// add additional test code here
 		// An unexpected exception was thrown in user code while executing this test:
-		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.AutoClientUEB
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.onap.policy.std.AutoClientUEB
 	}
 
 	/**
@@ -377,7 +377,7 @@ public class AutoClientUEBTest {
 
 		// add additional test code here
 		// An unexpected exception was thrown in user code while executing this test:
-		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.AutoClientUEB
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.onap.policy.std.AutoClientUEB
 	}
 
 	/**
@@ -397,7 +397,7 @@ public class AutoClientUEBTest {
 
 		// add additional test code here
 		// An unexpected exception was thrown in user code while executing this test:
-		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.AutoClientUEB
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.onap.policy.std.AutoClientUEB
 	}
 
 	/**
@@ -417,7 +417,7 @@ public class AutoClientUEBTest {
 
 		// add additional test code here
 		// An unexpected exception was thrown in user code while executing this test:
-		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.AutoClientUEB
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.onap.policy.std.AutoClientUEB
 	}
 
 	/**
@@ -437,7 +437,7 @@ public class AutoClientUEBTest {
 
 		// add additional test code here
 		// An unexpected exception was thrown in user code while executing this test:
-		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.AutoClientUEB
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.onap.policy.std.AutoClientUEB
 	}
 
 	/**
@@ -457,7 +457,7 @@ public class AutoClientUEBTest {
 
 		// add additional test code here
 		// An unexpected exception was thrown in user code while executing this test:
-		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.AutoClientUEB
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.onap.policy.std.AutoClientUEB
 	}
 
 	/**
@@ -479,7 +479,7 @@ public class AutoClientUEBTest {
 
 		// add additional test code here
 		// An unexpected exception was thrown in user code while executing this test:
-		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.AutoClientUEB
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.onap.policy.std.AutoClientUEB
 	}
 
 	/**
@@ -498,7 +498,7 @@ public class AutoClientUEBTest {
 
 		// add additional test code here
 		// An unexpected exception was thrown in user code while executing this test:
-		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.AutoClientUEB
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.onap.policy.std.AutoClientUEB
 	}
 
 	/**
@@ -518,7 +518,7 @@ public class AutoClientUEBTest {
 
 		// add additional test code here
 		// An unexpected exception was thrown in user code while executing this test:
-		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.AutoClientUEB
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.onap.policy.std.AutoClientUEB
 	}
 
 	/**
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/Handler.java b/PolicyEngineAPI/src/test/java/org/onap/policy/std/test/Handler.java
index 9879174cb..388ca078d 100644
--- a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/Handler.java
+++ b/PolicyEngineAPI/src/test/java/org/onap/policy/std/test/Handler.java
@@ -18,22 +18,22 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.std.test;
+package org.onap.policy.std.test;
 
 import java.util.Collection;
 
-import org.openecomp.policy.api.LoadedPolicy;
-import org.openecomp.policy.api.NotificationHandler;
-import org.openecomp.policy.api.NotificationType;
-import org.openecomp.policy.api.PDPNotification;
-import org.openecomp.policy.api.PolicyConfig;
-import org.openecomp.policy.api.PolicyConfigException;
-import org.openecomp.policy.api.PolicyConfigStatus;
-import org.openecomp.policy.api.PolicyEngine;
-import org.openecomp.policy.api.PolicyEngineException;
-import org.openecomp.policy.api.RemovedPolicy;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.api.LoadedPolicy;
+import org.onap.policy.api.NotificationHandler;
+import org.onap.policy.api.NotificationType;
+import org.onap.policy.api.PDPNotification;
+import org.onap.policy.api.PolicyConfig;
+import org.onap.policy.api.PolicyConfigException;
+import org.onap.policy.api.PolicyConfigStatus;
+import org.onap.policy.api.PolicyEngine;
+import org.onap.policy.api.PolicyEngineException;
+import org.onap.policy.api.RemovedPolicy;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
 
 public class Handler implements NotificationHandler{
 	
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/ManualClientEndTest.java b/PolicyEngineAPI/src/test/java/org/onap/policy/std/test/ManualClientEndTest.java
index c44dac606..2ae522c1d 100644
--- a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/ManualClientEndTest.java
+++ b/PolicyEngineAPI/src/test/java/org/onap/policy/std/test/ManualClientEndTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.std.test;
+package org.onap.policy.std.test;
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
@@ -26,9 +26,9 @@ import static org.junit.Assert.assertNull;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.openecomp.policy.api.NotificationScheme;
-import org.openecomp.policy.api.PDPNotification;
-import org.openecomp.policy.std.ManualClientEnd;
+import org.onap.policy.api.NotificationScheme;
+import org.onap.policy.api.PDPNotification;
+import org.onap.policy.std.ManualClientEnd;
 
 /**
  * The class <code>ManualClientEndTest</code> contains tests for the class <code>{@link ManualClientEnd}</code>.
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/ManualClientEndUEBTest.java b/PolicyEngineAPI/src/test/java/org/onap/policy/std/test/ManualClientEndUEBTest.java
index f19697597..77b0c6f49 100644
--- a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/ManualClientEndUEBTest.java
+++ b/PolicyEngineAPI/src/test/java/org/onap/policy/std/test/ManualClientEndUEBTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.std.test;
+package org.onap.policy.std.test;
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
@@ -29,10 +29,10 @@ import java.util.List;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.openecomp.policy.api.NotificationScheme;
-import org.openecomp.policy.api.PDPNotification;
-import org.openecomp.policy.std.ManualClientEndUEB;
-import org.openecomp.policy.std.StdPDPNotification;
+import org.onap.policy.api.NotificationScheme;
+import org.onap.policy.api.PDPNotification;
+import org.onap.policy.std.ManualClientEndUEB;
+import org.onap.policy.std.StdPDPNotification;
 
 /**
  * The class <code>ManualClientEndUEBTest</code> contains tests for the class <code>{@link ManualClientEndUEB}</code>.
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/MatchStoreTest.java b/PolicyEngineAPI/src/test/java/org/onap/policy/std/test/MatchStoreTest.java
index ab8946c60..856474dd8 100644
--- a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/MatchStoreTest.java
+++ b/PolicyEngineAPI/src/test/java/org/onap/policy/std/test/MatchStoreTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.std.test;
+package org.onap.policy.std.test;
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
@@ -29,10 +29,10 @@ import java.util.Hashtable;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.openecomp.policy.api.PDPNotification;
-import org.openecomp.policy.std.MatchStore;
-import org.openecomp.policy.std.Matches;
-import org.openecomp.policy.std.StdPDPNotification;
+import org.onap.policy.api.PDPNotification;
+import org.onap.policy.std.MatchStore;
+import org.onap.policy.std.Matches;
+import org.onap.policy.std.StdPDPNotification;
 
 /**
  * The class <code>MatchStoreTest</code> contains tests for the class <code>{@link MatchStore}</code>.
@@ -70,7 +70,7 @@ public class MatchStoreTest {
 
 		// add additional test code here
 		// An unexpected exception was thrown in user code while executing this test:
-		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.MatchStore
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.onap.policy.std.MatchStore
 		assertNull(result);
 	}
 
@@ -90,7 +90,7 @@ public class MatchStoreTest {
 
 		// add additional test code here
 		// An unexpected exception was thrown in user code while executing this test:
-		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.MatchStore
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.onap.policy.std.MatchStore
 		assertNotNull(result);
 	}
 
@@ -110,7 +110,7 @@ public class MatchStoreTest {
 
 		// add additional test code here
 		// An unexpected exception was thrown in user code while executing this test:
-		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.MatchStore
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.onap.policy.std.MatchStore
 		assertNotNull(result);
 	}
 
@@ -130,7 +130,7 @@ public class MatchStoreTest {
 
 		// add additional test code here
 		// An unexpected exception was thrown in user code while executing this test:
-		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.MatchStore
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.onap.policy.std.MatchStore
 		assertNotNull(result);
 	}
 
@@ -150,7 +150,7 @@ public class MatchStoreTest {
 
 		// add additional test code here
 		// An unexpected exception was thrown in user code while executing this test:
-		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.MatchStore
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.onap.policy.std.MatchStore
 		assertNotNull(result);
 	}
 
@@ -170,7 +170,7 @@ public class MatchStoreTest {
 
 		// add additional test code here
 		// An unexpected exception was thrown in user code while executing this test:
-		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.MatchStore
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.onap.policy.std.MatchStore
 		assertNotNull(result);
 	}
 
@@ -190,7 +190,7 @@ public class MatchStoreTest {
 
 		// add additional test code here
 		// An unexpected exception was thrown in user code while executing this test:
-		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.MatchStore
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.onap.policy.std.MatchStore
 		assertNotNull(result);
 	}
 
@@ -210,7 +210,7 @@ public class MatchStoreTest {
 
 		// add additional test code here
 		// An unexpected exception was thrown in user code while executing this test:
-		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.MatchStore
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.onap.policy.std.MatchStore
 		assertNotNull(result);
 	}
 
@@ -230,7 +230,7 @@ public class MatchStoreTest {
 
 		// add additional test code here
 		// An unexpected exception was thrown in user code while executing this test:
-		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.MatchStore
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.onap.policy.std.MatchStore
 		assertNotNull(result);
 	}
 
@@ -250,7 +250,7 @@ public class MatchStoreTest {
 
 		// add additional test code here
 		// An unexpected exception was thrown in user code while executing this test:
-		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.MatchStore
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.onap.policy.std.MatchStore
 		assertNotNull(result);
 	}
 
@@ -270,7 +270,7 @@ public class MatchStoreTest {
 
 		// add additional test code here
 		// An unexpected exception was thrown in user code while executing this test:
-		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.MatchStore
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.onap.policy.std.MatchStore
 		assertNotNull(result);
 	}
 
@@ -290,7 +290,7 @@ public class MatchStoreTest {
 
 		// add additional test code here
 		// An unexpected exception was thrown in user code while executing this test:
-		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.MatchStore
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.onap.policy.std.MatchStore
 		assertNotNull(result);
 	}
 
@@ -310,7 +310,7 @@ public class MatchStoreTest {
 
 		// add additional test code here
 		// An unexpected exception was thrown in user code while executing this test:
-		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.MatchStore
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.onap.policy.std.MatchStore
 		assertNotNull(result);
 	}
 
@@ -330,7 +330,7 @@ public class MatchStoreTest {
 
 		// add additional test code here
 		// An unexpected exception was thrown in user code while executing this test:
-		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.MatchStore
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.onap.policy.std.MatchStore
 		assertNotNull(result);
 	}
 
@@ -350,7 +350,7 @@ public class MatchStoreTest {
 
 		// add additional test code here
 		// An unexpected exception was thrown in user code while executing this test:
-		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.MatchStore
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.onap.policy.std.MatchStore
 		assertNotNull(result);
 	}
 
@@ -370,7 +370,7 @@ public class MatchStoreTest {
 
 		// add additional test code here
 		// An unexpected exception was thrown in user code while executing this test:
-		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.MatchStore
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.onap.policy.std.MatchStore
 		assertNotNull(result);
 	}
 
@@ -391,7 +391,7 @@ public class MatchStoreTest {
 		// An unexpected exception was thrown in user code while executing this test:
 		//    java.lang.ExceptionInInitializerError
 		//       at org.apache.log4j.Logger.getLogger(Logger.java:104)
-		//       at org.openecomp.policy.std.MatchStore.<clinit>(MatchStore.java:15)
+		//       at org.onap.policy.std.MatchStore.<clinit>(MatchStore.java:15)
 		assertNotNull(result);
 	}
 
@@ -407,13 +407,13 @@ public class MatchStoreTest {
 		throws Exception {
 		Matches newMatch = new Matches();
 		newMatch.setConfigName("");
-		newMatch.setEcompName("");
+		newMatch.setOnapName("");
 
 		MatchStore.storeMatch(newMatch);
 
 		// add additional test code here
 		// An unexpected exception was thrown in user code while executing this test:
-		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.MatchStore
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.onap.policy.std.MatchStore
 	}
 
 	/**
@@ -428,13 +428,13 @@ public class MatchStoreTest {
 		throws Exception {
 		Matches newMatch = new Matches();
 		newMatch.setConfigName("");
-		newMatch.setEcompName("");
+		newMatch.setOnapName("");
 
 		MatchStore.storeMatch(newMatch);
 
 		// add additional test code here
 		// An unexpected exception was thrown in user code while executing this test:
-		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.MatchStore
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.onap.policy.std.MatchStore
 	}
 
 	/**
@@ -449,13 +449,13 @@ public class MatchStoreTest {
 		throws Exception {
 		Matches newMatch = new Matches();
 		newMatch.setConfigName("");
-		newMatch.setEcompName("");
+		newMatch.setOnapName("");
 
 		MatchStore.storeMatch(newMatch);
 
 		// add additional test code here
 		// An unexpected exception was thrown in user code while executing this test:
-		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.MatchStore
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.onap.policy.std.MatchStore
 	}
 
 	/**
@@ -471,13 +471,13 @@ public class MatchStoreTest {
 		Matches newMatch = new Matches();
 		newMatch.setConfigAttributes(new Hashtable<String, String>());
 		newMatch.setConfigName("");
-		newMatch.setEcompName("");
+		newMatch.setOnapName("");
 
 		MatchStore.storeMatch(newMatch);
 
 		// add additional test code here
 		// An unexpected exception was thrown in user code while executing this test:
-		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.MatchStore
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.onap.policy.std.MatchStore
 	}
 
 	/**
@@ -493,13 +493,13 @@ public class MatchStoreTest {
 		Matches newMatch = new Matches();
 		newMatch.setConfigAttributes(new Hashtable<String, String>());
 		newMatch.setConfigName("");
-		newMatch.setEcompName("");
+		newMatch.setOnapName("");
 
 		MatchStore.storeMatch(newMatch);
 
 		// add additional test code here
 		// An unexpected exception was thrown in user code while executing this test:
-		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.MatchStore
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.onap.policy.std.MatchStore
 	}
 
 	/**
@@ -515,13 +515,13 @@ public class MatchStoreTest {
 		Matches newMatch = new Matches();
 		newMatch.setConfigAttributes(new Hashtable<String, String>());
 		newMatch.setConfigName("");
-		newMatch.setEcompName("");
+		newMatch.setOnapName("");
 
 		MatchStore.storeMatch(newMatch);
 
 		// add additional test code here
 		// An unexpected exception was thrown in user code while executing this test:
-		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.MatchStore
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.onap.policy.std.MatchStore
 	}
 
 	/**
@@ -537,13 +537,13 @@ public class MatchStoreTest {
 		Matches newMatch = new Matches();
 		newMatch.setConfigAttributes(new Hashtable<String, String>());
 		newMatch.setConfigName("");
-		newMatch.setEcompName("");
+		newMatch.setOnapName("");
 
 		MatchStore.storeMatch(newMatch);
 
 		// add additional test code here
 		// An unexpected exception was thrown in user code while executing this test:
-		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.MatchStore
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.onap.policy.std.MatchStore
 	}
 
 	/**
@@ -558,13 +558,13 @@ public class MatchStoreTest {
 		throws Exception {
 		Matches newMatch = new Matches();
 		newMatch.setConfigName("");
-		newMatch.setEcompName("");
+		newMatch.setOnapName("");
 
 		MatchStore.storeMatch(newMatch);
 
 		// add additional test code here
 		// An unexpected exception was thrown in user code while executing this test:
-		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.MatchStore
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.onap.policy.std.MatchStore
 	}
 
 	/**
@@ -578,13 +578,13 @@ public class MatchStoreTest {
 	public void testStoreMatch_9()
 		throws Exception {
 		Matches newMatch = new Matches();
-		newMatch.setEcompName("");
+		newMatch.setOnapName("");
 
 		MatchStore.storeMatch(newMatch);
 
 		// add additional test code here
 		// An unexpected exception was thrown in user code while executing this test:
-		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.MatchStore
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.onap.policy.std.MatchStore
 	}
 
 	/**
@@ -600,13 +600,13 @@ public class MatchStoreTest {
 		Matches newMatch = new Matches();
 		newMatch.setConfigAttributes(new Hashtable<String, String>());
 		newMatch.setConfigName("");
-		newMatch.setEcompName("");
+		newMatch.setOnapName("");
 
 		MatchStore.storeMatch(newMatch);
 
 		// add additional test code here
 		// An unexpected exception was thrown in user code while executing this test:
-		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.MatchStore
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.onap.policy.std.MatchStore
 	}
 
 	/**
@@ -622,13 +622,13 @@ public class MatchStoreTest {
 		Matches newMatch = new Matches();
 		newMatch.setConfigAttributes(new Hashtable<String, String>());
 		newMatch.setConfigName("");
-		newMatch.setEcompName("");
+		newMatch.setOnapName("");
 
 		MatchStore.storeMatch(newMatch);
 
 		// add additional test code here
 		// An unexpected exception was thrown in user code while executing this test:
-		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.MatchStore
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.onap.policy.std.MatchStore
 	}
 
 	/**
@@ -644,13 +644,13 @@ public class MatchStoreTest {
 		Matches newMatch = new Matches();
 		newMatch.setConfigAttributes(new Hashtable<String, String>());
 		newMatch.setConfigName("");
-		newMatch.setEcompName("");
+		newMatch.setOnapName("");
 
 		MatchStore.storeMatch(newMatch);
 
 		// add additional test code here
 		// An unexpected exception was thrown in user code while executing this test:
-		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.MatchStore
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.onap.policy.std.MatchStore
 	}
 
 	/**
@@ -666,13 +666,13 @@ public class MatchStoreTest {
 		Matches newMatch = new Matches();
 		newMatch.setConfigAttributes(new Hashtable<String, String>());
 		newMatch.setConfigName("");
-		newMatch.setEcompName("");
+		newMatch.setOnapName("");
 
 		MatchStore.storeMatch(newMatch);
 
 		// add additional test code here
 		// An unexpected exception was thrown in user code while executing this test:
-		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.MatchStore
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.onap.policy.std.MatchStore
 	}
 
 	/**
@@ -688,13 +688,13 @@ public class MatchStoreTest {
 		Matches newMatch = new Matches();
 		newMatch.setConfigAttributes(new Hashtable<String, String>());
 		newMatch.setConfigName("");
-		newMatch.setEcompName("");
+		newMatch.setOnapName("");
 
 		MatchStore.storeMatch(newMatch);
 
 		// add additional test code here
 		// An unexpected exception was thrown in user code while executing this test:
-		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.MatchStore
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.onap.policy.std.MatchStore
 	}
 
 	/**
@@ -713,7 +713,7 @@ public class MatchStoreTest {
 
 		// add additional test code here
 		// An unexpected exception was thrown in user code while executing this test:
-		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.MatchStore
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.onap.policy.std.MatchStore
 	}
 
 	/**
@@ -732,7 +732,7 @@ public class MatchStoreTest {
 
 		// add additional test code here
 		// An unexpected exception was thrown in user code while executing this test:
-		//    java.lang.NoClassDefFoundError: Could not initialize class org.openecomp.policy.std.MatchStore
+		//    java.lang.NoClassDefFoundError: Could not initialize class org.onap.policy.std.MatchStore
 	}
 
 	/**
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/MatchesTest.java b/PolicyEngineAPI/src/test/java/org/onap/policy/std/test/MatchesTest.java
index cdc9b5595..f71d93cb8 100644
--- a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/MatchesTest.java
+++ b/PolicyEngineAPI/src/test/java/org/onap/policy/std/test/MatchesTest.java
@@ -18,13 +18,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.std.test;
+package org.onap.policy.std.test;
 
 import java.util.Hashtable;
 import java.util.Map;
 
 import org.junit.*;
-import org.openecomp.policy.std.Matches;
+import org.onap.policy.std.Matches;
 
 import static org.junit.Assert.*;
 
@@ -59,7 +59,7 @@ public class MatchesTest {
 	public void testGetConfigAttributes_1()
 		throws Exception {
 		Matches fixture = new Matches();
-		fixture.setEcompName("");
+		fixture.setOnapName("");
 		fixture.setConfigAttributes(new Hashtable<String, String>());
 		fixture.setConfigName("");
 
@@ -81,7 +81,7 @@ public class MatchesTest {
 	public void testGetConfigName_1()
 		throws Exception {
 		Matches fixture = new Matches();
-		fixture.setEcompName("");
+		fixture.setOnapName("");
 		fixture.setConfigAttributes(new Hashtable<String, String>());
 		fixture.setConfigName("");
 
@@ -92,21 +92,21 @@ public class MatchesTest {
 	}
 
 	/**
-	 * Run the String getEcompName() method test.
+	 * Run the String getOnapName() method test.
 	 *
 	 * @throws Exception
 	 *
 	 * @generatedBy CodePro at 6/1/16 1:41 PM
 	 */
 	@Test
-	public void testGetEcompName_1()
+	public void testGetOnapName_1()
 		throws Exception {
 		Matches fixture = new Matches();
-		fixture.setEcompName("");
+		fixture.setOnapName("");
 		fixture.setConfigAttributes(new Hashtable<String, String>());
 		fixture.setConfigName("");
 
-		String result = fixture.getEcompName();
+		String result = fixture.getOnapName();
 
 		// add additional test code here
 		assertEquals("", result);
@@ -123,7 +123,7 @@ public class MatchesTest {
 	public void testSetConfigAttributes_1()
 		throws Exception {
 		Matches fixture = new Matches();
-		fixture.setEcompName("");
+		fixture.setOnapName("");
 		fixture.setConfigAttributes(new Hashtable<String, String>());
 		fixture.setConfigName("");
 		Map<String, String> configAttributes = new Hashtable<String, String>();
@@ -144,7 +144,7 @@ public class MatchesTest {
 	public void testSetConfigName_1()
 		throws Exception {
 		Matches fixture = new Matches();
-		fixture.setEcompName("");
+		fixture.setOnapName("");
 		fixture.setConfigAttributes(new Hashtable<String, String>());
 		fixture.setConfigName("");
 		String configName = "";
@@ -155,22 +155,22 @@ public class MatchesTest {
 	}
 
 	/**
-	 * Run the void setEcompName(String) method test.
+	 * Run the void setOnapName(String) method test.
 	 *
 	 * @throws Exception
 	 *
 	 * @generatedBy CodePro at 6/1/16 1:41 PM
 	 */
 	@Test
-	public void testSetEcompName_1()
+	public void testSetOnapName_1()
 		throws Exception {
 		Matches fixture = new Matches();
-		fixture.setEcompName("");
+		fixture.setOnapName("");
 		fixture.setConfigAttributes(new Hashtable<String, String>());
 		fixture.setConfigName("");
-		String ecompName = "";
+		String onapName = "";
 
-		fixture.setEcompName(ecompName);
+		fixture.setOnapName(onapName);
 
 		// add additional test code here
 	}
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/NotificationStoreTest.java b/PolicyEngineAPI/src/test/java/org/onap/policy/std/test/NotificationStoreTest.java
index d54c4f4cb..ed7383e1a 100644
--- a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/NotificationStoreTest.java
+++ b/PolicyEngineAPI/src/test/java/org/onap/policy/std/test/NotificationStoreTest.java
@@ -18,11 +18,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.std.test;
+package org.onap.policy.std.test;
 
 import org.junit.*;
-import org.openecomp.policy.std.NotificationStore;
-import org.openecomp.policy.std.StdPDPNotification;
+import org.onap.policy.std.NotificationStore;
+import org.onap.policy.std.StdPDPNotification;
 
 import static org.junit.Assert.*;
 
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/NotificationUnMarshalTest.java b/PolicyEngineAPI/src/test/java/org/onap/policy/std/test/NotificationUnMarshalTest.java
index 674c58a00..fb42f98aa 100644
--- a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/NotificationUnMarshalTest.java
+++ b/PolicyEngineAPI/src/test/java/org/onap/policy/std/test/NotificationUnMarshalTest.java
@@ -18,15 +18,15 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.std.test;
+package org.onap.policy.std.test;
 
 import static org.junit.Assert.assertNotNull;
 
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.openecomp.policy.std.NotificationUnMarshal;
-import org.openecomp.policy.std.StdPDPNotification;
+import org.onap.policy.std.NotificationUnMarshal;
+import org.onap.policy.std.StdPDPNotification;
 
 /**
  * The class <code>NotificationUnMarshalTest</code> contains tests for the class <code>{@link NotificationUnMarshal}</code>.
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/StdLoadedPolicyTest.java b/PolicyEngineAPI/src/test/java/org/onap/policy/std/test/StdLoadedPolicyTest.java
index de8a6a7ad..c45a5aca7 100644
--- a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/StdLoadedPolicyTest.java
+++ b/PolicyEngineAPI/src/test/java/org/onap/policy/std/test/StdLoadedPolicyTest.java
@@ -18,14 +18,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.std.test;
+package org.onap.policy.std.test;
 
 import java.util.Hashtable;
 import java.util.Map;
 
 import org.junit.*;
-import org.openecomp.policy.api.UpdateType;
-import org.openecomp.policy.std.StdLoadedPolicy;
+import org.onap.policy.api.UpdateType;
+import org.onap.policy.std.StdLoadedPolicy;
 
 import static org.junit.Assert.*;
 
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/StdPDPNotificationTest.java b/PolicyEngineAPI/src/test/java/org/onap/policy/std/test/StdPDPNotificationTest.java
index 1bda0e59f..6a558006d 100644
--- a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/StdPDPNotificationTest.java
+++ b/PolicyEngineAPI/src/test/java/org/onap/policy/std/test/StdPDPNotificationTest.java
@@ -18,18 +18,18 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.std.test;
+package org.onap.policy.std.test;
 
 import java.util.Collection;
 import java.util.LinkedList;
 
 import org.junit.*;
-import org.openecomp.policy.api.LoadedPolicy;
-import org.openecomp.policy.api.NotificationType;
-import org.openecomp.policy.api.RemovedPolicy;
-import org.openecomp.policy.std.StdLoadedPolicy;
-import org.openecomp.policy.std.StdPDPNotification;
-import org.openecomp.policy.std.StdRemovedPolicy;
+import org.onap.policy.api.LoadedPolicy;
+import org.onap.policy.api.NotificationType;
+import org.onap.policy.api.RemovedPolicy;
+import org.onap.policy.std.StdLoadedPolicy;
+import org.onap.policy.std.StdPDPNotification;
+import org.onap.policy.std.StdRemovedPolicy;
 
 import static org.junit.Assert.*;
 
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/StdPolicyChangeResponseTest.java b/PolicyEngineAPI/src/test/java/org/onap/policy/std/test/StdPolicyChangeResponseTest.java
index 45c70187d..5ce53d133 100644
--- a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/StdPolicyChangeResponseTest.java
+++ b/PolicyEngineAPI/src/test/java/org/onap/policy/std/test/StdPolicyChangeResponseTest.java
@@ -18,10 +18,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.std.test;
+package org.onap.policy.std.test;
 
 import org.junit.*;
-import org.openecomp.policy.std.StdPolicyChangeResponse;
+import org.onap.policy.std.StdPolicyChangeResponse;
 
 import static org.junit.Assert.*;
 
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/StdPolicyConfigTest.java b/PolicyEngineAPI/src/test/java/org/onap/policy/std/test/StdPolicyConfigTest.java
index a34737477..736f51b57 100644
--- a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/StdPolicyConfigTest.java
+++ b/PolicyEngineAPI/src/test/java/org/onap/policy/std/test/StdPolicyConfigTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.std.test;
+package org.onap.policy.std.test;
 
 import java.util.Hashtable;
 import java.util.Map;
@@ -27,9 +27,9 @@ import java.util.Properties;
 import javax.json.JsonObject;
 
 import org.junit.*;
-import org.openecomp.policy.api.PolicyConfigStatus;
-import org.openecomp.policy.api.PolicyType;
-import org.openecomp.policy.std.StdPolicyConfig;
+import org.onap.policy.api.PolicyConfigStatus;
+import org.onap.policy.api.PolicyType;
+import org.onap.policy.std.StdPolicyConfig;
 
 import static org.junit.Assert.*;
 
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/StdPolicyResponseTest.java b/PolicyEngineAPI/src/test/java/org/onap/policy/std/test/StdPolicyResponseTest.java
index a593c460b..11179aece 100644
--- a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/StdPolicyResponseTest.java
+++ b/PolicyEngineAPI/src/test/java/org/onap/policy/std/test/StdPolicyResponseTest.java
@@ -18,14 +18,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.std.test;
+package org.onap.policy.std.test;
 
 import java.util.Hashtable;
 import java.util.Map;
 
 import org.junit.*;
-import org.openecomp.policy.api.PolicyResponseStatus;
-import org.openecomp.policy.std.StdPolicyResponse;
+import org.onap.policy.api.PolicyResponseStatus;
+import org.onap.policy.std.StdPolicyResponse;
 
 import static org.junit.Assert.*;
 
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/StdRemovedPolicyTest.java b/PolicyEngineAPI/src/test/java/org/onap/policy/std/test/StdRemovedPolicyTest.java
index 0a0865c82..2482c3015 100644
--- a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/StdRemovedPolicyTest.java
+++ b/PolicyEngineAPI/src/test/java/org/onap/policy/std/test/StdRemovedPolicyTest.java
@@ -18,10 +18,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.std.test;
+package org.onap.policy.std.test;
 
 import org.junit.*;
-import org.openecomp.policy.std.StdRemovedPolicy;
+import org.onap.policy.std.StdRemovedPolicy;
 
 import static org.junit.Assert.*;
 
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/StdStatusTest.java b/PolicyEngineAPI/src/test/java/org/onap/policy/std/test/StdStatusTest.java
index 34918c2ea..b72d2568d 100644
--- a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/StdStatusTest.java
+++ b/PolicyEngineAPI/src/test/java/org/onap/policy/std/test/StdStatusTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.std.test;
+package org.onap.policy.std.test;
 
 import java.util.Hashtable;
 import java.util.Map;
@@ -27,11 +27,11 @@ import java.util.Properties;
 import javax.json.JsonObject;
 
 import org.junit.*;
-import org.openecomp.policy.api.PolicyConfigStatus;
-import org.openecomp.policy.api.PolicyDecision;
-import org.openecomp.policy.api.PolicyResponseStatus;
-import org.openecomp.policy.api.PolicyType;
-import org.openecomp.policy.std.StdStatus;
+import org.onap.policy.api.PolicyConfigStatus;
+import org.onap.policy.api.PolicyDecision;
+import org.onap.policy.api.PolicyResponseStatus;
+import org.onap.policy.api.PolicyType;
+import org.onap.policy.std.StdStatus;
 
 import static org.junit.Assert.*;
 
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/package-info.java b/PolicyEngineAPI/src/test/java/org/onap/policy/std/test/package-info.java
index 75bfc39ad..4c98f98a9 100644
--- a/PolicyEngineAPI/src/test/java/org/openecomp/policy/std/test/package-info.java
+++ b/PolicyEngineAPI/src/test/java/org/onap/policy/std/test/package-info.java
@@ -24,4 +24,4 @@
 /**
  *
  */
-package org.openecomp.policy.std.test;
+package org.onap.policy.std.test;
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/ActionPolicyApiTest.java b/PolicyEngineAPI/src/test/java/org/onap/policy/test/ActionPolicyApiTest.java
index 398efe0f1..a66256432 100644
--- a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/ActionPolicyApiTest.java
+++ b/PolicyEngineAPI/src/test/java/org/onap/policy/test/ActionPolicyApiTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.test;
+package org.onap.policy.test;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -27,15 +27,15 @@ import java.util.UUID;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;
-import org.openecomp.policy.api.AttributeType;
-import org.openecomp.policy.api.PolicyChangeResponse;
-import org.openecomp.policy.api.PolicyClass;
-import org.openecomp.policy.api.PolicyEngine;
-import org.openecomp.policy.api.PolicyEngineException;
-import org.openecomp.policy.api.PolicyParameters;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.std.StdPolicyChangeResponse;
+import org.onap.policy.api.AttributeType;
+import org.onap.policy.api.PolicyChangeResponse;
+import org.onap.policy.api.PolicyClass;
+import org.onap.policy.api.PolicyEngine;
+import org.onap.policy.api.PolicyEngineException;
+import org.onap.policy.api.PolicyParameters;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.std.StdPolicyChangeResponse;
 
 import junit.framework.TestCase; 
 
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/AttributeTypeTest.java b/PolicyEngineAPI/src/test/java/org/onap/policy/test/AttributeTypeTest.java
index df8713ab8..62c447fae 100644
--- a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/AttributeTypeTest.java
+++ b/PolicyEngineAPI/src/test/java/org/onap/policy/test/AttributeTypeTest.java
@@ -18,10 +18,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.test;
+package org.onap.policy.test;
 
 import org.junit.*;
-import org.openecomp.policy.api.AttributeType;
+import org.onap.policy.api.AttributeType;
 
 import static org.junit.Assert.*;
 
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/ConfigBasePolicyTest.java b/PolicyEngineAPI/src/test/java/org/onap/policy/test/ConfigBasePolicyTest.java
index 69de7fe87..5d5a076ae 100644
--- a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/ConfigBasePolicyTest.java
+++ b/PolicyEngineAPI/src/test/java/org/onap/policy/test/ConfigBasePolicyTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.test;
+package org.onap.policy.test;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -26,16 +26,16 @@ import java.util.UUID;
 
 import org.junit.Test;
 import org.mockito.Mockito;
-import org.openecomp.policy.api.AttributeType;
-import org.openecomp.policy.api.PolicyChangeResponse;
-import org.openecomp.policy.api.PolicyConfigType;
-import org.openecomp.policy.api.PolicyEngine;
-import org.openecomp.policy.api.PolicyEngineException;
-import org.openecomp.policy.api.PolicyParameters;
-import org.openecomp.policy.api.PolicyType;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.std.StdPolicyChangeResponse;
+import org.onap.policy.api.AttributeType;
+import org.onap.policy.api.PolicyChangeResponse;
+import org.onap.policy.api.PolicyConfigType;
+import org.onap.policy.api.PolicyEngine;
+import org.onap.policy.api.PolicyEngineException;
+import org.onap.policy.api.PolicyParameters;
+import org.onap.policy.api.PolicyType;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.std.StdPolicyChangeResponse;
 
 import junit.framework.TestCase; 
 
@@ -77,7 +77,7 @@ public class ConfigBasePolicyTest extends TestCase {
 
         policyParameters.setPolicyConfigType(PolicyConfigType.Base); //required
         policyParameters.setPolicyName("test.junitTest"); //required
-        policyParameters.setEcompName("test");
+        policyParameters.setOnapName("test");
         policyParameters.setConfigName("testBase");
         policyParameters.setConfigBodyType(PolicyType.OTHER);
         policyParameters.setConfigBody("testing");
@@ -204,9 +204,9 @@ public class ConfigBasePolicyTest extends TestCase {
 	}
 	
 	@Test
-	public final void testCreatePolicyNullEcompName() {
-		response.setResponseMessage("PE300 - Data Issue: No ECOMP Name given.");
-		policyParameters.setEcompName(null);
+	public final void testCreatePolicyNullOnapName() {
+		response.setResponseMessage("PE300 - Data Issue: No ONAP Name given.");
+		policyParameters.setOnapName(null);
 		try{
 			result = policyEngine.createPolicy(policyParameters);
 		} catch (Exception e){
@@ -276,9 +276,9 @@ public class ConfigBasePolicyTest extends TestCase {
 	}
 	
 	@Test
-	public final void testUpdatePolicyNullEcompName() {
-		response.setResponseMessage("PE300 - Data Issue: No ECOMP Name given.");
-		policyParameters.setEcompName(null);
+	public final void testUpdatePolicyNullOnapName() {
+		response.setResponseMessage("PE300 - Data Issue: No ONAP Name given.");
+		policyParameters.setOnapName(null);
 		try{
 			result = policyEngine.updatePolicy(policyParameters);
 		} catch (Exception e){
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/ConfigFirewallPolicyTest.java b/PolicyEngineAPI/src/test/java/org/onap/policy/test/ConfigFirewallPolicyTest.java
index 280f06e10..78ae2493b 100644
--- a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/ConfigFirewallPolicyTest.java
+++ b/PolicyEngineAPI/src/test/java/org/onap/policy/test/ConfigFirewallPolicyTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.test;
+package org.onap.policy.test;
 
 import java.io.StringReader;
 import java.util.UUID;
@@ -29,14 +29,14 @@ import javax.json.JsonReader;
 
 import org.junit.Test;
 import org.mockito.Mockito;
-import org.openecomp.policy.api.PolicyChangeResponse;
-import org.openecomp.policy.api.PolicyConfigType;
-import org.openecomp.policy.api.PolicyEngine;
-import org.openecomp.policy.api.PolicyEngineException;
-import org.openecomp.policy.api.PolicyParameters;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.std.StdPolicyChangeResponse;
+import org.onap.policy.api.PolicyChangeResponse;
+import org.onap.policy.api.PolicyConfigType;
+import org.onap.policy.api.PolicyEngine;
+import org.onap.policy.api.PolicyEngineException;
+import org.onap.policy.api.PolicyParameters;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.std.StdPolicyChangeResponse;
 
 import junit.framework.TestCase; 
 
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/ConfigRequestParametersTest.java b/PolicyEngineAPI/src/test/java/org/onap/policy/test/ConfigRequestParametersTest.java
index 0e8f912c9..91025f5c0 100644
--- a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/ConfigRequestParametersTest.java
+++ b/PolicyEngineAPI/src/test/java/org/onap/policy/test/ConfigRequestParametersTest.java
@@ -18,14 +18,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.test;
+package org.onap.policy.test;
 
 import java.util.Hashtable;
 import java.util.Map;
 import java.util.UUID;
 
 import org.junit.*;
-import org.openecomp.policy.api.ConfigRequestParameters;
+import org.onap.policy.api.ConfigRequestParameters;
 
 import static org.junit.Assert.*;
 
@@ -55,7 +55,7 @@ public class ConfigRequestParametersTest {
 		assertEquals(null, result.getConfigName());
 		assertEquals(null, result.getConfigAttributes());
 		assertEquals(null, result.getRequestID());
-		assertEquals(null, result.getEcompName());
+		assertEquals(null, result.getOnapName());
 		assertEquals(Boolean.FALSE, result.getUnique());
 	}
 
@@ -70,19 +70,19 @@ public class ConfigRequestParametersTest {
 	public void testConfigRequestParameters_2()
 		throws Exception {
 		String policyName = "";
-		String eCOMPComponentName = "";
+		String onapComponentName = "";
 		String configName = "";
 		Map<String, String> configAttributes = new Hashtable<String, String>();
 		Boolean unique = new Boolean(true);
 		UUID requestID = UUID.randomUUID();
 
-		ConfigRequestParameters result = createConfigRequest(policyName, eCOMPComponentName, configName, configAttributes, unique, requestID);
+		ConfigRequestParameters result = createConfigRequest(policyName, onapComponentName, configName, configAttributes, unique, requestID);
 
 		// add additional test code here
 		assertNotNull(result);
 		assertEquals("", result.getPolicyName());
 		assertEquals("", result.getConfigName());
-		assertEquals("", result.getEcompName());
+		assertEquals("", result.getOnapName());
 		assertEquals(Boolean.TRUE, result.getUnique());
 	}
 
@@ -124,18 +124,18 @@ public class ConfigRequestParametersTest {
 	}
 
 	/**
-	 * Run the String getEcompName() method test.
+	 * Run the String getOnapName() method test.
 	 *
 	 * @throws Exception
 	 *
 	 * @generatedBy CodePro at 6/1/16 1:40 PM
 	 */
 	@Test
-	public void testGetEcompName_1()
+	public void testGetOnapName_1()
 		throws Exception {
 		ConfigRequestParameters fixture = createConfigRequest("", "", "", new Hashtable<String, String>(), new Boolean(true), UUID.randomUUID());
 
-		String result = fixture.getEcompName();
+		String result = fixture.getOnapName();
 
 		// add additional test code here
 		assertEquals("", result);
@@ -257,19 +257,19 @@ public class ConfigRequestParametersTest {
 	}
 
 	/**
-	 * Run the void setEcompName(String) method test.
+	 * Run the void setOnapName(String) method test.
 	 *
 	 * @throws Exception
 	 *
 	 * @generatedBy CodePro at 6/1/16 1:40 PM
 	 */
 	@Test
-	public void testSetEcompName_1()
+	public void testSetOnapName_1()
 		throws Exception {
 		ConfigRequestParameters fixture = createConfigRequest("", "", "", new Hashtable<String, String>(), new Boolean(true), UUID.randomUUID());
-		String eCOMPComponentName = "";
+		String onapComponentName = "";
 
-		fixture.setEcompName(eCOMPComponentName);
+		fixture.setOnapName(onapComponentName);
 
 		// add additional test code here
 	}
@@ -349,11 +349,11 @@ public class ConfigRequestParametersTest {
 		new org.junit.runner.JUnitCore().run(ConfigRequestParametersTest.class);
 	}
 	
-	private ConfigRequestParameters createConfigRequest(String policyName, String eCOMPComponentName, String configName, Map<String,String> configAttributes, Boolean unique, UUID requestID){
+	private ConfigRequestParameters createConfigRequest(String policyName, String onapComponentName, String configName, Map<String,String> configAttributes, Boolean unique, UUID requestID){
 		ConfigRequestParameters configRequestParameters = new ConfigRequestParameters();
 		configRequestParameters.setRequestID(requestID);
 		configRequestParameters.setPolicyName(policyName);
-		configRequestParameters.setEcompName(eCOMPComponentName);
+		configRequestParameters.setOnapName(onapComponentName);
 		configRequestParameters.setConfigName(configName);
 		configRequestParameters.setConfigAttributes(configAttributes);
 		configRequestParameters.makeUnique(unique);
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/DecisionPolicyApiTest.java b/PolicyEngineAPI/src/test/java/org/onap/policy/test/DecisionPolicyApiTest.java
index 82ba1c7ca..a80093470 100644
--- a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/DecisionPolicyApiTest.java
+++ b/PolicyEngineAPI/src/test/java/org/onap/policy/test/DecisionPolicyApiTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.test;
+package org.onap.policy.test;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -26,15 +26,15 @@ import java.util.UUID;
 
 import org.junit.Test;
 import org.mockito.Mockito;
-import org.openecomp.policy.api.AttributeType;
-import org.openecomp.policy.api.PolicyChangeResponse;
-import org.openecomp.policy.api.PolicyClass;
-import org.openecomp.policy.api.PolicyEngine;
-import org.openecomp.policy.api.PolicyEngineException;
-import org.openecomp.policy.api.PolicyParameters;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.std.StdPolicyChangeResponse;
+import org.onap.policy.api.AttributeType;
+import org.onap.policy.api.PolicyChangeResponse;
+import org.onap.policy.api.PolicyClass;
+import org.onap.policy.api.PolicyEngine;
+import org.onap.policy.api.PolicyEngineException;
+import org.onap.policy.api.PolicyParameters;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.std.StdPolicyChangeResponse;
 
 import junit.framework.TestCase;
 
@@ -76,7 +76,7 @@ public class DecisionPolicyApiTest extends TestCase {
 
         policyParameters.setPolicyClass(PolicyClass.Decision); //required
         policyParameters.setPolicyName("test.junitTest"); //required
-        policyParameters.setEcompName("test");
+        policyParameters.setOnapName("test");
         policyParameters.setPolicyDescription("testing");  //optional
         //policyParameters.setPolicyScope("test"); //Directory will be created where the Policies are saved... this displays a a subscope on the GUI
         
@@ -170,9 +170,9 @@ public class DecisionPolicyApiTest extends TestCase {
 	}
 	
 	@Test
-	public final void testCreatePolicyNullEcompName() {
+	public final void testCreatePolicyNullOnapName() {
 		response.setResponseMessage("PE500 - Process Flow Issue: :500:");
-		policyParameters.setEcompName(null);
+		policyParameters.setOnapName(null);
 		try{
 			result = policyEngine.createPolicy(policyParameters);
 		} catch (Exception e){
@@ -206,9 +206,9 @@ public class DecisionPolicyApiTest extends TestCase {
 	}
 	
 	@Test
-	public final void testUpdatePolicyNullEcompName() {
+	public final void testUpdatePolicyNullOnapName() {
 		response.setResponseMessage("PE500 - Process Flow Issue: :500:");
-		policyParameters.setEcompName(null);
+		policyParameters.setOnapName(null);
 		try{
 			result = policyEngine.updatePolicy(policyParameters);
 		} catch (Exception e){
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/DecisionRequestParametersTest.java b/PolicyEngineAPI/src/test/java/org/onap/policy/test/DecisionRequestParametersTest.java
index d8fdfbc0a..746822f94 100644
--- a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/DecisionRequestParametersTest.java
+++ b/PolicyEngineAPI/src/test/java/org/onap/policy/test/DecisionRequestParametersTest.java
@@ -18,14 +18,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.test;
+package org.onap.policy.test;
 
 import java.util.Hashtable;
 import java.util.Map;
 import java.util.UUID;
 
 import org.junit.*;
-import org.openecomp.policy.api.DecisionRequestParameters;
+import org.onap.policy.api.DecisionRequestParameters;
 
 import static org.junit.Assert.*;
 
@@ -51,7 +51,7 @@ public class DecisionRequestParametersTest {
 
 		// add additional test code here
 		assertNotNull(result);
-		assertEquals(null, result.getECOMPComponentName());
+		assertEquals(null, result.getONAPComponentName());
 		assertEquals(null, result.getDecisionAttributes());
 		assertEquals(null, result.getRequestID());
 	}
@@ -66,15 +66,15 @@ public class DecisionRequestParametersTest {
 	@Test
 	public void testDecisionRequestParameters_2()
 		throws Exception {
-		String eCOMPComponentName = "";
+		String onapComponentName = "";
 		Map<String, String> decisionAttributes = new Hashtable<String, String>();
 		UUID requestID = UUID.randomUUID();
 
-		DecisionRequestParameters result = new DecisionRequestParameters(eCOMPComponentName, decisionAttributes, requestID);
+		DecisionRequestParameters result = new DecisionRequestParameters(onapComponentName, decisionAttributes, requestID);
 
 		// add additional test code here
 		assertNotNull(result);
-		assertEquals("", result.getECOMPComponentName());
+		assertEquals("", result.getONAPComponentName());
 	}
 
 	/**
@@ -97,18 +97,18 @@ public class DecisionRequestParametersTest {
 	}
 
 	/**
-	 * Run the String getECOMPComponentName() method test.
+	 * Run the String getONAPComponentName() method test.
 	 *
 	 * @throws Exception
 	 *
 	 * @generatedBy CodePro at 6/1/16 1:41 PM
 	 */
 	@Test
-	public void testGetECOMPComponentName_1()
+	public void testGetONAPComponentName_1()
 		throws Exception {
 		DecisionRequestParameters fixture = new DecisionRequestParameters("", new Hashtable<String, String>(), UUID.randomUUID());
 
-		String result = fixture.getECOMPComponentName();
+		String result = fixture.getONAPComponentName();
 
 		// add additional test code here
 		assertEquals("", result);
@@ -156,19 +156,19 @@ public class DecisionRequestParametersTest {
 	}
 
 	/**
-	 * Run the void setECOMPComponentName(String) method test.
+	 * Run the void setONAPComponentName(String) method test.
 	 *
 	 * @throws Exception
 	 *
 	 * @generatedBy CodePro at 6/1/16 1:41 PM
 	 */
 	@Test
-	public void testSetECOMPComponentName_1()
+	public void testSetONAPComponentName_1()
 		throws Exception {
 		DecisionRequestParameters fixture = new DecisionRequestParameters("", new Hashtable<String, String>(), UUID.randomUUID());
-		String eCOMPComponentName = "";
+		String onapComponentName = "";
 
-		fixture.setECOMPComponentName(eCOMPComponentName);
+		fixture.setONAPComponentName(onapComponentName);
 
 		// add additional test code here
 	}
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/DeletePolicyConditionTest.java b/PolicyEngineAPI/src/test/java/org/onap/policy/test/DeletePolicyConditionTest.java
index c2941202b..2513816bb 100644
--- a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/DeletePolicyConditionTest.java
+++ b/PolicyEngineAPI/src/test/java/org/onap/policy/test/DeletePolicyConditionTest.java
@@ -18,10 +18,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.test;
+package org.onap.policy.test;
 
 import org.junit.*;
-import org.openecomp.policy.api.DeletePolicyCondition;
+import org.onap.policy.api.DeletePolicyCondition;
 
 import static org.junit.Assert.*;
 
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/DeletePolicyParametersTest.java b/PolicyEngineAPI/src/test/java/org/onap/policy/test/DeletePolicyParametersTest.java
index 7723f9819..423b839f6 100644
--- a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/DeletePolicyParametersTest.java
+++ b/PolicyEngineAPI/src/test/java/org/onap/policy/test/DeletePolicyParametersTest.java
@@ -18,13 +18,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.test;
+package org.onap.policy.test;
 
 import java.util.UUID;
 
 import org.junit.*;
-import org.openecomp.policy.api.DeletePolicyCondition;
-import org.openecomp.policy.api.DeletePolicyParameters;
+import org.onap.policy.api.DeletePolicyCondition;
+import org.onap.policy.api.DeletePolicyParameters;
 
 import static org.junit.Assert.*;
 
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/EventRequestParametersTest.java b/PolicyEngineAPI/src/test/java/org/onap/policy/test/EventRequestParametersTest.java
index abfc31f8b..4fecea8c2 100644
--- a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/EventRequestParametersTest.java
+++ b/PolicyEngineAPI/src/test/java/org/onap/policy/test/EventRequestParametersTest.java
@@ -18,14 +18,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.test;
+package org.onap.policy.test;
 
 import java.util.Hashtable;
 import java.util.Map;
 import java.util.UUID;
 
 import org.junit.*;
-import org.openecomp.policy.api.EventRequestParameters;
+import org.onap.policy.api.EventRequestParameters;
 
 import static org.junit.Assert.*;
 
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/GetConfigByPolicyNameTest.java b/PolicyEngineAPI/src/test/java/org/onap/policy/test/GetConfigByPolicyNameTest.java
index 7bfa27c6e..07af71eaf 100644
--- a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/GetConfigByPolicyNameTest.java
+++ b/PolicyEngineAPI/src/test/java/org/onap/policy/test/GetConfigByPolicyNameTest.java
@@ -18,18 +18,18 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.test;
+package org.onap.policy.test;
 
 import java.util.Collection;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.openecomp.policy.api.PolicyConfig;
-import org.openecomp.policy.api.PolicyConfigException;
-import org.openecomp.policy.api.PolicyEngine;
-import org.openecomp.policy.api.PolicyEngineException;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.api.PolicyConfig;
+import org.onap.policy.api.PolicyConfigException;
+import org.onap.policy.api.PolicyEngine;
+import org.onap.policy.api.PolicyEngineException;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
 
 import junit.framework.TestCase; 
 
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/GetConfigStringStringMapTest.java b/PolicyEngineAPI/src/test/java/org/onap/policy/test/GetConfigStringStringMapTest.java
index c5b7f8f6d..f70a16a98 100644
--- a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/GetConfigStringStringMapTest.java
+++ b/PolicyEngineAPI/src/test/java/org/onap/policy/test/GetConfigStringStringMapTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.test;
+package org.onap.policy.test;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -31,19 +31,19 @@ import java.util.Map;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.openecomp.policy.api.PolicyConfig;
-import org.openecomp.policy.api.PolicyConfigException;
-import org.openecomp.policy.api.PolicyConfigStatus;
-import org.openecomp.policy.api.PolicyEngine;
-import org.openecomp.policy.api.PolicyEngineException;
-import org.openecomp.policy.api.PolicyType;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger; 
+import org.onap.policy.api.PolicyConfig;
+import org.onap.policy.api.PolicyConfigException;
+import org.onap.policy.api.PolicyConfigStatus;
+import org.onap.policy.api.PolicyEngine;
+import org.onap.policy.api.PolicyEngineException;
+import org.onap.policy.api.PolicyType;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger; 
 
 public class GetConfigStringStringMapTest {
 
 	private PolicyEngine policyEngine = null;
-	private String eCOMPComponentName = null;
+	private String onapComponentName = null;
 	private String configName = null;
 	private Map<String,String> configAttributes = new HashMap<String,String>();
 	private Collection<PolicyConfig> policyConfig = null;
@@ -62,11 +62,11 @@ public class GetConfigStringStringMapTest {
 	@SuppressWarnings("deprecation")
 	@Test
 	public void testGetConfigStringStringMapFail() {
-		eCOMPComponentName = null;
+		onapComponentName = null;
 		configName = null;
 		configAttributes = null;
 		try {
-			policyConfig = policyEngine.getConfig(eCOMPComponentName, configName, configAttributes);
+			policyConfig = policyEngine.getConfig(onapComponentName, configName, configAttributes);
 		} catch (PolicyConfigException e) {
 			logger.warn(e.getMessage());
 		}
@@ -76,11 +76,11 @@ public class GetConfigStringStringMapTest {
 	@SuppressWarnings("deprecation")
 	@Test
 	public void testGetConfigStringStringMapFail1() {
-		eCOMPComponentName = null;
+		onapComponentName = null;
 		configName = "testFail";
 		configAttributes.put("TestValue", "Fail");
 		try {
-			policyConfig = policyEngine.getConfig(eCOMPComponentName, configName, configAttributes);
+			policyConfig = policyEngine.getConfig(onapComponentName, configName, configAttributes);
 		} catch (PolicyConfigException e) {
 			logger.warn(e.getMessage());
 		}
@@ -90,11 +90,11 @@ public class GetConfigStringStringMapTest {
 	@SuppressWarnings("deprecation")
 	@Test
 	public void testGetConfigStringStringMapFail2() {
-		eCOMPComponentName = "TestFail";
+		onapComponentName = "TestFail";
 		configName = null;
 		configAttributes.put("TestValue", "Fail");
 		try {
-			policyConfig = policyEngine.getConfig(eCOMPComponentName, configName, configAttributes);
+			policyConfig = policyEngine.getConfig(onapComponentName, configName, configAttributes);
 		} catch (PolicyConfigException e) {
 			logger.warn(e.getMessage());
 		}
@@ -104,11 +104,11 @@ public class GetConfigStringStringMapTest {
 	@SuppressWarnings("deprecation")
 	@Test
 	public void testGetConfigStringStringMapFail3() {
-		eCOMPComponentName = "TestFail";
+		onapComponentName = "TestFail";
 		configName = "configFail";
 		configAttributes= null;
 		try {
-			policyConfig = policyEngine.getConfig(eCOMPComponentName, configName, configAttributes);
+			policyConfig = policyEngine.getConfig(onapComponentName, configName, configAttributes);
 		} catch (PolicyConfigException e) {
 			logger.warn(e.getMessage());
 		}
@@ -118,11 +118,11 @@ public class GetConfigStringStringMapTest {
 	@SuppressWarnings("deprecation")
 	@Test
 	public void testGetConfigStringStringMapfail4() {
-		eCOMPComponentName = "TestFail";
+		onapComponentName = "TestFail";
 		configName = "configFail";
 		configAttributes.put("", "");
 		try {
-			policyConfig = policyEngine.getConfig(eCOMPComponentName, configName, configAttributes);
+			policyConfig = policyEngine.getConfig(onapComponentName, configName, configAttributes);
 		} catch (PolicyConfigException e) {
 			logger.warn(e.getMessage());
 		}
@@ -132,11 +132,11 @@ public class GetConfigStringStringMapTest {
 	//@Test
 	@SuppressWarnings("deprecation")
 	public void testGetConfigStringStringMapNotValid() {
-		eCOMPComponentName = "TestFail";
+		onapComponentName = "TestFail";
 		configName = "configFail";
 		configAttributes.put("Action:com.test.fail", "Value");
 		try {
-			policyConfig = policyEngine.getConfig(eCOMPComponentName, configName, configAttributes);
+			policyConfig = policyEngine.getConfig(onapComponentName, configName, configAttributes);
 		} catch (PolicyConfigException e) {
 			logger.warn(e.getMessage());
 		}
@@ -156,13 +156,13 @@ public class GetConfigStringStringMapTest {
 	//@Test
 	@SuppressWarnings("deprecation")
 	public void testGetConfigStringStringMapValidJSON() {
-		eCOMPComponentName = "JSON";
+		onapComponentName = "JSON";
 		configName = "JSONconfig";
 		configAttributes.put("Resource.com:test:resource:json", "Test");
 		configAttributes.put("Action.com:test:action:json", "TestJSON");
 		configAttributes.put("Subject.com:test:subject:json", "TestSubject");
 		try {
-			policyConfig = policyEngine.getConfig(eCOMPComponentName, configName, configAttributes);
+			policyConfig = policyEngine.getConfig(onapComponentName, configName, configAttributes);
 		} catch (PolicyConfigException e) {
 			logger.warn(e.getMessage());
 		}
@@ -182,13 +182,13 @@ public class GetConfigStringStringMapTest {
 	//@Test
 	@SuppressWarnings("deprecation")
 	public void testGetConfigStringStringMapValidXML() {
-		eCOMPComponentName = "XML";
+		onapComponentName = "XML";
 		configName = "XMLconfig";
 		configAttributes.put("Resource.com:test:resource:json", "Test");
 		configAttributes.put("Action.com:test:action:json", "TestJSON");
 		configAttributes.put("Subject.com:test:subject:json", "TestSubject");
 		try {
-			policyConfig = policyEngine.getConfig(eCOMPComponentName, configName, configAttributes);
+			policyConfig = policyEngine.getConfig(onapComponentName, configName, configAttributes);
 		} catch (PolicyConfigException e) {
 			logger.warn(e.getMessage());
 		}
@@ -208,13 +208,13 @@ public class GetConfigStringStringMapTest {
 	//@Test
 	@SuppressWarnings("deprecation")
 	public void testGetConfigStringStringMapValidProperties() {
-		eCOMPComponentName = "Properties";
+		onapComponentName = "Properties";
 		configName = "PropConfig" ;
 		configAttributes.put("Resource.com:test:resource:json", "Test");
 		configAttributes.put("Action.com:test:action:json", "TestJSON");
 		configAttributes.put("Subject.com:test:subject:json", "TestSubject");
 		try {
-			policyConfig = policyEngine.getConfig(eCOMPComponentName, configName, configAttributes);
+			policyConfig = policyEngine.getConfig(onapComponentName, configName, configAttributes);
 		} catch (PolicyConfigException e) {
 			logger.warn(e.getMessage());
 		}
@@ -234,13 +234,13 @@ public class GetConfigStringStringMapTest {
 	//@Test
 	@SuppressWarnings("deprecation")
 	public void testGetConfigStringStringMapValidOther() {
-		eCOMPComponentName = "Other";
+		onapComponentName = "Other";
 		configName = "OtherConfig" ;
 		configAttributes.put("Resource.com:test:resource:json", "Test");
 		configAttributes.put("Action.com:test:action:json", "TestJSON");
 		configAttributes.put("Subject.com:test:subject:json", "TestSubject");
 		try {
-			policyConfig = policyEngine.getConfig(eCOMPComponentName, configName, configAttributes);
+			policyConfig = policyEngine.getConfig(onapComponentName, configName, configAttributes);
 		} catch (PolicyConfigException e) {
 			logger.warn(e.getMessage());
 		}
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/GetConfigStringStringTest.java b/PolicyEngineAPI/src/test/java/org/onap/policy/test/GetConfigStringStringTest.java
index b55abd734..0a6db2dd4 100644
--- a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/GetConfigStringStringTest.java
+++ b/PolicyEngineAPI/src/test/java/org/onap/policy/test/GetConfigStringStringTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.test;
+package org.onap.policy.test;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -29,19 +29,19 @@ import java.util.Collection;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.openecomp.policy.api.PolicyConfig;
-import org.openecomp.policy.api.PolicyConfigException;
-import org.openecomp.policy.api.PolicyConfigStatus;
-import org.openecomp.policy.api.PolicyEngine;
-import org.openecomp.policy.api.PolicyEngineException;
-import org.openecomp.policy.api.PolicyType;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger; 
+import org.onap.policy.api.PolicyConfig;
+import org.onap.policy.api.PolicyConfigException;
+import org.onap.policy.api.PolicyConfigStatus;
+import org.onap.policy.api.PolicyEngine;
+import org.onap.policy.api.PolicyEngineException;
+import org.onap.policy.api.PolicyType;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger; 
 
 public class GetConfigStringStringTest {
 	
 	private PolicyEngine policyEngine = null;
-	private String eCOMPComponentName = null;
+	private String onapComponentName = null;
 	private String configName = null;
 	private Collection<PolicyConfig> policyConfig = null;
 	private static final Logger logger = FlexLogger.getLogger(GetConfigStringStringTest.class);
@@ -59,10 +59,10 @@ public class GetConfigStringStringTest {
 	@SuppressWarnings("deprecation")
 	@Test
 	public void testGetConfigStringStringFail() {
-		eCOMPComponentName = null;
+		onapComponentName = null;
 		configName = null;
 		try {
-			policyConfig = policyEngine.getConfig(eCOMPComponentName, configName);
+			policyConfig = policyEngine.getConfig(onapComponentName, configName);
 		} catch (PolicyConfigException e) {
 			logger.warn(e.getMessage());
 		}
@@ -72,10 +72,10 @@ public class GetConfigStringStringTest {
 	@SuppressWarnings("deprecation")
 	@Test
 	public void testGetConfigStringStringFail1() {
-		eCOMPComponentName = null;
+		onapComponentName = null;
 		configName = "";
 		try {
-			policyConfig = policyEngine.getConfig(eCOMPComponentName, configName);
+			policyConfig = policyEngine.getConfig(onapComponentName, configName);
 		} catch (PolicyConfigException e) {
 			logger.warn(e.getMessage());
 		}
@@ -85,10 +85,10 @@ public class GetConfigStringStringTest {
 	@SuppressWarnings("deprecation")
 	@Test
 	public void testGetConfigStringStringFail2() {
-		eCOMPComponentName = "";
+		onapComponentName = "";
 		configName = null;
 		try {
-			policyConfig = policyEngine.getConfig(eCOMPComponentName, configName);
+			policyConfig = policyEngine.getConfig(onapComponentName, configName);
 		} catch (PolicyConfigException e) {
 			logger.warn(e.getMessage());
 		}
@@ -98,10 +98,10 @@ public class GetConfigStringStringTest {
 	//@Test
 	@SuppressWarnings("deprecation")
 	public void testGetConfigStringStringNotvalid() {
-		eCOMPComponentName = "fail";
+		onapComponentName = "fail";
 		configName = "fail";
 		try {
-			policyConfig = policyEngine.getConfig(eCOMPComponentName, configName);
+			policyConfig = policyEngine.getConfig(onapComponentName, configName);
 		} catch (PolicyConfigException e) {
 			logger.warn(e.getMessage());
 		}
@@ -121,10 +121,10 @@ public class GetConfigStringStringTest {
 	//@Test
 	@SuppressWarnings("deprecation")
 	public void testGetConfigStringStringValidJSON() {
-		eCOMPComponentName = "JSON";
+		onapComponentName = "JSON";
 		configName = "JSONconfig";
 		try {
-			policyConfig = policyEngine.getConfig(eCOMPComponentName, configName);
+			policyConfig = policyEngine.getConfig(onapComponentName, configName);
 		} catch (PolicyConfigException e) {
 			logger.warn(e.getMessage());
 		}
@@ -144,10 +144,10 @@ public class GetConfigStringStringTest {
 	//@Test
 	@SuppressWarnings("deprecation")
 	public void testGetConfigStringStringValidXML() {
-		eCOMPComponentName = "XML";
+		onapComponentName = "XML";
 		configName = "XMLconfig";
 		try {
-			policyConfig = policyEngine.getConfig(eCOMPComponentName, configName);
+			policyConfig = policyEngine.getConfig(onapComponentName, configName);
 		} catch (PolicyConfigException e) {
 			logger.warn(e.getMessage());
 		}
@@ -167,10 +167,10 @@ public class GetConfigStringStringTest {
 	//@Test
 	@SuppressWarnings("deprecation")
 	public void testGetConfigStringStringValidProperties() {
-		eCOMPComponentName = "Properties";
+		onapComponentName = "Properties";
 		configName = "PropConfig" ; 
 		try {
-			policyConfig = policyEngine.getConfig(eCOMPComponentName, configName);
+			policyConfig = policyEngine.getConfig(onapComponentName, configName);
 		} catch (PolicyConfigException e) {
 			logger.warn(e.getMessage());
 		}
@@ -190,10 +190,10 @@ public class GetConfigStringStringTest {
 	//@Test
 	@SuppressWarnings("deprecation")
 	public void testGetConfigStringStringValidOther() {
-		eCOMPComponentName = "Other";
+		onapComponentName = "Other";
 		configName = "OtherConfig" ; 
 		try {
-			policyConfig = policyEngine.getConfig(eCOMPComponentName, configName);
+			policyConfig = policyEngine.getConfig(onapComponentName, configName);
 		} catch (PolicyConfigException e) {
 			logger.warn(e.getMessage());
 		}
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/GetConfigStringTest.java b/PolicyEngineAPI/src/test/java/org/onap/policy/test/GetConfigStringTest.java
index ffa1913aa..f87a59c09 100644
--- a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/GetConfigStringTest.java
+++ b/PolicyEngineAPI/src/test/java/org/onap/policy/test/GetConfigStringTest.java
@@ -18,24 +18,24 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.test;
+package org.onap.policy.test;
 
 import java.util.Collection;
 
 import org.junit.Before;
-import org.openecomp.policy.api.PolicyConfig;
-import org.openecomp.policy.api.PolicyConfigException;
-import org.openecomp.policy.api.PolicyEngine;
-import org.openecomp.policy.api.PolicyEngineException;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.api.PolicyConfig;
+import org.onap.policy.api.PolicyConfigException;
+import org.onap.policy.api.PolicyEngine;
+import org.onap.policy.api.PolicyEngineException;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
 
 import junit.framework.TestCase; 
 
 public class GetConfigStringTest extends TestCase{
 	
 	private PolicyEngine policyEngine = null;
-	private String eCOMPComponentName = null;
+	private String onapComponentName = null;
 	private Collection<PolicyConfig> policyConfig = null;
 	private static final Logger logger = FlexLogger.getLogger(GetConfigStringTest.class);
 	@Before
@@ -52,9 +52,9 @@ public class GetConfigStringTest extends TestCase{
 	//@Test
 	@SuppressWarnings("deprecation")
 	public void testGetConfigStringFail() {
-		eCOMPComponentName = null;
+		onapComponentName = null;
 		try {
-			policyConfig = policyEngine.getConfig(eCOMPComponentName);
+			policyConfig = policyEngine.getConfig(onapComponentName);
 		} catch (PolicyConfigException e) {
 			logger.warn(e.getMessage());
 		}
@@ -63,9 +63,9 @@ public class GetConfigStringTest extends TestCase{
 	
 	/*@Test
 	public void testGetConfigStringNotvalid() {
-		eCOMPComponentName = "fail";
+		onapComponentName = "fail";
 		try {
-			policyConfig = policyEngine.getConfig(eCOMPComponentName);
+			policyConfig = policyEngine.getConfig(onapComponentName);
 		} catch (PolicyConfigException e) {
 			logger.warn(e.getMessage());
 		}
@@ -85,9 +85,9 @@ public class GetConfigStringTest extends TestCase{
 	
 	/*@Test
 	public void testGetConfigStringValidJSON() {
-		eCOMPComponentName = "JSON";
+		onapComponentName = "JSON";
 		try {
-			policyConfig = policyEngine.getConfig(eCOMPComponentName);
+			policyConfig = policyEngine.getConfig(onapComponentName);
 		} catch (PolicyConfigException e) {
 			logger.warn(e.getMessage());
 		}
@@ -106,9 +106,9 @@ public class GetConfigStringTest extends TestCase{
 	*/
 	/*@Test
 	public void testGetConfigStringValidXML() {
-		eCOMPComponentName = "XML";
+		onapComponentName = "XML";
 		try {
-			policyConfig = policyEngine.getConfig(eCOMPComponentName);
+			policyConfig = policyEngine.getConfig(onapComponentName);
 		} catch (PolicyConfigException e) {
 			logger.warn(e.getMessage());
 		}
@@ -127,9 +127,9 @@ public class GetConfigStringTest extends TestCase{
 	*/
 	/*@Test
 	public void testGetConfigStringValidProperties() {
-		eCOMPComponentName = "Properties";
+		onapComponentName = "Properties";
 		try {
-			policyConfig = policyEngine.getConfig(eCOMPComponentName);
+			policyConfig = policyEngine.getConfig(onapComponentName);
 		} catch (PolicyConfigException e) {
 			logger.warn(e.getMessage());
 		}
@@ -148,9 +148,9 @@ public class GetConfigStringTest extends TestCase{
 	*/
 	/*@Test
 	public void testGetConfigStringValidOther() {
-		eCOMPComponentName = "Other";
+		onapComponentName = "Other";
 		try {
-			policyConfig = policyEngine.getConfig(eCOMPComponentName);
+			policyConfig = policyEngine.getConfig(onapComponentName);
 		} catch (PolicyConfigException e) {
 			logger.warn(e.getMessage());
 		}
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/ImportParametersTest.java b/PolicyEngineAPI/src/test/java/org/onap/policy/test/ImportParametersTest.java
index 3719b5d2f..be3e9c39b 100644
--- a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/ImportParametersTest.java
+++ b/PolicyEngineAPI/src/test/java/org/onap/policy/test/ImportParametersTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.test;
+package org.onap.policy.test;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -28,7 +28,7 @@ import java.util.UUID;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.openecomp.policy.api.ImportParameters;
+import org.onap.policy.api.ImportParameters;
 
 /**
  * The class <code>ImportParametersTest</code> contains tests for the class <code>{@link ImportParameters}</code>.
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/LoadedPolicyTest.java b/PolicyEngineAPI/src/test/java/org/onap/policy/test/LoadedPolicyTest.java
index 0748d0ad9..1cc9de8df 100644
--- a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/LoadedPolicyTest.java
+++ b/PolicyEngineAPI/src/test/java/org/onap/policy/test/LoadedPolicyTest.java
@@ -18,11 +18,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.test;
+package org.onap.policy.test;
 
 import org.junit.After;
 import org.junit.Before;
-import org.openecomp.policy.api.LoadedPolicy;
+import org.onap.policy.api.LoadedPolicy;
 
 /**
  * The class <code>LoadedPolicyTest</code> contains tests for the class <code>{@link LoadedPolicy}</code>.
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/NotificationHandlerTest.java b/PolicyEngineAPI/src/test/java/org/onap/policy/test/NotificationHandlerTest.java
index 68ba3a773..4b996ce35 100644
--- a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/NotificationHandlerTest.java
+++ b/PolicyEngineAPI/src/test/java/org/onap/policy/test/NotificationHandlerTest.java
@@ -18,11 +18,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.test;
+package org.onap.policy.test;
 
 import org.junit.After;
 import org.junit.Before;
-import org.openecomp.policy.api.NotificationHandler;
+import org.onap.policy.api.NotificationHandler;
 
 /**
  * The class <code>NotificationHandlerTest</code> contains tests for the class <code>{@link NotificationHandler}</code>.
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/NotificationSchemeTest.java b/PolicyEngineAPI/src/test/java/org/onap/policy/test/NotificationSchemeTest.java
index 1cb105c2f..3274cf3ac 100644
--- a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/NotificationSchemeTest.java
+++ b/PolicyEngineAPI/src/test/java/org/onap/policy/test/NotificationSchemeTest.java
@@ -18,10 +18,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.test;
+package org.onap.policy.test;
 
 import org.junit.*;
-import org.openecomp.policy.api.NotificationScheme;
+import org.onap.policy.api.NotificationScheme;
 
 import static org.junit.Assert.*;
 
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/NotificationTypeTest.java b/PolicyEngineAPI/src/test/java/org/onap/policy/test/NotificationTypeTest.java
index 95dce6a60..53ef086e2 100644
--- a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/NotificationTypeTest.java
+++ b/PolicyEngineAPI/src/test/java/org/onap/policy/test/NotificationTypeTest.java
@@ -18,10 +18,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.test;
+package org.onap.policy.test;
 
 import org.junit.*;
-import org.openecomp.policy.api.NotificationType;
+import org.onap.policy.api.NotificationType;
 
 import static org.junit.Assert.*;
 
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PDPNotificationTest.java b/PolicyEngineAPI/src/test/java/org/onap/policy/test/PDPNotificationTest.java
index 43754f8df..50d0aa324 100644
--- a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PDPNotificationTest.java
+++ b/PolicyEngineAPI/src/test/java/org/onap/policy/test/PDPNotificationTest.java
@@ -18,11 +18,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.test;
+package org.onap.policy.test;
 
 import org.junit.After;
 import org.junit.Before;
-import org.openecomp.policy.api.PDPNotification;
+import org.onap.policy.api.PDPNotification;
 
 /**
  * The class <code>PDPNotificationTest</code> contains tests for the class <code>{@link PDPNotification}</code>.
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PolicyChangeResponseTest.java b/PolicyEngineAPI/src/test/java/org/onap/policy/test/PolicyChangeResponseTest.java
index d36ae44c2..e8fd6346a 100644
--- a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PolicyChangeResponseTest.java
+++ b/PolicyEngineAPI/src/test/java/org/onap/policy/test/PolicyChangeResponseTest.java
@@ -18,11 +18,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.test;
+package org.onap.policy.test;
 
 import org.junit.After;
 import org.junit.Before;
-import org.openecomp.policy.api.PolicyChangeResponse;
+import org.onap.policy.api.PolicyChangeResponse;
 
 /**
  * The class <code>PolicyChangeResponseTest</code> contains tests for the class <code>{@link PolicyChangeResponse}</code>.
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PolicyClassTest.java b/PolicyEngineAPI/src/test/java/org/onap/policy/test/PolicyClassTest.java
index 28e5beefd..24eafc1ad 100644
--- a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PolicyClassTest.java
+++ b/PolicyEngineAPI/src/test/java/org/onap/policy/test/PolicyClassTest.java
@@ -18,10 +18,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.test;
+package org.onap.policy.test;
 
 import org.junit.*;
-import org.openecomp.policy.api.PolicyClass;
+import org.onap.policy.api.PolicyClass;
 
 import static org.junit.Assert.*;
 
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PolicyConfigExceptionTest.java b/PolicyEngineAPI/src/test/java/org/onap/policy/test/PolicyConfigExceptionTest.java
index 4134eacc2..60b11b5c4 100644
--- a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PolicyConfigExceptionTest.java
+++ b/PolicyEngineAPI/src/test/java/org/onap/policy/test/PolicyConfigExceptionTest.java
@@ -18,10 +18,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.test;
+package org.onap.policy.test;
 
 import org.junit.*;
-import org.openecomp.policy.api.PolicyConfigException;
+import org.onap.policy.api.PolicyConfigException;
 
 import static org.junit.Assert.*;
 
@@ -48,7 +48,7 @@ public class PolicyConfigExceptionTest {
 		// add additional test code here
 		assertNotNull(result);
 		assertEquals(null, result.getCause());
-		assertEquals("org.openecomp.policy.api.PolicyConfigException", result.toString());
+		assertEquals("org.onap.policy.api.PolicyConfigException", result.toString());
 		assertEquals(null, result.getLocalizedMessage());
 		assertEquals(null, result.getMessage());
 	}
@@ -70,7 +70,7 @@ public class PolicyConfigExceptionTest {
 		// add additional test code here
 		assertNotNull(result);
 		assertEquals(null, result.getCause());
-		assertEquals("org.openecomp.policy.api.PolicyConfigException: ", result.toString());
+		assertEquals("org.onap.policy.api.PolicyConfigException: ", result.toString());
 		assertEquals("", result.getLocalizedMessage());
 		assertEquals("", result.getMessage());
 	}
@@ -91,7 +91,7 @@ public class PolicyConfigExceptionTest {
 
 		// add additional test code here
 		assertNotNull(result);
-		assertEquals("org.openecomp.policy.api.PolicyConfigException: java.lang.Throwable", result.toString());
+		assertEquals("org.onap.policy.api.PolicyConfigException: java.lang.Throwable", result.toString());
 		assertEquals("java.lang.Throwable", result.getLocalizedMessage());
 		assertEquals("java.lang.Throwable", result.getMessage());
 	}
@@ -113,7 +113,7 @@ public class PolicyConfigExceptionTest {
 
 		// add additional test code here
 		assertNotNull(result);
-		assertEquals("org.openecomp.policy.api.PolicyConfigException: ", result.toString());
+		assertEquals("org.onap.policy.api.PolicyConfigException: ", result.toString());
 		assertEquals("", result.getLocalizedMessage());
 		assertEquals("", result.getMessage());
 	}
@@ -137,7 +137,7 @@ public class PolicyConfigExceptionTest {
 
 		// add additional test code here
 		assertNotNull(result);
-		assertEquals("org.openecomp.policy.api.PolicyConfigException: ", result.toString());
+		assertEquals("org.onap.policy.api.PolicyConfigException: ", result.toString());
 		assertEquals("", result.getLocalizedMessage());
 		assertEquals("", result.getMessage());
 	}
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PolicyConfigStatusTest.java b/PolicyEngineAPI/src/test/java/org/onap/policy/test/PolicyConfigStatusTest.java
index c40253890..7a93f0505 100644
--- a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PolicyConfigStatusTest.java
+++ b/PolicyEngineAPI/src/test/java/org/onap/policy/test/PolicyConfigStatusTest.java
@@ -18,10 +18,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.test;
+package org.onap.policy.test;
 
 import org.junit.*;
-import org.openecomp.policy.api.PolicyConfigStatus;
+import org.onap.policy.api.PolicyConfigStatus;
 
 import static org.junit.Assert.*;
 
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PolicyConfigTest.java b/PolicyEngineAPI/src/test/java/org/onap/policy/test/PolicyConfigTest.java
index c6247fcdf..0aa4fbbfa 100644
--- a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PolicyConfigTest.java
+++ b/PolicyEngineAPI/src/test/java/org/onap/policy/test/PolicyConfigTest.java
@@ -18,11 +18,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.test;
+package org.onap.policy.test;
 
 import org.junit.After;
 import org.junit.Before;
-import org.openecomp.policy.api.PolicyConfig;
+import org.onap.policy.api.PolicyConfig;
 
 /**
  * The class <code>PolicyConfigTest</code> contains tests for the class <code>{@link PolicyConfig}</code>.
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PolicyConfigTypeTest.java b/PolicyEngineAPI/src/test/java/org/onap/policy/test/PolicyConfigTypeTest.java
index cd6c6a977..e5e0b5494 100644
--- a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PolicyConfigTypeTest.java
+++ b/PolicyEngineAPI/src/test/java/org/onap/policy/test/PolicyConfigTypeTest.java
@@ -18,10 +18,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.test;
+package org.onap.policy.test;
 
 import org.junit.*;
-import org.openecomp.policy.api.PolicyConfigType;
+import org.onap.policy.api.PolicyConfigType;
 
 import static org.junit.Assert.*;
 
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PolicyDecisionExceptionTest.java b/PolicyEngineAPI/src/test/java/org/onap/policy/test/PolicyDecisionExceptionTest.java
index 95dfd7acd..f0ee88151 100644
--- a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PolicyDecisionExceptionTest.java
+++ b/PolicyEngineAPI/src/test/java/org/onap/policy/test/PolicyDecisionExceptionTest.java
@@ -18,10 +18,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.test;
+package org.onap.policy.test;
 
 import org.junit.*;
-import org.openecomp.policy.api.PolicyDecisionException;
+import org.onap.policy.api.PolicyDecisionException;
 
 import static org.junit.Assert.*;
 
@@ -48,7 +48,7 @@ public class PolicyDecisionExceptionTest {
 		// add additional test code here
 		assertNotNull(result);
 		assertEquals(null, result.getCause());
-		assertEquals("org.openecomp.policy.api.PolicyDecisionException", result.toString());
+		assertEquals("org.onap.policy.api.PolicyDecisionException", result.toString());
 		assertEquals(null, result.getLocalizedMessage());
 		assertEquals(null, result.getMessage());
 	}
@@ -70,7 +70,7 @@ public class PolicyDecisionExceptionTest {
 		// add additional test code here
 		assertNotNull(result);
 		assertEquals(null, result.getCause());
-		assertEquals("org.openecomp.policy.api.PolicyDecisionException: ", result.toString());
+		assertEquals("org.onap.policy.api.PolicyDecisionException: ", result.toString());
 		assertEquals("", result.getLocalizedMessage());
 		assertEquals("", result.getMessage());
 	}
@@ -91,7 +91,7 @@ public class PolicyDecisionExceptionTest {
 
 		// add additional test code here
 		assertNotNull(result);
-		assertEquals("org.openecomp.policy.api.PolicyDecisionException: java.lang.Throwable", result.toString());
+		assertEquals("org.onap.policy.api.PolicyDecisionException: java.lang.Throwable", result.toString());
 		assertEquals("java.lang.Throwable", result.getLocalizedMessage());
 		assertEquals("java.lang.Throwable", result.getMessage());
 	}
@@ -113,7 +113,7 @@ public class PolicyDecisionExceptionTest {
 
 		// add additional test code here
 		assertNotNull(result);
-		assertEquals("org.openecomp.policy.api.PolicyDecisionException: ", result.toString());
+		assertEquals("org.onap.policy.api.PolicyDecisionException: ", result.toString());
 		assertEquals("", result.getLocalizedMessage());
 		assertEquals("", result.getMessage());
 	}
@@ -137,7 +137,7 @@ public class PolicyDecisionExceptionTest {
 
 		// add additional test code here
 		assertNotNull(result);
-		assertEquals("org.openecomp.policy.api.PolicyDecisionException: ", result.toString());
+		assertEquals("org.onap.policy.api.PolicyDecisionException: ", result.toString());
 		assertEquals("", result.getLocalizedMessage());
 		assertEquals("", result.getMessage());
 	}
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PolicyDecisionTest.java b/PolicyEngineAPI/src/test/java/org/onap/policy/test/PolicyDecisionTest.java
index 12069abeb..4d9523859 100644
--- a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PolicyDecisionTest.java
+++ b/PolicyEngineAPI/src/test/java/org/onap/policy/test/PolicyDecisionTest.java
@@ -18,10 +18,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.test;
+package org.onap.policy.test;
 
 import org.junit.*;
-import org.openecomp.policy.api.PolicyDecision;
+import org.onap.policy.api.PolicyDecision;
 
 import static org.junit.Assert.*;
 
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PolicyEngineExceptionTest.java b/PolicyEngineAPI/src/test/java/org/onap/policy/test/PolicyEngineExceptionTest.java
index d21fb12e2..58c45b97c 100644
--- a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PolicyEngineExceptionTest.java
+++ b/PolicyEngineAPI/src/test/java/org/onap/policy/test/PolicyEngineExceptionTest.java
@@ -18,10 +18,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.test;
+package org.onap.policy.test;
 
 import org.junit.*;
-import org.openecomp.policy.api.PolicyEngineException;
+import org.onap.policy.api.PolicyEngineException;
 
 import static org.junit.Assert.*;
 
@@ -48,7 +48,7 @@ public class PolicyEngineExceptionTest {
 		// add additional test code here
 		assertNotNull(result);
 		assertEquals(null, result.getCause());
-		assertEquals("org.openecomp.policy.api.PolicyEngineException", result.toString());
+		assertEquals("org.onap.policy.api.PolicyEngineException", result.toString());
 		assertEquals(null, result.getLocalizedMessage());
 		assertEquals(null, result.getMessage());
 	}
@@ -70,7 +70,7 @@ public class PolicyEngineExceptionTest {
 		// add additional test code here
 		assertNotNull(result);
 		assertEquals(null, result.getCause());
-		assertEquals("org.openecomp.policy.api.PolicyEngineException: ", result.toString());
+		assertEquals("org.onap.policy.api.PolicyEngineException: ", result.toString());
 		assertEquals("", result.getLocalizedMessage());
 		assertEquals("", result.getMessage());
 	}
@@ -91,7 +91,7 @@ public class PolicyEngineExceptionTest {
 
 		// add additional test code here
 		assertNotNull(result);
-		assertEquals("org.openecomp.policy.api.PolicyEngineException: java.lang.Throwable", result.toString());
+		assertEquals("org.onap.policy.api.PolicyEngineException: java.lang.Throwable", result.toString());
 		assertEquals("java.lang.Throwable", result.getLocalizedMessage());
 		assertEquals("java.lang.Throwable", result.getMessage());
 	}
@@ -113,7 +113,7 @@ public class PolicyEngineExceptionTest {
 
 		// add additional test code here
 		assertNotNull(result);
-		assertEquals("org.openecomp.policy.api.PolicyEngineException: ", result.toString());
+		assertEquals("org.onap.policy.api.PolicyEngineException: ", result.toString());
 		assertEquals("", result.getLocalizedMessage());
 		assertEquals("", result.getMessage());
 	}
@@ -137,7 +137,7 @@ public class PolicyEngineExceptionTest {
 
 		// add additional test code here
 		assertNotNull(result);
-		assertEquals("org.openecomp.policy.api.PolicyEngineException: ", result.toString());
+		assertEquals("org.onap.policy.api.PolicyEngineException: ", result.toString());
 		assertEquals("", result.getLocalizedMessage());
 		assertEquals("", result.getMessage());
 	}
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PolicyEngineInterfaceTest.java b/PolicyEngineAPI/src/test/java/org/onap/policy/test/PolicyEngineInterfaceTest.java
index fd5f65fa3..be9e0e7e8 100644
--- a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PolicyEngineInterfaceTest.java
+++ b/PolicyEngineAPI/src/test/java/org/onap/policy/test/PolicyEngineInterfaceTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.test;
+package org.onap.policy.test;
 
 import java.io.StringReader;
 import java.net.HttpURLConnection;
@@ -32,34 +32,34 @@ import javax.json.JsonObject;
 import javax.json.JsonReader;
 
 import org.mockito.Mockito;
-import org.openecomp.policy.api.AttributeType;
-import org.openecomp.policy.api.ConfigRequestParameters;
-import org.openecomp.policy.api.DecisionRequestParameters;
-import org.openecomp.policy.api.DecisionResponse;
-import org.openecomp.policy.api.DeletePolicyCondition;
-import org.openecomp.policy.api.DeletePolicyParameters;
-import org.openecomp.policy.api.EventRequestParameters;
-import org.openecomp.policy.api.ImportParameters;
-import org.openecomp.policy.api.ImportParameters.IMPORT_TYPE;
-import org.openecomp.policy.api.NotificationHandler;
-import org.openecomp.policy.api.NotificationScheme;
-import org.openecomp.policy.api.PDPNotification;
-import org.openecomp.policy.api.PolicyChangeResponse;
-import org.openecomp.policy.api.PolicyClass;
-import org.openecomp.policy.api.PolicyConfig;
-import org.openecomp.policy.api.PolicyConfigException;
-import org.openecomp.policy.api.PolicyDecisionException;
-import org.openecomp.policy.api.PolicyEngine;
-import org.openecomp.policy.api.PolicyEngineException;
-import org.openecomp.policy.api.PolicyEventException;
-import org.openecomp.policy.api.PolicyParameters;
-import org.openecomp.policy.api.PolicyResponse;
-import org.openecomp.policy.api.PushPolicyParameters;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.std.StdPDPNotification;
-import org.openecomp.policy.std.StdPolicyChangeResponse;
-import org.openecomp.policy.std.StdPolicyResponse;
+import org.onap.policy.api.AttributeType;
+import org.onap.policy.api.ConfigRequestParameters;
+import org.onap.policy.api.DecisionRequestParameters;
+import org.onap.policy.api.DecisionResponse;
+import org.onap.policy.api.DeletePolicyCondition;
+import org.onap.policy.api.DeletePolicyParameters;
+import org.onap.policy.api.EventRequestParameters;
+import org.onap.policy.api.ImportParameters;
+import org.onap.policy.api.ImportParameters.IMPORT_TYPE;
+import org.onap.policy.api.NotificationHandler;
+import org.onap.policy.api.NotificationScheme;
+import org.onap.policy.api.PDPNotification;
+import org.onap.policy.api.PolicyChangeResponse;
+import org.onap.policy.api.PolicyClass;
+import org.onap.policy.api.PolicyConfig;
+import org.onap.policy.api.PolicyConfigException;
+import org.onap.policy.api.PolicyDecisionException;
+import org.onap.policy.api.PolicyEngine;
+import org.onap.policy.api.PolicyEngineException;
+import org.onap.policy.api.PolicyEventException;
+import org.onap.policy.api.PolicyParameters;
+import org.onap.policy.api.PolicyResponse;
+import org.onap.policy.api.PushPolicyParameters;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.std.StdPDPNotification;
+import org.onap.policy.std.StdPolicyChangeResponse;
+import org.onap.policy.std.StdPolicyResponse;
 
 import junit.framework.TestCase;
 
@@ -163,10 +163,10 @@ public class PolicyEngineInterfaceTest extends TestCase {
 	 */
 	@SuppressWarnings("deprecation")
 	public void testGetConfig() {
-		String ecompName = null;
+		String onapName = null;
 		
 		try{
-			policyConfig = policyEngine.getConfig(ecompName);
+			policyConfig = policyEngine.getConfig(onapName);
 		} catch (PolicyConfigException e){
 			logger.warn(e.getMessage());
 		}
@@ -175,10 +175,10 @@ public class PolicyEngineInterfaceTest extends TestCase {
 	
 	@SuppressWarnings("deprecation")
 	public void testGetConfig2() {
-		String ecompName = null;
+		String onapName = null;
 
 		try{
-			policyConfig = policyEngine.getConfig(ecompName,requestID);
+			policyConfig = policyEngine.getConfig(onapName,requestID);
 		} catch (PolicyConfigException e){
 			logger.warn(e.getMessage());
 		}
@@ -188,11 +188,11 @@ public class PolicyEngineInterfaceTest extends TestCase {
 	
 	@SuppressWarnings("deprecation")
 	public void testGetConfig3() {
-		String ecompName = null;
+		String onapName = null;
 		String configName = null;
 
 		try{
-			policyConfig = policyEngine.getConfig(ecompName,configName,requestID);
+			policyConfig = policyEngine.getConfig(onapName,configName,requestID);
 		} catch (PolicyConfigException e){
 			logger.warn(e.getMessage());
 		}
@@ -201,12 +201,12 @@ public class PolicyEngineInterfaceTest extends TestCase {
 
 	@SuppressWarnings("deprecation")
 	public void testGetConfig4() {
-		String ecompName = null;
+		String onapName = null;
 		String configName = null;
 		Map<String,String> configAttributes = null;
 		
 		try{
-			policyConfig = policyEngine.getConfig(ecompName,configName,configAttributes);
+			policyConfig = policyEngine.getConfig(onapName,configName,configAttributes);
 		} catch (PolicyConfigException e){
 			logger.warn(e.getMessage());
 		}
@@ -215,12 +215,12 @@ public class PolicyEngineInterfaceTest extends TestCase {
 	
 	@SuppressWarnings("deprecation")
 	public void testGetConfig5() {
-		String ecompName = null;
+		String onapName = null;
 		String configName = null;
 		Map<String,String> configAttributes = null;
 		
 		try{
-			policyConfig = policyEngine.getConfig(ecompName,configName,configAttributes,requestID);
+			policyConfig = policyEngine.getConfig(onapName,configName,configAttributes,requestID);
 		} catch (PolicyConfigException e){
 			logger.warn(e.getMessage());
 		}
@@ -307,14 +307,14 @@ public class PolicyEngineInterfaceTest extends TestCase {
 	@SuppressWarnings("deprecation")
 	public void testGetDecision()
 	{
-		String eCOMPComponentName = null;
+		String onapComponentName = null;
 		Map<String,String> decisionAttributes = null;
 		
 		DecisionResponse result = null;
 		
 		try {
-			Mockito.when(mockPolicyEngine.getDecision(eCOMPComponentName,decisionAttributes)).thenReturn(null);
-			result = mockPolicyEngine.getDecision(eCOMPComponentName,decisionAttributes);
+			Mockito.when(mockPolicyEngine.getDecision(onapComponentName,decisionAttributes)).thenReturn(null);
+			result = mockPolicyEngine.getDecision(onapComponentName,decisionAttributes);
 		} catch (PolicyDecisionException e) {
 			logger.error("Exception Occured"+e);
 		}
@@ -325,14 +325,14 @@ public class PolicyEngineInterfaceTest extends TestCase {
 	@SuppressWarnings("deprecation")
 	public void testGetDecision2()
 	{
-		String eCOMPComponentName = null;
+		String onapComponentName = null;
 		Map<String,String> decisionAttributes = null;
 		
 		DecisionResponse result = null;
 		
 		try {	
-			Mockito.when(mockPolicyEngine.getDecision(eCOMPComponentName,decisionAttributes,requestID)).thenReturn(null);
-			result = mockPolicyEngine.getDecision(eCOMPComponentName,decisionAttributes);
+			Mockito.when(mockPolicyEngine.getDecision(onapComponentName,decisionAttributes,requestID)).thenReturn(null);
+			result = mockPolicyEngine.getDecision(onapComponentName,decisionAttributes);
 		} catch (PolicyDecisionException e) {
 			logger.error("Exception Occured"+e);
 		}
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PolicyEngineTest.java b/PolicyEngineAPI/src/test/java/org/onap/policy/test/PolicyEngineTest.java
index c36a921d4..abfab075b 100644
--- a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PolicyEngineTest.java
+++ b/PolicyEngineAPI/src/test/java/org/onap/policy/test/PolicyEngineTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.test;
+package org.onap.policy.test;
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
@@ -29,11 +29,11 @@ import java.nio.file.Path;
 import java.nio.file.Paths;
 
 import org.junit.Test;
-import org.openecomp.policy.api.NotificationScheme;
-import org.openecomp.policy.api.PolicyEngine;
-import org.openecomp.policy.api.PolicyEngineException;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger; 
+import org.onap.policy.api.NotificationScheme;
+import org.onap.policy.api.PolicyEngine;
+import org.onap.policy.api.PolicyEngineException;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger; 
 
 public class PolicyEngineTest {
 
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PolicyEventExceptionTest.java b/PolicyEngineAPI/src/test/java/org/onap/policy/test/PolicyEventExceptionTest.java
index fa8d5d1d8..6f7573352 100644
--- a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PolicyEventExceptionTest.java
+++ b/PolicyEngineAPI/src/test/java/org/onap/policy/test/PolicyEventExceptionTest.java
@@ -18,10 +18,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.test;
+package org.onap.policy.test;
 
 import org.junit.*;
-import org.openecomp.policy.api.PolicyEventException;
+import org.onap.policy.api.PolicyEventException;
 
 import static org.junit.Assert.*;
 
@@ -48,7 +48,7 @@ public class PolicyEventExceptionTest {
 		// add additional test code here
 		assertNotNull(result);
 		assertEquals(null, result.getCause());
-		assertEquals("org.openecomp.policy.api.PolicyEventException", result.toString());
+		assertEquals("org.onap.policy.api.PolicyEventException", result.toString());
 		assertEquals(null, result.getLocalizedMessage());
 		assertEquals(null, result.getMessage());
 	}
@@ -70,7 +70,7 @@ public class PolicyEventExceptionTest {
 		// add additional test code here
 		assertNotNull(result);
 		assertEquals(null, result.getCause());
-		assertEquals("org.openecomp.policy.api.PolicyEventException: ", result.toString());
+		assertEquals("org.onap.policy.api.PolicyEventException: ", result.toString());
 		assertEquals("", result.getLocalizedMessage());
 		assertEquals("", result.getMessage());
 	}
@@ -91,7 +91,7 @@ public class PolicyEventExceptionTest {
 
 		// add additional test code here
 		assertNotNull(result);
-		assertEquals("org.openecomp.policy.api.PolicyEventException: java.lang.Throwable", result.toString());
+		assertEquals("org.onap.policy.api.PolicyEventException: java.lang.Throwable", result.toString());
 		assertEquals("java.lang.Throwable", result.getLocalizedMessage());
 		assertEquals("java.lang.Throwable", result.getMessage());
 	}
@@ -113,7 +113,7 @@ public class PolicyEventExceptionTest {
 
 		// add additional test code here
 		assertNotNull(result);
-		assertEquals("org.openecomp.policy.api.PolicyEventException: ", result.toString());
+		assertEquals("org.onap.policy.api.PolicyEventException: ", result.toString());
 		assertEquals("", result.getLocalizedMessage());
 		assertEquals("", result.getMessage());
 	}
@@ -137,7 +137,7 @@ public class PolicyEventExceptionTest {
 
 		// add additional test code here
 		assertNotNull(result);
-		assertEquals("org.openecomp.policy.api.PolicyEventException: ", result.toString());
+		assertEquals("org.onap.policy.api.PolicyEventException: ", result.toString());
 		assertEquals("", result.getLocalizedMessage());
 		assertEquals("", result.getMessage());
 	}
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PolicyParametersTest.java b/PolicyEngineAPI/src/test/java/org/onap/policy/test/PolicyParametersTest.java
index eeb973b90..ff192dcab 100644
--- a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PolicyParametersTest.java
+++ b/PolicyEngineAPI/src/test/java/org/onap/policy/test/PolicyParametersTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.test;
+package org.onap.policy.test;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -32,11 +32,11 @@ import java.util.UUID;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.openecomp.policy.api.AttributeType;
-import org.openecomp.policy.api.PolicyClass;
-import org.openecomp.policy.api.PolicyConfigType;
-import org.openecomp.policy.api.PolicyParameters;
-import org.openecomp.policy.api.PolicyType;
+import org.onap.policy.api.AttributeType;
+import org.onap.policy.api.PolicyClass;
+import org.onap.policy.api.PolicyConfigType;
+import org.onap.policy.api.PolicyParameters;
+import org.onap.policy.api.PolicyType;
 
 /**
  * The class <code>PolicyParametersTest</code> contains tests for the class <code>{@link PolicyParameters}</code>.
@@ -67,7 +67,7 @@ public class PolicyParametersTest {
 		fixture.setConfigName("");
 		fixture.setDynamicRuleAlgorithmFunctions(new LinkedList<String>());
 		fixture.setPolicyClass(PolicyClass.Action);
-		fixture.setEcompName("");
+		fixture.setOnapName("");
 		fixture.setConfigBodyType(PolicyType.JSON);
 		fixture.setDynamicRuleAlgorithmField1(new LinkedList<String>());
 		fixture.setPriority("");
@@ -102,7 +102,7 @@ public class PolicyParametersTest {
 		fixture.setConfigName("");
 		fixture.setDynamicRuleAlgorithmFunctions(new LinkedList<String>());
 		fixture.setPolicyClass(PolicyClass.Action);
-		fixture.setEcompName("");
+		fixture.setOnapName("");
 		fixture.setConfigBodyType(PolicyType.JSON);
 		fixture.setDynamicRuleAlgorithmField1(new LinkedList<String>());
 		fixture.setPriority("");
@@ -138,7 +138,7 @@ public class PolicyParametersTest {
 		fixture.setConfigName("");
 		fixture.setDynamicRuleAlgorithmFunctions(new LinkedList<String>());
 		fixture.setPolicyClass(PolicyClass.Action);
-		fixture.setEcompName("");
+		fixture.setOnapName("");
 		fixture.setConfigBodyType(PolicyType.JSON);
 		fixture.setDynamicRuleAlgorithmField1(new LinkedList<String>());
 		fixture.setPriority("");
@@ -175,7 +175,7 @@ public class PolicyParametersTest {
 		fixture.setConfigName("");
 		fixture.setDynamicRuleAlgorithmFunctions(new LinkedList<String>());
 		fixture.setPolicyClass(PolicyClass.Action);
-		fixture.setEcompName("");
+		fixture.setOnapName("");
 		fixture.setConfigBodyType(PolicyType.JSON);
 		fixture.setDynamicRuleAlgorithmField1(new LinkedList<String>());
 		fixture.setPriority("");
@@ -211,7 +211,7 @@ public class PolicyParametersTest {
 		fixture.setConfigName("");
 		fixture.setDynamicRuleAlgorithmFunctions(new LinkedList<String>());
 		fixture.setPolicyClass(PolicyClass.Action);
-		fixture.setEcompName("");
+		fixture.setOnapName("");
 		fixture.setConfigBodyType(PolicyType.JSON);
 		fixture.setDynamicRuleAlgorithmField1(new LinkedList<String>());
 		fixture.setPriority("");
@@ -250,7 +250,7 @@ public class PolicyParametersTest {
 		fixture.setConfigName("");
 		fixture.setDynamicRuleAlgorithmFunctions(new LinkedList<String>());
 		fixture.setPolicyClass(PolicyClass.Action);
-		fixture.setEcompName("");
+		fixture.setOnapName("");
 		fixture.setConfigBodyType(PolicyType.JSON);
 		fixture.setDynamicRuleAlgorithmField1(new LinkedList<String>());
 		fixture.setPriority("");
@@ -286,7 +286,7 @@ public class PolicyParametersTest {
 		fixture.setConfigName("");
 		fixture.setDynamicRuleAlgorithmFunctions(new LinkedList<String>());
 		fixture.setPolicyClass(PolicyClass.Action);
-		fixture.setEcompName("");
+		fixture.setOnapName("");
 		fixture.setConfigBodyType(PolicyType.JSON);
 		fixture.setDynamicRuleAlgorithmField1(new LinkedList<String>());
 		fixture.setPriority("");
@@ -323,7 +323,7 @@ public class PolicyParametersTest {
 		fixture.setConfigName("");
 		fixture.setDynamicRuleAlgorithmFunctions(new LinkedList<String>());
 		fixture.setPolicyClass(PolicyClass.Action);
-		fixture.setEcompName("");
+		fixture.setOnapName("");
 		fixture.setConfigBodyType(PolicyType.JSON);
 		fixture.setDynamicRuleAlgorithmField1(new LinkedList<String>());
 		fixture.setPriority("");
@@ -360,7 +360,7 @@ public class PolicyParametersTest {
 		fixture.setConfigName("");
 		fixture.setDynamicRuleAlgorithmFunctions(new LinkedList<String>());
 		fixture.setPolicyClass(PolicyClass.Action);
-		fixture.setEcompName("");
+		fixture.setOnapName("");
 		fixture.setConfigBodyType(PolicyType.JSON);
 		fixture.setDynamicRuleAlgorithmField1(new LinkedList<String>());
 		fixture.setPriority("");
@@ -397,7 +397,7 @@ public class PolicyParametersTest {
 		fixture.setConfigName("");
 		fixture.setDynamicRuleAlgorithmFunctions(new LinkedList<String>());
 		fixture.setPolicyClass(PolicyClass.Action);
-		fixture.setEcompName("");
+		fixture.setOnapName("");
 		fixture.setConfigBodyType(PolicyType.JSON);
 		fixture.setDynamicRuleAlgorithmField1(new LinkedList<String>());
 		fixture.setPriority("");
@@ -412,14 +412,14 @@ public class PolicyParametersTest {
 	}
 
 	/**
-	 * Run the String getEcompName() method test.
+	 * Run the String getOnapName() method test.
 	 *
 	 * @throws Exception
 	 *
 	 * @generatedBy CodePro at 6/1/16 1:41 PM
 	 */
 	@Test
-	public void testGetEcompName_1()
+	public void testGetOnapName_1()
 		throws Exception {
 		PolicyParameters fixture = new PolicyParameters();
 		fixture.setRequestID(UUID.randomUUID());
@@ -434,14 +434,14 @@ public class PolicyParametersTest {
 		fixture.setConfigName("");
 		fixture.setDynamicRuleAlgorithmFunctions(new LinkedList<String>());
 		fixture.setPolicyClass(PolicyClass.Action);
-		fixture.setEcompName("");
+		fixture.setOnapName("");
 		fixture.setConfigBodyType(PolicyType.JSON);
 		fixture.setDynamicRuleAlgorithmField1(new LinkedList<String>());
 		fixture.setPriority("");
 		fixture.setActionPerformer("");
 		fixture.setConfigBody("");
 
-		String result = fixture.getEcompName();
+		String result = fixture.getOnapName();
 
 		// add additional test code here
 		assertEquals("", result);
@@ -470,7 +470,7 @@ public class PolicyParametersTest {
 		fixture.setConfigName("");
 		fixture.setDynamicRuleAlgorithmFunctions(new LinkedList<String>());
 		fixture.setPolicyClass(PolicyClass.Action);
-		fixture.setEcompName("");
+		fixture.setOnapName("");
 		fixture.setConfigBodyType(PolicyType.JSON);
 		fixture.setDynamicRuleAlgorithmField1(new LinkedList<String>());
 		fixture.setPriority("");
@@ -509,7 +509,7 @@ public class PolicyParametersTest {
 		fixture.setConfigName("");
 		fixture.setDynamicRuleAlgorithmFunctions(new LinkedList<String>());
 		fixture.setPolicyClass(PolicyClass.Action);
-		fixture.setEcompName("");
+		fixture.setOnapName("");
 		fixture.setConfigBodyType(PolicyType.JSON);
 		fixture.setDynamicRuleAlgorithmField1(new LinkedList<String>());
 		fixture.setPriority("");
@@ -548,7 +548,7 @@ public class PolicyParametersTest {
 		fixture.setConfigName("");
 		fixture.setDynamicRuleAlgorithmFunctions(new LinkedList<String>());
 		fixture.setPolicyClass(PolicyClass.Action);
-		fixture.setEcompName("");
+		fixture.setOnapName("");
 		fixture.setConfigBodyType(PolicyType.JSON);
 		fixture.setDynamicRuleAlgorithmField1(new LinkedList<String>());
 		fixture.setPriority("");
@@ -584,7 +584,7 @@ public class PolicyParametersTest {
 		fixture.setConfigName("");
 		fixture.setDynamicRuleAlgorithmFunctions(new LinkedList<String>());
 		fixture.setPolicyClass(PolicyClass.Action);
-		fixture.setEcompName("");
+		fixture.setOnapName("");
 		fixture.setConfigBodyType(PolicyType.JSON);
 		fixture.setDynamicRuleAlgorithmField1(new LinkedList<String>());
 		fixture.setPriority("");
@@ -620,7 +620,7 @@ public class PolicyParametersTest {
 		fixture.setConfigName("");
 		fixture.setDynamicRuleAlgorithmFunctions(new LinkedList<String>());
 		fixture.setPolicyClass(PolicyClass.Action);
-		fixture.setEcompName("");
+		fixture.setOnapName("");
 		fixture.setConfigBodyType(PolicyType.JSON);
 		fixture.setDynamicRuleAlgorithmField1(new LinkedList<String>());
 		fixture.setPriority("");
@@ -656,7 +656,7 @@ public class PolicyParametersTest {
 		fixture.setConfigName("");
 		fixture.setDynamicRuleAlgorithmFunctions(new LinkedList<String>());
 		fixture.setPolicyClass(PolicyClass.Action);
-		fixture.setEcompName("");
+		fixture.setOnapName("");
 		fixture.setConfigBodyType(PolicyType.JSON);
 		fixture.setDynamicRuleAlgorithmField1(new LinkedList<String>());
 		fixture.setPriority("");
@@ -697,7 +697,7 @@ public class PolicyParametersTest {
 		fixture.setConfigName("");
 		fixture.setDynamicRuleAlgorithmFunctions(new LinkedList<String>());
 		fixture.setPolicyClass(PolicyClass.Action);
-		fixture.setEcompName("");
+		fixture.setOnapName("");
 		fixture.setConfigBodyType(PolicyType.JSON);
 		fixture.setDynamicRuleAlgorithmField1(new LinkedList<String>());
 		fixture.setPriority("");
@@ -733,7 +733,7 @@ public class PolicyParametersTest {
 		fixture.setConfigName("");
 		fixture.setDynamicRuleAlgorithmFunctions(new LinkedList<String>());
 		fixture.setPolicyClass(PolicyClass.Action);
-		fixture.setEcompName("");
+		fixture.setOnapName("");
 		fixture.setConfigBodyType(PolicyType.JSON);
 		fixture.setDynamicRuleAlgorithmField1(new LinkedList<String>());
 		fixture.setPriority("");
@@ -769,7 +769,7 @@ public class PolicyParametersTest {
 		fixture.setConfigName("");
 		fixture.setDynamicRuleAlgorithmFunctions(new LinkedList<String>());
 		fixture.setPolicyClass(PolicyClass.Action);
-		fixture.setEcompName("");
+		fixture.setOnapName("");
 		fixture.setConfigBodyType(PolicyType.JSON);
 		fixture.setDynamicRuleAlgorithmField1(new LinkedList<String>());
 		fixture.setPriority("");
@@ -805,7 +805,7 @@ public class PolicyParametersTest {
 		fixture.setConfigName("");
 		fixture.setDynamicRuleAlgorithmFunctions(new LinkedList<String>());
 		fixture.setPolicyClass(PolicyClass.Action);
-		fixture.setEcompName("");
+		fixture.setOnapName("");
 		fixture.setConfigBodyType(PolicyType.JSON);
 		fixture.setDynamicRuleAlgorithmField1(new LinkedList<String>());
 		fixture.setPriority("");
@@ -841,7 +841,7 @@ public class PolicyParametersTest {
 		fixture.setConfigName("");
 		fixture.setDynamicRuleAlgorithmFunctions(new LinkedList<String>());
 		fixture.setPolicyClass(PolicyClass.Action);
-		fixture.setEcompName("");
+		fixture.setOnapName("");
 		fixture.setConfigBodyType(PolicyType.JSON);
 		fixture.setDynamicRuleAlgorithmField1(new LinkedList<String>());
 		fixture.setPriority("");
@@ -877,7 +877,7 @@ public class PolicyParametersTest {
 		fixture.setConfigName("");
 		fixture.setDynamicRuleAlgorithmFunctions(new LinkedList<String>());
 		fixture.setPolicyClass(PolicyClass.Action);
-		fixture.setEcompName("");
+		fixture.setOnapName("");
 		fixture.setConfigBodyType(PolicyType.JSON);
 		fixture.setDynamicRuleAlgorithmField1(new LinkedList<String>());
 		fixture.setPriority("");
@@ -915,7 +915,7 @@ public class PolicyParametersTest {
 		fixture.setConfigName("");
 		fixture.setDynamicRuleAlgorithmFunctions(new LinkedList<String>());
 		fixture.setPolicyClass(PolicyClass.Action);
-		fixture.setEcompName("");
+		fixture.setOnapName("");
 		fixture.setConfigBodyType(PolicyType.JSON);
 		fixture.setDynamicRuleAlgorithmField1(new LinkedList<String>());
 		fixture.setPriority("");
@@ -951,7 +951,7 @@ public class PolicyParametersTest {
 		fixture.setConfigName("");
 		fixture.setDynamicRuleAlgorithmFunctions(new LinkedList<String>());
 		fixture.setPolicyClass(PolicyClass.Action);
-		fixture.setEcompName("");
+		fixture.setOnapName("");
 		fixture.setConfigBodyType(PolicyType.JSON);
 		fixture.setDynamicRuleAlgorithmField1(new LinkedList<String>());
 		fixture.setPriority("");
@@ -960,14 +960,14 @@ public class PolicyParametersTest {
 		PolicyConfigType policyConfigType = PolicyConfigType.BRMS_PARAM;
 		String policyName = "";
 		String policyDescription = "";
-		String ecompName = "";
+		String onapName = "";
 		String configName = "";
 		Map<AttributeType, Map<String, String>> attributes = new Hashtable<AttributeType, Map<String, String>>();
 		PolicyType configBodyType = PolicyType.JSON;
 		String configBody = "";
 		UUID requestID = UUID.randomUUID();
 
-		fixture.setConfigPolicyParameters(policyConfigType, policyName, policyDescription, ecompName, configName, attributes, configBodyType, configBody, requestID);
+		fixture.setConfigPolicyParameters(policyConfigType, policyName, policyDescription, onapName, configName, attributes, configBodyType, configBody, requestID);
 
 		// add additional test code here
 	}
@@ -995,7 +995,7 @@ public class PolicyParametersTest {
 		fixture.setConfigName("");
 		fixture.setDynamicRuleAlgorithmFunctions(new LinkedList<String>());
 		fixture.setPolicyClass(PolicyClass.Action);
-		fixture.setEcompName("");
+		fixture.setOnapName("");
 		fixture.setConfigBodyType(PolicyType.JSON);
 		fixture.setDynamicRuleAlgorithmField1(new LinkedList<String>());
 		fixture.setPriority("");
@@ -1031,7 +1031,7 @@ public class PolicyParametersTest {
 		fixture.setConfigName("");
 		fixture.setDynamicRuleAlgorithmFunctions(new LinkedList<String>());
 		fixture.setPolicyClass(PolicyClass.Action);
-		fixture.setEcompName("");
+		fixture.setOnapName("");
 		fixture.setConfigBodyType(PolicyType.JSON);
 		fixture.setDynamicRuleAlgorithmField1(new LinkedList<String>());
 		fixture.setPriority("");
@@ -1067,7 +1067,7 @@ public class PolicyParametersTest {
 		fixture.setConfigName("");
 		fixture.setDynamicRuleAlgorithmFunctions(new LinkedList<String>());
 		fixture.setPolicyClass(PolicyClass.Action);
-		fixture.setEcompName("");
+		fixture.setOnapName("");
 		fixture.setConfigBodyType(PolicyType.JSON);
 		fixture.setDynamicRuleAlgorithmField1(new LinkedList<String>());
 		fixture.setPriority("");
@@ -1103,7 +1103,7 @@ public class PolicyParametersTest {
 		fixture.setConfigName("");
 		fixture.setDynamicRuleAlgorithmFunctions(new LinkedList<String>());
 		fixture.setPolicyClass(PolicyClass.Action);
-		fixture.setEcompName("");
+		fixture.setOnapName("");
 		fixture.setConfigBodyType(PolicyType.JSON);
 		fixture.setDynamicRuleAlgorithmField1(new LinkedList<String>());
 		fixture.setPriority("");
@@ -1117,14 +1117,14 @@ public class PolicyParametersTest {
 	}
 
 	/**
-	 * Run the void setEcompName(String) method test.
+	 * Run the void setOnapName(String) method test.
 	 *
 	 * @throws Exception
 	 *
 	 * @generatedBy CodePro at 6/1/16 1:41 PM
 	 */
 	@Test
-	public void testSetEcompName_1()
+	public void testSetOnapName_1()
 		throws Exception {
 		PolicyParameters fixture = new PolicyParameters();
 		fixture.setRequestID(UUID.randomUUID());
@@ -1139,15 +1139,15 @@ public class PolicyParametersTest {
 		fixture.setConfigName("");
 		fixture.setDynamicRuleAlgorithmFunctions(new LinkedList<String>());
 		fixture.setPolicyClass(PolicyClass.Action);
-		fixture.setEcompName("");
+		fixture.setOnapName("");
 		fixture.setConfigBodyType(PolicyType.JSON);
 		fixture.setDynamicRuleAlgorithmField1(new LinkedList<String>());
 		fixture.setPriority("");
 		fixture.setActionPerformer("");
 		fixture.setConfigBody("");
-		String ecompName = "";
+		String onapName = "";
 
-		fixture.setEcompName(ecompName);
+		fixture.setOnapName(onapName);
 
 		// add additional test code here
 	}
@@ -1175,7 +1175,7 @@ public class PolicyParametersTest {
 		fixture.setConfigName("");
 		fixture.setDynamicRuleAlgorithmFunctions(new LinkedList<String>());
 		fixture.setPolicyClass(PolicyClass.Action);
-		fixture.setEcompName("");
+		fixture.setOnapName("");
 		fixture.setConfigBodyType(PolicyType.JSON);
 		fixture.setDynamicRuleAlgorithmField1(new LinkedList<String>());
 		fixture.setPriority("");
@@ -1211,7 +1211,7 @@ public class PolicyParametersTest {
 		fixture.setConfigName("");
 		fixture.setDynamicRuleAlgorithmFunctions(new LinkedList<String>());
 		fixture.setPolicyClass(PolicyClass.Action);
-		fixture.setEcompName("");
+		fixture.setOnapName("");
 		fixture.setConfigBodyType(PolicyType.JSON);
 		fixture.setDynamicRuleAlgorithmField1(new LinkedList<String>());
 		fixture.setPriority("");
@@ -1247,7 +1247,7 @@ public class PolicyParametersTest {
 		fixture.setConfigName("");
 		fixture.setDynamicRuleAlgorithmFunctions(new LinkedList<String>());
 		fixture.setPolicyClass(PolicyClass.Action);
-		fixture.setEcompName("");
+		fixture.setOnapName("");
 		fixture.setConfigBodyType(PolicyType.JSON);
 		fixture.setDynamicRuleAlgorithmField1(new LinkedList<String>());
 		fixture.setPriority("");
@@ -1283,7 +1283,7 @@ public class PolicyParametersTest {
 		fixture.setConfigName("");
 		fixture.setDynamicRuleAlgorithmFunctions(new LinkedList<String>());
 		fixture.setPolicyClass(PolicyClass.Action);
-		fixture.setEcompName("");
+		fixture.setOnapName("");
 		fixture.setConfigBodyType(PolicyType.JSON);
 		fixture.setDynamicRuleAlgorithmField1(new LinkedList<String>());
 		fixture.setPriority("");
@@ -1319,7 +1319,7 @@ public class PolicyParametersTest {
 		fixture.setConfigName("");
 		fixture.setDynamicRuleAlgorithmFunctions(new LinkedList<String>());
 		fixture.setPolicyClass(PolicyClass.Action);
-		fixture.setEcompName("");
+		fixture.setOnapName("");
 		fixture.setConfigBodyType(PolicyType.JSON);
 		fixture.setDynamicRuleAlgorithmField1(new LinkedList<String>());
 		fixture.setPriority("");
@@ -1355,7 +1355,7 @@ public class PolicyParametersTest {
 		fixture.setConfigName("");
 		fixture.setDynamicRuleAlgorithmFunctions(new LinkedList<String>());
 		fixture.setPolicyClass(PolicyClass.Action);
-		fixture.setEcompName("");
+		fixture.setOnapName("");
 		fixture.setConfigBodyType(PolicyType.JSON);
 		fixture.setDynamicRuleAlgorithmField1(new LinkedList<String>());
 		fixture.setPriority("");
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PolicyResponseStatusTest.java b/PolicyEngineAPI/src/test/java/org/onap/policy/test/PolicyResponseStatusTest.java
index 5841571bd..294f0929d 100644
--- a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PolicyResponseStatusTest.java
+++ b/PolicyEngineAPI/src/test/java/org/onap/policy/test/PolicyResponseStatusTest.java
@@ -18,10 +18,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.test;
+package org.onap.policy.test;
 
 import org.junit.*;
-import org.openecomp.policy.api.PolicyResponseStatus;
+import org.onap.policy.api.PolicyResponseStatus;
 
 import static org.junit.Assert.*;
 
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PolicyResponseTest.java b/PolicyEngineAPI/src/test/java/org/onap/policy/test/PolicyResponseTest.java
index ec6ac09f0..b0a71d375 100644
--- a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PolicyResponseTest.java
+++ b/PolicyEngineAPI/src/test/java/org/onap/policy/test/PolicyResponseTest.java
@@ -18,11 +18,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.test;
+package org.onap.policy.test;
 
 import org.junit.After;
 import org.junit.Before;
-import org.openecomp.policy.api.PolicyResponse;
+import org.onap.policy.api.PolicyResponse;
 
 /**
  * The class <code>PolicyResponseTest</code> contains tests for the class <code>{@link PolicyResponse}</code>.
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PolicyTypeTest.java b/PolicyEngineAPI/src/test/java/org/onap/policy/test/PolicyTypeTest.java
index 5b31e857b..9f1a608da 100644
--- a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PolicyTypeTest.java
+++ b/PolicyEngineAPI/src/test/java/org/onap/policy/test/PolicyTypeTest.java
@@ -18,10 +18,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.test;
+package org.onap.policy.test;
 
 import org.junit.*;
-import org.openecomp.policy.api.PolicyType;
+import org.onap.policy.api.PolicyType;
 
 import static org.junit.Assert.*;
 
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PushPolicyParametersTest.java b/PolicyEngineAPI/src/test/java/org/onap/policy/test/PushPolicyParametersTest.java
index ef005f1f4..832589757 100644
--- a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PushPolicyParametersTest.java
+++ b/PolicyEngineAPI/src/test/java/org/onap/policy/test/PushPolicyParametersTest.java
@@ -18,12 +18,12 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.test;
+package org.onap.policy.test;
 
 import java.util.UUID;
 
 import org.junit.*;
-import org.openecomp.policy.api.PushPolicyParameters;
+import org.onap.policy.api.PushPolicyParameters;
 
 import static org.junit.Assert.*;
 
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/RemovedPolicyTest.java b/PolicyEngineAPI/src/test/java/org/onap/policy/test/RemovedPolicyTest.java
index ef77e6d5f..6a53cbfb1 100644
--- a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/RemovedPolicyTest.java
+++ b/PolicyEngineAPI/src/test/java/org/onap/policy/test/RemovedPolicyTest.java
@@ -18,11 +18,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.test;
+package org.onap.policy.test;
 
 import org.junit.After;
 import org.junit.Before;
-import org.openecomp.policy.api.RemovedPolicy;
+import org.onap.policy.api.RemovedPolicy;
 
 /**
  * The class <code>RemovedPolicyTest</code> contains tests for the class <code>{@link RemovedPolicy}</code>.
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/SendEventTest.java b/PolicyEngineAPI/src/test/java/org/onap/policy/test/SendEventTest.java
index 5757f8915..560ca463f 100644
--- a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/SendEventTest.java
+++ b/PolicyEngineAPI/src/test/java/org/onap/policy/test/SendEventTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.test;
+package org.onap.policy.test;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -30,13 +30,13 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.junit.Before;
-import org.openecomp.policy.api.PolicyEngine;
-import org.openecomp.policy.api.PolicyEngineException;
-import org.openecomp.policy.api.PolicyEventException;
-import org.openecomp.policy.api.PolicyResponse;
-import org.openecomp.policy.api.PolicyResponseStatus;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger; 
+import org.onap.policy.api.PolicyEngine;
+import org.onap.policy.api.PolicyEngineException;
+import org.onap.policy.api.PolicyEventException;
+import org.onap.policy.api.PolicyResponse;
+import org.onap.policy.api.PolicyResponseStatus;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger; 
 
 public class SendEventTest {
 	
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/TestRunner.java b/PolicyEngineAPI/src/test/java/org/onap/policy/test/TestRunner.java
index 69cbd834e..87687f0ab 100644
--- a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/TestRunner.java
+++ b/PolicyEngineAPI/src/test/java/org/onap/policy/test/TestRunner.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.test;
+package org.onap.policy.test;
 
 import org.junit.runner.JUnitCore;
 import org.junit.runner.Result;
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/UpdateTypeTest.java b/PolicyEngineAPI/src/test/java/org/onap/policy/test/UpdateTypeTest.java
index 909a05f0e..500d6c1c5 100644
--- a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/UpdateTypeTest.java
+++ b/PolicyEngineAPI/src/test/java/org/onap/policy/test/UpdateTypeTest.java
@@ -18,10 +18,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.test;
+package org.onap.policy.test;
 
 import org.junit.*;
-import org.openecomp.policy.api.UpdateType;
+import org.onap.policy.api.UpdateType;
 
 import static org.junit.Assert.*;
 
diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/package-info.java b/PolicyEngineAPI/src/test/java/org/onap/policy/test/package-info.java
index e678c4be2..eb92f89bd 100644
--- a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/package-info.java
+++ b/PolicyEngineAPI/src/test/java/org/onap/policy/test/package-info.java
@@ -21,4 +21,4 @@
 /**
  * API JUNIT TestCases. 
  */
-package org.openecomp.policy.test;
+package org.onap.policy.test;
diff --git a/PolicyEngineClient/input.testCases b/PolicyEngineClient/input.testCases
index edb374001..a170fbef4 100644
--- a/PolicyEngineClient/input.testCases
+++ b/PolicyEngineClient/input.testCases
@@ -4,7 +4,7 @@
   "testCaseDescription": "test GetConfig String Not valid",
   "testFor": "getConfig",
   "PDP_URLConfigFile":  "config.properties"
-  "ECOMPName": "fail",
+  "ONAPName": "fail",
   "ConfigName": null,
    "configAttributes": null,
   "expectedResult":[
@@ -16,7 +16,7 @@
   "testCaseDescription": "test Get ConfigString Valid JSON",
   "testFor": "getConfig",
   "PDP_URLConfigFile":  "config.properties"
-  "ECOMPName": "JSON",
+  "ONAPName": "JSON",
   "ConfigName": null,
    "configAttributes": null,
   "expectedResult":[
@@ -28,7 +28,7 @@
   "testCaseDescription": "test Get ConfigString Valid XML",
   "testFor": "getConfig",
   "PDP_URLConfigFile":  "config.properties"
-  "ECOMPName": "XML",
+  "ONAPName": "XML",
   "ConfigName": null,
    "configAttributes": null,
   "expectedResult":[
@@ -40,7 +40,7 @@
   "testCaseDescription": "test Get ConfigString Valid properties",
   "testFor": "getConfig",
   "PDP_URLConfigFile":  "config.properties"
-  "ECOMPName": "Properties",
+  "ONAPName": "Properties",
   "ConfigName": null,
    "configAttributes": null,
   "expectedResult":[
@@ -52,7 +52,7 @@
   "testCaseDescription": "test Get ConfigString Valid other",
   "testFor": "getConfig",
   "PDP_URLConfigFile":  "config.properties"
-  "ECOMPName": "Other",
+  "ONAPName": "Other",
   "ConfigName": null,
    "configAttributes": null,
   "expectedResult":[
@@ -64,11 +64,11 @@
   "testCaseDescription": "test GetConfig String String Fail",
   "testFor": "getConfig",
   "PDP_URLConfigFile":  "config.properties"
-  "ECOMPName": null,
+  "ONAPName": null,
   "ConfigName": null,
    "configAttributes": null,
   "expectedResult":[
-  		"org.openecomp.policy.api.PolicyConfigException: No eCOMPComponentName given.",
+  		"org.onap.policy.api.PolicyConfigException: No onapComponentName given.",
  	 ]
 },
 {
@@ -76,11 +76,11 @@
   "testCaseDescription": "test GetConfig String String Fail1",
   "testFor": "getConfig",
   "PDP_URLConfigFile":  "config.properties"
-  "ECOMPName": null,
+  "ONAPName": null,
   "ConfigName": null,
    "configAttributes": null,
   "expectedResult":[
-  	"org.openecomp.policy.api.PolicyConfigException: No eCOMPComponentName given."
+  	"org.onap.policy.api.PolicyConfigException: No onapComponentName given."
   
  	 ]
 },
@@ -89,7 +89,7 @@
   "testCaseDescription": "test GetConfig String String Valid ",
   "testFor": "getConfig",
   "PDP_URLConfigFile":  "config.properties"
-  "ECOMPName": "fail",
+  "ONAPName": "fail",
   "ConfigName": "fail",
    "configAttributes": null,
   "expectedResult":[
@@ -101,7 +101,7 @@
   "testCaseDescription": "test GetConfig String String Valid JSON",
   "testFor": "getConfig",
   "PDP_URLConfigFile":  "config.properties"
-  "ECOMPName": "JSON",
+  "ONAPName": "JSON",
   "ConfigName": "JSONconfig",
    "configAttributes": null,
   "expectedResult":[
@@ -113,7 +113,7 @@
   "testCaseDescription": "test GetConfig String String Valid XML",
   "testFor": "getConfig",
   "PDP_URLConfigFile":  "config.properties"
-  "ECOMPName": "XML",
+  "ONAPName": "XML",
   "ConfigName": "XMLconfig",
    "configAttributes": null,
   "expectedResult":[
@@ -125,7 +125,7 @@
   "testCaseDescription": "test GetConfig String String Valid properties",
   "testFor": "getConfig",
   "PDP_URLConfigFile":  "config.properties"
-  "ECOMPName": "Properties",
+  "ONAPName": "Properties",
   "ConfigName": "PropConfig",
    "configAttributes": null,
   "expectedResult":[
@@ -137,7 +137,7 @@
   "testCaseDescription": "test GetConfig String String Valid other",
   "testFor": "getConfig",
   "PDP_URLConfigFile":  "config.properties"
-  "ECOMPName": "Other",
+  "ONAPName": "Other",
   "ConfigName": "OtherConfig",
    "configAttributes": null,
   "expectedResult":[
@@ -149,11 +149,11 @@
   "testCaseDescription": "test GetConfig String String String fail",
   "testFor": "getConfig",
   "PDP_URLConfigFile":  "config.properties"
-  "ECOMPName": null,
+  "ONAPName": null,
   "ConfigName": null,
    "configAttributes": null,
   "expectedResult":[
-  	"org.openecomp.policy.api.PolicyConfigException: No eCOMPComponentName given."
+  	"org.onap.policy.api.PolicyConfigException: No onapComponentName given."
   	]
 },
 {
@@ -161,7 +161,7 @@
   "testCaseDescription": "test GetConfig String String String fail1",
   "testFor": "getConfig",
   "PDP_URLConfigFile":  "config.properties"
-  "ECOMPName": null,
+  "ONAPName": null,
   "ConfigName": "testFail",
    "configAttributes": [
 		{
@@ -170,7 +170,7 @@
 			},
 		],
   "expectedResult":[
-  		"org.openecomp.policy.api.PolicyConfigException: No eCOMPComponentName given.",
+  		"org.onap.policy.api.PolicyConfigException: No onapComponentName given.",
   		]
 },
 {
@@ -178,7 +178,7 @@
   "testCaseDescription": "test GetConfig String String String fail2",
   "testFor": "getConfig",
   "PDP_URLConfigFile":  "config.properties"
-  "ECOMPName": "TestFail",
+  "ONAPName": "TestFail",
   "ConfigName": null,
    "configAttributes": [
 		{
@@ -195,7 +195,7 @@
   "testCaseDescription": "test GetConfig String String String fail3",
   "testFor": "getConfig",
   "PDP_URLConfigFile":  "config.properties"
-  "ECOMPName": "TestFail",
+  "ONAPName": "TestFail",
   "ConfigName": "configFail",
    "configAttributes": null,
   "expectedResult":[
@@ -207,7 +207,7 @@
   "testCaseDescription": "test GetConfig String String String fail4",
   "testFor": "getConfig",
   "PDP_URLConfigFile":  "config.properties"
-  "ECOMPName": "TestFail",
+  "ONAPName": "TestFail",
   "ConfigName": "configFail",
    "configAttributes": [
 		{
@@ -216,7 +216,7 @@
 		},
 	],
   "expectedResult":[
-  		"org.openecomp.policy.api.PolicyConfigException: Cannot have an empty Key",
+  		"org.onap.policy.api.PolicyConfigException: Cannot have an empty Key",
 
  	 ]
 },
@@ -225,7 +225,7 @@
   "testCaseDescription": "test GetConfig String String String Valid",
   "testFor": "getConfig",
   "PDP_URLConfigFile":  "config.properties"
-  "ECOMPName": "TestFail",
+  "ONAPName": "TestFail",
   "ConfigName": "configFail",
    "configAttributes": [
 		{
@@ -242,7 +242,7 @@
   "testCaseDescription": "test GetConfig String String String Valid JSON",
   "testFor": "getConfig",
   "PDP_URLConfigFile":  "config.properties"
-  "ECOMPName": "JSON",
+  "ONAPName": "JSON",
   "ConfigName": "JSONconfig",
    "configAttributes": [
 	{
@@ -267,7 +267,7 @@
   "testCaseDescription": "test GetConfig String String String Valid XML",
   "testFor": "getConfig",
   "PDP_URLConfigFile":  "config.properties"
-  "ECOMPName": "XML",
+  "ONAPName": "XML",
   "ConfigName": "XMLconfig",
    "configAttributes": [
 	{
@@ -292,7 +292,7 @@
   "testCaseDescription": "test GetConfig String String String Valid properties",
   "testFor": "getConfig",
   "PDP_URLConfigFile":  "config.properties"
-  "ECOMPName": "Properties",
+  "ONAPName": "Properties",
   "ConfigName": "PropConfig",
    "configAttributes": [
 	{
@@ -317,7 +317,7 @@
   "testCaseDescription": "test GetConfig String String String Valid other",
   "testFor": "getConfig",
   "PDP_URLConfigFile":  "config.properties"
-  "ECOMPName": "Other",
+  "ONAPName": "Other",
   "ConfigName": "OtherConfig",
    "configAttributes": [
 	{
@@ -344,7 +344,7 @@
   "PDP_URLConfigFile":  "config.properties",
   "eventAttributes": null,
  "expectedResult":[
- 		"org.openecomp.policy.api.PolicyEventException: No EventAttributes Given.",
+ 		"org.onap.policy.api.PolicyEventException: No EventAttributes Given.",
  ]
 },
 {
@@ -359,7 +359,7 @@
     },
   ],
  "expectedResult":[
- 		"org.openecomp.policy.api.PolicyEventException: Cannot have an empty Key",
+ 		"org.onap.policy.api.PolicyEventException: Cannot have an empty Key",
  		
  ]
 },
diff --git a/PolicyEngineClient/pom.xml b/PolicyEngineClient/pom.xml
index fb6267c2a..04be78565 100644
--- a/PolicyEngineClient/pom.xml
+++ b/PolicyEngineClient/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   ============LICENSE_START=======================================================
-  ECOMP Policy Engine
+  ONAP Policy Engine
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
   ================================================================================
@@ -23,14 +23,14 @@
 	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>PolicyEngineClient</artifactId>
 	<dependencies>
 		<dependency>
-			<groupId>org.openecomp.policy.engine</groupId>
+			<groupId>org.onap.policy.engine</groupId>
 			<artifactId>PolicyEngineAPI</artifactId>
 			<version>${project.version}</version>
 		</dependency>
diff --git a/PolicyEngineClient/src/main/java/org/openecomp/policyEngine/ActionPolicyClient.java b/PolicyEngineClient/src/main/java/org/onap/policyEngine/ActionPolicyClient.java
index d1081b106..fa04668ca 100644
--- a/PolicyEngineClient/src/main/java/org/openecomp/policyEngine/ActionPolicyClient.java
+++ b/PolicyEngineClient/src/main/java/org/onap/policyEngine/ActionPolicyClient.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policyEngine;
+package org.onap.policyEngine;
 
 import java.util.Arrays;
 import java.util.HashMap;
@@ -27,11 +27,11 @@ import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
-import org.openecomp.policy.api.AttributeType;
-import org.openecomp.policy.api.PolicyChangeResponse;
-import org.openecomp.policy.api.PolicyClass;
-import org.openecomp.policy.api.PolicyEngine;
-import org.openecomp.policy.api.PolicyParameters;
+import org.onap.policy.api.AttributeType;
+import org.onap.policy.api.PolicyChangeResponse;
+import org.onap.policy.api.PolicyClass;
+import org.onap.policy.api.PolicyEngine;
+import org.onap.policy.api.PolicyParameters;
 
 public class ActionPolicyClient {
 	static Boolean isEdit = true;
diff --git a/PolicyEngineClient/src/main/java/org/openecomp/policyEngine/BrmsParamPolicyClient.java b/PolicyEngineClient/src/main/java/org/onap/policyEngine/BrmsParamPolicyClient.java
index 5810106c1..04cfdb84a 100644
--- a/PolicyEngineClient/src/main/java/org/openecomp/policyEngine/BrmsParamPolicyClient.java
+++ b/PolicyEngineClient/src/main/java/org/onap/policyEngine/BrmsParamPolicyClient.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policyEngine;
+package org.onap.policyEngine;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -26,11 +26,11 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
 
-import org.openecomp.policy.api.AttributeType;
-import org.openecomp.policy.api.PolicyChangeResponse;
-import org.openecomp.policy.api.PolicyConfigType;
-import org.openecomp.policy.api.PolicyEngine;
-import org.openecomp.policy.api.PolicyParameters;
+import org.onap.policy.api.AttributeType;
+import org.onap.policy.api.PolicyChangeResponse;
+import org.onap.policy.api.PolicyConfigType;
+import org.onap.policy.api.PolicyEngine;
+import org.onap.policy.api.PolicyParameters;
 
 
 public class BrmsParamPolicyClient {
diff --git a/PolicyEngineClient/src/main/java/org/openecomp/policyEngine/BrmsRawPolicyClient.java b/PolicyEngineClient/src/main/java/org/onap/policyEngine/BrmsRawPolicyClient.java
index c144e1989..bf8fea59f 100644
--- a/PolicyEngineClient/src/main/java/org/openecomp/policyEngine/BrmsRawPolicyClient.java
+++ b/PolicyEngineClient/src/main/java/org/onap/policyEngine/BrmsRawPolicyClient.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policyEngine;
+package org.onap.policyEngine;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -32,12 +32,12 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
 
-import org.openecomp.policy.api.AttributeType;
-import org.openecomp.policy.api.PolicyChangeResponse;
-import org.openecomp.policy.api.PolicyConfigType;
-import org.openecomp.policy.api.PolicyEngine;
-import org.openecomp.policy.api.PolicyParameters;
-import org.openecomp.policy.api.PolicyType;
+import org.onap.policy.api.AttributeType;
+import org.onap.policy.api.PolicyChangeResponse;
+import org.onap.policy.api.PolicyConfigType;
+import org.onap.policy.api.PolicyEngine;
+import org.onap.policy.api.PolicyParameters;
+import org.onap.policy.api.PolicyType;
 
 public class BrmsRawPolicyClient {
 	static Boolean isEdit = true;
diff --git a/PolicyEngineClient/src/main/java/org/openecomp/policyEngine/ClosedLoopPolicyClient.java b/PolicyEngineClient/src/main/java/org/onap/policyEngine/ClosedLoopPolicyClient.java
index a54030b94..2240f0b73 100644
--- a/PolicyEngineClient/src/main/java/org/openecomp/policyEngine/ClosedLoopPolicyClient.java
+++ b/PolicyEngineClient/src/main/java/org/onap/policyEngine/ClosedLoopPolicyClient.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policyEngine;
+package org.onap.policyEngine;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -36,11 +36,11 @@ import javax.json.Json;
 import javax.json.JsonObject;
 import javax.json.JsonReader;
 
-import org.openecomp.policy.api.PolicyChangeResponse;
-import org.openecomp.policy.api.PolicyConfigType;
-import org.openecomp.policy.api.PolicyEngine;
-import org.openecomp.policy.api.PolicyParameters;
-import org.openecomp.policy.api.PolicyType;
+import org.onap.policy.api.PolicyChangeResponse;
+import org.onap.policy.api.PolicyConfigType;
+import org.onap.policy.api.PolicyEngine;
+import org.onap.policy.api.PolicyParameters;
+import org.onap.policy.api.PolicyType;
 
 public class ClosedLoopPolicyClient {
 	//For updating a ClosedLoop_Fault policy set the "isEdit" flag to true.   
diff --git a/PolicyEngineClient/src/main/java/org/openecomp/policyEngine/ClosedLoopPolicyPerformanceMetricClient.java b/PolicyEngineClient/src/main/java/org/onap/policyEngine/ClosedLoopPolicyPerformanceMetricClient.java
index 9564cdefe..e3b5fde60 100644
--- a/PolicyEngineClient/src/main/java/org/openecomp/policyEngine/ClosedLoopPolicyPerformanceMetricClient.java
+++ b/PolicyEngineClient/src/main/java/org/onap/policyEngine/ClosedLoopPolicyPerformanceMetricClient.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policyEngine;
+package org.onap.policyEngine;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -36,11 +36,11 @@ import javax.json.Json;
 import javax.json.JsonObject;
 import javax.json.JsonReader;
 
-import org.openecomp.policy.api.PolicyChangeResponse;
-import org.openecomp.policy.api.PolicyConfigType;
-import org.openecomp.policy.api.PolicyEngine;
-import org.openecomp.policy.api.PolicyParameters;
-import org.openecomp.policy.api.PolicyType;
+import org.onap.policy.api.PolicyChangeResponse;
+import org.onap.policy.api.PolicyConfigType;
+import org.onap.policy.api.PolicyEngine;
+import org.onap.policy.api.PolicyParameters;
+import org.onap.policy.api.PolicyType;
 
 public class ClosedLoopPolicyPerformanceMetricClient {
 	
diff --git a/PolicyEngineClient/src/main/java/org/openecomp/policyEngine/ConfigBasePolicyClient.java b/PolicyEngineClient/src/main/java/org/onap/policyEngine/ConfigBasePolicyClient.java
index a3903806c..20a5bd359 100644
--- a/PolicyEngineClient/src/main/java/org/openecomp/policyEngine/ConfigBasePolicyClient.java
+++ b/PolicyEngineClient/src/main/java/org/onap/policyEngine/ConfigBasePolicyClient.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policyEngine;
+package org.onap.policyEngine;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -26,12 +26,12 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
 
-import org.openecomp.policy.api.AttributeType;
-import org.openecomp.policy.api.PolicyChangeResponse;
-import org.openecomp.policy.api.PolicyConfigType;
-import org.openecomp.policy.api.PolicyEngine;
-import org.openecomp.policy.api.PolicyParameters;
-import org.openecomp.policy.api.PolicyType;
+import org.onap.policy.api.AttributeType;
+import org.onap.policy.api.PolicyChangeResponse;
+import org.onap.policy.api.PolicyConfigType;
+import org.onap.policy.api.PolicyEngine;
+import org.onap.policy.api.PolicyParameters;
+import org.onap.policy.api.PolicyType;
 
 public class ConfigBasePolicyClient{
 	static Boolean isEdit = false;
@@ -43,7 +43,7 @@ public class ConfigBasePolicyClient{
             policyParameters.setPolicyConfigType(PolicyConfigType.Base); //required
             policyParameters.setPolicyName("MikeConsole.testDeleteAPI6"); //required
             policyParameters.setPolicyDescription("This is a sample Config Base policy creation example");  //optional
-            policyParameters.setEcompName("DCAE");  //required
+            policyParameters.setOnapName("DCAE");  //required
             policyParameters.setConfigName("testBase"); //required
             policyParameters.setConfigBodyType(PolicyType.OTHER); //required
             policyParameters.setConfigBody("testing");  //required
diff --git a/PolicyEngineClient/src/main/java/org/openecomp/policyEngine/ConfigFirewallPolicyClient.java b/PolicyEngineClient/src/main/java/org/onap/policyEngine/ConfigFirewallPolicyClient.java
index a6b3119f9..a261761f5 100644
--- a/PolicyEngineClient/src/main/java/org/openecomp/policyEngine/ConfigFirewallPolicyClient.java
+++ b/PolicyEngineClient/src/main/java/org/onap/policyEngine/ConfigFirewallPolicyClient.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policyEngine;
+package org.onap.policyEngine;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -36,11 +36,11 @@ import javax.json.Json;
 import javax.json.JsonObject;
 import javax.json.JsonReader;
 
-import org.openecomp.policy.api.PolicyChangeResponse;
-import org.openecomp.policy.api.PolicyConfigType;
-import org.openecomp.policy.api.PolicyEngine;
-import org.openecomp.policy.api.PolicyParameters;
-import org.openecomp.policy.api.PolicyType;
+import org.onap.policy.api.PolicyChangeResponse;
+import org.onap.policy.api.PolicyConfigType;
+import org.onap.policy.api.PolicyEngine;
+import org.onap.policy.api.PolicyParameters;
+import org.onap.policy.api.PolicyType;
 
 public class ConfigFirewallPolicyClient {
 	static Boolean isEdit = false;
diff --git a/PolicyEngineClient/src/main/java/org/openecomp/policyEngine/DecisionPolicyClient.java b/PolicyEngineClient/src/main/java/org/onap/policyEngine/DecisionPolicyClient.java
index 428a2ca03..8c16e0e40 100644
--- a/PolicyEngineClient/src/main/java/org/openecomp/policyEngine/DecisionPolicyClient.java
+++ b/PolicyEngineClient/src/main/java/org/onap/policyEngine/DecisionPolicyClient.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policyEngine;
+package org.onap.policyEngine;
 
 import java.util.Arrays;
 import java.util.HashMap;
@@ -27,11 +27,11 @@ import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
-import org.openecomp.policy.api.AttributeType;
-import org.openecomp.policy.api.PolicyChangeResponse;
-import org.openecomp.policy.api.PolicyClass;
-import org.openecomp.policy.api.PolicyEngine;
-import org.openecomp.policy.api.PolicyParameters;
+import org.onap.policy.api.AttributeType;
+import org.onap.policy.api.PolicyChangeResponse;
+import org.onap.policy.api.PolicyClass;
+import org.onap.policy.api.PolicyEngine;
+import org.onap.policy.api.PolicyParameters;
 
 public class DecisionPolicyClient {
 	static Boolean isEdit = true;
@@ -42,7 +42,7 @@ public class DecisionPolicyClient {
 	        // Set Policy Type
 	        policyParameters.setPolicyClass(PolicyClass.Decision); //required
 	        policyParameters.setPolicyName("MikeAPItests.testDecisionAPI"); //required
-	        policyParameters.setEcompName("java"); //required
+	        policyParameters.setOnapName("java"); //required
 	        policyParameters.setPolicyDescription("This is a sample Decision policy UPDATE example with Settings");  //optional
 	        //policyParameters.setPolicyScope("MikeAPItests"); //Directory will be created where the Policies are saved... this displays a a subscope on the GUI
 	        
diff --git a/PolicyEngineClient/src/main/java/org/openecomp/policyEngine/DeletePolicyClient.java b/PolicyEngineClient/src/main/java/org/onap/policyEngine/DeletePolicyClient.java
index 79ec99f85..ec4959550 100644
--- a/PolicyEngineClient/src/main/java/org/openecomp/policyEngine/DeletePolicyClient.java
+++ b/PolicyEngineClient/src/main/java/org/onap/policyEngine/DeletePolicyClient.java
@@ -18,12 +18,12 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policyEngine;
+package org.onap.policyEngine;
 
-import org.openecomp.policy.api.DeletePolicyCondition;
-import org.openecomp.policy.api.DeletePolicyParameters;
-import org.openecomp.policy.api.PolicyChangeResponse;
-import org.openecomp.policy.api.PolicyEngine;
+import org.onap.policy.api.DeletePolicyCondition;
+import org.onap.policy.api.DeletePolicyParameters;
+import org.onap.policy.api.PolicyChangeResponse;
+import org.onap.policy.api.PolicyEngine;
 
 public class DeletePolicyClient {
 
diff --git a/PolicyEngineClient/src/main/java/org/openecomp/policyEngine/GeneralTestClient.java b/PolicyEngineClient/src/main/java/org/onap/policyEngine/GeneralTestClient.java
index 4298e8167..423ade2c2 100644
--- a/PolicyEngineClient/src/main/java/org/openecomp/policyEngine/GeneralTestClient.java
+++ b/PolicyEngineClient/src/main/java/org/onap/policyEngine/GeneralTestClient.java
@@ -28,7 +28,7 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package org.openecomp.policyEngine;
+package org.onap.policyEngine;
 
 import java.io.FileNotFoundException;
 import java.io.FileReader;
@@ -45,10 +45,10 @@ import java.util.Map;
 import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;
 import org.json.simple.parser.JSONParser;
-import org.openecomp.policy.api.PolicyEngine;
-import org.openecomp.policy.api.PolicyEngineException;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.api.PolicyEngine;
+import org.onap.policy.api.PolicyEngineException;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
 
 /**
  * Class reads from .testCases file and run the test cases available in the file
@@ -102,7 +102,7 @@ public class GeneralTestClient {
 	 * @param file
 	 */
 	private static void runTestClientOnConfigFile(Path file) {
-		String resultReturned, eCOMPComponentName;
+		String resultReturned, onapComponentName;
 		int totalTCforFile = 0, passTCforFile = 0, failTCforFile = 0;
 		System.out
 		.println("\n###############################################################################################");
@@ -151,8 +151,8 @@ public class GeneralTestClient {
 						switch (testFor) {
 
 						case "getConfig":
-							eCOMPComponentName = (String) testCase
-							.get("ECOMPName");
+							onapComponentName = (String) testCase
+							.get("ONAPName");
 							String configName = (String) testCase
 									.get("ConfigName");
 							Map<String, String> configAttributes = new HashMap<>();
@@ -172,7 +172,7 @@ public class GeneralTestClient {
 								configAttributes = null;
 							}
 							resultReceived = PolicyEngineTestClient.getConfig(
-									policyEngine, eCOMPComponentName,
+									policyEngine, onapComponentName,
 									configName, configAttributes);
 							Collections.sort(expectedResult);
 							Collections.sort(resultReceived);
@@ -226,8 +226,8 @@ public class GeneralTestClient {
 							break;
 
 						case "getDecision":
-							eCOMPComponentName = (String) testCase
-							.get("ECOMPName");
+							onapComponentName = (String) testCase
+							.get("ONAPName");
 							Map<String, String> decisionAttributes = new HashMap<>();
 							decisionAttributes.put("Key", "Value");
 							JSONArray decisionAttributesJSON = (JSONArray) testCase
@@ -243,7 +243,7 @@ public class GeneralTestClient {
 							
 							resultReceived = PolicyEngineTestClient
 									.getDecision(policyEngine,
-											eCOMPComponentName,
+											onapComponentName,
 											decisionAttributes);
 							Collections.sort(expectedResult);
 							Collections.sort(resultReceived);
@@ -264,11 +264,11 @@ public class GeneralTestClient {
 
 							// case "getManualNotification":
 							// PolicyEngineTestClient
-							// .getManualNotifications(org.openecomp.policyEngine);
+							// .getManualNotifications(org.onap.policyEngine);
 							// break;
 							// case "getAutoNotification":
 							// PolicyEngineTestClient
-							// .getAutoNotifications(org.openecomp.policyEngine);
+							// .getAutoNotifications(org.onap.policyEngine);
 							// break;
 
 						default:
diff --git a/PolicyEngineClient/src/main/java/org/openecomp/policyEngine/GetConfigSample.java b/PolicyEngineClient/src/main/java/org/onap/policyEngine/GetConfigSample.java
index cdba1c9fe..59225ce6f 100644
--- a/PolicyEngineClient/src/main/java/org/openecomp/policyEngine/GetConfigSample.java
+++ b/PolicyEngineClient/src/main/java/org/onap/policyEngine/GetConfigSample.java
@@ -18,13 +18,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policyEngine;
+package org.onap.policyEngine;
 
 import java.util.Collection;
 
-import org.openecomp.policy.api.ConfigRequestParameters;
-import org.openecomp.policy.api.PolicyConfig;
-import org.openecomp.policy.api.PolicyEngine;
+import org.onap.policy.api.ConfigRequestParameters;
+import org.onap.policy.api.PolicyConfig;
+import org.onap.policy.api.PolicyEngine;
 
 public class GetConfigSample {
 
diff --git a/PolicyEngineClient/src/main/java/org/openecomp/policyEngine/Handler.java b/PolicyEngineClient/src/main/java/org/onap/policyEngine/Handler.java
index ea11f9d8d..4a78db615 100644
--- a/PolicyEngineClient/src/main/java/org/openecomp/policyEngine/Handler.java
+++ b/PolicyEngineClient/src/main/java/org/onap/policyEngine/Handler.java
@@ -18,22 +18,22 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policyEngine;
+package org.onap.policyEngine;
 
 import java.util.Collection;
 
-import org.openecomp.policy.api.LoadedPolicy;
-import org.openecomp.policy.api.NotificationHandler;
-import org.openecomp.policy.api.NotificationType;
-import org.openecomp.policy.api.PDPNotification;
-import org.openecomp.policy.api.PolicyConfig;
-import org.openecomp.policy.api.PolicyConfigException;
-import org.openecomp.policy.api.PolicyConfigStatus;
-import org.openecomp.policy.api.PolicyEngine;
-import org.openecomp.policy.api.PolicyEngineException;
-import org.openecomp.policy.api.RemovedPolicy;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.api.LoadedPolicy;
+import org.onap.policy.api.NotificationHandler;
+import org.onap.policy.api.NotificationType;
+import org.onap.policy.api.PDPNotification;
+import org.onap.policy.api.PolicyConfig;
+import org.onap.policy.api.PolicyConfigException;
+import org.onap.policy.api.PolicyConfigStatus;
+import org.onap.policy.api.PolicyEngine;
+import org.onap.policy.api.PolicyEngineException;
+import org.onap.policy.api.RemovedPolicy;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
 
 public class Handler implements NotificationHandler{
 
diff --git a/PolicyEngineClient/src/main/java/org/openecomp/policyEngine/ImportBRMSTemplate.java b/PolicyEngineClient/src/main/java/org/onap/policyEngine/ImportBRMSTemplate.java
index bb34c4985..053c524b6 100644
--- a/PolicyEngineClient/src/main/java/org/openecomp/policyEngine/ImportBRMSTemplate.java
+++ b/PolicyEngineClient/src/main/java/org/onap/policyEngine/ImportBRMSTemplate.java
@@ -1,12 +1,12 @@
-package org.openecomp.policyEngine;
+package org.onap.policyEngine;
 
 import java.io.File;
 import java.util.UUID;
 
-import org.openecomp.policy.api.ImportParameters;
-import org.openecomp.policy.api.PolicyChangeResponse;
-import org.openecomp.policy.api.PolicyEngine;
-import org.openecomp.policy.api.ImportParameters.IMPORT_TYPE;
+import org.onap.policy.api.ImportParameters;
+import org.onap.policy.api.PolicyChangeResponse;
+import org.onap.policy.api.PolicyEngine;
+import org.onap.policy.api.ImportParameters.IMPORT_TYPE;
 
 public class ImportBRMSTemplate {
 	public static void main(String[] args) {
diff --git a/PolicyEngineClient/src/main/java/org/openecomp/policyEngine/ImportMicroServiceClient.java b/PolicyEngineClient/src/main/java/org/onap/policyEngine/ImportMicroServiceClient.java
index 70e79805e..671eb6c80 100644
--- a/PolicyEngineClient/src/main/java/org/openecomp/policyEngine/ImportMicroServiceClient.java
+++ b/PolicyEngineClient/src/main/java/org/onap/policyEngine/ImportMicroServiceClient.java
@@ -18,14 +18,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policyEngine;
+package org.onap.policyEngine;
 
 import java.util.UUID;
 
-import org.openecomp.policy.api.ImportParameters;
-import org.openecomp.policy.api.ImportParameters.IMPORT_TYPE;
-import org.openecomp.policy.api.PolicyChangeResponse;
-import org.openecomp.policy.api.PolicyEngine;
+import org.onap.policy.api.ImportParameters;
+import org.onap.policy.api.ImportParameters.IMPORT_TYPE;
+import org.onap.policy.api.PolicyChangeResponse;
+import org.onap.policy.api.PolicyEngine;
 
 public class ImportMicroServiceClient {
 	static Boolean isEdit = false;
diff --git a/PolicyEngineClient/src/main/java/org/openecomp/policyEngine/ListConfigPoliciesClient.java b/PolicyEngineClient/src/main/java/org/onap/policyEngine/ListConfigPoliciesClient.java
index 497ff84a1..dd5c97ba1 100644
--- a/PolicyEngineClient/src/main/java/org/openecomp/policyEngine/ListConfigPoliciesClient.java
+++ b/PolicyEngineClient/src/main/java/org/onap/policyEngine/ListConfigPoliciesClient.java
@@ -18,19 +18,19 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policyEngine;
+package org.onap.policyEngine;
 
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
 
-import org.openecomp.policy.api.ConfigRequestParameters;
-import org.openecomp.policy.api.PolicyConfigException;
-import org.openecomp.policy.api.PolicyEngine;
-import org.openecomp.policy.api.PolicyEngineException;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.api.ConfigRequestParameters;
+import org.onap.policy.api.PolicyConfigException;
+import org.onap.policy.api.PolicyEngine;
+import org.onap.policy.api.PolicyEngineException;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
 
 public class ListConfigPoliciesClient {
 	
@@ -45,7 +45,7 @@ public class ListConfigPoliciesClient {
 			ConfigRequestParameters parameters = new ConfigRequestParameters();
 			
 			parameters.setPolicyName(".*");
-			parameters.setEcompName(".*");
+			parameters.setOnapName(".*");
 			parameters.setConfigName(".*");
 			
 			Map<String, String> configAttributes = new HashMap<>();
diff --git a/PolicyEngineClient/src/main/java/org/openecomp/policyEngine/MainClient.java b/PolicyEngineClient/src/main/java/org/onap/policyEngine/MainClient.java
index d17f0c649..0be702c13 100644
--- a/PolicyEngineClient/src/main/java/org/openecomp/policyEngine/MainClient.java
+++ b/PolicyEngineClient/src/main/java/org/onap/policyEngine/MainClient.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policyEngine;
+package org.onap.policyEngine;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -34,15 +34,15 @@ import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 
-import org.openecomp.policy.api.LoadedPolicy;
-import org.openecomp.policy.api.NotificationScheme;
-import org.openecomp.policy.api.PolicyConfig;
-import org.openecomp.policy.api.PolicyConfigException;
-import org.openecomp.policy.api.PolicyEngine;
-import org.openecomp.policy.api.PolicyEngineException;
-import org.openecomp.policy.api.RemovedPolicy;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.api.LoadedPolicy;
+import org.onap.policy.api.NotificationScheme;
+import org.onap.policy.api.PolicyConfig;
+import org.onap.policy.api.PolicyConfigException;
+import org.onap.policy.api.PolicyEngine;
+import org.onap.policy.api.PolicyEngineException;
+import org.onap.policy.api.RemovedPolicy;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
 import org.w3c.dom.Document;
 
 public class MainClient {
@@ -67,7 +67,7 @@ public class MainClient {
 			// Config Example 
 			try {
 				@SuppressWarnings("deprecation")
-				Collection<PolicyConfig> policyConfigs = policyEngine.getConfigByPolicyName(".*");//(eCOMPComponentName, configName, configAttributes);
+				Collection<PolicyConfig> policyConfigs = policyEngine.getConfigByPolicyName(".*");//(onapComponentName, configName, configAttributes);
 				if(policyConfigs!=null && !policyConfigs.isEmpty()){
 					for(PolicyConfig policyConfig: policyConfigs){
 						System.out.println("\nConfig Message: "+ policyConfig.getPolicyConfigMessage());
diff --git a/PolicyEngineClient/src/main/java/org/openecomp/policyEngine/MicroServicesPolicyClient.java b/PolicyEngineClient/src/main/java/org/onap/policyEngine/MicroServicesPolicyClient.java
index 4c6756a5b..99f9551cb 100644
--- a/PolicyEngineClient/src/main/java/org/openecomp/policyEngine/MicroServicesPolicyClient.java
+++ b/PolicyEngineClient/src/main/java/org/onap/policyEngine/MicroServicesPolicyClient.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policyEngine;
+package org.onap.policyEngine;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -35,11 +35,11 @@ import javax.json.Json;
 import javax.json.JsonObject;
 import javax.json.JsonReader;
 
-import org.openecomp.policy.api.PolicyChangeResponse;
-import org.openecomp.policy.api.PolicyConfigType;
-import org.openecomp.policy.api.PolicyEngine;
-import org.openecomp.policy.api.PolicyParameters;
-import org.openecomp.policy.api.PolicyType;
+import org.onap.policy.api.PolicyChangeResponse;
+import org.onap.policy.api.PolicyConfigType;
+import org.onap.policy.api.PolicyEngine;
+import org.onap.policy.api.PolicyParameters;
+import org.onap.policy.api.PolicyType;
 public class MicroServicesPolicyClient {
      
 //For updating a Micro Services policy set the "isEdit" flag to true.   
@@ -79,7 +79,7 @@ public static void main(String[] args) {
 			policyParameters.setPolicyConfigType(PolicyConfigType.MicroService);
 			policyParameters.setPolicyName("Katrina.configuration_dcae_microservice_stringmatcher");
 			//policyParameters.setPolicyDescription("This is a sample Micro Service policy Create example");
-			policyParameters.setEcompName("DCAE");
+			policyParameters.setOnapName("DCAE");
 			//policyParameters.setConfigName("Collector");
 			//policyParameters.setPriority("1");
 			//policyParameters.setPolicyScope("service=vSCP;resource=F5;type=configuration;closedLoopControlName=vSCP_F5_Firewall_d925ed73-8231-4d02-9545-db4e113213abab322");
diff --git a/PolicyEngineClient/src/main/java/org/openecomp/policyEngine/PolicyEngineTestClient.java b/PolicyEngineClient/src/main/java/org/onap/policyEngine/PolicyEngineTestClient.java
index a56145214..4f782c8c9 100644
--- a/PolicyEngineClient/src/main/java/org/openecomp/policyEngine/PolicyEngineTestClient.java
+++ b/PolicyEngineClient/src/main/java/org/onap/policyEngine/PolicyEngineTestClient.java
@@ -28,7 +28,7 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package org.openecomp.policyEngine;
+package org.onap.policyEngine;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -36,16 +36,16 @@ import java.util.Collection;
 import java.util.Map;
 import java.util.UUID;
 
-import org.openecomp.policy.api.DecisionResponse;
-import org.openecomp.policy.api.LoadedPolicy;
-import org.openecomp.policy.api.NotificationScheme;
-import org.openecomp.policy.api.PolicyConfig;
-import org.openecomp.policy.api.PolicyConfigException;
-import org.openecomp.policy.api.PolicyDecisionException;
-import org.openecomp.policy.api.PolicyEngine;
-import org.openecomp.policy.api.PolicyEventException;
-import org.openecomp.policy.api.PolicyResponse;
-import org.openecomp.policy.api.RemovedPolicy;
+import org.onap.policy.api.DecisionResponse;
+import org.onap.policy.api.LoadedPolicy;
+import org.onap.policy.api.NotificationScheme;
+import org.onap.policy.api.PolicyConfig;
+import org.onap.policy.api.PolicyConfigException;
+import org.onap.policy.api.PolicyDecisionException;
+import org.onap.policy.api.PolicyEngine;
+import org.onap.policy.api.PolicyEventException;
+import org.onap.policy.api.PolicyResponse;
+import org.onap.policy.api.RemovedPolicy;
 
 /**
  * Class contains static functions which make call to policy engine using API.
@@ -60,8 +60,8 @@ public class PolicyEngineTestClient {
 	 * This fuction make API call to policy engine to get config. And returns
 	 * policy name, policy version and policy configStatus
 	 * 
-	 * @param org.openecomp.policyEngine
-	 * @param eCOMPComponentName
+	 * @param org.onap.policyEngine
+	 * @param onapComponentName
 	 * @param configName
 	 * @param configAttributes
 	 * @return
@@ -69,21 +69,21 @@ public class PolicyEngineTestClient {
 
 	@SuppressWarnings("deprecation")
 	public static ArrayList<String> getConfig(PolicyEngine policyEngine,
-			String eCOMPComponentName, String configName,
+			String onapComponentName, String configName,
 			Map<String, String> configAttributes) {
 		ArrayList<String> resultReceived = new ArrayList<>();
 		try {
 			UUID requestID = UUID.randomUUID();
 			Collection<PolicyConfig> policyConfigs;
 			if (configName == null) {
-				policyConfigs = policyEngine.getConfig(eCOMPComponentName, requestID);
+				policyConfigs = policyEngine.getConfig(onapComponentName, requestID);
 			} else {
 				if (configAttributes == null) {
-					policyConfigs = policyEngine.getConfig(eCOMPComponentName,
+					policyConfigs = policyEngine.getConfig(onapComponentName,
 							configName, requestID);
 				} else {
 					
-					policyConfigs = policyEngine.getConfig(eCOMPComponentName,
+					policyConfigs = policyEngine.getConfig(onapComponentName,
 							configName, configAttributes, requestID);
 				}
 			}
@@ -107,20 +107,20 @@ public class PolicyEngineTestClient {
 	 * This functions make API call to policy engine to get decision. And
 	 * returns policy Decision
 	 * 
-	 * @param org.openecomp.policyEngine
-	 * @param eCOMPComponentName
+	 * @param org.onap.policyEngine
+	 * @param onapComponentName
 	 * @param decisionAttributes
 	 * @return
 	 */
 	public static ArrayList<String> getDecision(PolicyEngine policyEngine,
-			String eCOMPComponentName, Map<String, String> decisionAttributes) {
+			String onapComponentName, Map<String, String> decisionAttributes) {
 		ArrayList<String> resultReceived = new ArrayList<>();
 		// Decision example
 		try {
 			UUID requestID = UUID.randomUUID();
 			@SuppressWarnings("deprecation")
 			DecisionResponse policyDecision = policyEngine.getDecision(
-					eCOMPComponentName, decisionAttributes, requestID);
+					onapComponentName, decisionAttributes, requestID);
 			resultReceived.add(policyDecision.getDecision().toString());
 		} catch (PolicyDecisionException e) {
 //			logger.error("Exception Occured"+e);
@@ -133,7 +133,7 @@ public class PolicyEngineTestClient {
 	 * This function makes API call to policy engine to get action. And returns
 	 * responseMessage and responseStatus
 	 * 
-	 * @param org.openecomp.policyEngine
+	 * @param org.onap.policyEngine
 	 * @param eventAttributes
 	 * @return
 	 */
@@ -164,7 +164,7 @@ public class PolicyEngineTestClient {
 	 * This function makes API call to policy engine to get manual
 	 * notifications.
 	 * 
-	 * @param org.openecomp.policyEngine
+	 * @param org.onap.policyEngine
 	 */
 
 	public static void getManualNotifications(PolicyEngine policyEngine) {
@@ -186,7 +186,7 @@ public class PolicyEngineTestClient {
 	 * This function makes API call to policy engine to get automatic
 	 * notifications.
 	 * 
-	 * @param org.openecomp.policyEngine
+	 * @param org.onap.policyEngine
 	 */
 	public static void getAutoNotifications(PolicyEngine policyEngine) {
 		Handler handler = new Handler();
diff --git a/PolicyEngineClient/src/main/java/org/openecomp/policyEngine/PushPoliciesToPDP.java b/PolicyEngineClient/src/main/java/org/onap/policyEngine/PushPoliciesToPDP.java
index 2a4086357..05d736464 100644
--- a/PolicyEngineClient/src/main/java/org/openecomp/policyEngine/PushPoliciesToPDP.java
+++ b/PolicyEngineClient/src/main/java/org/onap/policyEngine/PushPoliciesToPDP.java
@@ -18,11 +18,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policyEngine;
+package org.onap.policyEngine;
 
-import org.openecomp.policy.api.PolicyChangeResponse;
-import org.openecomp.policy.api.PolicyEngine;
-import org.openecomp.policy.api.PushPolicyParameters;
+import org.onap.policy.api.PolicyChangeResponse;
+import org.onap.policy.api.PolicyEngine;
+import org.onap.policy.api.PushPolicyParameters;
 
 public class PushPoliciesToPDP {
 	public static void main(String[] args) {
diff --git a/PolicyEngineClient/testResources/test.drl b/PolicyEngineClient/testResources/test.drl
index 2a58f5439..7accc63ae 100644
--- a/PolicyEngineClient/testResources/test.drl
+++ b/PolicyEngineClient/testResources/test.drl
@@ -78,7 +78,7 @@ import org.onap.policy.mso.MSORelatedInstanceListElement;
 import org.onap.policy.mso.MSORelatedInstance;
 import org.onap.policy.mso.MSOResponse;
 
-import org.openecomp.policy.drools.system.PolicyEngine;
+import org.onap.policy.drools.system.PolicyEngine;
 
 //
 // These parameters are required to build the runtime policy
@@ -101,7 +101,7 @@ end
 /*
 *
 * Called once and only once to insert the parameters into working memory for this Closed Loop policy.
-* (Comment SETUP rule out for the first ECOMP opensource release since policy BRMS_GW already puts a Params fact in there)
+* (Comment SETUP rule out for the first ONAP opensource release since policy BRMS_GW already puts a Params fact in there)
 *
 *
 *rule "${policyName}.SETUP"
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 {
diff --git a/README.md b/README.md
index 1acdc038a..3e8ca7892 100644
--- a/README.md
+++ b/README.md
@@ -1 +1 @@
-This source repository contains the OpenECOMP Policy Engine code. The settings file needs to support the standard Maven repositories (e.g. central = http://repo1.maven.org/maven2/), and any proxy settings needed in your environment. To build it using Maven 3, run 'mvn clean install'.
+This source repository contains the ONAP Policy Engine code. The settings file needs to support the standard Maven repositories (e.g. central = http://repo1.maven.org/maven2/), and any proxy settings needed in your environment. To build it using Maven 3, run 'mvn clean install'.
diff --git a/packages/base/pom.xml b/packages/base/pom.xml
index 2e2e5248c..9f24c6008 100755
--- a/packages/base/pom.xml
+++ b/packages/base/pom.xml
@@ -1,6 +1,6 @@
 <!--
   ============LICENSE_START=======================================================
-  ECOMP Policy Engine
+  ONAP Policy Engine
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
   ================================================================================
@@ -24,7 +24,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.openecomp.policy.engine</groupId>
+		<groupId>org.onap.policy.engine</groupId>
 		<artifactId>packages</artifactId>
 		<version>1.1.0-SNAPSHOT</version>
 	</parent>
@@ -33,7 +33,7 @@
 	<packaging>pom</packaging>
 
 	<name>Base Package</name>
-	<description>D2 ECOMP Policy Base Packaging</description>
+	<description>D2 ONAP Policy Base Packaging</description>
 
 	<build>
 		<plugins>
@@ -53,8 +53,8 @@
 							<overWriteSnapshots>true</overWriteSnapshots>
 							<artifactItems>
 								<artifactItem>
-									<groupId>org.openecomp.policy.engine</groupId>
-									<artifactId>ECOMP-PDP-REST</artifactId>
+									<groupId>org.onap.policy.engine</groupId>
+									<artifactId>ONAP-PDP-REST</artifactId>
 									<version>${project.version}</version>
 									<type>war</type>
 									<destFileName>pdp.war</destFileName>
@@ -74,8 +74,8 @@
 							<overWriteSnapshots>true</overWriteSnapshots>
 							<artifactItems>
 								<artifactItem>
-									<groupId>org.openecomp.policy.engine</groupId>
-									<artifactId>ECOMP-PAP-REST</artifactId>
+									<groupId>org.onap.policy.engine</groupId>
+									<artifactId>ONAP-PAP-REST</artifactId>
 									<version>${project.version}</version>
 									<type>war</type>
 									<destFileName>pap.war</destFileName>
@@ -84,7 +84,7 @@
 						</configuration>
 					</execution>
 					<execution>
-						<id>copy-ecomp</id>
+						<id>copy-onap</id>
 						<phase>prepare-package</phase>
 						<goals>
 							<goal>copy</goal>
@@ -95,11 +95,11 @@
 							<overWriteSnapshots>true</overWriteSnapshots>
 							<artifactItems>
 								<artifactItem>
-									<groupId>org.openecomp.policy.engine</groupId>
-									<artifactId>ECOMP-SDK-APP</artifactId>
+									<groupId>org.onap.policy.engine</groupId>
+									<artifactId>ONAP-SDK-APP</artifactId>
 									<version>${project.version}</version>
 									<type>war</type>
-									<destFileName>ecomp.war</destFileName>
+									<destFileName>onap.war</destFileName>
 								</artifactItem>
 							</artifactItems>
 						</configuration>
@@ -137,7 +137,7 @@
 							<overWriteSnapshots>true</overWriteSnapshots>
 							<artifactItems>
 								<artifactItem>
-									<groupId>org.openecomp.policy.engine</groupId>
+									<groupId>org.onap.policy.engine</groupId>
 									<artifactId>BRMSGateway</artifactId>
 									<version>${project.version}</version>
 									<type>jar</type>
@@ -159,7 +159,7 @@
 							<overWriteSnapshots>true</overWriteSnapshots>
 							<artifactItems>
 								<artifactItem>
-									<groupId>org.openecomp.policy.engine</groupId>
+									<groupId>org.onap.policy.engine</groupId>
 									<artifactId>LogParser</artifactId>
 									<version>${project.version}</version>
 									<type>jar</type>
@@ -216,7 +216,7 @@
 									<executable>/bin/bash</executable>
 									<arguments>
 										<argument>-c</argument>
-										<argument>mkdir -p target ; echo -e 'version="${project.version}"\ndescription="Open ECOMP Policy Engine"\nbuildTag="'"${BUILD_TAG}"'"\ncommit="'"${GIT_COMMIT}"'"\ntimestamp="${maven.build.timestamp}"' >target/build.info</argument>
+										<argument>mkdir -p target ; echo -e 'version="${project.version}"\ndescription="Open ONAP Policy Engine"\nbuildTag="'"${BUILD_TAG}"'"\ncommit="'"${GIT_COMMIT}"'"\ntimestamp="${maven.build.timestamp}"' >target/build.info</argument>
 									</arguments>
 								</configuration>
 							</execution>
diff --git a/packages/base/src/assembly/zip.xml b/packages/base/src/assembly/zip.xml
index b14273b5c..dc14bba25 100644
--- a/packages/base/src/assembly/zip.xml
+++ b/packages/base/src/assembly/zip.xml
@@ -1,6 +1,6 @@
 <!--
   ============LICENSE_START=======================================================
-  ECOMP Policy Engine
+  ONAP Policy Engine
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
   ================================================================================
diff --git a/packages/base/src/files/bin/backup.sh b/packages/base/src/files/bin/backup.sh
index a40638cab..f65eed069 100644
--- a/packages/base/src/files/bin/backup.sh
+++ b/packages/base/src/files/bin/backup.sh
@@ -1,6 +1,6 @@
 ###
 # ============LICENSE_START=======================================================
-# ECOMP Policy Engine
+# ONAP Policy Engine
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
diff --git a/packages/base/src/files/bin/certtool.sh b/packages/base/src/files/bin/certtool.sh
index 02899f17b..096c5d5d5 100644
--- a/packages/base/src/files/bin/certtool.sh
+++ b/packages/base/src/files/bin/certtool.sh
@@ -1,6 +1,6 @@
 ###
 # ============LICENSE_START=======================================================
-# ECOMP Policy Engine
+# ONAP Policy Engine
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
diff --git a/packages/base/src/files/bin/java/log4j.properties b/packages/base/src/files/bin/java/log4j.properties
index 3d1f50790..68771efd5 100644
--- a/packages/base/src/files/bin/java/log4j.properties
+++ b/packages/base/src/files/bin/java/log4j.properties
@@ -1,6 +1,6 @@
 ###
 # ============LICENSE_START=======================================================
-# ECOMP Policy Engine
+# ONAP Policy Engine
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
diff --git a/packages/base/src/files/bin/monitor.sh b/packages/base/src/files/bin/monitor.sh
index fb311bc04..65baad4bc 100644
--- a/packages/base/src/files/bin/monitor.sh
+++ b/packages/base/src/files/bin/monitor.sh
@@ -1,6 +1,6 @@
 ###
 # ============LICENSE_START=======================================================
-# ECOMP Policy Engine
+# ONAP Policy Engine
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
diff --git a/packages/base/src/files/bin/policy.sh b/packages/base/src/files/bin/policy.sh
index 315b3e963..f21030e10 100644
--- a/packages/base/src/files/bin/policy.sh
+++ b/packages/base/src/files/bin/policy.sh
@@ -1,6 +1,6 @@
 ###
 # ============LICENSE_START=======================================================
-# ECOMP Policy Engine
+# ONAP Policy Engine
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
diff --git a/packages/base/src/files/etc/profile.d/env.sh b/packages/base/src/files/etc/profile.d/env.sh
index 4d9fcf9a7..56b44260b 100644
--- a/packages/base/src/files/etc/profile.d/env.sh
+++ b/packages/base/src/files/etc/profile.d/env.sh
@@ -1,6 +1,6 @@
 ###
 # ============LICENSE_START=======================================================
-# ECOMP Policy Engine
+# ONAP Policy Engine
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
diff --git a/packages/base/src/files/install/elk/bin/elk.sh b/packages/base/src/files/install/elk/bin/elk.sh
index 5011aa61e..3429905c4 100644
--- a/packages/base/src/files/install/elk/bin/elk.sh
+++ b/packages/base/src/files/install/elk/bin/elk.sh
@@ -108,7 +108,7 @@ function audit() {
 		fi
 	fi
 	
-	$JAVA_HOME/bin/java -cp $POLICY_HOME/servers/pap/webapps/pap/WEB-INF/lib/ECOMP-PAP-REST-*.jar:$POLICY_HOME/servers/pap/webapps/pap/WEB-INF/lib/*: -DPROPERTY_FILE=$POLICY_HOME/servers/pap/bin/policyelk.properties org.openecomp.policy.pap.xacml.rest.elk.client.ElasticSearchPolicyUpdate
+	$JAVA_HOME/bin/java -cp $POLICY_HOME/servers/pap/webapps/pap/WEB-INF/lib/ONAP-PAP-REST-*.jar:$POLICY_HOME/servers/pap/webapps/pap/WEB-INF/lib/*: -DPROPERTY_FILE=$POLICY_HOME/servers/pap/bin/policyelk.properties org.onap.policy.pap.xacml.rest.elk.client.ElasticSearchPolicyUpdate
 }
 
 #########################################################################
diff --git a/packages/base/src/files/install/mysql/bin/cleanup_policy.sh b/packages/base/src/files/install/mysql/bin/cleanup_policy.sh
index 1eec53f96..1841d3c57 100644
--- a/packages/base/src/files/install/mysql/bin/cleanup_policy.sh
+++ b/packages/base/src/files/install/mysql/bin/cleanup_policy.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 ###
 # ============LICENSE_START=======================================================
-# ECOMP Policy Engine
+# ONAP Policy Engine
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
diff --git a/packages/base/src/files/install/mysql/bin/db_backup.sh b/packages/base/src/files/install/mysql/bin/db_backup.sh
index 896c4ff2d..dca2017ff 100644
--- a/packages/base/src/files/install/mysql/bin/db_backup.sh
+++ b/packages/base/src/files/install/mysql/bin/db_backup.sh
@@ -1,7 +1,7 @@
 #!/bin/bash 
 ###
 # ============LICENSE_START=======================================================
-# ECOMP Policy Engine
+# ONAP Policy Engine
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
@@ -23,7 +23,7 @@
 # db_backup.sh: Run this script to back database to a file
 # 
 # Usage  : db_backup.sh db_user     db_user_password database
-# Example: db_backup.sh policy_user password         ecomp_sdk
+# Example: db_backup.sh policy_user password         onap_sdk
 #
 # Note: mysqldump requires at least the SELECT privilege for dumped tables
 #
@@ -79,6 +79,6 @@ if [ $# -eq 3 ]; then
   echo "db_backup.sh completed ... `date`" | tee -a $LOG
 else
   echo "Usage  : db_backup.sh db_user_id  db_user_password database" 
-  echo "Example: db_backup.sh policy_user password         ecomp_sdk" 
+  echo "Example: db_backup.sh policy_user password         onap_sdk" 
 fi
 
diff --git a/packages/base/src/files/install/mysql/bin/db_backup_data.sh b/packages/base/src/files/install/mysql/bin/db_backup_data.sh
index 39df9e272..ee0b44732 100644
--- a/packages/base/src/files/install/mysql/bin/db_backup_data.sh
+++ b/packages/base/src/files/install/mysql/bin/db_backup_data.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 ###
 # ============LICENSE_START=======================================================
-# ECOMP Policy Engine
+# ONAP Policy Engine
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
diff --git a/packages/base/src/files/install/mysql/bin/db_backup_remote.sh b/packages/base/src/files/install/mysql/bin/db_backup_remote.sh
index 00ee95269..212896942 100644
--- a/packages/base/src/files/install/mysql/bin/db_backup_remote.sh
+++ b/packages/base/src/files/install/mysql/bin/db_backup_remote.sh
@@ -1,7 +1,7 @@
 #!/bin/bash 
 ###
 # ============LICENSE_START=======================================================
-# ECOMP Policy Engine
+# ONAP Policy Engine
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
@@ -23,7 +23,7 @@
 # db_backup_remote.sh: Perform database backup from remote 
 # 
 # Usage  : db_backup_remote.sh db_user     db_user_password database  db_hostname
-# Example: db_backup_remote.sh policy_user password         ecomp_sdk localhost.com
+# Example: db_backup_remote.sh policy_user password         onap_sdk localhost.com
 #
 # Note: 1. mysqldump utility must be available in the env where this script intend to run
 #       2. db_user requires at least the SELECT privilege for dumped tables
@@ -84,5 +84,5 @@ if [ $# -eq 4 ]; then
   echo "db_backup_remote.sh for [$DATABASE]@[${DB_HOSTNAME}] completed ... `date`" | tee -a $LOG
 else
   echo "Usage  : db_backup_remote.sh db_user_id  db_user_password database  db_hostname" 
-  echo "Example: db_backup_remote.sh policy_user password         ecomp_sdk localhost.com" 
+  echo "Example: db_backup_remote.sh policy_user password         onap_sdk localhost.com" 
 fi
diff --git a/packages/base/src/files/install/mysql/bin/db_restore.sh b/packages/base/src/files/install/mysql/bin/db_restore.sh
index b0e32dac3..d6e21df79 100644
--- a/packages/base/src/files/install/mysql/bin/db_restore.sh
+++ b/packages/base/src/files/install/mysql/bin/db_restore.sh
@@ -1,7 +1,7 @@
 #!/bin/bash 
 ###
 # ============LICENSE_START=======================================================
-# ECOMP Policy Engine
+# ONAP Policy Engine
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
@@ -23,8 +23,8 @@
 # db_restore.sh: Restore database table(s) from database backup file
 # 
 # Usage  : db_restore.sh db_user     db_password backup_file database table_name
-# Example: db_restore.sh policy_user password    /opt/app/policy/data/mysql/20150901/backup_ecomp_sdk_20150910102030.sql ecomp_sdk attribute
-#          db_restore.sh policy_user password    /opt/app/policy/data/mysql/20150901/backup_ecomp_sdk_20150910102030.sql ecomp_sdk all
+# Example: db_restore.sh policy_user password    /opt/app/policy/data/mysql/20150901/backup_onap_sdk_20150910102030.sql onap_sdk attribute
+#          db_restore.sh policy_user password    /opt/app/policy/data/mysql/20150901/backup_onap_sdk_20150910102030.sql onap_sdk all
 #
 # Assumption: Database backup_file is created from mysqldump utility
 #
@@ -90,7 +90,7 @@ if [ $# -eq 5 ]; then
   fi
 else
   echo "Usage  : db_restore.sh db_user_id  db_password  backup_file database table_name" 
-  echo "Example: db_restore.sh policy_user password     /opt/app/policy/data/mysql/20150901/backup_ecomp_sdk_20150901102030.sql ecomp_sdk attribute" 
+  echo "Example: db_restore.sh policy_user password     /opt/app/policy/data/mysql/20150901/backup_onap_sdk_20150901102030.sql onap_sdk attribute" 
 fi
 
 rm -f $TEMP_FILE
diff --git a/packages/base/src/files/install/mysql/bin/db_restore_data.sh b/packages/base/src/files/install/mysql/bin/db_restore_data.sh
index 926755996..c4fec027f 100644
--- a/packages/base/src/files/install/mysql/bin/db_restore_data.sh
+++ b/packages/base/src/files/install/mysql/bin/db_restore_data.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 ###
 # ============LICENSE_START=======================================================
-# ECOMP Policy Engine
+# ONAP Policy Engine
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
diff --git a/packages/base/src/files/install/mysql/bin/db_upgrade.sh b/packages/base/src/files/install/mysql/bin/db_upgrade.sh
index 41b79e1ef..87d5d9bd7 100644
--- a/packages/base/src/files/install/mysql/bin/db_upgrade.sh
+++ b/packages/base/src/files/install/mysql/bin/db_upgrade.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # ============LICENSE_START=======================================================
-# ECOMP Policy Engine
+# ONAP Policy Engine
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
diff --git a/packages/base/src/files/install/mysql/bin/db_upgrade_remote.sh b/packages/base/src/files/install/mysql/bin/db_upgrade_remote.sh
index a5b6e77da..a10ac2173 100644
--- a/packages/base/src/files/install/mysql/bin/db_upgrade_remote.sh
+++ b/packages/base/src/files/install/mysql/bin/db_upgrade_remote.sh
@@ -1,7 +1,7 @@
 #!/bin/bash 
 ###
 # ============LICENSE_START=======================================================
-# ECOMP Policy Engine
+# ONAP Policy Engine
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
diff --git a/packages/base/src/files/install/mysql/data/161000_upgrade_script.sql b/packages/base/src/files/install/mysql/data/161000_upgrade_script.sql
index a75e7981a..70dae61f1 100755
--- a/packages/base/src/files/install/mysql/data/161000_upgrade_script.sql
+++ b/packages/base/src/files/install/mysql/data/161000_upgrade_script.sql
@@ -1,6 +1,6 @@
 /*-
 * ============LICENSE_START=======================================================
-* ECOMP Policy Engine
+* ONAP Policy Engine
 * ================================================================================
 * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 * ================================================================================
@@ -18,7 +18,7 @@
 * ============LICENSE_END=========================================================
 */
 -- ---------------------------------------------------------------------------------------------------------------
--- This is for the 1610 Version of SDK database called ecomp_sdk for Open Source
+-- This is for the 1610 Version of SDK database called onap_sdk for Open Source
 
 -- Note to : Database Admin,  set the MySQL system variable called lower_case_table_names
 
@@ -39,9 +39,9 @@
 -- All versions newer or older than these DO NOT necessarily mean they are compatible.
 -- ------------------------------------------------------------------------------------------------------------------
 
-CREATE DATABASE IF NOT EXISTS `ecomp_sdk`;
+CREATE DATABASE IF NOT EXISTS `onap_sdk`;
 
-USE `ecomp_sdk`;
+USE `onap_sdk`;
 set foreign_key_checks=0;
 
 --
@@ -784,20 +784,20 @@ primary key (`id`)
 );
 
 --
--- Table structure for table `ecompname`
+-- Table structure for table `onapname`
 --
 
-drop table if exists `ecompname`;
-create table `ecompname` (
+drop table if exists `onapname`;
+create table `onapname` (
 `id` int(11) not null auto_increment,
 `created_by` varchar(255) not null,
 `created_date` timestamp not null default current_timestamp,
 `description` varchar(2048) default null,
-`ecomp_name` varchar(767) not null,
+`onap_name` varchar(767) not null,
 `modified_by` varchar(255) not null,
 `modified_date` timestamp not null default '0000-00-00 00:00:00',
 primary key (`id`),
-unique key `ecomp_name` (`ecomp_name`)
+unique key `onap_name` (`onap_name`)
 );
 
 --
@@ -1806,7 +1806,7 @@ drop view  if exists `match_functions`;
 create table `match_functions` (
 `id` tinyint not null,
 `shortname` tinyint not null,
-`ecomp_sdkid` tinyint not null,
+`onap_sdkid` tinyint not null,
 `return_datatype` tinyint not null,
 `is_bag_return` tinyint not null,
 `arg_lb` tinyint not null,
@@ -2048,7 +2048,7 @@ create table `policy_management` (
 `config_name` varchar(1024) not null,
 `create_date_time` timestamp not null default current_timestamp on update current_timestamp,
 `creted_by` varchar(45) not null,
-`ecomp_name` varchar(1024) not null,
+`onap_name` varchar(1024) not null,
 `policy_name` varchar(1024) not null,
 `scope` varchar(1024) not null,
 `update_date_time` timestamp not null default '0000-00-00 00:00:00',
@@ -2067,7 +2067,7 @@ create table `policy_manangement` (
 `config_name` varchar(1024) not null,
 `create_date_time` timestamp not null default current_timestamp on update current_timestamp,
 `created_by` varchar(45) not null,
-`ecomp_name` varchar(1024) not null,
+`onap_name` varchar(1024) not null,
 `policy_name` varchar(1024) not null,
 `scope` varchar(1024) not null,
 `update_date_time` timestamp not null default '0000-00-00 00:00:00',
@@ -2629,10 +2629,10 @@ primary key (`id`)
 );
 
 --
--- Current Database: `ecomp_sdk`
+-- Current Database: `onap_sdk`
 --
 
-use `ecomp_sdk`;
+use `onap_sdk`;
 
 --
 -- Final view structure for view `function_flattener`
@@ -2656,7 +2656,7 @@ create view `higherorder_bag_functions` as select `function_flattener`.`id` as `
 
 drop table if exists `match_functions`;
 drop view if exists `match_functions`;
-create view `match_functions` as select `d`.`id` as `id`,`d`.`short_name` as `shortname`,`d`.`xacml_id` as `ecomp_sdkid`,`d`.`return_datatype` as `return_datatype`,`d`.`is_bag_return` as `is_bag_return`,`d`.`arg_lb` as `arg_lb`,`d`.`arg_ub` as `arg_ub`,`a1`.`is_bag` as `arg1_isbag`,`a1`.`datatype_id` as `arg1_datatype`,`a2`.`is_bag` as `arg2_isbag`,`a2`.`datatype_id` as `arg2_datatype` from ((`functiondefinition` `d` left join `functionarguments` `a1` on(((`a1`.`function_id` = `d`.`id`) and (`a1`.`arg_index` = 1)))) left join `functionarguments` `a2` on(((`a2`.`function_id` = `d`.`id`) and (`a2`.`arg_index` = 2)))) where ((`d`.`arg_lb` = 2) and (`d`.`arg_ub` = 2) and (`d`.`return_datatype` = 18) and (`a1`.`is_bag` = 0)) order by `d`.`short_name`;
+create view `match_functions` as select `d`.`id` as `id`,`d`.`short_name` as `shortname`,`d`.`xacml_id` as `onap_sdkid`,`d`.`return_datatype` as `return_datatype`,`d`.`is_bag_return` as `is_bag_return`,`d`.`arg_lb` as `arg_lb`,`d`.`arg_ub` as `arg_ub`,`a1`.`is_bag` as `arg1_isbag`,`a1`.`datatype_id` as `arg1_datatype`,`a2`.`is_bag` as `arg2_isbag`,`a2`.`datatype_id` as `arg2_datatype` from ((`functiondefinition` `d` left join `functionarguments` `a1` on(((`a1`.`function_id` = `d`.`id`) and (`a1`.`arg_index` = 1)))) left join `functionarguments` `a2` on(((`a2`.`function_id` = `d`.`id`) and (`a2`.`arg_index` = 2)))) where ((`d`.`arg_lb` = 2) and (`d`.`arg_ub` = 2) and (`d`.`return_datatype` = 18) and (`a1`.`is_bag` = 0)) order by `d`.`short_name`;
 
 --
 -- Final view structure for view `v_url_access`
@@ -2687,10 +2687,10 @@ primary key (`id`)
 );
 
 -- 
--- This is for the default data for 1610 Version of SDK database for Open Source called ecomp_sdk
+-- This is for the default data for 1610 Version of SDK database for Open Source called onap_sdk
 --
 
-USE ecomp_sdk;
+USE onap_sdk;
 
 -- fn_function
 Insert into fn_function (FUNCTION_CD,FUNCTION_NAME) values ('menu_process','Process List');
@@ -2798,14 +2798,14 @@ INSERT INTO fn_menu (MENU_ID, LABEL, PARENT_ID, SORT_ORDER, ACTION, FUNCTION_CD,
 INSERT INTO fn_menu (MENU_ID, LABEL, PARENT_ID, SORT_ORDER, ACTION, FUNCTION_CD, ACTIVE_YN, SERVLET, QUERY_STRING, EXTERNAL_URL, TARGET, MENU_SET_CD, SEPARATOR_YN, IMAGE_SRC) VALUES (121, 'Collaboration', 5000, 100, 'collaborate_list.htm', 'menu_sample', 'N', NULL, NULL, NULL, NULL, 'APP', 'N', '/static/fusion/images/bubble.png');
 INSERT INTO fn_menu (MENU_ID, LABEL, PARENT_ID, SORT_ORDER, ACTION, FUNCTION_CD, ACTIVE_YN, SERVLET, QUERY_STRING, EXTERNAL_URL, TARGET, MENU_SET_CD, SEPARATOR_YN, IMAGE_SRC) VALUES (930, 'Search', 9, 15, 'userProfile', 'menu_admin', 'N', NULL, NULL, NULL, NULL, 'APP', 'N', '/static/fusion/images/search_profile.png');
 INSERT INTO fn_menu (MENU_ID, LABEL, PARENT_ID, SORT_ORDER, ACTION, FUNCTION_CD, ACTIVE_YN, SERVLET, QUERY_STRING, EXTERNAL_URL, TARGET, MENU_SET_CD, SEPARATOR_YN, IMAGE_SRC) VALUES (150038,'Notebook',5000,135,'notebook.htm','menu_sample','N',NULL,NULL,NULL,NULL,'APP','N',NULL);
-INSERT INTO `ecomp_sdk`.`fn_menu` (`menu_id`, `label`, `parent_id`, `sort_order`, `function_cd`, `active_yn`, `menu_set_cd`, `separator_yn`) VALUES ('150004', 'Policy', '1', '1000', 'menu_policy', 'Y', 'APP', 'N');
-INSERT INTO `ecomp_sdk`.`fn_menu` (`menu_id`, `label`, `parent_id`, `sort_order`, `action`, `function_cd`, `active_yn`, `menu_set_cd`, `separator_yn`) VALUES ('150005', 'Editor', '150004', '1000', 'policy#/Editor', 'policy_editor', 'Y', 'APP', 'N');
-INSERT INTO `ecomp_sdk`.`fn_menu` (`menu_id`, `label`, `parent_id`, `sort_order`, `action`, `function_cd`, `active_yn`, `menu_set_cd`, `separator_yn`) VALUES ('150006', 'Dictionary', '150004', '1000', 'policy#/Dictionary', 'policy_dictionary', 'Y', 'APP', 'N');
-INSERT INTO `ecomp_sdk`.`fn_menu` (`menu_id`, `label`, `parent_id`, `sort_order`, `action`, `function_cd`, `active_yn`, `menu_set_cd`, `separator_yn`) VALUES ('150007', 'PDP', '150004', '1000', 'policy#/Pdp', 'policy_pdp', 'Y', 'APP', 'N');
-INSERT INTO `ecomp_sdk`.`fn_menu` (`menu_id`, `label`, `parent_id`, `sort_order`, `action`, `function_cd`, `active_yn`, `menu_set_cd`, `separator_yn`) VALUES ('150008', 'Push', '150004', '1000', 'policy#/Push', 'policy_push', 'Y', 'APP', 'N');
-INSERT INTO `ecomp_sdk`.`fn_menu` (`menu_id`, `label`, `parent_id`, `sort_order`, `action`, `function_cd`, `active_yn`, `menu_set_cd`, `separator_yn`) VALUES ('150009', 'Roles', '150004', '1000', 'policy#/Roles', 'policy_roles', 'Y', 'APP', 'N');
-INSERT INTO `ecomp_sdk`.`fn_menu` (`menu_id`, `label`, `parent_id`, `sort_order`, `action`, `function_cd`, `active_yn`, `menu_set_cd`, `separator_yn`) VALUES ('150010', 'Admin', '150004', '1000', 'policy#/Admin', 'policy_admin', 'Y', 'APP', 'N');
-INSERT INTO `ecomp_sdk`.`fn_menu` (`menu_id`, `label`, `parent_id`, `sort_order`, `action`, `function_cd`, `active_yn`, `menu_set_cd`, `separator_yn`) VALUES ('150011', 'Dashboard', '150004', '1000', 'policy#/Dashboard', 'policy_dashboard', 'Y', 'APP', 'N');
+INSERT INTO `onap_sdk`.`fn_menu` (`menu_id`, `label`, `parent_id`, `sort_order`, `function_cd`, `active_yn`, `menu_set_cd`, `separator_yn`) VALUES ('150004', 'Policy', '1', '1000', 'menu_policy', 'Y', 'APP', 'N');
+INSERT INTO `onap_sdk`.`fn_menu` (`menu_id`, `label`, `parent_id`, `sort_order`, `action`, `function_cd`, `active_yn`, `menu_set_cd`, `separator_yn`) VALUES ('150005', 'Editor', '150004', '1000', 'policy#/Editor', 'policy_editor', 'Y', 'APP', 'N');
+INSERT INTO `onap_sdk`.`fn_menu` (`menu_id`, `label`, `parent_id`, `sort_order`, `action`, `function_cd`, `active_yn`, `menu_set_cd`, `separator_yn`) VALUES ('150006', 'Dictionary', '150004', '1000', 'policy#/Dictionary', 'policy_dictionary', 'Y', 'APP', 'N');
+INSERT INTO `onap_sdk`.`fn_menu` (`menu_id`, `label`, `parent_id`, `sort_order`, `action`, `function_cd`, `active_yn`, `menu_set_cd`, `separator_yn`) VALUES ('150007', 'PDP', '150004', '1000', 'policy#/Pdp', 'policy_pdp', 'Y', 'APP', 'N');
+INSERT INTO `onap_sdk`.`fn_menu` (`menu_id`, `label`, `parent_id`, `sort_order`, `action`, `function_cd`, `active_yn`, `menu_set_cd`, `separator_yn`) VALUES ('150008', 'Push', '150004', '1000', 'policy#/Push', 'policy_push', 'Y', 'APP', 'N');
+INSERT INTO `onap_sdk`.`fn_menu` (`menu_id`, `label`, `parent_id`, `sort_order`, `action`, `function_cd`, `active_yn`, `menu_set_cd`, `separator_yn`) VALUES ('150009', 'Roles', '150004', '1000', 'policy#/Roles', 'policy_roles', 'Y', 'APP', 'N');
+INSERT INTO `onap_sdk`.`fn_menu` (`menu_id`, `label`, `parent_id`, `sort_order`, `action`, `function_cd`, `active_yn`, `menu_set_cd`, `separator_yn`) VALUES ('150010', 'Admin', '150004', '1000', 'policy#/Admin', 'policy_admin', 'Y', 'APP', 'N');
+INSERT INTO `onap_sdk`.`fn_menu` (`menu_id`, `label`, `parent_id`, `sort_order`, `action`, `function_cd`, `active_yn`, `menu_set_cd`, `separator_yn`) VALUES ('150011', 'Dashboard', '150004', '1000', 'policy#/Dashboard', 'policy_dashboard', 'Y', 'APP', 'N');
 
 -- fn_restricted_url
 INSERT INTO fn_restricted_url (restricted_url, function_cd) VALUES ('attachment.htm','menu_admin');
@@ -2942,7 +2942,7 @@ Insert into cr_raptor_action_img (IMAGE_ID, IMAGE_LOC) Values ('DELETE', '/stati
 Insert into cr_raptor_action_img (IMAGE_ID, IMAGE_LOC) Values ('CALENDAR', '/static/fusion/raptor/img/Calendar-16x16.png');
 
 -- fn_app
-Insert into fn_app (APP_ID,APP_NAME,APP_IMAGE_URL,APP_DESCRIPTION,APP_NOTES,APP_URL,APP_ALTERNATE_URL,APP_REST_ENDPOINT,ML_APP_NAME,ML_APP_ADMIN_ID,MOTS_ID,APP_PASSWORD,OPEN,ENABLED,THUMBNAIL,APP_USERNAME,UEB_KEY,UEB_SECRET,UEB_TOPIC_NAME) VALUES (1,'Default',null,'Some Default Description','Some Default Note',null,null,null,'ECPP','?','1','okYTaDrhzibcbGVq5mjkVQ==','N','N',null,'Default',null,null,'ECOMP-PORTAL-INBOX');
+Insert into fn_app (APP_ID,APP_NAME,APP_IMAGE_URL,APP_DESCRIPTION,APP_NOTES,APP_URL,APP_ALTERNATE_URL,APP_REST_ENDPOINT,ML_APP_NAME,ML_APP_ADMIN_ID,MOTS_ID,APP_PASSWORD,OPEN,ENABLED,THUMBNAIL,APP_USERNAME,UEB_KEY,UEB_SECRET,UEB_TOPIC_NAME) VALUES (1,'Default',null,'Some Default Description','Some Default Note',null,null,null,'ECPP','?','1','okYTaDrhzibcbGVq5mjkVQ==','N','N',null,'Default',null,null,'ONAP-PORTAL-INBOX');
 
 -- fn_user_role
 Insert into fn_user_role (USER_ID,ROLE_ID,PRIORITY,APP_ID) values (1,1,null,1);
@@ -6328,20 +6328,20 @@ INSERT INTO PIPType VALUES (500,'SQL'), (501,'LDAP'), (502,'CSV'), (503,'Hyper-C
 
 INSERT INTO GlobalRoleSettings (role, lockdown) values ('super-admin', '0');
 
-INSERT INTO `ecomp_sdk`.`roles` (`id`, `loginid`, `role`) VALUES ('2', 'API', 'super-admin');
-INSERT INTO `ecomp_sdk`.`roles` (`id`, `loginid`, `role`) VALUES ('3', 'demo', 'super-admin');
+INSERT INTO `onap_sdk`.`roles` (`id`, `loginid`, `role`) VALUES ('2', 'API', 'super-admin');
+INSERT INTO `onap_sdk`.`roles` (`id`, `loginid`, `role`) VALUES ('3', 'demo', 'super-admin');
 
-INSERT INTO `ecomp_sdk`.`USERINFO` (`loginid`, `NAME`) VALUES ('API', 'API');
-INSERT INTO `ecomp_sdk`.`USERINFO` (`loginid`, `NAME`) VALUES ('demo', 'Demo');
+INSERT INTO `onap_sdk`.`USERINFO` (`loginid`, `NAME`) VALUES ('API', 'API');
+INSERT INTO `onap_sdk`.`USERINFO` (`loginid`, `NAME`) VALUES ('demo', 'Demo');
 
-INSERT INTO `ecomp_sdk`.`dcaeuuid` (`ID`, `name`, `description`) VALUES ('2', '/services/cdap-tca-hi-lo/instances/demo/configuration/metricsPerFunctionalRole/vLoadBalancer', 'vLoadBalancer');
-INSERT INTO `ecomp_sdk`.`dcaeuuid` (`ID`, `name`, `description`) VALUES ('3', '/services/cdap-tca-hi-lo/instances/demo/configuration/metricsPerFunctionalRole/vFirewall', 'vFirewall');
+INSERT INTO `onap_sdk`.`dcaeuuid` (`ID`, `name`, `description`) VALUES ('2', '/services/cdap-tca-hi-lo/instances/demo/configuration/metricsPerFunctionalRole/vLoadBalancer', 'vLoadBalancer');
+INSERT INTO `onap_sdk`.`dcaeuuid` (`ID`, `name`, `description`) VALUES ('3', '/services/cdap-tca-hi-lo/instances/demo/configuration/metricsPerFunctionalRole/vFirewall', 'vFirewall');
 
-INSERT INTO `ecomp_sdk`.`microservicemodels` (`id`, `modelname`, `description`, `dependency`, `imported_by`, `attributes`, `ref_attributes`, `sub_attributes`, `version`) VALUES ('1', 'TcaMetrics', 'TCA Metrics test', '[NamedEntity,  DcaePolicyEntity]', 'API', 'functionalRole=java.lang.String:defaultValue-NA:required-false:MANY-false, name=java.lang.String:defaultValue-NA:required-false:MANY-false', 'thresholds=TcaThreshold:MANY-true', '{\"TcaThreshold\":{\"severity\":\"java.lang.String:defaultValue-NA:required-false:MANY-false\",\"fieldPath\":\"java.lang.String:defaultValue-NA:required-false:MANY-false\",\"thresholdValue\":\"java.lang.Integer:defaultValue-NA:required-false:MANY-false\",\"closedLoopControlName\":\"java.lang.String:defaultValue-NA:required-false:MANY-false\",\"version\":\"java.lang.String:defaultValue-NA:required-false:MANY-false\",\"direction\":\"java.lang.String:defaultValue-NA:required-false:MANY-false\"}}', '1.0.0.5');
-INSERT INTO `ecomp_sdk`.`microservicemodels` (`id`, `modelname`, `description`, `dependency`, `imported_by`, `ref_attributes`, `sub_attributes`, `version`) VALUES ('2', 'StringMatchingConfiguration', 'StringMatchingConfiguration', '[CdapServiceInstanceConfiguration]', 'API', 'serviceConfigurations=StringMatchingServiceConfiguration:MANY-true', '{\"StringMatchingServiceConfiguration\":{\"ageLimit\":\"java.lang.String:defaultValue-NA:required-false:MANY-false\",\"timeWindow\":\"java.lang.String:defaultValue-NA:required-false:MANY-false\",\"createClosedLoopEventId\":\"java.lang.String:defaultValue-NA:required-false:MANY-false\",\"aaiSendFields\":\"java.lang.String:defaultValue-NA:required-false:MANY-true\",\"stringSet\":\"java.lang.String:defaultValue-NA:required-false:MANY-true\",\"outputEventName\":\"java.lang.String:defaultValue-NA:required-false:MANY-false\",\"aaiMatchingFields\":\"java.lang.String:defaultValue-NA:required-false:MANY-true\"}}', '1.0.0.3');
+INSERT INTO `onap_sdk`.`microservicemodels` (`id`, `modelname`, `description`, `dependency`, `imported_by`, `attributes`, `ref_attributes`, `sub_attributes`, `version`) VALUES ('1', 'TcaMetrics', 'TCA Metrics test', '[NamedEntity,  DcaePolicyEntity]', 'API', 'functionalRole=java.lang.String:defaultValue-NA:required-false:MANY-false, name=java.lang.String:defaultValue-NA:required-false:MANY-false', 'thresholds=TcaThreshold:MANY-true', '{\"TcaThreshold\":{\"severity\":\"java.lang.String:defaultValue-NA:required-false:MANY-false\",\"fieldPath\":\"java.lang.String:defaultValue-NA:required-false:MANY-false\",\"thresholdValue\":\"java.lang.Integer:defaultValue-NA:required-false:MANY-false\",\"closedLoopControlName\":\"java.lang.String:defaultValue-NA:required-false:MANY-false\",\"version\":\"java.lang.String:defaultValue-NA:required-false:MANY-false\",\"direction\":\"java.lang.String:defaultValue-NA:required-false:MANY-false\"}}', '1.0.0.5');
+INSERT INTO `onap_sdk`.`microservicemodels` (`id`, `modelname`, `description`, `dependency`, `imported_by`, `ref_attributes`, `sub_attributes`, `version`) VALUES ('2', 'StringMatchingConfiguration', 'StringMatchingConfiguration', '[CdapServiceInstanceConfiguration]', 'API', 'serviceConfigurations=StringMatchingServiceConfiguration:MANY-true', '{\"StringMatchingServiceConfiguration\":{\"ageLimit\":\"java.lang.String:defaultValue-NA:required-false:MANY-false\",\"timeWindow\":\"java.lang.String:defaultValue-NA:required-false:MANY-false\",\"createClosedLoopEventId\":\"java.lang.String:defaultValue-NA:required-false:MANY-false\",\"aaiSendFields\":\"java.lang.String:defaultValue-NA:required-false:MANY-true\",\"stringSet\":\"java.lang.String:defaultValue-NA:required-false:MANY-true\",\"outputEventName\":\"java.lang.String:defaultValue-NA:required-false:MANY-false\",\"aaiMatchingFields\":\"java.lang.String:defaultValue-NA:required-false:MANY-true\"}}', '1.0.0.3');
 
-INSERT INTO `ecompname` VALUES (1,'demo','2016-12-28 14:23:31','DCAE','DCAE','demo','2016-12-28 14:23:31');
-INSERT INTO `ecompname` VALUES (2,'demo','2016-12-28 14:23:31','test','SampleDemo','demo','2016-12-28 14:23:31');
+INSERT INTO `onapname` VALUES (1,'demo','2016-12-28 14:23:31','DCAE','DCAE','demo','2016-12-28 14:23:31');
+INSERT INTO `onapname` VALUES (2,'demo','2016-12-28 14:23:31','test','SampleDemo','demo','2016-12-28 14:23:31');
 
 INSERT INTO `safepolicywarning` VALUES (1,'demo','SampleRiskType','SampleSafePolicyWarning');
 
@@ -6361,15 +6361,15 @@ INSERT INTO `microservicelocation` VALUES (1,'SampleServiceLocation','demo');
 
 INSERT INTO `risktype` VALUES (1,'demo','2016-12-29 20:20:48','demo','SampleRiskType','demo','2016-12-29 20:20:48');
 
-INSERT INTO `brmsparamtemplate` VALUES (2,'ControlLoopDemo__closedLoopControlName','ControlLoopDemo__closedLoopControlName','\r\n\r\n/*-\n * ============LICENSE_START=======================================================\n * archetype-closed-loop-demo-rules\n * ================================================================================\n * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.\n * ================================================================================\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n * \n *      http://www.apache.org/licenses/LICENSE-2.0\n * \n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n * ============LICENSE_END=========================================================\n */\n\npackage org.onap.policy.controlloop;\n\nimport java.util.List;\nimport java.util.LinkedList;\nimport java.util.Map;\nimport java.util.HashMap;\nimport java.util.UUID;\n\nimport org.onap.policy.controlloop.VirtualControlLoopEvent;\nimport org.onap.policy.controlloop.ControlLoopEventStatus;\nimport org.onap.policy.controlloop.VirtualControlLoopNotification;\nimport org.onap.policy.controlloop.ControlLoopNotificationType;\nimport org.onap.policy.controlloop.ControlLoopOperation;\nimport org.onap.policy.controlloop.ControlLoopOperationWrapper;\nimport org.onap.policy.template.demo.ControlLoopException;\n\nimport org.onap.policy.aai.AAINQF199.AAINQF199CloudRegion;\nimport org.onap.policy.aai.AAINQF199.AAINQF199ExtraProperties;\nimport org.onap.policy.aai.AAINQF199.AAINQF199ExtraProperty;\nimport org.onap.policy.aai.AAINQF199.AAINQF199GenericVNF;\nimport org.onap.policy.aai.AAINQF199.AAINQF199InstanceFilters;\nimport org.onap.policy.aai.AAINQF199.AAINQF199InventoryResponseItem;\nimport org.onap.policy.aai.AAINQF199.AAINQF199InventoryResponseItems;\nimport org.onap.policy.aai.AAINQF199.AAINQF199Manager;\nimport org.onap.policy.aai.AAINQF199.AAINQF199NamedQuery;\nimport org.onap.policy.aai.AAINQF199.AAINQF199QueryParameters;\nimport org.onap.policy.aai.AAINQF199.AAINQF199Request;\nimport org.onap.policy.aai.AAINQF199.AAINQF199RequestWrapper;\nimport org.onap.policy.aai.AAINQF199.AAINQF199Response;\nimport org.onap.policy.aai.AAINQF199.AAINQF199ResponseWrapper;\nimport org.onap.policy.aai.AAINQF199.AAINQF199ServiceInstance;\nimport org.onap.policy.aai.AAINQF199.AAINQF199Tenant;\nimport org.onap.policy.aai.AAINQF199.AAINQF199VfModule;\nimport org.onap.policy.aai.AAINQF199.AAINQF199VServer;\nimport org.onap.policy.aai.util.Serialization;\n\nimport org.onap.policy.appc.CommonHeader;\nimport org.onap.policy.appc.Request;\nimport org.onap.policy.appc.Response;\nimport org.onap.policy.appc.ResponseCode;\nimport org.onap.policy.appc.ResponseStatus;\nimport org.onap.policy.appc.ResponseValue;\n\nimport org.onap.policy.template.demo.EventManager;\nimport org.onap.policy.vnf.trafficgenerator.PGRequest;\nimport org.onap.policy.vnf.trafficgenerator.PGStream;\nimport org.onap.policy.vnf.trafficgenerator.PGStreams;\n\nimport org.onap.policy.mso.MSOManager;\nimport org.onap.policy.mso.MSORequest;\nimport org.onap.policy.mso.MSORequestStatus;\nimport org.onap.policy.mso.MSORequestDetails;\nimport org.onap.policy.mso.MSOModelInfo;\nimport org.onap.policy.mso.MSOCloudConfiguration;\nimport org.onap.policy.mso.MSORequestInfo;\nimport org.onap.policy.mso.MSORequestParameters;\nimport org.onap.policy.mso.MSORelatedInstanceListElement;\nimport org.onap.policy.mso.MSORelatedInstance;\nimport org.onap.policy.mso.MSOResponse;\n\nimport org.openecomp.policy.drools.system.PolicyEngine;\n\n//\n// These parameters are required to build the runtime policy\n//\ndeclare Params\n    closedLoopControlName : String\n    actor : String\n    aaiURL : String\n    aaiUsername : String\n    aaiPassword : String\n    msoURL : String\n    msoUsername : String\n    msoPassword : String\n    aaiNamedQueryUUID : String\n    aaiPatternMatch : int \n    notificationTopic : String\n    appcTopic : String\nend\n\n/*\n*\n* Called once and only once to insert the parameters into working memory for this Closed Loop policy.\n* (Comment SETUP rule out for the first ECOMP opensource release since policy BRMS_GW already puts a Params fact in there)\n*\n*\n*rule \"${policyName}.SETUP\"\n*	when\n*	then\n*		System.out.println(\"rule SETUP is triggered.\");\n*		Params params = new Params();\n*		params.setClosedLoopControlName(\"${closedLoopControlName}\");\n*		params.setActor(\"${actor}\");\n*		params.setAaiURL(\"${aaiURL}\");\n*		params.setAaiUsername(\"${aaiUsername}\");\n*		params.setAaiPassword(\"${aaiPassword}\");\n*		params.setMsoURL(\"${msoURL}\");\n*		params.setMsoUsername(\"${msoUsername}\");\n*		params.setMsoPassword(\"${msoPassword}\");\n*		params.setAaiNamedQueryUUID(\"${aaiNamedQueryUUID}\");\n*		params.setAaiPatternMatch(${aaiPatternMatch});\n*		params.setNotificationTopic(\"${notificationTopic}\");\n*		params.setAppcTopic(\"${appcTopic}\");\n*		//\n*		// This stays in memory as long as the rule is alive and running\n*		//\n*		insert(params);\n*end\n*/\n/*\n*\n* This rule responds to DCAE Events\n*\n*/\nrule \"${policyName}.EVENT\"\n	when\n        $params : Params( getClosedLoopControlName() == \"${closedLoopControlName}\" )\n        $event : VirtualControlLoopEvent( closedLoopControlName == $params.getClosedLoopControlName(), closedLoopEventStatus == ControlLoopEventStatus.ONSET )\n        not ( EventManager( closedLoopControlName == $event.closedLoopControlName ))\n	then\n		System.out.println(\"rule EVENT is triggered.\");\n		try {\n			// \n			// Check the requestID in the event to make sure it is not null before we create the EventManager. \n			// The EventManager will do extra syntax checking as well check if the closed loop is disabled/\n			//\n			if ($event.requestID == null) {\n				VirtualControlLoopNotification notification = new VirtualControlLoopNotification($event);\n				notification.notification = ControlLoopNotificationType.REJECTED;\n				notification.from = \"policy\";\n				notification.message = \"Missing requestID from DCAE event\";\n				notification.policyName = drools.getRule().getName();\n				notification.policyScope = \"${policyScope}\";\n				notification.policyVersion = \"${policyVersion}\";\n				//\n				// Let interested parties know\n				//\n				try {\n					System.out.println(Serialization.gsonPretty.toJson(notification));\n					PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n				} catch (Exception e) {\n					e.printStackTrace();\n					System.out.println(\"Can\'t deliver notification: \" + notification);\n				}\n				//\n				// Retract it from memory\n				//\n				retract($event);\n				System.out.println(\"Event with requestID=null has been retracted.\");\n			} else {\n				//\n				// Create an EventManager\n				//\n				EventManager manager = new EventManager($params.getClosedLoopControlName(), $event.requestID, $event.target);\n				//\n				// Determine if EventManager can actively process the event (i.e. syntax)\n				//\n				VirtualControlLoopNotification notification = manager.activate($event);\n				notification.from = \"policy\"; \n				notification.policyName = drools.getRule().getName();\n				notification.policyScope = \"${policyScope}\";\n				notification.policyVersion = \"${policyVersion}\";\n				//\n				// Are we actively pursuing this event?\n				//\n				if (notification.notification == ControlLoopNotificationType.ACTIVE) {\n					//\n					// Insert Event Manager into memory, this will now kick off processing.\n					//\n					insert(manager);\n					//\n					// Let interested parties know\n					//\n					try {\n						System.out.println(Serialization.gsonPretty.toJson(notification));\n						PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n					} catch (Exception e) {\n						e.printStackTrace();\n						System.out.println(\"Can\'t deliver notification: \" + notification);\n					}		\n				} else {\n					//\n					// Let interested parties know\n					//\n					try {\n						System.out.println(Serialization.gsonPretty.toJson(notification));\n						PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n					} catch (Exception e) {\n						e.printStackTrace();\n						System.out.println(\"Can\'t deliver notification: \" + notification);\n					}\n					//\n					// Retract it from memory\n					//\n					retract($event);\n				}\n				//\n				// Now that the manager is inserted into Drools working memory, we\'ll wait for\n				// another rule to fire in order to continue processing. This way we can also\n				// then screen for additional ONSET and ABATED events for this same RequestIDs \n				// and for different RequestIDs but with the same closedLoopControlName and target.\n				//\n			}\n		//\n		} catch (Exception e) {\n			e.printStackTrace();\n			VirtualControlLoopNotification notification = new VirtualControlLoopNotification($event);\n			notification.notification = ControlLoopNotificationType.REJECTED;\n			notification.message = \"Exception occurred \" + e.getMessage();\n			notification.policyName = drools.getRule().getName();\n			notification.policyScope = \"${policyScope}\";\n			notification.policyVersion = \"${policyVersion}\";\n			//\n			//\n			//\n			try {\n				System.out.println(Serialization.gsonPretty.toJson(notification));\n				PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n			} catch (Exception e1) {\n				System.out.println(\"Can\'t deliver notification: \" + notification);\n				e1.printStackTrace();\n			}\n			//\n			// Retract the event\n			//\n			retract($event);\n		}\nend\n\n/*\n*\n* This rule happens when we got a valid ONSET, closed loop is enabled and an Event Manager\n* is created. We can start the operations for this closed loop.\n*\n*/\nrule \"${policyName}.EVENT.MANAGER\"\n	when\n		$params : Params( getClosedLoopControlName() == \"${closedLoopControlName}\" )\n		$event : VirtualControlLoopEvent( closedLoopControlName == $params.getClosedLoopControlName(), closedLoopEventStatus == ControlLoopEventStatus.ONSET )\n		$manager : EventManager( closedLoopControlName == $event.closedLoopControlName, controlLoopResult == null)\n	then\n		System.out.println(\"rule EVENT.MANAGER is triggered.\");\n		//\n		// Check which event this is.\n		//\n		EventManager.NEW_EVENT_STATUS eventStatus = $manager.onNewEvent($event);\n		//\n		// We only want the initial ONSET event in memory,\n		// all the other events need to be retracted to support\n		// cleanup and avoid the other rules being fired for this event.\n		//\n		if (eventStatus != EventManager.NEW_EVENT_STATUS.FIRST_ONSET) {\n			System.out.println(\"Retracting \"+eventStatus+\" Event.\");\n			retract($event);\n			return;\n		}\n		//\n		// Now the event in memory is first onset event\n		//\n		try {\n			//\n			// Pull the known AAI field from the Event\n			//\n			// generic-vnf is needed for vFirewall case\n			// vserver-name is needed for vLoadBalancer case\n			//\n			String genericVNF = $event.AAI.get(\"generic-vnf.vnf-id\");\n			String vserver = $event.AAI.get(\"vserver.vserver-name\");\n			//\n			// Check if we are implementing a simple pattern match.\n			//\n			if ($params.getAaiPatternMatch() == 1) {\n				//\n				// Yes\n				//\n				//Basic naming characteristics:\n				//VF Name (9 char)+VM name (13 char total)+VFC (19 char total)\n				//Example: \n				//VF Name (9 characters):    cscf0001v\n				//VM Name(13 characters): cscf0001vm001\n				//VFC name(19 characters): cscf0001vm001cfg001\n				//\n				// zdfw1fwl01fwl02 or zdfw1fwl01fwl01  \n				// replaced with\n				// zdfw1fwl01pgn02 or zdfw1fwl01pgn01\n				//\n				int index = genericVNF.lastIndexOf(\"fwl\");\n				if (index == -1) {\n					System.err.println(\"The generic-vnf.vnf-id from DCAE Event is not valid.\");\n				} else {\n					genericVNF = genericVNF.substring(0, index) + \"pgn\" + genericVNF.substring(index+\"fwl\".length());\n				}\n				//\n				// Construct an APPC request\n				//\n				ControlLoopOperation operation = new ControlLoopOperation();\n				operation.actor = $params.getActor();\n				operation.operation = \"ModifyConfig\";\n				operation.target = $event.target;\n				//\n				// Create operationWrapper\n				//\n				ControlLoopOperationWrapper operationWrapper = new ControlLoopOperationWrapper($event.requestID, operation);\n				//\n				// insert operationWrapper into memory\n				//\n				insert(operationWrapper);\n				//\n				Request request = new Request();\n				request.CommonHeader = new CommonHeader();\n				request.CommonHeader.RequestID = $event.requestID;\n				request.Action = operation.operation;\n				request.Payload = new HashMap<String, Object>();\n				//\n				// Fill in the payload\n				//\n				request.Payload.put(\"generic-vnf.vnf-id\", genericVNF);\n				//\n				PGRequest pgRequest = new PGRequest();\n				pgRequest.pgStreams = new PGStreams();\n				\n				PGStream pgStream;\n				for(int i = 0; i < 5; i++){\n					pgStream = new PGStream();\n					pgStream.streamId = \"fw_udp\"+(i+1);\n					pgStream.isEnabled = \"true\";\n					pgRequest.pgStreams.pgStream.add(pgStream);\n				}\n				request.Payload.put(\"pg-streams\", pgRequest.pgStreams);\n				\n				if (request != null) {\n					//\n					// Insert request into memory\n					//\n					insert(request);\n					//\n					// Tell interested parties we are performing this Operation\n					//\n					VirtualControlLoopNotification notification = new VirtualControlLoopNotification($event);\n					notification.notification = ControlLoopNotificationType.OPERATION;\n					// message and history ??\n					notification.from = \"policy\";\n					notification.policyName = drools.getRule().getName();\n					notification.policyScope = \"${policyScope}\";\n					notification.policyVersion = \"${policyVersion}\";\n					try {\n						System.out.println(Serialization.gsonPretty.toJson(notification));\n						PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n					} catch (Exception e) {\n						System.out.println(\"Can\'t deliver notification: \" + notification);\n						e.printStackTrace();\n					}\n					//\n					// Now send the operation request\n					//\n					if (request instanceof Request) {\n						try {\n							System.out.println(\"APPC request sent:\");\n							System.out.println(Serialization.gsonPretty.toJson(request));\n							PolicyEngine.manager.deliver($params.getAppcTopic(), request);\n						} catch (Exception e) {\n							e.printStackTrace();\n							System.out.println(\"Can\'t deliver request: \" + request);\n						}\n					}\n				} else {\n					//\n					// what happens if it is null\n					//\n				}\n				//\n			} else {\n				//\n				// create AAI named-query request with UUID started with \"F199\"\n				//\n				AAINQF199Request aainqf199request = new AAINQF199Request();\n				AAINQF199QueryParameters aainqf199queryparam = new AAINQF199QueryParameters();\n				AAINQF199NamedQuery aainqf199namedquery = new AAINQF199NamedQuery();\n				AAINQF199InstanceFilters aainqf199instancefilter = new AAINQF199InstanceFilters();\n				//\n				// queryParameters\n				//\n				aainqf199namedquery.namedQueryUUID = UUID.fromString($params.getAaiNamedQueryUUID()); \n				aainqf199queryparam.namedQuery = aainqf199namedquery;\n				aainqf199request.queryParameters = aainqf199queryparam;\n				//\n				// instanceFilters\n				//\n				Map aainqf199instancefiltermap = new HashMap();\n				Map aainqf199instancefiltermapitem = new HashMap();\n				aainqf199instancefiltermapitem.put(\"vserver-name\", vserver); \n				aainqf199instancefiltermap.put(\"vserver\", aainqf199instancefiltermapitem);\n				aainqf199instancefilter.instanceFilter.add(aainqf199instancefiltermap);\n				aainqf199request.instanceFilters = aainqf199instancefilter;\n				//\n				// print aainqf199request for debug\n				//\n				System.out.println(\"AAI Request sent:\");\n				System.out.println(Serialization.gsonPretty.toJson(aainqf199request));\n				//\n				// Create AAINQF199RequestWrapper\n				//\n				AAINQF199RequestWrapper aainqf199RequestWrapper = new AAINQF199RequestWrapper($event.requestID, aainqf199request);\n				//\n				// insert aainqf199request into memory\n				//\n				insert(aainqf199RequestWrapper);\n			}\n			//\n		} catch (Exception e) {\n		 e.printStackTrace();\n		}\nend\n\n/*\n*\n* This rule happens when we got a valid ONSET, closed loop is enabled, an Event Manager\n* is created, AAI Manager and AAI Request are ready in memory. We can start sending query to AAI and then wait for response.\n*\n*/\nrule \"${policyName}.EVENT.MANAGER.AAINQF199REQUEST\"\n	when\n		$params : Params( getClosedLoopControlName() == \"${closedLoopControlName}\" )\n		$event : VirtualControlLoopEvent( closedLoopControlName == $params.getClosedLoopControlName(), closedLoopEventStatus == ControlLoopEventStatus.ONSET )\n		$manager : EventManager( closedLoopControlName == $event.closedLoopControlName )\n		$aainqf199RequestWrapper : AAINQF199RequestWrapper(requestID == $event.requestID)\n	then\n		System.out.println(\"rule EVENT.MANAGER.AAINQF199REQUEST is triggered.\");\n		//\n		// send the request\n		//\n		AAINQF199Response aainqf199response = AAINQF199Manager.postQuery($params.getAaiURL(), $params.getAaiUsername(), $params.getAaiPassword(),\n													   $aainqf199RequestWrapper.aainqf199request, $event.requestID);\n		//\n		// Check AAI response\n		//\n		if (aainqf199response == null) {\n			System.err.println(\"Failed to get AAI response\");\n			//\n			// Fail and retract everything\n			//\n			retract($event);\n			retract($manager);\n			retract($aainqf199RequestWrapper);\n		} else {\n			//\n			// Create AAINQF199ResponseWrapper\n			//\n			AAINQF199ResponseWrapper aainqf199ResponseWrapper = new AAINQF199ResponseWrapper($event.requestID, aainqf199response);\n			//\n			// insert aainqf199ResponseWrapper to memeory\n			//\n			insert(aainqf199ResponseWrapper);\n		}\nend\n\n/*\n*\n* This rule happens when we got a valid AAI response. We can start sending request to APPC or MSO now.\n*\n*/\nrule \"${policyName}.EVENT.MANAGER.AAINQF199RESPONSE\"\n	when \n		$params : Params( getClosedLoopControlName() == \"${closedLoopControlName}\" )\n		$event : VirtualControlLoopEvent( closedLoopControlName == $params.getClosedLoopControlName(), closedLoopEventStatus == ControlLoopEventStatus.ONSET )\n		$manager : EventManager( closedLoopControlName == $event.closedLoopControlName )\n		$aainqf199RequestWrapper : AAINQF199RequestWrapper(requestID == $event.requestID)\n		$aainqf199ResponseWrapper : AAINQF199ResponseWrapper(requestID == $event.requestID)\n	then\n		System.out.println(\"rule EVENT.MANAGER.AAINQF199RESPONSE is triggered.\");\n		//\n		// Extract related fields out of AAINQF199RESPONSE\n		//\n		String vnfItemVnfId, vnfItemVnfType, vnfItemPersonaModelId, vnfItemPersonaModelVersion, vnfItemModelName, \n		       vnfItemModelVersion, vnfItemModelNameVersionId, serviceItemServiceInstanceId, serviceItemPersonaModelId,\n		       serviceItemModelName, serviceItemModelType, serviceItemModelVersion, serviceItemModelNameVersionId,\n		       vfModuleItemVfModuleName, vfModuleItemPersonaModelId, vfModuleItemPersonaModelVersion, vfModuleItemModelName, \n		       vfModuleItemModelNameVersionId, tenantItemTenantId, cloudRegionItemCloudRegionId;\n		try {\n			//\n			// vnfItem\n			//\n			vnfItemVnfId = $aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).genericVNF.vnfID;\n			vnfItemVnfType = $aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).genericVNF.vnfType;\n			vnfItemVnfType = vnfItemVnfType.substring(vnfItemVnfType.lastIndexOf(\"/\")+1);\n			vnfItemPersonaModelId = $aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).genericVNF.personaModelId;\n			vnfItemPersonaModelVersion = $aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).genericVNF.personaModelVersion;\n			vnfItemModelName = $aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).extraProperties.extraProperty.get(0).propertyValue;\n			vnfItemModelVersion = 		$aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).extraProperties.extraProperty.get(2).propertyValue;\n			vnfItemModelNameVersionId = 	$aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).extraProperties.extraProperty.get(4).propertyValue;\n			//\n			// serviceItem\n			//\n			serviceItemServiceInstanceId = $aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).serviceInstance.serviceInstanceID;\n			serviceItemPersonaModelId = $aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).serviceInstance.personaModelId;\n			serviceItemModelName = $aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).extraProperties.extraProperty.get(0).propertyValue;\n			serviceItemModelType = $aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).extraProperties.extraProperty.get(1).propertyValue;\n			serviceItemModelVersion = $aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).serviceInstance.personaModelVersion;\n			serviceItemModelNameVersionId = $aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).extraProperties.extraProperty.get(4).propertyValue;\n			//\n			// Find the index for base vf module and non-base vf module\n			//\n			int baseIndex = -1;\n			int nonBaseIndex = -1;\n			List<AAINQF199InventoryResponseItem> inventoryItems = $aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).items.inventoryResponseItems;\n			for (AAINQF199InventoryResponseItem m : inventoryItems) {\n				if (m.vfModule != null && m.vfModule.isBaseVfModule == true) {\n					baseIndex = inventoryItems.indexOf(m);\n				} else if (m.vfModule != null && m.vfModule.isBaseVfModule == false && m.vfModule.orchestrationStatus == null) {\n					nonBaseIndex = inventoryItems.indexOf(m);\n				}\n				//\n				if (baseIndex != -1 && nonBaseIndex != -1) {\n					break;\n				}\n			}\n			//\n			// Report the error if either base vf module or non-base vf module is not found\n			//\n			if (baseIndex == -1 || nonBaseIndex == -1) {\n				System.err.println(\"Either base or non-base vf module is not found from AAI response.\");\n				retract($aainqf199RequestWrapper);\n				retract($aainqf199ResponseWrapper);\n				retract($manager);\n				retract($event);\n				return;\n			}\n			//\n			// This comes from the base module\n			//\n			vfModuleItemVfModuleName = 			$aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).items.inventoryResponseItems.get(baseIndex).vfModule.vfModuleName;\n			vfModuleItemVfModuleName = vfModuleItemVfModuleName.replace(\"Vfmodule\", \"vDNS\");\n			//\n			// vfModuleItem - NOT the base module\n			//\n			vfModuleItemPersonaModelId = 		$aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).items.inventoryResponseItems.get(nonBaseIndex).vfModule.personaModelId;\n			vfModuleItemPersonaModelVersion = 	$aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).items.inventoryResponseItems.get(nonBaseIndex).vfModule.personaModelVersion;\n			vfModuleItemModelName = 			$aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).items.inventoryResponseItems.get(nonBaseIndex).extraProperties.extraProperty.get(0).propertyValue;\n			vfModuleItemModelNameVersionId = 	$aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).items.inventoryResponseItems.get(nonBaseIndex).extraProperties.extraProperty.get(4).propertyValue;\n			//\n			// tenantItem\n			//\n			tenantItemTenantId = $aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(1).tenant.tenantId;\n			//\n			// cloudRegionItem\n			//\n			cloudRegionItemCloudRegionId = $aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(1).items.inventoryResponseItems.get(0).cloudRegion.cloudRegionId;\n			//\n		} catch (Exception e) {\n			e.printStackTrace();\n			VirtualControlLoopNotification notification = new VirtualControlLoopNotification($event);\n			notification.notification = ControlLoopNotificationType.REJECTED;\n			notification.message = \"Exception occurred \" + e.getMessage();\n			notification.policyName = drools.getRule().getName();\n			notification.policyScope = \"${policyScope}\";\n			notification.policyVersion = \"${policyVersion}\";\n			//\n			try {\n				System.out.println(Serialization.gsonPretty.toJson(notification));\n				PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n			} catch (Exception e1) {\n				System.out.println(\"Can\'t deliver notification: \" + notification);\n				e1.printStackTrace();\n			}\n			//\n			notification.notification = ControlLoopNotificationType.FINAL_FAILURE;\n			notification.message = \"Invalid named-query response from AAI\";\n            //\n            try {\n            	System.out.println(Serialization.gsonPretty.toJson(notification));\n                PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n            } catch (Exception e1) {\n                System.out.println(\"Can\'t deliver notification: \" + notification);\n                e1.printStackTrace();\n            }\n			//\n			// Retract everything\n			//\n			retract($aainqf199RequestWrapper);\n			retract($aainqf199ResponseWrapper);\n			retract($manager);\n			retract($event);\n			return;\n		}	\n		//\n		// Extracted fields should not be null\n		//\n		if ((vnfItemVnfId == null) || (vnfItemVnfType == null) ||\n		    (vnfItemPersonaModelId == null) || (vnfItemModelName == null) ||\n		    (vnfItemModelVersion == null) || (vnfItemModelNameVersionId == null) ||\n		    (serviceItemServiceInstanceId == null) || (serviceItemModelName == null) ||\n		    (serviceItemModelType == null) || (serviceItemModelVersion == null) ||\n		    (serviceItemModelNameVersionId == null) || (vfModuleItemVfModuleName == null) ||\n		    (vfModuleItemPersonaModelId == null) || (vfModuleItemPersonaModelVersion == null) ||\n		    (vfModuleItemModelName == null) || (vfModuleItemModelNameVersionId == null) ||\n		    (tenantItemTenantId == null) || (cloudRegionItemCloudRegionId == null)) {\n			//\n			System.err.println(\"some fields are missing from AAI response.\");\n			//\n			// Fail and retract everything\n			//\n			retract($aainqf199RequestWrapper);\n			retract($aainqf199ResponseWrapper);\n			retract($manager);\n			retract($event);\n			return;\n		}\n		//\n		// We don\'t need them any more\n		//\n		retract($aainqf199ResponseWrapper);\n		retract($aainqf199RequestWrapper);  \n		//\n		// check the actor of this closed loop\n		//\n		switch ($params.getActor()) {\n			case \"APPC\":\n			{\n				//\n				// Construct an APPC request\n				//\n				ControlLoopOperation operation = new ControlLoopOperation();\n				operation.actor = $params.getActor();\n				operation.operation = \"ModifyConfig\";\n				operation.target = $event.target;\n				//\n				// Create operationWrapper\n				//\n				ControlLoopOperationWrapper operationWrapper = new ControlLoopOperationWrapper($event.requestID, operation);\n				//\n				// insert operationWrapper into memory\n				//\n				insert(operationWrapper);\n				//\n				Request request = new Request();\n				request.CommonHeader = new CommonHeader();\n				request.CommonHeader.RequestID = $event.requestID;\n				request.Action = operation.operation;\n				request.Payload = new HashMap<String, Object>();\n				//\n				// Fill in the payload\n				// Hardcode genericVNF for now since AAI has not been ready for vFirewall demo case\n				//\n				String genericVNF = \"zdfw1fwl01pgn02\";\n				request.Payload.put(\"generic-vnf.vnf-id\", genericVNF);\n				//\n				PGRequest pgRequest = new PGRequest();\n				pgRequest.pgStreams = new PGStreams();\n				\n				PGStream pgStream;\n				for(int i = 0; i < 5; i++){\n					pgStream = new PGStream();\n					pgStream.streamId = \"fw_udp\"+(i+1);\n					pgStream.isEnabled = \"true\";\n					pgRequest.pgStreams.pgStream.add(pgStream);\n				}\n				request.Payload.put(\"pg-streams\", pgRequest.pgStreams);\n				\n				if (request != null) {\n					//\n					// Insert request into memory\n					//\n					insert(request);\n					//\n					// Tell interested parties we are performing this Operation\n					//\n					VirtualControlLoopNotification notification = new VirtualControlLoopNotification($event);\n					notification.notification = ControlLoopNotificationType.OPERATION;\n					// message and history ??\n					notification.from = \"policy\";\n					notification.policyName = drools.getRule().getName();\n					notification.policyScope = \"${policyScope}\";\n					notification.policyVersion = \"${policyVersion}\";\n					try {\n						System.out.println(Serialization.gsonPretty.toJson(notification));\n						PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n					} catch (Exception e) {\n						System.out.println(\"Can\'t deliver notification: \" + notification);\n						e.printStackTrace();\n					}\n					//\n					// Now send the operation request\n					//\n					if (request instanceof Request) {\n						try {\n							System.out.println(\"APPC request sent:\");\n							System.out.println(Serialization.gsonPretty.toJson(request));\n							PolicyEngine.manager.deliver($params.getAppcTopic(), request);\n						} catch (Exception e) {\n							e.printStackTrace();\n							System.out.println(\"Can\'t deliver request: \" + request);\n						}\n					}\n				} else {\n					//\n					// what happens if it is null\n					//\n				}\n			}\n			break;\n			case \"MSO\":\n			{\n				//\n				// Construct an operation\n				//\n				ControlLoopOperation operation = new ControlLoopOperation();\n				operation.actor = $params.getActor();\n				operation.operation = \"createModuleInstance\";\n				operation.target = $event.target;\n				//\n				// Create operationWrapper\n				//\n				ControlLoopOperationWrapper operationWrapper = new ControlLoopOperationWrapper($event.requestID, operation);\n				//\n				// Construct an MSO request\n				//\n				MSORequest request = new MSORequest();\n				request.requestDetails = new MSORequestDetails();\n				request.requestDetails.modelInfo = new MSOModelInfo();\n				request.requestDetails.cloudConfiguration = new MSOCloudConfiguration();\n				request.requestDetails.requestInfo = new MSORequestInfo();\n				request.requestDetails.requestParameters = new MSORequestParameters();\n				request.requestDetails.requestParameters.userParams = null;\n				//\n				// cloudConfiguration\n				//\n				request.requestDetails.cloudConfiguration.lcpCloudRegionId = cloudRegionItemCloudRegionId;\n				request.requestDetails.cloudConfiguration.tenantId = tenantItemTenantId;\n				//\n				// modelInfo\n				//\n				request.requestDetails.modelInfo.modelType = \"vfModule\";\n				request.requestDetails.modelInfo.modelInvariantId = vfModuleItemPersonaModelId;\n				request.requestDetails.modelInfo.modelNameVersionId = vfModuleItemModelNameVersionId;\n				request.requestDetails.modelInfo.modelName = vfModuleItemModelName;\n				request.requestDetails.modelInfo.modelVersion = vfModuleItemPersonaModelVersion;\n				//\n				// requestInfo\n				//\n				request.requestDetails.requestInfo.instanceName = vfModuleItemVfModuleName;\n				request.requestDetails.requestInfo.source = \"POLICY\";\n				request.requestDetails.requestInfo.suppressRollback = false;\n				//\n				// relatedInstanceList\n				//\n				MSORelatedInstanceListElement relatedInstanceListElement1 = new MSORelatedInstanceListElement();\n				MSORelatedInstanceListElement relatedInstanceListElement2 = new MSORelatedInstanceListElement();\n				relatedInstanceListElement1.relatedInstance = new MSORelatedInstance();\n				relatedInstanceListElement2.relatedInstance = new MSORelatedInstance();\n				//\n				relatedInstanceListElement1.relatedInstance.instanceId = serviceItemServiceInstanceId;\n				relatedInstanceListElement1.relatedInstance.modelInfo = new MSOModelInfo();\n				relatedInstanceListElement1.relatedInstance.modelInfo.modelType = \"service\";\n				relatedInstanceListElement1.relatedInstance.modelInfo.modelInvariantId = serviceItemPersonaModelId;\n				relatedInstanceListElement1.relatedInstance.modelInfo.modelNameVersionId = serviceItemModelNameVersionId;\n				relatedInstanceListElement1.relatedInstance.modelInfo.modelName = serviceItemModelName;\n				relatedInstanceListElement1.relatedInstance.modelInfo.modelVersion = serviceItemModelVersion;\n				//\n				relatedInstanceListElement2.relatedInstance.instanceId = vnfItemVnfId;\n				relatedInstanceListElement2.relatedInstance.modelInfo = new MSOModelInfo();\n				relatedInstanceListElement2.relatedInstance.modelInfo.modelType = \"vnf\";\n				relatedInstanceListElement2.relatedInstance.modelInfo.modelInvariantId = vnfItemPersonaModelId;\n				relatedInstanceListElement2.relatedInstance.modelInfo.modelNameVersionId = vnfItemModelNameVersionId;\n				relatedInstanceListElement2.relatedInstance.modelInfo.modelName = vnfItemModelName;\n				relatedInstanceListElement2.relatedInstance.modelInfo.modelVersion = vnfItemModelVersion;\n				relatedInstanceListElement2.relatedInstance.modelInfo.modelCustomizationName = vnfItemVnfType;\n				//	\n				request.requestDetails.relatedInstanceList.add(relatedInstanceListElement1);\n				request.requestDetails.relatedInstanceList.add(relatedInstanceListElement2);\n				//\n				// print MSO request for debug\n				//\n				System.out.println(\"MSO request sent:\");\n				System.out.println(Serialization.gsonPretty.toJson(request));\n				//\n				//\n				//\n				if (request != null) {\n					//\n					// Tell interested parties we are performing this Operation\n					//\n					VirtualControlLoopNotification notification = new VirtualControlLoopNotification($event);\n					notification.notification = ControlLoopNotificationType.OPERATION;\n					notification.from = \"policy\";\n					notification.policyName = drools.getRule().getName();\n					notification.policyScope = \"${policyScope}\";\n					notification.policyVersion = \"${policyVersion}\";\n					try {\n						System.out.println(Serialization.gsonPretty.toJson(notification));\n						PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n					} catch (Exception e) {\n						System.out.println(\"Can\'t deliver notification: \" + notification);\n						e.printStackTrace();\n					}\n					//\n					// Concatenate serviceItemServiceInstanceId and vnfItemVnfId to msoURL\n					//\n					String MSOUrl = $params.getMsoURL() + \"/serviceInstances/v2/\" + serviceItemServiceInstanceId + \"/vnfs/\" + vnfItemVnfId + \"/vfModules\";\n					//\n					// Call MSO\n					//\n					MSOResponse response = MSOManager.createModuleInstance(MSOUrl, $params.getMsoURL(), $params.getMsoUsername(), $params.getMsoPassword(), request);\n					//\n					if (response != null) {\n						//\n						// Assign requestId\n						//\n						request.requestId = $event.requestID.toString();						\n						response.request.requestId = $event.requestID.toString();\n						//\n						// Insert facts\n						//\n						insert(operationWrapper);\n						insert(request);\n						insert(response);\n					} else {\n						//\n						// MSO request not even accepted\n						//\n						notification.message = operationWrapper.operation.toMessage();\n						operationWrapper.operation.message = operationWrapper.operation.toMessage();\n						operationWrapper.operation.outcome = \"FAILURE_EXCEPTION\";\n						$manager.setControlLoopResult(\"FAILURE_EXCEPTION\");\n						notification.history.add(operationWrapper.operation);\n						notification.notification = ControlLoopNotificationType.OPERATION_FAILURE;\n						//\n						// Let interested parties know\n						//\n						try {\n							System.out.println(Serialization.gsonPretty.toJson(notification));\n							PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n						} catch (Exception e) {\n							System.out.println(\"Can\'t deliver notification: \" + notification);\n							e.printStackTrace();\n						}\n	                    notification.notification = ControlLoopNotificationType.FINAL_FAILURE;\n                        try {\n                        	System.out.println(Serialization.gsonPretty.toJson(notification));\n                        	PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n                        } catch (Exception e) {\n                        	System.out.println(\"Can\'t deliver notification: \" + notification);\n                        	e.printStackTrace();\n                        }\n						//\n						// Retract everything\n						//\n						retract($event);\n						retract($manager);\n					}\n				} else {\n					System.err.println(\"constructed MSO request is invalid.\");\n				}\n			}\n			break; \n		} \nend\n		\n/*\n*\n* This rule responds to APPC Response Events\n*\n*/\nrule \"${policyName}.APPC.RESPONSE\"\n	when\n		$params : Params( getClosedLoopControlName() == \"${closedLoopControlName}\" )\n		$event : VirtualControlLoopEvent( closedLoopControlName == $params.getClosedLoopControlName(), closedLoopEventStatus == ControlLoopEventStatus.ONSET )\n		$manager : EventManager( closedLoopControlName == $event.closedLoopControlName )\n		$operationWrapper : ControlLoopOperationWrapper( requestID == $event.requestID )\n		$request : Request( getCommonHeader().RequestID == $event.requestID )\n		$response : Response( getCommonHeader().RequestID == $event.requestID )	\n	then\n		System.out.println(\"rule APPC.RESPONSE is triggered.\");\n		if ($response.Status == null) {\n			$operationWrapper.operation.outcome = \"FAILURE_EXCEPTION\";\n			$manager.setControlLoopResult(\"FAILURE_EXCEPTION\");\n		} \n		//\n		// Get the Response Code\n		//\n		ResponseCode code = ResponseCode.toResponseCode($response.Status.Code);\n		if (code == null) {\n			$operationWrapper.operation.outcome = \"FAILURE_EXCEPTION\";\n			$manager.setControlLoopResult(\"FAILURE_EXCEPTION\");\n		}\n		//\n		// Construct notification\n		//\n		VirtualControlLoopNotification notification = new VirtualControlLoopNotification($event);\n		notification.from = \"policy\";\n		notification.policyName = drools.getRule().getName();\n		notification.policyScope = \"${policyScope}\";\n		notification.policyVersion = \"${policyVersion}\";\n		notification.message = $operationWrapper.operation.toMessage();\n		$operationWrapper.operation.message = $operationWrapper.operation.toMessage();\n		//\n		// Ok, let\'s figure out what APP-C\'s response is\n		//\n		switch (code) {\n			case ACCEPT:\n				$operationWrapper.operation.outcome = \"PROCESSING\";\n				break;\n			case ERROR:\n			case REJECT:\n				$operationWrapper.operation.outcome = \"FAILURE_EXCEPTION\";\n				$manager.setControlLoopResult(\"FAILURE_EXCEPTION\");\n				break;\n			case SUCCESS:\n				$operationWrapper.operation.outcome = \"SUCCESS\";\n				$manager.setControlLoopResult(\"SUCCESS\");\n				break;\n			case FAILURE:\n				$operationWrapper.operation.outcome = \"FAILURE\";\n				$manager.setControlLoopResult(\"FAILURE\");\n				break;\n		}\n		if ($operationWrapper.operation.outcome.equals(\"SUCCESS\")) {\n			notification.history.add($operationWrapper.operation);\n			notification.notification = ControlLoopNotificationType.OPERATION_SUCCESS;\n			//\n			// Let interested parties know\n			//\n			try {\n				System.out.println(Serialization.gsonPretty.toJson(notification));\n				PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n			} catch (Exception e) {\n				System.out.println(\"Can\'t deliver notification: \" + notification);\n				e.printStackTrace();\n			}\n            notification.notification = ControlLoopNotificationType.FINAL_SUCCESS;\n            try {\n            	System.out.println(Serialization.gsonPretty.toJson(notification));\n            	PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n            } catch (Exception e) {\n            	System.out.println(\"Can\'t deliver notification: \" + notification);\n            	e.printStackTrace();\n            }\n\n			//\n			// We are going to retract these objects from memory\n			//\n			System.out.println(\"Retracting everything\");\n			retract($operationWrapper);\n			retract($request);\n			retract($response);\n			retract($event);\n			retract($manager);\n		} else if ($operationWrapper.operation.outcome.equals(\"PROCESSING\")) {\n			retract($response);\n		} else {\n			notification.history.add($operationWrapper.operation);\n			notification.notification = ControlLoopNotificationType.OPERATION_FAILURE;\n			//\n			// Let interested parties know\n			//\n			try {\n				System.out.println(Serialization.gsonPretty.toJson(notification));\n				PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n			} catch (Exception e) {\n				System.out.println(\"Can\'t deliver notification: \" + notification);\n				e.printStackTrace();\n			}\n            notification.notification = ControlLoopNotificationType.FINAL_FAILURE;\n            //\n            // Let interested parties know\n            //\n            try {\n            	System.out.println(Serialization.gsonPretty.toJson(notification));\n            	PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n            } catch (Exception e) {\n            	System.out.println(\"Can\'t deliver notification: \" + notification);\n            	e.printStackTrace();\n            }\n			//\n			// We are going to retract these objects from memory\n			//\n			System.out.println(\"Retracting everything\");\n			retract($operationWrapper);\n			retract($request);\n			retract($response);\n			retract($event);\n			retract($manager);\n		}\n		\nend		\n\n/*\n*\n* This rule is used to clean up APPC response\n*\n*/		\nrule \"${policyName}.APPC.RESPONSE.CLEANUP\"\n	when\n		$params : Params( getClosedLoopControlName() == \"${closedLoopControlName}\" )\n        $response : Response($id : getCommonHeader().RequestID )\n		not ( VirtualControlLoopEvent( closedLoopControlName == $params.getClosedLoopControlName(), requestID == $id, closedLoopEventStatus == ControlLoopEventStatus.ONSET ) ) \n	then\n		System.out.println(\"rule APPC.RESPONSE.CLEANUP is triggered.\");\n		retract($response);\nend\n\n/*\n*\n* This rule responds to MSO Response Events\n*\n*/\nrule \"${policyName}.MSO.RESPONSE\"\n	when\n		$params : Params( getClosedLoopControlName() == \"${closedLoopControlName}\" )\n		$event : VirtualControlLoopEvent( closedLoopControlName == $params.getClosedLoopControlName(), closedLoopEventStatus == ControlLoopEventStatus.ONSET )\n		$manager : EventManager( closedLoopControlName == $event.closedLoopControlName )\n		$operationWrapper : ControlLoopOperationWrapper( requestID == $event.requestID )\n		$request : MSORequest( requestId == $event.requestID.toString() )\n		$response : MSOResponse( request.requestId == $event.requestID.toString() )	\n	then\n		System.out.println(\"rule MSO.RESPONSE is triggered.\");\n		//\n		// Construct notification\n		//\n		VirtualControlLoopNotification notification = new VirtualControlLoopNotification($event);\n		notification.from = \"policy\";\n		notification.policyName = drools.getRule().getName();\n		notification.policyScope = \"${policyScope}\";\n		notification.policyVersion = \"${policyVersion}\";\n		notification.message = $operationWrapper.operation.toMessage();\n		$operationWrapper.operation.message = $operationWrapper.operation.toMessage();\n		//\n		// The operation can either be succeeded or failed\n		// \n		if($response.request.requestStatus.requestState.equals(\"COMPLETE\")) {\n			$operationWrapper.operation.outcome = \"SUCCESS\";\n			$manager.setControlLoopResult(\"SUCCESS\");\n			notification.history.add($operationWrapper.operation);\n			notification.notification = ControlLoopNotificationType.OPERATION_SUCCESS;\n			//\n			// Let interested parties know\n			//\n			try {\n				System.out.println(Serialization.gsonPretty.toJson(notification));\n				PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n			} catch (Exception e) {\n				System.out.println(\"Can\'t deliver notification: \" + notification);\n				e.printStackTrace();\n			}\n			notification.notification = ControlLoopNotificationType.FINAL_SUCCESS;\n            //\n            // Let interested parties know\n            //\n            try {\n            	System.out.println(Serialization.gsonPretty.toJson(notification));\n            	PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n            } catch (Exception e) {\n            	System.out.println(\"Can\'t deliver notification: \" + notification);\n            	e.printStackTrace();\n            }\n            //\n			// We are going to retract these objects from memory\n			//\n			System.out.println(\"Retracting everything\");\n			retract($operationWrapper);\n			retract($request);\n			retract($response);\n			retract($event);\n			retract($manager);\n		} else {\n			$operationWrapper.operation.outcome = \"FAILURE\";\n			$manager.setControlLoopResult(\"FAILURE\");\n			notification.history.add($operationWrapper.operation);\n			notification.notification = ControlLoopNotificationType.OPERATION_FAILURE;\n			//\n			// Let interested parties know\n			//\n			try {\n				System.out.println(Serialization.gsonPretty.toJson(notification));\n				PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n			} catch (Exception e) {\n				System.out.println(\"Can\'t deliver notification: \" + notification);\n				e.printStackTrace();\n			}\n			notification.notification = ControlLoopNotificationType.FINAL_FAILURE;\n            //\n            // Let interested parties know\n            //\n            try {\n            	System.out.println(Serialization.gsonPretty.toJson(notification));\n            	PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n            } catch (Exception e) {\n            	System.out.println(\"Can\'t deliver notification: \" + notification);\n            	e.printStackTrace();\n            }\n            //\n			// We are going to retract these objects from memory\n			//\n			System.out.println(\"Retracting everything\");\n			retract($operationWrapper);\n			retract($request);\n			retract($response);\n			retract($event);\n			retract($manager);\n		}\n		\nend	','2017-03-14 19:55:47','demo');
+INSERT INTO `brmsparamtemplate` VALUES (2,'ControlLoopDemo__closedLoopControlName','ControlLoopDemo__closedLoopControlName','\r\n\r\n/*-\n * ============LICENSE_START=======================================================\n * archetype-closed-loop-demo-rules\n * ================================================================================\n * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.\n * ================================================================================\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n * \n *      http://www.apache.org/licenses/LICENSE-2.0\n * \n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n * ============LICENSE_END=========================================================\n */\n\npackage org.onap.policy.controlloop;\n\nimport java.util.List;\nimport java.util.LinkedList;\nimport java.util.Map;\nimport java.util.HashMap;\nimport java.util.UUID;\n\nimport org.onap.policy.controlloop.VirtualControlLoopEvent;\nimport org.onap.policy.controlloop.ControlLoopEventStatus;\nimport org.onap.policy.controlloop.VirtualControlLoopNotification;\nimport org.onap.policy.controlloop.ControlLoopNotificationType;\nimport org.onap.policy.controlloop.ControlLoopOperation;\nimport org.onap.policy.controlloop.ControlLoopOperationWrapper;\nimport org.onap.policy.template.demo.ControlLoopException;\n\nimport org.onap.policy.aai.AAINQF199.AAINQF199CloudRegion;\nimport org.onap.policy.aai.AAINQF199.AAINQF199ExtraProperties;\nimport org.onap.policy.aai.AAINQF199.AAINQF199ExtraProperty;\nimport org.onap.policy.aai.AAINQF199.AAINQF199GenericVNF;\nimport org.onap.policy.aai.AAINQF199.AAINQF199InstanceFilters;\nimport org.onap.policy.aai.AAINQF199.AAINQF199InventoryResponseItem;\nimport org.onap.policy.aai.AAINQF199.AAINQF199InventoryResponseItems;\nimport org.onap.policy.aai.AAINQF199.AAINQF199Manager;\nimport org.onap.policy.aai.AAINQF199.AAINQF199NamedQuery;\nimport org.onap.policy.aai.AAINQF199.AAINQF199QueryParameters;\nimport org.onap.policy.aai.AAINQF199.AAINQF199Request;\nimport org.onap.policy.aai.AAINQF199.AAINQF199RequestWrapper;\nimport org.onap.policy.aai.AAINQF199.AAINQF199Response;\nimport org.onap.policy.aai.AAINQF199.AAINQF199ResponseWrapper;\nimport org.onap.policy.aai.AAINQF199.AAINQF199ServiceInstance;\nimport org.onap.policy.aai.AAINQF199.AAINQF199Tenant;\nimport org.onap.policy.aai.AAINQF199.AAINQF199VfModule;\nimport org.onap.policy.aai.AAINQF199.AAINQF199VServer;\nimport org.onap.policy.aai.util.Serialization;\n\nimport org.onap.policy.appc.CommonHeader;\nimport org.onap.policy.appc.Request;\nimport org.onap.policy.appc.Response;\nimport org.onap.policy.appc.ResponseCode;\nimport org.onap.policy.appc.ResponseStatus;\nimport org.onap.policy.appc.ResponseValue;\n\nimport org.onap.policy.template.demo.EventManager;\nimport org.onap.policy.vnf.trafficgenerator.PGRequest;\nimport org.onap.policy.vnf.trafficgenerator.PGStream;\nimport org.onap.policy.vnf.trafficgenerator.PGStreams;\n\nimport org.onap.policy.mso.MSOManager;\nimport org.onap.policy.mso.MSORequest;\nimport org.onap.policy.mso.MSORequestStatus;\nimport org.onap.policy.mso.MSORequestDetails;\nimport org.onap.policy.mso.MSOModelInfo;\nimport org.onap.policy.mso.MSOCloudConfiguration;\nimport org.onap.policy.mso.MSORequestInfo;\nimport org.onap.policy.mso.MSORequestParameters;\nimport org.onap.policy.mso.MSORelatedInstanceListElement;\nimport org.onap.policy.mso.MSORelatedInstance;\nimport org.onap.policy.mso.MSOResponse;\n\nimport org.onap.policy.drools.system.PolicyEngine;\n\n//\n// These parameters are required to build the runtime policy\n//\ndeclare Params\n    closedLoopControlName : String\n    actor : String\n    aaiURL : String\n    aaiUsername : String\n    aaiPassword : String\n    msoURL : String\n    msoUsername : String\n    msoPassword : String\n    aaiNamedQueryUUID : String\n    aaiPatternMatch : int \n    notificationTopic : String\n    appcTopic : String\nend\n\n/*\n*\n* Called once and only once to insert the parameters into working memory for this Closed Loop policy.\n* (Comment SETUP rule out for the first ONAP opensource release since policy BRMS_GW already puts a Params fact in there)\n*\n*\n*rule \"${policyName}.SETUP\"\n*	when\n*	then\n*		System.out.println(\"rule SETUP is triggered.\");\n*		Params params = new Params();\n*		params.setClosedLoopControlName(\"${closedLoopControlName}\");\n*		params.setActor(\"${actor}\");\n*		params.setAaiURL(\"${aaiURL}\");\n*		params.setAaiUsername(\"${aaiUsername}\");\n*		params.setAaiPassword(\"${aaiPassword}\");\n*		params.setMsoURL(\"${msoURL}\");\n*		params.setMsoUsername(\"${msoUsername}\");\n*		params.setMsoPassword(\"${msoPassword}\");\n*		params.setAaiNamedQueryUUID(\"${aaiNamedQueryUUID}\");\n*		params.setAaiPatternMatch(${aaiPatternMatch});\n*		params.setNotificationTopic(\"${notificationTopic}\");\n*		params.setAppcTopic(\"${appcTopic}\");\n*		//\n*		// This stays in memory as long as the rule is alive and running\n*		//\n*		insert(params);\n*end\n*/\n/*\n*\n* This rule responds to DCAE Events\n*\n*/\nrule \"${policyName}.EVENT\"\n	when\n        $params : Params( getClosedLoopControlName() == \"${closedLoopControlName}\" )\n        $event : VirtualControlLoopEvent( closedLoopControlName == $params.getClosedLoopControlName(), closedLoopEventStatus == ControlLoopEventStatus.ONSET )\n        not ( EventManager( closedLoopControlName == $event.closedLoopControlName ))\n	then\n		System.out.println(\"rule EVENT is triggered.\");\n		try {\n			// \n			// Check the requestID in the event to make sure it is not null before we create the EventManager. \n			// The EventManager will do extra syntax checking as well check if the closed loop is disabled/\n			//\n			if ($event.requestID == null) {\n				VirtualControlLoopNotification notification = new VirtualControlLoopNotification($event);\n				notification.notification = ControlLoopNotificationType.REJECTED;\n				notification.from = \"policy\";\n				notification.message = \"Missing requestID from DCAE event\";\n				notification.policyName = drools.getRule().getName();\n				notification.policyScope = \"${policyScope}\";\n				notification.policyVersion = \"${policyVersion}\";\n				//\n				// Let interested parties know\n				//\n				try {\n					System.out.println(Serialization.gsonPretty.toJson(notification));\n					PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n				} catch (Exception e) {\n					e.printStackTrace();\n					System.out.println(\"Can\'t deliver notification: \" + notification);\n				}\n				//\n				// Retract it from memory\n				//\n				retract($event);\n				System.out.println(\"Event with requestID=null has been retracted.\");\n			} else {\n				//\n				// Create an EventManager\n				//\n				EventManager manager = new EventManager($params.getClosedLoopControlName(), $event.requestID, $event.target);\n				//\n				// Determine if EventManager can actively process the event (i.e. syntax)\n				//\n				VirtualControlLoopNotification notification = manager.activate($event);\n				notification.from = \"policy\"; \n				notification.policyName = drools.getRule().getName();\n				notification.policyScope = \"${policyScope}\";\n				notification.policyVersion = \"${policyVersion}\";\n				//\n				// Are we actively pursuing this event?\n				//\n				if (notification.notification == ControlLoopNotificationType.ACTIVE) {\n					//\n					// Insert Event Manager into memory, this will now kick off processing.\n					//\n					insert(manager);\n					//\n					// Let interested parties know\n					//\n					try {\n						System.out.println(Serialization.gsonPretty.toJson(notification));\n						PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n					} catch (Exception e) {\n						e.printStackTrace();\n						System.out.println(\"Can\'t deliver notification: \" + notification);\n					}		\n				} else {\n					//\n					// Let interested parties know\n					//\n					try {\n						System.out.println(Serialization.gsonPretty.toJson(notification));\n						PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n					} catch (Exception e) {\n						e.printStackTrace();\n						System.out.println(\"Can\'t deliver notification: \" + notification);\n					}\n					//\n					// Retract it from memory\n					//\n					retract($event);\n				}\n				//\n				// Now that the manager is inserted into Drools working memory, we\'ll wait for\n				// another rule to fire in order to continue processing. This way we can also\n				// then screen for additional ONSET and ABATED events for this same RequestIDs \n				// and for different RequestIDs but with the same closedLoopControlName and target.\n				//\n			}\n		//\n		} catch (Exception e) {\n			e.printStackTrace();\n			VirtualControlLoopNotification notification = new VirtualControlLoopNotification($event);\n			notification.notification = ControlLoopNotificationType.REJECTED;\n			notification.message = \"Exception occurred \" + e.getMessage();\n			notification.policyName = drools.getRule().getName();\n			notification.policyScope = \"${policyScope}\";\n			notification.policyVersion = \"${policyVersion}\";\n			//\n			//\n			//\n			try {\n				System.out.println(Serialization.gsonPretty.toJson(notification));\n				PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n			} catch (Exception e1) {\n				System.out.println(\"Can\'t deliver notification: \" + notification);\n				e1.printStackTrace();\n			}\n			//\n			// Retract the event\n			//\n			retract($event);\n		}\nend\n\n/*\n*\n* This rule happens when we got a valid ONSET, closed loop is enabled and an Event Manager\n* is created. We can start the operations for this closed loop.\n*\n*/\nrule \"${policyName}.EVENT.MANAGER\"\n	when\n		$params : Params( getClosedLoopControlName() == \"${closedLoopControlName}\" )\n		$event : VirtualControlLoopEvent( closedLoopControlName == $params.getClosedLoopControlName(), closedLoopEventStatus == ControlLoopEventStatus.ONSET )\n		$manager : EventManager( closedLoopControlName == $event.closedLoopControlName, controlLoopResult == null)\n	then\n		System.out.println(\"rule EVENT.MANAGER is triggered.\");\n		//\n		// Check which event this is.\n		//\n		EventManager.NEW_EVENT_STATUS eventStatus = $manager.onNewEvent($event);\n		//\n		// We only want the initial ONSET event in memory,\n		// all the other events need to be retracted to support\n		// cleanup and avoid the other rules being fired for this event.\n		//\n		if (eventStatus != EventManager.NEW_EVENT_STATUS.FIRST_ONSET) {\n			System.out.println(\"Retracting \"+eventStatus+\" Event.\");\n			retract($event);\n			return;\n		}\n		//\n		// Now the event in memory is first onset event\n		//\n		try {\n			//\n			// Pull the known AAI field from the Event\n			//\n			// generic-vnf is needed for vFirewall case\n			// vserver-name is needed for vLoadBalancer case\n			//\n			String genericVNF = $event.AAI.get(\"generic-vnf.vnf-id\");\n			String vserver = $event.AAI.get(\"vserver.vserver-name\");\n			//\n			// Check if we are implementing a simple pattern match.\n			//\n			if ($params.getAaiPatternMatch() == 1) {\n				//\n				// Yes\n				//\n				//Basic naming characteristics:\n				//VF Name (9 char)+VM name (13 char total)+VFC (19 char total)\n				//Example: \n				//VF Name (9 characters):    cscf0001v\n				//VM Name(13 characters): cscf0001vm001\n				//VFC name(19 characters): cscf0001vm001cfg001\n				//\n				// zdfw1fwl01fwl02 or zdfw1fwl01fwl01  \n				// replaced with\n				// zdfw1fwl01pgn02 or zdfw1fwl01pgn01\n				//\n				int index = genericVNF.lastIndexOf(\"fwl\");\n				if (index == -1) {\n					System.err.println(\"The generic-vnf.vnf-id from DCAE Event is not valid.\");\n				} else {\n					genericVNF = genericVNF.substring(0, index) + \"pgn\" + genericVNF.substring(index+\"fwl\".length());\n				}\n				//\n				// Construct an APPC request\n				//\n				ControlLoopOperation operation = new ControlLoopOperation();\n				operation.actor = $params.getActor();\n				operation.operation = \"ModifyConfig\";\n				operation.target = $event.target;\n				//\n				// Create operationWrapper\n				//\n				ControlLoopOperationWrapper operationWrapper = new ControlLoopOperationWrapper($event.requestID, operation);\n				//\n				// insert operationWrapper into memory\n				//\n				insert(operationWrapper);\n				//\n				Request request = new Request();\n				request.CommonHeader = new CommonHeader();\n				request.CommonHeader.RequestID = $event.requestID;\n				request.Action = operation.operation;\n				request.Payload = new HashMap<String, Object>();\n				//\n				// Fill in the payload\n				//\n				request.Payload.put(\"generic-vnf.vnf-id\", genericVNF);\n				//\n				PGRequest pgRequest = new PGRequest();\n				pgRequest.pgStreams = new PGStreams();\n				\n				PGStream pgStream;\n				for(int i = 0; i < 5; i++){\n					pgStream = new PGStream();\n					pgStream.streamId = \"fw_udp\"+(i+1);\n					pgStream.isEnabled = \"true\";\n					pgRequest.pgStreams.pgStream.add(pgStream);\n				}\n				request.Payload.put(\"pg-streams\", pgRequest.pgStreams);\n				\n				if (request != null) {\n					//\n					// Insert request into memory\n					//\n					insert(request);\n					//\n					// Tell interested parties we are performing this Operation\n					//\n					VirtualControlLoopNotification notification = new VirtualControlLoopNotification($event);\n					notification.notification = ControlLoopNotificationType.OPERATION;\n					// message and history ??\n					notification.from = \"policy\";\n					notification.policyName = drools.getRule().getName();\n					notification.policyScope = \"${policyScope}\";\n					notification.policyVersion = \"${policyVersion}\";\n					try {\n						System.out.println(Serialization.gsonPretty.toJson(notification));\n						PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n					} catch (Exception e) {\n						System.out.println(\"Can\'t deliver notification: \" + notification);\n						e.printStackTrace();\n					}\n					//\n					// Now send the operation request\n					//\n					if (request instanceof Request) {\n						try {\n							System.out.println(\"APPC request sent:\");\n							System.out.println(Serialization.gsonPretty.toJson(request));\n							PolicyEngine.manager.deliver($params.getAppcTopic(), request);\n						} catch (Exception e) {\n							e.printStackTrace();\n							System.out.println(\"Can\'t deliver request: \" + request);\n						}\n					}\n				} else {\n					//\n					// what happens if it is null\n					//\n				}\n				//\n			} else {\n				//\n				// create AAI named-query request with UUID started with \"F199\"\n				//\n				AAINQF199Request aainqf199request = new AAINQF199Request();\n				AAINQF199QueryParameters aainqf199queryparam = new AAINQF199QueryParameters();\n				AAINQF199NamedQuery aainqf199namedquery = new AAINQF199NamedQuery();\n				AAINQF199InstanceFilters aainqf199instancefilter = new AAINQF199InstanceFilters();\n				//\n				// queryParameters\n				//\n				aainqf199namedquery.namedQueryUUID = UUID.fromString($params.getAaiNamedQueryUUID()); \n				aainqf199queryparam.namedQuery = aainqf199namedquery;\n				aainqf199request.queryParameters = aainqf199queryparam;\n				//\n				// instanceFilters\n				//\n				Map aainqf199instancefiltermap = new HashMap();\n				Map aainqf199instancefiltermapitem = new HashMap();\n				aainqf199instancefiltermapitem.put(\"vserver-name\", vserver); \n				aainqf199instancefiltermap.put(\"vserver\", aainqf199instancefiltermapitem);\n				aainqf199instancefilter.instanceFilter.add(aainqf199instancefiltermap);\n				aainqf199request.instanceFilters = aainqf199instancefilter;\n				//\n				// print aainqf199request for debug\n				//\n				System.out.println(\"AAI Request sent:\");\n				System.out.println(Serialization.gsonPretty.toJson(aainqf199request));\n				//\n				// Create AAINQF199RequestWrapper\n				//\n				AAINQF199RequestWrapper aainqf199RequestWrapper = new AAINQF199RequestWrapper($event.requestID, aainqf199request);\n				//\n				// insert aainqf199request into memory\n				//\n				insert(aainqf199RequestWrapper);\n			}\n			//\n		} catch (Exception e) {\n		 e.printStackTrace();\n		}\nend\n\n/*\n*\n* This rule happens when we got a valid ONSET, closed loop is enabled, an Event Manager\n* is created, AAI Manager and AAI Request are ready in memory. We can start sending query to AAI and then wait for response.\n*\n*/\nrule \"${policyName}.EVENT.MANAGER.AAINQF199REQUEST\"\n	when\n		$params : Params( getClosedLoopControlName() == \"${closedLoopControlName}\" )\n		$event : VirtualControlLoopEvent( closedLoopControlName == $params.getClosedLoopControlName(), closedLoopEventStatus == ControlLoopEventStatus.ONSET )\n		$manager : EventManager( closedLoopControlName == $event.closedLoopControlName )\n		$aainqf199RequestWrapper : AAINQF199RequestWrapper(requestID == $event.requestID)\n	then\n		System.out.println(\"rule EVENT.MANAGER.AAINQF199REQUEST is triggered.\");\n		//\n		// send the request\n		//\n		AAINQF199Response aainqf199response = AAINQF199Manager.postQuery($params.getAaiURL(), $params.getAaiUsername(), $params.getAaiPassword(),\n													   $aainqf199RequestWrapper.aainqf199request, $event.requestID);\n		//\n		// Check AAI response\n		//\n		if (aainqf199response == null) {\n			System.err.println(\"Failed to get AAI response\");\n			//\n			// Fail and retract everything\n			//\n			retract($event);\n			retract($manager);\n			retract($aainqf199RequestWrapper);\n		} else {\n			//\n			// Create AAINQF199ResponseWrapper\n			//\n			AAINQF199ResponseWrapper aainqf199ResponseWrapper = new AAINQF199ResponseWrapper($event.requestID, aainqf199response);\n			//\n			// insert aainqf199ResponseWrapper to memeory\n			//\n			insert(aainqf199ResponseWrapper);\n		}\nend\n\n/*\n*\n* This rule happens when we got a valid AAI response. We can start sending request to APPC or MSO now.\n*\n*/\nrule \"${policyName}.EVENT.MANAGER.AAINQF199RESPONSE\"\n	when \n		$params : Params( getClosedLoopControlName() == \"${closedLoopControlName}\" )\n		$event : VirtualControlLoopEvent( closedLoopControlName == $params.getClosedLoopControlName(), closedLoopEventStatus == ControlLoopEventStatus.ONSET )\n		$manager : EventManager( closedLoopControlName == $event.closedLoopControlName )\n		$aainqf199RequestWrapper : AAINQF199RequestWrapper(requestID == $event.requestID)\n		$aainqf199ResponseWrapper : AAINQF199ResponseWrapper(requestID == $event.requestID)\n	then\n		System.out.println(\"rule EVENT.MANAGER.AAINQF199RESPONSE is triggered.\");\n		//\n		// Extract related fields out of AAINQF199RESPONSE\n		//\n		String vnfItemVnfId, vnfItemVnfType, vnfItemPersonaModelId, vnfItemPersonaModelVersion, vnfItemModelName, \n		       vnfItemModelVersion, vnfItemModelNameVersionId, serviceItemServiceInstanceId, serviceItemPersonaModelId,\n		       serviceItemModelName, serviceItemModelType, serviceItemModelVersion, serviceItemModelNameVersionId,\n		       vfModuleItemVfModuleName, vfModuleItemPersonaModelId, vfModuleItemPersonaModelVersion, vfModuleItemModelName, \n		       vfModuleItemModelNameVersionId, tenantItemTenantId, cloudRegionItemCloudRegionId;\n		try {\n			//\n			// vnfItem\n			//\n			vnfItemVnfId = $aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).genericVNF.vnfID;\n			vnfItemVnfType = $aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).genericVNF.vnfType;\n			vnfItemVnfType = vnfItemVnfType.substring(vnfItemVnfType.lastIndexOf(\"/\")+1);\n			vnfItemPersonaModelId = $aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).genericVNF.personaModelId;\n			vnfItemPersonaModelVersion = $aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).genericVNF.personaModelVersion;\n			vnfItemModelName = $aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).extraProperties.extraProperty.get(0).propertyValue;\n			vnfItemModelVersion = 		$aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).extraProperties.extraProperty.get(2).propertyValue;\n			vnfItemModelNameVersionId = 	$aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).extraProperties.extraProperty.get(4).propertyValue;\n			//\n			// serviceItem\n			//\n			serviceItemServiceInstanceId = $aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).serviceInstance.serviceInstanceID;\n			serviceItemPersonaModelId = $aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).serviceInstance.personaModelId;\n			serviceItemModelName = $aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).extraProperties.extraProperty.get(0).propertyValue;\n			serviceItemModelType = $aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).extraProperties.extraProperty.get(1).propertyValue;\n			serviceItemModelVersion = $aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).serviceInstance.personaModelVersion;\n			serviceItemModelNameVersionId = $aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).extraProperties.extraProperty.get(4).propertyValue;\n			//\n			// Find the index for base vf module and non-base vf module\n			//\n			int baseIndex = -1;\n			int nonBaseIndex = -1;\n			List<AAINQF199InventoryResponseItem> inventoryItems = $aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).items.inventoryResponseItems;\n			for (AAINQF199InventoryResponseItem m : inventoryItems) {\n				if (m.vfModule != null && m.vfModule.isBaseVfModule == true) {\n					baseIndex = inventoryItems.indexOf(m);\n				} else if (m.vfModule != null && m.vfModule.isBaseVfModule == false && m.vfModule.orchestrationStatus == null) {\n					nonBaseIndex = inventoryItems.indexOf(m);\n				}\n				//\n				if (baseIndex != -1 && nonBaseIndex != -1) {\n					break;\n				}\n			}\n			//\n			// Report the error if either base vf module or non-base vf module is not found\n			//\n			if (baseIndex == -1 || nonBaseIndex == -1) {\n				System.err.println(\"Either base or non-base vf module is not found from AAI response.\");\n				retract($aainqf199RequestWrapper);\n				retract($aainqf199ResponseWrapper);\n				retract($manager);\n				retract($event);\n				return;\n			}\n			//\n			// This comes from the base module\n			//\n			vfModuleItemVfModuleName = 			$aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).items.inventoryResponseItems.get(baseIndex).vfModule.vfModuleName;\n			vfModuleItemVfModuleName = vfModuleItemVfModuleName.replace(\"Vfmodule\", \"vDNS\");\n			//\n			// vfModuleItem - NOT the base module\n			//\n			vfModuleItemPersonaModelId = 		$aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).items.inventoryResponseItems.get(nonBaseIndex).vfModule.personaModelId;\n			vfModuleItemPersonaModelVersion = 	$aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).items.inventoryResponseItems.get(nonBaseIndex).vfModule.personaModelVersion;\n			vfModuleItemModelName = 			$aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).items.inventoryResponseItems.get(nonBaseIndex).extraProperties.extraProperty.get(0).propertyValue;\n			vfModuleItemModelNameVersionId = 	$aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).items.inventoryResponseItems.get(nonBaseIndex).extraProperties.extraProperty.get(4).propertyValue;\n			//\n			// tenantItem\n			//\n			tenantItemTenantId = $aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(1).tenant.tenantId;\n			//\n			// cloudRegionItem\n			//\n			cloudRegionItemCloudRegionId = $aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(1).items.inventoryResponseItems.get(0).cloudRegion.cloudRegionId;\n			//\n		} catch (Exception e) {\n			e.printStackTrace();\n			VirtualControlLoopNotification notification = new VirtualControlLoopNotification($event);\n			notification.notification = ControlLoopNotificationType.REJECTED;\n			notification.message = \"Exception occurred \" + e.getMessage();\n			notification.policyName = drools.getRule().getName();\n			notification.policyScope = \"${policyScope}\";\n			notification.policyVersion = \"${policyVersion}\";\n			//\n			try {\n				System.out.println(Serialization.gsonPretty.toJson(notification));\n				PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n			} catch (Exception e1) {\n				System.out.println(\"Can\'t deliver notification: \" + notification);\n				e1.printStackTrace();\n			}\n			//\n			notification.notification = ControlLoopNotificationType.FINAL_FAILURE;\n			notification.message = \"Invalid named-query response from AAI\";\n            //\n            try {\n            	System.out.println(Serialization.gsonPretty.toJson(notification));\n                PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n            } catch (Exception e1) {\n                System.out.println(\"Can\'t deliver notification: \" + notification);\n                e1.printStackTrace();\n            }\n			//\n			// Retract everything\n			//\n			retract($aainqf199RequestWrapper);\n			retract($aainqf199ResponseWrapper);\n			retract($manager);\n			retract($event);\n			return;\n		}	\n		//\n		// Extracted fields should not be null\n		//\n		if ((vnfItemVnfId == null) || (vnfItemVnfType == null) ||\n		    (vnfItemPersonaModelId == null) || (vnfItemModelName == null) ||\n		    (vnfItemModelVersion == null) || (vnfItemModelNameVersionId == null) ||\n		    (serviceItemServiceInstanceId == null) || (serviceItemModelName == null) ||\n		    (serviceItemModelType == null) || (serviceItemModelVersion == null) ||\n		    (serviceItemModelNameVersionId == null) || (vfModuleItemVfModuleName == null) ||\n		    (vfModuleItemPersonaModelId == null) || (vfModuleItemPersonaModelVersion == null) ||\n		    (vfModuleItemModelName == null) || (vfModuleItemModelNameVersionId == null) ||\n		    (tenantItemTenantId == null) || (cloudRegionItemCloudRegionId == null)) {\n			//\n			System.err.println(\"some fields are missing from AAI response.\");\n			//\n			// Fail and retract everything\n			//\n			retract($aainqf199RequestWrapper);\n			retract($aainqf199ResponseWrapper);\n			retract($manager);\n			retract($event);\n			return;\n		}\n		//\n		// We don\'t need them any more\n		//\n		retract($aainqf199ResponseWrapper);\n		retract($aainqf199RequestWrapper);  \n		//\n		// check the actor of this closed loop\n		//\n		switch ($params.getActor()) {\n			case \"APPC\":\n			{\n				//\n				// Construct an APPC request\n				//\n				ControlLoopOperation operation = new ControlLoopOperation();\n				operation.actor = $params.getActor();\n				operation.operation = \"ModifyConfig\";\n				operation.target = $event.target;\n				//\n				// Create operationWrapper\n				//\n				ControlLoopOperationWrapper operationWrapper = new ControlLoopOperationWrapper($event.requestID, operation);\n				//\n				// insert operationWrapper into memory\n				//\n				insert(operationWrapper);\n				//\n				Request request = new Request();\n				request.CommonHeader = new CommonHeader();\n				request.CommonHeader.RequestID = $event.requestID;\n				request.Action = operation.operation;\n				request.Payload = new HashMap<String, Object>();\n				//\n				// Fill in the payload\n				// Hardcode genericVNF for now since AAI has not been ready for vFirewall demo case\n				//\n				String genericVNF = \"zdfw1fwl01pgn02\";\n				request.Payload.put(\"generic-vnf.vnf-id\", genericVNF);\n				//\n				PGRequest pgRequest = new PGRequest();\n				pgRequest.pgStreams = new PGStreams();\n				\n				PGStream pgStream;\n				for(int i = 0; i < 5; i++){\n					pgStream = new PGStream();\n					pgStream.streamId = \"fw_udp\"+(i+1);\n					pgStream.isEnabled = \"true\";\n					pgRequest.pgStreams.pgStream.add(pgStream);\n				}\n				request.Payload.put(\"pg-streams\", pgRequest.pgStreams);\n				\n				if (request != null) {\n					//\n					// Insert request into memory\n					//\n					insert(request);\n					//\n					// Tell interested parties we are performing this Operation\n					//\n					VirtualControlLoopNotification notification = new VirtualControlLoopNotification($event);\n					notification.notification = ControlLoopNotificationType.OPERATION;\n					// message and history ??\n					notification.from = \"policy\";\n					notification.policyName = drools.getRule().getName();\n					notification.policyScope = \"${policyScope}\";\n					notification.policyVersion = \"${policyVersion}\";\n					try {\n						System.out.println(Serialization.gsonPretty.toJson(notification));\n						PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n					} catch (Exception e) {\n						System.out.println(\"Can\'t deliver notification: \" + notification);\n						e.printStackTrace();\n					}\n					//\n					// Now send the operation request\n					//\n					if (request instanceof Request) {\n						try {\n							System.out.println(\"APPC request sent:\");\n							System.out.println(Serialization.gsonPretty.toJson(request));\n							PolicyEngine.manager.deliver($params.getAppcTopic(), request);\n						} catch (Exception e) {\n							e.printStackTrace();\n							System.out.println(\"Can\'t deliver request: \" + request);\n						}\n					}\n				} else {\n					//\n					// what happens if it is null\n					//\n				}\n			}\n			break;\n			case \"MSO\":\n			{\n				//\n				// Construct an operation\n				//\n				ControlLoopOperation operation = new ControlLoopOperation();\n				operation.actor = $params.getActor();\n				operation.operation = \"createModuleInstance\";\n				operation.target = $event.target;\n				//\n				// Create operationWrapper\n				//\n				ControlLoopOperationWrapper operationWrapper = new ControlLoopOperationWrapper($event.requestID, operation);\n				//\n				// Construct an MSO request\n				//\n				MSORequest request = new MSORequest();\n				request.requestDetails = new MSORequestDetails();\n				request.requestDetails.modelInfo = new MSOModelInfo();\n				request.requestDetails.cloudConfiguration = new MSOCloudConfiguration();\n				request.requestDetails.requestInfo = new MSORequestInfo();\n				request.requestDetails.requestParameters = new MSORequestParameters();\n				request.requestDetails.requestParameters.userParams = null;\n				//\n				// cloudConfiguration\n				//\n				request.requestDetails.cloudConfiguration.lcpCloudRegionId = cloudRegionItemCloudRegionId;\n				request.requestDetails.cloudConfiguration.tenantId = tenantItemTenantId;\n				//\n				// modelInfo\n				//\n				request.requestDetails.modelInfo.modelType = \"vfModule\";\n				request.requestDetails.modelInfo.modelInvariantId = vfModuleItemPersonaModelId;\n				request.requestDetails.modelInfo.modelNameVersionId = vfModuleItemModelNameVersionId;\n				request.requestDetails.modelInfo.modelName = vfModuleItemModelName;\n				request.requestDetails.modelInfo.modelVersion = vfModuleItemPersonaModelVersion;\n				//\n				// requestInfo\n				//\n				request.requestDetails.requestInfo.instanceName = vfModuleItemVfModuleName;\n				request.requestDetails.requestInfo.source = \"POLICY\";\n				request.requestDetails.requestInfo.suppressRollback = false;\n				//\n				// relatedInstanceList\n				//\n				MSORelatedInstanceListElement relatedInstanceListElement1 = new MSORelatedInstanceListElement();\n				MSORelatedInstanceListElement relatedInstanceListElement2 = new MSORelatedInstanceListElement();\n				relatedInstanceListElement1.relatedInstance = new MSORelatedInstance();\n				relatedInstanceListElement2.relatedInstance = new MSORelatedInstance();\n				//\n				relatedInstanceListElement1.relatedInstance.instanceId = serviceItemServiceInstanceId;\n				relatedInstanceListElement1.relatedInstance.modelInfo = new MSOModelInfo();\n				relatedInstanceListElement1.relatedInstance.modelInfo.modelType = \"service\";\n				relatedInstanceListElement1.relatedInstance.modelInfo.modelInvariantId = serviceItemPersonaModelId;\n				relatedInstanceListElement1.relatedInstance.modelInfo.modelNameVersionId = serviceItemModelNameVersionId;\n				relatedInstanceListElement1.relatedInstance.modelInfo.modelName = serviceItemModelName;\n				relatedInstanceListElement1.relatedInstance.modelInfo.modelVersion = serviceItemModelVersion;\n				//\n				relatedInstanceListElement2.relatedInstance.instanceId = vnfItemVnfId;\n				relatedInstanceListElement2.relatedInstance.modelInfo = new MSOModelInfo();\n				relatedInstanceListElement2.relatedInstance.modelInfo.modelType = \"vnf\";\n				relatedInstanceListElement2.relatedInstance.modelInfo.modelInvariantId = vnfItemPersonaModelId;\n				relatedInstanceListElement2.relatedInstance.modelInfo.modelNameVersionId = vnfItemModelNameVersionId;\n				relatedInstanceListElement2.relatedInstance.modelInfo.modelName = vnfItemModelName;\n				relatedInstanceListElement2.relatedInstance.modelInfo.modelVersion = vnfItemModelVersion;\n				relatedInstanceListElement2.relatedInstance.modelInfo.modelCustomizationName = vnfItemVnfType;\n				//	\n				request.requestDetails.relatedInstanceList.add(relatedInstanceListElement1);\n				request.requestDetails.relatedInstanceList.add(relatedInstanceListElement2);\n				//\n				// print MSO request for debug\n				//\n				System.out.println(\"MSO request sent:\");\n				System.out.println(Serialization.gsonPretty.toJson(request));\n				//\n				//\n				//\n				if (request != null) {\n					//\n					// Tell interested parties we are performing this Operation\n					//\n					VirtualControlLoopNotification notification = new VirtualControlLoopNotification($event);\n					notification.notification = ControlLoopNotificationType.OPERATION;\n					notification.from = \"policy\";\n					notification.policyName = drools.getRule().getName();\n					notification.policyScope = \"${policyScope}\";\n					notification.policyVersion = \"${policyVersion}\";\n					try {\n						System.out.println(Serialization.gsonPretty.toJson(notification));\n						PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n					} catch (Exception e) {\n						System.out.println(\"Can\'t deliver notification: \" + notification);\n						e.printStackTrace();\n					}\n					//\n					// Concatenate serviceItemServiceInstanceId and vnfItemVnfId to msoURL\n					//\n					String MSOUrl = $params.getMsoURL() + \"/serviceInstances/v2/\" + serviceItemServiceInstanceId + \"/vnfs/\" + vnfItemVnfId + \"/vfModules\";\n					//\n					// Call MSO\n					//\n					MSOResponse response = MSOManager.createModuleInstance(MSOUrl, $params.getMsoURL(), $params.getMsoUsername(), $params.getMsoPassword(), request);\n					//\n					if (response != null) {\n						//\n						// Assign requestId\n						//\n						request.requestId = $event.requestID.toString();						\n						response.request.requestId = $event.requestID.toString();\n						//\n						// Insert facts\n						//\n						insert(operationWrapper);\n						insert(request);\n						insert(response);\n					} else {\n						//\n						// MSO request not even accepted\n						//\n						notification.message = operationWrapper.operation.toMessage();\n						operationWrapper.operation.message = operationWrapper.operation.toMessage();\n						operationWrapper.operation.outcome = \"FAILURE_EXCEPTION\";\n						$manager.setControlLoopResult(\"FAILURE_EXCEPTION\");\n						notification.history.add(operationWrapper.operation);\n						notification.notification = ControlLoopNotificationType.OPERATION_FAILURE;\n						//\n						// Let interested parties know\n						//\n						try {\n							System.out.println(Serialization.gsonPretty.toJson(notification));\n							PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n						} catch (Exception e) {\n							System.out.println(\"Can\'t deliver notification: \" + notification);\n							e.printStackTrace();\n						}\n	                    notification.notification = ControlLoopNotificationType.FINAL_FAILURE;\n                        try {\n                        	System.out.println(Serialization.gsonPretty.toJson(notification));\n                        	PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n                        } catch (Exception e) {\n                        	System.out.println(\"Can\'t deliver notification: \" + notification);\n                        	e.printStackTrace();\n                        }\n						//\n						// Retract everything\n						//\n						retract($event);\n						retract($manager);\n					}\n				} else {\n					System.err.println(\"constructed MSO request is invalid.\");\n				}\n			}\n			break; \n		} \nend\n		\n/*\n*\n* This rule responds to APPC Response Events\n*\n*/\nrule \"${policyName}.APPC.RESPONSE\"\n	when\n		$params : Params( getClosedLoopControlName() == \"${closedLoopControlName}\" )\n		$event : VirtualControlLoopEvent( closedLoopControlName == $params.getClosedLoopControlName(), closedLoopEventStatus == ControlLoopEventStatus.ONSET )\n		$manager : EventManager( closedLoopControlName == $event.closedLoopControlName )\n		$operationWrapper : ControlLoopOperationWrapper( requestID == $event.requestID )\n		$request : Request( getCommonHeader().RequestID == $event.requestID )\n		$response : Response( getCommonHeader().RequestID == $event.requestID )	\n	then\n		System.out.println(\"rule APPC.RESPONSE is triggered.\");\n		if ($response.Status == null) {\n			$operationWrapper.operation.outcome = \"FAILURE_EXCEPTION\";\n			$manager.setControlLoopResult(\"FAILURE_EXCEPTION\");\n		} \n		//\n		// Get the Response Code\n		//\n		ResponseCode code = ResponseCode.toResponseCode($response.Status.Code);\n		if (code == null) {\n			$operationWrapper.operation.outcome = \"FAILURE_EXCEPTION\";\n			$manager.setControlLoopResult(\"FAILURE_EXCEPTION\");\n		}\n		//\n		// Construct notification\n		//\n		VirtualControlLoopNotification notification = new VirtualControlLoopNotification($event);\n		notification.from = \"policy\";\n		notification.policyName = drools.getRule().getName();\n		notification.policyScope = \"${policyScope}\";\n		notification.policyVersion = \"${policyVersion}\";\n		notification.message = $operationWrapper.operation.toMessage();\n		$operationWrapper.operation.message = $operationWrapper.operation.toMessage();\n		//\n		// Ok, let\'s figure out what APP-C\'s response is\n		//\n		switch (code) {\n			case ACCEPT:\n				$operationWrapper.operation.outcome = \"PROCESSING\";\n				break;\n			case ERROR:\n			case REJECT:\n				$operationWrapper.operation.outcome = \"FAILURE_EXCEPTION\";\n				$manager.setControlLoopResult(\"FAILURE_EXCEPTION\");\n				break;\n			case SUCCESS:\n				$operationWrapper.operation.outcome = \"SUCCESS\";\n				$manager.setControlLoopResult(\"SUCCESS\");\n				break;\n			case FAILURE:\n				$operationWrapper.operation.outcome = \"FAILURE\";\n				$manager.setControlLoopResult(\"FAILURE\");\n				break;\n		}\n		if ($operationWrapper.operation.outcome.equals(\"SUCCESS\")) {\n			notification.history.add($operationWrapper.operation);\n			notification.notification = ControlLoopNotificationType.OPERATION_SUCCESS;\n			//\n			// Let interested parties know\n			//\n			try {\n				System.out.println(Serialization.gsonPretty.toJson(notification));\n				PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n			} catch (Exception e) {\n				System.out.println(\"Can\'t deliver notification: \" + notification);\n				e.printStackTrace();\n			}\n            notification.notification = ControlLoopNotificationType.FINAL_SUCCESS;\n            try {\n            	System.out.println(Serialization.gsonPretty.toJson(notification));\n            	PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n            } catch (Exception e) {\n            	System.out.println(\"Can\'t deliver notification: \" + notification);\n            	e.printStackTrace();\n            }\n\n			//\n			// We are going to retract these objects from memory\n			//\n			System.out.println(\"Retracting everything\");\n			retract($operationWrapper);\n			retract($request);\n			retract($response);\n			retract($event);\n			retract($manager);\n		} else if ($operationWrapper.operation.outcome.equals(\"PROCESSING\")) {\n			retract($response);\n		} else {\n			notification.history.add($operationWrapper.operation);\n			notification.notification = ControlLoopNotificationType.OPERATION_FAILURE;\n			//\n			// Let interested parties know\n			//\n			try {\n				System.out.println(Serialization.gsonPretty.toJson(notification));\n				PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n			} catch (Exception e) {\n				System.out.println(\"Can\'t deliver notification: \" + notification);\n				e.printStackTrace();\n			}\n            notification.notification = ControlLoopNotificationType.FINAL_FAILURE;\n            //\n            // Let interested parties know\n            //\n            try {\n            	System.out.println(Serialization.gsonPretty.toJson(notification));\n            	PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n            } catch (Exception e) {\n            	System.out.println(\"Can\'t deliver notification: \" + notification);\n            	e.printStackTrace();\n            }\n			//\n			// We are going to retract these objects from memory\n			//\n			System.out.println(\"Retracting everything\");\n			retract($operationWrapper);\n			retract($request);\n			retract($response);\n			retract($event);\n			retract($manager);\n		}\n		\nend		\n\n/*\n*\n* This rule is used to clean up APPC response\n*\n*/		\nrule \"${policyName}.APPC.RESPONSE.CLEANUP\"\n	when\n		$params : Params( getClosedLoopControlName() == \"${closedLoopControlName}\" )\n        $response : Response($id : getCommonHeader().RequestID )\n		not ( VirtualControlLoopEvent( closedLoopControlName == $params.getClosedLoopControlName(), requestID == $id, closedLoopEventStatus == ControlLoopEventStatus.ONSET ) ) \n	then\n		System.out.println(\"rule APPC.RESPONSE.CLEANUP is triggered.\");\n		retract($response);\nend\n\n/*\n*\n* This rule responds to MSO Response Events\n*\n*/\nrule \"${policyName}.MSO.RESPONSE\"\n	when\n		$params : Params( getClosedLoopControlName() == \"${closedLoopControlName}\" )\n		$event : VirtualControlLoopEvent( closedLoopControlName == $params.getClosedLoopControlName(), closedLoopEventStatus == ControlLoopEventStatus.ONSET )\n		$manager : EventManager( closedLoopControlName == $event.closedLoopControlName )\n		$operationWrapper : ControlLoopOperationWrapper( requestID == $event.requestID )\n		$request : MSORequest( requestId == $event.requestID.toString() )\n		$response : MSOResponse( request.requestId == $event.requestID.toString() )	\n	then\n		System.out.println(\"rule MSO.RESPONSE is triggered.\");\n		//\n		// Construct notification\n		//\n		VirtualControlLoopNotification notification = new VirtualControlLoopNotification($event);\n		notification.from = \"policy\";\n		notification.policyName = drools.getRule().getName();\n		notification.policyScope = \"${policyScope}\";\n		notification.policyVersion = \"${policyVersion}\";\n		notification.message = $operationWrapper.operation.toMessage();\n		$operationWrapper.operation.message = $operationWrapper.operation.toMessage();\n		//\n		// The operation can either be succeeded or failed\n		// \n		if($response.request.requestStatus.requestState.equals(\"COMPLETE\")) {\n			$operationWrapper.operation.outcome = \"SUCCESS\";\n			$manager.setControlLoopResult(\"SUCCESS\");\n			notification.history.add($operationWrapper.operation);\n			notification.notification = ControlLoopNotificationType.OPERATION_SUCCESS;\n			//\n			// Let interested parties know\n			//\n			try {\n				System.out.println(Serialization.gsonPretty.toJson(notification));\n				PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n			} catch (Exception e) {\n				System.out.println(\"Can\'t deliver notification: \" + notification);\n				e.printStackTrace();\n			}\n			notification.notification = ControlLoopNotificationType.FINAL_SUCCESS;\n            //\n            // Let interested parties know\n            //\n            try {\n            	System.out.println(Serialization.gsonPretty.toJson(notification));\n            	PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n            } catch (Exception e) {\n            	System.out.println(\"Can\'t deliver notification: \" + notification);\n            	e.printStackTrace();\n            }\n            //\n			// We are going to retract these objects from memory\n			//\n			System.out.println(\"Retracting everything\");\n			retract($operationWrapper);\n			retract($request);\n			retract($response);\n			retract($event);\n			retract($manager);\n		} else {\n			$operationWrapper.operation.outcome = \"FAILURE\";\n			$manager.setControlLoopResult(\"FAILURE\");\n			notification.history.add($operationWrapper.operation);\n			notification.notification = ControlLoopNotificationType.OPERATION_FAILURE;\n			//\n			// Let interested parties know\n			//\n			try {\n				System.out.println(Serialization.gsonPretty.toJson(notification));\n				PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n			} catch (Exception e) {\n				System.out.println(\"Can\'t deliver notification: \" + notification);\n				e.printStackTrace();\n			}\n			notification.notification = ControlLoopNotificationType.FINAL_FAILURE;\n            //\n            // Let interested parties know\n            //\n            try {\n            	System.out.println(Serialization.gsonPretty.toJson(notification));\n            	PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n            } catch (Exception e) {\n            	System.out.println(\"Can\'t deliver notification: \" + notification);\n            	e.printStackTrace();\n            }\n            //\n			// We are going to retract these objects from memory\n			//\n			System.out.println(\"Retracting everything\");\n			retract($operationWrapper);\n			retract($request);\n			retract($response);\n			retract($event);\n			retract($manager);\n		}\n		\nend	','2017-03-14 19:55:47','demo');
 
-INSERT INTO `policyentity` VALUES (3156,'doACPolicyPut','2017-03-03 17:26:24',0,'Micro Service vFirewall Demo Policy@CreatedBy:@CreatedBy:@ModifiedBy:@ModifiedBy:','doACPolicyPut','2017-03-03 17:26:24','<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n<Policy xmlns=\"urn:oasis:names:tc:xacml:3.0:core:schema:wd-17\" PolicyId=\"urn:com:xacml:policy:id:34928b05-b0f6-4974-8458-f4d34a2a1764\" Version=\"1\" RuleCombiningAlgId=\"urn:oasis:names:tc:xacml:3.0:rule-combining-algorithm:permit-overrides\">\n    <Description>Micro Service vFirewall Demo Policy@CreatedBy:@CreatedBy:@ModifiedBy:@ModifiedBy:</Description>\n    <Target>\n        <AnyOf>\n            <AllOf>\n                <Match MatchId=\"org.openecomp.function.regex-match\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">com.Config_MS_vFirewall.1.xml</AttributeValue>\n                    <AttributeDesignator Category=\"urn:oasis:names:tc:xacml:1.0:subject-category:access-subject\" AttributeId=\"PolicyName\" DataType=\"http://www.w3.org/2001/XMLSchema#string\" MustBePresent=\"false\"/>\n                </Match>\n            </AllOf>\n            <AllOf>\n                <Match MatchId=\"org.openecomp.function.regex-match\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">DCAE</AttributeValue>\n                    <AttributeDesignator Category=\"urn:oasis:names:tc:xacml:1.0:subject-category:access-subject\" AttributeId=\"ECOMPName\" DataType=\"http://www.w3.org/2001/XMLSchema#string\" MustBePresent=\"false\"/>\n                </Match>\n                <Match MatchId=\"org.openecomp.function.regex-match\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">SampleConfigName</AttributeValue>\n                    <AttributeDesignator Category=\"urn:oasis:names:tc:xacml:1.0:subject-category:access-subject\" AttributeId=\"ConfigName\" DataType=\"http://www.w3.org/2001/XMLSchema#string\" MustBePresent=\"false\"/>\n                </Match>\n                <Match MatchId=\"org.openecomp.function.regex-match\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">TcaMetrics-v1.0.0.5</AttributeValue>\n                    <AttributeDesignator Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" AttributeId=\"service\" DataType=\"http://www.w3.org/2001/XMLSchema#string\" MustBePresent=\"false\"/>\n                </Match>\n                <Match MatchId=\"org.openecomp.function.regex-match\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">/services/cdap-tca-hi-lo/instances/demo/configuration/metricsPerFunctionalRole/vFirewall</AttributeValue>\n                    <AttributeDesignator Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" AttributeId=\"uuid\" DataType=\"http://www.w3.org/2001/XMLSchema#string\" MustBePresent=\"false\"/>\n                </Match>\n                <Match MatchId=\"org.openecomp.function.regex-match\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">SampleServiceLocation</AttributeValue>\n                    <AttributeDesignator Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" AttributeId=\"location\" DataType=\"http://www.w3.org/2001/XMLSchema#string\" MustBePresent=\"false\"/>\n                </Match>\n                <Match MatchId=\"org.openecomp.function.regex-match\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">SampleRiskType</AttributeValue>\n                    <AttributeDesignator Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" AttributeId=\"RiskType\" DataType=\"http://www.w3.org/2001/XMLSchema#string\" MustBePresent=\"false\"/>\n                </Match>\n                <Match MatchId=\"org.openecomp.function.regex-match\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">1</AttributeValue>\n                    <AttributeDesignator Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" AttributeId=\"RiskLevel\" DataType=\"http://www.w3.org/2001/XMLSchema#string\" MustBePresent=\"false\"/>\n                </Match>\n                <Match MatchId=\"org.openecomp.function.regex-match\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">False</AttributeValue>\n                    <AttributeDesignator Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" AttributeId=\"guard\" DataType=\"http://www.w3.org/2001/XMLSchema#string\" MustBePresent=\"false\"/>\n                </Match>\n                <Match MatchId=\"org.openecomp.function.regex-match\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">NA</AttributeValue>\n                    <AttributeDesignator Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" AttributeId=\"TTLDate\" DataType=\"http://www.w3.org/2001/XMLSchema#string\" MustBePresent=\"false\"/>\n                </Match>\n            </AllOf>\n        </AnyOf>\n    </Target>\n    <Rule RuleId=\"urn:com:xacml:rule:id:063161de-0534-4989-bd01-42f784daf21e\" Effect=\"Permit\">\n        <Target>\n            <AnyOf>\n                <AllOf>\n                    <Match MatchId=\"urn:oasis:names:tc:xacml:3.0:function:string-equal-ignore-case\">\n                        <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">ACCESS</AttributeValue>\n                        <AttributeDesignator Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:action\" AttributeId=\"urn:oasis:names:tc:xacml:1.0:action:action-id\" DataType=\"http://www.w3.org/2001/XMLSchema#string\" MustBePresent=\"false\"/>\n                    </Match>\n                    <Match MatchId=\"urn:oasis:names:tc:xacml:3.0:function:string-equal-ignore-case\">\n                        <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">Config</AttributeValue>\n                        <AttributeDesignator Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" AttributeId=\"urn:oasis:names:tc:xacml:1.0:resource:resource-id\" DataType=\"http://www.w3.org/2001/XMLSchema#string\" MustBePresent=\"false\"/>\n                    </Match>\n                </AllOf>\n            </AnyOf>\n        </Target>\n        <AdviceExpressions>\n            <AdviceExpression AdviceId=\"MSID\" AppliesTo=\"Permit\">\n                <AttributeAssignmentExpression AttributeId=\"type\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">Configuration</AttributeValue>\n                </AttributeAssignmentExpression>\n                <AttributeAssignmentExpression AttributeId=\"URLID\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#anyURI\">$URL/Config/com.Config_MS_vFirewall.1.json</AttributeValue>\n                </AttributeAssignmentExpression>\n                <AttributeAssignmentExpression AttributeId=\"PolicyName\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">com.Config_MS_vFirewall.1.xml</AttributeValue>\n                </AttributeAssignmentExpression>\n                <AttributeAssignmentExpression AttributeId=\"VersionNumber\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">1</AttributeValue>\n                </AttributeAssignmentExpression>\n                <AttributeAssignmentExpression AttributeId=\"matching:ECOMPName\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">DCAE</AttributeValue>\n                </AttributeAssignmentExpression>\n                <AttributeAssignmentExpression AttributeId=\"matching:ConfigName\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">SampleConfigName</AttributeValue>\n                </AttributeAssignmentExpression>\n                <AttributeAssignmentExpression AttributeId=\"matching:service\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">TcaMetrics-v1.0.0.5</AttributeValue>\n                </AttributeAssignmentExpression>\n                <AttributeAssignmentExpression AttributeId=\"matching:uuid\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">/services/cdap-tca-hi-lo/instances/demo/configuration/metricsPerFunctionalRole/vFirewall</AttributeValue>\n                </AttributeAssignmentExpression>\n                <AttributeAssignmentExpression AttributeId=\"matching:Location\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">SampleServiceLocation</AttributeValue>\n                </AttributeAssignmentExpression>\n                <AttributeAssignmentExpression AttributeId=\"Priority\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">1</AttributeValue>\n                </AttributeAssignmentExpression>\n                <AttributeAssignmentExpression AttributeId=\"RiskType\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">SampleRiskType</AttributeValue>\n                </AttributeAssignmentExpression>\n                <AttributeAssignmentExpression AttributeId=\"RiskLevel\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">1</AttributeValue>\n                </AttributeAssignmentExpression>\n                <AttributeAssignmentExpression AttributeId=\"guard\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">1</AttributeValue>\n                </AttributeAssignmentExpression>\n                <AttributeAssignmentExpression AttributeId=\"TTLDate\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">NA</AttributeValue>\n                </AttributeAssignmentExpression>\n            </AdviceExpression>\n        </AdviceExpressions>\n    </Rule>\n</Policy>\n','Config_MS_vFirewall.1.xml',0,'com',1,NULL,3155),(3158,'doACPolicyPut','2017-03-03 17:28:10',0,'Micro Service vLoadBalancer Demo Policy@CreatedBy:@CreatedBy:@ModifiedBy:@ModifiedBy:','doACPolicyPut','2017-03-03 17:28:10','<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n<Policy xmlns=\"urn:oasis:names:tc:xacml:3.0:core:schema:wd-17\" PolicyId=\"urn:com:xacml:policy:id:c220802a-70ee-4ca8-9f1e-f8a515650381\" Version=\"1\" RuleCombiningAlgId=\"urn:oasis:names:tc:xacml:3.0:rule-combining-algorithm:permit-overrides\">\n    <Description>Micro Service vLoadBalancer Demo Policy@CreatedBy:@CreatedBy:@ModifiedBy:@ModifiedBy:</Description>\n    <Target>\n        <AnyOf>\n            <AllOf>\n                <Match MatchId=\"org.openecomp.function.regex-match\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">com.Config_MS_vLoadBalancer.1.xml</AttributeValue>\n                    <AttributeDesignator Category=\"urn:oasis:names:tc:xacml:1.0:subject-category:access-subject\" AttributeId=\"PolicyName\" DataType=\"http://www.w3.org/2001/XMLSchema#string\" MustBePresent=\"false\"/>\n                </Match>\n            </AllOf>\n            <AllOf>\n                <Match MatchId=\"org.openecomp.function.regex-match\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">DCAE</AttributeValue>\n                    <AttributeDesignator Category=\"urn:oasis:names:tc:xacml:1.0:subject-category:access-subject\" AttributeId=\"ECOMPName\" DataType=\"http://www.w3.org/2001/XMLSchema#string\" MustBePresent=\"false\"/>\n                </Match>\n                <Match MatchId=\"org.openecomp.function.regex-match\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">SampleConfigName</AttributeValue>\n                    <AttributeDesignator Category=\"urn:oasis:names:tc:xacml:1.0:subject-category:access-subject\" AttributeId=\"ConfigName\" DataType=\"http://www.w3.org/2001/XMLSchema#string\" MustBePresent=\"false\"/>\n                </Match>\n                <Match MatchId=\"org.openecomp.function.regex-match\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">TcaMetrics-v1.0.0.5</AttributeValue>\n                    <AttributeDesignator Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" AttributeId=\"service\" DataType=\"http://www.w3.org/2001/XMLSchema#string\" MustBePresent=\"false\"/>\n                </Match>\n                <Match MatchId=\"org.openecomp.function.regex-match\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">/services/cdap-tca-hi-lo/instances/demo/configuration/metricsPerFunctionalRole/vLoadBalancer</AttributeValue>\n                    <AttributeDesignator Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" AttributeId=\"uuid\" DataType=\"http://www.w3.org/2001/XMLSchema#string\" MustBePresent=\"false\"/>\n                </Match>\n                <Match MatchId=\"org.openecomp.function.regex-match\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">SampleServiceLocation</AttributeValue>\n                    <AttributeDesignator Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" AttributeId=\"location\" DataType=\"http://www.w3.org/2001/XMLSchema#string\" MustBePresent=\"false\"/>\n                </Match>\n                <Match MatchId=\"org.openecomp.function.regex-match\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">SampleRiskType</AttributeValue>\n                    <AttributeDesignator Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" AttributeId=\"RiskType\" DataType=\"http://www.w3.org/2001/XMLSchema#string\" MustBePresent=\"false\"/>\n                </Match>\n                <Match MatchId=\"org.openecomp.function.regex-match\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">1</AttributeValue>\n                    <AttributeDesignator Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" AttributeId=\"RiskLevel\" DataType=\"http://www.w3.org/2001/XMLSchema#string\" MustBePresent=\"false\"/>\n                </Match>\n                <Match MatchId=\"org.openecomp.function.regex-match\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">False</AttributeValue>\n                    <AttributeDesignator Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" AttributeId=\"guard\" DataType=\"http://www.w3.org/2001/XMLSchema#string\" MustBePresent=\"false\"/>\n                </Match>\n                <Match MatchId=\"org.openecomp.function.regex-match\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">NA</AttributeValue>\n                    <AttributeDesignator Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" AttributeId=\"TTLDate\" DataType=\"http://www.w3.org/2001/XMLSchema#string\" MustBePresent=\"false\"/>\n                </Match>\n            </AllOf>\n        </AnyOf>\n    </Target>\n    <Rule RuleId=\"urn:com:xacml:rule:id:fca27dab-6c09-4541-8136-328abaec2656\" Effect=\"Permit\">\n        <Target>\n            <AnyOf>\n                <AllOf>\n                    <Match MatchId=\"urn:oasis:names:tc:xacml:3.0:function:string-equal-ignore-case\">\n                        <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">ACCESS</AttributeValue>\n                        <AttributeDesignator Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:action\" AttributeId=\"urn:oasis:names:tc:xacml:1.0:action:action-id\" DataType=\"http://www.w3.org/2001/XMLSchema#string\" MustBePresent=\"false\"/>\n                    </Match>\n                    <Match MatchId=\"urn:oasis:names:tc:xacml:3.0:function:string-equal-ignore-case\">\n                        <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">Config</AttributeValue>\n                        <AttributeDesignator Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" AttributeId=\"urn:oasis:names:tc:xacml:1.0:resource:resource-id\" DataType=\"http://www.w3.org/2001/XMLSchema#string\" MustBePresent=\"false\"/>\n                    </Match>\n                </AllOf>\n            </AnyOf>\n        </Target>\n        <AdviceExpressions>\n            <AdviceExpression AdviceId=\"MSID\" AppliesTo=\"Permit\">\n                <AttributeAssignmentExpression AttributeId=\"type\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">Configuration</AttributeValue>\n                </AttributeAssignmentExpression>\n                <AttributeAssignmentExpression AttributeId=\"URLID\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#anyURI\">$URL/Config/com.Config_MS_vLoadBalancer.1.json</AttributeValue>\n                </AttributeAssignmentExpression>\n                <AttributeAssignmentExpression AttributeId=\"PolicyName\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">com.Config_MS_vLoadBalancer.1.xml</AttributeValue>\n                </AttributeAssignmentExpression>\n                <AttributeAssignmentExpression AttributeId=\"VersionNumber\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">1</AttributeValue>\n                </AttributeAssignmentExpression>\n                <AttributeAssignmentExpression AttributeId=\"matching:ECOMPName\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">DCAE</AttributeValue>\n                </AttributeAssignmentExpression>\n                <AttributeAssignmentExpression AttributeId=\"matching:ConfigName\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">SampleConfigName</AttributeValue>\n                </AttributeAssignmentExpression>\n                <AttributeAssignmentExpression AttributeId=\"matching:service\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">TcaMetrics-v1.0.0.5</AttributeValue>\n                </AttributeAssignmentExpression>\n                <AttributeAssignmentExpression AttributeId=\"matching:uuid\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">/services/cdap-tca-hi-lo/instances/demo/configuration/metricsPerFunctionalRole/vLoadBalancer</AttributeValue>\n                </AttributeAssignmentExpression>\n                <AttributeAssignmentExpression AttributeId=\"matching:Location\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">SampleServiceLocation</AttributeValue>\n                </AttributeAssignmentExpression>\n                <AttributeAssignmentExpression AttributeId=\"Priority\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">1</AttributeValue>\n                </AttributeAssignmentExpression>\n                <AttributeAssignmentExpression AttributeId=\"RiskType\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">SampleRiskType</AttributeValue>\n                </AttributeAssignmentExpression>\n                <AttributeAssignmentExpression AttributeId=\"RiskLevel\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">1</AttributeValue>\n                </AttributeAssignmentExpression>\n                <AttributeAssignmentExpression AttributeId=\"guard\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">1</AttributeValue>\n                </AttributeAssignmentExpression>\n                <AttributeAssignmentExpression AttributeId=\"TTLDate\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">NA</AttributeValue>\n                </AttributeAssignmentExpression>\n            </AdviceExpression>\n        </AdviceExpressions>\n    </Rule>\n</Policy>\n','Config_MS_vLoadBalancer.1.xml',0,'com',1,NULL,3157);
+INSERT INTO `policyentity` VALUES (3156,'doACPolicyPut','2017-03-03 17:26:24',0,'Micro Service vFirewall Demo Policy@CreatedBy:@CreatedBy:@ModifiedBy:@ModifiedBy:','doACPolicyPut','2017-03-03 17:26:24','<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n<Policy xmlns=\"urn:oasis:names:tc:xacml:3.0:core:schema:wd-17\" PolicyId=\"urn:com:xacml:policy:id:34928b05-b0f6-4974-8458-f4d34a2a1764\" Version=\"1\" RuleCombiningAlgId=\"urn:oasis:names:tc:xacml:3.0:rule-combining-algorithm:permit-overrides\">\n    <Description>Micro Service vFirewall Demo Policy@CreatedBy:@CreatedBy:@ModifiedBy:@ModifiedBy:</Description>\n    <Target>\n        <AnyOf>\n            <AllOf>\n                <Match MatchId=\"org.onap.function.regex-match\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">com.Config_MS_vFirewall.1.xml</AttributeValue>\n                    <AttributeDesignator Category=\"urn:oasis:names:tc:xacml:1.0:subject-category:access-subject\" AttributeId=\"PolicyName\" DataType=\"http://www.w3.org/2001/XMLSchema#string\" MustBePresent=\"false\"/>\n                </Match>\n            </AllOf>\n            <AllOf>\n                <Match MatchId=\"org.onap.function.regex-match\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">DCAE</AttributeValue>\n                    <AttributeDesignator Category=\"urn:oasis:names:tc:xacml:1.0:subject-category:access-subject\" AttributeId=\"ONAPName\" DataType=\"http://www.w3.org/2001/XMLSchema#string\" MustBePresent=\"false\"/>\n                </Match>\n                <Match MatchId=\"org.onap.function.regex-match\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">SampleConfigName</AttributeValue>\n                    <AttributeDesignator Category=\"urn:oasis:names:tc:xacml:1.0:subject-category:access-subject\" AttributeId=\"ConfigName\" DataType=\"http://www.w3.org/2001/XMLSchema#string\" MustBePresent=\"false\"/>\n                </Match>\n                <Match MatchId=\"org.onap.function.regex-match\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">TcaMetrics-v1.0.0.5</AttributeValue>\n                    <AttributeDesignator Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" AttributeId=\"service\" DataType=\"http://www.w3.org/2001/XMLSchema#string\" MustBePresent=\"false\"/>\n                </Match>\n                <Match MatchId=\"org.onap.function.regex-match\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">/services/cdap-tca-hi-lo/instances/demo/configuration/metricsPerFunctionalRole/vFirewall</AttributeValue>\n                    <AttributeDesignator Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" AttributeId=\"uuid\" DataType=\"http://www.w3.org/2001/XMLSchema#string\" MustBePresent=\"false\"/>\n                </Match>\n                <Match MatchId=\"org.onap.function.regex-match\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">SampleServiceLocation</AttributeValue>\n                    <AttributeDesignator Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" AttributeId=\"location\" DataType=\"http://www.w3.org/2001/XMLSchema#string\" MustBePresent=\"false\"/>\n                </Match>\n                <Match MatchId=\"org.onap.function.regex-match\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">SampleRiskType</AttributeValue>\n                    <AttributeDesignator Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" AttributeId=\"RiskType\" DataType=\"http://www.w3.org/2001/XMLSchema#string\" MustBePresent=\"false\"/>\n                </Match>\n                <Match MatchId=\"org.onap.function.regex-match\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">1</AttributeValue>\n                    <AttributeDesignator Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" AttributeId=\"RiskLevel\" DataType=\"http://www.w3.org/2001/XMLSchema#string\" MustBePresent=\"false\"/>\n                </Match>\n                <Match MatchId=\"org.onap.function.regex-match\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">False</AttributeValue>\n                    <AttributeDesignator Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" AttributeId=\"guard\" DataType=\"http://www.w3.org/2001/XMLSchema#string\" MustBePresent=\"false\"/>\n                </Match>\n                <Match MatchId=\"org.onap.function.regex-match\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">NA</AttributeValue>\n                    <AttributeDesignator Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" AttributeId=\"TTLDate\" DataType=\"http://www.w3.org/2001/XMLSchema#string\" MustBePresent=\"false\"/>\n                </Match>\n            </AllOf>\n        </AnyOf>\n    </Target>\n    <Rule RuleId=\"urn:com:xacml:rule:id:063161de-0534-4989-bd01-42f784daf21e\" Effect=\"Permit\">\n        <Target>\n            <AnyOf>\n                <AllOf>\n                    <Match MatchId=\"urn:oasis:names:tc:xacml:3.0:function:string-equal-ignore-case\">\n                        <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">ACCESS</AttributeValue>\n                        <AttributeDesignator Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:action\" AttributeId=\"urn:oasis:names:tc:xacml:1.0:action:action-id\" DataType=\"http://www.w3.org/2001/XMLSchema#string\" MustBePresent=\"false\"/>\n                    </Match>\n                    <Match MatchId=\"urn:oasis:names:tc:xacml:3.0:function:string-equal-ignore-case\">\n                        <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">Config</AttributeValue>\n                        <AttributeDesignator Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" AttributeId=\"urn:oasis:names:tc:xacml:1.0:resource:resource-id\" DataType=\"http://www.w3.org/2001/XMLSchema#string\" MustBePresent=\"false\"/>\n                    </Match>\n                </AllOf>\n            </AnyOf>\n        </Target>\n        <AdviceExpressions>\n            <AdviceExpression AdviceId=\"MSID\" AppliesTo=\"Permit\">\n                <AttributeAssignmentExpression AttributeId=\"type\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">Configuration</AttributeValue>\n                </AttributeAssignmentExpression>\n                <AttributeAssignmentExpression AttributeId=\"URLID\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#anyURI\">$URL/Config/com.Config_MS_vFirewall.1.json</AttributeValue>\n                </AttributeAssignmentExpression>\n                <AttributeAssignmentExpression AttributeId=\"PolicyName\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">com.Config_MS_vFirewall.1.xml</AttributeValue>\n                </AttributeAssignmentExpression>\n                <AttributeAssignmentExpression AttributeId=\"VersionNumber\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">1</AttributeValue>\n                </AttributeAssignmentExpression>\n                <AttributeAssignmentExpression AttributeId=\"matching:ONAPName\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">DCAE</AttributeValue>\n                </AttributeAssignmentExpression>\n                <AttributeAssignmentExpression AttributeId=\"matching:ConfigName\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">SampleConfigName</AttributeValue>\n                </AttributeAssignmentExpression>\n                <AttributeAssignmentExpression AttributeId=\"matching:service\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">TcaMetrics-v1.0.0.5</AttributeValue>\n                </AttributeAssignmentExpression>\n                <AttributeAssignmentExpression AttributeId=\"matching:uuid\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">/services/cdap-tca-hi-lo/instances/demo/configuration/metricsPerFunctionalRole/vFirewall</AttributeValue>\n                </AttributeAssignmentExpression>\n                <AttributeAssignmentExpression AttributeId=\"matching:Location\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">SampleServiceLocation</AttributeValue>\n                </AttributeAssignmentExpression>\n                <AttributeAssignmentExpression AttributeId=\"Priority\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">1</AttributeValue>\n                </AttributeAssignmentExpression>\n                <AttributeAssignmentExpression AttributeId=\"RiskType\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">SampleRiskType</AttributeValue>\n                </AttributeAssignmentExpression>\n                <AttributeAssignmentExpression AttributeId=\"RiskLevel\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">1</AttributeValue>\n                </AttributeAssignmentExpression>\n                <AttributeAssignmentExpression AttributeId=\"guard\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">1</AttributeValue>\n                </AttributeAssignmentExpression>\n                <AttributeAssignmentExpression AttributeId=\"TTLDate\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">NA</AttributeValue>\n                </AttributeAssignmentExpression>\n            </AdviceExpression>\n        </AdviceExpressions>\n    </Rule>\n</Policy>\n','Config_MS_vFirewall.1.xml',0,'com',1,NULL,3155),(3158,'doACPolicyPut','2017-03-03 17:28:10',0,'Micro Service vLoadBalancer Demo Policy@CreatedBy:@CreatedBy:@ModifiedBy:@ModifiedBy:','doACPolicyPut','2017-03-03 17:28:10','<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n<Policy xmlns=\"urn:oasis:names:tc:xacml:3.0:core:schema:wd-17\" PolicyId=\"urn:com:xacml:policy:id:c220802a-70ee-4ca8-9f1e-f8a515650381\" Version=\"1\" RuleCombiningAlgId=\"urn:oasis:names:tc:xacml:3.0:rule-combining-algorithm:permit-overrides\">\n    <Description>Micro Service vLoadBalancer Demo Policy@CreatedBy:@CreatedBy:@ModifiedBy:@ModifiedBy:</Description>\n    <Target>\n        <AnyOf>\n            <AllOf>\n                <Match MatchId=\"org.onap.function.regex-match\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">com.Config_MS_vLoadBalancer.1.xml</AttributeValue>\n                    <AttributeDesignator Category=\"urn:oasis:names:tc:xacml:1.0:subject-category:access-subject\" AttributeId=\"PolicyName\" DataType=\"http://www.w3.org/2001/XMLSchema#string\" MustBePresent=\"false\"/>\n                </Match>\n            </AllOf>\n            <AllOf>\n                <Match MatchId=\"org.onap.function.regex-match\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">DCAE</AttributeValue>\n                    <AttributeDesignator Category=\"urn:oasis:names:tc:xacml:1.0:subject-category:access-subject\" AttributeId=\"ONAPName\" DataType=\"http://www.w3.org/2001/XMLSchema#string\" MustBePresent=\"false\"/>\n                </Match>\n                <Match MatchId=\"org.onap.function.regex-match\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">SampleConfigName</AttributeValue>\n                    <AttributeDesignator Category=\"urn:oasis:names:tc:xacml:1.0:subject-category:access-subject\" AttributeId=\"ConfigName\" DataType=\"http://www.w3.org/2001/XMLSchema#string\" MustBePresent=\"false\"/>\n                </Match>\n                <Match MatchId=\"org.onap.function.regex-match\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">TcaMetrics-v1.0.0.5</AttributeValue>\n                    <AttributeDesignator Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" AttributeId=\"service\" DataType=\"http://www.w3.org/2001/XMLSchema#string\" MustBePresent=\"false\"/>\n                </Match>\n                <Match MatchId=\"org.onap.function.regex-match\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">/services/cdap-tca-hi-lo/instances/demo/configuration/metricsPerFunctionalRole/vLoadBalancer</AttributeValue>\n                    <AttributeDesignator Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" AttributeId=\"uuid\" DataType=\"http://www.w3.org/2001/XMLSchema#string\" MustBePresent=\"false\"/>\n                </Match>\n                <Match MatchId=\"org.onap.function.regex-match\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">SampleServiceLocation</AttributeValue>\n                    <AttributeDesignator Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" AttributeId=\"location\" DataType=\"http://www.w3.org/2001/XMLSchema#string\" MustBePresent=\"false\"/>\n                </Match>\n                <Match MatchId=\"org.onap.function.regex-match\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">SampleRiskType</AttributeValue>\n                    <AttributeDesignator Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" AttributeId=\"RiskType\" DataType=\"http://www.w3.org/2001/XMLSchema#string\" MustBePresent=\"false\"/>\n                </Match>\n                <Match MatchId=\"org.onap.function.regex-match\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">1</AttributeValue>\n                    <AttributeDesignator Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" AttributeId=\"RiskLevel\" DataType=\"http://www.w3.org/2001/XMLSchema#string\" MustBePresent=\"false\"/>\n                </Match>\n                <Match MatchId=\"org.onap.function.regex-match\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">False</AttributeValue>\n                    <AttributeDesignator Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" AttributeId=\"guard\" DataType=\"http://www.w3.org/2001/XMLSchema#string\" MustBePresent=\"false\"/>\n                </Match>\n                <Match MatchId=\"org.onap.function.regex-match\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">NA</AttributeValue>\n                    <AttributeDesignator Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" AttributeId=\"TTLDate\" DataType=\"http://www.w3.org/2001/XMLSchema#string\" MustBePresent=\"false\"/>\n                </Match>\n            </AllOf>\n        </AnyOf>\n    </Target>\n    <Rule RuleId=\"urn:com:xacml:rule:id:fca27dab-6c09-4541-8136-328abaec2656\" Effect=\"Permit\">\n        <Target>\n            <AnyOf>\n                <AllOf>\n                    <Match MatchId=\"urn:oasis:names:tc:xacml:3.0:function:string-equal-ignore-case\">\n                        <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">ACCESS</AttributeValue>\n                        <AttributeDesignator Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:action\" AttributeId=\"urn:oasis:names:tc:xacml:1.0:action:action-id\" DataType=\"http://www.w3.org/2001/XMLSchema#string\" MustBePresent=\"false\"/>\n                    </Match>\n                    <Match MatchId=\"urn:oasis:names:tc:xacml:3.0:function:string-equal-ignore-case\">\n                        <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">Config</AttributeValue>\n                        <AttributeDesignator Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" AttributeId=\"urn:oasis:names:tc:xacml:1.0:resource:resource-id\" DataType=\"http://www.w3.org/2001/XMLSchema#string\" MustBePresent=\"false\"/>\n                    </Match>\n                </AllOf>\n            </AnyOf>\n        </Target>\n        <AdviceExpressions>\n            <AdviceExpression AdviceId=\"MSID\" AppliesTo=\"Permit\">\n                <AttributeAssignmentExpression AttributeId=\"type\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">Configuration</AttributeValue>\n                </AttributeAssignmentExpression>\n                <AttributeAssignmentExpression AttributeId=\"URLID\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#anyURI\">$URL/Config/com.Config_MS_vLoadBalancer.1.json</AttributeValue>\n                </AttributeAssignmentExpression>\n                <AttributeAssignmentExpression AttributeId=\"PolicyName\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">com.Config_MS_vLoadBalancer.1.xml</AttributeValue>\n                </AttributeAssignmentExpression>\n                <AttributeAssignmentExpression AttributeId=\"VersionNumber\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">1</AttributeValue>\n                </AttributeAssignmentExpression>\n                <AttributeAssignmentExpression AttributeId=\"matching:ONAPName\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">DCAE</AttributeValue>\n                </AttributeAssignmentExpression>\n                <AttributeAssignmentExpression AttributeId=\"matching:ConfigName\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">SampleConfigName</AttributeValue>\n                </AttributeAssignmentExpression>\n                <AttributeAssignmentExpression AttributeId=\"matching:service\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">TcaMetrics-v1.0.0.5</AttributeValue>\n                </AttributeAssignmentExpression>\n                <AttributeAssignmentExpression AttributeId=\"matching:uuid\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">/services/cdap-tca-hi-lo/instances/demo/configuration/metricsPerFunctionalRole/vLoadBalancer</AttributeValue>\n                </AttributeAssignmentExpression>\n                <AttributeAssignmentExpression AttributeId=\"matching:Location\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">SampleServiceLocation</AttributeValue>\n                </AttributeAssignmentExpression>\n                <AttributeAssignmentExpression AttributeId=\"Priority\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">1</AttributeValue>\n                </AttributeAssignmentExpression>\n                <AttributeAssignmentExpression AttributeId=\"RiskType\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">SampleRiskType</AttributeValue>\n                </AttributeAssignmentExpression>\n                <AttributeAssignmentExpression AttributeId=\"RiskLevel\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">1</AttributeValue>\n                </AttributeAssignmentExpression>\n                <AttributeAssignmentExpression AttributeId=\"guard\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">1</AttributeValue>\n                </AttributeAssignmentExpression>\n                <AttributeAssignmentExpression AttributeId=\"TTLDate\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">NA</AttributeValue>\n                </AttributeAssignmentExpression>\n            </AdviceExpression>\n        </AdviceExpressions>\n    </Rule>\n</Policy>\n','Config_MS_vLoadBalancer.1.xml',0,'com',1,NULL,3157);
 
 INSERT INTO `configurationdataentity` VALUES (3155,'{\"service\":\"TcaMetrics\",\"location\":\"SampleServiceLocation\",\"uuid\":\"/services/cdap-tca-hi-lo/instances/demo/configuration/metricsPerFunctionalRole/vFirewall\",\"policyName\":\"vFirewall\",\"description\":\"Micro Service vFirewall Demo Policy@CreatedBy:@CreatedBy:@ModifiedBy:@ModifiedBy:\",\"configName\":\"SampleConfigName\",\"templateVersion\":\"OpenSource.version.1\",\"version\":\"1.0.0.5\",\"priority\":\"1\",\"policyScope\":\"resource=SampleResource,service=SampleService,type=SampleType,closedLoopControlName=SampleClosedLoop\",\"content\":{\"thresholds\":[{\"severity\":\"MAJOR\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicUsageArray[*].packetsIn\",\"thresholdValue\":\"300\",\"closedLoopControlName\":\"CL-FRWL-LOW-TRAFFIC-SIG-d925ed73-8231-4d02-9545-db4e101f88f8\",\"version\":\"1.0.2\",\"direction\":\"LESS_OR_EQUAL\"},{\"severity\":\"CRITICAL\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicUsageArray[*].packetsIn\",\"thresholdValue\":\"700\",\"closedLoopControlName\":\"CL-FRWL-LOW-TRAFFIC-SIG-d925ed73-8231-4d02-9545-db4e101f88f8\",\"version\":\"1.0.2\",\"direction\":\"GREATER_OR_EQUAL\"}],\"functionalRole\":\"vFirewall\",\"name\":\"0\"}}\r\n','JSON','com.Config_MS_vFirewall.1.json','doACPolicyPut','2017-03-03 17:26:24',0,'','doACPolicyPut','2017-03-03 17:26:24',1),(3157,'{\"service\":\"TcaMetrics\",\"location\":\"SampleServiceLocation\",\"uuid\":\"/services/cdap-tca-hi-lo/instances/demo/configuration/metricsPerFunctionalRole/vLoadBalancer\",\"policyName\":\"vLoadBalancer\",\"description\":\"Micro Service vLoadBalancer Demo Policy@CreatedBy:@CreatedBy:@ModifiedBy:@ModifiedBy:\",\"configName\":\"SampleConfigName\",\"templateVersion\":\"OpenSource.version.1\",\"version\":\"1.0.0.5\",\"priority\":\"1\",\"policyScope\":\"resource=SampleResource,service=SampleService,type=SampleType,closedLoopControlName=SampleClosedLoop\",\"content\":{\"thresholds\":[{\"severity\":\"MAJOR\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicUsageArray[*].packetsIn\",\"thresholdValue\":\"200\",\"closedLoopControlName\":\"CL-DNS-LOW-TRAFFIC-SIG-d925ed73-8231-4d02-9545-db4e101f88f8\",\"version\":\"1.0.2\",\"direction\":\"GREATER_OR_EQUAL\"}],\"functionalRole\":\"vLoadBalancer\",\"name\":\"0\"}}\r\n','JSON','com.Config_MS_vLoadBalancer.1.json','doACPolicyPut','2017-03-03 17:28:10',0,'','doACPolicyPut','2017-03-03 17:28:10',1);
 
-INSERT INTO `configurationdataentity` VALUES (3201,'/* Autogenerated Code Please Don\'t change/remove this comment section. This is for the UI purpose. \n	 <$%BRMSParamTemplate=ControlLoopDemo__closedLoopControlName%$> \n */ \n\r\n\r\n/*-\n * ============LICENSE_START=======================================================\n * archetype-closed-loop-demo-rules\n * ================================================================================\n * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.\n * ================================================================================\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n * \n *      http://www.apache.org/licenses/LICENSE-2.0\n * \n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n * ============LICENSE_END=========================================================\n */\n\npackage org.onap.policy.controlloop;\n\nimport java.util.List;\nimport java.util.LinkedList;\nimport java.util.Map;\nimport java.util.HashMap;\nimport java.util.UUID;\n\nimport org.onap.policy.controlloop.VirtualControlLoopEvent;\nimport org.onap.policy.controlloop.ControlLoopEventStatus;\nimport org.onap.policy.controlloop.VirtualControlLoopNotification;\nimport org.onap.policy.controlloop.ControlLoopNotificationType;\nimport org.onap.policy.controlloop.ControlLoopOperation;\nimport org.onap.policy.controlloop.ControlLoopOperationWrapper;\nimport org.onap.policy.template.demo.ControlLoopException;\n\nimport org.onap.policy.aai.AAINQF199.AAINQF199CloudRegion;\nimport org.onap.policy.aai.AAINQF199.AAINQF199ExtraProperties;\nimport org.onap.policy.aai.AAINQF199.AAINQF199ExtraProperty;\nimport org.onap.policy.aai.AAINQF199.AAINQF199GenericVNF;\nimport org.onap.policy.aai.AAINQF199.AAINQF199InstanceFilters;\nimport org.onap.policy.aai.AAINQF199.AAINQF199InventoryResponseItem;\nimport org.onap.policy.aai.AAINQF199.AAINQF199InventoryResponseItems;\nimport org.onap.policy.aai.AAINQF199.AAINQF199Manager;\nimport org.onap.policy.aai.AAINQF199.AAINQF199NamedQuery;\nimport org.onap.policy.aai.AAINQF199.AAINQF199QueryParameters;\nimport org.onap.policy.aai.AAINQF199.AAINQF199Request;\nimport org.onap.policy.aai.AAINQF199.AAINQF199RequestWrapper;\nimport org.onap.policy.aai.AAINQF199.AAINQF199Response;\nimport org.onap.policy.aai.AAINQF199.AAINQF199ResponseWrapper;\nimport org.onap.policy.aai.AAINQF199.AAINQF199ServiceInstance;\nimport org.onap.policy.aai.AAINQF199.AAINQF199Tenant;\nimport org.onap.policy.aai.AAINQF199.AAINQF199VfModule;\nimport org.onap.policy.aai.AAINQF199.AAINQF199VServer;\nimport org.onap.policy.aai.util.Serialization;\n\nimport org.onap.policy.appc.CommonHeader;\nimport org.onap.policy.appc.Request;\nimport org.onap.policy.appc.Response;\nimport org.onap.policy.appc.ResponseCode;\nimport org.onap.policy.appc.ResponseStatus;\nimport org.onap.policy.appc.ResponseValue;\n\nimport org.onap.policy.template.demo.EventManager;\nimport org.onap.policy.vnf.trafficgenerator.PGRequest;\nimport org.onap.policy.vnf.trafficgenerator.PGStream;\nimport org.onap.policy.vnf.trafficgenerator.PGStreams;\n\nimport org.onap.policy.mso.MSOManager;\nimport org.onap.policy.mso.MSORequest;\nimport org.onap.policy.mso.MSORequestStatus;\nimport org.onap.policy.mso.MSORequestDetails;\nimport org.onap.policy.mso.MSOModelInfo;\nimport org.onap.policy.mso.MSOCloudConfiguration;\nimport org.onap.policy.mso.MSORequestInfo;\nimport org.onap.policy.mso.MSORequestParameters;\nimport org.onap.policy.mso.MSORelatedInstanceListElement;\nimport org.onap.policy.mso.MSORelatedInstance;\nimport org.onap.policy.mso.MSOResponse;\n\nimport org.openecomp.policy.drools.system.PolicyEngine;\n\n//\n// These parameters are required to build the runtime policy\n//\ndeclare Params\n    closedLoopControlName : String\n    actor : String\n    aaiURL : String\n    aaiUsername : String\n    aaiPassword : String\n    msoURL : String\n    msoUsername : String\n    msoPassword : String\n    aaiNamedQueryUUID : String\n    aaiPatternMatch : int \n    notificationTopic : String\n    appcTopic : String\nend\n\n/*\n*\n* Called once and only once to insert the parameters into working memory for this Closed Loop policy.\n* (Comment SETUP rule out for the first ECOMP opensource release since policy BRMS_GW already puts a Params fact in there)\n*\n*\n*rule \"BRMSParamvFWDemoPolicy.SETUP\"\n*	when\n*	then\n*		System.out.println(\"rule SETUP is triggered.\");\n*		Params params = new Params();\n*		params.setClosedLoopControlName(\"CL-FRWL-LOW-TRAFFIC-SIG-d925ed73-8231-4d02-9545-db4e101f88f8\");\n*		params.setActor(\"APPC\");\n*		params.setAaiURL(\"null\");\n*		params.setAaiUsername(\"null\");\n*		params.setAaiPassword(\"null\");\n*		params.setMsoURL(\"null\");\n*		params.setMsoUsername(\"null\");\n*		params.setMsoPassword(\"null\");\n*		params.setAaiNamedQueryUUID(\"null\");\n*		params.setAaiPatternMatch(1);\n*		params.setNotificationTopic(\"POLICY-CL-MGT\");\n*		params.setAppcTopic(\"APPC-CL\");\n*		//\n*		// This stays in memory as long as the rule is alive and running\n*		//\n*		insert(params);\n*end\n*/\n/*\n*\n* This rule responds to DCAE Events\n*\n*/\nrule \"BRMSParamvFWDemoPolicy.EVENT\"\n	when\n        $params : Params( getClosedLoopControlName() == \"CL-FRWL-LOW-TRAFFIC-SIG-d925ed73-8231-4d02-9545-db4e101f88f8\" )\n        $event : VirtualControlLoopEvent( closedLoopControlName == $params.getClosedLoopControlName(), closedLoopEventStatus == ControlLoopEventStatus.ONSET )\n        not ( EventManager( closedLoopControlName == $event.closedLoopControlName ))\n	then\n		System.out.println(\"rule EVENT is triggered.\");\n		try {\n			// \n			// Check the requestID in the event to make sure it is not null before we create the EventManager. \n			// The EventManager will do extra syntax checking as well check if the closed loop is disabled/\n			//\n			if ($event.requestID == null) {\n				VirtualControlLoopNotification notification = new VirtualControlLoopNotification($event);\n				notification.notification = ControlLoopNotificationType.REJECTED;\n				notification.from = \"policy\";\n				notification.message = \"Missing requestID from DCAE event\";\n				notification.policyName = drools.getRule().getName();\n				notification.policyScope = \"com\";\n				notification.policyVersion = \"1\";\n				//\n				// Let interested parties know\n				//\n				try {\n					System.out.println(Serialization.gsonPretty.toJson(notification));\n					PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n				} catch (Exception e) {\n					e.printStackTrace();\n					System.out.println(\"Can\'t deliver notification: \" + notification);\n				}\n				//\n				// Retract it from memory\n				//\n				retract($event);\n				System.out.println(\"Event with requestID=null has been retracted.\");\n			} else {\n				//\n				// Create an EventManager\n				//\n				EventManager manager = new EventManager($params.getClosedLoopControlName(), $event.requestID, $event.target);\n				//\n				// Determine if EventManager can actively process the event (i.e. syntax)\n				//\n				VirtualControlLoopNotification notification = manager.activate($event);\n				notification.from = \"policy\"; \n				notification.policyName = drools.getRule().getName();\n				notification.policyScope = \"com\";\n				notification.policyVersion = \"1\";\n				//\n				// Are we actively pursuing this event?\n				//\n				if (notification.notification == ControlLoopNotificationType.ACTIVE) {\n					//\n					// Insert Event Manager into memory, this will now kick off processing.\n					//\n					insert(manager);\n					//\n					// Let interested parties know\n					//\n					try {\n						System.out.println(Serialization.gsonPretty.toJson(notification));\n						PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n					} catch (Exception e) {\n						e.printStackTrace();\n						System.out.println(\"Can\'t deliver notification: \" + notification);\n					}		\n				} else {\n					//\n					// Let interested parties know\n					//\n					try {\n						System.out.println(Serialization.gsonPretty.toJson(notification));\n						PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n					} catch (Exception e) {\n						e.printStackTrace();\n						System.out.println(\"Can\'t deliver notification: \" + notification);\n					}\n					//\n					// Retract it from memory\n					//\n					retract($event);\n				}\n				//\n				// Now that the manager is inserted into Drools working memory, we\'ll wait for\n				// another rule to fire in order to continue processing. This way we can also\n				// then screen for additional ONSET and ABATED events for this same RequestIDs \n				// and for different RequestIDs but with the same closedLoopControlName and target.\n				//\n			}\n		//\n		} catch (Exception e) {\n			e.printStackTrace();\n			VirtualControlLoopNotification notification = new VirtualControlLoopNotification($event);\n			notification.notification = ControlLoopNotificationType.REJECTED;\n			notification.message = \"Exception occurred \" + e.getMessage();\n			notification.policyName = drools.getRule().getName();\n			notification.policyScope = \"com\";\n			notification.policyVersion = \"1\";\n			//\n			//\n			//\n			try {\n				System.out.println(Serialization.gsonPretty.toJson(notification));\n				PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n			} catch (Exception e1) {\n				System.out.println(\"Can\'t deliver notification: \" + notification);\n				e1.printStackTrace();\n			}\n			//\n			// Retract the event\n			//\n			retract($event);\n		}\nend\n\n/*\n*\n* This rule happens when we got a valid ONSET, closed loop is enabled and an Event Manager\n* is created. We can start the operations for this closed loop.\n*\n*/\nrule \"BRMSParamvFWDemoPolicy.EVENT.MANAGER\"\n	when\n		$params : Params( getClosedLoopControlName() == \"CL-FRWL-LOW-TRAFFIC-SIG-d925ed73-8231-4d02-9545-db4e101f88f8\" )\n		$event : VirtualControlLoopEvent( closedLoopControlName == $params.getClosedLoopControlName(), closedLoopEventStatus == ControlLoopEventStatus.ONSET )\n		$manager : EventManager( closedLoopControlName == $event.closedLoopControlName, controlLoopResult == null)\n	then\n		System.out.println(\"rule EVENT.MANAGER is triggered.\");\n		//\n		// Check which event this is.\n		//\n		EventManager.NEW_EVENT_STATUS eventStatus = $manager.onNewEvent($event);\n		//\n		// We only want the initial ONSET event in memory,\n		// all the other events need to be retracted to support\n		// cleanup and avoid the other rules being fired for this event.\n		//\n		if (eventStatus != EventManager.NEW_EVENT_STATUS.FIRST_ONSET) {\n			System.out.println(\"Retracting \"+eventStatus+\" Event.\");\n			retract($event);\n			return;\n		}\n		//\n		// Now the event in memory is first onset event\n		//\n		try {\n			//\n			// Pull the known AAI field from the Event\n			//\n			// generic-vnf is needed for vFirewall case\n			// vserver-name is needed for vLoadBalancer case\n			//\n			String genericVNF = $event.AAI.get(\"generic-vnf.vnf-id\");\n			String vserver = $event.AAI.get(\"vserver.vserver-name\");\n			//\n			// Check if we are implementing a simple pattern match.\n			//\n			if ($params.getAaiPatternMatch() == 1) {\n				//\n				// Yes\n				//\n				//Basic naming characteristics:\n				//VF Name (9 char)+VM name (13 char total)+VFC (19 char total)\n				//Example: \n				//VF Name (9 characters):    cscf0001v\n				//VM Name(13 characters): cscf0001vm001\n				//VFC name(19 characters): cscf0001vm001cfg001\n				//\n				// zdfw1fwl01fwl02 or zdfw1fwl01fwl01  \n				// replaced with\n				// zdfw1fwl01pgn02 or zdfw1fwl01pgn01\n				//\n				int index = genericVNF.lastIndexOf(\"fwl\");\n				if (index == -1) {\n					System.err.println(\"The generic-vnf.vnf-id from DCAE Event is not valid.\");\n				} else {\n					genericVNF = genericVNF.substring(0, index) + \"pgn\" + genericVNF.substring(index+\"fwl\".length());\n				}\n				//\n				// Construct an APPC request\n				//\n				ControlLoopOperation operation = new ControlLoopOperation();\n				operation.actor = $params.getActor();\n				operation.operation = \"ModifyConfig\";\n				operation.target = $event.target;\n				//\n				// Create operationWrapper\n				//\n				ControlLoopOperationWrapper operationWrapper = new ControlLoopOperationWrapper($event.requestID, operation);\n				//\n				// insert operationWrapper into memory\n				//\n				insert(operationWrapper);\n				//\n				Request request = new Request();\n				request.CommonHeader = new CommonHeader();\n				request.CommonHeader.RequestID = $event.requestID;\n				request.Action = operation.operation;\n				request.Payload = new HashMap<String, Object>();\n				//\n				// Fill in the payload\n				//\n				request.Payload.put(\"generic-vnf.vnf-id\", genericVNF);\n				//\n				PGRequest pgRequest = new PGRequest();\n				pgRequest.pgStreams = new PGStreams();\n				\n				PGStream pgStream;\n				for(int i = 0; i < 5; i++){\n					pgStream = new PGStream();\n					pgStream.streamId = \"fw_udp\"+(i+1);\n					pgStream.isEnabled = \"true\";\n					pgRequest.pgStreams.pgStream.add(pgStream);\n				}\n				request.Payload.put(\"pg-streams\", pgRequest.pgStreams);\n				\n				if (request != null) {\n					//\n					// Insert request into memory\n					//\n					insert(request);\n					//\n					// Tell interested parties we are performing this Operation\n					//\n					VirtualControlLoopNotification notification = new VirtualControlLoopNotification($event);\n					notification.notification = ControlLoopNotificationType.OPERATION;\n					// message and history ??\n					notification.from = \"policy\";\n					notification.policyName = drools.getRule().getName();\n					notification.policyScope = \"com\";\n					notification.policyVersion = \"1\";\n					try {\n						System.out.println(Serialization.gsonPretty.toJson(notification));\n						PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n					} catch (Exception e) {\n						System.out.println(\"Can\'t deliver notification: \" + notification);\n						e.printStackTrace();\n					}\n					//\n					// Now send the operation request\n					//\n					if (request instanceof Request) {\n						try {\n							System.out.println(\"APPC request sent:\");\n							System.out.println(Serialization.gsonPretty.toJson(request));\n							PolicyEngine.manager.deliver($params.getAppcTopic(), request);\n						} catch (Exception e) {\n							e.printStackTrace();\n							System.out.println(\"Can\'t deliver request: \" + request);\n						}\n					}\n				} else {\n					//\n					// what happens if it is null\n					//\n				}\n				//\n			} else {\n				//\n				// create AAI named-query request with UUID started with \"F199\"\n				//\n				AAINQF199Request aainqf199request = new AAINQF199Request();\n				AAINQF199QueryParameters aainqf199queryparam = new AAINQF199QueryParameters();\n				AAINQF199NamedQuery aainqf199namedquery = new AAINQF199NamedQuery();\n				AAINQF199InstanceFilters aainqf199instancefilter = new AAINQF199InstanceFilters();\n				//\n				// queryParameters\n				//\n				aainqf199namedquery.namedQueryUUID = UUID.fromString($params.getAaiNamedQueryUUID()); \n				aainqf199queryparam.namedQuery = aainqf199namedquery;\n				aainqf199request.queryParameters = aainqf199queryparam;\n				//\n				// instanceFilters\n				//\n				Map aainqf199instancefiltermap = new HashMap();\n				Map aainqf199instancefiltermapitem = new HashMap();\n				aainqf199instancefiltermapitem.put(\"vserver-name\", vserver); \n				aainqf199instancefiltermap.put(\"vserver\", aainqf199instancefiltermapitem);\n				aainqf199instancefilter.instanceFilter.add(aainqf199instancefiltermap);\n				aainqf199request.instanceFilters = aainqf199instancefilter;\n				//\n				// print aainqf199request for debug\n				//\n				System.out.println(\"AAI Request sent:\");\n				System.out.println(Serialization.gsonPretty.toJson(aainqf199request));\n				//\n				// Create AAINQF199RequestWrapper\n				//\n				AAINQF199RequestWrapper aainqf199RequestWrapper = new AAINQF199RequestWrapper($event.requestID, aainqf199request);\n				//\n				// insert aainqf199request into memory\n				//\n				insert(aainqf199RequestWrapper);\n			}\n			//\n		} catch (Exception e) {\n		 e.printStackTrace();\n		}\nend\n\n/*\n*\n* This rule happens when we got a valid ONSET, closed loop is enabled, an Event Manager\n* is created, AAI Manager and AAI Request are ready in memory. We can start sending query to AAI and then wait for response.\n*\n*/\nrule \"BRMSParamvFWDemoPolicy.EVENT.MANAGER.AAINQF199REQUEST\"\n	when\n		$params : Params( getClosedLoopControlName() == \"CL-FRWL-LOW-TRAFFIC-SIG-d925ed73-8231-4d02-9545-db4e101f88f8\" )\n		$event : VirtualControlLoopEvent( closedLoopControlName == $params.getClosedLoopControlName(), closedLoopEventStatus == ControlLoopEventStatus.ONSET )\n		$manager : EventManager( closedLoopControlName == $event.closedLoopControlName )\n		$aainqf199RequestWrapper : AAINQF199RequestWrapper(requestID == $event.requestID)\n	then\n		System.out.println(\"rule EVENT.MANAGER.AAINQF199REQUEST is triggered.\");\n		//\n		// send the request\n		//\n		AAINQF199Response aainqf199response = AAINQF199Manager.postQuery($params.getAaiURL(), $params.getAaiUsername(), $params.getAaiPassword(),\n													   $aainqf199RequestWrapper.aainqf199request, $event.requestID);\n		//\n		// Check AAI response\n		//\n		if (aainqf199response == null) {\n			System.err.println(\"Failed to get AAI response\");\n			//\n			// Fail and retract everything\n			//\n			retract($event);\n			retract($manager);\n			retract($aainqf199RequestWrapper);\n		} else {\n			//\n			// Create AAINQF199ResponseWrapper\n			//\n			AAINQF199ResponseWrapper aainqf199ResponseWrapper = new AAINQF199ResponseWrapper($event.requestID, aainqf199response);\n			//\n			// insert aainqf199ResponseWrapper to memeory\n			//\n			insert(aainqf199ResponseWrapper);\n		}\nend\n\n/*\n*\n* This rule happens when we got a valid AAI response. We can start sending request to APPC or MSO now.\n*\n*/\nrule \"BRMSParamvFWDemoPolicy.EVENT.MANAGER.AAINQF199RESPONSE\"\n	when \n		$params : Params( getClosedLoopControlName() == \"CL-FRWL-LOW-TRAFFIC-SIG-d925ed73-8231-4d02-9545-db4e101f88f8\" )\n		$event : VirtualControlLoopEvent( closedLoopControlName == $params.getClosedLoopControlName(), closedLoopEventStatus == ControlLoopEventStatus.ONSET )\n		$manager : EventManager( closedLoopControlName == $event.closedLoopControlName )\n		$aainqf199RequestWrapper : AAINQF199RequestWrapper(requestID == $event.requestID)\n		$aainqf199ResponseWrapper : AAINQF199ResponseWrapper(requestID == $event.requestID)\n	then\n		System.out.println(\"rule EVENT.MANAGER.AAINQF199RESPONSE is triggered.\");\n		//\n		// Extract related fields out of AAINQF199RESPONSE\n		//\n		String vnfItemVnfId, vnfItemVnfType, vnfItemPersonaModelId, vnfItemPersonaModelVersion, vnfItemModelName, \n		       vnfItemModelVersion, vnfItemModelNameVersionId, serviceItemServiceInstanceId, serviceItemPersonaModelId,\n		       serviceItemModelName, serviceItemModelType, serviceItemModelVersion, serviceItemModelNameVersionId,\n		       vfModuleItemVfModuleName, vfModuleItemPersonaModelId, vfModuleItemPersonaModelVersion, vfModuleItemModelName, \n		       vfModuleItemModelNameVersionId, tenantItemTenantId, cloudRegionItemCloudRegionId;\n		try {\n			//\n			// vnfItem\n			//\n			vnfItemVnfId = $aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).genericVNF.vnfID;\n			vnfItemVnfType = $aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).genericVNF.vnfType;\n			vnfItemVnfType = vnfItemVnfType.substring(vnfItemVnfType.lastIndexOf(\"/\")+1);\n			vnfItemPersonaModelId = $aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).genericVNF.personaModelId;\n			vnfItemPersonaModelVersion = $aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).genericVNF.personaModelVersion;\n			vnfItemModelName = $aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).extraProperties.extraProperty.get(0).propertyValue;\n			vnfItemModelVersion = 		$aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).extraProperties.extraProperty.get(2).propertyValue;\n			vnfItemModelNameVersionId = 	$aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).extraProperties.extraProperty.get(4).propertyValue;\n			//\n			// serviceItem\n			//\n			serviceItemServiceInstanceId = $aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).serviceInstance.serviceInstanceID;\n			serviceItemPersonaModelId = $aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).serviceInstance.personaModelId;\n			serviceItemModelName = $aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).extraProperties.extraProperty.get(0).propertyValue;\n			serviceItemModelType = $aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).extraProperties.extraProperty.get(1).propertyValue;\n			serviceItemModelVersion = $aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).serviceInstance.personaModelVersion;\n			serviceItemModelNameVersionId = $aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).extraProperties.extraProperty.get(4).propertyValue;\n			//\n			// Find the index for base vf module and non-base vf module\n			//\n			int baseIndex = -1;\n			int nonBaseIndex = -1;\n			List<AAINQF199InventoryResponseItem> inventoryItems = $aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).items.inventoryResponseItems;\n			for (AAINQF199InventoryResponseItem m : inventoryItems) {\n				if (m.vfModule != null && m.vfModule.isBaseVfModule == true) {\n					baseIndex = inventoryItems.indexOf(m);\n				} else if (m.vfModule != null && m.vfModule.isBaseVfModule == false && m.vfModule.orchestrationStatus == null) {\n					nonBaseIndex = inventoryItems.indexOf(m);\n				}\n				//\n				if (baseIndex != -1 && nonBaseIndex != -1) {\n					break;\n				}\n			}\n			//\n			// Report the error if either base vf module or non-base vf module is not found\n			//\n			if (baseIndex == -1 || nonBaseIndex == -1) {\n				System.err.println(\"Either base or non-base vf module is not found from AAI response.\");\n				retract($aainqf199RequestWrapper);\n				retract($aainqf199ResponseWrapper);\n				retract($manager);\n				retract($event);\n				return;\n			}\n			//\n			// This comes from the base module\n			//\n			vfModuleItemVfModuleName = 			$aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).items.inventoryResponseItems.get(baseIndex).vfModule.vfModuleName;\n			vfModuleItemVfModuleName = vfModuleItemVfModuleName.replace(\"Vfmodule\", \"vDNS\");\n			//\n			// vfModuleItem - NOT the base module\n			//\n			vfModuleItemPersonaModelId = 		$aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).items.inventoryResponseItems.get(nonBaseIndex).vfModule.personaModelId;\n			vfModuleItemPersonaModelVersion = 	$aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).items.inventoryResponseItems.get(nonBaseIndex).vfModule.personaModelVersion;\n			vfModuleItemModelName = 			$aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).items.inventoryResponseItems.get(nonBaseIndex).extraProperties.extraProperty.get(0).propertyValue;\n			vfModuleItemModelNameVersionId = 	$aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).items.inventoryResponseItems.get(nonBaseIndex).extraProperties.extraProperty.get(4).propertyValue;\n			//\n			// tenantItem\n			//\n			tenantItemTenantId = $aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(1).tenant.tenantId;\n			//\n			// cloudRegionItem\n			//\n			cloudRegionItemCloudRegionId = $aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(1).items.inventoryResponseItems.get(0).cloudRegion.cloudRegionId;\n			//\n		} catch (Exception e) {\n			e.printStackTrace();\n			VirtualControlLoopNotification notification = new VirtualControlLoopNotification($event);\n			notification.notification = ControlLoopNotificationType.REJECTED;\n			notification.message = \"Exception occurred \" + e.getMessage();\n			notification.policyName = drools.getRule().getName();\n			notification.policyScope = \"com\";\n			notification.policyVersion = \"1\";\n			//\n			try {\n				System.out.println(Serialization.gsonPretty.toJson(notification));\n				PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n			} catch (Exception e1) {\n				System.out.println(\"Can\'t deliver notification: \" + notification);\n				e1.printStackTrace();\n			}\n			//\n			notification.notification = ControlLoopNotificationType.FINAL_FAILURE;\n			notification.message = \"Invalid named-query response from AAI\";\n            //\n            try {\n            	System.out.println(Serialization.gsonPretty.toJson(notification));\n                PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n            } catch (Exception e1) {\n                System.out.println(\"Can\'t deliver notification: \" + notification);\n                e1.printStackTrace();\n            }\n			//\n			// Retract everything\n			//\n			retract($aainqf199RequestWrapper);\n			retract($aainqf199ResponseWrapper);\n			retract($manager);\n			retract($event);\n			return;\n		}	\n		//\n		// Extracted fields should not be null\n		//\n		if ((vnfItemVnfId == null) || (vnfItemVnfType == null) ||\n		    (vnfItemPersonaModelId == null) || (vnfItemModelName == null) ||\n		    (vnfItemModelVersion == null) || (vnfItemModelNameVersionId == null) ||\n		    (serviceItemServiceInstanceId == null) || (serviceItemModelName == null) ||\n		    (serviceItemModelType == null) || (serviceItemModelVersion == null) ||\n		    (serviceItemModelNameVersionId == null) || (vfModuleItemVfModuleName == null) ||\n		    (vfModuleItemPersonaModelId == null) || (vfModuleItemPersonaModelVersion == null) ||\n		    (vfModuleItemModelName == null) || (vfModuleItemModelNameVersionId == null) ||\n		    (tenantItemTenantId == null) || (cloudRegionItemCloudRegionId == null)) {\n			//\n			System.err.println(\"some fields are missing from AAI response.\");\n			//\n			// Fail and retract everything\n			//\n			retract($aainqf199RequestWrapper);\n			retract($aainqf199ResponseWrapper);\n			retract($manager);\n			retract($event);\n			return;\n		}\n		//\n		// We don\'t need them any more\n		//\n		retract($aainqf199ResponseWrapper);\n		retract($aainqf199RequestWrapper);  \n		//\n		// check the actor of this closed loop\n		//\n		switch ($params.getActor()) {\n			case \"APPC\":\n			{\n				//\n				// Construct an APPC request\n				//\n				ControlLoopOperation operation = new ControlLoopOperation();\n				operation.actor = $params.getActor();\n				operation.operation = \"ModifyConfig\";\n				operation.target = $event.target;\n				//\n				// Create operationWrapper\n				//\n				ControlLoopOperationWrapper operationWrapper = new ControlLoopOperationWrapper($event.requestID, operation);\n				//\n				// insert operationWrapper into memory\n				//\n				insert(operationWrapper);\n				//\n				Request request = new Request();\n				request.CommonHeader = new CommonHeader();\n				request.CommonHeader.RequestID = $event.requestID;\n				request.Action = operation.operation;\n				request.Payload = new HashMap<String, Object>();\n				//\n				// Fill in the payload\n				// Hardcode genericVNF for now since AAI has not been ready for vFirewall demo case\n				//\n				String genericVNF = \"zdfw1fwl01pgn02\";\n				request.Payload.put(\"generic-vnf.vnf-id\", genericVNF);\n				//\n				PGRequest pgRequest = new PGRequest();\n				pgRequest.pgStreams = new PGStreams();\n				\n				PGStream pgStream;\n				for(int i = 0; i < 5; i++){\n					pgStream = new PGStream();\n					pgStream.streamId = \"fw_udp\"+(i+1);\n					pgStream.isEnabled = \"true\";\n					pgRequest.pgStreams.pgStream.add(pgStream);\n				}\n				request.Payload.put(\"pg-streams\", pgRequest.pgStreams);\n				\n				if (request != null) {\n					//\n					// Insert request into memory\n					//\n					insert(request);\n					//\n					// Tell interested parties we are performing this Operation\n					//\n					VirtualControlLoopNotification notification = new VirtualControlLoopNotification($event);\n					notification.notification = ControlLoopNotificationType.OPERATION;\n					// message and history ??\n					notification.from = \"policy\";\n					notification.policyName = drools.getRule().getName();\n					notification.policyScope = \"com\";\n					notification.policyVersion = \"1\";\n					try {\n						System.out.println(Serialization.gsonPretty.toJson(notification));\n						PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n					} catch (Exception e) {\n						System.out.println(\"Can\'t deliver notification: \" + notification);\n						e.printStackTrace();\n					}\n					//\n					// Now send the operation request\n					//\n					if (request instanceof Request) {\n						try {\n							System.out.println(\"APPC request sent:\");\n							System.out.println(Serialization.gsonPretty.toJson(request));\n							PolicyEngine.manager.deliver($params.getAppcTopic(), request);\n						} catch (Exception e) {\n							e.printStackTrace();\n							System.out.println(\"Can\'t deliver request: \" + request);\n						}\n					}\n				} else {\n					//\n					// what happens if it is null\n					//\n				}\n			}\n			break;\n			case \"MSO\":\n			{\n				//\n				// Construct an operation\n				//\n				ControlLoopOperation operation = new ControlLoopOperation();\n				operation.actor = $params.getActor();\n				operation.operation = \"createModuleInstance\";\n				operation.target = $event.target;\n				//\n				// Create operationWrapper\n				//\n				ControlLoopOperationWrapper operationWrapper = new ControlLoopOperationWrapper($event.requestID, operation);\n				//\n				// Construct an MSO request\n				//\n				MSORequest request = new MSORequest();\n				request.requestDetails = new MSORequestDetails();\n				request.requestDetails.modelInfo = new MSOModelInfo();\n				request.requestDetails.cloudConfiguration = new MSOCloudConfiguration();\n				request.requestDetails.requestInfo = new MSORequestInfo();\n				request.requestDetails.requestParameters = new MSORequestParameters();\n				request.requestDetails.requestParameters.userParams = null;\n				//\n				// cloudConfiguration\n				//\n				request.requestDetails.cloudConfiguration.lcpCloudRegionId = cloudRegionItemCloudRegionId;\n				request.requestDetails.cloudConfiguration.tenantId = tenantItemTenantId;\n				//\n				// modelInfo\n				//\n				request.requestDetails.modelInfo.modelType = \"vfModule\";\n				request.requestDetails.modelInfo.modelInvariantId = vfModuleItemPersonaModelId;\n				request.requestDetails.modelInfo.modelNameVersionId = vfModuleItemModelNameVersionId;\n				request.requestDetails.modelInfo.modelName = vfModuleItemModelName;\n				request.requestDetails.modelInfo.modelVersion = vfModuleItemPersonaModelVersion;\n				//\n				// requestInfo\n				//\n				request.requestDetails.requestInfo.instanceName = vfModuleItemVfModuleName;\n				request.requestDetails.requestInfo.source = \"POLICY\";\n				request.requestDetails.requestInfo.suppressRollback = false;\n				//\n				// relatedInstanceList\n				//\n				MSORelatedInstanceListElement relatedInstanceListElement1 = new MSORelatedInstanceListElement();\n				MSORelatedInstanceListElement relatedInstanceListElement2 = new MSORelatedInstanceListElement();\n				relatedInstanceListElement1.relatedInstance = new MSORelatedInstance();\n				relatedInstanceListElement2.relatedInstance = new MSORelatedInstance();\n				//\n				relatedInstanceListElement1.relatedInstance.instanceId = serviceItemServiceInstanceId;\n				relatedInstanceListElement1.relatedInstance.modelInfo = new MSOModelInfo();\n				relatedInstanceListElement1.relatedInstance.modelInfo.modelType = \"service\";\n				relatedInstanceListElement1.relatedInstance.modelInfo.modelInvariantId = serviceItemPersonaModelId;\n				relatedInstanceListElement1.relatedInstance.modelInfo.modelNameVersionId = serviceItemModelNameVersionId;\n				relatedInstanceListElement1.relatedInstance.modelInfo.modelName = serviceItemModelName;\n				relatedInstanceListElement1.relatedInstance.modelInfo.modelVersion = serviceItemModelVersion;\n				//\n				relatedInstanceListElement2.relatedInstance.instanceId = vnfItemVnfId;\n				relatedInstanceListElement2.relatedInstance.modelInfo = new MSOModelInfo();\n				relatedInstanceListElement2.relatedInstance.modelInfo.modelType = \"vnf\";\n				relatedInstanceListElement2.relatedInstance.modelInfo.modelInvariantId = vnfItemPersonaModelId;\n				relatedInstanceListElement2.relatedInstance.modelInfo.modelNameVersionId = vnfItemModelNameVersionId;\n				relatedInstanceListElement2.relatedInstance.modelInfo.modelName = vnfItemModelName;\n				relatedInstanceListElement2.relatedInstance.modelInfo.modelVersion = vnfItemModelVersion;\n				relatedInstanceListElement2.relatedInstance.modelInfo.modelCustomizationName = vnfItemVnfType;\n				//	\n				request.requestDetails.relatedInstanceList.add(relatedInstanceListElement1);\n				request.requestDetails.relatedInstanceList.add(relatedInstanceListElement2);\n				//\n				// print MSO request for debug\n				//\n				System.out.println(\"MSO request sent:\");\n				System.out.println(Serialization.gsonPretty.toJson(request));\n				//\n				//\n				//\n				if (request != null) {\n					//\n					// Tell interested parties we are performing this Operation\n					//\n					VirtualControlLoopNotification notification = new VirtualControlLoopNotification($event);\n					notification.notification = ControlLoopNotificationType.OPERATION;\n					notification.from = \"policy\";\n					notification.policyName = drools.getRule().getName();\n					notification.policyScope = \"com\";\n					notification.policyVersion = \"1\";\n					try {\n						System.out.println(Serialization.gsonPretty.toJson(notification));\n						PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n					} catch (Exception e) {\n						System.out.println(\"Can\'t deliver notification: \" + notification);\n						e.printStackTrace();\n					}\n					//\n					// Concatenate serviceItemServiceInstanceId and vnfItemVnfId to msoURL\n					//\n					String MSOUrl = $params.getMsoURL() + \"/serviceInstances/v2/\" + serviceItemServiceInstanceId + \"/vnfs/\" + vnfItemVnfId + \"/vfModules\";\n					//\n					// Call MSO\n					//\n					MSOResponse response = MSOManager.createModuleInstance(MSOUrl, $params.getMsoURL(), $params.getMsoUsername(), $params.getMsoPassword(), request);\n					//\n					if (response != null) {\n						//\n						// Assign requestId\n						//\n						request.requestId = $event.requestID.toString();						\n						response.request.requestId = $event.requestID.toString();\n						//\n						// Insert facts\n						//\n						insert(operationWrapper);\n						insert(request);\n						insert(response);\n					} else {\n						//\n						// MSO request not even accepted\n						//\n						notification.message = operationWrapper.operation.toMessage();\n						operationWrapper.operation.message = operationWrapper.operation.toMessage();\n						operationWrapper.operation.outcome = \"FAILURE_EXCEPTION\";\n						$manager.setControlLoopResult(\"FAILURE_EXCEPTION\");\n						notification.history.add(operationWrapper.operation);\n						notification.notification = ControlLoopNotificationType.OPERATION_FAILURE;\n						//\n						// Let interested parties know\n						//\n						try {\n							System.out.println(Serialization.gsonPretty.toJson(notification));\n							PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n						} catch (Exception e) {\n							System.out.println(\"Can\'t deliver notification: \" + notification);\n							e.printStackTrace();\n						}\n	                    notification.notification = ControlLoopNotificationType.FINAL_FAILURE;\n                        try {\n                        	System.out.println(Serialization.gsonPretty.toJson(notification));\n                        	PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n                        } catch (Exception e) {\n                        	System.out.println(\"Can\'t deliver notification: \" + notification);\n                        	e.printStackTrace();\n                        }\n						//\n						// Retract everything\n						//\n						retract($event);\n						retract($manager);\n					}\n				} else {\n					System.err.println(\"constructed MSO request is invalid.\");\n				}\n			}\n			break; \n		} \nend\n		\n/*\n*\n* This rule responds to APPC Response Events\n*\n*/\nrule \"BRMSParamvFWDemoPolicy.APPC.RESPONSE\"\n	when\n		$params : Params( getClosedLoopControlName() == \"CL-FRWL-LOW-TRAFFIC-SIG-d925ed73-8231-4d02-9545-db4e101f88f8\" )\n		$event : VirtualControlLoopEvent( closedLoopControlName == $params.getClosedLoopControlName(), closedLoopEventStatus == ControlLoopEventStatus.ONSET )\n		$manager : EventManager( closedLoopControlName == $event.closedLoopControlName )\n		$operationWrapper : ControlLoopOperationWrapper( requestID == $event.requestID )\n		$request : Request( getCommonHeader().RequestID == $event.requestID )\n		$response : Response( getCommonHeader().RequestID == $event.requestID )	\n	then\n		System.out.println(\"rule APPC.RESPONSE is triggered.\");\n		if ($response.Status == null) {\n			$operationWrapper.operation.outcome = \"FAILURE_EXCEPTION\";\n			$manager.setControlLoopResult(\"FAILURE_EXCEPTION\");\n		} \n		//\n		// Get the Response Code\n		//\n		ResponseCode code = ResponseCode.toResponseCode($response.Status.Code);\n		if (code == null) {\n			$operationWrapper.operation.outcome = \"FAILURE_EXCEPTION\";\n			$manager.setControlLoopResult(\"FAILURE_EXCEPTION\");\n		}\n		//\n		// Construct notification\n		//\n		VirtualControlLoopNotification notification = new VirtualControlLoopNotification($event);\n		notification.from = \"policy\";\n		notification.policyName = drools.getRule().getName();\n		notification.policyScope = \"com\";\n		notification.policyVersion = \"1\";\n		notification.message = $operationWrapper.operation.toMessage();\n		$operationWrapper.operation.message = $operationWrapper.operation.toMessage();\n		//\n		// Ok, let\'s figure out what APP-C\'s response is\n		//\n		switch (code) {\n			case ACCEPT:\n				$operationWrapper.operation.outcome = \"PROCESSING\";\n				break;\n			case ERROR:\n			case REJECT:\n				$operationWrapper.operation.outcome = \"FAILURE_EXCEPTION\";\n				$manager.setControlLoopResult(\"FAILURE_EXCEPTION\");\n				break;\n			case SUCCESS:\n				$operationWrapper.operation.outcome = \"SUCCESS\";\n				$manager.setControlLoopResult(\"SUCCESS\");\n				break;\n			case FAILURE:\n				$operationWrapper.operation.outcome = \"FAILURE\";\n				$manager.setControlLoopResult(\"FAILURE\");\n				break;\n		}\n		if ($operationWrapper.operation.outcome.equals(\"SUCCESS\")) {\n			notification.history.add($operationWrapper.operation);\n			notification.notification = ControlLoopNotificationType.OPERATION_SUCCESS;\n			//\n			// Let interested parties know\n			//\n			try {\n				System.out.println(Serialization.gsonPretty.toJson(notification));\n				PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n			} catch (Exception e) {\n				System.out.println(\"Can\'t deliver notification: \" + notification);\n				e.printStackTrace();\n			}\n            notification.notification = ControlLoopNotificationType.FINAL_SUCCESS;\n            try {\n            	System.out.println(Serialization.gsonPretty.toJson(notification));\n            	PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n            } catch (Exception e) {\n            	System.out.println(\"Can\'t deliver notification: \" + notification);\n            	e.printStackTrace();\n            }\n\n			//\n			// We are going to retract these objects from memory\n			//\n			System.out.println(\"Retracting everything\");\n			retract($operationWrapper);\n			retract($request);\n			retract($response);\n			retract($event);\n			retract($manager);\n		} else if ($operationWrapper.operation.outcome.equals(\"PROCESSING\")) {\n			retract($response);\n		} else {\n			notification.history.add($operationWrapper.operation);\n			notification.notification = ControlLoopNotificationType.OPERATION_FAILURE;\n			//\n			// Let interested parties know\n			//\n			try {\n				System.out.println(Serialization.gsonPretty.toJson(notification));\n				PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n			} catch (Exception e) {\n				System.out.println(\"Can\'t deliver notification: \" + notification);\n				e.printStackTrace();\n			}\n            notification.notification = ControlLoopNotificationType.FINAL_FAILURE;\n            //\n            // Let interested parties know\n            //\n            try {\n            	System.out.println(Serialization.gsonPretty.toJson(notification));\n            	PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n            } catch (Exception e) {\n            	System.out.println(\"Can\'t deliver notification: \" + notification);\n            	e.printStackTrace();\n            }\n			//\n			// We are going to retract these objects from memory\n			//\n			System.out.println(\"Retracting everything\");\n			retract($operationWrapper);\n			retract($request);\n			retract($response);\n			retract($event);\n			retract($manager);\n		}\n		\nend		\n\n/*\n*\n* This rule is used to clean up APPC response\n*\n*/		\nrule \"BRMSParamvFWDemoPolicy.APPC.RESPONSE.CLEANUP\"\n	when\n		$params : Params( getClosedLoopControlName() == \"CL-FRWL-LOW-TRAFFIC-SIG-d925ed73-8231-4d02-9545-db4e101f88f8\" )\n        $response : Response($id : getCommonHeader().RequestID )\n		not ( VirtualControlLoopEvent( closedLoopControlName == $params.getClosedLoopControlName(), requestID == $id, closedLoopEventStatus == ControlLoopEventStatus.ONSET ) ) \n	then\n		System.out.println(\"rule APPC.RESPONSE.CLEANUP is triggered.\");\n		retract($response);\nend\n\n/*\n*\n* This rule responds to MSO Response Events\n*\n*/\nrule \"BRMSParamvFWDemoPolicy.MSO.RESPONSE\"\n	when\n		$params : Params( getClosedLoopControlName() == \"CL-FRWL-LOW-TRAFFIC-SIG-d925ed73-8231-4d02-9545-db4e101f88f8\" )\n		$event : VirtualControlLoopEvent( closedLoopControlName == $params.getClosedLoopControlName(), closedLoopEventStatus == ControlLoopEventStatus.ONSET )\n		$manager : EventManager( closedLoopControlName == $event.closedLoopControlName )\n		$operationWrapper : ControlLoopOperationWrapper( requestID == $event.requestID )\n		$request : MSORequest( requestId == $event.requestID.toString() )\n		$response : MSOResponse( request.requestId == $event.requestID.toString() )	\n	then\n		System.out.println(\"rule MSO.RESPONSE is triggered.\");\n		//\n		// Construct notification\n		//\n		VirtualControlLoopNotification notification = new VirtualControlLoopNotification($event);\n		notification.from = \"policy\";\n		notification.policyName = drools.getRule().getName();\n		notification.policyScope = \"com\";\n		notification.policyVersion = \"1\";\n		notification.message = $operationWrapper.operation.toMessage();\n		$operationWrapper.operation.message = $operationWrapper.operation.toMessage();\n		//\n		// The operation can either be succeeded or failed\n		// \n		if($response.request.requestStatus.requestState.equals(\"COMPLETE\")) {\n			$operationWrapper.operation.outcome = \"SUCCESS\";\n			$manager.setControlLoopResult(\"SUCCESS\");\n			notification.history.add($operationWrapper.operation);\n			notification.notification = ControlLoopNotificationType.OPERATION_SUCCESS;\n			//\n			// Let interested parties know\n			//\n			try {\n				System.out.println(Serialization.gsonPretty.toJson(notification));\n				PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n			} catch (Exception e) {\n				System.out.println(\"Can\'t deliver notification: \" + notification);\n				e.printStackTrace();\n			}\n			notification.notification = ControlLoopNotificationType.FINAL_SUCCESS;\n            //\n            // Let interested parties know\n            //\n            try {\n            	System.out.println(Serialization.gsonPretty.toJson(notification));\n            	PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n            } catch (Exception e) {\n            	System.out.println(\"Can\'t deliver notification: \" + notification);\n            	e.printStackTrace();\n            }\n            //\n			// We are going to retract these objects from memory\n			//\n			System.out.println(\"Retracting everything\");\n			retract($operationWrapper);\n			retract($request);\n			retract($response);\n			retract($event);\n			retract($manager);\n		} else {\n			$operationWrapper.operation.outcome = \"FAILURE\";\n			$manager.setControlLoopResult(\"FAILURE\");\n			notification.history.add($operationWrapper.operation);\n			notification.notification = ControlLoopNotificationType.OPERATION_FAILURE;\n			//\n			// Let interested parties know\n			//\n			try {\n				System.out.println(Serialization.gsonPretty.toJson(notification));\n				PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n			} catch (Exception e) {\n				System.out.println(\"Can\'t deliver notification: \" + notification);\n				e.printStackTrace();\n			}\n			notification.notification = ControlLoopNotificationType.FINAL_FAILURE;\n            //\n            // Let interested parties know\n            //\n            try {\n            	System.out.println(Serialization.gsonPretty.toJson(notification));\n            	PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n            } catch (Exception e) {\n            	System.out.println(\"Can\'t deliver notification: \" + notification);\n            	e.printStackTrace();\n            }\n            //\n			// We are going to retract these objects from memory\n			//\n			System.out.println(\"Retracting everything\");\n			retract($operationWrapper);\n			retract($request);\n			retract($response);\n			retract($event);\n			retract($manager);\n		}\n		\nend	\nrule \"com.Config_BRMS_Param_BRMSParamvFWDemoPolicy.Params\" \n	salience 1000 \n	when\n	then\n		Params params = new Params();\n		params.setAaiPatternMatch(1);\n		params.setAppcTopic(\"APPC-CL\");\n		params.setAaiURL(\"null\");\n		params.setMsoPassword(\"null\");\n		params.setClosedLoopControlName(\"CL-FRWL-LOW-TRAFFIC-SIG-d925ed73-8231-4d02-9545-db4e101f88f8\");\n		params.setMsoURL(\"null\");\n		params.setAaiUsername(\"null\");\n		params.setActor(\"APPC\");\n		params.setMsoUsername(\"null\");\n		params.setAaiNamedQueryUUID(\"null\");\n		params.setAaiPassword(\"null\");\n		params.setNotificationTopic(\"POLICY-CL-MGT\");\n		insert(params);\nend\r\n','OTHER','com.Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.txt','doACPolicyPut','2017-03-14 19:58:19',0,'','doACPolicyPut','2017-03-14 19:58:19',1),(3203,'/* Autogenerated Code Please Don\'t change/remove this comment section. This is for the UI purpose. \n	 <$%BRMSParamTemplate=ControlLoopDemo__closedLoopControlName%$> \n */ \n\r\n\r\n/*-\n * ============LICENSE_START=======================================================\n * archetype-closed-loop-demo-rules\n * ================================================================================\n * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.\n * ================================================================================\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n * \n *      http://www.apache.org/licenses/LICENSE-2.0\n * \n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n * ============LICENSE_END=========================================================\n */\n\npackage org.onap.policy.controlloop;\n\nimport java.util.List;\nimport java.util.LinkedList;\nimport java.util.Map;\nimport java.util.HashMap;\nimport java.util.UUID;\n\nimport org.onap.policy.controlloop.VirtualControlLoopEvent;\nimport org.onap.policy.controlloop.ControlLoopEventStatus;\nimport org.onap.policy.controlloop.VirtualControlLoopNotification;\nimport org.onap.policy.controlloop.ControlLoopNotificationType;\nimport org.onap.policy.controlloop.ControlLoopOperation;\nimport org.onap.policy.controlloop.ControlLoopOperationWrapper;\nimport org.onap.policy.template.demo.ControlLoopException;\n\nimport org.onap.policy.aai.AAINQF199.AAINQF199CloudRegion;\nimport org.onap.policy.aai.AAINQF199.AAINQF199ExtraProperties;\nimport org.onap.policy.aai.AAINQF199.AAINQF199ExtraProperty;\nimport org.onap.policy.aai.AAINQF199.AAINQF199GenericVNF;\nimport org.onap.policy.aai.AAINQF199.AAINQF199InstanceFilters;\nimport org.onap.policy.aai.AAINQF199.AAINQF199InventoryResponseItem;\nimport org.onap.policy.aai.AAINQF199.AAINQF199InventoryResponseItems;\nimport org.onap.policy.aai.AAINQF199.AAINQF199Manager;\nimport org.onap.policy.aai.AAINQF199.AAINQF199NamedQuery;\nimport org.onap.policy.aai.AAINQF199.AAINQF199QueryParameters;\nimport org.onap.policy.aai.AAINQF199.AAINQF199Request;\nimport org.onap.policy.aai.AAINQF199.AAINQF199RequestWrapper;\nimport org.onap.policy.aai.AAINQF199.AAINQF199Response;\nimport org.onap.policy.aai.AAINQF199.AAINQF199ResponseWrapper;\nimport org.onap.policy.aai.AAINQF199.AAINQF199ServiceInstance;\nimport org.onap.policy.aai.AAINQF199.AAINQF199Tenant;\nimport org.onap.policy.aai.AAINQF199.AAINQF199VfModule;\nimport org.onap.policy.aai.AAINQF199.AAINQF199VServer;\nimport org.onap.policy.aai.util.Serialization;\n\nimport org.onap.policy.appc.CommonHeader;\nimport org.onap.policy.appc.Request;\nimport org.onap.policy.appc.Response;\nimport org.onap.policy.appc.ResponseCode;\nimport org.onap.policy.appc.ResponseStatus;\nimport org.onap.policy.appc.ResponseValue;\n\nimport org.onap.policy.template.demo.EventManager;\nimport org.onap.policy.vnf.trafficgenerator.PGRequest;\nimport org.onap.policy.vnf.trafficgenerator.PGStream;\nimport org.onap.policy.vnf.trafficgenerator.PGStreams;\n\nimport org.onap.policy.mso.MSOManager;\nimport org.onap.policy.mso.MSORequest;\nimport org.onap.policy.mso.MSORequestStatus;\nimport org.onap.policy.mso.MSORequestDetails;\nimport org.onap.policy.mso.MSOModelInfo;\nimport org.onap.policy.mso.MSOCloudConfiguration;\nimport org.onap.policy.mso.MSORequestInfo;\nimport org.onap.policy.mso.MSORequestParameters;\nimport org.onap.policy.mso.MSORelatedInstanceListElement;\nimport org.onap.policy.mso.MSORelatedInstance;\nimport org.onap.policy.mso.MSOResponse;\n\nimport org.openecomp.policy.drools.system.PolicyEngine;\n\n//\n// These parameters are required to build the runtime policy\n//\ndeclare Params\n    closedLoopControlName : String\n    actor : String\n    aaiURL : String\n    aaiUsername : String\n    aaiPassword : String\n    msoURL : String\n    msoUsername : String\n    msoPassword : String\n    aaiNamedQueryUUID : String\n    aaiPatternMatch : int \n    notificationTopic : String\n    appcTopic : String\nend\n\n/*\n*\n* Called once and only once to insert the parameters into working memory for this Closed Loop policy.\n* (Comment SETUP rule out for the first ECOMP opensource release since policy BRMS_GW already puts a Params fact in there)\n*\n*\n*rule \"BRMSParamvLBDemoPolicy.SETUP\"\n*	when\n*	then\n*		System.out.println(\"rule SETUP is triggered.\");\n*		Params params = new Params();\n*		params.setClosedLoopControlName(\"CL-DNS-LOW-TRAFFIC-SIG-d925ed73-8231-4d02-9545-db4e101f88f8\");\n*		params.setActor(\"MSO\");\n*		params.setAaiURL(\"https://aai.api.simpledemo.openecomp.org:8443\");\n*		params.setAaiUsername(\"POLICY\");\n*		params.setAaiPassword(\"POLICY\");\n*		params.setMsoURL(\"http://vm1.mso.simpledemo.openecomp.org:8080/ecomp/mso/infra\");\n*		params.setMsoUsername(\"InfraPortalClient\");\n*		params.setMsoPassword(\"password1$\");\n*		params.setAaiNamedQueryUUID(\"f199cb88-5e69-4b1f-93e0-6f257877d066\");\n*		params.setAaiPatternMatch(0);\n*		params.setNotificationTopic(\"POLICY-CL-MGT\");\n*		params.setAppcTopic(\"APPC-CL\");\n*		//\n*		// This stays in memory as long as the rule is alive and running\n*		//\n*		insert(params);\n*end\n*/\n/*\n*\n* This rule responds to DCAE Events\n*\n*/\nrule \"BRMSParamvLBDemoPolicy.EVENT\"\n	when\n        $params : Params( getClosedLoopControlName() == \"CL-DNS-LOW-TRAFFIC-SIG-d925ed73-8231-4d02-9545-db4e101f88f8\" )\n        $event : VirtualControlLoopEvent( closedLoopControlName == $params.getClosedLoopControlName(), closedLoopEventStatus == ControlLoopEventStatus.ONSET )\n        not ( EventManager( closedLoopControlName == $event.closedLoopControlName ))\n	then\n		System.out.println(\"rule EVENT is triggered.\");\n		try {\n			// \n			// Check the requestID in the event to make sure it is not null before we create the EventManager. \n			// The EventManager will do extra syntax checking as well check if the closed loop is disabled/\n			//\n			if ($event.requestID == null) {\n				VirtualControlLoopNotification notification = new VirtualControlLoopNotification($event);\n				notification.notification = ControlLoopNotificationType.REJECTED;\n				notification.from = \"policy\";\n				notification.message = \"Missing requestID from DCAE event\";\n				notification.policyName = drools.getRule().getName();\n				notification.policyScope = \"com\";\n				notification.policyVersion = \"1\";\n				//\n				// Let interested parties know\n				//\n				try {\n					System.out.println(Serialization.gsonPretty.toJson(notification));\n					PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n				} catch (Exception e) {\n					e.printStackTrace();\n					System.out.println(\"Can\'t deliver notification: \" + notification);\n				}\n				//\n				// Retract it from memory\n				//\n				retract($event);\n				System.out.println(\"Event with requestID=null has been retracted.\");\n			} else {\n				//\n				// Create an EventManager\n				//\n				EventManager manager = new EventManager($params.getClosedLoopControlName(), $event.requestID, $event.target);\n				//\n				// Determine if EventManager can actively process the event (i.e. syntax)\n				//\n				VirtualControlLoopNotification notification = manager.activate($event);\n				notification.from = \"policy\"; \n				notification.policyName = drools.getRule().getName();\n				notification.policyScope = \"com\";\n				notification.policyVersion = \"1\";\n				//\n				// Are we actively pursuing this event?\n				//\n				if (notification.notification == ControlLoopNotificationType.ACTIVE) {\n					//\n					// Insert Event Manager into memory, this will now kick off processing.\n					//\n					insert(manager);\n					//\n					// Let interested parties know\n					//\n					try {\n						System.out.println(Serialization.gsonPretty.toJson(notification));\n						PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n					} catch (Exception e) {\n						e.printStackTrace();\n						System.out.println(\"Can\'t deliver notification: \" + notification);\n					}		\n				} else {\n					//\n					// Let interested parties know\n					//\n					try {\n						System.out.println(Serialization.gsonPretty.toJson(notification));\n						PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n					} catch (Exception e) {\n						e.printStackTrace();\n						System.out.println(\"Can\'t deliver notification: \" + notification);\n					}\n					//\n					// Retract it from memory\n					//\n					retract($event);\n				}\n				//\n				// Now that the manager is inserted into Drools working memory, we\'ll wait for\n				// another rule to fire in order to continue processing. This way we can also\n				// then screen for additional ONSET and ABATED events for this same RequestIDs \n				// and for different RequestIDs but with the same closedLoopControlName and target.\n				//\n			}\n		//\n		} catch (Exception e) {\n			e.printStackTrace();\n			VirtualControlLoopNotification notification = new VirtualControlLoopNotification($event);\n			notification.notification = ControlLoopNotificationType.REJECTED;\n			notification.message = \"Exception occurred \" + e.getMessage();\n			notification.policyName = drools.getRule().getName();\n			notification.policyScope = \"com\";\n			notification.policyVersion = \"1\";\n			//\n			//\n			//\n			try {\n				System.out.println(Serialization.gsonPretty.toJson(notification));\n				PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n			} catch (Exception e1) {\n				System.out.println(\"Can\'t deliver notification: \" + notification);\n				e1.printStackTrace();\n			}\n			//\n			// Retract the event\n			//\n			retract($event);\n		}\nend\n\n/*\n*\n* This rule happens when we got a valid ONSET, closed loop is enabled and an Event Manager\n* is created. We can start the operations for this closed loop.\n*\n*/\nrule \"BRMSParamvLBDemoPolicy.EVENT.MANAGER\"\n	when\n		$params : Params( getClosedLoopControlName() == \"CL-DNS-LOW-TRAFFIC-SIG-d925ed73-8231-4d02-9545-db4e101f88f8\" )\n		$event : VirtualControlLoopEvent( closedLoopControlName == $params.getClosedLoopControlName(), closedLoopEventStatus == ControlLoopEventStatus.ONSET )\n		$manager : EventManager( closedLoopControlName == $event.closedLoopControlName, controlLoopResult == null)\n	then\n		System.out.println(\"rule EVENT.MANAGER is triggered.\");\n		//\n		// Check which event this is.\n		//\n		EventManager.NEW_EVENT_STATUS eventStatus = $manager.onNewEvent($event);\n		//\n		// We only want the initial ONSET event in memory,\n		// all the other events need to be retracted to support\n		// cleanup and avoid the other rules being fired for this event.\n		//\n		if (eventStatus != EventManager.NEW_EVENT_STATUS.FIRST_ONSET) {\n			System.out.println(\"Retracting \"+eventStatus+\" Event.\");\n			retract($event);\n			return;\n		}\n		//\n		// Now the event in memory is first onset event\n		//\n		try {\n			//\n			// Pull the known AAI field from the Event\n			//\n			// generic-vnf is needed for vFirewall case\n			// vserver-name is needed for vLoadBalancer case\n			//\n			String genericVNF = $event.AAI.get(\"generic-vnf.vnf-id\");\n			String vserver = $event.AAI.get(\"vserver.vserver-name\");\n			//\n			// Check if we are implementing a simple pattern match.\n			//\n			if ($params.getAaiPatternMatch() == 1) {\n				//\n				// Yes\n				//\n				//Basic naming characteristics:\n				//VF Name (9 char)+VM name (13 char total)+VFC (19 char total)\n				//Example: \n				//VF Name (9 characters):    cscf0001v\n				//VM Name(13 characters): cscf0001vm001\n				//VFC name(19 characters): cscf0001vm001cfg001\n				//\n				// zdfw1fwl01fwl02 or zdfw1fwl01fwl01  \n				// replaced with\n				// zdfw1fwl01pgn02 or zdfw1fwl01pgn01\n				//\n				int index = genericVNF.lastIndexOf(\"fwl\");\n				if (index == -1) {\n					System.err.println(\"The generic-vnf.vnf-id from DCAE Event is not valid.\");\n				} else {\n					genericVNF = genericVNF.substring(0, index) + \"pgn\" + genericVNF.substring(index+\"fwl\".length());\n				}\n				//\n				// Construct an APPC request\n				//\n				ControlLoopOperation operation = new ControlLoopOperation();\n				operation.actor = $params.getActor();\n				operation.operation = \"ModifyConfig\";\n				operation.target = $event.target;\n				//\n				// Create operationWrapper\n				//\n				ControlLoopOperationWrapper operationWrapper = new ControlLoopOperationWrapper($event.requestID, operation);\n				//\n				// insert operationWrapper into memory\n				//\n				insert(operationWrapper);\n				//\n				Request request = new Request();\n				request.CommonHeader = new CommonHeader();\n				request.CommonHeader.RequestID = $event.requestID;\n				request.Action = operation.operation;\n				request.Payload = new HashMap<String, Object>();\n				//\n				// Fill in the payload\n				//\n				request.Payload.put(\"generic-vnf.vnf-id\", genericVNF);\n				//\n				PGRequest pgRequest = new PGRequest();\n				pgRequest.pgStreams = new PGStreams();\n				\n				PGStream pgStream;\n				for(int i = 0; i < 5; i++){\n					pgStream = new PGStream();\n					pgStream.streamId = \"fw_udp\"+(i+1);\n					pgStream.isEnabled = \"true\";\n					pgRequest.pgStreams.pgStream.add(pgStream);\n				}\n				request.Payload.put(\"pg-streams\", pgRequest.pgStreams);\n				\n				if (request != null) {\n					//\n					// Insert request into memory\n					//\n					insert(request);\n					//\n					// Tell interested parties we are performing this Operation\n					//\n					VirtualControlLoopNotification notification = new VirtualControlLoopNotification($event);\n					notification.notification = ControlLoopNotificationType.OPERATION;\n					// message and history ??\n					notification.from = \"policy\";\n					notification.policyName = drools.getRule().getName();\n					notification.policyScope = \"com\";\n					notification.policyVersion = \"1\";\n					try {\n						System.out.println(Serialization.gsonPretty.toJson(notification));\n						PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n					} catch (Exception e) {\n						System.out.println(\"Can\'t deliver notification: \" + notification);\n						e.printStackTrace();\n					}\n					//\n					// Now send the operation request\n					//\n					if (request instanceof Request) {\n						try {\n							System.out.println(\"APPC request sent:\");\n							System.out.println(Serialization.gsonPretty.toJson(request));\n							PolicyEngine.manager.deliver($params.getAppcTopic(), request);\n						} catch (Exception e) {\n							e.printStackTrace();\n							System.out.println(\"Can\'t deliver request: \" + request);\n						}\n					}\n				} else {\n					//\n					// what happens if it is null\n					//\n				}\n				//\n			} else {\n				//\n				// create AAI named-query request with UUID started with \"F199\"\n				//\n				AAINQF199Request aainqf199request = new AAINQF199Request();\n				AAINQF199QueryParameters aainqf199queryparam = new AAINQF199QueryParameters();\n				AAINQF199NamedQuery aainqf199namedquery = new AAINQF199NamedQuery();\n				AAINQF199InstanceFilters aainqf199instancefilter = new AAINQF199InstanceFilters();\n				//\n				// queryParameters\n				//\n				aainqf199namedquery.namedQueryUUID = UUID.fromString($params.getAaiNamedQueryUUID()); \n				aainqf199queryparam.namedQuery = aainqf199namedquery;\n				aainqf199request.queryParameters = aainqf199queryparam;\n				//\n				// instanceFilters\n				//\n				Map aainqf199instancefiltermap = new HashMap();\n				Map aainqf199instancefiltermapitem = new HashMap();\n				aainqf199instancefiltermapitem.put(\"vserver-name\", vserver); \n				aainqf199instancefiltermap.put(\"vserver\", aainqf199instancefiltermapitem);\n				aainqf199instancefilter.instanceFilter.add(aainqf199instancefiltermap);\n				aainqf199request.instanceFilters = aainqf199instancefilter;\n				//\n				// print aainqf199request for debug\n				//\n				System.out.println(\"AAI Request sent:\");\n				System.out.println(Serialization.gsonPretty.toJson(aainqf199request));\n				//\n				// Create AAINQF199RequestWrapper\n				//\n				AAINQF199RequestWrapper aainqf199RequestWrapper = new AAINQF199RequestWrapper($event.requestID, aainqf199request);\n				//\n				// insert aainqf199request into memory\n				//\n				insert(aainqf199RequestWrapper);\n			}\n			//\n		} catch (Exception e) {\n		 e.printStackTrace();\n		}\nend\n\n/*\n*\n* This rule happens when we got a valid ONSET, closed loop is enabled, an Event Manager\n* is created, AAI Manager and AAI Request are ready in memory. We can start sending query to AAI and then wait for response.\n*\n*/\nrule \"BRMSParamvLBDemoPolicy.EVENT.MANAGER.AAINQF199REQUEST\"\n	when\n		$params : Params( getClosedLoopControlName() == \"CL-DNS-LOW-TRAFFIC-SIG-d925ed73-8231-4d02-9545-db4e101f88f8\" )\n		$event : VirtualControlLoopEvent( closedLoopControlName == $params.getClosedLoopControlName(), closedLoopEventStatus == ControlLoopEventStatus.ONSET )\n		$manager : EventManager( closedLoopControlName == $event.closedLoopControlName )\n		$aainqf199RequestWrapper : AAINQF199RequestWrapper(requestID == $event.requestID)\n	then\n		System.out.println(\"rule EVENT.MANAGER.AAINQF199REQUEST is triggered.\");\n		//\n		// send the request\n		//\n		AAINQF199Response aainqf199response = AAINQF199Manager.postQuery($params.getAaiURL(), $params.getAaiUsername(), $params.getAaiPassword(),\n													   $aainqf199RequestWrapper.aainqf199request, $event.requestID);\n		//\n		// Check AAI response\n		//\n		if (aainqf199response == null) {\n			System.err.println(\"Failed to get AAI response\");\n			//\n			// Fail and retract everything\n			//\n			retract($event);\n			retract($manager);\n			retract($aainqf199RequestWrapper);\n		} else {\n			//\n			// Create AAINQF199ResponseWrapper\n			//\n			AAINQF199ResponseWrapper aainqf199ResponseWrapper = new AAINQF199ResponseWrapper($event.requestID, aainqf199response);\n			//\n			// insert aainqf199ResponseWrapper to memeory\n			//\n			insert(aainqf199ResponseWrapper);\n		}\nend\n\n/*\n*\n* This rule happens when we got a valid AAI response. We can start sending request to APPC or MSO now.\n*\n*/\nrule \"BRMSParamvLBDemoPolicy.EVENT.MANAGER.AAINQF199RESPONSE\"\n	when \n		$params : Params( getClosedLoopControlName() == \"CL-DNS-LOW-TRAFFIC-SIG-d925ed73-8231-4d02-9545-db4e101f88f8\" )\n		$event : VirtualControlLoopEvent( closedLoopControlName == $params.getClosedLoopControlName(), closedLoopEventStatus == ControlLoopEventStatus.ONSET )\n		$manager : EventManager( closedLoopControlName == $event.closedLoopControlName )\n		$aainqf199RequestWrapper : AAINQF199RequestWrapper(requestID == $event.requestID)\n		$aainqf199ResponseWrapper : AAINQF199ResponseWrapper(requestID == $event.requestID)\n	then\n		System.out.println(\"rule EVENT.MANAGER.AAINQF199RESPONSE is triggered.\");\n		//\n		// Extract related fields out of AAINQF199RESPONSE\n		//\n		String vnfItemVnfId, vnfItemVnfType, vnfItemPersonaModelId, vnfItemPersonaModelVersion, vnfItemModelName, \n		       vnfItemModelVersion, vnfItemModelNameVersionId, serviceItemServiceInstanceId, serviceItemPersonaModelId,\n		       serviceItemModelName, serviceItemModelType, serviceItemModelVersion, serviceItemModelNameVersionId,\n		       vfModuleItemVfModuleName, vfModuleItemPersonaModelId, vfModuleItemPersonaModelVersion, vfModuleItemModelName, \n		       vfModuleItemModelNameVersionId, tenantItemTenantId, cloudRegionItemCloudRegionId;\n		try {\n			//\n			// vnfItem\n			//\n			vnfItemVnfId = $aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).genericVNF.vnfID;\n			vnfItemVnfType = $aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).genericVNF.vnfType;\n			vnfItemVnfType = vnfItemVnfType.substring(vnfItemVnfType.lastIndexOf(\"/\")+1);\n			vnfItemPersonaModelId = $aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).genericVNF.personaModelId;\n			vnfItemPersonaModelVersion = $aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).genericVNF.personaModelVersion;\n			vnfItemModelName = $aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).extraProperties.extraProperty.get(0).propertyValue;\n			vnfItemModelVersion = 		$aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).extraProperties.extraProperty.get(2).propertyValue;\n			vnfItemModelNameVersionId = 	$aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).extraProperties.extraProperty.get(4).propertyValue;\n			//\n			// serviceItem\n			//\n			serviceItemServiceInstanceId = $aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).serviceInstance.serviceInstanceID;\n			serviceItemPersonaModelId = $aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).serviceInstance.personaModelId;\n			serviceItemModelName = $aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).extraProperties.extraProperty.get(0).propertyValue;\n			serviceItemModelType = $aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).extraProperties.extraProperty.get(1).propertyValue;\n			serviceItemModelVersion = $aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).serviceInstance.personaModelVersion;\n			serviceItemModelNameVersionId = $aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).extraProperties.extraProperty.get(4).propertyValue;\n			//\n			// Find the index for base vf module and non-base vf module\n			//\n			int baseIndex = -1;\n			int nonBaseIndex = -1;\n			List<AAINQF199InventoryResponseItem> inventoryItems = $aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).items.inventoryResponseItems;\n			for (AAINQF199InventoryResponseItem m : inventoryItems) {\n				if (m.vfModule != null && m.vfModule.isBaseVfModule == true) {\n					baseIndex = inventoryItems.indexOf(m);\n				} else if (m.vfModule != null && m.vfModule.isBaseVfModule == false && m.vfModule.orchestrationStatus == null) {\n					nonBaseIndex = inventoryItems.indexOf(m);\n				}\n				//\n				if (baseIndex != -1 && nonBaseIndex != -1) {\n					break;\n				}\n			}\n			//\n			// Report the error if either base vf module or non-base vf module is not found\n			//\n			if (baseIndex == -1 || nonBaseIndex == -1) {\n				System.err.println(\"Either base or non-base vf module is not found from AAI response.\");\n				retract($aainqf199RequestWrapper);\n				retract($aainqf199ResponseWrapper);\n				retract($manager);\n				retract($event);\n				return;\n			}\n			//\n			// This comes from the base module\n			//\n			vfModuleItemVfModuleName = 			$aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).items.inventoryResponseItems.get(baseIndex).vfModule.vfModuleName;\n			vfModuleItemVfModuleName = vfModuleItemVfModuleName.replace(\"Vfmodule\", \"vDNS\");\n			//\n			// vfModuleItem - NOT the base module\n			//\n			vfModuleItemPersonaModelId = 		$aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).items.inventoryResponseItems.get(nonBaseIndex).vfModule.personaModelId;\n			vfModuleItemPersonaModelVersion = 	$aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).items.inventoryResponseItems.get(nonBaseIndex).vfModule.personaModelVersion;\n			vfModuleItemModelName = 			$aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).items.inventoryResponseItems.get(nonBaseIndex).extraProperties.extraProperty.get(0).propertyValue;\n			vfModuleItemModelNameVersionId = 	$aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).items.inventoryResponseItems.get(nonBaseIndex).extraProperties.extraProperty.get(4).propertyValue;\n			//\n			// tenantItem\n			//\n			tenantItemTenantId = $aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(1).tenant.tenantId;\n			//\n			// cloudRegionItem\n			//\n			cloudRegionItemCloudRegionId = $aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(1).items.inventoryResponseItems.get(0).cloudRegion.cloudRegionId;\n			//\n		} catch (Exception e) {\n			e.printStackTrace();\n			VirtualControlLoopNotification notification = new VirtualControlLoopNotification($event);\n			notification.notification = ControlLoopNotificationType.REJECTED;\n			notification.message = \"Exception occurred \" + e.getMessage();\n			notification.policyName = drools.getRule().getName();\n			notification.policyScope = \"com\";\n			notification.policyVersion = \"1\";\n			//\n			try {\n				System.out.println(Serialization.gsonPretty.toJson(notification));\n				PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n			} catch (Exception e1) {\n				System.out.println(\"Can\'t deliver notification: \" + notification);\n				e1.printStackTrace();\n			}\n			//\n			notification.notification = ControlLoopNotificationType.FINAL_FAILURE;\n			notification.message = \"Invalid named-query response from AAI\";\n            //\n            try {\n            	System.out.println(Serialization.gsonPretty.toJson(notification));\n                PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n            } catch (Exception e1) {\n                System.out.println(\"Can\'t deliver notification: \" + notification);\n                e1.printStackTrace();\n            }\n			//\n			// Retract everything\n			//\n			retract($aainqf199RequestWrapper);\n			retract($aainqf199ResponseWrapper);\n			retract($manager);\n			retract($event);\n			return;\n		}	\n		//\n		// Extracted fields should not be null\n		//\n		if ((vnfItemVnfId == null) || (vnfItemVnfType == null) ||\n		    (vnfItemPersonaModelId == null) || (vnfItemModelName == null) ||\n		    (vnfItemModelVersion == null) || (vnfItemModelNameVersionId == null) ||\n		    (serviceItemServiceInstanceId == null) || (serviceItemModelName == null) ||\n		    (serviceItemModelType == null) || (serviceItemModelVersion == null) ||\n		    (serviceItemModelNameVersionId == null) || (vfModuleItemVfModuleName == null) ||\n		    (vfModuleItemPersonaModelId == null) || (vfModuleItemPersonaModelVersion == null) ||\n		    (vfModuleItemModelName == null) || (vfModuleItemModelNameVersionId == null) ||\n		    (tenantItemTenantId == null) || (cloudRegionItemCloudRegionId == null)) {\n			//\n			System.err.println(\"some fields are missing from AAI response.\");\n			//\n			// Fail and retract everything\n			//\n			retract($aainqf199RequestWrapper);\n			retract($aainqf199ResponseWrapper);\n			retract($manager);\n			retract($event);\n			return;\n		}\n		//\n		// We don\'t need them any more\n		//\n		retract($aainqf199ResponseWrapper);\n		retract($aainqf199RequestWrapper);  \n		//\n		// check the actor of this closed loop\n		//\n		switch ($params.getActor()) {\n			case \"APPC\":\n			{\n				//\n				// Construct an APPC request\n				//\n				ControlLoopOperation operation = new ControlLoopOperation();\n				operation.actor = $params.getActor();\n				operation.operation = \"ModifyConfig\";\n				operation.target = $event.target;\n				//\n				// Create operationWrapper\n				//\n				ControlLoopOperationWrapper operationWrapper = new ControlLoopOperationWrapper($event.requestID, operation);\n				//\n				// insert operationWrapper into memory\n				//\n				insert(operationWrapper);\n				//\n				Request request = new Request();\n				request.CommonHeader = new CommonHeader();\n				request.CommonHeader.RequestID = $event.requestID;\n				request.Action = operation.operation;\n				request.Payload = new HashMap<String, Object>();\n				//\n				// Fill in the payload\n				// Hardcode genericVNF for now since AAI has not been ready for vFirewall demo case\n				//\n				String genericVNF = \"zdfw1fwl01pgn02\";\n				request.Payload.put(\"generic-vnf.vnf-id\", genericVNF);\n				//\n				PGRequest pgRequest = new PGRequest();\n				pgRequest.pgStreams = new PGStreams();\n				\n				PGStream pgStream;\n				for(int i = 0; i < 5; i++){\n					pgStream = new PGStream();\n					pgStream.streamId = \"fw_udp\"+(i+1);\n					pgStream.isEnabled = \"true\";\n					pgRequest.pgStreams.pgStream.add(pgStream);\n				}\n				request.Payload.put(\"pg-streams\", pgRequest.pgStreams);\n				\n				if (request != null) {\n					//\n					// Insert request into memory\n					//\n					insert(request);\n					//\n					// Tell interested parties we are performing this Operation\n					//\n					VirtualControlLoopNotification notification = new VirtualControlLoopNotification($event);\n					notification.notification = ControlLoopNotificationType.OPERATION;\n					// message and history ??\n					notification.from = \"policy\";\n					notification.policyName = drools.getRule().getName();\n					notification.policyScope = \"com\";\n					notification.policyVersion = \"1\";\n					try {\n						System.out.println(Serialization.gsonPretty.toJson(notification));\n						PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n					} catch (Exception e) {\n						System.out.println(\"Can\'t deliver notification: \" + notification);\n						e.printStackTrace();\n					}\n					//\n					// Now send the operation request\n					//\n					if (request instanceof Request) {\n						try {\n							System.out.println(\"APPC request sent:\");\n							System.out.println(Serialization.gsonPretty.toJson(request));\n							PolicyEngine.manager.deliver($params.getAppcTopic(), request);\n						} catch (Exception e) {\n							e.printStackTrace();\n							System.out.println(\"Can\'t deliver request: \" + request);\n						}\n					}\n				} else {\n					//\n					// what happens if it is null\n					//\n				}\n			}\n			break;\n			case \"MSO\":\n			{\n				//\n				// Construct an operation\n				//\n				ControlLoopOperation operation = new ControlLoopOperation();\n				operation.actor = $params.getActor();\n				operation.operation = \"createModuleInstance\";\n				operation.target = $event.target;\n				//\n				// Create operationWrapper\n				//\n				ControlLoopOperationWrapper operationWrapper = new ControlLoopOperationWrapper($event.requestID, operation);\n				//\n				// Construct an MSO request\n				//\n				MSORequest request = new MSORequest();\n				request.requestDetails = new MSORequestDetails();\n				request.requestDetails.modelInfo = new MSOModelInfo();\n				request.requestDetails.cloudConfiguration = new MSOCloudConfiguration();\n				request.requestDetails.requestInfo = new MSORequestInfo();\n				request.requestDetails.requestParameters = new MSORequestParameters();\n				request.requestDetails.requestParameters.userParams = null;\n				//\n				// cloudConfiguration\n				//\n				request.requestDetails.cloudConfiguration.lcpCloudRegionId = cloudRegionItemCloudRegionId;\n				request.requestDetails.cloudConfiguration.tenantId = tenantItemTenantId;\n				//\n				// modelInfo\n				//\n				request.requestDetails.modelInfo.modelType = \"vfModule\";\n				request.requestDetails.modelInfo.modelInvariantId = vfModuleItemPersonaModelId;\n				request.requestDetails.modelInfo.modelNameVersionId = vfModuleItemModelNameVersionId;\n				request.requestDetails.modelInfo.modelName = vfModuleItemModelName;\n				request.requestDetails.modelInfo.modelVersion = vfModuleItemPersonaModelVersion;\n				//\n				// requestInfo\n				//\n				request.requestDetails.requestInfo.instanceName = vfModuleItemVfModuleName;\n				request.requestDetails.requestInfo.source = \"POLICY\";\n				request.requestDetails.requestInfo.suppressRollback = false;\n				//\n				// relatedInstanceList\n				//\n				MSORelatedInstanceListElement relatedInstanceListElement1 = new MSORelatedInstanceListElement();\n				MSORelatedInstanceListElement relatedInstanceListElement2 = new MSORelatedInstanceListElement();\n				relatedInstanceListElement1.relatedInstance = new MSORelatedInstance();\n				relatedInstanceListElement2.relatedInstance = new MSORelatedInstance();\n				//\n				relatedInstanceListElement1.relatedInstance.instanceId = serviceItemServiceInstanceId;\n				relatedInstanceListElement1.relatedInstance.modelInfo = new MSOModelInfo();\n				relatedInstanceListElement1.relatedInstance.modelInfo.modelType = \"service\";\n				relatedInstanceListElement1.relatedInstance.modelInfo.modelInvariantId = serviceItemPersonaModelId;\n				relatedInstanceListElement1.relatedInstance.modelInfo.modelNameVersionId = serviceItemModelNameVersionId;\n				relatedInstanceListElement1.relatedInstance.modelInfo.modelName = serviceItemModelName;\n				relatedInstanceListElement1.relatedInstance.modelInfo.modelVersion = serviceItemModelVersion;\n				//\n				relatedInstanceListElement2.relatedInstance.instanceId = vnfItemVnfId;\n				relatedInstanceListElement2.relatedInstance.modelInfo = new MSOModelInfo();\n				relatedInstanceListElement2.relatedInstance.modelInfo.modelType = \"vnf\";\n				relatedInstanceListElement2.relatedInstance.modelInfo.modelInvariantId = vnfItemPersonaModelId;\n				relatedInstanceListElement2.relatedInstance.modelInfo.modelNameVersionId = vnfItemModelNameVersionId;\n				relatedInstanceListElement2.relatedInstance.modelInfo.modelName = vnfItemModelName;\n				relatedInstanceListElement2.relatedInstance.modelInfo.modelVersion = vnfItemModelVersion;\n				relatedInstanceListElement2.relatedInstance.modelInfo.modelCustomizationName = vnfItemVnfType;\n				//	\n				request.requestDetails.relatedInstanceList.add(relatedInstanceListElement1);\n				request.requestDetails.relatedInstanceList.add(relatedInstanceListElement2);\n				//\n				// print MSO request for debug\n				//\n				System.out.println(\"MSO request sent:\");\n				System.out.println(Serialization.gsonPretty.toJson(request));\n				//\n				//\n				//\n				if (request != null) {\n					//\n					// Tell interested parties we are performing this Operation\n					//\n					VirtualControlLoopNotification notification = new VirtualControlLoopNotification($event);\n					notification.notification = ControlLoopNotificationType.OPERATION;\n					notification.from = \"policy\";\n					notification.policyName = drools.getRule().getName();\n					notification.policyScope = \"com\";\n					notification.policyVersion = \"1\";\n					try {\n						System.out.println(Serialization.gsonPretty.toJson(notification));\n						PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n					} catch (Exception e) {\n						System.out.println(\"Can\'t deliver notification: \" + notification);\n						e.printStackTrace();\n					}\n					//\n					// Concatenate serviceItemServiceInstanceId and vnfItemVnfId to msoURL\n					//\n					String MSOUrl = $params.getMsoURL() + \"/serviceInstances/v2/\" + serviceItemServiceInstanceId + \"/vnfs/\" + vnfItemVnfId + \"/vfModules\";\n					//\n					// Call MSO\n					//\n					MSOResponse response = MSOManager.createModuleInstance(MSOUrl, $params.getMsoURL(), $params.getMsoUsername(), $params.getMsoPassword(), request);\n					//\n					if (response != null) {\n						//\n						// Assign requestId\n						//\n						request.requestId = $event.requestID.toString();						\n						response.request.requestId = $event.requestID.toString();\n						//\n						// Insert facts\n						//\n						insert(operationWrapper);\n						insert(request);\n						insert(response);\n					} else {\n						//\n						// MSO request not even accepted\n						//\n						notification.message = operationWrapper.operation.toMessage();\n						operationWrapper.operation.message = operationWrapper.operation.toMessage();\n						operationWrapper.operation.outcome = \"FAILURE_EXCEPTION\";\n						$manager.setControlLoopResult(\"FAILURE_EXCEPTION\");\n						notification.history.add(operationWrapper.operation);\n						notification.notification = ControlLoopNotificationType.OPERATION_FAILURE;\n						//\n						// Let interested parties know\n						//\n						try {\n							System.out.println(Serialization.gsonPretty.toJson(notification));\n							PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n						} catch (Exception e) {\n							System.out.println(\"Can\'t deliver notification: \" + notification);\n							e.printStackTrace();\n						}\n	                    notification.notification = ControlLoopNotificationType.FINAL_FAILURE;\n                        try {\n                        	System.out.println(Serialization.gsonPretty.toJson(notification));\n                        	PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n                        } catch (Exception e) {\n                        	System.out.println(\"Can\'t deliver notification: \" + notification);\n                        	e.printStackTrace();\n                        }\n						//\n						// Retract everything\n						//\n						retract($event);\n						retract($manager);\n					}\n				} else {\n					System.err.println(\"constructed MSO request is invalid.\");\n				}\n			}\n			break; \n		} \nend\n		\n/*\n*\n* This rule responds to APPC Response Events\n*\n*/\nrule \"BRMSParamvLBDemoPolicy.APPC.RESPONSE\"\n	when\n		$params : Params( getClosedLoopControlName() == \"CL-DNS-LOW-TRAFFIC-SIG-d925ed73-8231-4d02-9545-db4e101f88f8\" )\n		$event : VirtualControlLoopEvent( closedLoopControlName == $params.getClosedLoopControlName(), closedLoopEventStatus == ControlLoopEventStatus.ONSET )\n		$manager : EventManager( closedLoopControlName == $event.closedLoopControlName )\n		$operationWrapper : ControlLoopOperationWrapper( requestID == $event.requestID )\n		$request : Request( getCommonHeader().RequestID == $event.requestID )\n		$response : Response( getCommonHeader().RequestID == $event.requestID )	\n	then\n		System.out.println(\"rule APPC.RESPONSE is triggered.\");\n		if ($response.Status == null) {\n			$operationWrapper.operation.outcome = \"FAILURE_EXCEPTION\";\n			$manager.setControlLoopResult(\"FAILURE_EXCEPTION\");\n		} \n		//\n		// Get the Response Code\n		//\n		ResponseCode code = ResponseCode.toResponseCode($response.Status.Code);\n		if (code == null) {\n			$operationWrapper.operation.outcome = \"FAILURE_EXCEPTION\";\n			$manager.setControlLoopResult(\"FAILURE_EXCEPTION\");\n		}\n		//\n		// Construct notification\n		//\n		VirtualControlLoopNotification notification = new VirtualControlLoopNotification($event);\n		notification.from = \"policy\";\n		notification.policyName = drools.getRule().getName();\n		notification.policyScope = \"com\";\n		notification.policyVersion = \"1\";\n		notification.message = $operationWrapper.operation.toMessage();\n		$operationWrapper.operation.message = $operationWrapper.operation.toMessage();\n		//\n		// Ok, let\'s figure out what APP-C\'s response is\n		//\n		switch (code) {\n			case ACCEPT:\n				$operationWrapper.operation.outcome = \"PROCESSING\";\n				break;\n			case ERROR:\n			case REJECT:\n				$operationWrapper.operation.outcome = \"FAILURE_EXCEPTION\";\n				$manager.setControlLoopResult(\"FAILURE_EXCEPTION\");\n				break;\n			case SUCCESS:\n				$operationWrapper.operation.outcome = \"SUCCESS\";\n				$manager.setControlLoopResult(\"SUCCESS\");\n				break;\n			case FAILURE:\n				$operationWrapper.operation.outcome = \"FAILURE\";\n				$manager.setControlLoopResult(\"FAILURE\");\n				break;\n		}\n		if ($operationWrapper.operation.outcome.equals(\"SUCCESS\")) {\n			notification.history.add($operationWrapper.operation);\n			notification.notification = ControlLoopNotificationType.OPERATION_SUCCESS;\n			//\n			// Let interested parties know\n			//\n			try {\n				System.out.println(Serialization.gsonPretty.toJson(notification));\n				PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n			} catch (Exception e) {\n				System.out.println(\"Can\'t deliver notification: \" + notification);\n				e.printStackTrace();\n			}\n            notification.notification = ControlLoopNotificationType.FINAL_SUCCESS;\n            try {\n            	System.out.println(Serialization.gsonPretty.toJson(notification));\n            	PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n            } catch (Exception e) {\n            	System.out.println(\"Can\'t deliver notification: \" + notification);\n            	e.printStackTrace();\n            }\n\n			//\n			// We are going to retract these objects from memory\n			//\n			System.out.println(\"Retracting everything\");\n			retract($operationWrapper);\n			retract($request);\n			retract($response);\n			retract($event);\n			retract($manager);\n		} else if ($operationWrapper.operation.outcome.equals(\"PROCESSING\")) {\n			retract($response);\n		} else {\n			notification.history.add($operationWrapper.operation);\n			notification.notification = ControlLoopNotificationType.OPERATION_FAILURE;\n			//\n			// Let interested parties know\n			//\n			try {\n				System.out.println(Serialization.gsonPretty.toJson(notification));\n				PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n			} catch (Exception e) {\n				System.out.println(\"Can\'t deliver notification: \" + notification);\n				e.printStackTrace();\n			}\n            notification.notification = ControlLoopNotificationType.FINAL_FAILURE;\n            //\n            // Let interested parties know\n            //\n            try {\n            	System.out.println(Serialization.gsonPretty.toJson(notification));\n            	PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n            } catch (Exception e) {\n            	System.out.println(\"Can\'t deliver notification: \" + notification);\n            	e.printStackTrace();\n            }\n			//\n			// We are going to retract these objects from memory\n			//\n			System.out.println(\"Retracting everything\");\n			retract($operationWrapper);\n			retract($request);\n			retract($response);\n			retract($event);\n			retract($manager);\n		}\n		\nend		\n\n/*\n*\n* This rule is used to clean up APPC response\n*\n*/		\nrule \"BRMSParamvLBDemoPolicy.APPC.RESPONSE.CLEANUP\"\n	when\n		$params : Params( getClosedLoopControlName() == \"CL-DNS-LOW-TRAFFIC-SIG-d925ed73-8231-4d02-9545-db4e101f88f8\" )\n        $response : Response($id : getCommonHeader().RequestID )\n		not ( VirtualControlLoopEvent( closedLoopControlName == $params.getClosedLoopControlName(), requestID == $id, closedLoopEventStatus == ControlLoopEventStatus.ONSET ) ) \n	then\n		System.out.println(\"rule APPC.RESPONSE.CLEANUP is triggered.\");\n		retract($response);\nend\n\n/*\n*\n* This rule responds to MSO Response Events\n*\n*/\nrule \"BRMSParamvLBDemoPolicy.MSO.RESPONSE\"\n	when\n		$params : Params( getClosedLoopControlName() == \"CL-DNS-LOW-TRAFFIC-SIG-d925ed73-8231-4d02-9545-db4e101f88f8\" )\n		$event : VirtualControlLoopEvent( closedLoopControlName == $params.getClosedLoopControlName(), closedLoopEventStatus == ControlLoopEventStatus.ONSET )\n		$manager : EventManager( closedLoopControlName == $event.closedLoopControlName )\n		$operationWrapper : ControlLoopOperationWrapper( requestID == $event.requestID )\n		$request : MSORequest( requestId == $event.requestID.toString() )\n		$response : MSOResponse( request.requestId == $event.requestID.toString() )	\n	then\n		System.out.println(\"rule MSO.RESPONSE is triggered.\");\n		//\n		// Construct notification\n		//\n		VirtualControlLoopNotification notification = new VirtualControlLoopNotification($event);\n		notification.from = \"policy\";\n		notification.policyName = drools.getRule().getName();\n		notification.policyScope = \"com\";\n		notification.policyVersion = \"1\";\n		notification.message = $operationWrapper.operation.toMessage();\n		$operationWrapper.operation.message = $operationWrapper.operation.toMessage();\n		//\n		// The operation can either be succeeded or failed\n		// \n		if($response.request.requestStatus.requestState.equals(\"COMPLETE\")) {\n			$operationWrapper.operation.outcome = \"SUCCESS\";\n			$manager.setControlLoopResult(\"SUCCESS\");\n			notification.history.add($operationWrapper.operation);\n			notification.notification = ControlLoopNotificationType.OPERATION_SUCCESS;\n			//\n			// Let interested parties know\n			//\n			try {\n				System.out.println(Serialization.gsonPretty.toJson(notification));\n				PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n			} catch (Exception e) {\n				System.out.println(\"Can\'t deliver notification: \" + notification);\n				e.printStackTrace();\n			}\n			notification.notification = ControlLoopNotificationType.FINAL_SUCCESS;\n            //\n            // Let interested parties know\n            //\n            try {\n            	System.out.println(Serialization.gsonPretty.toJson(notification));\n            	PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n            } catch (Exception e) {\n            	System.out.println(\"Can\'t deliver notification: \" + notification);\n            	e.printStackTrace();\n            }\n            //\n			// We are going to retract these objects from memory\n			//\n			System.out.println(\"Retracting everything\");\n			retract($operationWrapper);\n			retract($request);\n			retract($response);\n			retract($event);\n			retract($manager);\n		} else {\n			$operationWrapper.operation.outcome = \"FAILURE\";\n			$manager.setControlLoopResult(\"FAILURE\");\n			notification.history.add($operationWrapper.operation);\n			notification.notification = ControlLoopNotificationType.OPERATION_FAILURE;\n			//\n			// Let interested parties know\n			//\n			try {\n				System.out.println(Serialization.gsonPretty.toJson(notification));\n				PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n			} catch (Exception e) {\n				System.out.println(\"Can\'t deliver notification: \" + notification);\n				e.printStackTrace();\n			}\n			notification.notification = ControlLoopNotificationType.FINAL_FAILURE;\n            //\n            // Let interested parties know\n            //\n            try {\n            	System.out.println(Serialization.gsonPretty.toJson(notification));\n            	PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n            } catch (Exception e) {\n            	System.out.println(\"Can\'t deliver notification: \" + notification);\n            	e.printStackTrace();\n            }\n            //\n			// We are going to retract these objects from memory\n			//\n			System.out.println(\"Retracting everything\");\n			retract($operationWrapper);\n			retract($request);\n			retract($response);\n			retract($event);\n			retract($manager);\n		}\n		\nend	\nrule \"com.Config_BRMS_Param_BRMSParamvLBDemoPolicy.Params\" \n	salience 1000 \n	when\n	then\n		Params params = new Params();\n		params.setAaiPatternMatch(0);\n		params.setAppcTopic(\"APPC-CL\");\n		params.setAaiURL(\"https://aai.api.simpledemo.openecomp.org:8443\");\n		params.setMsoPassword(\"password1$\");\n		params.setClosedLoopControlName(\"CL-DNS-LOW-TRAFFIC-SIG-d925ed73-8231-4d02-9545-db4e101f88f8\");\n		params.setAaiUsername(\"POLICY\");\n		params.setMsoURL(\"http://vm1.mso.simpledemo.openecomp.org:8080/ecomp/mso/infra\");\n		params.setActor(\"MSO\");\n		params.setMsoUsername(\"InfraPortalClient\");\n		params.setAaiNamedQueryUUID(\"f199cb88-5e69-4b1f-93e0-6f257877d066\");\n		params.setAaiPassword(\"POLICY\");\n		params.setNotificationTopic(\"POLICY-CL-MGT\");\n		insert(params);\nend\r\n','OTHER','com.Config_BRMS_Param_BRMSParamvLBDemoPolicy.1.txt','doACPolicyPut','2017-03-14 20:00:56',0,'','doACPolicyPut','2017-03-14 20:00:56',1);
+INSERT INTO `configurationdataentity` VALUES (3201,'/* Autogenerated Code Please Don\'t change/remove this comment section. This is for the UI purpose. \n	 <$%BRMSParamTemplate=ControlLoopDemo__closedLoopControlName%$> \n */ \n\r\n\r\n/*-\n * ============LICENSE_START=======================================================\n * archetype-closed-loop-demo-rules\n * ================================================================================\n * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.\n * ================================================================================\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n * \n *      http://www.apache.org/licenses/LICENSE-2.0\n * \n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n * ============LICENSE_END=========================================================\n */\n\npackage org.onap.policy.controlloop;\n\nimport java.util.List;\nimport java.util.LinkedList;\nimport java.util.Map;\nimport java.util.HashMap;\nimport java.util.UUID;\n\nimport org.onap.policy.controlloop.VirtualControlLoopEvent;\nimport org.onap.policy.controlloop.ControlLoopEventStatus;\nimport org.onap.policy.controlloop.VirtualControlLoopNotification;\nimport org.onap.policy.controlloop.ControlLoopNotificationType;\nimport org.onap.policy.controlloop.ControlLoopOperation;\nimport org.onap.policy.controlloop.ControlLoopOperationWrapper;\nimport org.onap.policy.template.demo.ControlLoopException;\n\nimport org.onap.policy.aai.AAINQF199.AAINQF199CloudRegion;\nimport org.onap.policy.aai.AAINQF199.AAINQF199ExtraProperties;\nimport org.onap.policy.aai.AAINQF199.AAINQF199ExtraProperty;\nimport org.onap.policy.aai.AAINQF199.AAINQF199GenericVNF;\nimport org.onap.policy.aai.AAINQF199.AAINQF199InstanceFilters;\nimport org.onap.policy.aai.AAINQF199.AAINQF199InventoryResponseItem;\nimport org.onap.policy.aai.AAINQF199.AAINQF199InventoryResponseItems;\nimport org.onap.policy.aai.AAINQF199.AAINQF199Manager;\nimport org.onap.policy.aai.AAINQF199.AAINQF199NamedQuery;\nimport org.onap.policy.aai.AAINQF199.AAINQF199QueryParameters;\nimport org.onap.policy.aai.AAINQF199.AAINQF199Request;\nimport org.onap.policy.aai.AAINQF199.AAINQF199RequestWrapper;\nimport org.onap.policy.aai.AAINQF199.AAINQF199Response;\nimport org.onap.policy.aai.AAINQF199.AAINQF199ResponseWrapper;\nimport org.onap.policy.aai.AAINQF199.AAINQF199ServiceInstance;\nimport org.onap.policy.aai.AAINQF199.AAINQF199Tenant;\nimport org.onap.policy.aai.AAINQF199.AAINQF199VfModule;\nimport org.onap.policy.aai.AAINQF199.AAINQF199VServer;\nimport org.onap.policy.aai.util.Serialization;\n\nimport org.onap.policy.appc.CommonHeader;\nimport org.onap.policy.appc.Request;\nimport org.onap.policy.appc.Response;\nimport org.onap.policy.appc.ResponseCode;\nimport org.onap.policy.appc.ResponseStatus;\nimport org.onap.policy.appc.ResponseValue;\n\nimport org.onap.policy.template.demo.EventManager;\nimport org.onap.policy.vnf.trafficgenerator.PGRequest;\nimport org.onap.policy.vnf.trafficgenerator.PGStream;\nimport org.onap.policy.vnf.trafficgenerator.PGStreams;\n\nimport org.onap.policy.mso.MSOManager;\nimport org.onap.policy.mso.MSORequest;\nimport org.onap.policy.mso.MSORequestStatus;\nimport org.onap.policy.mso.MSORequestDetails;\nimport org.onap.policy.mso.MSOModelInfo;\nimport org.onap.policy.mso.MSOCloudConfiguration;\nimport org.onap.policy.mso.MSORequestInfo;\nimport org.onap.policy.mso.MSORequestParameters;\nimport org.onap.policy.mso.MSORelatedInstanceListElement;\nimport org.onap.policy.mso.MSORelatedInstance;\nimport org.onap.policy.mso.MSOResponse;\n\nimport org.onap.policy.drools.system.PolicyEngine;\n\n//\n// These parameters are required to build the runtime policy\n//\ndeclare Params\n    closedLoopControlName : String\n    actor : String\n    aaiURL : String\n    aaiUsername : String\n    aaiPassword : String\n    msoURL : String\n    msoUsername : String\n    msoPassword : String\n    aaiNamedQueryUUID : String\n    aaiPatternMatch : int \n    notificationTopic : String\n    appcTopic : String\nend\n\n/*\n*\n* Called once and only once to insert the parameters into working memory for this Closed Loop policy.\n* (Comment SETUP rule out for the first ONAP opensource release since policy BRMS_GW already puts a Params fact in there)\n*\n*\n*rule \"BRMSParamvFWDemoPolicy.SETUP\"\n*	when\n*	then\n*		System.out.println(\"rule SETUP is triggered.\");\n*		Params params = new Params();\n*		params.setClosedLoopControlName(\"CL-FRWL-LOW-TRAFFIC-SIG-d925ed73-8231-4d02-9545-db4e101f88f8\");\n*		params.setActor(\"APPC\");\n*		params.setAaiURL(\"null\");\n*		params.setAaiUsername(\"null\");\n*		params.setAaiPassword(\"null\");\n*		params.setMsoURL(\"null\");\n*		params.setMsoUsername(\"null\");\n*		params.setMsoPassword(\"null\");\n*		params.setAaiNamedQueryUUID(\"null\");\n*		params.setAaiPatternMatch(1);\n*		params.setNotificationTopic(\"POLICY-CL-MGT\");\n*		params.setAppcTopic(\"APPC-CL\");\n*		//\n*		// This stays in memory as long as the rule is alive and running\n*		//\n*		insert(params);\n*end\n*/\n/*\n*\n* This rule responds to DCAE Events\n*\n*/\nrule \"BRMSParamvFWDemoPolicy.EVENT\"\n	when\n        $params : Params( getClosedLoopControlName() == \"CL-FRWL-LOW-TRAFFIC-SIG-d925ed73-8231-4d02-9545-db4e101f88f8\" )\n        $event : VirtualControlLoopEvent( closedLoopControlName == $params.getClosedLoopControlName(), closedLoopEventStatus == ControlLoopEventStatus.ONSET )\n        not ( EventManager( closedLoopControlName == $event.closedLoopControlName ))\n	then\n		System.out.println(\"rule EVENT is triggered.\");\n		try {\n			// \n			// Check the requestID in the event to make sure it is not null before we create the EventManager. \n			// The EventManager will do extra syntax checking as well check if the closed loop is disabled/\n			//\n			if ($event.requestID == null) {\n				VirtualControlLoopNotification notification = new VirtualControlLoopNotification($event);\n				notification.notification = ControlLoopNotificationType.REJECTED;\n				notification.from = \"policy\";\n				notification.message = \"Missing requestID from DCAE event\";\n				notification.policyName = drools.getRule().getName();\n				notification.policyScope = \"com\";\n				notification.policyVersion = \"1\";\n				//\n				// Let interested parties know\n				//\n				try {\n					System.out.println(Serialization.gsonPretty.toJson(notification));\n					PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n				} catch (Exception e) {\n					e.printStackTrace();\n					System.out.println(\"Can\'t deliver notification: \" + notification);\n				}\n				//\n				// Retract it from memory\n				//\n				retract($event);\n				System.out.println(\"Event with requestID=null has been retracted.\");\n			} else {\n				//\n				// Create an EventManager\n				//\n				EventManager manager = new EventManager($params.getClosedLoopControlName(), $event.requestID, $event.target);\n				//\n				// Determine if EventManager can actively process the event (i.e. syntax)\n				//\n				VirtualControlLoopNotification notification = manager.activate($event);\n				notification.from = \"policy\"; \n				notification.policyName = drools.getRule().getName();\n				notification.policyScope = \"com\";\n				notification.policyVersion = \"1\";\n				//\n				// Are we actively pursuing this event?\n				//\n				if (notification.notification == ControlLoopNotificationType.ACTIVE) {\n					//\n					// Insert Event Manager into memory, this will now kick off processing.\n					//\n					insert(manager);\n					//\n					// Let interested parties know\n					//\n					try {\n						System.out.println(Serialization.gsonPretty.toJson(notification));\n						PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n					} catch (Exception e) {\n						e.printStackTrace();\n						System.out.println(\"Can\'t deliver notification: \" + notification);\n					}		\n				} else {\n					//\n					// Let interested parties know\n					//\n					try {\n						System.out.println(Serialization.gsonPretty.toJson(notification));\n						PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n					} catch (Exception e) {\n						e.printStackTrace();\n						System.out.println(\"Can\'t deliver notification: \" + notification);\n					}\n					//\n					// Retract it from memory\n					//\n					retract($event);\n				}\n				//\n				// Now that the manager is inserted into Drools working memory, we\'ll wait for\n				// another rule to fire in order to continue processing. This way we can also\n				// then screen for additional ONSET and ABATED events for this same RequestIDs \n				// and for different RequestIDs but with the same closedLoopControlName and target.\n				//\n			}\n		//\n		} catch (Exception e) {\n			e.printStackTrace();\n			VirtualControlLoopNotification notification = new VirtualControlLoopNotification($event);\n			notification.notification = ControlLoopNotificationType.REJECTED;\n			notification.message = \"Exception occurred \" + e.getMessage();\n			notification.policyName = drools.getRule().getName();\n			notification.policyScope = \"com\";\n			notification.policyVersion = \"1\";\n			//\n			//\n			//\n			try {\n				System.out.println(Serialization.gsonPretty.toJson(notification));\n				PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n			} catch (Exception e1) {\n				System.out.println(\"Can\'t deliver notification: \" + notification);\n				e1.printStackTrace();\n			}\n			//\n			// Retract the event\n			//\n			retract($event);\n		}\nend\n\n/*\n*\n* This rule happens when we got a valid ONSET, closed loop is enabled and an Event Manager\n* is created. We can start the operations for this closed loop.\n*\n*/\nrule \"BRMSParamvFWDemoPolicy.EVENT.MANAGER\"\n	when\n		$params : Params( getClosedLoopControlName() == \"CL-FRWL-LOW-TRAFFIC-SIG-d925ed73-8231-4d02-9545-db4e101f88f8\" )\n		$event : VirtualControlLoopEvent( closedLoopControlName == $params.getClosedLoopControlName(), closedLoopEventStatus == ControlLoopEventStatus.ONSET )\n		$manager : EventManager( closedLoopControlName == $event.closedLoopControlName, controlLoopResult == null)\n	then\n		System.out.println(\"rule EVENT.MANAGER is triggered.\");\n		//\n		// Check which event this is.\n		//\n		EventManager.NEW_EVENT_STATUS eventStatus = $manager.onNewEvent($event);\n		//\n		// We only want the initial ONSET event in memory,\n		// all the other events need to be retracted to support\n		// cleanup and avoid the other rules being fired for this event.\n		//\n		if (eventStatus != EventManager.NEW_EVENT_STATUS.FIRST_ONSET) {\n			System.out.println(\"Retracting \"+eventStatus+\" Event.\");\n			retract($event);\n			return;\n		}\n		//\n		// Now the event in memory is first onset event\n		//\n		try {\n			//\n			// Pull the known AAI field from the Event\n			//\n			// generic-vnf is needed for vFirewall case\n			// vserver-name is needed for vLoadBalancer case\n			//\n			String genericVNF = $event.AAI.get(\"generic-vnf.vnf-id\");\n			String vserver = $event.AAI.get(\"vserver.vserver-name\");\n			//\n			// Check if we are implementing a simple pattern match.\n			//\n			if ($params.getAaiPatternMatch() == 1) {\n				//\n				// Yes\n				//\n				//Basic naming characteristics:\n				//VF Name (9 char)+VM name (13 char total)+VFC (19 char total)\n				//Example: \n				//VF Name (9 characters):    cscf0001v\n				//VM Name(13 characters): cscf0001vm001\n				//VFC name(19 characters): cscf0001vm001cfg001\n				//\n				// zdfw1fwl01fwl02 or zdfw1fwl01fwl01  \n				// replaced with\n				// zdfw1fwl01pgn02 or zdfw1fwl01pgn01\n				//\n				int index = genericVNF.lastIndexOf(\"fwl\");\n				if (index == -1) {\n					System.err.println(\"The generic-vnf.vnf-id from DCAE Event is not valid.\");\n				} else {\n					genericVNF = genericVNF.substring(0, index) + \"pgn\" + genericVNF.substring(index+\"fwl\".length());\n				}\n				//\n				// Construct an APPC request\n				//\n				ControlLoopOperation operation = new ControlLoopOperation();\n				operation.actor = $params.getActor();\n				operation.operation = \"ModifyConfig\";\n				operation.target = $event.target;\n				//\n				// Create operationWrapper\n				//\n				ControlLoopOperationWrapper operationWrapper = new ControlLoopOperationWrapper($event.requestID, operation);\n				//\n				// insert operationWrapper into memory\n				//\n				insert(operationWrapper);\n				//\n				Request request = new Request();\n				request.CommonHeader = new CommonHeader();\n				request.CommonHeader.RequestID = $event.requestID;\n				request.Action = operation.operation;\n				request.Payload = new HashMap<String, Object>();\n				//\n				// Fill in the payload\n				//\n				request.Payload.put(\"generic-vnf.vnf-id\", genericVNF);\n				//\n				PGRequest pgRequest = new PGRequest();\n				pgRequest.pgStreams = new PGStreams();\n				\n				PGStream pgStream;\n				for(int i = 0; i < 5; i++){\n					pgStream = new PGStream();\n					pgStream.streamId = \"fw_udp\"+(i+1);\n					pgStream.isEnabled = \"true\";\n					pgRequest.pgStreams.pgStream.add(pgStream);\n				}\n				request.Payload.put(\"pg-streams\", pgRequest.pgStreams);\n				\n				if (request != null) {\n					//\n					// Insert request into memory\n					//\n					insert(request);\n					//\n					// Tell interested parties we are performing this Operation\n					//\n					VirtualControlLoopNotification notification = new VirtualControlLoopNotification($event);\n					notification.notification = ControlLoopNotificationType.OPERATION;\n					// message and history ??\n					notification.from = \"policy\";\n					notification.policyName = drools.getRule().getName();\n					notification.policyScope = \"com\";\n					notification.policyVersion = \"1\";\n					try {\n						System.out.println(Serialization.gsonPretty.toJson(notification));\n						PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n					} catch (Exception e) {\n						System.out.println(\"Can\'t deliver notification: \" + notification);\n						e.printStackTrace();\n					}\n					//\n					// Now send the operation request\n					//\n					if (request instanceof Request) {\n						try {\n							System.out.println(\"APPC request sent:\");\n							System.out.println(Serialization.gsonPretty.toJson(request));\n							PolicyEngine.manager.deliver($params.getAppcTopic(), request);\n						} catch (Exception e) {\n							e.printStackTrace();\n							System.out.println(\"Can\'t deliver request: \" + request);\n						}\n					}\n				} else {\n					//\n					// what happens if it is null\n					//\n				}\n				//\n			} else {\n				//\n				// create AAI named-query request with UUID started with \"F199\"\n				//\n				AAINQF199Request aainqf199request = new AAINQF199Request();\n				AAINQF199QueryParameters aainqf199queryparam = new AAINQF199QueryParameters();\n				AAINQF199NamedQuery aainqf199namedquery = new AAINQF199NamedQuery();\n				AAINQF199InstanceFilters aainqf199instancefilter = new AAINQF199InstanceFilters();\n				//\n				// queryParameters\n				//\n				aainqf199namedquery.namedQueryUUID = UUID.fromString($params.getAaiNamedQueryUUID()); \n				aainqf199queryparam.namedQuery = aainqf199namedquery;\n				aainqf199request.queryParameters = aainqf199queryparam;\n				//\n				// instanceFilters\n				//\n				Map aainqf199instancefiltermap = new HashMap();\n				Map aainqf199instancefiltermapitem = new HashMap();\n				aainqf199instancefiltermapitem.put(\"vserver-name\", vserver); \n				aainqf199instancefiltermap.put(\"vserver\", aainqf199instancefiltermapitem);\n				aainqf199instancefilter.instanceFilter.add(aainqf199instancefiltermap);\n				aainqf199request.instanceFilters = aainqf199instancefilter;\n				//\n				// print aainqf199request for debug\n				//\n				System.out.println(\"AAI Request sent:\");\n				System.out.println(Serialization.gsonPretty.toJson(aainqf199request));\n				//\n				// Create AAINQF199RequestWrapper\n				//\n				AAINQF199RequestWrapper aainqf199RequestWrapper = new AAINQF199RequestWrapper($event.requestID, aainqf199request);\n				//\n				// insert aainqf199request into memory\n				//\n				insert(aainqf199RequestWrapper);\n			}\n			//\n		} catch (Exception e) {\n		 e.printStackTrace();\n		}\nend\n\n/*\n*\n* This rule happens when we got a valid ONSET, closed loop is enabled, an Event Manager\n* is created, AAI Manager and AAI Request are ready in memory. We can start sending query to AAI and then wait for response.\n*\n*/\nrule \"BRMSParamvFWDemoPolicy.EVENT.MANAGER.AAINQF199REQUEST\"\n	when\n		$params : Params( getClosedLoopControlName() == \"CL-FRWL-LOW-TRAFFIC-SIG-d925ed73-8231-4d02-9545-db4e101f88f8\" )\n		$event : VirtualControlLoopEvent( closedLoopControlName == $params.getClosedLoopControlName(), closedLoopEventStatus == ControlLoopEventStatus.ONSET )\n		$manager : EventManager( closedLoopControlName == $event.closedLoopControlName )\n		$aainqf199RequestWrapper : AAINQF199RequestWrapper(requestID == $event.requestID)\n	then\n		System.out.println(\"rule EVENT.MANAGER.AAINQF199REQUEST is triggered.\");\n		//\n		// send the request\n		//\n		AAINQF199Response aainqf199response = AAINQF199Manager.postQuery($params.getAaiURL(), $params.getAaiUsername(), $params.getAaiPassword(),\n													   $aainqf199RequestWrapper.aainqf199request, $event.requestID);\n		//\n		// Check AAI response\n		//\n		if (aainqf199response == null) {\n			System.err.println(\"Failed to get AAI response\");\n			//\n			// Fail and retract everything\n			//\n			retract($event);\n			retract($manager);\n			retract($aainqf199RequestWrapper);\n		} else {\n			//\n			// Create AAINQF199ResponseWrapper\n			//\n			AAINQF199ResponseWrapper aainqf199ResponseWrapper = new AAINQF199ResponseWrapper($event.requestID, aainqf199response);\n			//\n			// insert aainqf199ResponseWrapper to memeory\n			//\n			insert(aainqf199ResponseWrapper);\n		}\nend\n\n/*\n*\n* This rule happens when we got a valid AAI response. We can start sending request to APPC or MSO now.\n*\n*/\nrule \"BRMSParamvFWDemoPolicy.EVENT.MANAGER.AAINQF199RESPONSE\"\n	when \n		$params : Params( getClosedLoopControlName() == \"CL-FRWL-LOW-TRAFFIC-SIG-d925ed73-8231-4d02-9545-db4e101f88f8\" )\n		$event : VirtualControlLoopEvent( closedLoopControlName == $params.getClosedLoopControlName(), closedLoopEventStatus == ControlLoopEventStatus.ONSET )\n		$manager : EventManager( closedLoopControlName == $event.closedLoopControlName )\n		$aainqf199RequestWrapper : AAINQF199RequestWrapper(requestID == $event.requestID)\n		$aainqf199ResponseWrapper : AAINQF199ResponseWrapper(requestID == $event.requestID)\n	then\n		System.out.println(\"rule EVENT.MANAGER.AAINQF199RESPONSE is triggered.\");\n		//\n		// Extract related fields out of AAINQF199RESPONSE\n		//\n		String vnfItemVnfId, vnfItemVnfType, vnfItemPersonaModelId, vnfItemPersonaModelVersion, vnfItemModelName, \n		       vnfItemModelVersion, vnfItemModelNameVersionId, serviceItemServiceInstanceId, serviceItemPersonaModelId,\n		       serviceItemModelName, serviceItemModelType, serviceItemModelVersion, serviceItemModelNameVersionId,\n		       vfModuleItemVfModuleName, vfModuleItemPersonaModelId, vfModuleItemPersonaModelVersion, vfModuleItemModelName, \n		       vfModuleItemModelNameVersionId, tenantItemTenantId, cloudRegionItemCloudRegionId;\n		try {\n			//\n			// vnfItem\n			//\n			vnfItemVnfId = $aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).genericVNF.vnfID;\n			vnfItemVnfType = $aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).genericVNF.vnfType;\n			vnfItemVnfType = vnfItemVnfType.substring(vnfItemVnfType.lastIndexOf(\"/\")+1);\n			vnfItemPersonaModelId = $aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).genericVNF.personaModelId;\n			vnfItemPersonaModelVersion = $aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).genericVNF.personaModelVersion;\n			vnfItemModelName = $aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).extraProperties.extraProperty.get(0).propertyValue;\n			vnfItemModelVersion = 		$aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).extraProperties.extraProperty.get(2).propertyValue;\n			vnfItemModelNameVersionId = 	$aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).extraProperties.extraProperty.get(4).propertyValue;\n			//\n			// serviceItem\n			//\n			serviceItemServiceInstanceId = $aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).serviceInstance.serviceInstanceID;\n			serviceItemPersonaModelId = $aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).serviceInstance.personaModelId;\n			serviceItemModelName = $aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).extraProperties.extraProperty.get(0).propertyValue;\n			serviceItemModelType = $aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).extraProperties.extraProperty.get(1).propertyValue;\n			serviceItemModelVersion = $aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).serviceInstance.personaModelVersion;\n			serviceItemModelNameVersionId = $aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).extraProperties.extraProperty.get(4).propertyValue;\n			//\n			// Find the index for base vf module and non-base vf module\n			//\n			int baseIndex = -1;\n			int nonBaseIndex = -1;\n			List<AAINQF199InventoryResponseItem> inventoryItems = $aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).items.inventoryResponseItems;\n			for (AAINQF199InventoryResponseItem m : inventoryItems) {\n				if (m.vfModule != null && m.vfModule.isBaseVfModule == true) {\n					baseIndex = inventoryItems.indexOf(m);\n				} else if (m.vfModule != null && m.vfModule.isBaseVfModule == false && m.vfModule.orchestrationStatus == null) {\n					nonBaseIndex = inventoryItems.indexOf(m);\n				}\n				//\n				if (baseIndex != -1 && nonBaseIndex != -1) {\n					break;\n				}\n			}\n			//\n			// Report the error if either base vf module or non-base vf module is not found\n			//\n			if (baseIndex == -1 || nonBaseIndex == -1) {\n				System.err.println(\"Either base or non-base vf module is not found from AAI response.\");\n				retract($aainqf199RequestWrapper);\n				retract($aainqf199ResponseWrapper);\n				retract($manager);\n				retract($event);\n				return;\n			}\n			//\n			// This comes from the base module\n			//\n			vfModuleItemVfModuleName = 			$aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).items.inventoryResponseItems.get(baseIndex).vfModule.vfModuleName;\n			vfModuleItemVfModuleName = vfModuleItemVfModuleName.replace(\"Vfmodule\", \"vDNS\");\n			//\n			// vfModuleItem - NOT the base module\n			//\n			vfModuleItemPersonaModelId = 		$aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).items.inventoryResponseItems.get(nonBaseIndex).vfModule.personaModelId;\n			vfModuleItemPersonaModelVersion = 	$aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).items.inventoryResponseItems.get(nonBaseIndex).vfModule.personaModelVersion;\n			vfModuleItemModelName = 			$aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).items.inventoryResponseItems.get(nonBaseIndex).extraProperties.extraProperty.get(0).propertyValue;\n			vfModuleItemModelNameVersionId = 	$aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).items.inventoryResponseItems.get(nonBaseIndex).extraProperties.extraProperty.get(4).propertyValue;\n			//\n			// tenantItem\n			//\n			tenantItemTenantId = $aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(1).tenant.tenantId;\n			//\n			// cloudRegionItem\n			//\n			cloudRegionItemCloudRegionId = $aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(1).items.inventoryResponseItems.get(0).cloudRegion.cloudRegionId;\n			//\n		} catch (Exception e) {\n			e.printStackTrace();\n			VirtualControlLoopNotification notification = new VirtualControlLoopNotification($event);\n			notification.notification = ControlLoopNotificationType.REJECTED;\n			notification.message = \"Exception occurred \" + e.getMessage();\n			notification.policyName = drools.getRule().getName();\n			notification.policyScope = \"com\";\n			notification.policyVersion = \"1\";\n			//\n			try {\n				System.out.println(Serialization.gsonPretty.toJson(notification));\n				PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n			} catch (Exception e1) {\n				System.out.println(\"Can\'t deliver notification: \" + notification);\n				e1.printStackTrace();\n			}\n			//\n			notification.notification = ControlLoopNotificationType.FINAL_FAILURE;\n			notification.message = \"Invalid named-query response from AAI\";\n            //\n            try {\n            	System.out.println(Serialization.gsonPretty.toJson(notification));\n                PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n            } catch (Exception e1) {\n                System.out.println(\"Can\'t deliver notification: \" + notification);\n                e1.printStackTrace();\n            }\n			//\n			// Retract everything\n			//\n			retract($aainqf199RequestWrapper);\n			retract($aainqf199ResponseWrapper);\n			retract($manager);\n			retract($event);\n			return;\n		}	\n		//\n		// Extracted fields should not be null\n		//\n		if ((vnfItemVnfId == null) || (vnfItemVnfType == null) ||\n		    (vnfItemPersonaModelId == null) || (vnfItemModelName == null) ||\n		    (vnfItemModelVersion == null) || (vnfItemModelNameVersionId == null) ||\n		    (serviceItemServiceInstanceId == null) || (serviceItemModelName == null) ||\n		    (serviceItemModelType == null) || (serviceItemModelVersion == null) ||\n		    (serviceItemModelNameVersionId == null) || (vfModuleItemVfModuleName == null) ||\n		    (vfModuleItemPersonaModelId == null) || (vfModuleItemPersonaModelVersion == null) ||\n		    (vfModuleItemModelName == null) || (vfModuleItemModelNameVersionId == null) ||\n		    (tenantItemTenantId == null) || (cloudRegionItemCloudRegionId == null)) {\n			//\n			System.err.println(\"some fields are missing from AAI response.\");\n			//\n			// Fail and retract everything\n			//\n			retract($aainqf199RequestWrapper);\n			retract($aainqf199ResponseWrapper);\n			retract($manager);\n			retract($event);\n			return;\n		}\n		//\n		// We don\'t need them any more\n		//\n		retract($aainqf199ResponseWrapper);\n		retract($aainqf199RequestWrapper);  \n		//\n		// check the actor of this closed loop\n		//\n		switch ($params.getActor()) {\n			case \"APPC\":\n			{\n				//\n				// Construct an APPC request\n				//\n				ControlLoopOperation operation = new ControlLoopOperation();\n				operation.actor = $params.getActor();\n				operation.operation = \"ModifyConfig\";\n				operation.target = $event.target;\n				//\n				// Create operationWrapper\n				//\n				ControlLoopOperationWrapper operationWrapper = new ControlLoopOperationWrapper($event.requestID, operation);\n				//\n				// insert operationWrapper into memory\n				//\n				insert(operationWrapper);\n				//\n				Request request = new Request();\n				request.CommonHeader = new CommonHeader();\n				request.CommonHeader.RequestID = $event.requestID;\n				request.Action = operation.operation;\n				request.Payload = new HashMap<String, Object>();\n				//\n				// Fill in the payload\n				// Hardcode genericVNF for now since AAI has not been ready for vFirewall demo case\n				//\n				String genericVNF = \"zdfw1fwl01pgn02\";\n				request.Payload.put(\"generic-vnf.vnf-id\", genericVNF);\n				//\n				PGRequest pgRequest = new PGRequest();\n				pgRequest.pgStreams = new PGStreams();\n				\n				PGStream pgStream;\n				for(int i = 0; i < 5; i++){\n					pgStream = new PGStream();\n					pgStream.streamId = \"fw_udp\"+(i+1);\n					pgStream.isEnabled = \"true\";\n					pgRequest.pgStreams.pgStream.add(pgStream);\n				}\n				request.Payload.put(\"pg-streams\", pgRequest.pgStreams);\n				\n				if (request != null) {\n					//\n					// Insert request into memory\n					//\n					insert(request);\n					//\n					// Tell interested parties we are performing this Operation\n					//\n					VirtualControlLoopNotification notification = new VirtualControlLoopNotification($event);\n					notification.notification = ControlLoopNotificationType.OPERATION;\n					// message and history ??\n					notification.from = \"policy\";\n					notification.policyName = drools.getRule().getName();\n					notification.policyScope = \"com\";\n					notification.policyVersion = \"1\";\n					try {\n						System.out.println(Serialization.gsonPretty.toJson(notification));\n						PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n					} catch (Exception e) {\n						System.out.println(\"Can\'t deliver notification: \" + notification);\n						e.printStackTrace();\n					}\n					//\n					// Now send the operation request\n					//\n					if (request instanceof Request) {\n						try {\n							System.out.println(\"APPC request sent:\");\n							System.out.println(Serialization.gsonPretty.toJson(request));\n							PolicyEngine.manager.deliver($params.getAppcTopic(), request);\n						} catch (Exception e) {\n							e.printStackTrace();\n							System.out.println(\"Can\'t deliver request: \" + request);\n						}\n					}\n				} else {\n					//\n					// what happens if it is null\n					//\n				}\n			}\n			break;\n			case \"MSO\":\n			{\n				//\n				// Construct an operation\n				//\n				ControlLoopOperation operation = new ControlLoopOperation();\n				operation.actor = $params.getActor();\n				operation.operation = \"createModuleInstance\";\n				operation.target = $event.target;\n				//\n				// Create operationWrapper\n				//\n				ControlLoopOperationWrapper operationWrapper = new ControlLoopOperationWrapper($event.requestID, operation);\n				//\n				// Construct an MSO request\n				//\n				MSORequest request = new MSORequest();\n				request.requestDetails = new MSORequestDetails();\n				request.requestDetails.modelInfo = new MSOModelInfo();\n				request.requestDetails.cloudConfiguration = new MSOCloudConfiguration();\n				request.requestDetails.requestInfo = new MSORequestInfo();\n				request.requestDetails.requestParameters = new MSORequestParameters();\n				request.requestDetails.requestParameters.userParams = null;\n				//\n				// cloudConfiguration\n				//\n				request.requestDetails.cloudConfiguration.lcpCloudRegionId = cloudRegionItemCloudRegionId;\n				request.requestDetails.cloudConfiguration.tenantId = tenantItemTenantId;\n				//\n				// modelInfo\n				//\n				request.requestDetails.modelInfo.modelType = \"vfModule\";\n				request.requestDetails.modelInfo.modelInvariantId = vfModuleItemPersonaModelId;\n				request.requestDetails.modelInfo.modelNameVersionId = vfModuleItemModelNameVersionId;\n				request.requestDetails.modelInfo.modelName = vfModuleItemModelName;\n				request.requestDetails.modelInfo.modelVersion = vfModuleItemPersonaModelVersion;\n				//\n				// requestInfo\n				//\n				request.requestDetails.requestInfo.instanceName = vfModuleItemVfModuleName;\n				request.requestDetails.requestInfo.source = \"POLICY\";\n				request.requestDetails.requestInfo.suppressRollback = false;\n				//\n				// relatedInstanceList\n				//\n				MSORelatedInstanceListElement relatedInstanceListElement1 = new MSORelatedInstanceListElement();\n				MSORelatedInstanceListElement relatedInstanceListElement2 = new MSORelatedInstanceListElement();\n				relatedInstanceListElement1.relatedInstance = new MSORelatedInstance();\n				relatedInstanceListElement2.relatedInstance = new MSORelatedInstance();\n				//\n				relatedInstanceListElement1.relatedInstance.instanceId = serviceItemServiceInstanceId;\n				relatedInstanceListElement1.relatedInstance.modelInfo = new MSOModelInfo();\n				relatedInstanceListElement1.relatedInstance.modelInfo.modelType = \"service\";\n				relatedInstanceListElement1.relatedInstance.modelInfo.modelInvariantId = serviceItemPersonaModelId;\n				relatedInstanceListElement1.relatedInstance.modelInfo.modelNameVersionId = serviceItemModelNameVersionId;\n				relatedInstanceListElement1.relatedInstance.modelInfo.modelName = serviceItemModelName;\n				relatedInstanceListElement1.relatedInstance.modelInfo.modelVersion = serviceItemModelVersion;\n				//\n				relatedInstanceListElement2.relatedInstance.instanceId = vnfItemVnfId;\n				relatedInstanceListElement2.relatedInstance.modelInfo = new MSOModelInfo();\n				relatedInstanceListElement2.relatedInstance.modelInfo.modelType = \"vnf\";\n				relatedInstanceListElement2.relatedInstance.modelInfo.modelInvariantId = vnfItemPersonaModelId;\n				relatedInstanceListElement2.relatedInstance.modelInfo.modelNameVersionId = vnfItemModelNameVersionId;\n				relatedInstanceListElement2.relatedInstance.modelInfo.modelName = vnfItemModelName;\n				relatedInstanceListElement2.relatedInstance.modelInfo.modelVersion = vnfItemModelVersion;\n				relatedInstanceListElement2.relatedInstance.modelInfo.modelCustomizationName = vnfItemVnfType;\n				//	\n				request.requestDetails.relatedInstanceList.add(relatedInstanceListElement1);\n				request.requestDetails.relatedInstanceList.add(relatedInstanceListElement2);\n				//\n				// print MSO request for debug\n				//\n				System.out.println(\"MSO request sent:\");\n				System.out.println(Serialization.gsonPretty.toJson(request));\n				//\n				//\n				//\n				if (request != null) {\n					//\n					// Tell interested parties we are performing this Operation\n					//\n					VirtualControlLoopNotification notification = new VirtualControlLoopNotification($event);\n					notification.notification = ControlLoopNotificationType.OPERATION;\n					notification.from = \"policy\";\n					notification.policyName = drools.getRule().getName();\n					notification.policyScope = \"com\";\n					notification.policyVersion = \"1\";\n					try {\n						System.out.println(Serialization.gsonPretty.toJson(notification));\n						PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n					} catch (Exception e) {\n						System.out.println(\"Can\'t deliver notification: \" + notification);\n						e.printStackTrace();\n					}\n					//\n					// Concatenate serviceItemServiceInstanceId and vnfItemVnfId to msoURL\n					//\n					String MSOUrl = $params.getMsoURL() + \"/serviceInstances/v2/\" + serviceItemServiceInstanceId + \"/vnfs/\" + vnfItemVnfId + \"/vfModules\";\n					//\n					// Call MSO\n					//\n					MSOResponse response = MSOManager.createModuleInstance(MSOUrl, $params.getMsoURL(), $params.getMsoUsername(), $params.getMsoPassword(), request);\n					//\n					if (response != null) {\n						//\n						// Assign requestId\n						//\n						request.requestId = $event.requestID.toString();						\n						response.request.requestId = $event.requestID.toString();\n						//\n						// Insert facts\n						//\n						insert(operationWrapper);\n						insert(request);\n						insert(response);\n					} else {\n						//\n						// MSO request not even accepted\n						//\n						notification.message = operationWrapper.operation.toMessage();\n						operationWrapper.operation.message = operationWrapper.operation.toMessage();\n						operationWrapper.operation.outcome = \"FAILURE_EXCEPTION\";\n						$manager.setControlLoopResult(\"FAILURE_EXCEPTION\");\n						notification.history.add(operationWrapper.operation);\n						notification.notification = ControlLoopNotificationType.OPERATION_FAILURE;\n						//\n						// Let interested parties know\n						//\n						try {\n							System.out.println(Serialization.gsonPretty.toJson(notification));\n							PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n						} catch (Exception e) {\n							System.out.println(\"Can\'t deliver notification: \" + notification);\n							e.printStackTrace();\n						}\n	                    notification.notification = ControlLoopNotificationType.FINAL_FAILURE;\n                        try {\n                        	System.out.println(Serialization.gsonPretty.toJson(notification));\n                        	PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n                        } catch (Exception e) {\n                        	System.out.println(\"Can\'t deliver notification: \" + notification);\n                        	e.printStackTrace();\n                        }\n						//\n						// Retract everything\n						//\n						retract($event);\n						retract($manager);\n					}\n				} else {\n					System.err.println(\"constructed MSO request is invalid.\");\n				}\n			}\n			break; \n		} \nend\n		\n/*\n*\n* This rule responds to APPC Response Events\n*\n*/\nrule \"BRMSParamvFWDemoPolicy.APPC.RESPONSE\"\n	when\n		$params : Params( getClosedLoopControlName() == \"CL-FRWL-LOW-TRAFFIC-SIG-d925ed73-8231-4d02-9545-db4e101f88f8\" )\n		$event : VirtualControlLoopEvent( closedLoopControlName == $params.getClosedLoopControlName(), closedLoopEventStatus == ControlLoopEventStatus.ONSET )\n		$manager : EventManager( closedLoopControlName == $event.closedLoopControlName )\n		$operationWrapper : ControlLoopOperationWrapper( requestID == $event.requestID )\n		$request : Request( getCommonHeader().RequestID == $event.requestID )\n		$response : Response( getCommonHeader().RequestID == $event.requestID )	\n	then\n		System.out.println(\"rule APPC.RESPONSE is triggered.\");\n		if ($response.Status == null) {\n			$operationWrapper.operation.outcome = \"FAILURE_EXCEPTION\";\n			$manager.setControlLoopResult(\"FAILURE_EXCEPTION\");\n		} \n		//\n		// Get the Response Code\n		//\n		ResponseCode code = ResponseCode.toResponseCode($response.Status.Code);\n		if (code == null) {\n			$operationWrapper.operation.outcome = \"FAILURE_EXCEPTION\";\n			$manager.setControlLoopResult(\"FAILURE_EXCEPTION\");\n		}\n		//\n		// Construct notification\n		//\n		VirtualControlLoopNotification notification = new VirtualControlLoopNotification($event);\n		notification.from = \"policy\";\n		notification.policyName = drools.getRule().getName();\n		notification.policyScope = \"com\";\n		notification.policyVersion = \"1\";\n		notification.message = $operationWrapper.operation.toMessage();\n		$operationWrapper.operation.message = $operationWrapper.operation.toMessage();\n		//\n		// Ok, let\'s figure out what APP-C\'s response is\n		//\n		switch (code) {\n			case ACCEPT:\n				$operationWrapper.operation.outcome = \"PROCESSING\";\n				break;\n			case ERROR:\n			case REJECT:\n				$operationWrapper.operation.outcome = \"FAILURE_EXCEPTION\";\n				$manager.setControlLoopResult(\"FAILURE_EXCEPTION\");\n				break;\n			case SUCCESS:\n				$operationWrapper.operation.outcome = \"SUCCESS\";\n				$manager.setControlLoopResult(\"SUCCESS\");\n				break;\n			case FAILURE:\n				$operationWrapper.operation.outcome = \"FAILURE\";\n				$manager.setControlLoopResult(\"FAILURE\");\n				break;\n		}\n		if ($operationWrapper.operation.outcome.equals(\"SUCCESS\")) {\n			notification.history.add($operationWrapper.operation);\n			notification.notification = ControlLoopNotificationType.OPERATION_SUCCESS;\n			//\n			// Let interested parties know\n			//\n			try {\n				System.out.println(Serialization.gsonPretty.toJson(notification));\n				PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n			} catch (Exception e) {\n				System.out.println(\"Can\'t deliver notification: \" + notification);\n				e.printStackTrace();\n			}\n            notification.notification = ControlLoopNotificationType.FINAL_SUCCESS;\n            try {\n            	System.out.println(Serialization.gsonPretty.toJson(notification));\n            	PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n            } catch (Exception e) {\n            	System.out.println(\"Can\'t deliver notification: \" + notification);\n            	e.printStackTrace();\n            }\n\n			//\n			// We are going to retract these objects from memory\n			//\n			System.out.println(\"Retracting everything\");\n			retract($operationWrapper);\n			retract($request);\n			retract($response);\n			retract($event);\n			retract($manager);\n		} else if ($operationWrapper.operation.outcome.equals(\"PROCESSING\")) {\n			retract($response);\n		} else {\n			notification.history.add($operationWrapper.operation);\n			notification.notification = ControlLoopNotificationType.OPERATION_FAILURE;\n			//\n			// Let interested parties know\n			//\n			try {\n				System.out.println(Serialization.gsonPretty.toJson(notification));\n				PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n			} catch (Exception e) {\n				System.out.println(\"Can\'t deliver notification: \" + notification);\n				e.printStackTrace();\n			}\n            notification.notification = ControlLoopNotificationType.FINAL_FAILURE;\n            //\n            // Let interested parties know\n            //\n            try {\n            	System.out.println(Serialization.gsonPretty.toJson(notification));\n            	PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n            } catch (Exception e) {\n            	System.out.println(\"Can\'t deliver notification: \" + notification);\n            	e.printStackTrace();\n            }\n			//\n			// We are going to retract these objects from memory\n			//\n			System.out.println(\"Retracting everything\");\n			retract($operationWrapper);\n			retract($request);\n			retract($response);\n			retract($event);\n			retract($manager);\n		}\n		\nend		\n\n/*\n*\n* This rule is used to clean up APPC response\n*\n*/		\nrule \"BRMSParamvFWDemoPolicy.APPC.RESPONSE.CLEANUP\"\n	when\n		$params : Params( getClosedLoopControlName() == \"CL-FRWL-LOW-TRAFFIC-SIG-d925ed73-8231-4d02-9545-db4e101f88f8\" )\n        $response : Response($id : getCommonHeader().RequestID )\n		not ( VirtualControlLoopEvent( closedLoopControlName == $params.getClosedLoopControlName(), requestID == $id, closedLoopEventStatus == ControlLoopEventStatus.ONSET ) ) \n	then\n		System.out.println(\"rule APPC.RESPONSE.CLEANUP is triggered.\");\n		retract($response);\nend\n\n/*\n*\n* This rule responds to MSO Response Events\n*\n*/\nrule \"BRMSParamvFWDemoPolicy.MSO.RESPONSE\"\n	when\n		$params : Params( getClosedLoopControlName() == \"CL-FRWL-LOW-TRAFFIC-SIG-d925ed73-8231-4d02-9545-db4e101f88f8\" )\n		$event : VirtualControlLoopEvent( closedLoopControlName == $params.getClosedLoopControlName(), closedLoopEventStatus == ControlLoopEventStatus.ONSET )\n		$manager : EventManager( closedLoopControlName == $event.closedLoopControlName )\n		$operationWrapper : ControlLoopOperationWrapper( requestID == $event.requestID )\n		$request : MSORequest( requestId == $event.requestID.toString() )\n		$response : MSOResponse( request.requestId == $event.requestID.toString() )	\n	then\n		System.out.println(\"rule MSO.RESPONSE is triggered.\");\n		//\n		// Construct notification\n		//\n		VirtualControlLoopNotification notification = new VirtualControlLoopNotification($event);\n		notification.from = \"policy\";\n		notification.policyName = drools.getRule().getName();\n		notification.policyScope = \"com\";\n		notification.policyVersion = \"1\";\n		notification.message = $operationWrapper.operation.toMessage();\n		$operationWrapper.operation.message = $operationWrapper.operation.toMessage();\n		//\n		// The operation can either be succeeded or failed\n		// \n		if($response.request.requestStatus.requestState.equals(\"COMPLETE\")) {\n			$operationWrapper.operation.outcome = \"SUCCESS\";\n			$manager.setControlLoopResult(\"SUCCESS\");\n			notification.history.add($operationWrapper.operation);\n			notification.notification = ControlLoopNotificationType.OPERATION_SUCCESS;\n			//\n			// Let interested parties know\n			//\n			try {\n				System.out.println(Serialization.gsonPretty.toJson(notification));\n				PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n			} catch (Exception e) {\n				System.out.println(\"Can\'t deliver notification: \" + notification);\n				e.printStackTrace();\n			}\n			notification.notification = ControlLoopNotificationType.FINAL_SUCCESS;\n            //\n            // Let interested parties know\n            //\n            try {\n            	System.out.println(Serialization.gsonPretty.toJson(notification));\n            	PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n            } catch (Exception e) {\n            	System.out.println(\"Can\'t deliver notification: \" + notification);\n            	e.printStackTrace();\n            }\n            //\n			// We are going to retract these objects from memory\n			//\n			System.out.println(\"Retracting everything\");\n			retract($operationWrapper);\n			retract($request);\n			retract($response);\n			retract($event);\n			retract($manager);\n		} else {\n			$operationWrapper.operation.outcome = \"FAILURE\";\n			$manager.setControlLoopResult(\"FAILURE\");\n			notification.history.add($operationWrapper.operation);\n			notification.notification = ControlLoopNotificationType.OPERATION_FAILURE;\n			//\n			// Let interested parties know\n			//\n			try {\n				System.out.println(Serialization.gsonPretty.toJson(notification));\n				PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n			} catch (Exception e) {\n				System.out.println(\"Can\'t deliver notification: \" + notification);\n				e.printStackTrace();\n			}\n			notification.notification = ControlLoopNotificationType.FINAL_FAILURE;\n            //\n            // Let interested parties know\n            //\n            try {\n            	System.out.println(Serialization.gsonPretty.toJson(notification));\n            	PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n            } catch (Exception e) {\n            	System.out.println(\"Can\'t deliver notification: \" + notification);\n            	e.printStackTrace();\n            }\n            //\n			// We are going to retract these objects from memory\n			//\n			System.out.println(\"Retracting everything\");\n			retract($operationWrapper);\n			retract($request);\n			retract($response);\n			retract($event);\n			retract($manager);\n		}\n		\nend	\nrule \"com.Config_BRMS_Param_BRMSParamvFWDemoPolicy.Params\" \n	salience 1000 \n	when\n	then\n		Params params = new Params();\n		params.setAaiPatternMatch(1);\n		params.setAppcTopic(\"APPC-CL\");\n		params.setAaiURL(\"null\");\n		params.setMsoPassword(\"null\");\n		params.setClosedLoopControlName(\"CL-FRWL-LOW-TRAFFIC-SIG-d925ed73-8231-4d02-9545-db4e101f88f8\");\n		params.setMsoURL(\"null\");\n		params.setAaiUsername(\"null\");\n		params.setActor(\"APPC\");\n		params.setMsoUsername(\"null\");\n		params.setAaiNamedQueryUUID(\"null\");\n		params.setAaiPassword(\"null\");\n		params.setNotificationTopic(\"POLICY-CL-MGT\");\n		insert(params);\nend\r\n','OTHER','com.Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.txt','doACPolicyPut','2017-03-14 19:58:19',0,'','doACPolicyPut','2017-03-14 19:58:19',1),(3203,'/* Autogenerated Code Please Don\'t change/remove this comment section. This is for the UI purpose. \n	 <$%BRMSParamTemplate=ControlLoopDemo__closedLoopControlName%$> \n */ \n\r\n\r\n/*-\n * ============LICENSE_START=======================================================\n * archetype-closed-loop-demo-rules\n * ================================================================================\n * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.\n * ================================================================================\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n * \n *      http://www.apache.org/licenses/LICENSE-2.0\n * \n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n * ============LICENSE_END=========================================================\n */\n\npackage org.onap.policy.controlloop;\n\nimport java.util.List;\nimport java.util.LinkedList;\nimport java.util.Map;\nimport java.util.HashMap;\nimport java.util.UUID;\n\nimport org.onap.policy.controlloop.VirtualControlLoopEvent;\nimport org.onap.policy.controlloop.ControlLoopEventStatus;\nimport org.onap.policy.controlloop.VirtualControlLoopNotification;\nimport org.onap.policy.controlloop.ControlLoopNotificationType;\nimport org.onap.policy.controlloop.ControlLoopOperation;\nimport org.onap.policy.controlloop.ControlLoopOperationWrapper;\nimport org.onap.policy.template.demo.ControlLoopException;\n\nimport org.onap.policy.aai.AAINQF199.AAINQF199CloudRegion;\nimport org.onap.policy.aai.AAINQF199.AAINQF199ExtraProperties;\nimport org.onap.policy.aai.AAINQF199.AAINQF199ExtraProperty;\nimport org.onap.policy.aai.AAINQF199.AAINQF199GenericVNF;\nimport org.onap.policy.aai.AAINQF199.AAINQF199InstanceFilters;\nimport org.onap.policy.aai.AAINQF199.AAINQF199InventoryResponseItem;\nimport org.onap.policy.aai.AAINQF199.AAINQF199InventoryResponseItems;\nimport org.onap.policy.aai.AAINQF199.AAINQF199Manager;\nimport org.onap.policy.aai.AAINQF199.AAINQF199NamedQuery;\nimport org.onap.policy.aai.AAINQF199.AAINQF199QueryParameters;\nimport org.onap.policy.aai.AAINQF199.AAINQF199Request;\nimport org.onap.policy.aai.AAINQF199.AAINQF199RequestWrapper;\nimport org.onap.policy.aai.AAINQF199.AAINQF199Response;\nimport org.onap.policy.aai.AAINQF199.AAINQF199ResponseWrapper;\nimport org.onap.policy.aai.AAINQF199.AAINQF199ServiceInstance;\nimport org.onap.policy.aai.AAINQF199.AAINQF199Tenant;\nimport org.onap.policy.aai.AAINQF199.AAINQF199VfModule;\nimport org.onap.policy.aai.AAINQF199.AAINQF199VServer;\nimport org.onap.policy.aai.util.Serialization;\n\nimport org.onap.policy.appc.CommonHeader;\nimport org.onap.policy.appc.Request;\nimport org.onap.policy.appc.Response;\nimport org.onap.policy.appc.ResponseCode;\nimport org.onap.policy.appc.ResponseStatus;\nimport org.onap.policy.appc.ResponseValue;\n\nimport org.onap.policy.template.demo.EventManager;\nimport org.onap.policy.vnf.trafficgenerator.PGRequest;\nimport org.onap.policy.vnf.trafficgenerator.PGStream;\nimport org.onap.policy.vnf.trafficgenerator.PGStreams;\n\nimport org.onap.policy.mso.MSOManager;\nimport org.onap.policy.mso.MSORequest;\nimport org.onap.policy.mso.MSORequestStatus;\nimport org.onap.policy.mso.MSORequestDetails;\nimport org.onap.policy.mso.MSOModelInfo;\nimport org.onap.policy.mso.MSOCloudConfiguration;\nimport org.onap.policy.mso.MSORequestInfo;\nimport org.onap.policy.mso.MSORequestParameters;\nimport org.onap.policy.mso.MSORelatedInstanceListElement;\nimport org.onap.policy.mso.MSORelatedInstance;\nimport org.onap.policy.mso.MSOResponse;\n\nimport org.onap.policy.drools.system.PolicyEngine;\n\n//\n// These parameters are required to build the runtime policy\n//\ndeclare Params\n    closedLoopControlName : String\n    actor : String\n    aaiURL : String\n    aaiUsername : String\n    aaiPassword : String\n    msoURL : String\n    msoUsername : String\n    msoPassword : String\n    aaiNamedQueryUUID : String\n    aaiPatternMatch : int \n    notificationTopic : String\n    appcTopic : String\nend\n\n/*\n*\n* Called once and only once to insert the parameters into working memory for this Closed Loop policy.\n* (Comment SETUP rule out for the first ONAP opensource release since policy BRMS_GW already puts a Params fact in there)\n*\n*\n*rule \"BRMSParamvLBDemoPolicy.SETUP\"\n*	when\n*	then\n*		System.out.println(\"rule SETUP is triggered.\");\n*		Params params = new Params();\n*		params.setClosedLoopControlName(\"CL-DNS-LOW-TRAFFIC-SIG-d925ed73-8231-4d02-9545-db4e101f88f8\");\n*		params.setActor(\"MSO\");\n*		params.setAaiURL(\"https://aai.api.simpledemo.openecomp.org:8443\");\n*		params.setAaiUsername(\"POLICY\");\n*		params.setAaiPassword(\"POLICY\");\n*		params.setMsoURL(\"http://vm1.mso.simpledemo.openecomp.org:8080/onap/mso/infra\");\n*		params.setMsoUsername(\"InfraPortalClient\");\n*		params.setMsoPassword(\"password1$\");\n*		params.setAaiNamedQueryUUID(\"f199cb88-5e69-4b1f-93e0-6f257877d066\");\n*		params.setAaiPatternMatch(0);\n*		params.setNotificationTopic(\"POLICY-CL-MGT\");\n*		params.setAppcTopic(\"APPC-CL\");\n*		//\n*		// This stays in memory as long as the rule is alive and running\n*		//\n*		insert(params);\n*end\n*/\n/*\n*\n* This rule responds to DCAE Events\n*\n*/\nrule \"BRMSParamvLBDemoPolicy.EVENT\"\n	when\n        $params : Params( getClosedLoopControlName() == \"CL-DNS-LOW-TRAFFIC-SIG-d925ed73-8231-4d02-9545-db4e101f88f8\" )\n        $event : VirtualControlLoopEvent( closedLoopControlName == $params.getClosedLoopControlName(), closedLoopEventStatus == ControlLoopEventStatus.ONSET )\n        not ( EventManager( closedLoopControlName == $event.closedLoopControlName ))\n	then\n		System.out.println(\"rule EVENT is triggered.\");\n		try {\n			// \n			// Check the requestID in the event to make sure it is not null before we create the EventManager. \n			// The EventManager will do extra syntax checking as well check if the closed loop is disabled/\n			//\n			if ($event.requestID == null) {\n				VirtualControlLoopNotification notification = new VirtualControlLoopNotification($event);\n				notification.notification = ControlLoopNotificationType.REJECTED;\n				notification.from = \"policy\";\n				notification.message = \"Missing requestID from DCAE event\";\n				notification.policyName = drools.getRule().getName();\n				notification.policyScope = \"com\";\n				notification.policyVersion = \"1\";\n				//\n				// Let interested parties know\n				//\n				try {\n					System.out.println(Serialization.gsonPretty.toJson(notification));\n					PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n				} catch (Exception e) {\n					e.printStackTrace();\n					System.out.println(\"Can\'t deliver notification: \" + notification);\n				}\n				//\n				// Retract it from memory\n				//\n				retract($event);\n				System.out.println(\"Event with requestID=null has been retracted.\");\n			} else {\n				//\n				// Create an EventManager\n				//\n				EventManager manager = new EventManager($params.getClosedLoopControlName(), $event.requestID, $event.target);\n				//\n				// Determine if EventManager can actively process the event (i.e. syntax)\n				//\n				VirtualControlLoopNotification notification = manager.activate($event);\n				notification.from = \"policy\"; \n				notification.policyName = drools.getRule().getName();\n				notification.policyScope = \"com\";\n				notification.policyVersion = \"1\";\n				//\n				// Are we actively pursuing this event?\n				//\n				if (notification.notification == ControlLoopNotificationType.ACTIVE) {\n					//\n					// Insert Event Manager into memory, this will now kick off processing.\n					//\n					insert(manager);\n					//\n					// Let interested parties know\n					//\n					try {\n						System.out.println(Serialization.gsonPretty.toJson(notification));\n						PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n					} catch (Exception e) {\n						e.printStackTrace();\n						System.out.println(\"Can\'t deliver notification: \" + notification);\n					}		\n				} else {\n					//\n					// Let interested parties know\n					//\n					try {\n						System.out.println(Serialization.gsonPretty.toJson(notification));\n						PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n					} catch (Exception e) {\n						e.printStackTrace();\n						System.out.println(\"Can\'t deliver notification: \" + notification);\n					}\n					//\n					// Retract it from memory\n					//\n					retract($event);\n				}\n				//\n				// Now that the manager is inserted into Drools working memory, we\'ll wait for\n				// another rule to fire in order to continue processing. This way we can also\n				// then screen for additional ONSET and ABATED events for this same RequestIDs \n				// and for different RequestIDs but with the same closedLoopControlName and target.\n				//\n			}\n		//\n		} catch (Exception e) {\n			e.printStackTrace();\n			VirtualControlLoopNotification notification = new VirtualControlLoopNotification($event);\n			notification.notification = ControlLoopNotificationType.REJECTED;\n			notification.message = \"Exception occurred \" + e.getMessage();\n			notification.policyName = drools.getRule().getName();\n			notification.policyScope = \"com\";\n			notification.policyVersion = \"1\";\n			//\n			//\n			//\n			try {\n				System.out.println(Serialization.gsonPretty.toJson(notification));\n				PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n			} catch (Exception e1) {\n				System.out.println(\"Can\'t deliver notification: \" + notification);\n				e1.printStackTrace();\n			}\n			//\n			// Retract the event\n			//\n			retract($event);\n		}\nend\n\n/*\n*\n* This rule happens when we got a valid ONSET, closed loop is enabled and an Event Manager\n* is created. We can start the operations for this closed loop.\n*\n*/\nrule \"BRMSParamvLBDemoPolicy.EVENT.MANAGER\"\n	when\n		$params : Params( getClosedLoopControlName() == \"CL-DNS-LOW-TRAFFIC-SIG-d925ed73-8231-4d02-9545-db4e101f88f8\" )\n		$event : VirtualControlLoopEvent( closedLoopControlName == $params.getClosedLoopControlName(), closedLoopEventStatus == ControlLoopEventStatus.ONSET )\n		$manager : EventManager( closedLoopControlName == $event.closedLoopControlName, controlLoopResult == null)\n	then\n		System.out.println(\"rule EVENT.MANAGER is triggered.\");\n		//\n		// Check which event this is.\n		//\n		EventManager.NEW_EVENT_STATUS eventStatus = $manager.onNewEvent($event);\n		//\n		// We only want the initial ONSET event in memory,\n		// all the other events need to be retracted to support\n		// cleanup and avoid the other rules being fired for this event.\n		//\n		if (eventStatus != EventManager.NEW_EVENT_STATUS.FIRST_ONSET) {\n			System.out.println(\"Retracting \"+eventStatus+\" Event.\");\n			retract($event);\n			return;\n		}\n		//\n		// Now the event in memory is first onset event\n		//\n		try {\n			//\n			// Pull the known AAI field from the Event\n			//\n			// generic-vnf is needed for vFirewall case\n			// vserver-name is needed for vLoadBalancer case\n			//\n			String genericVNF = $event.AAI.get(\"generic-vnf.vnf-id\");\n			String vserver = $event.AAI.get(\"vserver.vserver-name\");\n			//\n			// Check if we are implementing a simple pattern match.\n			//\n			if ($params.getAaiPatternMatch() == 1) {\n				//\n				// Yes\n				//\n				//Basic naming characteristics:\n				//VF Name (9 char)+VM name (13 char total)+VFC (19 char total)\n				//Example: \n				//VF Name (9 characters):    cscf0001v\n				//VM Name(13 characters): cscf0001vm001\n				//VFC name(19 characters): cscf0001vm001cfg001\n				//\n				// zdfw1fwl01fwl02 or zdfw1fwl01fwl01  \n				// replaced with\n				// zdfw1fwl01pgn02 or zdfw1fwl01pgn01\n				//\n				int index = genericVNF.lastIndexOf(\"fwl\");\n				if (index == -1) {\n					System.err.println(\"The generic-vnf.vnf-id from DCAE Event is not valid.\");\n				} else {\n					genericVNF = genericVNF.substring(0, index) + \"pgn\" + genericVNF.substring(index+\"fwl\".length());\n				}\n				//\n				// Construct an APPC request\n				//\n				ControlLoopOperation operation = new ControlLoopOperation();\n				operation.actor = $params.getActor();\n				operation.operation = \"ModifyConfig\";\n				operation.target = $event.target;\n				//\n				// Create operationWrapper\n				//\n				ControlLoopOperationWrapper operationWrapper = new ControlLoopOperationWrapper($event.requestID, operation);\n				//\n				// insert operationWrapper into memory\n				//\n				insert(operationWrapper);\n				//\n				Request request = new Request();\n				request.CommonHeader = new CommonHeader();\n				request.CommonHeader.RequestID = $event.requestID;\n				request.Action = operation.operation;\n				request.Payload = new HashMap<String, Object>();\n				//\n				// Fill in the payload\n				//\n				request.Payload.put(\"generic-vnf.vnf-id\", genericVNF);\n				//\n				PGRequest pgRequest = new PGRequest();\n				pgRequest.pgStreams = new PGStreams();\n				\n				PGStream pgStream;\n				for(int i = 0; i < 5; i++){\n					pgStream = new PGStream();\n					pgStream.streamId = \"fw_udp\"+(i+1);\n					pgStream.isEnabled = \"true\";\n					pgRequest.pgStreams.pgStream.add(pgStream);\n				}\n				request.Payload.put(\"pg-streams\", pgRequest.pgStreams);\n				\n				if (request != null) {\n					//\n					// Insert request into memory\n					//\n					insert(request);\n					//\n					// Tell interested parties we are performing this Operation\n					//\n					VirtualControlLoopNotification notification = new VirtualControlLoopNotification($event);\n					notification.notification = ControlLoopNotificationType.OPERATION;\n					// message and history ??\n					notification.from = \"policy\";\n					notification.policyName = drools.getRule().getName();\n					notification.policyScope = \"com\";\n					notification.policyVersion = \"1\";\n					try {\n						System.out.println(Serialization.gsonPretty.toJson(notification));\n						PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n					} catch (Exception e) {\n						System.out.println(\"Can\'t deliver notification: \" + notification);\n						e.printStackTrace();\n					}\n					//\n					// Now send the operation request\n					//\n					if (request instanceof Request) {\n						try {\n							System.out.println(\"APPC request sent:\");\n							System.out.println(Serialization.gsonPretty.toJson(request));\n							PolicyEngine.manager.deliver($params.getAppcTopic(), request);\n						} catch (Exception e) {\n							e.printStackTrace();\n							System.out.println(\"Can\'t deliver request: \" + request);\n						}\n					}\n				} else {\n					//\n					// what happens if it is null\n					//\n				}\n				//\n			} else {\n				//\n				// create AAI named-query request with UUID started with \"F199\"\n				//\n				AAINQF199Request aainqf199request = new AAINQF199Request();\n				AAINQF199QueryParameters aainqf199queryparam = new AAINQF199QueryParameters();\n				AAINQF199NamedQuery aainqf199namedquery = new AAINQF199NamedQuery();\n				AAINQF199InstanceFilters aainqf199instancefilter = new AAINQF199InstanceFilters();\n				//\n				// queryParameters\n				//\n				aainqf199namedquery.namedQueryUUID = UUID.fromString($params.getAaiNamedQueryUUID()); \n				aainqf199queryparam.namedQuery = aainqf199namedquery;\n				aainqf199request.queryParameters = aainqf199queryparam;\n				//\n				// instanceFilters\n				//\n				Map aainqf199instancefiltermap = new HashMap();\n				Map aainqf199instancefiltermapitem = new HashMap();\n				aainqf199instancefiltermapitem.put(\"vserver-name\", vserver); \n				aainqf199instancefiltermap.put(\"vserver\", aainqf199instancefiltermapitem);\n				aainqf199instancefilter.instanceFilter.add(aainqf199instancefiltermap);\n				aainqf199request.instanceFilters = aainqf199instancefilter;\n				//\n				// print aainqf199request for debug\n				//\n				System.out.println(\"AAI Request sent:\");\n				System.out.println(Serialization.gsonPretty.toJson(aainqf199request));\n				//\n				// Create AAINQF199RequestWrapper\n				//\n				AAINQF199RequestWrapper aainqf199RequestWrapper = new AAINQF199RequestWrapper($event.requestID, aainqf199request);\n				//\n				// insert aainqf199request into memory\n				//\n				insert(aainqf199RequestWrapper);\n			}\n			//\n		} catch (Exception e) {\n		 e.printStackTrace();\n		}\nend\n\n/*\n*\n* This rule happens when we got a valid ONSET, closed loop is enabled, an Event Manager\n* is created, AAI Manager and AAI Request are ready in memory. We can start sending query to AAI and then wait for response.\n*\n*/\nrule \"BRMSParamvLBDemoPolicy.EVENT.MANAGER.AAINQF199REQUEST\"\n	when\n		$params : Params( getClosedLoopControlName() == \"CL-DNS-LOW-TRAFFIC-SIG-d925ed73-8231-4d02-9545-db4e101f88f8\" )\n		$event : VirtualControlLoopEvent( closedLoopControlName == $params.getClosedLoopControlName(), closedLoopEventStatus == ControlLoopEventStatus.ONSET )\n		$manager : EventManager( closedLoopControlName == $event.closedLoopControlName )\n		$aainqf199RequestWrapper : AAINQF199RequestWrapper(requestID == $event.requestID)\n	then\n		System.out.println(\"rule EVENT.MANAGER.AAINQF199REQUEST is triggered.\");\n		//\n		// send the request\n		//\n		AAINQF199Response aainqf199response = AAINQF199Manager.postQuery($params.getAaiURL(), $params.getAaiUsername(), $params.getAaiPassword(),\n													   $aainqf199RequestWrapper.aainqf199request, $event.requestID);\n		//\n		// Check AAI response\n		//\n		if (aainqf199response == null) {\n			System.err.println(\"Failed to get AAI response\");\n			//\n			// Fail and retract everything\n			//\n			retract($event);\n			retract($manager);\n			retract($aainqf199RequestWrapper);\n		} else {\n			//\n			// Create AAINQF199ResponseWrapper\n			//\n			AAINQF199ResponseWrapper aainqf199ResponseWrapper = new AAINQF199ResponseWrapper($event.requestID, aainqf199response);\n			//\n			// insert aainqf199ResponseWrapper to memeory\n			//\n			insert(aainqf199ResponseWrapper);\n		}\nend\n\n/*\n*\n* This rule happens when we got a valid AAI response. We can start sending request to APPC or MSO now.\n*\n*/\nrule \"BRMSParamvLBDemoPolicy.EVENT.MANAGER.AAINQF199RESPONSE\"\n	when \n		$params : Params( getClosedLoopControlName() == \"CL-DNS-LOW-TRAFFIC-SIG-d925ed73-8231-4d02-9545-db4e101f88f8\" )\n		$event : VirtualControlLoopEvent( closedLoopControlName == $params.getClosedLoopControlName(), closedLoopEventStatus == ControlLoopEventStatus.ONSET )\n		$manager : EventManager( closedLoopControlName == $event.closedLoopControlName )\n		$aainqf199RequestWrapper : AAINQF199RequestWrapper(requestID == $event.requestID)\n		$aainqf199ResponseWrapper : AAINQF199ResponseWrapper(requestID == $event.requestID)\n	then\n		System.out.println(\"rule EVENT.MANAGER.AAINQF199RESPONSE is triggered.\");\n		//\n		// Extract related fields out of AAINQF199RESPONSE\n		//\n		String vnfItemVnfId, vnfItemVnfType, vnfItemPersonaModelId, vnfItemPersonaModelVersion, vnfItemModelName, \n		       vnfItemModelVersion, vnfItemModelNameVersionId, serviceItemServiceInstanceId, serviceItemPersonaModelId,\n		       serviceItemModelName, serviceItemModelType, serviceItemModelVersion, serviceItemModelNameVersionId,\n		       vfModuleItemVfModuleName, vfModuleItemPersonaModelId, vfModuleItemPersonaModelVersion, vfModuleItemModelName, \n		       vfModuleItemModelNameVersionId, tenantItemTenantId, cloudRegionItemCloudRegionId;\n		try {\n			//\n			// vnfItem\n			//\n			vnfItemVnfId = $aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).genericVNF.vnfID;\n			vnfItemVnfType = $aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).genericVNF.vnfType;\n			vnfItemVnfType = vnfItemVnfType.substring(vnfItemVnfType.lastIndexOf(\"/\")+1);\n			vnfItemPersonaModelId = $aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).genericVNF.personaModelId;\n			vnfItemPersonaModelVersion = $aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).genericVNF.personaModelVersion;\n			vnfItemModelName = $aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).extraProperties.extraProperty.get(0).propertyValue;\n			vnfItemModelVersion = 		$aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).extraProperties.extraProperty.get(2).propertyValue;\n			vnfItemModelNameVersionId = 	$aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).extraProperties.extraProperty.get(4).propertyValue;\n			//\n			// serviceItem\n			//\n			serviceItemServiceInstanceId = $aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).serviceInstance.serviceInstanceID;\n			serviceItemPersonaModelId = $aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).serviceInstance.personaModelId;\n			serviceItemModelName = $aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).extraProperties.extraProperty.get(0).propertyValue;\n			serviceItemModelType = $aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).extraProperties.extraProperty.get(1).propertyValue;\n			serviceItemModelVersion = $aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).serviceInstance.personaModelVersion;\n			serviceItemModelNameVersionId = $aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).extraProperties.extraProperty.get(4).propertyValue;\n			//\n			// Find the index for base vf module and non-base vf module\n			//\n			int baseIndex = -1;\n			int nonBaseIndex = -1;\n			List<AAINQF199InventoryResponseItem> inventoryItems = $aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).items.inventoryResponseItems;\n			for (AAINQF199InventoryResponseItem m : inventoryItems) {\n				if (m.vfModule != null && m.vfModule.isBaseVfModule == true) {\n					baseIndex = inventoryItems.indexOf(m);\n				} else if (m.vfModule != null && m.vfModule.isBaseVfModule == false && m.vfModule.orchestrationStatus == null) {\n					nonBaseIndex = inventoryItems.indexOf(m);\n				}\n				//\n				if (baseIndex != -1 && nonBaseIndex != -1) {\n					break;\n				}\n			}\n			//\n			// Report the error if either base vf module or non-base vf module is not found\n			//\n			if (baseIndex == -1 || nonBaseIndex == -1) {\n				System.err.println(\"Either base or non-base vf module is not found from AAI response.\");\n				retract($aainqf199RequestWrapper);\n				retract($aainqf199ResponseWrapper);\n				retract($manager);\n				retract($event);\n				return;\n			}\n			//\n			// This comes from the base module\n			//\n			vfModuleItemVfModuleName = 			$aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).items.inventoryResponseItems.get(baseIndex).vfModule.vfModuleName;\n			vfModuleItemVfModuleName = vfModuleItemVfModuleName.replace(\"Vfmodule\", \"vDNS\");\n			//\n			// vfModuleItem - NOT the base module\n			//\n			vfModuleItemPersonaModelId = 		$aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).items.inventoryResponseItems.get(nonBaseIndex).vfModule.personaModelId;\n			vfModuleItemPersonaModelVersion = 	$aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).items.inventoryResponseItems.get(nonBaseIndex).vfModule.personaModelVersion;\n			vfModuleItemModelName = 			$aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).items.inventoryResponseItems.get(nonBaseIndex).extraProperties.extraProperty.get(0).propertyValue;\n			vfModuleItemModelNameVersionId = 	$aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(0).items.inventoryResponseItems.get(nonBaseIndex).extraProperties.extraProperty.get(4).propertyValue;\n			//\n			// tenantItem\n			//\n			tenantItemTenantId = $aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(1).tenant.tenantId;\n			//\n			// cloudRegionItem\n			//\n			cloudRegionItemCloudRegionId = $aainqf199ResponseWrapper.aainqf199response.inventoryResponseItems.get(0).items.inventoryResponseItems.get(1).items.inventoryResponseItems.get(0).cloudRegion.cloudRegionId;\n			//\n		} catch (Exception e) {\n			e.printStackTrace();\n			VirtualControlLoopNotification notification = new VirtualControlLoopNotification($event);\n			notification.notification = ControlLoopNotificationType.REJECTED;\n			notification.message = \"Exception occurred \" + e.getMessage();\n			notification.policyName = drools.getRule().getName();\n			notification.policyScope = \"com\";\n			notification.policyVersion = \"1\";\n			//\n			try {\n				System.out.println(Serialization.gsonPretty.toJson(notification));\n				PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n			} catch (Exception e1) {\n				System.out.println(\"Can\'t deliver notification: \" + notification);\n				e1.printStackTrace();\n			}\n			//\n			notification.notification = ControlLoopNotificationType.FINAL_FAILURE;\n			notification.message = \"Invalid named-query response from AAI\";\n            //\n            try {\n            	System.out.println(Serialization.gsonPretty.toJson(notification));\n                PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n            } catch (Exception e1) {\n                System.out.println(\"Can\'t deliver notification: \" + notification);\n                e1.printStackTrace();\n            }\n			//\n			// Retract everything\n			//\n			retract($aainqf199RequestWrapper);\n			retract($aainqf199ResponseWrapper);\n			retract($manager);\n			retract($event);\n			return;\n		}	\n		//\n		// Extracted fields should not be null\n		//\n		if ((vnfItemVnfId == null) || (vnfItemVnfType == null) ||\n		    (vnfItemPersonaModelId == null) || (vnfItemModelName == null) ||\n		    (vnfItemModelVersion == null) || (vnfItemModelNameVersionId == null) ||\n		    (serviceItemServiceInstanceId == null) || (serviceItemModelName == null) ||\n		    (serviceItemModelType == null) || (serviceItemModelVersion == null) ||\n		    (serviceItemModelNameVersionId == null) || (vfModuleItemVfModuleName == null) ||\n		    (vfModuleItemPersonaModelId == null) || (vfModuleItemPersonaModelVersion == null) ||\n		    (vfModuleItemModelName == null) || (vfModuleItemModelNameVersionId == null) ||\n		    (tenantItemTenantId == null) || (cloudRegionItemCloudRegionId == null)) {\n			//\n			System.err.println(\"some fields are missing from AAI response.\");\n			//\n			// Fail and retract everything\n			//\n			retract($aainqf199RequestWrapper);\n			retract($aainqf199ResponseWrapper);\n			retract($manager);\n			retract($event);\n			return;\n		}\n		//\n		// We don\'t need them any more\n		//\n		retract($aainqf199ResponseWrapper);\n		retract($aainqf199RequestWrapper);  \n		//\n		// check the actor of this closed loop\n		//\n		switch ($params.getActor()) {\n			case \"APPC\":\n			{\n				//\n				// Construct an APPC request\n				//\n				ControlLoopOperation operation = new ControlLoopOperation();\n				operation.actor = $params.getActor();\n				operation.operation = \"ModifyConfig\";\n				operation.target = $event.target;\n				//\n				// Create operationWrapper\n				//\n				ControlLoopOperationWrapper operationWrapper = new ControlLoopOperationWrapper($event.requestID, operation);\n				//\n				// insert operationWrapper into memory\n				//\n				insert(operationWrapper);\n				//\n				Request request = new Request();\n				request.CommonHeader = new CommonHeader();\n				request.CommonHeader.RequestID = $event.requestID;\n				request.Action = operation.operation;\n				request.Payload = new HashMap<String, Object>();\n				//\n				// Fill in the payload\n				// Hardcode genericVNF for now since AAI has not been ready for vFirewall demo case\n				//\n				String genericVNF = \"zdfw1fwl01pgn02\";\n				request.Payload.put(\"generic-vnf.vnf-id\", genericVNF);\n				//\n				PGRequest pgRequest = new PGRequest();\n				pgRequest.pgStreams = new PGStreams();\n				\n				PGStream pgStream;\n				for(int i = 0; i < 5; i++){\n					pgStream = new PGStream();\n					pgStream.streamId = \"fw_udp\"+(i+1);\n					pgStream.isEnabled = \"true\";\n					pgRequest.pgStreams.pgStream.add(pgStream);\n				}\n				request.Payload.put(\"pg-streams\", pgRequest.pgStreams);\n				\n				if (request != null) {\n					//\n					// Insert request into memory\n					//\n					insert(request);\n					//\n					// Tell interested parties we are performing this Operation\n					//\n					VirtualControlLoopNotification notification = new VirtualControlLoopNotification($event);\n					notification.notification = ControlLoopNotificationType.OPERATION;\n					// message and history ??\n					notification.from = \"policy\";\n					notification.policyName = drools.getRule().getName();\n					notification.policyScope = \"com\";\n					notification.policyVersion = \"1\";\n					try {\n						System.out.println(Serialization.gsonPretty.toJson(notification));\n						PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n					} catch (Exception e) {\n						System.out.println(\"Can\'t deliver notification: \" + notification);\n						e.printStackTrace();\n					}\n					//\n					// Now send the operation request\n					//\n					if (request instanceof Request) {\n						try {\n							System.out.println(\"APPC request sent:\");\n							System.out.println(Serialization.gsonPretty.toJson(request));\n							PolicyEngine.manager.deliver($params.getAppcTopic(), request);\n						} catch (Exception e) {\n							e.printStackTrace();\n							System.out.println(\"Can\'t deliver request: \" + request);\n						}\n					}\n				} else {\n					//\n					// what happens if it is null\n					//\n				}\n			}\n			break;\n			case \"MSO\":\n			{\n				//\n				// Construct an operation\n				//\n				ControlLoopOperation operation = new ControlLoopOperation();\n				operation.actor = $params.getActor();\n				operation.operation = \"createModuleInstance\";\n				operation.target = $event.target;\n				//\n				// Create operationWrapper\n				//\n				ControlLoopOperationWrapper operationWrapper = new ControlLoopOperationWrapper($event.requestID, operation);\n				//\n				// Construct an MSO request\n				//\n				MSORequest request = new MSORequest();\n				request.requestDetails = new MSORequestDetails();\n				request.requestDetails.modelInfo = new MSOModelInfo();\n				request.requestDetails.cloudConfiguration = new MSOCloudConfiguration();\n				request.requestDetails.requestInfo = new MSORequestInfo();\n				request.requestDetails.requestParameters = new MSORequestParameters();\n				request.requestDetails.requestParameters.userParams = null;\n				//\n				// cloudConfiguration\n				//\n				request.requestDetails.cloudConfiguration.lcpCloudRegionId = cloudRegionItemCloudRegionId;\n				request.requestDetails.cloudConfiguration.tenantId = tenantItemTenantId;\n				//\n				// modelInfo\n				//\n				request.requestDetails.modelInfo.modelType = \"vfModule\";\n				request.requestDetails.modelInfo.modelInvariantId = vfModuleItemPersonaModelId;\n				request.requestDetails.modelInfo.modelNameVersionId = vfModuleItemModelNameVersionId;\n				request.requestDetails.modelInfo.modelName = vfModuleItemModelName;\n				request.requestDetails.modelInfo.modelVersion = vfModuleItemPersonaModelVersion;\n				//\n				// requestInfo\n				//\n				request.requestDetails.requestInfo.instanceName = vfModuleItemVfModuleName;\n				request.requestDetails.requestInfo.source = \"POLICY\";\n				request.requestDetails.requestInfo.suppressRollback = false;\n				//\n				// relatedInstanceList\n				//\n				MSORelatedInstanceListElement relatedInstanceListElement1 = new MSORelatedInstanceListElement();\n				MSORelatedInstanceListElement relatedInstanceListElement2 = new MSORelatedInstanceListElement();\n				relatedInstanceListElement1.relatedInstance = new MSORelatedInstance();\n				relatedInstanceListElement2.relatedInstance = new MSORelatedInstance();\n				//\n				relatedInstanceListElement1.relatedInstance.instanceId = serviceItemServiceInstanceId;\n				relatedInstanceListElement1.relatedInstance.modelInfo = new MSOModelInfo();\n				relatedInstanceListElement1.relatedInstance.modelInfo.modelType = \"service\";\n				relatedInstanceListElement1.relatedInstance.modelInfo.modelInvariantId = serviceItemPersonaModelId;\n				relatedInstanceListElement1.relatedInstance.modelInfo.modelNameVersionId = serviceItemModelNameVersionId;\n				relatedInstanceListElement1.relatedInstance.modelInfo.modelName = serviceItemModelName;\n				relatedInstanceListElement1.relatedInstance.modelInfo.modelVersion = serviceItemModelVersion;\n				//\n				relatedInstanceListElement2.relatedInstance.instanceId = vnfItemVnfId;\n				relatedInstanceListElement2.relatedInstance.modelInfo = new MSOModelInfo();\n				relatedInstanceListElement2.relatedInstance.modelInfo.modelType = \"vnf\";\n				relatedInstanceListElement2.relatedInstance.modelInfo.modelInvariantId = vnfItemPersonaModelId;\n				relatedInstanceListElement2.relatedInstance.modelInfo.modelNameVersionId = vnfItemModelNameVersionId;\n				relatedInstanceListElement2.relatedInstance.modelInfo.modelName = vnfItemModelName;\n				relatedInstanceListElement2.relatedInstance.modelInfo.modelVersion = vnfItemModelVersion;\n				relatedInstanceListElement2.relatedInstance.modelInfo.modelCustomizationName = vnfItemVnfType;\n				//	\n				request.requestDetails.relatedInstanceList.add(relatedInstanceListElement1);\n				request.requestDetails.relatedInstanceList.add(relatedInstanceListElement2);\n				//\n				// print MSO request for debug\n				//\n				System.out.println(\"MSO request sent:\");\n				System.out.println(Serialization.gsonPretty.toJson(request));\n				//\n				//\n				//\n				if (request != null) {\n					//\n					// Tell interested parties we are performing this Operation\n					//\n					VirtualControlLoopNotification notification = new VirtualControlLoopNotification($event);\n					notification.notification = ControlLoopNotificationType.OPERATION;\n					notification.from = \"policy\";\n					notification.policyName = drools.getRule().getName();\n					notification.policyScope = \"com\";\n					notification.policyVersion = \"1\";\n					try {\n						System.out.println(Serialization.gsonPretty.toJson(notification));\n						PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n					} catch (Exception e) {\n						System.out.println(\"Can\'t deliver notification: \" + notification);\n						e.printStackTrace();\n					}\n					//\n					// Concatenate serviceItemServiceInstanceId and vnfItemVnfId to msoURL\n					//\n					String MSOUrl = $params.getMsoURL() + \"/serviceInstances/v2/\" + serviceItemServiceInstanceId + \"/vnfs/\" + vnfItemVnfId + \"/vfModules\";\n					//\n					// Call MSO\n					//\n					MSOResponse response = MSOManager.createModuleInstance(MSOUrl, $params.getMsoURL(), $params.getMsoUsername(), $params.getMsoPassword(), request);\n					//\n					if (response != null) {\n						//\n						// Assign requestId\n						//\n						request.requestId = $event.requestID.toString();						\n						response.request.requestId = $event.requestID.toString();\n						//\n						// Insert facts\n						//\n						insert(operationWrapper);\n						insert(request);\n						insert(response);\n					} else {\n						//\n						// MSO request not even accepted\n						//\n						notification.message = operationWrapper.operation.toMessage();\n						operationWrapper.operation.message = operationWrapper.operation.toMessage();\n						operationWrapper.operation.outcome = \"FAILURE_EXCEPTION\";\n						$manager.setControlLoopResult(\"FAILURE_EXCEPTION\");\n						notification.history.add(operationWrapper.operation);\n						notification.notification = ControlLoopNotificationType.OPERATION_FAILURE;\n						//\n						// Let interested parties know\n						//\n						try {\n							System.out.println(Serialization.gsonPretty.toJson(notification));\n							PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n						} catch (Exception e) {\n							System.out.println(\"Can\'t deliver notification: \" + notification);\n							e.printStackTrace();\n						}\n	                    notification.notification = ControlLoopNotificationType.FINAL_FAILURE;\n                        try {\n                        	System.out.println(Serialization.gsonPretty.toJson(notification));\n                        	PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n                        } catch (Exception e) {\n                        	System.out.println(\"Can\'t deliver notification: \" + notification);\n                        	e.printStackTrace();\n                        }\n						//\n						// Retract everything\n						//\n						retract($event);\n						retract($manager);\n					}\n				} else {\n					System.err.println(\"constructed MSO request is invalid.\");\n				}\n			}\n			break; \n		} \nend\n		\n/*\n*\n* This rule responds to APPC Response Events\n*\n*/\nrule \"BRMSParamvLBDemoPolicy.APPC.RESPONSE\"\n	when\n		$params : Params( getClosedLoopControlName() == \"CL-DNS-LOW-TRAFFIC-SIG-d925ed73-8231-4d02-9545-db4e101f88f8\" )\n		$event : VirtualControlLoopEvent( closedLoopControlName == $params.getClosedLoopControlName(), closedLoopEventStatus == ControlLoopEventStatus.ONSET )\n		$manager : EventManager( closedLoopControlName == $event.closedLoopControlName )\n		$operationWrapper : ControlLoopOperationWrapper( requestID == $event.requestID )\n		$request : Request( getCommonHeader().RequestID == $event.requestID )\n		$response : Response( getCommonHeader().RequestID == $event.requestID )	\n	then\n		System.out.println(\"rule APPC.RESPONSE is triggered.\");\n		if ($response.Status == null) {\n			$operationWrapper.operation.outcome = \"FAILURE_EXCEPTION\";\n			$manager.setControlLoopResult(\"FAILURE_EXCEPTION\");\n		} \n		//\n		// Get the Response Code\n		//\n		ResponseCode code = ResponseCode.toResponseCode($response.Status.Code);\n		if (code == null) {\n			$operationWrapper.operation.outcome = \"FAILURE_EXCEPTION\";\n			$manager.setControlLoopResult(\"FAILURE_EXCEPTION\");\n		}\n		//\n		// Construct notification\n		//\n		VirtualControlLoopNotification notification = new VirtualControlLoopNotification($event);\n		notification.from = \"policy\";\n		notification.policyName = drools.getRule().getName();\n		notification.policyScope = \"com\";\n		notification.policyVersion = \"1\";\n		notification.message = $operationWrapper.operation.toMessage();\n		$operationWrapper.operation.message = $operationWrapper.operation.toMessage();\n		//\n		// Ok, let\'s figure out what APP-C\'s response is\n		//\n		switch (code) {\n			case ACCEPT:\n				$operationWrapper.operation.outcome = \"PROCESSING\";\n				break;\n			case ERROR:\n			case REJECT:\n				$operationWrapper.operation.outcome = \"FAILURE_EXCEPTION\";\n				$manager.setControlLoopResult(\"FAILURE_EXCEPTION\");\n				break;\n			case SUCCESS:\n				$operationWrapper.operation.outcome = \"SUCCESS\";\n				$manager.setControlLoopResult(\"SUCCESS\");\n				break;\n			case FAILURE:\n				$operationWrapper.operation.outcome = \"FAILURE\";\n				$manager.setControlLoopResult(\"FAILURE\");\n				break;\n		}\n		if ($operationWrapper.operation.outcome.equals(\"SUCCESS\")) {\n			notification.history.add($operationWrapper.operation);\n			notification.notification = ControlLoopNotificationType.OPERATION_SUCCESS;\n			//\n			// Let interested parties know\n			//\n			try {\n				System.out.println(Serialization.gsonPretty.toJson(notification));\n				PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n			} catch (Exception e) {\n				System.out.println(\"Can\'t deliver notification: \" + notification);\n				e.printStackTrace();\n			}\n            notification.notification = ControlLoopNotificationType.FINAL_SUCCESS;\n            try {\n            	System.out.println(Serialization.gsonPretty.toJson(notification));\n            	PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n            } catch (Exception e) {\n            	System.out.println(\"Can\'t deliver notification: \" + notification);\n            	e.printStackTrace();\n            }\n\n			//\n			// We are going to retract these objects from memory\n			//\n			System.out.println(\"Retracting everything\");\n			retract($operationWrapper);\n			retract($request);\n			retract($response);\n			retract($event);\n			retract($manager);\n		} else if ($operationWrapper.operation.outcome.equals(\"PROCESSING\")) {\n			retract($response);\n		} else {\n			notification.history.add($operationWrapper.operation);\n			notification.notification = ControlLoopNotificationType.OPERATION_FAILURE;\n			//\n			// Let interested parties know\n			//\n			try {\n				System.out.println(Serialization.gsonPretty.toJson(notification));\n				PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n			} catch (Exception e) {\n				System.out.println(\"Can\'t deliver notification: \" + notification);\n				e.printStackTrace();\n			}\n            notification.notification = ControlLoopNotificationType.FINAL_FAILURE;\n            //\n            // Let interested parties know\n            //\n            try {\n            	System.out.println(Serialization.gsonPretty.toJson(notification));\n            	PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n            } catch (Exception e) {\n            	System.out.println(\"Can\'t deliver notification: \" + notification);\n            	e.printStackTrace();\n            }\n			//\n			// We are going to retract these objects from memory\n			//\n			System.out.println(\"Retracting everything\");\n			retract($operationWrapper);\n			retract($request);\n			retract($response);\n			retract($event);\n			retract($manager);\n		}\n		\nend		\n\n/*\n*\n* This rule is used to clean up APPC response\n*\n*/		\nrule \"BRMSParamvLBDemoPolicy.APPC.RESPONSE.CLEANUP\"\n	when\n		$params : Params( getClosedLoopControlName() == \"CL-DNS-LOW-TRAFFIC-SIG-d925ed73-8231-4d02-9545-db4e101f88f8\" )\n        $response : Response($id : getCommonHeader().RequestID )\n		not ( VirtualControlLoopEvent( closedLoopControlName == $params.getClosedLoopControlName(), requestID == $id, closedLoopEventStatus == ControlLoopEventStatus.ONSET ) ) \n	then\n		System.out.println(\"rule APPC.RESPONSE.CLEANUP is triggered.\");\n		retract($response);\nend\n\n/*\n*\n* This rule responds to MSO Response Events\n*\n*/\nrule \"BRMSParamvLBDemoPolicy.MSO.RESPONSE\"\n	when\n		$params : Params( getClosedLoopControlName() == \"CL-DNS-LOW-TRAFFIC-SIG-d925ed73-8231-4d02-9545-db4e101f88f8\" )\n		$event : VirtualControlLoopEvent( closedLoopControlName == $params.getClosedLoopControlName(), closedLoopEventStatus == ControlLoopEventStatus.ONSET )\n		$manager : EventManager( closedLoopControlName == $event.closedLoopControlName )\n		$operationWrapper : ControlLoopOperationWrapper( requestID == $event.requestID )\n		$request : MSORequest( requestId == $event.requestID.toString() )\n		$response : MSOResponse( request.requestId == $event.requestID.toString() )	\n	then\n		System.out.println(\"rule MSO.RESPONSE is triggered.\");\n		//\n		// Construct notification\n		//\n		VirtualControlLoopNotification notification = new VirtualControlLoopNotification($event);\n		notification.from = \"policy\";\n		notification.policyName = drools.getRule().getName();\n		notification.policyScope = \"com\";\n		notification.policyVersion = \"1\";\n		notification.message = $operationWrapper.operation.toMessage();\n		$operationWrapper.operation.message = $operationWrapper.operation.toMessage();\n		//\n		// The operation can either be succeeded or failed\n		// \n		if($response.request.requestStatus.requestState.equals(\"COMPLETE\")) {\n			$operationWrapper.operation.outcome = \"SUCCESS\";\n			$manager.setControlLoopResult(\"SUCCESS\");\n			notification.history.add($operationWrapper.operation);\n			notification.notification = ControlLoopNotificationType.OPERATION_SUCCESS;\n			//\n			// Let interested parties know\n			//\n			try {\n				System.out.println(Serialization.gsonPretty.toJson(notification));\n				PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n			} catch (Exception e) {\n				System.out.println(\"Can\'t deliver notification: \" + notification);\n				e.printStackTrace();\n			}\n			notification.notification = ControlLoopNotificationType.FINAL_SUCCESS;\n            //\n            // Let interested parties know\n            //\n            try {\n            	System.out.println(Serialization.gsonPretty.toJson(notification));\n            	PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n            } catch (Exception e) {\n            	System.out.println(\"Can\'t deliver notification: \" + notification);\n            	e.printStackTrace();\n            }\n            //\n			// We are going to retract these objects from memory\n			//\n			System.out.println(\"Retracting everything\");\n			retract($operationWrapper);\n			retract($request);\n			retract($response);\n			retract($event);\n			retract($manager);\n		} else {\n			$operationWrapper.operation.outcome = \"FAILURE\";\n			$manager.setControlLoopResult(\"FAILURE\");\n			notification.history.add($operationWrapper.operation);\n			notification.notification = ControlLoopNotificationType.OPERATION_FAILURE;\n			//\n			// Let interested parties know\n			//\n			try {\n				System.out.println(Serialization.gsonPretty.toJson(notification));\n				PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n			} catch (Exception e) {\n				System.out.println(\"Can\'t deliver notification: \" + notification);\n				e.printStackTrace();\n			}\n			notification.notification = ControlLoopNotificationType.FINAL_FAILURE;\n            //\n            // Let interested parties know\n            //\n            try {\n            	System.out.println(Serialization.gsonPretty.toJson(notification));\n            	PolicyEngine.manager.deliver($params.getNotificationTopic(), notification);\n            } catch (Exception e) {\n            	System.out.println(\"Can\'t deliver notification: \" + notification);\n            	e.printStackTrace();\n            }\n            //\n			// We are going to retract these objects from memory\n			//\n			System.out.println(\"Retracting everything\");\n			retract($operationWrapper);\n			retract($request);\n			retract($response);\n			retract($event);\n			retract($manager);\n		}\n		\nend	\nrule \"com.Config_BRMS_Param_BRMSParamvLBDemoPolicy.Params\" \n	salience 1000 \n	when\n	then\n		Params params = new Params();\n		params.setAaiPatternMatch(0);\n		params.setAppcTopic(\"APPC-CL\");\n		params.setAaiURL(\"https://aai.api.simpledemo.openecomp.org:8443\");\n		params.setMsoPassword(\"password1$\");\n		params.setClosedLoopControlName(\"CL-DNS-LOW-TRAFFIC-SIG-d925ed73-8231-4d02-9545-db4e101f88f8\");\n		params.setAaiUsername(\"POLICY\");\n		params.setMsoURL(\"http://vm1.mso.simpledemo.openecomp.org:8080/onap/mso/infra\");\n		params.setActor(\"MSO\");\n		params.setMsoUsername(\"InfraPortalClient\");\n		params.setAaiNamedQueryUUID(\"f199cb88-5e69-4b1f-93e0-6f257877d066\");\n		params.setAaiPassword(\"POLICY\");\n		params.setNotificationTopic(\"POLICY-CL-MGT\");\n		insert(params);\nend\r\n','OTHER','com.Config_BRMS_Param_BRMSParamvLBDemoPolicy.1.txt','doACPolicyPut','2017-03-14 20:00:56',0,'','doACPolicyPut','2017-03-14 20:00:56',1);
 
-INSERT INTO `policyentity` VALUES (3202,'doACPolicyPut','2017-03-14 19:58:19',0,'BRMSParam vFW Demo Policy@CreatedBy:@CreatedBy:@ModifiedBy:@ModifiedBy:','doACPolicyPut','2017-03-14 19:58:19','<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n<Policy xmlns=\"urn:oasis:names:tc:xacml:3.0:core:schema:wd-17\" PolicyId=\"urn:com:xacml:policy:id:256f4712-a965-4817-a851-a71bdeb9fb49\" Version=\"1\" RuleCombiningAlgId=\"urn:oasis:names:tc:xacml:3.0:rule-combining-algorithm:permit-overrides\">\n    <Description>BRMSParam vFW Demo Policy@CreatedBy:@CreatedBy:@ModifiedBy:@ModifiedBy:</Description>\n    <Target>\n        <AnyOf>\n            <AllOf>\n                <Match MatchId=\"org.openecomp.function.regex-match\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">com.Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.xml</AttributeValue>\n                    <AttributeDesignator Category=\"urn:oasis:names:tc:xacml:1.0:subject-category:access-subject\" AttributeId=\"PolicyName\" DataType=\"http://www.w3.org/2001/XMLSchema#string\" MustBePresent=\"false\"/>\n                </Match>\n            </AllOf>\n            <AllOf>\n                <Match MatchId=\"org.openecomp.function.regex-match\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">DROOLS</AttributeValue>\n                    <AttributeDesignator Category=\"urn:oasis:names:tc:xacml:1.0:subject-category:access-subject\" AttributeId=\"ECOMPName\" DataType=\"http://www.w3.org/2001/XMLSchema#string\" MustBePresent=\"false\"/>\n                </Match>\n                <Match MatchId=\"org.openecomp.function.regex-match\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">BRMS_PARAM_RULE</AttributeValue>\n                    <AttributeDesignator Category=\"urn:oasis:names:tc:xacml:1.0:subject-category:access-subject\" AttributeId=\"ConfigName\" DataType=\"http://www.w3.org/2001/XMLSchema#string\" MustBePresent=\"false\"/>\n                </Match>\n                <Match MatchId=\"org.openecomp.function.regex-match\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">SampleRiskType</AttributeValue>\n                    <AttributeDesignator Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" AttributeId=\"RiskType\" DataType=\"http://www.w3.org/2001/XMLSchema#string\" MustBePresent=\"false\"/>\n                </Match>\n                <Match MatchId=\"org.openecomp.function.regex-match\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">1</AttributeValue>\n                    <AttributeDesignator Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" AttributeId=\"RiskLevel\" DataType=\"http://www.w3.org/2001/XMLSchema#string\" MustBePresent=\"false\"/>\n                </Match>\n                <Match MatchId=\"org.openecomp.function.regex-match\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">False</AttributeValue>\n                    <AttributeDesignator Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" AttributeId=\"guard\" DataType=\"http://www.w3.org/2001/XMLSchema#string\" MustBePresent=\"false\"/>\n                </Match>\n                <Match MatchId=\"org.openecomp.function.regex-match\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">NA</AttributeValue>\n                    <AttributeDesignator Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" AttributeId=\"TTLDate\" DataType=\"http://www.w3.org/2001/XMLSchema#string\" MustBePresent=\"false\"/>\n                </Match>\n            </AllOf>\n        </AnyOf>\n    </Target>\n    <Rule RuleId=\"urn:com:xacml:rule:id:8cdb88aa-448b-4ed1-bce5-6a037651e73c\" Effect=\"Permit\">\n        <Target>\n            <AnyOf>\n                <AllOf>\n                    <Match MatchId=\"urn:oasis:names:tc:xacml:3.0:function:string-equal-ignore-case\">\n                        <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">ACCESS</AttributeValue>\n                        <AttributeDesignator Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:action\" AttributeId=\"urn:oasis:names:tc:xacml:1.0:action:action-id\" DataType=\"http://www.w3.org/2001/XMLSchema#string\" MustBePresent=\"false\"/>\n                    </Match>\n                    <Match MatchId=\"urn:oasis:names:tc:xacml:3.0:function:string-equal-ignore-case\">\n                        <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">Config</AttributeValue>\n                        <AttributeDesignator Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" AttributeId=\"urn:oasis:names:tc:xacml:1.0:resource:resource-id\" DataType=\"http://www.w3.org/2001/XMLSchema#string\" MustBePresent=\"false\"/>\n                    </Match>\n                </AllOf>\n            </AnyOf>\n        </Target>\n        <AdviceExpressions>\n            <AdviceExpression AdviceId=\"BRMSPARAMID\" AppliesTo=\"Permit\">\n                <AttributeAssignmentExpression AttributeId=\"type\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">Configuration</AttributeValue>\n                </AttributeAssignmentExpression>\n                <AttributeAssignmentExpression AttributeId=\"URLID\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#anyURI\">$URL/Config/com.Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.txt</AttributeValue>\n                </AttributeAssignmentExpression>\n                <AttributeAssignmentExpression AttributeId=\"PolicyName\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">com.Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.xml</AttributeValue>\n                </AttributeAssignmentExpression>\n                <AttributeAssignmentExpression AttributeId=\"VersionNumber\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">1</AttributeValue>\n                </AttributeAssignmentExpression>\n                <AttributeAssignmentExpression AttributeId=\"matching:ECOMPName\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">DROOLS</AttributeValue>\n                </AttributeAssignmentExpression>\n                <AttributeAssignmentExpression AttributeId=\"matching:ConfigName\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">BRMS_PARAM_RULE</AttributeValue>\n                </AttributeAssignmentExpression>\n                <AttributeAssignmentExpression AttributeId=\"key:controller\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">vFW</AttributeValue>\n                </AttributeAssignmentExpression>\n                <AttributeAssignmentExpression AttributeId=\"RiskType\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">SampleRiskType</AttributeValue>\n                </AttributeAssignmentExpression>\n                <AttributeAssignmentExpression AttributeId=\"RiskLevel\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">1</AttributeValue>\n                </AttributeAssignmentExpression>\n                <AttributeAssignmentExpression AttributeId=\"guard\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">False</AttributeValue>\n                </AttributeAssignmentExpression>\n                <AttributeAssignmentExpression AttributeId=\"TTLDate\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">NA</AttributeValue>\n                </AttributeAssignmentExpression>\n            </AdviceExpression>\n        </AdviceExpressions>\n    </Rule>\n</Policy>\n','Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.xml',0,'com',1,NULL,3201),(3204,'doACPolicyPut','2017-03-14 20:00:56',0,'BRMSParam vLB Demo Policy@CreatedBy:@CreatedBy:@ModifiedBy:@ModifiedBy:','doACPolicyPut','2017-03-14 20:00:56','<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n<Policy xmlns=\"urn:oasis:names:tc:xacml:3.0:core:schema:wd-17\" PolicyId=\"urn:com:xacml:policy:id:ace93d23-7a21-450a-87b4-5ff11e01d4b1\" Version=\"1\" RuleCombiningAlgId=\"urn:oasis:names:tc:xacml:3.0:rule-combining-algorithm:permit-overrides\">\n    <Description>BRMSParam vLB Demo Policy@CreatedBy:@CreatedBy:@ModifiedBy:@ModifiedBy:</Description>\n    <Target>\n        <AnyOf>\n            <AllOf>\n                <Match MatchId=\"org.openecomp.function.regex-match\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">com.Config_BRMS_Param_BRMSParamvLBDemoPolicy.1.xml</AttributeValue>\n                    <AttributeDesignator Category=\"urn:oasis:names:tc:xacml:1.0:subject-category:access-subject\" AttributeId=\"PolicyName\" DataType=\"http://www.w3.org/2001/XMLSchema#string\" MustBePresent=\"false\"/>\n                </Match>\n            </AllOf>\n            <AllOf>\n                <Match MatchId=\"org.openecomp.function.regex-match\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">DROOLS</AttributeValue>\n                    <AttributeDesignator Category=\"urn:oasis:names:tc:xacml:1.0:subject-category:access-subject\" AttributeId=\"ECOMPName\" DataType=\"http://www.w3.org/2001/XMLSchema#string\" MustBePresent=\"false\"/>\n                </Match>\n                <Match MatchId=\"org.openecomp.function.regex-match\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">BRMS_PARAM_RULE</AttributeValue>\n                    <AttributeDesignator Category=\"urn:oasis:names:tc:xacml:1.0:subject-category:access-subject\" AttributeId=\"ConfigName\" DataType=\"http://www.w3.org/2001/XMLSchema#string\" MustBePresent=\"false\"/>\n                </Match>\n                <Match MatchId=\"org.openecomp.function.regex-match\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">SampleRiskType</AttributeValue>\n                    <AttributeDesignator Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" AttributeId=\"RiskType\" DataType=\"http://www.w3.org/2001/XMLSchema#string\" MustBePresent=\"false\"/>\n                </Match>\n                <Match MatchId=\"org.openecomp.function.regex-match\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">1</AttributeValue>\n                    <AttributeDesignator Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" AttributeId=\"RiskLevel\" DataType=\"http://www.w3.org/2001/XMLSchema#string\" MustBePresent=\"false\"/>\n                </Match>\n                <Match MatchId=\"org.openecomp.function.regex-match\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">False</AttributeValue>\n                    <AttributeDesignator Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" AttributeId=\"guard\" DataType=\"http://www.w3.org/2001/XMLSchema#string\" MustBePresent=\"false\"/>\n                </Match>\n                <Match MatchId=\"org.openecomp.function.regex-match\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">NA</AttributeValue>\n                    <AttributeDesignator Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" AttributeId=\"TTLDate\" DataType=\"http://www.w3.org/2001/XMLSchema#string\" MustBePresent=\"false\"/>\n                </Match>\n            </AllOf>\n        </AnyOf>\n    </Target>\n    <Rule RuleId=\"urn:com:xacml:rule:id:9d472f3a-bab1-4bee-8bfc-0ee1b4e11ad6\" Effect=\"Permit\">\n        <Target>\n            <AnyOf>\n                <AllOf>\n                    <Match MatchId=\"urn:oasis:names:tc:xacml:3.0:function:string-equal-ignore-case\">\n                        <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">ACCESS</AttributeValue>\n                        <AttributeDesignator Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:action\" AttributeId=\"urn:oasis:names:tc:xacml:1.0:action:action-id\" DataType=\"http://www.w3.org/2001/XMLSchema#string\" MustBePresent=\"false\"/>\n                    </Match>\n                    <Match MatchId=\"urn:oasis:names:tc:xacml:3.0:function:string-equal-ignore-case\">\n                        <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">Config</AttributeValue>\n                        <AttributeDesignator Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" AttributeId=\"urn:oasis:names:tc:xacml:1.0:resource:resource-id\" DataType=\"http://www.w3.org/2001/XMLSchema#string\" MustBePresent=\"false\"/>\n                    </Match>\n                </AllOf>\n            </AnyOf>\n        </Target>\n        <AdviceExpressions>\n            <AdviceExpression AdviceId=\"BRMSPARAMID\" AppliesTo=\"Permit\">\n                <AttributeAssignmentExpression AttributeId=\"type\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">Configuration</AttributeValue>\n                </AttributeAssignmentExpression>\n                <AttributeAssignmentExpression AttributeId=\"URLID\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#anyURI\">$URL/Config/com.Config_BRMS_Param_BRMSParamvLBDemoPolicy.1.txt</AttributeValue>\n                </AttributeAssignmentExpression>\n                <AttributeAssignmentExpression AttributeId=\"PolicyName\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">com.Config_BRMS_Param_BRMSParamvLBDemoPolicy.1.xml</AttributeValue>\n                </AttributeAssignmentExpression>\n                <AttributeAssignmentExpression AttributeId=\"VersionNumber\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">1</AttributeValue>\n                </AttributeAssignmentExpression>\n                <AttributeAssignmentExpression AttributeId=\"matching:ECOMPName\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">DROOLS</AttributeValue>\n                </AttributeAssignmentExpression>\n                <AttributeAssignmentExpression AttributeId=\"matching:ConfigName\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">BRMS_PARAM_RULE</AttributeValue>\n                </AttributeAssignmentExpression>\n                <AttributeAssignmentExpression AttributeId=\"key:controller\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">vDNS</AttributeValue>\n                </AttributeAssignmentExpression>\n                <AttributeAssignmentExpression AttributeId=\"RiskType\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">SampleRiskType</AttributeValue>\n                </AttributeAssignmentExpression>\n                <AttributeAssignmentExpression AttributeId=\"RiskLevel\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">1</AttributeValue>\n                </AttributeAssignmentExpression>\n                <AttributeAssignmentExpression AttributeId=\"guard\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">False</AttributeValue>\n                </AttributeAssignmentExpression>\n                <AttributeAssignmentExpression AttributeId=\"TTLDate\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">NA</AttributeValue>\n                </AttributeAssignmentExpression>\n            </AdviceExpression>\n        </AdviceExpressions>\n    </Rule>\n</Policy>\n','Config_BRMS_Param_BRMSParamvLBDemoPolicy.1.xml',0,'com',1,NULL,3203);
+INSERT INTO `policyentity` VALUES (3202,'doACPolicyPut','2017-03-14 19:58:19',0,'BRMSParam vFW Demo Policy@CreatedBy:@CreatedBy:@ModifiedBy:@ModifiedBy:','doACPolicyPut','2017-03-14 19:58:19','<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n<Policy xmlns=\"urn:oasis:names:tc:xacml:3.0:core:schema:wd-17\" PolicyId=\"urn:com:xacml:policy:id:256f4712-a965-4817-a851-a71bdeb9fb49\" Version=\"1\" RuleCombiningAlgId=\"urn:oasis:names:tc:xacml:3.0:rule-combining-algorithm:permit-overrides\">\n    <Description>BRMSParam vFW Demo Policy@CreatedBy:@CreatedBy:@ModifiedBy:@ModifiedBy:</Description>\n    <Target>\n        <AnyOf>\n            <AllOf>\n                <Match MatchId=\"org.onap.function.regex-match\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">com.Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.xml</AttributeValue>\n                    <AttributeDesignator Category=\"urn:oasis:names:tc:xacml:1.0:subject-category:access-subject\" AttributeId=\"PolicyName\" DataType=\"http://www.w3.org/2001/XMLSchema#string\" MustBePresent=\"false\"/>\n                </Match>\n            </AllOf>\n            <AllOf>\n                <Match MatchId=\"org.onap.function.regex-match\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">DROOLS</AttributeValue>\n                    <AttributeDesignator Category=\"urn:oasis:names:tc:xacml:1.0:subject-category:access-subject\" AttributeId=\"ONAPName\" DataType=\"http://www.w3.org/2001/XMLSchema#string\" MustBePresent=\"false\"/>\n                </Match>\n                <Match MatchId=\"org.onap.function.regex-match\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">BRMS_PARAM_RULE</AttributeValue>\n                    <AttributeDesignator Category=\"urn:oasis:names:tc:xacml:1.0:subject-category:access-subject\" AttributeId=\"ConfigName\" DataType=\"http://www.w3.org/2001/XMLSchema#string\" MustBePresent=\"false\"/>\n                </Match>\n                <Match MatchId=\"org.onap.function.regex-match\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">SampleRiskType</AttributeValue>\n                    <AttributeDesignator Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" AttributeId=\"RiskType\" DataType=\"http://www.w3.org/2001/XMLSchema#string\" MustBePresent=\"false\"/>\n                </Match>\n                <Match MatchId=\"org.onap.function.regex-match\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">1</AttributeValue>\n                    <AttributeDesignator Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" AttributeId=\"RiskLevel\" DataType=\"http://www.w3.org/2001/XMLSchema#string\" MustBePresent=\"false\"/>\n                </Match>\n                <Match MatchId=\"org.onap.function.regex-match\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">False</AttributeValue>\n                    <AttributeDesignator Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" AttributeId=\"guard\" DataType=\"http://www.w3.org/2001/XMLSchema#string\" MustBePresent=\"false\"/>\n                </Match>\n                <Match MatchId=\"org.onap.function.regex-match\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">NA</AttributeValue>\n                    <AttributeDesignator Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" AttributeId=\"TTLDate\" DataType=\"http://www.w3.org/2001/XMLSchema#string\" MustBePresent=\"false\"/>\n                </Match>\n            </AllOf>\n        </AnyOf>\n    </Target>\n    <Rule RuleId=\"urn:com:xacml:rule:id:8cdb88aa-448b-4ed1-bce5-6a037651e73c\" Effect=\"Permit\">\n        <Target>\n            <AnyOf>\n                <AllOf>\n                    <Match MatchId=\"urn:oasis:names:tc:xacml:3.0:function:string-equal-ignore-case\">\n                        <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">ACCESS</AttributeValue>\n                        <AttributeDesignator Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:action\" AttributeId=\"urn:oasis:names:tc:xacml:1.0:action:action-id\" DataType=\"http://www.w3.org/2001/XMLSchema#string\" MustBePresent=\"false\"/>\n                    </Match>\n                    <Match MatchId=\"urn:oasis:names:tc:xacml:3.0:function:string-equal-ignore-case\">\n                        <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">Config</AttributeValue>\n                        <AttributeDesignator Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" AttributeId=\"urn:oasis:names:tc:xacml:1.0:resource:resource-id\" DataType=\"http://www.w3.org/2001/XMLSchema#string\" MustBePresent=\"false\"/>\n                    </Match>\n                </AllOf>\n            </AnyOf>\n        </Target>\n        <AdviceExpressions>\n            <AdviceExpression AdviceId=\"BRMSPARAMID\" AppliesTo=\"Permit\">\n                <AttributeAssignmentExpression AttributeId=\"type\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">Configuration</AttributeValue>\n                </AttributeAssignmentExpression>\n                <AttributeAssignmentExpression AttributeId=\"URLID\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#anyURI\">$URL/Config/com.Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.txt</AttributeValue>\n                </AttributeAssignmentExpression>\n                <AttributeAssignmentExpression AttributeId=\"PolicyName\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">com.Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.xml</AttributeValue>\n                </AttributeAssignmentExpression>\n                <AttributeAssignmentExpression AttributeId=\"VersionNumber\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">1</AttributeValue>\n                </AttributeAssignmentExpression>\n                <AttributeAssignmentExpression AttributeId=\"matching:ONAPName\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">DROOLS</AttributeValue>\n                </AttributeAssignmentExpression>\n                <AttributeAssignmentExpression AttributeId=\"matching:ConfigName\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">BRMS_PARAM_RULE</AttributeValue>\n                </AttributeAssignmentExpression>\n                <AttributeAssignmentExpression AttributeId=\"key:controller\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">vFW</AttributeValue>\n                </AttributeAssignmentExpression>\n                <AttributeAssignmentExpression AttributeId=\"RiskType\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">SampleRiskType</AttributeValue>\n                </AttributeAssignmentExpression>\n                <AttributeAssignmentExpression AttributeId=\"RiskLevel\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">1</AttributeValue>\n                </AttributeAssignmentExpression>\n                <AttributeAssignmentExpression AttributeId=\"guard\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">False</AttributeValue>\n                </AttributeAssignmentExpression>\n                <AttributeAssignmentExpression AttributeId=\"TTLDate\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">NA</AttributeValue>\n                </AttributeAssignmentExpression>\n            </AdviceExpression>\n        </AdviceExpressions>\n    </Rule>\n</Policy>\n','Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.xml',0,'com',1,NULL,3201),(3204,'doACPolicyPut','2017-03-14 20:00:56',0,'BRMSParam vLB Demo Policy@CreatedBy:@CreatedBy:@ModifiedBy:@ModifiedBy:','doACPolicyPut','2017-03-14 20:00:56','<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n<Policy xmlns=\"urn:oasis:names:tc:xacml:3.0:core:schema:wd-17\" PolicyId=\"urn:com:xacml:policy:id:ace93d23-7a21-450a-87b4-5ff11e01d4b1\" Version=\"1\" RuleCombiningAlgId=\"urn:oasis:names:tc:xacml:3.0:rule-combining-algorithm:permit-overrides\">\n    <Description>BRMSParam vLB Demo Policy@CreatedBy:@CreatedBy:@ModifiedBy:@ModifiedBy:</Description>\n    <Target>\n        <AnyOf>\n            <AllOf>\n                <Match MatchId=\"org.onap.function.regex-match\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">com.Config_BRMS_Param_BRMSParamvLBDemoPolicy.1.xml</AttributeValue>\n                    <AttributeDesignator Category=\"urn:oasis:names:tc:xacml:1.0:subject-category:access-subject\" AttributeId=\"PolicyName\" DataType=\"http://www.w3.org/2001/XMLSchema#string\" MustBePresent=\"false\"/>\n                </Match>\n            </AllOf>\n            <AllOf>\n                <Match MatchId=\"org.onap.function.regex-match\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">DROOLS</AttributeValue>\n                    <AttributeDesignator Category=\"urn:oasis:names:tc:xacml:1.0:subject-category:access-subject\" AttributeId=\"ONAPName\" DataType=\"http://www.w3.org/2001/XMLSchema#string\" MustBePresent=\"false\"/>\n                </Match>\n                <Match MatchId=\"org.onap.function.regex-match\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">BRMS_PARAM_RULE</AttributeValue>\n                    <AttributeDesignator Category=\"urn:oasis:names:tc:xacml:1.0:subject-category:access-subject\" AttributeId=\"ConfigName\" DataType=\"http://www.w3.org/2001/XMLSchema#string\" MustBePresent=\"false\"/>\n                </Match>\n                <Match MatchId=\"org.onap.function.regex-match\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">SampleRiskType</AttributeValue>\n                    <AttributeDesignator Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" AttributeId=\"RiskType\" DataType=\"http://www.w3.org/2001/XMLSchema#string\" MustBePresent=\"false\"/>\n                </Match>\n                <Match MatchId=\"org.onap.function.regex-match\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">1</AttributeValue>\n                    <AttributeDesignator Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" AttributeId=\"RiskLevel\" DataType=\"http://www.w3.org/2001/XMLSchema#string\" MustBePresent=\"false\"/>\n                </Match>\n                <Match MatchId=\"org.onap.function.regex-match\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">False</AttributeValue>\n                    <AttributeDesignator Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" AttributeId=\"guard\" DataType=\"http://www.w3.org/2001/XMLSchema#string\" MustBePresent=\"false\"/>\n                </Match>\n                <Match MatchId=\"org.onap.function.regex-match\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">NA</AttributeValue>\n                    <AttributeDesignator Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" AttributeId=\"TTLDate\" DataType=\"http://www.w3.org/2001/XMLSchema#string\" MustBePresent=\"false\"/>\n                </Match>\n            </AllOf>\n        </AnyOf>\n    </Target>\n    <Rule RuleId=\"urn:com:xacml:rule:id:9d472f3a-bab1-4bee-8bfc-0ee1b4e11ad6\" Effect=\"Permit\">\n        <Target>\n            <AnyOf>\n                <AllOf>\n                    <Match MatchId=\"urn:oasis:names:tc:xacml:3.0:function:string-equal-ignore-case\">\n                        <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">ACCESS</AttributeValue>\n                        <AttributeDesignator Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:action\" AttributeId=\"urn:oasis:names:tc:xacml:1.0:action:action-id\" DataType=\"http://www.w3.org/2001/XMLSchema#string\" MustBePresent=\"false\"/>\n                    </Match>\n                    <Match MatchId=\"urn:oasis:names:tc:xacml:3.0:function:string-equal-ignore-case\">\n                        <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">Config</AttributeValue>\n                        <AttributeDesignator Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" AttributeId=\"urn:oasis:names:tc:xacml:1.0:resource:resource-id\" DataType=\"http://www.w3.org/2001/XMLSchema#string\" MustBePresent=\"false\"/>\n                    </Match>\n                </AllOf>\n            </AnyOf>\n        </Target>\n        <AdviceExpressions>\n            <AdviceExpression AdviceId=\"BRMSPARAMID\" AppliesTo=\"Permit\">\n                <AttributeAssignmentExpression AttributeId=\"type\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">Configuration</AttributeValue>\n                </AttributeAssignmentExpression>\n                <AttributeAssignmentExpression AttributeId=\"URLID\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#anyURI\">$URL/Config/com.Config_BRMS_Param_BRMSParamvLBDemoPolicy.1.txt</AttributeValue>\n                </AttributeAssignmentExpression>\n                <AttributeAssignmentExpression AttributeId=\"PolicyName\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">com.Config_BRMS_Param_BRMSParamvLBDemoPolicy.1.xml</AttributeValue>\n                </AttributeAssignmentExpression>\n                <AttributeAssignmentExpression AttributeId=\"VersionNumber\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">1</AttributeValue>\n                </AttributeAssignmentExpression>\n                <AttributeAssignmentExpression AttributeId=\"matching:ONAPName\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">DROOLS</AttributeValue>\n                </AttributeAssignmentExpression>\n                <AttributeAssignmentExpression AttributeId=\"matching:ConfigName\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">BRMS_PARAM_RULE</AttributeValue>\n                </AttributeAssignmentExpression>\n                <AttributeAssignmentExpression AttributeId=\"key:controller\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">vDNS</AttributeValue>\n                </AttributeAssignmentExpression>\n                <AttributeAssignmentExpression AttributeId=\"RiskType\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">SampleRiskType</AttributeValue>\n                </AttributeAssignmentExpression>\n                <AttributeAssignmentExpression AttributeId=\"RiskLevel\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">1</AttributeValue>\n                </AttributeAssignmentExpression>\n                <AttributeAssignmentExpression AttributeId=\"guard\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">False</AttributeValue>\n                </AttributeAssignmentExpression>\n                <AttributeAssignmentExpression AttributeId=\"TTLDate\" Category=\"urn:oasis:names:tc:xacml:3.0:attribute-category:resource\" Issuer=\"\">\n                    <AttributeValue DataType=\"http://www.w3.org/2001/XMLSchema#string\">NA</AttributeValue>\n                </AttributeAssignmentExpression>\n            </AdviceExpression>\n        </AdviceExpressions>\n    </Rule>\n</Policy>\n','Config_BRMS_Param_BRMSParamvLBDemoPolicy.1.xml',0,'com',1,NULL,3203);
 
 INSERT INTO `policyversion` VALUES (1,'com/Config_BRMS_Param_BRMSParamvFWDemoPolicy',1,1,'2017-03-03 17:16:37','demo','2017-03-03 17:16:37','demo'),(2,'com/Config_BRMS_Param_BRMSParamvLBDemoPolicy',1,1,'2017-03-03 17:20:03','demo','2017-03-03 17:20:03','demo');
 
diff --git a/packages/base/src/files/install/mysql/data/170204_downgrade_script.sql b/packages/base/src/files/install/mysql/data/170204_downgrade_script.sql
index 8fead9cce..842f6e994 100644
--- a/packages/base/src/files/install/mysql/data/170204_downgrade_script.sql
+++ b/packages/base/src/files/install/mysql/data/170204_downgrade_script.sql
@@ -1,6 +1,6 @@
 /*-
 * ============LICENSE_START=======================================================
-* ECOMP Policy Engine
+* ONAP Policy Engine
 * ================================================================================
 * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 * ================================================================================
@@ -17,7 +17,7 @@
 * limitations under the License.
 * ============LICENSE_END=========================================================
 */
-use ecomp_sdk;
+use onap_sdk;
 drop table if exists brmsgroup_info;
 drop table if exists brmsgroup_policy;
 drop table if exists operationshistory10;
diff --git a/packages/base/src/files/install/mysql/data/170204_upgrade_script.sql b/packages/base/src/files/install/mysql/data/170204_upgrade_script.sql
index c474f1b7e..32868b909 100644
--- a/packages/base/src/files/install/mysql/data/170204_upgrade_script.sql
+++ b/packages/base/src/files/install/mysql/data/170204_upgrade_script.sql
@@ -1,6 +1,6 @@
 /*-
 * ============LICENSE_START=======================================================
-* ECOMP Policy Engine
+* ONAP Policy Engine
 * ================================================================================
 * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 * ================================================================================
@@ -17,7 +17,7 @@
 * limitations under the License.
 * ============LICENSE_END=========================================================
 */
-use ecomp_sdk;
+use onap_sdk;
 set foreign_key_checks=0;
 drop table if exists brmsgroup_info;
 CREATE TABLE brmsgroup_info
diff --git a/packages/base/src/files/install/mysql/data/170701_downgrade_script.sql b/packages/base/src/files/install/mysql/data/170701_downgrade_script.sql
index d81fa1535..2609634a6 100644
--- a/packages/base/src/files/install/mysql/data/170701_downgrade_script.sql
+++ b/packages/base/src/files/install/mysql/data/170701_downgrade_script.sql
@@ -1,6 +1,6 @@
 /*-
 * ============LICENSE_START=======================================================
-* ECOMP Policy Engine
+* ONAP Policy Engine
 * ================================================================================
 * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 * ================================================================================
@@ -17,7 +17,7 @@
 * limitations under the License.
 * ============LICENSE_END=========================================================
 */
-use ecomp_sdk;
+use onap_sdk;
 ALTER TABLE fwtagpicker drop networkRole;
 alter table microservicemodels drop column enumValues, drop column annotation; 
 drop table if exists FWTag; 
diff --git a/packages/base/src/files/install/mysql/data/170701_upgrade_script.sql b/packages/base/src/files/install/mysql/data/170701_upgrade_script.sql
index 9091d9fa1..acfdd008a 100644
--- a/packages/base/src/files/install/mysql/data/170701_upgrade_script.sql
+++ b/packages/base/src/files/install/mysql/data/170701_upgrade_script.sql
@@ -1,6 +1,6 @@
 /*-
 * ============LICENSE_START=======================================================
-* ECOMP Policy Engine
+* ONAP Policy Engine
 * ================================================================================
 * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 * ================================================================================
@@ -17,13 +17,13 @@
 * limitations under the License.
 * ============LICENSE_END=========================================================
 */
-use ecomp_sdk;
+use onap_sdk;
 
 INSERT INTO policyeditorscopes (`id`, `scopename`, `created_date`, `created_by`, `modified_date`, `modified_by`) VALUES ('1', 'com', '2017-06-01 11:45:36', 'demo', '2017-06-01 11:45:36', 'demo');
 
 alter table IntegrityAuditEntity modify jdbcUrl varchar(200) not null; 
 
-alter table `ecomp_sdk`.`microservicemodels` 
+alter table `onap_sdk`.`microservicemodels` 
 add column `enumValues` longtext null default null after `version`, 
 add column `annotation` longtext null after `enumValues`;
 
diff --git a/packages/base/src/files/install/mysql/data/171001_downgrade_script.sql b/packages/base/src/files/install/mysql/data/171001_downgrade_script.sql
index c7c74284c..469e951b2 100644
--- a/packages/base/src/files/install/mysql/data/171001_downgrade_script.sql
+++ b/packages/base/src/files/install/mysql/data/171001_downgrade_script.sql
@@ -1,6 +1,6 @@
 /*-
 * ============LICENSE_START=======================================================
-* ECOMP Policy Engine
+* ONAP Policy Engine
 * ================================================================================
 * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 * ================================================================================
@@ -17,5 +17,5 @@
 * limitations under the License.
 * ============LICENSE_END=========================================================
 */
-use ecomp_sdk;
+use onap_sdk;
 drop table if exists rainydaytreatments;
\ No newline at end of file
diff --git a/packages/base/src/files/install/mysql/data/171001_upgrade_script.sql b/packages/base/src/files/install/mysql/data/171001_upgrade_script.sql
index 6be2f25c5..c6f6303bd 100644
--- a/packages/base/src/files/install/mysql/data/171001_upgrade_script.sql
+++ b/packages/base/src/files/install/mysql/data/171001_upgrade_script.sql
@@ -1,6 +1,6 @@
 /*-
 * ============LICENSE_START=======================================================
-* ECOMP Policy Engine
+* ONAP Policy Engine
 * ================================================================================
 * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 * ================================================================================
@@ -17,10 +17,10 @@
 * limitations under the License.
 * ============LICENSE_END=========================================================
 */
-use ecomp_sdk;
-drop table if exists `ecomp_sdk`.`rainydaytreatments`;
+use onap_sdk;
+drop table if exists `onap_sdk`.`rainydaytreatments`;
 
-CREATE TABLE `ecomp_sdk`.`rainydaytreatments` (
+CREATE TABLE `onap_sdk`.`rainydaytreatments` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `bbid` varchar(250) DEFAULT NULL,
   `workstep` varchar(250) DEFAULT NULL,
diff --git a/packages/base/src/files/install/servers/brmsgw/client.properties b/packages/base/src/files/install/servers/brmsgw/client.properties
index 97156b66e..4a39cf1c0 100644
--- a/packages/base/src/files/install/servers/brmsgw/client.properties
+++ b/packages/base/src/files/install/servers/brmsgw/client.properties
@@ -1,6 +1,6 @@
 ###
 # ============LICENSE_START=======================================================
-# ECOMP Policy Engine
+# ONAP Policy Engine
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
diff --git a/packages/base/src/files/install/servers/brmsgw/config.properties b/packages/base/src/files/install/servers/brmsgw/config.properties
index 30b14b1e2..9e95ed719 100644
--- a/packages/base/src/files/install/servers/brmsgw/config.properties
+++ b/packages/base/src/files/install/servers/brmsgw/config.properties
@@ -1,6 +1,6 @@
 ###
 # ============LICENSE_START=======================================================
-# ECOMP Policy Engine
+# ONAP Policy Engine
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
diff --git a/packages/base/src/files/install/servers/brmsgw/config/policyLogger.properties b/packages/base/src/files/install/servers/brmsgw/config/policyLogger.properties
index 0deb1b3d6..bbb0ecf4e 100644
--- a/packages/base/src/files/install/servers/brmsgw/config/policyLogger.properties
+++ b/packages/base/src/files/install/servers/brmsgw/config/policyLogger.properties
@@ -1,6 +1,6 @@
 ###
 # ============LICENSE_START=======================================================
-# ECOMP Policy Engine
+# ONAP Policy Engine
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
diff --git a/packages/base/src/files/install/servers/common/tomcat/bin/setenv.sh b/packages/base/src/files/install/servers/common/tomcat/bin/setenv.sh
index 154b2a544..0ba7ab8e4 100644
--- a/packages/base/src/files/install/servers/common/tomcat/bin/setenv.sh
+++ b/packages/base/src/files/install/servers/common/tomcat/bin/setenv.sh
@@ -1,6 +1,6 @@
 ###
 # ============LICENSE_START=======================================================
-# ECOMP Policy Engine
+# ONAP Policy Engine
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
diff --git a/packages/base/src/files/install/servers/common/tomcat/conf/server.xml b/packages/base/src/files/install/servers/common/tomcat/conf/server.xml
index e45450024..787347283 100644
--- a/packages/base/src/files/install/servers/common/tomcat/conf/server.xml
+++ b/packages/base/src/files/install/servers/common/tomcat/conf/server.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='utf-8'?>
 <!--
   ============LICENSE_START=======================================================
-  ECOMP Policy Engine
+  ONAP Policy Engine
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
   ================================================================================
diff --git a/packages/base/src/files/install/servers/configs/conf/server.xml b/packages/base/src/files/install/servers/configs/conf/server.xml
index acda634ef..2a6191e99 100644
--- a/packages/base/src/files/install/servers/configs/conf/server.xml
+++ b/packages/base/src/files/install/servers/configs/conf/server.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='utf-8'?>
 <!--
   ============LICENSE_START=======================================================
-  ECOMP Policy Engine
+  ONAP Policy Engine
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
   ================================================================================
diff --git a/packages/base/src/files/install/servers/console/bin/Policy-Admin.xml b/packages/base/src/files/install/servers/console/bin/Policy-Admin.xml
index b2d70de9b..1f304b99a 100644
--- a/packages/base/src/files/install/servers/console/bin/Policy-Admin.xml
+++ b/packages/base/src/files/install/servers/console/bin/Policy-Admin.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <!--
   ============LICENSE_START=======================================================
-  ECOMP Policy Engine
+  ONAP Policy Engine
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
   ================================================================================
diff --git a/packages/base/src/files/install/servers/console/bin/config/policyLogger.properties b/packages/base/src/files/install/servers/console/bin/config/policyLogger.properties
index 0deb1b3d6..bbb0ecf4e 100644
--- a/packages/base/src/files/install/servers/console/bin/config/policyLogger.properties
+++ b/packages/base/src/files/install/servers/console/bin/config/policyLogger.properties
@@ -1,6 +1,6 @@
 ###
 # ============LICENSE_START=======================================================
-# ECOMP Policy Engine
+# ONAP Policy Engine
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
diff --git a/packages/base/src/files/install/servers/console/bin/model.properties b/packages/base/src/files/install/servers/console/bin/model.properties
index ce448b9ed..450654f60 100644
--- a/packages/base/src/files/install/servers/console/bin/model.properties
+++ b/packages/base/src/files/install/servers/console/bin/model.properties
@@ -1,6 +1,6 @@
 ###
 # ============LICENSE_START=======================================================
-# ECOMP Policy Engine
+# ONAP Policy Engine
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
diff --git a/packages/base/src/files/install/servers/console/bin/workspace/admin/repository/com/Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.xml b/packages/base/src/files/install/servers/console/bin/workspace/admin/repository/com/Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.xml
index 38405d625..e57f8fa4c 100755
--- a/packages/base/src/files/install/servers/console/bin/workspace/admin/repository/com/Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.xml
+++ b/packages/base/src/files/install/servers/console/bin/workspace/admin/repository/com/Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.xml
@@ -4,33 +4,33 @@
     <Target>
         <AnyOf>
             <AllOf>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">com.Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.xml</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="PolicyName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
             </AllOf>
             <AllOf>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">DROOLS</AttributeValue>
-                    <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ECOMPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
+                    <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ONAPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">BRMS_PARAM_RULE</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ConfigName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">SampleRiskType</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="RiskType" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">1</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="RiskLevel" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">False</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="guard" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">NA</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="TTLDate" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
@@ -66,7 +66,7 @@
                 <AttributeAssignmentExpression AttributeId="VersionNumber" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">1</AttributeValue>
                 </AttributeAssignmentExpression>
-                <AttributeAssignmentExpression AttributeId="matching:ECOMPName" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
+                <AttributeAssignmentExpression AttributeId="matching:ONAPName" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">DROOLS</AttributeValue>
                 </AttributeAssignmentExpression>
                 <AttributeAssignmentExpression AttributeId="matching:ConfigName" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
diff --git a/packages/base/src/files/install/servers/console/bin/workspace/admin/repository/com/Config_BRMS_Param_BRMSParamvLBDemoPolicy.1.xml b/packages/base/src/files/install/servers/console/bin/workspace/admin/repository/com/Config_BRMS_Param_BRMSParamvLBDemoPolicy.1.xml
index 25af35a78..7b60d8e86 100755
--- a/packages/base/src/files/install/servers/console/bin/workspace/admin/repository/com/Config_BRMS_Param_BRMSParamvLBDemoPolicy.1.xml
+++ b/packages/base/src/files/install/servers/console/bin/workspace/admin/repository/com/Config_BRMS_Param_BRMSParamvLBDemoPolicy.1.xml
@@ -4,33 +4,33 @@
     <Target>
         <AnyOf>
             <AllOf>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">com.Config_BRMS_Param_BRMSParamvLBDemoPolicy.1.xml</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="PolicyName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
             </AllOf>
             <AllOf>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">DROOLS</AttributeValue>
-                    <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ECOMPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
+                    <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ONAPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">BRMS_PARAM_RULE</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ConfigName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">SampleRiskType</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="RiskType" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">1</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="RiskLevel" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">False</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="guard" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">NA</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="TTLDate" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
@@ -66,7 +66,7 @@
                 <AttributeAssignmentExpression AttributeId="VersionNumber" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">1</AttributeValue>
                 </AttributeAssignmentExpression>
-                <AttributeAssignmentExpression AttributeId="matching:ECOMPName" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
+                <AttributeAssignmentExpression AttributeId="matching:ONAPName" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">DROOLS</AttributeValue>
                 </AttributeAssignmentExpression>
                 <AttributeAssignmentExpression AttributeId="matching:ConfigName" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
diff --git a/packages/base/src/files/install/servers/console/bin/workspace/admin/repository/com/Config_MS_vFirewall.1.xml b/packages/base/src/files/install/servers/console/bin/workspace/admin/repository/com/Config_MS_vFirewall.1.xml
index 336504c71..3b81613bc 100644
--- a/packages/base/src/files/install/servers/console/bin/workspace/admin/repository/com/Config_MS_vFirewall.1.xml
+++ b/packages/base/src/files/install/servers/console/bin/workspace/admin/repository/com/Config_MS_vFirewall.1.xml
@@ -4,45 +4,45 @@
     <Target>
         <AnyOf>
             <AllOf>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">com.Config_MS_vFirewall.1.xml</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="PolicyName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
             </AllOf>
             <AllOf>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">DCAE</AttributeValue>
-                    <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ECOMPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
+                    <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ONAPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">SampleConfigName</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ConfigName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">TcaMetrics-v1.0.0.5</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="service" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">/services/cdap-tca-hi-lo/instances/demo/configuration/metricsPerFunctionalRole/vFirewall</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="uuid" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">SampleServiceLocation</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="location" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">SampleRiskType</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="RiskType" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">1</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="RiskLevel" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">False</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="guard" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">NA</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="TTLDate" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
@@ -78,7 +78,7 @@
                 <AttributeAssignmentExpression AttributeId="VersionNumber" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">1</AttributeValue>
                 </AttributeAssignmentExpression>
-                <AttributeAssignmentExpression AttributeId="matching:ECOMPName" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
+                <AttributeAssignmentExpression AttributeId="matching:ONAPName" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">DCAE</AttributeValue>
                 </AttributeAssignmentExpression>
                 <AttributeAssignmentExpression AttributeId="matching:ConfigName" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
diff --git a/packages/base/src/files/install/servers/console/bin/workspace/admin/repository/com/Config_MS_vLoadBalancer.1.xml b/packages/base/src/files/install/servers/console/bin/workspace/admin/repository/com/Config_MS_vLoadBalancer.1.xml
index bb183c5a0..d48bf9e22 100644
--- a/packages/base/src/files/install/servers/console/bin/workspace/admin/repository/com/Config_MS_vLoadBalancer.1.xml
+++ b/packages/base/src/files/install/servers/console/bin/workspace/admin/repository/com/Config_MS_vLoadBalancer.1.xml
@@ -4,45 +4,45 @@
     <Target>
         <AnyOf>
             <AllOf>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">com.Config_MS_vLoadBalancer.1.xml</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="PolicyName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
             </AllOf>
             <AllOf>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">DCAE</AttributeValue>
-                    <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ECOMPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
+                    <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ONAPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">SampleConfigName</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ConfigName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">TcaMetrics-v1.0.0.5</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="service" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">/services/cdap-tca-hi-lo/instances/demo/configuration/metricsPerFunctionalRole/vLoadBalancer</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="uuid" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">SampleServiceLocation</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="location" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">SampleRiskType</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="RiskType" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">1</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="RiskLevel" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">False</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="guard" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">NA</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="TTLDate" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
@@ -78,7 +78,7 @@
                 <AttributeAssignmentExpression AttributeId="VersionNumber" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">1</AttributeValue>
                 </AttributeAssignmentExpression>
-                <AttributeAssignmentExpression AttributeId="matching:ECOMPName" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
+                <AttributeAssignmentExpression AttributeId="matching:ONAPName" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">DCAE</AttributeValue>
                 </AttributeAssignmentExpression>
                 <AttributeAssignmentExpression AttributeId="matching:ConfigName" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
diff --git a/packages/base/src/files/install/servers/console/bin/xacml.admin.properties b/packages/base/src/files/install/servers/console/bin/xacml.admin.properties
index 7c2d1d270..755d0f28b 100644
--- a/packages/base/src/files/install/servers/console/bin/xacml.admin.properties
+++ b/packages/base/src/files/install/servers/console/bin/xacml.admin.properties
@@ -1,6 +1,6 @@
 ###
 # ============LICENSE_START=======================================================
-# ECOMP Policy Engine
+# ONAP Policy Engine
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
@@ -39,12 +39,12 @@ xacml.pipFinderFactory=com.att.research.xacml.std.pip.StdPIPFinderFactory
 #
 xacml.att.evaluationContextFactory=com.att.research.xacmlatt.pdp.std.StdEvaluationContextFactory
 xacml.att.combiningAlgorithmFactory=com.att.research.xacmlatt.pdp.std.StdCombiningAlgorithmFactory
-xacml.att.functionDefinitionFactory=org.openecomp.policy.xacml.custom.EcompFunctionDefinitionFactory
+xacml.att.functionDefinitionFactory=org.onap.policy.xacml.custom.OnapFunctionDefinitionFactory
 xacml.att.policyFinderFactory=com.att.research.xacmlatt.pdp.std.StdPolicyFinderFactory
 #
 # Policy Adapter Implementation class 
 #
-policyAdapter.impl.className = org.openecomp.policy.admin.PolicyAdapter
+policyAdapter.impl.className = org.onap.policy.admin.PolicyAdapter
 
 #
 # This is an extremely simple policy to demonstrate authorization
@@ -56,12 +56,12 @@ admin.file=${{ADMIN_FILE}}
 #
 # PAP Servlet properties
 #
-xacml.PAP.papEngineFactory=org.openecomp.policy.xacml.std.pap.StdEngineFactory
+xacml.PAP.papEngineFactory=org.onap.policy.xacml.std.pap.StdEngineFactory
 
 #
 # Admin Console properties
 #
-xacml.AC.papEngineFactory=org.openecomp.policy.xacml.admin.util.RESTfulPAPFactory
+xacml.AC.papEngineFactory=org.onap.policy.xacml.admin.util.RESTfulPAPFactory
 
 # Set your domain here:
 
@@ -185,8 +185,8 @@ xacml.att.automatic.push = ${{automatic_push}}
 
 
 #Dashboard Tab Limit
-xacml.ecomp.dashboard.logTableLimit = 5000
-xacml.ecomp.dashboard.systemAlertTableLimit = 2000                                     
+xacml.onap.dashboard.logTableLimit = 5000
+xacml.onap.dashboard.systemAlertTableLimit = 2000                                     
 
 #Diff of policies for Firewall feature
 FW_GETURL=${{FW_GETURL}}
@@ -195,16 +195,16 @@ FW_PROXY=${{FW_PROXY}}
 FW_PORT=${{FW_PORT}}
 
 #SMTP Server Details for Java Mail
-ecomp.smtp.host = ${{ecomp_smtp_host}}
-ecomp.smtp.port = ${{ecomp_smtp_port}}
-ecomp.smtp.userName = ${{ecomp_smtp_userName}}
-ecomp.smtp.password = ${{ecomp_smtp_password}}
-ecomp.smtp.emailExtension=${{ecomp_smtp_emailExtension}}
-ecomp.application.name = ${{ecomp_application_name}}
+onap.smtp.host = ${{onap_smtp_host}}
+onap.smtp.port = ${{onap_smtp_port}}
+onap.smtp.userName = ${{onap_smtp_userName}}
+onap.smtp.password = ${{onap_smtp_password}}
+onap.smtp.emailExtension=${{onap_smtp_emailExtension}}
+onap.application.name = ${{onap_application_name}}
 
 #Dialect for Database
-ecomp.dialect = org.hibernate.dialect.MySQLDialect
+onap.dialect = org.hibernate.dialect.MySQLDialect
 
 #Micro Service Model Properties
-xacml.policy.msEcompName=${{policy_msEcompName}}
+xacml.policy.msOnapName=${{policy_msOnapName}}
 xacml.policy.msPolicyName=${{policy_msPolicyName}}
\ No newline at end of file
diff --git a/packages/base/src/files/install/servers/console/conf/server.xml b/packages/base/src/files/install/servers/console/conf/server.xml
index f45c5646c..53d563bba 100644
--- a/packages/base/src/files/install/servers/console/conf/server.xml
+++ b/packages/base/src/files/install/servers/console/conf/server.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='utf-8'?>
 <!--
   ============LICENSE_START=======================================================
-  ECOMP Policy Engine
+  ONAP Policy Engine
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
   ================================================================================
@@ -106,7 +106,7 @@
          documentation
 	-->
 
-    <!-- ECOMP portal currently using http instead of https 
+    <!-- ONAP portal currently using http instead of https 
     <Connector port="${{SSL_HTTP_CONNECTOR_PORT}}" protocol="org.apache.coyote.http11.Http11NioProtocol"
                maxThreads="150" SSLEnabled="true" scheme="https" secure="true"
                clientAuth="false" sslEnabledProtocols="TLSv1, TLSv1.1, TLSv1.2"
diff --git a/packages/base/src/files/install/servers/ecomp/WEB-INF/classes/portal.properties b/packages/base/src/files/install/servers/onap/WEB-INF/classes/portal.properties
index 7b12df4c1..e7332be87 100644
--- a/packages/base/src/files/install/servers/ecomp/WEB-INF/classes/portal.properties
+++ b/packages/base/src/files/install/servers/onap/WEB-INF/classes/portal.properties
@@ -1,6 +1,6 @@
 ###
 # ============LICENSE_START=======================================================
-# ECOMP Policy Engine
+# ONAP Policy Engine
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
@@ -18,7 +18,7 @@
 # ============LICENSE_END=========================================================
 ###
 
-# Properties read by ECOMP Framework library, ecompFW.jar
+# Properties read by ONAP Framework library, onapFW.jar
 
 ##########################################################################
 # The following properties should NOT be changed by partner applications.
@@ -41,14 +41,14 @@ use_rest_for_functional_menu=true
 ##########################################################################
 
 # Name of java class that implements the OnBoardingApiService interface.
-portal.api.impl.class = org.openecomp.portalapp.service.OnBoardingApiServiceImpl
+portal.api.impl.class = org.onap.portalapp.service.OnBoardingApiServiceImpl
 
 # CSP Global Log On for single sign on
-ecomp_redirect_url = ${{ECOMP_REDIRECT_URL}}
+onap_redirect_url = ${{ONAP_REDIRECT_URL}}
 
-# URL of the ECOMP Portal REST API
-# ecomp.homer.com is a development machine
-ecomp_rest_url = ${{ECOMP_REST_URL}}
+# URL of the ONAP Portal REST API
+# onap.homer.com is a development machine
+onap_rest_url = ${{ONAP_REST_URL}}
 
 # Applications do not need to run a UEB listener in 1610.  
 ueb_listeners_enable = false
@@ -58,14 +58,14 @@ ueb_listeners_enable = false
 # In release 1610, if key ueb_listeners_enable is set to false,
 # then only the ueb_app_key is required.
 # UEB servers
-ueb_url_list = ${{ECOMP_UEB_URL_LIST}}
-# ECOMP Portal listens on this UEB topic
-ecomp_portal_inbox_name = ${{ECOMP_PORTAL_INBOX_NAME}}
+ueb_url_list = ${{ONAP_UEB_URL_LIST}}
+# ONAP Portal listens on this UEB topic
+onap_portal_inbox_name = ${{ONAP_PORTAL_INBOX_NAME}}
 # Replace these 3 default values with the ones for your specific App,
-# as shown on the on-boarding page on the ECOMP Portal web application.
-ueb_app_key = ${{ECOMP_UEB_APP_KEY}}
-ueb_app_secret = ${{ECOMP_UEB_APP_SECRET}}
-ueb_app_mailbox_name = ${{ECOMP_UEB_APP_MAILBOX_NAME}}
+# as shown on the on-boarding page on the ONAP Portal web application.
+ueb_app_key = ${{ONAP_UEB_APP_KEY}}
+ueb_app_secret = ${{ONAP_UEB_APP_SECRET}}
+ueb_app_mailbox_name = ${{ONAP_UEB_APP_MAILBOX_NAME}}
 # Consumer group name for UEB topic.
 # Use the special tag '{UUID}' to generate a unique one for each sdk-app server.
 ueb_app_consumer_group_name = {UUID}
diff --git a/packages/base/src/files/install/servers/ecomp/WEB-INF/conf/system.properties b/packages/base/src/files/install/servers/onap/WEB-INF/conf/system.properties
index 4ae54c1d2..484a61768 100644
--- a/packages/base/src/files/install/servers/ecomp/WEB-INF/conf/system.properties
+++ b/packages/base/src/files/install/servers/onap/WEB-INF/conf/system.properties
@@ -1,6 +1,6 @@
 ###
 # ============LICENSE_START=======================================================
-# ECOMP Policy Engine
+# ONAP Policy Engine
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
@@ -18,7 +18,7 @@
 # ============LICENSE_END=========================================================
 ###
 
-# Properties read by ECOMP Core library, ecompSDK-core.jar
+# Properties read by ONAP Core library, onapSDK-core.jar
 
 ##########################################################################
 # The following properties should NOT be changed by partner applications.
@@ -64,8 +64,8 @@ mylogins_feed_cron            = 0 0/60 * * * ?;
 #sessiontimeout_feed_cron	  = 0 * * * * ? *
 my_login_feed_output_dir      = /tmp/MyLogins
 
-# ECOMP Portal Shared Context REST API URL
-ecomp_shared_context_rest_url= ${{ECOMP_SHARED_CONTEXT_REST_URL}}
+# ONAP Portal Shared Context REST API URL
+onap_shared_context_rest_url= ${{ONAP_SHARED_CONTEXT_REST_URL}}
 
 # Link shown in Help menu
 contact_us_link = 
@@ -73,7 +73,7 @@ contact_us_link =
 # An Unique 128-bit value defined to identify a specific version
 # of an application deployed on a specific virtual machine.
 # This value must be generated and updated by the application 
-# which is using the ECOMP SDK at the time of its deployment.
+# which is using the ONAP SDK at the time of its deployment.
 # Online Unique UUID generator - https://www.uuidgenerator.net/
 instance_uuid=8da691c9-987d-43ed-a358-00ac2f35685d
 
diff --git a/packages/base/src/files/install/servers/pap/bin/autopush.properties b/packages/base/src/files/install/servers/pap/bin/autopush.properties
index 8d780842f..134ff5dab 100644
--- a/packages/base/src/files/install/servers/pap/bin/autopush.properties
+++ b/packages/base/src/files/install/servers/pap/bin/autopush.properties
@@ -1,6 +1,6 @@
 ###
 # ============LICENSE_START=======================================================
-# ECOMP Policy Engine
+# ONAP Policy Engine
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
diff --git a/packages/base/src/files/install/servers/pap/bin/config/policyLogger.properties b/packages/base/src/files/install/servers/pap/bin/config/policyLogger.properties
index 0deb1b3d6..bbb0ecf4e 100644
--- a/packages/base/src/files/install/servers/pap/bin/config/policyLogger.properties
+++ b/packages/base/src/files/install/servers/pap/bin/config/policyLogger.properties
@@ -1,6 +1,6 @@
 ###
 # ============LICENSE_START=======================================================
-# ECOMP Policy Engine
+# ONAP Policy Engine
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
diff --git a/packages/base/src/files/install/servers/pap/bin/pdps/default/com.Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.xml b/packages/base/src/files/install/servers/pap/bin/pdps/default/com.Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.xml
index 33c0c4a8d..e27f163b6 100644
--- a/packages/base/src/files/install/servers/pap/bin/pdps/default/com.Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.xml
+++ b/packages/base/src/files/install/servers/pap/bin/pdps/default/com.Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.xml
@@ -4,33 +4,33 @@
     <Target>
         <AnyOf>
             <AllOf>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">com.Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.xml</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="PolicyName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
             </AllOf>
             <AllOf>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">DROOLS</AttributeValue>
-                    <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ECOMPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
+                    <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ONAPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">BRMS_PARAM_RULE</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ConfigName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">SampleRiskType</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="RiskType" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">1</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="RiskLevel" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">False</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="guard" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">NA</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="TTLDate" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
@@ -66,7 +66,7 @@
                 <AttributeAssignmentExpression AttributeId="VersionNumber" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">1</AttributeValue>
                 </AttributeAssignmentExpression>
-                <AttributeAssignmentExpression AttributeId="matching:ECOMPName" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
+                <AttributeAssignmentExpression AttributeId="matching:ONAPName" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">DROOLS</AttributeValue>
                 </AttributeAssignmentExpression>
                 <AttributeAssignmentExpression AttributeId="matching:ConfigName" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
diff --git a/packages/base/src/files/install/servers/pap/bin/pdps/default/com.Config_BRMS_Param_BRMSParamvLBDemoPolicy.1.xml b/packages/base/src/files/install/servers/pap/bin/pdps/default/com.Config_BRMS_Param_BRMSParamvLBDemoPolicy.1.xml
index 290146240..54bcbaaf0 100644
--- a/packages/base/src/files/install/servers/pap/bin/pdps/default/com.Config_BRMS_Param_BRMSParamvLBDemoPolicy.1.xml
+++ b/packages/base/src/files/install/servers/pap/bin/pdps/default/com.Config_BRMS_Param_BRMSParamvLBDemoPolicy.1.xml
@@ -4,33 +4,33 @@
     <Target>
         <AnyOf>
             <AllOf>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">com.Config_BRMS_Param_BRMSParamvLBDemoPolicy.1.xml</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="PolicyName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
             </AllOf>
             <AllOf>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">DROOLS</AttributeValue>
-                    <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ECOMPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
+                    <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ONAPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">BRMS_PARAM_RULE</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ConfigName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">SampleRiskType</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="RiskType" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">1</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="RiskLevel" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">False</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="guard" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">NA</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="TTLDate" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
@@ -66,7 +66,7 @@
                 <AttributeAssignmentExpression AttributeId="VersionNumber" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">1</AttributeValue>
                 </AttributeAssignmentExpression>
-                <AttributeAssignmentExpression AttributeId="matching:ECOMPName" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
+                <AttributeAssignmentExpression AttributeId="matching:ONAPName" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">DROOLS</AttributeValue>
                 </AttributeAssignmentExpression>
                 <AttributeAssignmentExpression AttributeId="matching:ConfigName" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
diff --git a/packages/base/src/files/install/servers/pap/bin/pdps/default/com.Config_MS_vFirewall.1.xml b/packages/base/src/files/install/servers/pap/bin/pdps/default/com.Config_MS_vFirewall.1.xml
index a18b59f41..ca01be5a7 100644
--- a/packages/base/src/files/install/servers/pap/bin/pdps/default/com.Config_MS_vFirewall.1.xml
+++ b/packages/base/src/files/install/servers/pap/bin/pdps/default/com.Config_MS_vFirewall.1.xml
@@ -4,45 +4,45 @@
     <Target>
         <AnyOf>
             <AllOf>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">com.Config_MS_vFirewall.1.xml</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="PolicyName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
             </AllOf>
             <AllOf>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">DCAE</AttributeValue>
-                    <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ECOMPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
+                    <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ONAPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">SampleConfigName</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ConfigName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">TcaMetrics-v1.0.0.5</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="service" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">/services/cdap-tca-hi-lo/instances/demo/configuration/metricsPerFunctionalRole/vFirewall</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="uuid" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">SampleServiceLocation</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="location" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">SampleRiskType</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="RiskType" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">1</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="RiskLevel" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">False</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="guard" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">NA</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="TTLDate" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
@@ -78,7 +78,7 @@
                 <AttributeAssignmentExpression AttributeId="VersionNumber" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">1</AttributeValue>
                 </AttributeAssignmentExpression>
-                <AttributeAssignmentExpression AttributeId="matching:ECOMPName" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
+                <AttributeAssignmentExpression AttributeId="matching:ONAPName" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">DCAE</AttributeValue>
                 </AttributeAssignmentExpression>
                 <AttributeAssignmentExpression AttributeId="matching:ConfigName" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
diff --git a/packages/base/src/files/install/servers/pap/bin/pdps/default/com.Config_MS_vLoadBalancer.1.xml b/packages/base/src/files/install/servers/pap/bin/pdps/default/com.Config_MS_vLoadBalancer.1.xml
index 03ae3e806..663f4f3c5 100644
--- a/packages/base/src/files/install/servers/pap/bin/pdps/default/com.Config_MS_vLoadBalancer.1.xml
+++ b/packages/base/src/files/install/servers/pap/bin/pdps/default/com.Config_MS_vLoadBalancer.1.xml
@@ -4,45 +4,45 @@
     <Target>
         <AnyOf>
             <AllOf>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">com.Config_MS_vLoadBalancer.1.xml</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="PolicyName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
             </AllOf>
             <AllOf>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">DCAE</AttributeValue>
-                    <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ECOMPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
+                    <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ONAPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">SampleConfigName</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ConfigName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">TcaMetrics-v1.0.0.5</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="service" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">/services/cdap-tca-hi-lo/instances/demo/configuration/metricsPerFunctionalRole/vLoadBalancer</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="uuid" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">SampleServiceLocation</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="location" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">SampleRiskType</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="RiskType" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">1</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="RiskLevel" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">False</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="guard" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="org.openecomp.function.regex-match">
+                <Match MatchId="org.onap.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">NA</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="TTLDate" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
@@ -78,7 +78,7 @@
                 <AttributeAssignmentExpression AttributeId="VersionNumber" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">1</AttributeValue>
                 </AttributeAssignmentExpression>
-                <AttributeAssignmentExpression AttributeId="matching:ECOMPName" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
+                <AttributeAssignmentExpression AttributeId="matching:ONAPName" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">DCAE</AttributeValue>
                 </AttributeAssignmentExpression>
                 <AttributeAssignmentExpression AttributeId="matching:ConfigName" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
diff --git a/packages/base/src/files/install/servers/pap/bin/pdps/default/xacml.pip.properties b/packages/base/src/files/install/servers/pap/bin/pdps/default/xacml.pip.properties
index 4dba1f554..846848f28 100644
--- a/packages/base/src/files/install/servers/pap/bin/pdps/default/xacml.pip.properties
+++ b/packages/base/src/files/install/servers/pap/bin/pdps/default/xacml.pip.properties
@@ -1,6 +1,6 @@
 #
 #Tue Feb 07 10:35:08 EST 2017
 AAF.description=AAFEngine to communicate with AAF to take decisions
-AAF.classname=org.openecomp.policy.xacml.std.pip.engines.aaf.AAFEngine
+AAF.classname=org.onap.policy.xacml.std.pip.engines.aaf.AAFEngine
 AAF.name=AAFEngine
 xacml.pip.engines=AAF
\ No newline at end of file
diff --git a/packages/base/src/files/install/servers/pap/bin/pip.properties b/packages/base/src/files/install/servers/pap/bin/pip.properties
index d9df903e4..b5d46af57 100644
--- a/packages/base/src/files/install/servers/pap/bin/pip.properties
+++ b/packages/base/src/files/install/servers/pap/bin/pip.properties
@@ -5,11 +5,11 @@ xacml.pip.engines=AAF,historydb
 
 ### AAF PIP Configuration. 
 AAF.description=AAFEngine to communicate with AAF to take decisions
-AAF.classname=org.openecomp.policy.xacml.std.pip.engines.aaf.AAFEngine
+AAF.classname=org.onap.policy.xacml.std.pip.engines.aaf.AAFEngine
 AAF.name=AAFEngine
 
 # PIP Engine Definition
 #
-historydb.classname=org.openecomp.policy.xacml.std.pip.engines.OperationHistoryEngine
+historydb.classname=org.onap.policy.xacml.std.pip.engines.OperationHistoryEngine
 historydb.issuer=org:onap:xacml:guard:historydb
 historydb.name=operationHistoryDB
\ No newline at end of file
diff --git a/packages/base/src/files/install/servers/pap/bin/policyelk.properties b/packages/base/src/files/install/servers/pap/bin/policyelk.properties
index 88fa7d7d0..4071e99dd 100644
--- a/packages/base/src/files/install/servers/pap/bin/policyelk.properties
+++ b/packages/base/src/files/install/servers/pap/bin/policyelk.properties
@@ -1,6 +1,6 @@
 ###
 # ============LICENSE_START=======================================================
-# ECOMP Policy Engine
+# ONAP Policy Engine
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
diff --git a/packages/base/src/files/install/servers/pap/bin/test.properties b/packages/base/src/files/install/servers/pap/bin/test.properties
index e983c3b7c..993c7e8ec 100644
--- a/packages/base/src/files/install/servers/pap/bin/test.properties
+++ b/packages/base/src/files/install/servers/pap/bin/test.properties
@@ -1,6 +1,6 @@
 ###
 # ============LICENSE_START=======================================================
-# ECOMP Policy Engine
+# ONAP Policy Engine
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
diff --git a/packages/base/src/files/install/servers/pap/bin/xacml.pap.properties b/packages/base/src/files/install/servers/pap/bin/xacml.pap.properties
index 3e30bde80..5646cf4b0 100644
--- a/packages/base/src/files/install/servers/pap/bin/xacml.pap.properties
+++ b/packages/base/src/files/install/servers/pap/bin/xacml.pap.properties
@@ -1,6 +1,6 @@
 ###
 # ============LICENSE_START=======================================================
-# ECOMP Policy Engine
+# ONAP Policy Engine
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
@@ -21,11 +21,11 @@
 #
 # This is our factory that will create our engine
 #
-xacml.PAP.papEngineFactory=org.openecomp.policy.xacml.std.pap.StdEngineFactory
-dictionary.impl.className=org.openecomp.policy.pap.xacml.rest.handler.DictionaryHandlerImpl
-savePolicy.impl.className=org.openecomp.policy.pap.xacml.rest.handler.SavePolicyHandler
-pushPolicy.impl.className=org.openecomp.policy.pap.xacml.rest.handler.PushPolicyHandler
-deletePolicy.impl.className=org.openecomp.policy.pap.xacml.rest.handler.DeleteHandler
+xacml.PAP.papEngineFactory=org.onap.policy.xacml.std.pap.StdEngineFactory
+dictionary.impl.className=org.onap.policy.pap.xacml.rest.handler.DictionaryHandlerImpl
+savePolicy.impl.className=org.onap.policy.pap.xacml.rest.handler.SavePolicyHandler
+pushPolicy.impl.className=org.onap.policy.pap.xacml.rest.handler.PushPolicyHandler
+deletePolicy.impl.className=org.onap.policy.pap.xacml.rest.handler.DeleteHandler
 #
 # Where we store our PAP PDP Group/Node information
 #
@@ -137,5 +137,5 @@ integrity_audit_period_seconds=${{integrity_audit_period_seconds}}
 ENVIRONMENT=${{ENVIRONMENT}}
 
 #Micro Service Model Properties
-xacml.policy.msEcompName=${{policy_msEcompName}}
+xacml.policy.msOnapName=${{policy_msOnapName}}
 xacml.policy.msPolicyName=${{policy_msPolicyName}}
\ No newline at end of file
diff --git a/packages/base/src/files/install/servers/pap/webapps/Config/com.Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.txt b/packages/base/src/files/install/servers/pap/webapps/Config/com.Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.txt
index c731b3f77..6ff244ea4 100755
--- a/packages/base/src/files/install/servers/pap/webapps/Config/com.Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.txt
+++ b/packages/base/src/files/install/servers/pap/webapps/Config/com.Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.txt
@@ -83,7 +83,7 @@ import org.onap.policy.mso.MSORelatedInstanceListElement;
 import org.onap.policy.mso.MSORelatedInstance;
 import org.onap.policy.mso.MSOResponse;
 
-import org.openecomp.policy.drools.system.PolicyEngine;
+import org.onap.policy.drools.system.PolicyEngine;
 
 //
 // These parameters are required to build the runtime policy
@@ -106,7 +106,7 @@ end
 /*
 *
 * Called once and only once to insert the parameters into working memory for this Closed Loop policy.
-* (Comment SETUP rule out for the first ECOMP opensource release since policy BRMS_GW already puts a Params fact in there)
+* (Comment SETUP rule out for the first ONAP opensource release since policy BRMS_GW already puts a Params fact in there)
 *
 *
 *rule "BRMSParamvFWDemoPolicy.SETUP"
diff --git a/packages/base/src/files/install/servers/pap/webapps/Config/com.Config_BRMS_Param_BRMSParamvLBDemoPolicy.1.txt b/packages/base/src/files/install/servers/pap/webapps/Config/com.Config_BRMS_Param_BRMSParamvLBDemoPolicy.1.txt
index 77408a227..f9accdd96 100755
--- a/packages/base/src/files/install/servers/pap/webapps/Config/com.Config_BRMS_Param_BRMSParamvLBDemoPolicy.1.txt
+++ b/packages/base/src/files/install/servers/pap/webapps/Config/com.Config_BRMS_Param_BRMSParamvLBDemoPolicy.1.txt
@@ -83,7 +83,7 @@ import org.onap.policy.mso.MSORelatedInstanceListElement;
 import org.onap.policy.mso.MSORelatedInstance;
 import org.onap.policy.mso.MSOResponse;
 
-import org.openecomp.policy.drools.system.PolicyEngine;
+import org.onap.policy.drools.system.PolicyEngine;
 
 //
 // These parameters are required to build the runtime policy
@@ -106,7 +106,7 @@ end
 /*
 *
 * Called once and only once to insert the parameters into working memory for this Closed Loop policy.
-* (Comment SETUP rule out for the first ECOMP opensource release since policy BRMS_GW already puts a Params fact in there)
+* (Comment SETUP rule out for the first ONAP opensource release since policy BRMS_GW already puts a Params fact in there)
 *
 *
 *rule "BRMSParamvLBDemoPolicy.SETUP"
@@ -119,7 +119,7 @@ end
 *		params.setAaiURL("https://aai.api.simpledemo.openecomp.org:8443");
 *		params.setAaiUsername("POLICY");
 *		params.setAaiPassword("POLICY");
-*		params.setMsoURL("http://vm1.mso.simpledemo.openecomp.org:8080/ecomp/mso/infra");
+*		params.setMsoURL("http://vm1.mso.simpledemo.openecomp.org:8080/onap/mso/infra");
 *		params.setMsoUsername("InfraPortalClient");
 *		params.setMsoPassword("password1$");
 *		params.setAaiNamedQueryUUID("f199cb88-5e69-4b1f-93e0-6f257877d066");
@@ -1135,7 +1135,7 @@ rule "com.Config_BRMS_Param_BRMSParamvLBDemoPolicy.Params"
 		params.setMsoPassword("password1$");
 		params.setClosedLoopControlName("CL-DNS-LOW-TRAFFIC-SIG-d925ed73-8231-4d02-9545-db4e101f88f8");
 		params.setAaiUsername("POLICY");
-		params.setMsoURL("http://vm1.mso.simpledemo.openecomp.org:8080/ecomp/mso/infra");
+		params.setMsoURL("http://vm1.mso.simpledemo.openecomp.org:8080/onap/mso/infra");
 		params.setActor("MSO");
 		params.setMsoUsername("InfraPortalClient");
 		params.setAaiNamedQueryUUID("f199cb88-5e69-4b1f-93e0-6f257877d066");
diff --git a/packages/base/src/files/install/servers/paplp/bin/config/policyLogger.properties b/packages/base/src/files/install/servers/paplp/bin/config/policyLogger.properties
index 0deb1b3d6..bbb0ecf4e 100644
--- a/packages/base/src/files/install/servers/paplp/bin/config/policyLogger.properties
+++ b/packages/base/src/files/install/servers/paplp/bin/config/policyLogger.properties
@@ -1,6 +1,6 @@
 ###
 # ============LICENSE_START=======================================================
-# ECOMP Policy Engine
+# ONAP Policy Engine
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
diff --git a/packages/base/src/files/install/servers/paplp/bin/parserlog.properties b/packages/base/src/files/install/servers/paplp/bin/parserlog.properties
index 8dbd70e9b..e9189f9c7 100644
--- a/packages/base/src/files/install/servers/paplp/bin/parserlog.properties
+++ b/packages/base/src/files/install/servers/paplp/bin/parserlog.properties
@@ -1,6 +1,6 @@
 ###
 # ============LICENSE_START=======================================================
-# ECOMP Policy Engine
+# ONAP Policy Engine
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
diff --git a/packages/base/src/files/install/servers/pdp/bin/client.properties b/packages/base/src/files/install/servers/pdp/bin/client.properties
index 97156b66e..4a39cf1c0 100644
--- a/packages/base/src/files/install/servers/pdp/bin/client.properties
+++ b/packages/base/src/files/install/servers/pdp/bin/client.properties
@@ -1,6 +1,6 @@
 ###
 # ============LICENSE_START=======================================================
-# ECOMP Policy Engine
+# ONAP Policy Engine
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
diff --git a/packages/base/src/files/install/servers/pdp/bin/config/policyLogger.properties b/packages/base/src/files/install/servers/pdp/bin/config/policyLogger.properties
index 0deb1b3d6..bbb0ecf4e 100644
--- a/packages/base/src/files/install/servers/pdp/bin/config/policyLogger.properties
+++ b/packages/base/src/files/install/servers/pdp/bin/config/policyLogger.properties
@@ -1,6 +1,6 @@
 ###
 # ============LICENSE_START=======================================================
-# ECOMP Policy Engine
+# ONAP Policy Engine
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
diff --git a/packages/base/src/files/install/servers/pdp/bin/xacml.pdp.properties b/packages/base/src/files/install/servers/pdp/bin/xacml.pdp.properties
index 765396339..ac7a5bb7e 100644
--- a/packages/base/src/files/install/servers/pdp/bin/xacml.pdp.properties
+++ b/packages/base/src/files/install/servers/pdp/bin/xacml.pdp.properties
@@ -1,6 +1,6 @@
 ###
 # ============LICENSE_START=======================================================
-# ECOMP Policy Engine
+# ONAP Policy Engine
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
@@ -32,17 +32,17 @@ xacml.traceEngineFactory=com.att.research.xacml.std.trace.LoggingTraceEngineFact
 #
 xacml.att.evaluationContextFactory=com.att.research.xacmlatt.pdp.std.StdEvaluationContextFactory
 xacml.att.combiningAlgorithmFactory=com.att.research.xacmlatt.pdp.std.StdCombiningAlgorithmFactory
-xacml.att.functionDefinitionFactory=org.openecomp.policy.xacml.custom.EcompFunctionDefinitionFactory
+xacml.att.functionDefinitionFactory=org.onap.policy.xacml.custom.OnapFunctionDefinitionFactory
 # NOT USED SEE BELOW xacml.att.policyFinderFactory=com.att.research.xacmlatt.pdp.std.StdPolicyFinderFactory
 # creteUpdate Policy Implementation Class details. 
-createUpdatePolicy.impl.className=org.openecomp.policy.pdp.rest.api.services.CreateUpdatePolicyServiceImpl
+createUpdatePolicy.impl.className=org.onap.policy.pdp.rest.api.services.CreateUpdatePolicyServiceImpl
 # AAF Implementation class details
-aafClient.impl.className=org.openecomp.policy.utils.AAFPolicyClientImpl
+aafClient.impl.className=org.onap.policy.utils.AAFPolicyClientImpl
 #
 # AT&T RESTful PDP Implementation Factories
 #
-xacml.pipFinderFactory=org.openecomp.policy.pdp.rest.impl.XACMLPdpPIPFinderFactory
-xacml.att.policyFinderFactory=org.openecomp.policy.pdp.rest.XACMLPdpPolicyFinderFactory
+xacml.pipFinderFactory=org.onap.policy.pdp.rest.impl.XACMLPdpPIPFinderFactory
+xacml.att.policyFinderFactory=org.onap.policy.pdp.rest.XACMLPdpPolicyFinderFactory
 #
 # When set to true, this flag tells the StdPolicyFinderFactory to combined all the root policy files into
 # into one PolicySet and use the given Policy Algorithm.
diff --git a/packages/base/src/files/install/servers/pdplp/bin/config/policyLogger.properties b/packages/base/src/files/install/servers/pdplp/bin/config/policyLogger.properties
index 0deb1b3d6..bbb0ecf4e 100644
--- a/packages/base/src/files/install/servers/pdplp/bin/config/policyLogger.properties
+++ b/packages/base/src/files/install/servers/pdplp/bin/config/policyLogger.properties
@@ -1,6 +1,6 @@
 ###
 # ============LICENSE_START=======================================================
-# ECOMP Policy Engine
+# ONAP Policy Engine
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
diff --git a/packages/base/src/files/install/servers/pdplp/bin/parserlog.properties b/packages/base/src/files/install/servers/pdplp/bin/parserlog.properties
index 42c3ade32..245af07b6 100755
--- a/packages/base/src/files/install/servers/pdplp/bin/parserlog.properties
+++ b/packages/base/src/files/install/servers/pdplp/bin/parserlog.properties
@@ -1,6 +1,6 @@
 ###
 # ============LICENSE_START=======================================================
-# ECOMP Policy Engine
+# ONAP Policy Engine
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
diff --git a/packages/base/src/files/m2/settings.xml b/packages/base/src/files/m2/settings.xml
index df187efe5..50bda7555 100644
--- a/packages/base/src/files/m2/settings.xml
+++ b/packages/base/src/files/m2/settings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   ============LICENSE_START=======================================================
-  ECOMP Policy Engine
+  ONAP Policy Engine
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
   ================================================================================
diff --git a/packages/install/pom.xml b/packages/install/pom.xml
index bcc81470d..d3fbacf65 100644
--- a/packages/install/pom.xml
+++ b/packages/install/pom.xml
@@ -1,6 +1,6 @@
 <!--
   ============LICENSE_START=======================================================
-  ECOMP Policy Engine
+  ONAP Policy Engine
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
   ================================================================================
@@ -24,7 +24,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.openecomp.policy.engine</groupId>
+		<groupId>org.onap.policy.engine</groupId>
 		<artifactId>packages</artifactId>
 		<version>1.1.0-SNAPSHOT</version>
 	</parent>
@@ -33,7 +33,7 @@
 	<packaging>pom</packaging>
 
 	<name>Installation Package</name>
-	<description>D2 ECOMP Policy Base Installation Package</description>
+	<description>D2 ONAP Policy Base Installation Package</description>
 
 	<build>
 		<plugins>
@@ -59,7 +59,7 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>org.openecomp.policy.engine</groupId>
+			<groupId>org.onap.policy.engine</groupId>
 			<artifactId>base</artifactId>
 			<version>${project.version}</version>
 			<type>tar.gz</type>
diff --git a/packages/install/src/assembly/zip.xml b/packages/install/src/assembly/zip.xml
index f98510c79..a59f2728c 100644
--- a/packages/install/src/assembly/zip.xml
+++ b/packages/install/src/assembly/zip.xml
@@ -1,6 +1,6 @@
 <!--
   ============LICENSE_START=======================================================
-  ECOMP Policy Engine
+  ONAP Policy Engine
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
   ================================================================================
@@ -34,7 +34,7 @@
 	<dependencySets>
 		<dependencySet>
 			<includes>
-				<include>org.openecomp.policy.engine:base:*</include>
+				<include>org.onap.policy.engine:base:*</include>
 			</includes>
 			<useTransitiveDependencies>false</useTransitiveDependencies>
 		</dependencySet>
diff --git a/packages/install/src/files/brmsgw.conf b/packages/install/src/files/brmsgw.conf
index bff9a9cf6..36cf41415 100644
--- a/packages/install/src/files/brmsgw.conf
+++ b/packages/install/src/files/brmsgw.conf
@@ -26,11 +26,11 @@ UEB_TOPIC=CLOSEDLOOP-DCAE-SAMPLE
 UEB_API_KEY=
 UEB_API_SECRET=
 
-groupID=org.openecomp.policy-engine
+groupID=org.onap.policy-engine
 artifactID=drlPDPGroup
-VFW_GROUP_ID=org.openecomp.policy-engine.drools.vFW
+VFW_GROUP_ID=org.onap.policy-engine.drools.vFW
 VFW_ARTIFACT_ID=policy-vFW-rules
-VDNS_GROUP_ID=org.openecomp.policy-engine.drools.vDNS
+VDNS_GROUP_ID=org.onap.policy-engine.drools.vDNS
 VDNS_ARTIFACT_ID=policy-vDNS-rules
 
 # the java property is RESOURCE_NAME (uppercase), but the conf parameter is lowercase
diff --git a/packages/install/src/files/console.conf b/packages/install/src/files/console.conf
index 858cf970e..7b6e5e5dd 100644
--- a/packages/install/src/files/console.conf
+++ b/packages/install/src/files/console.conf
@@ -112,23 +112,23 @@ FW_PROXY=
 FW_PORT=
 
 #SMTP Server Details for Java Mail
-ecomp_smtp_host=
-ecomp_smtp_port=
-ecomp_smtp_userName=root@localhost
-ecomp_smtp_password=password123
-ecomp_application_name=Dev
-
-#-----------------------ECOMP-PORTAL-Properties----------------------
-
-ECOMP_REDIRECT_URL=https://localhost/ecompui/process_csp
-ECOMP_REST_URL=https://localhost:8443/ecompui/auxapi
-ECOMP_UEB_URL_LIST=
-ECOMP_PORTAL_INBOX_NAME=ECOMP-PORTAL-INBOX-TEST
-ECOMP_UEB_APP_KEY=FZpTlJbdRIibgSmg
-ECOMP_UEB_APP_SECRET=QMyKdILRBwj1c76UQONjSYOt
-ECOMP_UEB_APP_MAILBOX_NAME=ECOMP-PORTAL-OUTBOX-45601
+onap_smtp_host=
+onap_smtp_port=
+onap_smtp_userName=root@localhost
+onap_smtp_password=password123
+onap_application_name=Dev
+
+#-----------------------ONAP-PORTAL-Properties----------------------
+
+ONAP_REDIRECT_URL=https://localhost/onapui/process_csp
+ONAP_REST_URL=https://localhost:8443/onapui/auxapi
+ONAP_UEB_URL_LIST=
+ONAP_PORTAL_INBOX_NAME=ONAP-PORTAL-INBOX-TEST
+ONAP_UEB_APP_KEY=FZpTlJbdRIibgSmg
+ONAP_UEB_APP_SECRET=QMyKdILRBwj1c76UQONjSYOt
+ONAP_UEB_APP_MAILBOX_NAME=ONAP-PORTAL-OUTBOX-45601
 APP_DISPLAY_NAME=POLICY IST
-ECOMP_SHARED_CONTEXT_REST_URL=https://localhost:8443/ecompui/context
+ONAP_SHARED_CONTEXT_REST_URL=https://localhost:8443/onapui/context
 
 #Add the Rest PAP url and pap auth password on adding delimiter @Auth@ *****Check the below assigned dummy example******
 
diff --git a/packages/pom.xml b/packages/pom.xml
index 802f85aee..a4c42b280 100644
--- a/packages/pom.xml
+++ b/packages/pom.xml
@@ -1,6 +1,6 @@
 <!--
   ============LICENSE_START=======================================================
-  ECOMP Policy Engine
+  ONAP Policy Engine
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
   ================================================================================
@@ -24,7 +24,7 @@
 	<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>
@@ -33,7 +33,7 @@
 	<packaging>pom</packaging>
 
 	<name>Policy Packages</name>
-	<description>D2 ECOMP Policy Installation Packages</description>
+	<description>D2 ONAP Policy Installation Packages</description>
 
 	<profiles>
 		<!-- DO NOT CHANGE THE *ORDER* IN WHICH THESE PROFILES ARE DEFINED! -->
diff --git a/pom.xml b/pom.xml
index f57ff264c..b8dd4c74e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,13 +2,13 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
-	<groupId>org.openecomp.policy.engine</groupId>
+	<groupId>org.onap.policy.engine</groupId>
 	<artifactId>PolicyEngineSuite</artifactId>
 	<version>1.1.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>Policy Engine - Policy Engine Suite</name>
 
-	<description>The ECOMP Policy Engine main pom</description>
+	<description>The ONAP Policy Engine main pom</description>
 
 	<properties>
 		<maven.compiler.source>1.8</maven.compiler.source>
@@ -39,36 +39,36 @@
 
 	<modules>
 		<module>PolicyEngineUtils</module>
-		<module>ECOMP-XACML</module>
-		<module>ECOMP-REST</module>
-		<module>ECOMP-ASDC</module>
-		<module>ECOMP-ControlloopPolicy</module>
+		<module>ONAP-XACML</module>
+		<module>ONAP-REST</module>
+		<module>ONAP-ASDC</module>
+		<module>ONAP-ControlloopPolicy</module>
 		<module>PolicyEngineAPI</module>
-		<module>ECOMP-PDP</module>
-		<module>ECOMP-PDP-REST</module>
-		<module>ECOMP-PAP-REST</module>
+		<module>ONAP-PDP</module>
+		<module>ONAP-PDP-REST</module>
+		<module>ONAP-PAP-REST</module>
 		<module>LogParser</module>
 		<module>PolicyEngineClient</module>
 		<module>BRMSGateway</module>
 		<module>POLICY-SDK-APP</module>
-		<module>ECOMP-SDK-APP</module>
+		<module>ONAP-SDK-APP</module>
 		<module>packages</module>
 	</modules>
 
 	<repositories>
 		<repository>
 			<id>ecomp-snapshots</id>
-			<name>OpenECOMP Snapshot Repository</name>
+			<name>ONAP Snapshot Repository</name>
 			<url>${nexusproxy}/${snapshots.path}</url>
 		</repository>
 		<repository>
 			<id>ecomp-releases</id>
-			<name>OpenECOMP Release Repository</name>
+			<name>ONAP Release Repository</name>
 			<url>${nexusproxy}/${releases.path}/</url>
 		</repository>
 		<repository>
 			<id>ecomp-staging</id>
-			<name>OpenECOMP Staging Repository</name>
+			<name>ONAP Staging Repository</name>
 			<url>${nexusproxy}/${staging.path}</url>
 		</repository>
 	</repositories>
@@ -76,12 +76,12 @@
 	<distributionManagement>
 		<repository>
 			<id>ecomp-releases</id>
-			<name>OpenECOMP Release Repository</name>
+			<name>ONAP Release Repository</name>
 			<url>${nexusproxy}/${releases.path}</url>
 		</repository>
 		<snapshotRepository>
 			<id>ecomp-snapshots</id>
-			<name>OpenECOMP Snapshot Repository</name>
+			<name>ONAP Snapshot Repository</name>
 			<url>${nexusproxy}/${snapshots.path}</url>
 		</snapshotRepository>
 		<site>
@@ -136,7 +136,7 @@
 				<configuration>
 					<nexusUrl>${nexusproxy}</nexusUrl>
 					<stagingProfileId>176c31dfe190a</stagingProfileId>
-					<serverId>ecomp-staging</serverId>
+					<serverId>onap-staging</serverId>
 				</configuration>
 			</plugin>
 			<plugin>
@@ -252,7 +252,7 @@
 				<configuration>
 					<dumpOnExit>true</dumpOnExit>
 					<includes>
-						<include>org.openecomp.*</include>
+						<include>org.onap.*</include>
 					</includes>
 				</configuration>
 				<executions>
diff --git a/project-configs/maven/conf/settings.xml b/project-configs/maven/conf/settings.xml
index 918117d7b..226451b4f 100644
--- a/project-configs/maven/conf/settings.xml
+++ b/project-configs/maven/conf/settings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   ============LICENSE_START=======================================================
-  ECOMP Policy Engine
+  ONAP Policy Engine
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
   ================================================================================