diff --git a/PolicyEngineAPI/Test/PDP_settings/test_PolicyEngine.xml b/PolicyEngineAPI/Test/PDP_settings/test_PolicyEngine.xml
index 343ec7c..4eebf15 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 d83c12a..1c1abf1 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>