Change openecomp to onap and update license

Issue-ID: AAI-61 AAI-82 Change-Id: Iae98d4bf4c693c0a3203158bff98c3c5e739f453 Signed-off-by: Venkata Harish K Kajur <vk250x@att.com>
author: Venkata Harish K Kajur <vk250x@att.com> 2017-09-28 12:43:08 -0400
committer: Venkata Harish K Kajur <vk250x@att.com> 2017-09-28 13:29:27 -0400
commit: 1767960099ea2983eef5218b8ce44b167ae0774c (patch)
tree: 4efe13601c1f9ebebc6026b32ec749778cd96caf /aai-schema/src/main/resources/oxm
parent: a8a05641920545aa094dffdb016b7b5febe9a879 (diff)
4 files changed, 923 insertions, 905 deletions
diff --git a/aai-schema/src/main/resources/oxm/aai_oxm_v10.xml b/aai-schema/src/main/resources/oxm/aai_oxm_v10.xml
index 6dce5aaa..51eaa349 100644
--- a/aai-schema/src/main/resources/oxm/aai_oxm_v10.xml
+++ b/aai-schema/src/main/resources/oxm/aai_oxm_v10.xml
@@ -1,23 +1,28 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
-  ============LICENSE_START=======================================================
-  org.openecomp.aai
-  ================================================================================
-  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=========================================================
-  -->
-
-<xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.openecomp.org.v10" xml-mapping-metadata-complete="true">
+
+    ============LICENSE_START=======================================================
+    org.onap.aai
+    ================================================================================
+    Copyright © 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=========================================================
+
+    ECOMP is a trademark and service mark of AT&T Intellectual Property.
+
+-->
+<xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.onap.org.v10" xml-mapping-metadata-complete="true">
     <xml-schema element-form-default="QUALIFIED">
         <xml-ns namespace-uri="http://org.openecomp.aai.inventory/v10" />
     </xml-schema>
@@ -25,14 +30,14 @@
         <java-type name="Inventory">
             <xml-root-element name="inventory" />
             <java-attributes>
-                <xml-element java-attribute="search" name="search" type="inventory.aai.openecomp.org.v10.Search" />
-                <xml-element java-attribute="actions" name="actions" type="inventory.aai.openecomp.org.v10.Actions" />
-                <xml-element java-attribute="cloudInfrastructure" name="cloud-infrastructure" type="inventory.aai.openecomp.org.v10.CloudInfrastructure" />
-                <xml-element java-attribute="business" name="business" type="inventory.aai.openecomp.org.v10.Business" />
-                <xml-element java-attribute="serviceDesignAndCreation" name="service-design-and-creation" type="inventory.aai.openecomp.org.v10.ServiceDesignAndCreation" />
-                <xml-element java-attribute="network" name="network" type="inventory.aai.openecomp.org.v10.Network" />
-                <xml-element java-attribute="aaiInternal" name="aai-internal" type="inventory.aai.openecomp.org.v10.AaiInternal" />
-                <xml-element java-attribute="nodes" name="nodes" type="inventory.aai.openecomp.org.v10.Nodes"/>
+                <xml-element java-attribute="search" name="search" type="inventory.aai.onap.org.v10.Search" />
+                <xml-element java-attribute="actions" name="actions" type="inventory.aai.onap.org.v10.Actions" />
+                <xml-element java-attribute="cloudInfrastructure" name="cloud-infrastructure" type="inventory.aai.onap.org.v10.CloudInfrastructure" />
+                <xml-element java-attribute="business" name="business" type="inventory.aai.onap.org.v10.Business" />
+                <xml-element java-attribute="serviceDesignAndCreation" name="service-design-and-creation" type="inventory.aai.onap.org.v10.ServiceDesignAndCreation" />
+                <xml-element java-attribute="network" name="network" type="inventory.aai.onap.org.v10.Network" />
+                <xml-element java-attribute="aaiInternal" name="aai-internal" type="inventory.aai.onap.org.v10.AaiInternal" />
+                <xml-element java-attribute="nodes" name="nodes" type="inventory.aai.onap.org.v10.Nodes"/>
             </java-attributes>
         </java-type>
 
@@ -42,24 +47,24 @@
         <java-type name="Search">
             <xml-root-element name="search" />
             <java-attributes>
-                <xml-element java-attribute="edgeTagQueryResult" name="edge-tag-query-result" type="inventory.aai.openecomp.org.v10.EdgeTagQueryResult" />
-                <xml-element java-attribute="edgeTagQueryRequest" name="edge-tag-query-request" type="inventory.aai.openecomp.org.v10.EdgeTagQueryRequest" />
-                <xml-element java-attribute="searchResults" name="search-results" type="inventory.aai.openecomp.org.v10.SearchResults" />
-                <xml-element java-attribute="sdnZoneResponse" name="sdn-zone-response" type="inventory.aai.openecomp.org.v10.SdnZoneResponse" />
+                <xml-element java-attribute="edgeTagQueryResult" name="edge-tag-query-result" type="inventory.aai.onap.org.v10.EdgeTagQueryResult" />
+                <xml-element java-attribute="edgeTagQueryRequest" name="edge-tag-query-request" type="inventory.aai.onap.org.v10.EdgeTagQueryRequest" />
+                <xml-element java-attribute="searchResults" name="search-results" type="inventory.aai.onap.org.v10.SearchResults" />
+                <xml-element java-attribute="sdnZoneResponse" name="sdn-zone-response" type="inventory.aai.onap.org.v10.SdnZoneResponse" />
             </java-attributes>
         </java-type>
 
         <java-type name="EdgeTagQueryResult">
             <xml-root-element name="edge-tag-query-result" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="taggedInventoryItemList" name="tagged-inventory-item-list" type="inventory.aai.openecomp.org.v10.TaggedInventoryItemList" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="taggedInventoryItemList" name="tagged-inventory-item-list" type="inventory.aai.onap.org.v10.TaggedInventoryItemList" />
             </java-attributes>
         </java-type>
 
         <java-type name="TaggedInventoryItemList">
             <xml-root-element name="tagged-inventory-item-list" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="inventoryItem" name="inventory-item" type="inventory.aai.openecomp.org.v10.InventoryItem" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="inventoryItem" name="inventory-item" type="inventory.aai.onap.org.v10.InventoryItem" />
             </java-attributes>
         </java-type>
 
@@ -68,8 +73,8 @@
             <java-attributes>
                 <xml-element java-attribute="inventoryItemType" name="inventory-item-type" type="java.lang.String" />
                 <xml-element java-attribute="inventoryItemLink" name="inventory-item-link" type="java.lang.String" />
-                <xml-element container-type="java.util.ArrayList" java-attribute="inventoryItemData" name="inventory-item-data" type="inventory.aai.openecomp.org.v10.InventoryItemData" />
-                <xml-element container-type="java.util.ArrayList" java-attribute="taggedInventoryItemList" name="tagged-inventory-item-list" type="inventory.aai.openecomp.org.v10.TaggedInventoryItemList" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="inventoryItemData" name="inventory-item-data" type="inventory.aai.onap.org.v10.InventoryItemData" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="taggedInventoryItemList" name="tagged-inventory-item-list" type="inventory.aai.onap.org.v10.TaggedInventoryItemList" />
             </java-attributes>
         </java-type>
 
@@ -87,9 +92,9 @@
                 <xml-element java-attribute="edgeTag" name="edge-tag" type="java.lang.String" />
                 <xml-element java-attribute="resultDetail" name="result-detail" type="java.lang.String" />
                 <xml-element java-attribute="startNodeType" name="start-node-type" type="java.lang.String" />
-                <xml-element container-type="java.util.ArrayList" java-attribute="startNodeFilter" name="start-node-filter" type="inventory.aai.openecomp.org.v10.StartNodeFilter" />
-                <xml-element container-type="java.util.ArrayList" java-attribute="includeNodeFilter" name="include-node-filter" type="inventory.aai.openecomp.org.v10.IncludeNodeFilter" />
-                <xml-element container-type="java.util.ArrayList" java-attribute="secondaryFilter" name="secondary-filter" type="inventory.aai.openecomp.org.v10.SecondaryFilter" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="startNodeFilter" name="start-node-filter" type="inventory.aai.onap.org.v10.StartNodeFilter" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="includeNodeFilter" name="include-node-filter" type="inventory.aai.onap.org.v10.IncludeNodeFilter" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="secondaryFilter" name="secondary-filter" type="inventory.aai.onap.org.v10.SecondaryFilter" />
             </java-attributes>
         </java-type>
 
@@ -120,7 +125,7 @@
         <java-type name="SearchResults">
             <xml-root-element name="search-results" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="resultData" name="result-data" type="inventory.aai.openecomp.org.v10.ResultData" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="resultData" name="result-data" type="inventory.aai.onap.org.v10.ResultData" />
             </java-attributes>
         </java-type>
 
@@ -143,16 +148,16 @@
         <java-type name="SdnZoneResponse">
             <xml-root-element name="sdn-zone-response" />
             <java-attributes>
-                <xml-element java-attribute="oamNetworks" name="oam-networks" type="inventory.aai.openecomp.org.v10.OamNetworks" />
-                <xml-element container-type="java.util.ArrayList" java-attribute="azAndDvsSwitches" name="az-and-dvs-switches" type="inventory.aai.openecomp.org.v10.AzAndDvsSwitches" />
+                <xml-element java-attribute="oamNetworks" name="oam-networks" type="inventory.aai.onap.org.v10.OamNetworks" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="azAndDvsSwitches" name="az-and-dvs-switches" type="inventory.aai.onap.org.v10.AzAndDvsSwitches" />
             </java-attributes>
         </java-type>
 
         <java-type name="AzAndDvsSwitches">
             <xml-root-element name="az-and-dvs-switches" />
             <java-attributes>
-                <xml-element java-attribute="dvsSwitches" name="dvs-switches" type="inventory.aai.openecomp.org.v10.DvsSwitches" />
-                <xml-element java-attribute="availabilityZone" name="availability-zone" type="inventory.aai.openecomp.org.v10.AvailabilityZone" />
+                <xml-element java-attribute="dvsSwitches" name="dvs-switches" type="inventory.aai.onap.org.v10.DvsSwitches" />
+                <xml-element java-attribute="availabilityZone" name="availability-zone" type="inventory.aai.onap.org.v10.AvailabilityZone" />
             </java-attributes>
         </java-type>
 
@@ -162,8 +167,8 @@
             </xml-properties>
             <xml-root-element name="actions" />
             <java-attributes>
-                <xml-element java-attribute="update" name="update" type="inventory.aai.openecomp.org.v10.Update" />
-                <xml-element java-attribute="notify" name="notify" type="inventory.aai.openecomp.org.v10.Notify" />
+                <xml-element java-attribute="update" name="update" type="inventory.aai.onap.org.v10.Update" />
+                <xml-element java-attribute="notify" name="notify" type="inventory.aai.onap.org.v10.Notify" />
             </java-attributes>
         </java-type>
 
@@ -174,9 +179,9 @@
             <xml-root-element name="update" />
             <java-attributes>
                 <xml-element java-attribute="updateNodeType" name="update-node-type" required="true" type="java.lang.String" />
-                <xml-element container-type="java.util.ArrayList" java-attribute="updateNodeKey" name="update-node-key" type="inventory.aai.openecomp.org.v10.UpdateNodeKey" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="updateNodeKey" name="update-node-key" type="inventory.aai.onap.org.v10.UpdateNodeKey" />
                 <xml-element java-attribute="updateNodeUri" name="update-node-uri" type="java.lang.String" />
-                <xml-element container-type="java.util.ArrayList" java-attribute="action" name="action" type="inventory.aai.openecomp.org.v10.Action" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="action" name="action" type="inventory.aai.onap.org.v10.Action" />
             </java-attributes>
         </java-type>
 
@@ -184,7 +189,7 @@
             <xml-root-element name="action" />
             <java-attributes>
                 <xml-element java-attribute="actionType" name="action-type" type="java.lang.String" />
-                <xml-element container-type="java.util.ArrayList" java-attribute="actionData" name="action-data" type="inventory.aai.openecomp.org.v10.ActionData" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="actionData" name="action-data" type="inventory.aai.onap.org.v10.ActionData" />
             </java-attributes>
         </java-type>
 
@@ -210,7 +215,7 @@
                 <xml-element java-attribute="eventId" name="event-id" required="true" type="java.lang.String" />
                 <xml-element java-attribute="nodeType" name="node-type" type="java.lang.String" />
                 <xml-element java-attribute="eventTrigger" name="event-trigger" type="java.lang.String" />
-                <xml-element container-type="java.util.ArrayList" java-attribute="keyData" name="key-data" type="inventory.aai.openecomp.org.v10.KeyData" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="keyData" name="key-data" type="inventory.aai.onap.org.v10.KeyData" />
                 <xml-element java-attribute="selflink" name="selflink" type="java.lang.String" />
             </java-attributes>
         </java-type>
@@ -229,18 +234,18 @@
             </xml-properties>
             <xml-root-element name="cloud-infrastructure" />
             <java-attributes>
-                <xml-element java-attribute="complexes" name="complexes" type="inventory.aai.openecomp.org.v10.Complexes" />
-                <xml-element java-attribute="cloudRegions" name="cloud-regions" type="inventory.aai.openecomp.org.v10.CloudRegions" />
-                <xml-element java-attribute="networkProfiles" name="network-profiles" type="inventory.aai.openecomp.org.v10.NetworkProfiles" />
-                <xml-element java-attribute="pservers" name="pservers" type="inventory.aai.openecomp.org.v10.Pservers" />
-                <xml-element java-attribute="virtualDataCenters" name="virtual-data-centers" type="inventory.aai.openecomp.org.v10.VirtualDataCenters" />
+                <xml-element java-attribute="complexes" name="complexes" type="inventory.aai.onap.org.v10.Complexes" />
+                <xml-element java-attribute="cloudRegions" name="cloud-regions" type="inventory.aai.onap.org.v10.CloudRegions" />
+                <xml-element java-attribute="networkProfiles" name="network-profiles" type="inventory.aai.onap.org.v10.NetworkProfiles" />
+                <xml-element java-attribute="pservers" name="pservers" type="inventory.aai.onap.org.v10.Pservers" />
+                <xml-element java-attribute="virtualDataCenters" name="virtual-data-centers" type="inventory.aai.onap.org.v10.VirtualDataCenters" />
             </java-attributes>
         </java-type>
 
         <java-type name="CloudRegions">
             <xml-root-element name="cloud-regions" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="cloudRegion" name="cloud-region" type="inventory.aai.openecomp.org.v10.CloudRegion" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="cloudRegion" name="cloud-region" type="inventory.aai.onap.org.v10.CloudRegion" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="maximumDepth" value="0" />
@@ -295,16 +300,16 @@
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="volumeGroups" name="volume-groups" type="inventory.aai.openecomp.org.v10.VolumeGroups" />
-                <xml-element java-attribute="tenants" name="tenants" type="inventory.aai.openecomp.org.v10.Tenants" />
-                <xml-element java-attribute="flavors" name="flavors" type="inventory.aai.openecomp.org.v10.Flavors" />
-                <xml-element java-attribute="groupAssignments" name="group-assignments" type="inventory.aai.openecomp.org.v10.GroupAssignments" />
-                <xml-element java-attribute="snapshots" name="snapshots" type="inventory.aai.openecomp.org.v10.Snapshots" />
-                <xml-element java-attribute="images" name="images" type="inventory.aai.openecomp.org.v10.Images" />
-                <xml-element java-attribute="dvsSwitches" name="dvs-switches" type="inventory.aai.openecomp.org.v10.DvsSwitches" />
-                <xml-element java-attribute="oamNetworks" name="oam-networks" type="inventory.aai.openecomp.org.v10.OamNetworks" />
-                <xml-element java-attribute="availabilityZones" name="availability-zones" type="inventory.aai.openecomp.org.v10.AvailabilityZones" />
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
+                <xml-element java-attribute="volumeGroups" name="volume-groups" type="inventory.aai.onap.org.v10.VolumeGroups" />
+                <xml-element java-attribute="tenants" name="tenants" type="inventory.aai.onap.org.v10.Tenants" />
+                <xml-element java-attribute="flavors" name="flavors" type="inventory.aai.onap.org.v10.Flavors" />
+                <xml-element java-attribute="groupAssignments" name="group-assignments" type="inventory.aai.onap.org.v10.GroupAssignments" />
+                <xml-element java-attribute="snapshots" name="snapshots" type="inventory.aai.onap.org.v10.Snapshots" />
+                <xml-element java-attribute="images" name="images" type="inventory.aai.onap.org.v10.Images" />
+                <xml-element java-attribute="dvsSwitches" name="dvs-switches" type="inventory.aai.onap.org.v10.DvsSwitches" />
+                <xml-element java-attribute="oamNetworks" name="oam-networks" type="inventory.aai.onap.org.v10.OamNetworks" />
+                <xml-element java-attribute="availabilityZones" name="availability-zones" type="inventory.aai.onap.org.v10.AvailabilityZones" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="cloud-region designates an installation of a cloud cluster or region or instantiation" />
@@ -320,7 +325,7 @@
             </xml-properties>
             <xml-root-element name="volume-groups" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="volumeGroup" name="volume-group" type="inventory.aai.openecomp.org.v10.VolumeGroup" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="volumeGroup" name="volume-group" type="inventory.aai.onap.org.v10.VolumeGroup" />
             </java-attributes>
         </java-type>
 
@@ -367,7 +372,7 @@
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Persistent block-level storage." />
@@ -381,7 +386,7 @@
         <java-type name="RelationshipList">
             <xml-root-element name="relationship-list" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="relationship" name="relationship" type="inventory.aai.openecomp.org.v10.Relationship" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="relationship" name="relationship" type="inventory.aai.onap.org.v10.Relationship" />
             </java-attributes>
         </java-type>
 
@@ -398,8 +403,8 @@
                         <xml-property name="description" value="URL to the object in A&amp;AI." />
                     </xml-properties>
                 </xml-element>
-                <xml-element container-type="java.util.ArrayList" java-attribute="relationshipData" name="relationship-data" type="inventory.aai.openecomp.org.v10.RelationshipData" />
-                <xml-element container-type="java.util.ArrayList" java-attribute="relatedToProperty" name="related-to-property" type="inventory.aai.openecomp.org.v10.RelatedToProperty" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="relationshipData" name="relationship-data" type="inventory.aai.onap.org.v10.RelationshipData" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="relatedToProperty" name="related-to-property" type="inventory.aai.onap.org.v10.RelatedToProperty" />
             </java-attributes>
         </java-type>
 
@@ -441,7 +446,7 @@
             </xml-properties>
             <xml-root-element name="complexes" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="complex" name="complex" type="inventory.aai.openecomp.org.v10.Complex" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="complex" name="complex" type="inventory.aai.onap.org.v10.Complex" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="maximumDepth" value="0" />
@@ -492,8 +497,8 @@
                 <xml-element java-attribute="longitude" name="longitude" type="java.lang.String" />
                 <xml-element java-attribute="elevation" name="elevation" type="java.lang.String" />
                 <xml-element java-attribute="lata" name="lata" type="java.lang.String" />
-                <xml-element java-attribute="ctagPools" name="ctag-pools" type="inventory.aai.openecomp.org.v10.CtagPools" />
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
+                <xml-element java-attribute="ctagPools" name="ctag-pools" type="inventory.aai.onap.org.v10.CtagPools" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Collection of physical locations that can house cloud-regions." />
@@ -508,7 +513,7 @@
         <java-type name="CtagPools">
             <xml-root-element name="ctag-pools" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="ctagPool" name="ctag-pool" type="inventory.aai.openecomp.org.v10.CtagPool" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="ctagPool" name="ctag-pool" type="inventory.aai.onap.org.v10.CtagPool" />
             </java-attributes>
         </java-type>
 
@@ -540,7 +545,7 @@
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="A collection of C tags (vlan tags) grouped for a specific purpose." />
@@ -556,7 +561,7 @@
             </xml-properties>
             <xml-root-element name="tenants" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="tenant" name="tenant" type="inventory.aai.openecomp.org.v10.Tenant" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="tenant" name="tenant" type="inventory.aai.onap.org.v10.Tenant" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="maximumDepth" value="0" />
@@ -581,8 +586,8 @@
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="vservers" name="vservers" type="inventory.aai.openecomp.org.v10.Vservers" />
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
+                <xml-element java-attribute="vservers" name="vservers" type="inventory.aai.onap.org.v10.Vservers" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Openstack tenant" />
@@ -600,7 +605,7 @@
             </xml-properties>
             <xml-root-element name="vservers" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="vserver" name="vserver" type="inventory.aai.openecomp.org.v10.Vserver" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="vserver" name="vserver" type="inventory.aai.onap.org.v10.Vserver" />
             </java-attributes>
         </java-type>
 
@@ -649,9 +654,9 @@
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="volumes" name="volumes" type="inventory.aai.openecomp.org.v10.Volumes" />
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
-                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.openecomp.org.v10.LInterfaces" />
+                <xml-element java-attribute="volumes" name="volumes" type="inventory.aai.onap.org.v10.Volumes" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
+                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v10.LInterfaces" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Virtual Servers, aka virtual machine or VM." />
@@ -669,7 +674,7 @@
             </xml-properties>
             <xml-root-element name="l-interfaces" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="lInterface" name="l-interface" type="inventory.aai.openecomp.org.v10.LInterface" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="lInterface" name="l-interface" type="inventory.aai.onap.org.v10.LInterface" />
             </java-attributes>
         </java-type>
 
@@ -738,12 +743,12 @@
                         <xml-property name="description" value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)" />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="vlans" name="vlans" type="inventory.aai.openecomp.org.v10.Vlans" />
-                <xml-element java-attribute="sriovVfs" name="sriov-vfs" type="inventory.aai.openecomp.org.v10.SriovVfs" />
-                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.openecomp.org.v10.LInterfaces" />
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
-                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.openecomp.org.v10.L3InterfaceIpv4AddressList" />
-                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.openecomp.org.v10.L3InterfaceIpv6AddressList" />
+                <xml-element java-attribute="vlans" name="vlans" type="inventory.aai.onap.org.v10.Vlans" />
+                <xml-element java-attribute="sriovVfs" name="sriov-vfs" type="inventory.aai.onap.org.v10.SriovVfs" />
+                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v10.LInterfaces" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v10.L3InterfaceIpv4AddressList" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v10.L3InterfaceIpv6AddressList" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Logical interfaces, e.g., a vnic." />
@@ -759,7 +764,7 @@
             </xml-properties>
             <xml-root-element name="sriov-vfs" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="sriovVf" name="sriov-vf" type="inventory.aai.openecomp.org.v10.SriovVf" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="sriovVf" name="sriov-vf" type="inventory.aai.onap.org.v10.SriovVf" />
             </java-attributes>
         </java-type>
         <java-type name="SriovVf">
@@ -835,7 +840,7 @@
                         <xml-property name="description" value="Neutron network id of the interface" />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="SR-IOV Virtual Function (not to be confused with virtual network function)" />
@@ -888,7 +893,7 @@
                         <xml-property name="description" value="Neutron id of subnet that address belongs to" />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="IPv4 Address Range" />
@@ -900,7 +905,7 @@
         <java-type name="Vlans">
             <xml-root-element name="vlans" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="vlan" name="vlan" type="inventory.aai.openecomp.org.v10.Vlan" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="vlan" name="vlan" type="inventory.aai.onap.org.v10.Vlan" />
             </java-attributes>
         </java-type>
 
@@ -964,9 +969,9 @@
                         <xml-property name="description" value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)" />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
-                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.openecomp.org.v10.L3InterfaceIpv4AddressList" />
-                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.openecomp.org.v10.L3InterfaceIpv6AddressList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v10.L3InterfaceIpv4AddressList" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v10.L3InterfaceIpv6AddressList" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Definition of vlan" />
@@ -1020,7 +1025,7 @@
                         <xml-property name="description" value="Neutron id of subnet that address belongs to" />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="IPv6 Address Range" />
@@ -1035,7 +1040,7 @@
             </xml-properties>
             <xml-root-element name="volumes" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="volume" name="volume" type="inventory.aai.openecomp.org.v10.Volume" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="volume" name="volume" type="inventory.aai.onap.org.v10.Volume" />
             </java-attributes>
         </java-type>
 
@@ -1057,7 +1062,7 @@
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Ephemeral Block storage volume." />
@@ -1073,7 +1078,7 @@
             </xml-properties>
             <xml-root-element name="flavors" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="flavor" name="flavor" type="inventory.aai.openecomp.org.v10.Flavor" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="flavor" name="flavor" type="inventory.aai.onap.org.v10.Flavor" />
             </java-attributes>
         </java-type>
 
@@ -1135,7 +1140,7 @@
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Openstack flavor." />
@@ -1152,7 +1157,7 @@
             </xml-properties>
             <xml-root-element name="snapshots" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="snapshot" name="snapshot" type="inventory.aai.openecomp.org.v10.Snapshot" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="snapshot" name="snapshot" type="inventory.aai.onap.org.v10.Snapshot" />
             </java-attributes>
         </java-type>
 
@@ -1214,7 +1219,7 @@
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Openstack snapshot" />
@@ -1232,7 +1237,7 @@
             </xml-properties>
             <xml-root-element name="group-assignments" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="groupAssignment" name="group-assignment" type="inventory.aai.openecomp.org.v10.GroupAssignment" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="groupAssignment" name="group-assignment" type="inventory.aai.onap.org.v10.GroupAssignment" />
             </java-attributes>
         </java-type>
 
@@ -1264,7 +1269,7 @@
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Openstack group-assignment used to store exclusivity groups (EG)." />
@@ -1281,7 +1286,7 @@
             </xml-properties>
             <xml-root-element name="images" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="image" name="image" type="inventory.aai.openecomp.org.v10.Image" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="image" name="image" type="inventory.aai.onap.org.v10.Image" />
             </java-attributes>
         </java-type>
 
@@ -1338,8 +1343,8 @@
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
-                <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.openecomp.org.v10.Metadata" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
+                <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v10.Metadata" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Openstack image." />
@@ -1356,7 +1361,7 @@
             </xml-properties>
             <xml-root-element name="metadata" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="metadatum" name="metadatum" type="inventory.aai.openecomp.org.v10.Metadatum" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="metadatum" name="metadatum" type="inventory.aai.onap.org.v10.Metadatum" />
             </java-attributes>
         </java-type>
 
@@ -1385,7 +1390,7 @@
             </xml-properties>
             <xml-root-element name="dvs-switches" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="dvsSwitch" name="dvs-switch" type="inventory.aai.openecomp.org.v10.DvsSwitch" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="dvsSwitch" name="dvs-switch" type="inventory.aai.onap.org.v10.DvsSwitch" />
             </java-attributes>
         </java-type>
 
@@ -1407,7 +1412,7 @@
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Digital virtual switch metadata, used by SDN-C to configure VCEs.  A&amp;AI needs to receive this data from the PO deployment team and administer it using the provisioningTool.sh into A&amp;AI. " />
@@ -1423,7 +1428,7 @@
             </xml-properties>
             <xml-root-element name="network-profiles" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="networkProfile" name="network-profile" type="inventory.aai.openecomp.org.v10.NetworkProfile" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="networkProfile" name="network-profile" type="inventory.aai.onap.org.v10.NetworkProfile" />
             </java-attributes>
         </java-type>
 
@@ -1445,7 +1450,7 @@
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Network profile populated by SDN-GP for SNMP" />
@@ -1461,7 +1466,7 @@
             </xml-properties>
             <xml-root-element name="pservers" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="pserver" name="pserver" type="inventory.aai.openecomp.org.v10.Pserver" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="pserver" name="pserver" type="inventory.aai.onap.org.v10.Pserver" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="maximumDepth" value="0" />
@@ -1597,9 +1602,9 @@
                         <xml-property name="description" value="Prov Status of this device (not under canopi control) Valid values [PREPROV/NVTPROV/PROV]" />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
-                <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.openecomp.org.v10.PInterfaces" />
-                <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.openecomp.org.v10.LagInterfaces" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
+                <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v10.PInterfaces" />
+                <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v10.LagInterfaces" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Compute host whose hostname must be unique and must exactly match what is sent as a relationship to a vserver." />
@@ -1617,7 +1622,7 @@
             </xml-properties>
             <xml-root-element name="p-interfaces" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="pInterface" name="p-interface" type="inventory.aai.openecomp.org.v10.PInterface" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="pInterface" name="p-interface" type="inventory.aai.onap.org.v10.PInterface" />
             </java-attributes>
         </java-type>
 
@@ -1675,8 +1680,8 @@
                         <xml-property name="description" value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)" />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
-                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.openecomp.org.v10.LInterfaces" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
+                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v10.LInterfaces" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Physical interface (e.g., nic)" />
@@ -1693,7 +1698,7 @@
             </xml-properties>
             <xml-root-element name="lag-interfaces" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="lagInterface" name="lag-interface" type="inventory.aai.openecomp.org.v10.LagInterface" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="lagInterface" name="lag-interface" type="inventory.aai.onap.org.v10.LagInterface" />
             </java-attributes>
         </java-type>
 
@@ -1746,8 +1751,8 @@
                         <xml-property name="description" value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)" />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
-                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.openecomp.org.v10.LInterfaces" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
+                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v10.LInterfaces" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Link aggregate interface" />
@@ -1763,7 +1768,7 @@
             </xml-properties>
             <xml-root-element name="oam-networks" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="oamNetwork" name="oam-network" type="inventory.aai.openecomp.org.v10.OamNetwork" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="oamNetwork" name="oam-network" type="inventory.aai.onap.org.v10.OamNetwork" />
             </java-attributes>
         </java-type>
 
@@ -1800,7 +1805,7 @@
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="OAM network, to be deprecated shortly.  Do not use for new purposes. " />
@@ -1817,7 +1822,7 @@
             </xml-properties>
             <xml-root-element name="availability-zones" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="availabilityZone" name="availability-zone" type="inventory.aai.openecomp.org.v10.AvailabilityZone" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="availabilityZone" name="availability-zone" type="inventory.aai.onap.org.v10.AvailabilityZone" />
             </java-attributes>
         </java-type>
 
@@ -1844,7 +1849,7 @@
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Availability zone, a collection of compute hosts/pservers" />
@@ -1860,7 +1865,7 @@
             </xml-properties>
             <xml-root-element name="virtual-data-centers" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="virtualDataCenter" name="virtual-data-center" type="inventory.aai.openecomp.org.v10.VirtualDataCenter" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="virtualDataCenter" name="virtual-data-center" type="inventory.aai.onap.org.v10.VirtualDataCenter" />
             </java-attributes>
         </java-type>
 
@@ -1882,7 +1887,7 @@
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Virtual organization of cloud infrastructure elements in a data center context" />
@@ -1902,8 +1907,8 @@
             </xml-properties>
             <xml-root-element name="business" />
             <java-attributes>
-                <xml-element java-attribute="connectors" name="connectors" type="inventory.aai.openecomp.org.v10.Connectors" />
-                <xml-element java-attribute="customers" name="customers" type="inventory.aai.openecomp.org.v10.Customers" />
+                <xml-element java-attribute="connectors" name="connectors" type="inventory.aai.onap.org.v10.Connectors" />
+                <xml-element java-attribute="customers" name="customers" type="inventory.aai.onap.org.v10.Customers" />
             </java-attributes>
         </java-type>
 
@@ -1913,7 +1918,7 @@
             </xml-properties>
             <xml-root-element name="connectors" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="connector" name="connector" type="inventory.aai.openecomp.org.v10.Connector" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="connector" name="connector" type="inventory.aai.onap.org.v10.Connector" />
             </java-attributes>
         </java-type>
 
@@ -1963,8 +1968,8 @@
                         <xml-property name="description" value="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
-                <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.openecomp.org.v10.Metadata" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
+                <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v10.Metadata" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Collection of resource instances used to connect a variety of disparate inventory widgets" />
@@ -1980,7 +1985,7 @@
             </xml-properties>
             <xml-root-element name="customers" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="customer" name="customer" type="inventory.aai.openecomp.org.v10.Customer" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="customer" name="customer" type="inventory.aai.onap.org.v10.Customer" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="maximumDepth" value="0" />
@@ -2011,8 +2016,8 @@
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="serviceSubscriptions" name="service-subscriptions" type="inventory.aai.openecomp.org.v10.ServiceSubscriptions" />
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
+                <xml-element java-attribute="serviceSubscriptions" name="service-subscriptions" type="inventory.aai.onap.org.v10.ServiceSubscriptions" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="customer identifiers to provide linkage back to BSS information." />
@@ -2031,7 +2036,7 @@
             </xml-properties>
             <xml-root-element name="service-subscriptions" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="serviceSubscription" name="service-subscription" type="inventory.aai.openecomp.org.v10.ServiceSubscription" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="serviceSubscription" name="service-subscription" type="inventory.aai.onap.org.v10.ServiceSubscription" />
             </java-attributes>
         </java-type>
 
@@ -2053,9 +2058,9 @@
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="serviceInstances" name="service-instances" type="inventory.aai.openecomp.org.v10.ServiceInstances">
+                <xml-element java-attribute="serviceInstances" name="service-instances" type="inventory.aai.onap.org.v10.ServiceInstances">
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Object that group service instances." />
@@ -2072,7 +2077,7 @@
             </xml-properties>
             <xml-root-element name="service-instances" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="serviceInstance" name="service-instance" type="inventory.aai.openecomp.org.v10.ServiceInstance" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="serviceInstance" name="service-instance" type="inventory.aai.onap.org.v10.ServiceInstance" />
             </java-attributes>
         </java-type>
 
@@ -2172,9 +2177,9 @@
                         <xml-property name="description" value="Orchestration status of this service." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
-                <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.openecomp.org.v10.Metadata" />
-                <xml-element java-attribute="allottedResources" name="allotted-resources" type="inventory.aai.openecomp.org.v10.AllottedResources" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
+                <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v10.Metadata" />
+                <xml-element java-attribute="allottedResources" name="allotted-resources" type="inventory.aai.onap.org.v10.AllottedResources" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Instance of a service" />
@@ -2193,11 +2198,11 @@
             </xml-properties>
             <xml-root-element name="service-design-and-creation" />
             <java-attributes>
-                <xml-element java-attribute="vnfImages" name="vnf-images" type="inventory.aai.openecomp.org.v10.VnfImages" />
-                <xml-element java-attribute="services" name="services" type="inventory.aai.openecomp.org.v10.Services" />
-                <xml-element java-attribute="serviceCapabilities" name="service-capabilities" type="inventory.aai.openecomp.org.v10.ServiceCapabilities" />
-                <xml-element java-attribute="models" name="models" type="inventory.aai.openecomp.org.v10.Models" />
-                <xml-element java-attribute="namedQueries" name="named-queries" type="inventory.aai.openecomp.org.v10.NamedQueries" />
+                <xml-element java-attribute="vnfImages" name="vnf-images" type="inventory.aai.onap.org.v10.VnfImages" />
+                <xml-element java-attribute="services" name="services" type="inventory.aai.onap.org.v10.Services" />
+                <xml-element java-attribute="serviceCapabilities" name="service-capabilities" type="inventory.aai.onap.org.v10.ServiceCapabilities" />
+                <xml-element java-attribute="models" name="models" type="inventory.aai.onap.org.v10.Models" />
+                <xml-element java-attribute="namedQueries" name="named-queries" type="inventory.aai.onap.org.v10.NamedQueries" />
             </java-attributes>
         </java-type>
 
@@ -2207,7 +2212,7 @@
             </xml-properties>
             <xml-root-element name="vnf-images" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="vnfImage" name="vnf-image" type="inventory.aai.openecomp.org.v10.VnfImage" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="vnfImage" name="vnf-image" type="inventory.aai.onap.org.v10.VnfImage" />
             </java-attributes>
         </java-type>
 
@@ -2244,7 +2249,7 @@
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Image object that pertain to a VNF that doesn't have associated vservers.  This is a kludge." />
@@ -2261,7 +2266,7 @@
             </xml-properties>
             <xml-root-element name="services" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="service" name="service" type="inventory.aai.openecomp.org.v10.Service" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="service" name="service" type="inventory.aai.onap.org.v10.Service" />
             </java-attributes>
         </java-type>
 
@@ -2293,7 +2298,7 @@
                         <xml-property name="description" value="service version" />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Stand-in for service model definitions.  Likely to be deprecated in favor of models from ASDC.  Does not strictly map to ASDC services." />
@@ -2309,7 +2314,7 @@
             </xml-properties>
             <xml-root-element name="service-capabilities" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="serviceCapability" name="service-capability" type="inventory.aai.openecomp.org.v10.ServiceCapability" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="serviceCapability" name="service-capability" type="inventory.aai.onap.org.v10.ServiceCapability" />
             </java-attributes>
         </java-type>
 
@@ -2331,7 +2336,7 @@
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Early definition of server/resource pairings, likely to be replaced by models.  No new use should be made of this." />
@@ -2347,24 +2352,24 @@
             </xml-properties>
             <xml-root-element name="network" />
             <java-attributes>
-                <xml-element java-attribute="logicalLinks" name="logical-links" type="inventory.aai.openecomp.org.v10.LogicalLinks" />
-                <xml-element java-attribute="sitePairSets" name="site-pair-sets" type="inventory.aai.openecomp.org.v10.SitePairSets" />
-                <xml-element java-attribute="vpnBindings" name="vpn-bindings" type="inventory.aai.openecomp.org.v10.VpnBindings" />
-                <xml-element java-attribute="vplsPes" name="vpls-pes" type="inventory.aai.openecomp.org.v10.VplsPes" />
-                <xml-element java-attribute="multicastConfigurations" name="multicast-configurations" type="inventory.aai.openecomp.org.v10.MulticastConfigurations" />
-                <xml-element java-attribute="vces" name="vces" type="inventory.aai.openecomp.org.v10.Vces" />
-                <xml-element java-attribute="vnfcs" name="vnfcs" type="inventory.aai.openecomp.org.v10.Vnfcs" />
-                <xml-element java-attribute="l3Networks" name="l3-networks" type="inventory.aai.openecomp.org.v10.L3Networks" />
-                <xml-element java-attribute="networkPolicies" name="network-policies" type="inventory.aai.openecomp.org.v10.NetworkPolicies" />
-                <xml-element java-attribute="genericVnfs" name="generic-vnfs" type="inventory.aai.openecomp.org.v10.GenericVnfs" />
-                <xml-element java-attribute="lagLinks" name="lag-links" type="inventory.aai.openecomp.org.v10.LagLinks" />
-                <xml-element java-attribute="newvces" name="newvces" type="inventory.aai.openecomp.org.v10.Newvces" />
-                <xml-element java-attribute="pnfs" name="pnfs" type="inventory.aai.openecomp.org.v10.Pnfs" />
-                <xml-element java-attribute="physicalLinks" name="physical-links" type="inventory.aai.openecomp.org.v10.PhysicalLinks" />
-                <xml-element java-attribute="ipsecConfigurations" name="ipsec-configurations" type="inventory.aai.openecomp.org.v10.IpsecConfigurations" />
-                <xml-element java-attribute="routeTableReferences" name="route-table-references" type="inventory.aai.openecomp.org.v10.RouteTableReferences" />
-                <xml-element java-attribute="instanceGroups" name="instance-groups" type="inventory.aai.openecomp.org.v10.InstanceGroups" />
-                <xml-element java-attribute="zones" name="zones" type="inventory.aai.openecomp.org.v10.Zones" />
+                <xml-element java-attribute="logicalLinks" name="logical-links" type="inventory.aai.onap.org.v10.LogicalLinks" />
+                <xml-element java-attribute="sitePairSets" name="site-pair-sets" type="inventory.aai.onap.org.v10.SitePairSets" />
+                <xml-element java-attribute="vpnBindings" name="vpn-bindings" type="inventory.aai.onap.org.v10.VpnBindings" />
+                <xml-element java-attribute="vplsPes" name="vpls-pes" type="inventory.aai.onap.org.v10.VplsPes" />
+                <xml-element java-attribute="multicastConfigurations" name="multicast-configurations" type="inventory.aai.onap.org.v10.MulticastConfigurations" />
+                <xml-element java-attribute="vces" name="vces" type="inventory.aai.onap.org.v10.Vces" />
+                <xml-element java-attribute="vnfcs" name="vnfcs" type="inventory.aai.onap.org.v10.Vnfcs" />
+                <xml-element java-attribute="l3Networks" name="l3-networks" type="inventory.aai.onap.org.v10.L3Networks" />
+                <xml-element java-attribute="networkPolicies" name="network-policies" type="inventory.aai.onap.org.v10.NetworkPolicies" />
+                <xml-element java-attribute="genericVnfs" name="generic-vnfs" type="inventory.aai.onap.org.v10.GenericVnfs" />
+                <xml-element java-attribute="lagLinks" name="lag-links" type="inventory.aai.onap.org.v10.LagLinks" />
+                <xml-element java-attribute="newvces" name="newvces" type="inventory.aai.onap.org.v10.Newvces" />
+                <xml-element java-attribute="pnfs" name="pnfs" type="inventory.aai.onap.org.v10.Pnfs" />
+                <xml-element java-attribute="physicalLinks" name="physical-links" type="inventory.aai.onap.org.v10.PhysicalLinks" />
+                <xml-element java-attribute="ipsecConfigurations" name="ipsec-configurations" type="inventory.aai.onap.org.v10.IpsecConfigurations" />
+                <xml-element java-attribute="routeTableReferences" name="route-table-references" type="inventory.aai.onap.org.v10.RouteTableReferences" />
+                <xml-element java-attribute="instanceGroups" name="instance-groups" type="inventory.aai.onap.org.v10.InstanceGroups" />
+                <xml-element java-attribute="zones" name="zones" type="inventory.aai.onap.org.v10.Zones" />
             </java-attributes>
         </java-type>
 
@@ -2374,7 +2379,7 @@
             </xml-properties>
             <xml-root-element name="logical-links" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="logicalLink" name="logical-link" type="inventory.aai.openecomp.org.v10.LogicalLink" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="logicalLink" name="logical-link" type="inventory.aai.onap.org.v10.LogicalLink" />
             </java-attributes>
         </java-type>
 
@@ -2484,7 +2489,7 @@
                         <xml-property name="description" value="Reason for this entity, role it is playing" />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Logical links generally connect l-interfaces but are used to express logical connectivity between two points" />
@@ -2502,7 +2507,7 @@
             </xml-properties>
             <xml-root-element name="site-pair-sets" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="sitePairSet" name="site-pair-set" type="inventory.aai.openecomp.org.v10.SitePairSet" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="sitePairSet" name="site-pair-set" type="inventory.aai.onap.org.v10.SitePairSet" />
             </java-attributes>
         </java-type>
 
@@ -2519,8 +2524,8 @@
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="routingInstances" name="routing-instances" type="inventory.aai.openecomp.org.v10.RoutingInstances" />
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
+                <xml-element java-attribute="routingInstances" name="routing-instances" type="inventory.aai.onap.org.v10.RoutingInstances" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Set of instances for probes used to measure service level agreements" />
@@ -2537,7 +2542,7 @@
             </xml-properties>
             <xml-root-element name="routing-instances" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="routingInstance" name="routing-instance" type="inventory.aai.openecomp.org.v10.RoutingInstance" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="routingInstance" name="routing-instance" type="inventory.aai.onap.org.v10.RoutingInstance" />
             </java-attributes>
         </java-type>
 
@@ -2559,8 +2564,8 @@
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="sitePairs" name="site-pairs" type="inventory.aai.openecomp.org.v10.SitePairs" />
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
+                <xml-element java-attribute="sitePairs" name="site-pairs" type="inventory.aai.onap.org.v10.SitePairs" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="indexedProps" value="routing-instance-id" />
@@ -2576,7 +2581,7 @@
             </xml-properties>
             <xml-root-element name="site-pairs" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="sitePair" name="site-pair" type="inventory.aai.openecomp.org.v10.SitePair" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="sitePair" name="site-pair" type="inventory.aai.onap.org.v10.SitePair" />
             </java-attributes>
         </java-type>
 
@@ -2618,8 +2623,8 @@
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="classesOfService" name="classes-of-service" type="inventory.aai.openecomp.org.v10.ClassesOfService" />
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
+                <xml-element java-attribute="classesOfService" name="classes-of-service" type="inventory.aai.onap.org.v10.ClassesOfService" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="indexedProps" value="site-pair-id" />
@@ -2635,7 +2640,7 @@
             </xml-properties>
             <xml-root-element name="classes-of-service" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="classOfService" name="class-of-service" type="inventory.aai.openecomp.org.v10.ClassOfService" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="classOfService" name="class-of-service" type="inventory.aai.onap.org.v10.ClassOfService" />
             </java-attributes>
         </java-type>
 
@@ -2662,7 +2667,7 @@
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="indexedProps" value="cos" />
@@ -2674,7 +2679,7 @@
         <java-type name="VpnBindings">
             <xml-root-element name="vpn-bindings" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="vpnBinding" name="vpn-binding" type="inventory.aai.openecomp.org.v10.VpnBinding" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="vpnBinding" name="vpn-binding" type="inventory.aai.onap.org.v10.VpnBinding" />
             </java-attributes>
         </java-type>
 
@@ -2711,8 +2716,8 @@
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="routeTargets" name="route-targets" type="inventory.aai.openecomp.org.v10.RouteTargets" />
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList">
+                <xml-element java-attribute="routeTargets" name="route-targets" type="inventory.aai.onap.org.v10.RouteTargets" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList">
                     <xml-properties>
                         <xml-property name="description" value="l3-networks relate to vpn-bindings" />
                     </xml-properties>
@@ -2735,7 +2740,7 @@
             </xml-properties>
             <xml-root-element name="vpls-pes" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="vplsPe" name="vpls-pe" type="inventory.aai.openecomp.org.v10.VplsPe" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="vplsPe" name="vpls-pe" type="inventory.aai.onap.org.v10.VplsPe" />
             </java-attributes>
         </java-type>
 
@@ -2768,9 +2773,9 @@
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
-                <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.openecomp.org.v10.PInterfaces" />
-                <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.openecomp.org.v10.LagInterfaces" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
+                <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v10.PInterfaces" />
+                <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v10.LagInterfaces" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="VPLS Provider Edge routers." />
@@ -2786,7 +2791,7 @@
             </xml-properties>
             <xml-root-element name="multicast-configurations" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="multicastConfiguration" name="multicast-configuration" type="inventory.aai.openecomp.org.v10.MulticastConfiguration" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="multicastConfiguration" name="multicast-configuration" type="inventory.aai.onap.org.v10.MulticastConfiguration" />
             </java-attributes>
         </java-type>
 
@@ -2813,7 +2818,7 @@
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="indexedProps" value="multicast-configuration-id" />
@@ -2829,7 +2834,7 @@
             </xml-properties>
             <xml-root-element name="vces" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="vce" name="vce" type="inventory.aai.openecomp.org.v10.Vce" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="vce" name="vce" type="inventory.aai.onap.org.v10.Vce" />
             </java-attributes>
         </java-type>
 
@@ -2931,10 +2936,10 @@
                         <xml-property name="description" value="OBSOLETE -  see child relationships" />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="portGroups" name="port-groups" type="inventory.aai.openecomp.org.v10.PortGroups" />
-                <xml-element java-attribute="licenses" name="licenses" type="inventory.aai.openecomp.org.v10.Licenses" />
-                <xml-element java-attribute="entitlements" name="entitlements" type="inventory.aai.openecomp.org.v10.Entitlements" />
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
+                <xml-element java-attribute="portGroups" name="port-groups" type="inventory.aai.onap.org.v10.PortGroups" />
+                <xml-element java-attribute="licenses" name="licenses" type="inventory.aai.onap.org.v10.Licenses" />
+                <xml-element java-attribute="entitlements" name="entitlements" type="inventory.aai.onap.org.v10.Entitlements" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Virtual Customer Edge Router, used specifically for Gamma.  This object is deprecated." />
@@ -2951,7 +2956,7 @@
         <java-type name="PortGroups">
             <xml-root-element name="port-groups" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="portGroup" name="port-group" type="inventory.aai.openecomp.org.v10.PortGroup" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="portGroup" name="port-group" type="inventory.aai.onap.org.v10.PortGroup" />
             </java-attributes>
         </java-type>
 
@@ -3013,8 +3018,8 @@
                         <xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE" />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="cvlanTags" name="cvlan-tags" type="inventory.aai.openecomp.org.v10.CvlanTags" />
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
+                <xml-element java-attribute="cvlanTags" name="cvlan-tags" type="inventory.aai.onap.org.v10.CvlanTags" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Used to capture the network interfaces of this VCE" />
@@ -3028,7 +3033,7 @@
         <java-type name="CvlanTags">
             <xml-root-element name="cvlan-tags" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="cvlanTagEntry" name="cvlan-tag-entry" type="inventory.aai.openecomp.org.v10.CvlanTagEntry" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="cvlanTagEntry" name="cvlan-tag-entry" type="inventory.aai.onap.org.v10.CvlanTagEntry" />
             </java-attributes>
         </java-type>
 
@@ -3045,7 +3050,7 @@
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="dependentOn" value="port-group" />
@@ -3062,7 +3067,7 @@
             </xml-properties>
             <xml-root-element name="vnfcs" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="vnfc" name="vnfc" type="inventory.aai.openecomp.org.v10.Vnfc" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="vnfc" name="vnfc" type="inventory.aai.onap.org.v10.Vnfc" />
             </java-attributes>
         </java-type>
 
@@ -3121,7 +3126,7 @@
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="indexedProps" value="vnfc-name,prov-status,vnfc-type,vnfc-function-code,ipaddress-v4-oam-vip,in-maint,is-closed-loop-disabled,group-notation" />
@@ -3134,7 +3139,7 @@
         <java-type name="L3Networks">
             <xml-root-element name="l3-networks" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="l3Network" name="l3-network" type="inventory.aai.openecomp.org.v10.L3Network" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="l3Network" name="l3-network" type="inventory.aai.onap.org.v10.L3Network" />
             </java-attributes>
         </java-type>
 
@@ -3283,10 +3288,10 @@
                         <xml-property name="description" value="Indicator for whether the resource is considered operational." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="subnets" name="subnets" type="inventory.aai.openecomp.org.v10.Subnets" />
-                <xml-element java-attribute="ctagAssignments" name="ctag-assignments" type="inventory.aai.openecomp.org.v10.CtagAssignments" />
-                <xml-element java-attribute="segmentationAssignments" name="segmentation-assignments" type="inventory.aai.openecomp.org.v10.SegmentationAssignments" />
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" >
+                <xml-element java-attribute="subnets" name="subnets" type="inventory.aai.onap.org.v10.Subnets" />
+                <xml-element java-attribute="ctagAssignments" name="ctag-assignments" type="inventory.aai.onap.org.v10.CtagAssignments" />
+                <xml-element java-attribute="segmentationAssignments" name="segmentation-assignments" type="inventory.aai.onap.org.v10.SegmentationAssignments" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" >
                     <xml-properties>
                         <xml-property name="description" value="Relates to tenant (or is it a child of tenant), complex, service, vpn-binding" />
                     </xml-properties>
@@ -3305,7 +3310,7 @@
         <java-type name="NetworkPolicies">
             <xml-root-element name="network-policies" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="networkPolicy" name="network-policy" type="inventory.aai.openecomp.org.v10.NetworkPolicy" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="networkPolicy" name="network-policy" type="inventory.aai.onap.org.v10.NetworkPolicy" />
             </java-attributes>
         </java-type>
         <java-type name="NetworkPolicy">
@@ -3331,7 +3336,7 @@
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="nameProps" value="network-policy-fqdn" />
@@ -3345,7 +3350,7 @@
         <java-type name="CtagAssignments">
             <xml-root-element name="ctag-assignments" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="ctagAssignment" name="ctag-assignment" type="inventory.aai.openecomp.org.v10.CtagAssignment" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="ctagAssignment" name="ctag-assignment" type="inventory.aai.onap.org.v10.CtagAssignment" />
             </java-attributes>
         </java-type>
 
@@ -3362,7 +3367,7 @@
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="indexedProps" value="vlan-id-inner" />
@@ -3374,7 +3379,7 @@
         <java-type name="Subnets">
             <xml-root-element name="subnets" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="subnet" name="subnet" type="inventory.aai.openecomp.org.v10.Subnet" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="subnet" name="subnet" type="inventory.aai.onap.org.v10.Subnet" />
             </java-attributes>
         </java-type>
 
@@ -3442,7 +3447,7 @@
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="indexedProps" value="subnet-id,subnet-name" />
@@ -3459,7 +3464,7 @@
             </xml-properties>
             <xml-root-element name="generic-vnfs" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="genericVnf" name="generic-vnf" type="inventory.aai.openecomp.org.v10.GenericVnf" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="genericVnf" name="generic-vnf" type="inventory.aai.onap.org.v10.GenericVnf" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="maximumDepth" value="0" />
@@ -3712,12 +3717,12 @@
                         <xml-property name="description" value="Path to the controller object." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
-                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.openecomp.org.v10.LInterfaces" />
-                <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.openecomp.org.v10.LagInterfaces" />
-                <xml-element java-attribute="vfModules" name="vf-modules" type="inventory.aai.openecomp.org.v10.VfModules" />
-                <xml-element java-attribute="licenses" name="licenses" type="inventory.aai.openecomp.org.v10.Licenses" />
-                <xml-element java-attribute="entitlements" name="entitlements" type="inventory.aai.openecomp.org.v10.Entitlements" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
+                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v10.LInterfaces" />
+                <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v10.LagInterfaces" />
+                <xml-element java-attribute="vfModules" name="vf-modules" type="inventory.aai.onap.org.v10.VfModules" />
+                <xml-element java-attribute="licenses" name="licenses" type="inventory.aai.onap.org.v10.Licenses" />
+                <xml-element java-attribute="entitlements" name="entitlements" type="inventory.aai.onap.org.v10.Entitlements" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="General purpose VNF" />
@@ -3739,7 +3744,7 @@
             </xml-properties>
             <xml-root-element name="vf-modules" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="vfModule" name="vf-module" type="inventory.aai.openecomp.org.v10.VfModule" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="vfModule" name="vf-module" type="inventory.aai.onap.org.v10.VfModule" />
             </java-attributes>
         </java-type>
 
@@ -3830,7 +3835,7 @@
                         <xml-property name="description" value="Path to the controller object." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="a deployment unit of VNFCs" />
@@ -3848,7 +3853,7 @@
             </xml-properties>
             <xml-root-element name="lag-links" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="lagLink" name="lag-link" type="inventory.aai.openecomp.org.v10.LagLink" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="lagLink" name="lag-link" type="inventory.aai.onap.org.v10.LagLink" />
             </java-attributes>
         </java-type>
 
@@ -3865,7 +3870,7 @@
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="LAG links can connect lag-interfaces" />
@@ -3881,7 +3886,7 @@
             </xml-properties>
             <xml-root-element name="newvces" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="newvce" name="newvce" type="inventory.aai.openecomp.org.v10.Newvce" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="newvce" name="newvce" type="inventory.aai.onap.org.v10.Newvce" />
             </java-attributes>
         </java-type>
 
@@ -3958,8 +3963,8 @@
                         <xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE" />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
-                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.openecomp.org.v10.LInterfaces" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
+                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v10.LInterfaces" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="This object fills in the gaps from vce that were incorporated into generic-vnf.  This object will be retired with vce." />
@@ -3978,7 +3983,7 @@
             </xml-properties>
             <xml-root-element name="pnfs" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="pnf" name="pnf" type="inventory.aai.openecomp.org.v10.Pnf" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="pnf" name="pnf" type="inventory.aai.onap.org.v10.Pnf" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="maximumDepth" value="0" />
@@ -4099,9 +4104,9 @@
                         <xml-property name="description" value="Nf Role is the role performed by this instance in the network." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
-                <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.openecomp.org.v10.PInterfaces" />
-                <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.openecomp.org.v10.LagInterfaces" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
+                <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v10.PInterfaces" />
+                <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v10.LagInterfaces" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="PNF represents a physical network function. typically equipment used in the D1 world." />
@@ -4119,7 +4124,7 @@
             </xml-properties>
             <xml-root-element name="physical-links" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="physicalLink" name="physical-link" type="inventory.aai.openecomp.org.v10.PhysicalLink" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="physicalLink" name="physical-link" type="inventory.aai.onap.org.v10.PhysicalLink" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="maximumDepth" value="0" />
@@ -4169,7 +4174,7 @@
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Collection of physical connections, typically between p-interfaces" />
@@ -4184,7 +4189,7 @@
         <java-type name="VigServers">
             <xml-root-element name="vig-servers" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="vigServer" name="vig-server" type="inventory.aai.openecomp.org.v10.VigServer" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="vigServer" name="vig-server" type="inventory.aai.onap.org.v10.VigServer" />
             </java-attributes>
         </java-type>
 
@@ -4211,7 +4216,7 @@
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="vig-server contains information about a vig server used for IPSec-configuration. Populated by SDN-C from 1607" />
@@ -4224,7 +4229,7 @@
         <java-type name="IpsecConfigurations">
             <xml-root-element name="ipsec-configurations" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="ipsecConfiguration" name="ipsec-configuration" type="inventory.aai.openecomp.org.v10.IpsecConfiguration" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="ipsecConfiguration" name="ipsec-configuration" type="inventory.aai.onap.org.v10.IpsecConfiguration" />
             </java-attributes>
         </java-type>
 
@@ -4341,8 +4346,8 @@
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
-                <xml-element java-attribute="vigServers" name="vig-servers" type="inventory.aai.openecomp.org.v10.VigServers" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
+                <xml-element java-attribute="vigServers" name="vig-servers" type="inventory.aai.onap.org.v10.VigServers" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="IPSec configuration node will contain various configuration data for the NMTE VNF. This node will have an edge to the generic-vnf (vnf type = TE). Starting 1607, this data will be populated by SDN-C" />
@@ -4358,7 +4363,7 @@
             <xml-root-element name="notification-event" />
             <java-attributes>
                 <xml-element java-attribute="cambriaPartition" name="cambria.partition" type="java.lang.String" />
-                <xml-element java-attribute="eventHeader" name="event-header" type="inventory.aai.openecomp.org.v10.NotificationEventHeader" />
+                <xml-element java-attribute="eventHeader" name="event-header" type="inventory.aai.onap.org.v10.NotificationEventHeader" />
                 <xml-any-element java-attribute="entity" />
             </java-attributes>
         </java-type>
@@ -4383,8 +4388,8 @@
         <java-type name="AaiInternal">
             <xml-root-element name="aai-internal" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="reservedPropNames" name="reserved-prop-names" type="inventory.aai.openecomp.org.v10.ReservedPropNames" />
-                <xml-element container-type="java.util.ArrayList" java-attribute="edgePropNames" name="edge-prop-names" type="inventory.aai.openecomp.org.v10.EdgePropNames" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="reservedPropNames" name="reserved-prop-names" type="inventory.aai.onap.org.v10.ReservedPropNames" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="edgePropNames" name="edge-prop-names" type="inventory.aai.onap.org.v10.EdgePropNames" />
             </java-attributes>
         </java-type>
         <java-type name="ReservedPropNames">
@@ -4429,7 +4434,7 @@
             </xml-properties>
             <xml-root-element name="models" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="model" name="model" type="inventory.aai.openecomp.org.v10.Model" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="model" name="model" type="inventory.aai.onap.org.v10.Model" />
             </java-attributes>
         </java-type>
 
@@ -4459,8 +4464,8 @@
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="modelVers" name="model-vers" type="inventory.aai.openecomp.org.v10.ModelVers" />
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
+                <xml-element java-attribute="modelVers" name="model-vers" type="inventory.aai.onap.org.v10.ModelVers" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
             </java-attributes>
         </java-type>
 
@@ -4468,7 +4473,7 @@
         <java-type name="ModelVers">
             <xml-root-element name="model-vers" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="modelVer" name="model-ver" type="inventory.aai.openecomp.org.v10.ModelVer" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="modelVer" name="model-ver" type="inventory.aai.onap.org.v10.ModelVer" />
             </java-attributes>
         </java-type>
 
@@ -4507,16 +4512,16 @@
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.openecomp.org.v10.ModelElements" />
-                <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.openecomp.org.v10.Metadata" />
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
+                <xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.onap.org.v10.ModelElements" />
+                <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v10.Metadata" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
             </java-attributes>
         </java-type>
 
         <java-type name="ModelElements">
             <xml-root-element name="model-elements" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="modelElement" name="model-element" type="inventory.aai.openecomp.org.v10.ModelElement" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="modelElement" name="model-element" type="inventory.aai.onap.org.v10.ModelElement" />
             </java-attributes>
         </java-type>
 
@@ -4553,24 +4558,24 @@
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.openecomp.org.v10.ModelElements">
+                <xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.onap.org.v10.ModelElements">
                     <xml-properties>
                         <xml-property name="description" value="Defines how other models combine to make up a higher-level model" />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="modelConstraints" name="model-constraints" type="inventory.aai.openecomp.org.v10.ModelConstraints">
+                <xml-element java-attribute="modelConstraints" name="model-constraints" type="inventory.aai.onap.org.v10.ModelConstraints">
                     <xml-properties>
                         <xml-property name="description" value="Describes new constraints on this model element that are not part of that model's definition" />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
             </java-attributes>
         </java-type>
 
         <java-type name="ModelConstraints">
             <xml-root-element name="model-constraints" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="modelConstraint" name="model-constraint" type="inventory.aai.openecomp.org.v10.ModelConstraint" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="modelConstraint" name="model-constraint" type="inventory.aai.onap.org.v10.ModelConstraint" />
             </java-attributes>
         </java-type>
 
@@ -4591,7 +4596,7 @@
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="constrainedElementSetUuidToReplace" name="constrained-element-set-uuid-to-replace" required="true" type="java.lang.String" />
-                <xml-element java-attribute="constrainedElementSets" name="constrained-element-sets" type="inventory.aai.openecomp.org.v10.ConstrainedElementSets" />
+                <xml-element java-attribute="constrainedElementSets" name="constrained-element-sets" type="inventory.aai.onap.org.v10.ConstrainedElementSets" />
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
@@ -4603,7 +4608,7 @@
         <java-type name="ConstrainedElementSets">
             <xml-root-element name="constrained-element-sets" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="constrainedElementSet" name="constrained-element-set" type="inventory.aai.openecomp.org.v10.ConstrainedElementSet" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="constrainedElementSet" name="constrained-element-set" type="inventory.aai.onap.org.v10.ConstrainedElementSet" />
             </java-attributes>
         </java-type>
 
@@ -4626,15 +4631,15 @@
                 <xml-element java-attribute="constraintType" name="constraint-type" required="true" type="java.lang.String" />
                 <xml-element java-attribute="checkType" name="check-type" required="true" type="java.lang.String" />
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" />
-                <xml-element java-attribute="elementChoiceSets" name="element-choice-sets" type="inventory.aai.openecomp.org.v10.ElementChoiceSets" />
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
+                <xml-element java-attribute="elementChoiceSets" name="element-choice-sets" type="inventory.aai.onap.org.v10.ElementChoiceSets" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
             </java-attributes>
         </java-type>
 
         <java-type name="ElementChoiceSets">
             <xml-root-element name="element-choice-sets" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="elementChoiceSet" name="element-choice-set" type="inventory.aai.openecomp.org.v10.ElementChoiceSet" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="elementChoiceSet" name="element-choice-set" type="inventory.aai.onap.org.v10.ElementChoiceSet" />
             </java-attributes>
         </java-type>
 
@@ -4657,15 +4662,15 @@
                 <xml-element java-attribute="elementChoiceSetName" name="element-choice-set-name" required="true" type="java.lang.String" />
                 <xml-element java-attribute="cardinality" name="cardinality" type="java.lang.String" />
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" />
-                <xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.openecomp.org.v10.ModelElements" />
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
+                <xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.onap.org.v10.ModelElements" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
             </java-attributes>
         </java-type>
 
         <java-type name="NamedQueries">
             <xml-root-element name="named-queries" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="namedQuery" name="named-query" type="inventory.aai.openecomp.org.v10.NamedQuery" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="namedQuery" name="named-query" type="inventory.aai.onap.org.v10.NamedQuery" />
             </java-attributes>
         </java-type>
 
@@ -4688,15 +4693,15 @@
                 </xml-element>
                 <xml-element java-attribute="description" name="description" type="java.lang.String" />
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" />
-                <xml-element java-attribute="namedQueryElements" name="named-query-elements" type="inventory.aai.openecomp.org.v10.NamedQueryElements" />
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
+                <xml-element java-attribute="namedQueryElements" name="named-query-elements" type="inventory.aai.onap.org.v10.NamedQueryElements" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
             </java-attributes>
         </java-type>
 
         <java-type name="NamedQueryElements">
             <xml-root-element name="named-query-elements" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="namedQueryElement" name="named-query-element" type="inventory.aai.openecomp.org.v10.NamedQueryElement" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="namedQueryElement" name="named-query-element" type="inventory.aai.onap.org.v10.NamedQueryElement" />
             </java-attributes>
         </java-type>
 
@@ -4720,17 +4725,17 @@
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" />
                 <xml-element java-attribute="propertyLimitDesc" name="property-limit-desc" type="java.lang.String" />
                 <xml-element java-attribute="doNotOutput" name="do-not-output" type="java.lang.String" />
-                <xml-element java-attribute="namedQueryElements" name="named-query-elements" type="inventory.aai.openecomp.org.v10.NamedQueryElements" />
-                <xml-element java-attribute="relatedLookups" name="related-lookups" type="inventory.aai.openecomp.org.v10.RelatedLookups" />
-                <xml-element java-attribute="propertyConstraints" name="property-constraints" type="inventory.aai.openecomp.org.v10.PropertyConstraints" />
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
+                <xml-element java-attribute="namedQueryElements" name="named-query-elements" type="inventory.aai.onap.org.v10.NamedQueryElements" />
+                <xml-element java-attribute="relatedLookups" name="related-lookups" type="inventory.aai.onap.org.v10.RelatedLookups" />
+                <xml-element java-attribute="propertyConstraints" name="property-constraints" type="inventory.aai.onap.org.v10.PropertyConstraints" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
             </java-attributes>
         </java-type>
 
         <java-type name="RelatedLookups">
             <xml-root-element name="related-lookups" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="relatedLookup" name="related-lookup" type="inventory.aai.openecomp.org.v10.RelatedLookup" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="relatedLookup" name="related-lookup" type="inventory.aai.onap.org.v10.RelatedLookup" />
             </java-attributes>
         </java-type>
 
@@ -4756,14 +4761,14 @@
                 <xml-element java-attribute="targetNodeProperty" name="target-node-property" required="true" type="java.lang.String" />
                 <xml-element container-type="java.util.ArrayList" java-attribute="propertyCollectList" name="property-collect-list" type="java.lang.String" />
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" />
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
             </java-attributes>
         </java-type>
 
         <java-type name="PropertyConstraints">
             <xml-root-element name="property-constraints" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="propertyConstraint" name="property-constraint" type="inventory.aai.openecomp.org.v10.PropertyConstraint" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="propertyConstraint" name="property-constraint" type="inventory.aai.onap.org.v10.PropertyConstraint" />
             </java-attributes>
         </java-type>
 
@@ -4796,9 +4801,9 @@
             </xml-properties>
             <xml-root-element name="model-and-named-query-search" />
             <java-attributes>
-                <xml-element java-attribute="queryParameters" name="query-parameters" type="inventory.aai.openecomp.org.v10.QueryParameters" />
-                <xml-element java-attribute="instanceFilters" name="instance-filters" type="inventory.aai.openecomp.org.v10.InstanceFilters" />
-                <xml-element java-attribute="secondaryFilts" name="secondary-filts" type="inventory.aai.openecomp.org.v10.SecondaryFilts" />
+                <xml-element java-attribute="queryParameters" name="query-parameters" type="inventory.aai.onap.org.v10.QueryParameters" />
+                <xml-element java-attribute="instanceFilters" name="instance-filters" type="inventory.aai.onap.org.v10.InstanceFilters" />
+                <xml-element java-attribute="secondaryFilts" name="secondary-filts" type="inventory.aai.onap.org.v10.SecondaryFilts" />
                 <xml-element java-attribute="topNodeType" name="top-node-type" type="java.lang.String" />
                 <xml-element java-attribute="secondaryFilterCutPoint" name="secondary-filter-cut-point" type="java.lang.String" />
             </java-attributes>
@@ -4810,8 +4815,8 @@
             </xml-properties>
             <xml-root-element name="query-parameters" />
             <java-attributes>
-                <xml-element java-attribute="namedQuery" name="named-query" type="inventory.aai.openecomp.org.v10.NamedQuery" />
-                <xml-element java-attribute="model" name="model" type="inventory.aai.openecomp.org.v10.OverloadedModel" />
+                <xml-element java-attribute="namedQuery" name="named-query" type="inventory.aai.onap.org.v10.NamedQuery" />
+                <xml-element java-attribute="model" name="model" type="inventory.aai.onap.org.v10.OverloadedModel" />
             </java-attributes>
         </java-type>
 
@@ -4861,8 +4866,8 @@
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="modelVers" name="model-vers" type="inventory.aai.openecomp.org.v10.ModelVers" />
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
+                <xml-element java-attribute="modelVers" name="model-vers" type="inventory.aai.onap.org.v10.ModelVers" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
             </java-attributes>
         </java-type>
 
@@ -4872,7 +4877,7 @@
             </xml-properties>
             <xml-root-element name="instance-filters" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="instanceFilter" name="instance-filter" type="inventory.aai.openecomp.org.v10.InstanceFilter" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="instanceFilter" name="instance-filter" type="inventory.aai.onap.org.v10.InstanceFilter" />
             </java-attributes>
         </java-type>
 
@@ -4893,7 +4898,7 @@
             </xml-properties>
             <xml-root-element name="secondary-filts" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="secondaryFilt" name="secondary-filt" type="inventory.aai.openecomp.org.v10.SecondaryFilt" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="secondaryFilt" name="secondary-filt" type="inventory.aai.onap.org.v10.SecondaryFilt" />
             </java-attributes>
         </java-type>
 
@@ -4924,7 +4929,7 @@
             </xml-properties>
             <xml-root-element name="response-list" />
             <java-attributes>
-                <xml-element java-attribute="inventoryResponseItems" name="inventory-response-items" type="inventory.aai.openecomp.org.v10.InventoryResponseItems" />
+                <xml-element java-attribute="inventoryResponseItems" name="inventory-response-items" type="inventory.aai.onap.org.v10.InventoryResponseItems" />
             </java-attributes>
         </java-type>
 
@@ -4935,7 +4940,7 @@
             </xml-properties>
             <xml-root-element name="inventory-response-items" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="inventoryResponseItem" name="inventory-response-item" type="inventory.aai.openecomp.org.v10.InventoryResponseItem" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="inventoryResponseItem" name="inventory-response-item" type="inventory.aai.onap.org.v10.InventoryResponseItem" />
             </java-attributes>
         </java-type>
 
@@ -4948,8 +4953,8 @@
             <java-attributes>
                 <xml-element java-attribute="modelName" name="model-name" type="java.lang.String" />
                 <xml-any-element java-attribute="item" />
-                <xml-element java-attribute="extraProperties" name="extra-properties" type="inventory.aai.openecomp.org.v10.ExtraProperties" />
-                <xml-element java-attribute="inventoryResponseItems" name="inventory-response-items" type="inventory.aai.openecomp.org.v10.InventoryResponseItems" />
+                <xml-element java-attribute="extraProperties" name="extra-properties" type="inventory.aai.onap.org.v10.ExtraProperties" />
+                <xml-element java-attribute="inventoryResponseItems" name="inventory-response-items" type="inventory.aai.onap.org.v10.InventoryResponseItems" />
             </java-attributes>
         </java-type>
 
@@ -4959,7 +4964,7 @@
             </xml-properties>
             <xml-root-element name="extra-properties" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="extraProperty" name="extra-property" type="inventory.aai.openecomp.org.v10.ExtraProperty" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="extraProperty" name="extra-property" type="inventory.aai.onap.org.v10.ExtraProperty" />
             </java-attributes>
         </java-type>
 
@@ -4977,7 +4982,7 @@
             </xml-properties>
             <xml-root-element name="route-table-references" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="routeTableReference" name="route-table-reference" type="inventory.aai.openecomp.org.v10.RouteTableReference" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="routeTableReference" name="route-table-reference" type="inventory.aai.onap.org.v10.RouteTableReference" />
             </java-attributes>
         </java-type>
 
@@ -4999,7 +5004,7 @@
                         <xml-property name="description" value="Concurrency value" />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
             </java-attributes>
 
             <xml-properties>
@@ -5018,7 +5023,7 @@
             </xml-properties>
             <xml-root-element name="instance-groups" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="instanceGroup" name="instance-group" type="inventory.aai.openecomp.org.v10.InstanceGroup" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="instanceGroup" name="instance-group" type="inventory.aai.onap.org.v10.InstanceGroup" />
             </java-attributes>
         </java-type>
 
@@ -5050,7 +5055,7 @@
                         <xml-property name="description" value="Concurrency value" />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
             </java-attributes>
 
             <xml-properties>
@@ -5070,7 +5075,7 @@
             </xml-properties>
             <xml-root-element name="segmentation-assignments" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="segmentationAssignment" name="segmentation-assignment" type="inventory.aai.openecomp.org.v10.SegmentationAssignment" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="segmentationAssignment" name="segmentation-assignment" type="inventory.aai.onap.org.v10.SegmentationAssignment" />
             </java-attributes>
         </java-type>
 
@@ -5087,7 +5092,7 @@
                         <xml-property name="description" value="Concurrency value" />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Openstack segmentation assignment." />
@@ -5103,7 +5108,7 @@
             </xml-properties>
             <xml-root-element name="allotted-resources" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="allottedResource" name="allotted-resource" type="inventory.aai.openecomp.org.v10.AllottedResource" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="allottedResource" name="allotted-resource" type="inventory.aai.onap.org.v10.AllottedResource" />
             </java-attributes>
         </java-type>
 
@@ -5173,8 +5178,8 @@
                         <xml-property name="description" value="role in the network that this resource will be providing." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="tunnelXconnects" name="tunnel-xconnects" type="inventory.aai.openecomp.org.v10.TunnelXconnects" />
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
+                <xml-element java-attribute="tunnelXconnects" name="tunnel-xconnects" type="inventory.aai.onap.org.v10.TunnelXconnects" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
             </java-attributes>
 
             <xml-properties>
@@ -5194,7 +5199,7 @@
             </xml-properties>
             <xml-root-element name="tunnel-xconnects" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="tunnelXconnect" name="tunnel-xconnect" type="inventory.aai.openecomp.org.v10.TunnelXconnect" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="tunnelXconnect" name="tunnel-xconnect" type="inventory.aai.onap.org.v10.TunnelXconnect" />
             </java-attributes>
         </java-type>
 
@@ -5231,7 +5236,7 @@
                         <xml-property name="description" value="Concurrency value" />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
             </java-attributes>
 
             <xml-properties>
@@ -5250,7 +5255,7 @@
             </xml-properties>
             <xml-root-element name="entitlements" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="entitlement" name="entitlement" type="inventory.aai.openecomp.org.v10.Entitlement" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="entitlement" name="entitlement" type="inventory.aai.onap.org.v10.Entitlement" />
             </java-attributes>
         </java-type>
 
@@ -5272,7 +5277,7 @@
                         <xml-property name="description" value="Concurrency value" />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Metadata for entitlement group." />
@@ -5289,7 +5294,7 @@
             </xml-properties>
             <xml-root-element name="licenses" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="license" name="license" type="inventory.aai.openecomp.org.v10.License" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="license" name="license" type="inventory.aai.onap.org.v10.License" />
             </java-attributes>
         </java-type>
 
@@ -5311,7 +5316,7 @@
                         <xml-property name="description" value="Concurrency value" />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Metadata for license group." />
@@ -5345,7 +5350,7 @@
             </xml-properties>
             <xml-root-element name="zones" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="zone" name="zone" type="inventory.aai.openecomp.org.v10.Zone" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="zone" name="zone" type="inventory.aai.onap.org.v10.Zone" />
             </java-attributes>
         </java-type>
 
@@ -5382,7 +5387,7 @@
                         <xml-property name="description" value="Concurrency value" />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="A zone is a grouping of assets in a location homing to the same connections into the CBB" />
@@ -5399,7 +5404,7 @@
             </xml-properties>
             <xml-root-element name="route-targets" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="routeTarget" name="route-target" type="inventory.aai.openecomp.org.v10.RouteTarget" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="routeTarget" name="route-target" type="inventory.aai.onap.org.v10.RouteTarget" />
             </java-attributes>
         </java-type>
         <java-type name="RouteTarget">
@@ -5420,7 +5425,7 @@
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Route target information" />
diff --git a/aai-schema/src/main/resources/oxm/aai_oxm_v11.xml b/aai-schema/src/main/resources/oxm/aai_oxm_v11.xml
index 640ceed1..61fe23ce 100644
--- a/aai-schema/src/main/resources/oxm/aai_oxm_v11.xml
+++ b/aai-schema/src/main/resources/oxm/aai_oxm_v11.xml
@@ -1,24 +1,27 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
-  ============LICENSE_START=======================================================
-  org.openecomp.aai
-  ================================================================================
-  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
-  
+
+    ============LICENSE_START=======================================================
+    org.onap.aai
+    ================================================================================
+    Copyright © 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=========================================================
-  -->
 
+    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=========================================================
+
+    ECOMP is a trademark and service mark of AT&T Intellectual Property.
+
+-->
 <xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.onap.org.v11" xml-mapping-metadata-complete="true">
 	<xml-schema element-form-default="QUALIFIED">
 		<xml-ns namespace-uri="http://org.openecomp.aai.inventory/v11" />
diff --git a/aai-schema/src/main/resources/oxm/aai_oxm_v8.xml b/aai-schema/src/main/resources/oxm/aai_oxm_v8.xml
index 6f644533..d666b738 100644
--- a/aai-schema/src/main/resources/oxm/aai_oxm_v8.xml
+++ b/aai-schema/src/main/resources/oxm/aai_oxm_v8.xml
@@ -1,23 +1,28 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
-  ============LICENSE_START=======================================================
-  org.openecomp.aai
-  ================================================================================
-  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=========================================================
-  -->
-
-<xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.openecomp.org.v8" xml-mapping-metadata-complete="true">
+
+    ============LICENSE_START=======================================================
+    org.onap.aai
+    ================================================================================
+    Copyright © 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=========================================================
+
+    ECOMP is a trademark and service mark of AT&T Intellectual Property.
+
+-->
+<xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.onap.org.v8" xml-mapping-metadata-complete="true">
 	<xml-schema element-form-default="QUALIFIED">
 		<xml-ns namespace-uri="http://org.openecomp.aai.inventory/v8" />
 	</xml-schema>
@@ -25,37 +30,37 @@
 		<java-type name="Inventory">
 			<xml-root-element name="inventory" />
 			<java-attributes>
-				<xml-element java-attribute="search" name="search" type="inventory.aai.openecomp.org.v8.Search" />
-				<xml-element java-attribute="actions" name="actions" type="inventory.aai.openecomp.org.v8.Actions" />
-				<xml-element java-attribute="cloudInfrastructure" name="cloud-infrastructure" type="inventory.aai.openecomp.org.v8.CloudInfrastructure" />
-				<xml-element java-attribute="business" name="business" type="inventory.aai.openecomp.org.v8.Business" />
-				<xml-element java-attribute="serviceDesignAndCreation" name="service-design-and-creation" type="inventory.aai.openecomp.org.v8.ServiceDesignAndCreation" />
-				<xml-element java-attribute="network" name="network" type="inventory.aai.openecomp.org.v8.Network" />
-				<xml-element java-attribute="aaiInternal" name="aai-internal" type="inventory.aai.openecomp.org.v8.AaiInternal" />
+				<xml-element java-attribute="search" name="search" type="inventory.aai.onap.org.v8.Search" />
+				<xml-element java-attribute="actions" name="actions" type="inventory.aai.onap.org.v8.Actions" />
+				<xml-element java-attribute="cloudInfrastructure" name="cloud-infrastructure" type="inventory.aai.onap.org.v8.CloudInfrastructure" />
+				<xml-element java-attribute="business" name="business" type="inventory.aai.onap.org.v8.Business" />
+				<xml-element java-attribute="serviceDesignAndCreation" name="service-design-and-creation" type="inventory.aai.onap.org.v8.ServiceDesignAndCreation" />
+				<xml-element java-attribute="network" name="network" type="inventory.aai.onap.org.v8.Network" />
+				<xml-element java-attribute="aaiInternal" name="aai-internal" type="inventory.aai.onap.org.v8.AaiInternal" />
 			</java-attributes>
 		</java-type>
 
 		<java-type name="Search">
 			<xml-root-element name="search" />
 			<java-attributes>
-				<xml-element java-attribute="edgeTagQueryResult" name="edge-tag-query-result" type="inventory.aai.openecomp.org.v8.EdgeTagQueryResult" />
-				<xml-element java-attribute="edgeTagQueryRequest" name="edge-tag-query-request" type="inventory.aai.openecomp.org.v8.EdgeTagQueryRequest" />
-				<xml-element java-attribute="searchResults" name="search-results" type="inventory.aai.openecomp.org.v8.SearchResults" />
-				<xml-element java-attribute="sdnZoneResponse" name="sdn-zone-response" type="inventory.aai.openecomp.org.v8.SdnZoneResponse" />
+				<xml-element java-attribute="edgeTagQueryResult" name="edge-tag-query-result" type="inventory.aai.onap.org.v8.EdgeTagQueryResult" />
+				<xml-element java-attribute="edgeTagQueryRequest" name="edge-tag-query-request" type="inventory.aai.onap.org.v8.EdgeTagQueryRequest" />
+				<xml-element java-attribute="searchResults" name="search-results" type="inventory.aai.onap.org.v8.SearchResults" />
+				<xml-element java-attribute="sdnZoneResponse" name="sdn-zone-response" type="inventory.aai.onap.org.v8.SdnZoneResponse" />
 			</java-attributes>
 		</java-type>
 
 		<java-type name="EdgeTagQueryResult">
 			<xml-root-element name="edge-tag-query-result" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="taggedInventoryItemList" name="tagged-inventory-item-list" type="inventory.aai.openecomp.org.v8.TaggedInventoryItemList" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="taggedInventoryItemList" name="tagged-inventory-item-list" type="inventory.aai.onap.org.v8.TaggedInventoryItemList" />
 			</java-attributes>
 		</java-type>
 
 		<java-type name="TaggedInventoryItemList">
 			<xml-root-element name="tagged-inventory-item-list" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="inventoryItem" name="inventory-item" type="inventory.aai.openecomp.org.v8.InventoryItem" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="inventoryItem" name="inventory-item" type="inventory.aai.onap.org.v8.InventoryItem" />
 			</java-attributes>
 		</java-type>
 
@@ -64,8 +69,8 @@
 			<java-attributes>
 				<xml-element java-attribute="inventoryItemType" name="inventory-item-type" type="java.lang.String" />
 				<xml-element java-attribute="inventoryItemLink" name="inventory-item-link" type="java.lang.String" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="inventoryItemData" name="inventory-item-data" type="inventory.aai.openecomp.org.v8.InventoryItemData" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="taggedInventoryItemList" name="tagged-inventory-item-list" type="inventory.aai.openecomp.org.v8.TaggedInventoryItemList" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="inventoryItemData" name="inventory-item-data" type="inventory.aai.onap.org.v8.InventoryItemData" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="taggedInventoryItemList" name="tagged-inventory-item-list" type="inventory.aai.onap.org.v8.TaggedInventoryItemList" />
 			</java-attributes>
 		</java-type>
 
@@ -83,9 +88,9 @@
 				<xml-element java-attribute="edgeTag" name="edge-tag" type="java.lang.String" />
 				<xml-element java-attribute="resultDetail" name="result-detail" type="java.lang.String" />
 				<xml-element java-attribute="startNodeType" name="start-node-type" type="java.lang.String" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="startNodeFilter" name="start-node-filter" type="inventory.aai.openecomp.org.v8.StartNodeFilter" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="includeNodeFilter" name="include-node-filter" type="inventory.aai.openecomp.org.v8.IncludeNodeFilter" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="secondaryFilter" name="secondary-filter" type="inventory.aai.openecomp.org.v8.SecondaryFilter" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="startNodeFilter" name="start-node-filter" type="inventory.aai.onap.org.v8.StartNodeFilter" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="includeNodeFilter" name="include-node-filter" type="inventory.aai.onap.org.v8.IncludeNodeFilter" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="secondaryFilter" name="secondary-filter" type="inventory.aai.onap.org.v8.SecondaryFilter" />
 			</java-attributes>
 		</java-type>
 
@@ -116,7 +121,7 @@
 		<java-type name="SearchResults">
 			<xml-root-element name="search-results" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="resultData" name="result-data" type="inventory.aai.openecomp.org.v8.ResultData" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="resultData" name="result-data" type="inventory.aai.onap.org.v8.ResultData" />
 			</java-attributes>
 		</java-type>
 
@@ -139,16 +144,16 @@
 		<java-type name="SdnZoneResponse">
 			<xml-root-element name="sdn-zone-response" />
 			<java-attributes>
-				<xml-element java-attribute="oamNetworks" name="oam-networks" type="inventory.aai.openecomp.org.v8.OamNetworks" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="azAndDvsSwitches" name="az-and-dvs-switches" type="inventory.aai.openecomp.org.v8.AzAndDvsSwitches" />
+				<xml-element java-attribute="oamNetworks" name="oam-networks" type="inventory.aai.onap.org.v8.OamNetworks" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="azAndDvsSwitches" name="az-and-dvs-switches" type="inventory.aai.onap.org.v8.AzAndDvsSwitches" />
 			</java-attributes>
 		</java-type>
 
 		<java-type name="AzAndDvsSwitches">
 			<xml-root-element name="az-and-dvs-switches" />
 			<java-attributes>
-				<xml-element java-attribute="dvsSwitches" name="dvs-switches" type="inventory.aai.openecomp.org.v8.DvsSwitches" />
-				<xml-element java-attribute="availabilityZone" name="availability-zone" type="inventory.aai.openecomp.org.v8.AvailabilityZone" />
+				<xml-element java-attribute="dvsSwitches" name="dvs-switches" type="inventory.aai.onap.org.v8.DvsSwitches" />
+				<xml-element java-attribute="availabilityZone" name="availability-zone" type="inventory.aai.onap.org.v8.AvailabilityZone" />
 			</java-attributes>
 		</java-type>
 
@@ -158,8 +163,8 @@
 			</xml-properties>
 			<xml-root-element name="actions" />
 			<java-attributes>
-				<xml-element java-attribute="update" name="update" type="inventory.aai.openecomp.org.v8.Update" />
-				<xml-element java-attribute="notify" name="notify" type="inventory.aai.openecomp.org.v8.Notify" />
+				<xml-element java-attribute="update" name="update" type="inventory.aai.onap.org.v8.Update" />
+				<xml-element java-attribute="notify" name="notify" type="inventory.aai.onap.org.v8.Notify" />
 			</java-attributes>
 		</java-type>
 
@@ -170,9 +175,9 @@
 			<xml-root-element name="update" />
 			<java-attributes>
 				<xml-element java-attribute="updateNodeType" name="update-node-type" required="true" type="java.lang.String" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="updateNodeKey" name="update-node-key" type="inventory.aai.openecomp.org.v8.UpdateNodeKey" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="updateNodeKey" name="update-node-key" type="inventory.aai.onap.org.v8.UpdateNodeKey" />
 				<xml-element java-attribute="updateNodeUri" name="update-node-uri" type="java.lang.String" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="action" name="action" type="inventory.aai.openecomp.org.v8.Action" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="action" name="action" type="inventory.aai.onap.org.v8.Action" />
 			</java-attributes>
 		</java-type>
 
@@ -180,7 +185,7 @@
 			<xml-root-element name="action" />
 			<java-attributes>
 				<xml-element java-attribute="actionType" name="action-type" type="java.lang.String" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="actionData" name="action-data" type="inventory.aai.openecomp.org.v8.ActionData" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="actionData" name="action-data" type="inventory.aai.onap.org.v8.ActionData" />
 			</java-attributes>
 		</java-type>
 
@@ -206,7 +211,7 @@
 				<xml-element java-attribute="eventId" name="event-id" required="true" type="java.lang.String" />
 				<xml-element java-attribute="nodeType" name="node-type" type="java.lang.String" />
 				<xml-element java-attribute="eventTrigger" name="event-trigger" type="java.lang.String" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="keyData" name="key-data" type="inventory.aai.openecomp.org.v8.KeyData" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="keyData" name="key-data" type="inventory.aai.onap.org.v8.KeyData" />
 				<xml-element java-attribute="selflink" name="selflink" type="java.lang.String" />
 			</java-attributes>
 		</java-type>
@@ -225,18 +230,18 @@
 			</xml-properties>
 			<xml-root-element name="cloud-infrastructure" />
 			<java-attributes>
-				<xml-element java-attribute="complexes" name="complexes" type="inventory.aai.openecomp.org.v8.Complexes" />
-				<xml-element java-attribute="cloudRegions" name="cloud-regions" type="inventory.aai.openecomp.org.v8.CloudRegions" />
-				<xml-element java-attribute="networkProfiles" name="network-profiles" type="inventory.aai.openecomp.org.v8.NetworkProfiles" />
-				<xml-element java-attribute="pservers" name="pservers" type="inventory.aai.openecomp.org.v8.Pservers" />
-				<xml-element java-attribute="virtualDataCenters" name="virtual-data-centers" type="inventory.aai.openecomp.org.v8.VirtualDataCenters" />
+				<xml-element java-attribute="complexes" name="complexes" type="inventory.aai.onap.org.v8.Complexes" />
+				<xml-element java-attribute="cloudRegions" name="cloud-regions" type="inventory.aai.onap.org.v8.CloudRegions" />
+				<xml-element java-attribute="networkProfiles" name="network-profiles" type="inventory.aai.onap.org.v8.NetworkProfiles" />
+				<xml-element java-attribute="pservers" name="pservers" type="inventory.aai.onap.org.v8.Pservers" />
+				<xml-element java-attribute="virtualDataCenters" name="virtual-data-centers" type="inventory.aai.onap.org.v8.VirtualDataCenters" />
 			</java-attributes>
 		</java-type>
 
 		<java-type name="CloudRegions">
 			<xml-root-element name="cloud-regions" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="cloudRegion" name="cloud-region" type="inventory.aai.openecomp.org.v8.CloudRegion" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="cloudRegion" name="cloud-region" type="inventory.aai.onap.org.v8.CloudRegion" />
 			</java-attributes>
 		</java-type>
 
@@ -288,16 +293,16 @@
 						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="volumeGroups" name="volume-groups" type="inventory.aai.openecomp.org.v8.VolumeGroups" />
-				<xml-element java-attribute="tenants" name="tenants" type="inventory.aai.openecomp.org.v8.Tenants" />
-				<xml-element java-attribute="flavors" name="flavors" type="inventory.aai.openecomp.org.v8.Flavors" />
-				<xml-element java-attribute="groupAssignments" name="group-assignments" type="inventory.aai.openecomp.org.v8.GroupAssignments" />
-				<xml-element java-attribute="snapshots" name="snapshots" type="inventory.aai.openecomp.org.v8.Snapshots" />
-				<xml-element java-attribute="images" name="images" type="inventory.aai.openecomp.org.v8.Images" />
-				<xml-element java-attribute="dvsSwitches" name="dvs-switches" type="inventory.aai.openecomp.org.v8.DvsSwitches" />
-				<xml-element java-attribute="oamNetworks" name="oam-networks" type="inventory.aai.openecomp.org.v8.OamNetworks" />
-				<xml-element java-attribute="availabilityZones" name="availability-zones" type="inventory.aai.openecomp.org.v8.AvailabilityZones" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="volumeGroups" name="volume-groups" type="inventory.aai.onap.org.v8.VolumeGroups" />
+				<xml-element java-attribute="tenants" name="tenants" type="inventory.aai.onap.org.v8.Tenants" />
+				<xml-element java-attribute="flavors" name="flavors" type="inventory.aai.onap.org.v8.Flavors" />
+				<xml-element java-attribute="groupAssignments" name="group-assignments" type="inventory.aai.onap.org.v8.GroupAssignments" />
+				<xml-element java-attribute="snapshots" name="snapshots" type="inventory.aai.onap.org.v8.Snapshots" />
+				<xml-element java-attribute="images" name="images" type="inventory.aai.onap.org.v8.Images" />
+				<xml-element java-attribute="dvsSwitches" name="dvs-switches" type="inventory.aai.onap.org.v8.DvsSwitches" />
+				<xml-element java-attribute="oamNetworks" name="oam-networks" type="inventory.aai.onap.org.v8.OamNetworks" />
+				<xml-element java-attribute="availabilityZones" name="availability-zones" type="inventory.aai.onap.org.v8.AvailabilityZones" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="cloud-region designates an installation of a cloud cluster or region or instantiation." />
@@ -313,7 +318,7 @@
 			</xml-properties>
 			<xml-root-element name="volume-groups" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="volumeGroup" name="volume-group" type="inventory.aai.openecomp.org.v8.VolumeGroup" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="volumeGroup" name="volume-group" type="inventory.aai.onap.org.v8.VolumeGroup" />
 			</java-attributes>
 		</java-type>
 
@@ -350,7 +355,7 @@
 						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Persistent block-level storage." />
@@ -363,7 +368,7 @@
 		<java-type name="RelationshipList">
 			<xml-root-element name="relationship-list" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="relationship" name="relationship" type="inventory.aai.openecomp.org.v8.Relationship" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="relationship" name="relationship" type="inventory.aai.onap.org.v8.Relationship" />
 			</java-attributes>
 		</java-type>
 
@@ -380,8 +385,8 @@
 						<xml-property name="description" value="URL to the object in A&amp;AI." />
 					</xml-properties>
 				</xml-element>
-				<xml-element container-type="java.util.ArrayList" java-attribute="relationshipData" name="relationship-data" type="inventory.aai.openecomp.org.v8.RelationshipData" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="relatedToProperty" name="related-to-property" type="inventory.aai.openecomp.org.v8.RelatedToProperty" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="relationshipData" name="relationship-data" type="inventory.aai.onap.org.v8.RelationshipData" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="relatedToProperty" name="related-to-property" type="inventory.aai.onap.org.v8.RelatedToProperty" />
 			</java-attributes>
 		</java-type>
 
@@ -423,7 +428,7 @@
 			</xml-properties>
 			<xml-root-element name="complexes" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="complex" name="complex" type="inventory.aai.openecomp.org.v8.Complex" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="complex" name="complex" type="inventory.aai.onap.org.v8.Complex" />
 			</java-attributes>
 		</java-type>
 
@@ -471,8 +476,8 @@
 				<xml-element java-attribute="longitude" name="longitude" type="java.lang.String" />
 				<xml-element java-attribute="elevation" name="elevation" type="java.lang.String" />
 				<xml-element java-attribute="lata" name="lata" type="java.lang.String" />
-				<xml-element java-attribute="ctagPools" name="ctag-pools" type="inventory.aai.openecomp.org.v8.CtagPools" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="ctagPools" name="ctag-pools" type="inventory.aai.onap.org.v8.CtagPools" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Collection of physical locations that can house cloud-regions." />
@@ -487,7 +492,7 @@
 		<java-type name="CtagPools">
 			<xml-root-element name="ctag-pools" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="ctagPool" name="ctag-pool" type="inventory.aai.openecomp.org.v8.CtagPool" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="ctagPool" name="ctag-pool" type="inventory.aai.onap.org.v8.CtagPool" />
 			</java-attributes>
 		</java-type>
 
@@ -519,7 +524,7 @@
 						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="A collection of C tags (vlan tags) grouped for a specific purpose." />
@@ -535,7 +540,7 @@
 			</xml-properties>
 			<xml-root-element name="tenants" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="tenant" name="tenant" type="inventory.aai.openecomp.org.v8.Tenant" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="tenant" name="tenant" type="inventory.aai.onap.org.v8.Tenant" />
 			</java-attributes>
 		</java-type>
 
@@ -557,8 +562,8 @@
 						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="vservers" name="vservers" type="inventory.aai.openecomp.org.v8.Vservers" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="vservers" name="vservers" type="inventory.aai.onap.org.v8.Vservers" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Openstack tenant" />
@@ -575,7 +580,7 @@
 			</xml-properties>
 			<xml-root-element name="vservers" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="vserver" name="vserver" type="inventory.aai.openecomp.org.v8.Vserver" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="vserver" name="vserver" type="inventory.aai.onap.org.v8.Vserver" />
 			</java-attributes>
 		</java-type>
 
@@ -624,9 +629,9 @@
 						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="volumes" name="volumes" type="inventory.aai.openecomp.org.v8.Volumes" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
-				<xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.openecomp.org.v8.LInterfaces" />
+				<xml-element java-attribute="volumes" name="volumes" type="inventory.aai.onap.org.v8.Volumes" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
+				<xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v8.LInterfaces" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Virtual Servers, aka virtual machine or VM." />
@@ -644,7 +649,7 @@
 			</xml-properties>
 			<xml-root-element name="l-interfaces" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="lInterface" name="l-interface" type="inventory.aai.openecomp.org.v8.LInterface" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="lInterface" name="l-interface" type="inventory.aai.onap.org.v8.LInterface" />
 			</java-attributes>
 		</java-type>
 
@@ -696,11 +701,11 @@
 						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="vlans" name="vlans" type="inventory.aai.openecomp.org.v8.Vlans" />
-				<xml-element java-attribute="sriovVfs" name="sriov-vfs" type="inventory.aai.openecomp.org.v8.SriovVfs" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.openecomp.org.v8.L3InterfaceIpv4AddressList" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.openecomp.org.v8.L3InterfaceIpv6AddressList" />
+				<xml-element java-attribute="vlans" name="vlans" type="inventory.aai.onap.org.v8.Vlans" />
+				<xml-element java-attribute="sriovVfs" name="sriov-vfs" type="inventory.aai.onap.org.v8.SriovVfs" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v8.L3InterfaceIpv4AddressList" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v8.L3InterfaceIpv6AddressList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Logical interfaces, e.g., a vnic." />
@@ -716,7 +721,7 @@
 			</xml-properties>
 			<xml-root-element name="sriov-vfs" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="sriovVf" name="sriov-vf" type="inventory.aai.openecomp.org.v8.SriovVf" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="sriovVf" name="sriov-vf" type="inventory.aai.onap.org.v8.SriovVf" />
 			</java-attributes>
 		</java-type>
 		<java-type name="SriovVf">
@@ -792,7 +797,7 @@
 						<xml-property name="description" value="Neutron network id of the interface" />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="SR-IOV Virtual Function (not to be confused with virtual network function)" />
@@ -845,7 +850,7 @@
 						<xml-property name="description" value="Neutron id of subnet that address belongs to" />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="IPv4 Address Range" />
@@ -857,7 +862,7 @@
 		<java-type name="Vlans">
 			<xml-root-element name="vlans" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="vlan" name="vlan" type="inventory.aai.openecomp.org.v8.Vlan" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="vlan" name="vlan" type="inventory.aai.onap.org.v8.Vlan" />
 			</java-attributes>
 		</java-type>
 
@@ -910,9 +915,9 @@
 						<xml-property name="dbAlias" value="vpn-id-local" />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.openecomp.org.v8.L3InterfaceIpv4AddressList" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.openecomp.org.v8.L3InterfaceIpv6AddressList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v8.L3InterfaceIpv4AddressList" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v8.L3InterfaceIpv6AddressList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Definition of vlan" />
@@ -966,7 +971,7 @@
 						<xml-property name="description" value="Neutron id of subnet that address belongs to" />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="IPv6 Address Range" />
@@ -981,7 +986,7 @@
 			</xml-properties>
 			<xml-root-element name="volumes" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="volume" name="volume" type="inventory.aai.openecomp.org.v8.Volume" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="volume" name="volume" type="inventory.aai.onap.org.v8.Volume" />
 			</java-attributes>
 		</java-type>
 
@@ -1003,7 +1008,7 @@
 						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Ephemeral Block storage volume." />
@@ -1019,7 +1024,7 @@
 			</xml-properties>
 			<xml-root-element name="flavors" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="flavor" name="flavor" type="inventory.aai.openecomp.org.v8.Flavor" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="flavor" name="flavor" type="inventory.aai.onap.org.v8.Flavor" />
 			</java-attributes>
 		</java-type>
 
@@ -1081,7 +1086,7 @@
 						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Openstack flavor." />
@@ -1098,7 +1103,7 @@
 			</xml-properties>
 			<xml-root-element name="snapshots" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="snapshot" name="snapshot" type="inventory.aai.openecomp.org.v8.Snapshot" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="snapshot" name="snapshot" type="inventory.aai.onap.org.v8.Snapshot" />
 			</java-attributes>
 		</java-type>
 
@@ -1160,7 +1165,7 @@
 						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Openstack snapshot" />
@@ -1178,7 +1183,7 @@
 			</xml-properties>
 			<xml-root-element name="group-assignments" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="groupAssignment" name="group-assignment" type="inventory.aai.openecomp.org.v8.GroupAssignment" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="groupAssignment" name="group-assignment" type="inventory.aai.onap.org.v8.GroupAssignment" />
 			</java-attributes>
 		</java-type>
 
@@ -1210,7 +1215,7 @@
 						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Openstack group-assignment used to store exclusivity groups (EG)." />
@@ -1227,7 +1232,7 @@
 			</xml-properties>
 			<xml-root-element name="images" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="image" name="image" type="inventory.aai.openecomp.org.v8.Image" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="image" name="image" type="inventory.aai.onap.org.v8.Image" />
 			</java-attributes>
 		</java-type>
 
@@ -1284,8 +1289,8 @@
 						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
-				<xml-element java-attribute="metadata" name="metadata" type="inventory.aai.openecomp.org.v8.Metadata" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
+				<xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v8.Metadata" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Openstack image." />
@@ -1302,7 +1307,7 @@
 			</xml-properties>
 			<xml-root-element name="metadata" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="metadatum" name="metadatum" type="inventory.aai.openecomp.org.v8.Metadatum" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="metadatum" name="metadatum" type="inventory.aai.onap.org.v8.Metadatum" />
 			</java-attributes>
 		</java-type>
 
@@ -1331,7 +1336,7 @@
 			</xml-properties>
 			<xml-root-element name="dvs-switches" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="dvsSwitch" name="dvs-switch" type="inventory.aai.openecomp.org.v8.DvsSwitch" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="dvsSwitch" name="dvs-switch" type="inventory.aai.onap.org.v8.DvsSwitch" />
 			</java-attributes>
 		</java-type>
 
@@ -1353,7 +1358,7 @@
 						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Digital virtual switch metadata, used by SDN-C to configure VCEs.  A&amp;AI needs to receive this data from the PO deployment team and administer it using the provisioningTool.sh into A&amp;AI. " />
@@ -1369,7 +1374,7 @@
 			</xml-properties>
 			<xml-root-element name="network-profiles" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="networkProfile" name="network-profile" type="inventory.aai.openecomp.org.v8.NetworkProfile" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="networkProfile" name="network-profile" type="inventory.aai.onap.org.v8.NetworkProfile" />
 			</java-attributes>
 		</java-type>
 
@@ -1391,7 +1396,7 @@
 						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Network profile populated by SDN-GP for SNMP" />
@@ -1407,7 +1412,7 @@
 			</xml-properties>
 			<xml-root-element name="pservers" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="pserver" name="pserver" type="inventory.aai.openecomp.org.v8.Pserver" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="pserver" name="pserver" type="inventory.aai.onap.org.v8.Pserver" />
 			</java-attributes>
 		</java-type>
 
@@ -1505,9 +1510,9 @@
 						<xml-property name="description" value="purpose of pserver" />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
-				<xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.openecomp.org.v8.PInterfaces" />
-				<xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.openecomp.org.v8.LagInterfaces" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
+				<xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v8.PInterfaces" />
+				<xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v8.LagInterfaces" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Compute host whose hostname must be unique and must exactly match what is sent as a relationship to a vserver." />
@@ -1525,7 +1530,7 @@
 			</xml-properties>
 			<xml-root-element name="p-interfaces" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="pInterface" name="p-interface" type="inventory.aai.openecomp.org.v8.PInterface" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="pInterface" name="p-interface" type="inventory.aai.onap.org.v8.PInterface" />
 			</java-attributes>
 		</java-type>
 
@@ -1572,8 +1577,8 @@
 						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
-				<xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.openecomp.org.v8.LInterfaces" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
+				<xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v8.LInterfaces" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Physical interface (e.g., nic)" />
@@ -1589,7 +1594,7 @@
 			</xml-properties>
 			<xml-root-element name="lag-interfaces" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="lagInterface" name="lag-interface" type="inventory.aai.openecomp.org.v8.LagInterface" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="lagInterface" name="lag-interface" type="inventory.aai.onap.org.v8.LagInterface" />
 			</java-attributes>
 		</java-type>
 
@@ -1616,8 +1621,8 @@
 						<xml-property name="description" value="Captures the units corresponding to the speed" />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
-				<xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.openecomp.org.v8.LInterfaces" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
+				<xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v8.LInterfaces" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Link aggregate interface" />
@@ -1633,7 +1638,7 @@
 			</xml-properties>
 			<xml-root-element name="oam-networks" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="oamNetwork" name="oam-network" type="inventory.aai.openecomp.org.v8.OamNetwork" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="oamNetwork" name="oam-network" type="inventory.aai.onap.org.v8.OamNetwork" />
 			</java-attributes>
 		</java-type>
 
@@ -1670,7 +1675,7 @@
 						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="OAM network, to be deprecated shortly.  Do not use for new purposes. " />
@@ -1687,7 +1692,7 @@
 			</xml-properties>
 			<xml-root-element name="availability-zones" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="availabilityZone" name="availability-zone" type="inventory.aai.openecomp.org.v8.AvailabilityZone" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="availabilityZone" name="availability-zone" type="inventory.aai.onap.org.v8.AvailabilityZone" />
 			</java-attributes>
 		</java-type>
 
@@ -1715,7 +1720,7 @@
 						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Availability zone, a collection of compute hosts/pservers" />
@@ -1731,7 +1736,7 @@
 			</xml-properties>
 			<xml-root-element name="virtual-data-centers" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="virtualDataCenter" name="virtual-data-center" type="inventory.aai.openecomp.org.v8.VirtualDataCenter" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="virtualDataCenter" name="virtual-data-center" type="inventory.aai.onap.org.v8.VirtualDataCenter" />
 			</java-attributes>
 		</java-type>
 
@@ -1753,7 +1758,7 @@
 						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Virtual organization of cloud infrastructure elements in a data center context" />
@@ -1773,8 +1778,8 @@
 			</xml-properties>
 			<xml-root-element name="business" />
 			<java-attributes>
-				<xml-element java-attribute="connectors" name="connectors" type="inventory.aai.openecomp.org.v8.Connectors" />
-				<xml-element java-attribute="customers" name="customers" type="inventory.aai.openecomp.org.v8.Customers" />
+				<xml-element java-attribute="connectors" name="connectors" type="inventory.aai.onap.org.v8.Connectors" />
+				<xml-element java-attribute="customers" name="customers" type="inventory.aai.onap.org.v8.Customers" />
 			</java-attributes>
 		</java-type>
 
@@ -1784,7 +1789,7 @@
 			</xml-properties>
 			<xml-root-element name="connectors" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="connector" name="connector" type="inventory.aai.openecomp.org.v8.Connector" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="connector" name="connector" type="inventory.aai.onap.org.v8.Connector" />
 			</java-attributes>
 		</java-type>
 
@@ -1834,8 +1839,8 @@
 						<xml-property name="description" value="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget." />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
-				<xml-element java-attribute="metadata" name="metadata" type="inventory.aai.openecomp.org.v8.Metadata" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
+				<xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v8.Metadata" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Collection of resource instances used to connect a variety of disparate inventory widgets" />
@@ -1851,7 +1856,7 @@
 			</xml-properties>
 			<xml-root-element name="customers" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="customer" name="customer" type="inventory.aai.openecomp.org.v8.Customer" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="customer" name="customer" type="inventory.aai.onap.org.v8.Customer" />
 			</java-attributes>
 		</java-type>
 
@@ -1879,8 +1884,8 @@
 						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="serviceSubscriptions" name="service-subscriptions" type="inventory.aai.openecomp.org.v8.ServiceSubscriptions" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="serviceSubscriptions" name="service-subscriptions" type="inventory.aai.onap.org.v8.ServiceSubscriptions" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="customer identifiers to provide linkage back to BSS information." />
@@ -1899,7 +1904,7 @@
 			</xml-properties>
 			<xml-root-element name="service-subscriptions" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="serviceSubscription" name="service-subscription" type="inventory.aai.openecomp.org.v8.ServiceSubscription" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="serviceSubscription" name="service-subscription" type="inventory.aai.onap.org.v8.ServiceSubscription" />
 			</java-attributes>
 		</java-type>
 
@@ -1921,9 +1926,9 @@
 						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="serviceInstances" name="service-instances" type="inventory.aai.openecomp.org.v8.ServiceInstances">
+				<xml-element java-attribute="serviceInstances" name="service-instances" type="inventory.aai.onap.org.v8.ServiceInstances">
 				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Object that group service instances." />
@@ -1939,7 +1944,7 @@
 			</xml-properties>
 			<xml-root-element name="service-instances" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="serviceInstance" name="service-instance" type="inventory.aai.openecomp.org.v8.ServiceInstance" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="serviceInstance" name="service-instance" type="inventory.aai.onap.org.v8.ServiceInstance" />
 			</java-attributes>
 		</java-type>
 
@@ -2029,8 +2034,8 @@
 						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
-				<xml-element java-attribute="metadata" name="metadata" type="inventory.aai.openecomp.org.v8.Metadata" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
+				<xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v8.Metadata" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Instance of a service" />
@@ -2049,11 +2054,11 @@
 			</xml-properties>
 			<xml-root-element name="service-design-and-creation" />
 			<java-attributes>
-				<xml-element java-attribute="vnfImages" name="vnf-images" type="inventory.aai.openecomp.org.v8.VnfImages" />
-				<xml-element java-attribute="services" name="services" type="inventory.aai.openecomp.org.v8.Services" />
-				<xml-element java-attribute="serviceCapabilities" name="service-capabilities" type="inventory.aai.openecomp.org.v8.ServiceCapabilities" />
-				<xml-element java-attribute="models" name="models" type="inventory.aai.openecomp.org.v8.Models" />
-				<xml-element java-attribute="namedQueries" name="named-queries" type="inventory.aai.openecomp.org.v8.NamedQueries" />
+				<xml-element java-attribute="vnfImages" name="vnf-images" type="inventory.aai.onap.org.v8.VnfImages" />
+				<xml-element java-attribute="services" name="services" type="inventory.aai.onap.org.v8.Services" />
+				<xml-element java-attribute="serviceCapabilities" name="service-capabilities" type="inventory.aai.onap.org.v8.ServiceCapabilities" />
+				<xml-element java-attribute="models" name="models" type="inventory.aai.onap.org.v8.Models" />
+				<xml-element java-attribute="namedQueries" name="named-queries" type="inventory.aai.onap.org.v8.NamedQueries" />
 			</java-attributes>
 		</java-type>
 
@@ -2063,7 +2068,7 @@
 			</xml-properties>
 			<xml-root-element name="vnf-images" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="vnfImage" name="vnf-image" type="inventory.aai.openecomp.org.v8.VnfImage" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="vnfImage" name="vnf-image" type="inventory.aai.onap.org.v8.VnfImage" />
 			</java-attributes>
 		</java-type>
 
@@ -2101,7 +2106,7 @@
 						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Image object that pertain to a VNF that doesn't have associated vservers.  This is a kludge." />
@@ -2118,7 +2123,7 @@
 			</xml-properties>
 			<xml-root-element name="services" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="service" name="service" type="inventory.aai.openecomp.org.v8.Service" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="service" name="service" type="inventory.aai.onap.org.v8.Service" />
 			</java-attributes>
 		</java-type>
 
@@ -2150,7 +2155,7 @@
 						<xml-property name="description" value="service version" />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Stand-in for service model definitions.  Likely to be deprecated in favor of models from ASDC." />
@@ -2166,7 +2171,7 @@
 			</xml-properties>
 			<xml-root-element name="service-capabilities" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="serviceCapability" name="service-capability" type="inventory.aai.openecomp.org.v8.ServiceCapability" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="serviceCapability" name="service-capability" type="inventory.aai.onap.org.v8.ServiceCapability" />
 			</java-attributes>
 		</java-type>
 
@@ -2188,7 +2193,7 @@
 						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Early definition of server/resource pairings, likely to be replaced by models.  No new use should be made of this." />
@@ -2204,22 +2209,22 @@
 			</xml-properties>
 			<xml-root-element name="network" />
 			<java-attributes>
-				<xml-element java-attribute="logicalLinks" name="logical-links" type="inventory.aai.openecomp.org.v8.LogicalLinks" />
-				<xml-element java-attribute="sitePairSets" name="site-pair-sets" type="inventory.aai.openecomp.org.v8.SitePairSets" />
-				<xml-element java-attribute="vpnBindings" name="vpn-bindings" type="inventory.aai.openecomp.org.v8.VpnBindings" />
-				<xml-element java-attribute="vplsPes" name="vpls-pes" type="inventory.aai.openecomp.org.v8.VplsPes" />
-				<xml-element java-attribute="multicastConfigurations" name="multicast-configurations" type="inventory.aai.openecomp.org.v8.MulticastConfigurations" />
-				<xml-element java-attribute="vces" name="vces" type="inventory.aai.openecomp.org.v8.Vces" />
-				<xml-element java-attribute="vnfcs" name="vnfcs" type="inventory.aai.openecomp.org.v8.Vnfcs" />
-				<xml-element java-attribute="l3Networks" name="l3-networks" type="inventory.aai.openecomp.org.v8.L3Networks" />
-				<xml-element java-attribute="networkPolicies" name="network-policies" type="inventory.aai.openecomp.org.v8.NetworkPolicies" />
-				<xml-element java-attribute="genericVnfs" name="generic-vnfs" type="inventory.aai.openecomp.org.v8.GenericVnfs" />
-				<xml-element java-attribute="lagLinks" name="lag-links" type="inventory.aai.openecomp.org.v8.LagLinks" />
-				<xml-element java-attribute="newvces" name="newvces" type="inventory.aai.openecomp.org.v8.Newvces" />
-				<xml-element java-attribute="pnfs" name="pnfs" type="inventory.aai.openecomp.org.v8.Pnfs" />
-				<xml-element java-attribute="physicalLinks" name="physical-links" type="inventory.aai.openecomp.org.v8.PhysicalLinks" />
-				<xml-element java-attribute="ipsecConfigurations" name="ipsec-configurations" type="inventory.aai.openecomp.org.v8.IpsecConfigurations" />
-				<xml-element java-attribute="routeTableReferences" name="route-table-references" type="inventory.aai.openecomp.org.v8.RouteTableReferences" />
+				<xml-element java-attribute="logicalLinks" name="logical-links" type="inventory.aai.onap.org.v8.LogicalLinks" />
+				<xml-element java-attribute="sitePairSets" name="site-pair-sets" type="inventory.aai.onap.org.v8.SitePairSets" />
+				<xml-element java-attribute="vpnBindings" name="vpn-bindings" type="inventory.aai.onap.org.v8.VpnBindings" />
+				<xml-element java-attribute="vplsPes" name="vpls-pes" type="inventory.aai.onap.org.v8.VplsPes" />
+				<xml-element java-attribute="multicastConfigurations" name="multicast-configurations" type="inventory.aai.onap.org.v8.MulticastConfigurations" />
+				<xml-element java-attribute="vces" name="vces" type="inventory.aai.onap.org.v8.Vces" />
+				<xml-element java-attribute="vnfcs" name="vnfcs" type="inventory.aai.onap.org.v8.Vnfcs" />
+				<xml-element java-attribute="l3Networks" name="l3-networks" type="inventory.aai.onap.org.v8.L3Networks" />
+				<xml-element java-attribute="networkPolicies" name="network-policies" type="inventory.aai.onap.org.v8.NetworkPolicies" />
+				<xml-element java-attribute="genericVnfs" name="generic-vnfs" type="inventory.aai.onap.org.v8.GenericVnfs" />
+				<xml-element java-attribute="lagLinks" name="lag-links" type="inventory.aai.onap.org.v8.LagLinks" />
+				<xml-element java-attribute="newvces" name="newvces" type="inventory.aai.onap.org.v8.Newvces" />
+				<xml-element java-attribute="pnfs" name="pnfs" type="inventory.aai.onap.org.v8.Pnfs" />
+				<xml-element java-attribute="physicalLinks" name="physical-links" type="inventory.aai.onap.org.v8.PhysicalLinks" />
+				<xml-element java-attribute="ipsecConfigurations" name="ipsec-configurations" type="inventory.aai.onap.org.v8.IpsecConfigurations" />
+				<xml-element java-attribute="routeTableReferences" name="route-table-references" type="inventory.aai.onap.org.v8.RouteTableReferences" />
 			</java-attributes>
 		</java-type>
 
@@ -2229,7 +2234,7 @@
 			</xml-properties>
 			<xml-root-element name="logical-links" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="logicalLink" name="logical-link" type="inventory.aai.openecomp.org.v8.LogicalLink" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="logicalLink" name="logical-link" type="inventory.aai.onap.org.v8.LogicalLink" />
 			</java-attributes>
 		</java-type>
 
@@ -2324,7 +2329,7 @@
 						<xml-property name="description" value="UUID of the logical-link, SDNC generates this." />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Logical links generally connect l-interfaces but are used to express logical connectivity between two points" />
@@ -2341,7 +2346,7 @@
 			</xml-properties>
 			<xml-root-element name="site-pair-sets" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="sitePairSet" name="site-pair-set" type="inventory.aai.openecomp.org.v8.SitePairSet" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="sitePairSet" name="site-pair-set" type="inventory.aai.onap.org.v8.SitePairSet" />
 			</java-attributes>
 		</java-type>
 
@@ -2358,8 +2363,8 @@
 						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="routingInstances" name="routing-instances" type="inventory.aai.openecomp.org.v8.RoutingInstances" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="routingInstances" name="routing-instances" type="inventory.aai.onap.org.v8.RoutingInstances" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Set of instances for probes used to measure service level agreements" />
@@ -2376,7 +2381,7 @@
 			</xml-properties>
 			<xml-root-element name="routing-instances" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="routingInstance" name="routing-instance" type="inventory.aai.openecomp.org.v8.RoutingInstance" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="routingInstance" name="routing-instance" type="inventory.aai.onap.org.v8.RoutingInstance" />
 			</java-attributes>
 		</java-type>
 
@@ -2398,8 +2403,8 @@
 						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="sitePairs" name="site-pairs" type="inventory.aai.openecomp.org.v8.SitePairs" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="sitePairs" name="site-pairs" type="inventory.aai.onap.org.v8.SitePairs" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="indexedProps" value="routing-instance-id" />
@@ -2415,7 +2420,7 @@
 			</xml-properties>
 			<xml-root-element name="site-pairs" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="sitePair" name="site-pair" type="inventory.aai.openecomp.org.v8.SitePair" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="sitePair" name="site-pair" type="inventory.aai.onap.org.v8.SitePair" />
 			</java-attributes>
 		</java-type>
 
@@ -2457,8 +2462,8 @@
 						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="classesOfService" name="classes-of-service" type="inventory.aai.openecomp.org.v8.ClassesOfService" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="classesOfService" name="classes-of-service" type="inventory.aai.onap.org.v8.ClassesOfService" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="indexedProps" value="site-pair-id" />
@@ -2474,7 +2479,7 @@
 			</xml-properties>
 			<xml-root-element name="classes-of-service" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="classOfService" name="class-of-service" type="inventory.aai.openecomp.org.v8.ClassOfService" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="classOfService" name="class-of-service" type="inventory.aai.onap.org.v8.ClassOfService" />
 			</java-attributes>
 		</java-type>
 
@@ -2501,7 +2506,7 @@
 						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="indexedProps" value="cos" />
@@ -2513,7 +2518,7 @@
 		<java-type name="VpnBindings">
 			<xml-root-element name="vpn-bindings" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="vpnBinding" name="vpn-binding" type="inventory.aai.openecomp.org.v8.VpnBinding" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="vpnBinding" name="vpn-binding" type="inventory.aai.onap.org.v8.VpnBinding" />
 			</java-attributes>
 		</java-type>
 
@@ -2545,7 +2550,7 @@
 						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList">
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList">
 					<xml-properties>
 						<xml-property name="description" value="l3-networks relate to vpn-bindings" />
 					</xml-properties>
@@ -2567,7 +2572,7 @@
 			</xml-properties>
 			<xml-root-element name="vpls-pes" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="vplsPe" name="vpls-pe" type="inventory.aai.openecomp.org.v8.VplsPe" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="vplsPe" name="vpls-pe" type="inventory.aai.onap.org.v8.VplsPe" />
 			</java-attributes>
 		</java-type>
 
@@ -2600,9 +2605,9 @@
 						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
-				<xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.openecomp.org.v8.PInterfaces" />
-				<xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.openecomp.org.v8.LagInterfaces" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
+				<xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v8.PInterfaces" />
+				<xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v8.LagInterfaces" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="VPLS Provider Edge routers." />
@@ -2618,7 +2623,7 @@
 			</xml-properties>
 			<xml-root-element name="multicast-configurations" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="multicastConfiguration" name="multicast-configuration" type="inventory.aai.openecomp.org.v8.MulticastConfiguration" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="multicastConfiguration" name="multicast-configuration" type="inventory.aai.onap.org.v8.MulticastConfiguration" />
 			</java-attributes>
 		</java-type>
 
@@ -2645,7 +2650,7 @@
 						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="indexedProps" value="multicast-configuration-id" />
@@ -2661,7 +2666,7 @@
 			</xml-properties>
 			<xml-root-element name="vces" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="vce" name="vce" type="inventory.aai.openecomp.org.v8.Vce" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="vce" name="vce" type="inventory.aai.onap.org.v8.Vce" />
 			</java-attributes>
 		</java-type>
 
@@ -2764,8 +2769,8 @@
 						<xml-property name="description" value="Entitlement resource uuid" />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="portGroups" name="port-groups" type="inventory.aai.openecomp.org.v8.PortGroups" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="portGroups" name="port-groups" type="inventory.aai.onap.org.v8.PortGroups" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Virtual Customer Edge Router, used specifically for Gamma.  This object is deprecated." />
@@ -2782,7 +2787,7 @@
 		<java-type name="PortGroups">
 			<xml-root-element name="port-groups" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="portGroup" name="port-group" type="inventory.aai.openecomp.org.v8.PortGroup" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="portGroup" name="port-group" type="inventory.aai.onap.org.v8.PortGroup" />
 			</java-attributes>
 		</java-type>
 
@@ -2844,8 +2849,8 @@
 						<xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE" />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="cvlanTags" name="cvlan-tags" type="inventory.aai.openecomp.org.v8.CvlanTags" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="cvlanTags" name="cvlan-tags" type="inventory.aai.onap.org.v8.CvlanTags" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Used to capture the network interfaces of this VCE" />
@@ -2859,7 +2864,7 @@
 		<java-type name="CvlanTags">
 			<xml-root-element name="cvlan-tags" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="cvlanTagEntry" name="cvlan-tag-entry" type="inventory.aai.openecomp.org.v8.CvlanTagEntry" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="cvlanTagEntry" name="cvlan-tag-entry" type="inventory.aai.onap.org.v8.CvlanTagEntry" />
 			</java-attributes>
 		</java-type>
 
@@ -2876,7 +2881,7 @@
 						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="dependentOn" value="port-group" />
@@ -2893,7 +2898,7 @@
 			</xml-properties>
 			<xml-root-element name="vnfcs" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="vnfc" name="vnfc" type="inventory.aai.openecomp.org.v8.Vnfc" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="vnfc" name="vnfc" type="inventory.aai.onap.org.v8.Vnfc" />
 			</java-attributes>
 		</java-type>
 
@@ -2952,7 +2957,7 @@
 						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="indexedProps" value="vnfc-name,prov-status,vnfc-type,vnfc-function-code,ipaddress-v4-oam-vip,in-maint,is-closed-loop-disabled,group-notation" />
@@ -2964,7 +2969,7 @@
 		<java-type name="L3Networks">
 			<xml-root-element name="l3-networks" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="l3Network" name="l3-network" type="inventory.aai.openecomp.org.v8.L3Network" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="l3Network" name="l3-network" type="inventory.aai.onap.org.v8.L3Network" />
 			</java-attributes>
 		</java-type>
 
@@ -3098,10 +3103,10 @@
 						<xml-property name="description" value="boolean indicatating whether or not network is an external network." />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="subnets" name="subnets" type="inventory.aai.openecomp.org.v8.Subnets" />
-				<xml-element java-attribute="ctagAssignments" name="ctag-assignments" type="inventory.aai.openecomp.org.v8.CtagAssignments" />
-				<xml-element java-attribute="segmentationAssignments" name="segmentation-assignments" type="inventory.aai.openecomp.org.v8.SegmentationAssignments" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" >
+				<xml-element java-attribute="subnets" name="subnets" type="inventory.aai.onap.org.v8.Subnets" />
+				<xml-element java-attribute="ctagAssignments" name="ctag-assignments" type="inventory.aai.onap.org.v8.CtagAssignments" />
+				<xml-element java-attribute="segmentationAssignments" name="segmentation-assignments" type="inventory.aai.onap.org.v8.SegmentationAssignments" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" >
 					<xml-properties>
 						<xml-property name="description" value="Relates to tenant (or is it a child of tenant), complex, service, vpn-binding" />
 					</xml-properties>
@@ -3119,7 +3124,7 @@
 		<java-type name="NetworkPolicies">
 			<xml-root-element name="network-policies" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="networkPolicy" name="network-policy" type="inventory.aai.openecomp.org.v8.NetworkPolicy" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="networkPolicy" name="network-policy" type="inventory.aai.onap.org.v8.NetworkPolicy" />
 			</java-attributes>
 		</java-type>
 		<java-type name="NetworkPolicy">
@@ -3145,7 +3150,7 @@
 						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="nameProps" value="network-policy-fqdn" />
@@ -3158,7 +3163,7 @@
 		<java-type name="CtagAssignments">
 			<xml-root-element name="ctag-assignments" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="ctagAssignment" name="ctag-assignment" type="inventory.aai.openecomp.org.v8.CtagAssignment" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="ctagAssignment" name="ctag-assignment" type="inventory.aai.onap.org.v8.CtagAssignment" />
 			</java-attributes>
 		</java-type>
 
@@ -3175,7 +3180,7 @@
 						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="indexedProps" value="vlan-id-inner" />
@@ -3187,7 +3192,7 @@
 		<java-type name="Subnets">
 			<xml-root-element name="subnets" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="subnet" name="subnet" type="inventory.aai.openecomp.org.v8.Subnet" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="subnet" name="subnet" type="inventory.aai.onap.org.v8.Subnet" />
 			</java-attributes>
 		</java-type>
 
@@ -3255,7 +3260,7 @@
 						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="indexedProps" value="subnet-id,subnet-name" />
@@ -3272,7 +3277,7 @@
 			</xml-properties>
 			<xml-root-element name="generic-vnfs" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="genericVnf" name="generic-vnf" type="inventory.aai.openecomp.org.v8.GenericVnf" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="genericVnf" name="generic-vnf" type="inventory.aai.onap.org.v8.GenericVnf" />
 			</java-attributes>
 		</java-type>
 
@@ -3470,10 +3475,10 @@
 						<xml-property name="description" value="represents sub zone of the rr plane" />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
-				<xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.openecomp.org.v8.LInterfaces" />
-				<xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.openecomp.org.v8.LagInterfaces" />
-				<xml-element java-attribute="vfModules" name="vf-modules" type="inventory.aai.openecomp.org.v8.VfModules" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
+				<xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v8.LInterfaces" />
+				<xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v8.LagInterfaces" />
+				<xml-element java-attribute="vfModules" name="vf-modules" type="inventory.aai.onap.org.v8.VfModules" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="General purpose VNF" />
@@ -3493,7 +3498,7 @@
 			</xml-properties>
 			<xml-root-element name="vf-modules" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="vfModule" name="vf-module" type="inventory.aai.openecomp.org.v8.VfModule" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="vfModule" name="vf-module" type="inventory.aai.onap.org.v8.VfModule" />
 			</java-attributes>
 		</java-type>
 
@@ -3569,7 +3574,7 @@
 						<xml-property name="description" value="the Contrail unique ID for a service-instance" />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="a deployment unit of VNFCs" />
@@ -3586,7 +3591,7 @@
 			</xml-properties>
 			<xml-root-element name="lag-links" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="lagLink" name="lag-link" type="inventory.aai.openecomp.org.v8.LagLink" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="lagLink" name="lag-link" type="inventory.aai.onap.org.v8.LagLink" />
 			</java-attributes>
 		</java-type>
 
@@ -3603,7 +3608,7 @@
 						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="LAG links can connect lag-interfaces" />
@@ -3619,7 +3624,7 @@
 			</xml-properties>
 			<xml-root-element name="newvces" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="newvce" name="newvce" type="inventory.aai.openecomp.org.v8.Newvce" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="newvce" name="newvce" type="inventory.aai.onap.org.v8.Newvce" />
 			</java-attributes>
 		</java-type>
 
@@ -3697,8 +3702,8 @@
 						<xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE" />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
-				<xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.openecomp.org.v8.LInterfaces" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
+				<xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v8.LInterfaces" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="This object fills in the gaps from vce that were incorporated into generic-vnf.  This object will be retired with vce." />
@@ -3717,7 +3722,7 @@
 			</xml-properties>
 			<xml-root-element name="pnfs" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="pnf" name="pnf" type="inventory.aai.openecomp.org.v8.Pnf" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="pnf" name="pnf" type="inventory.aai.onap.org.v8.Pnf" />
 			</java-attributes>
 		</java-type>
 
@@ -3795,9 +3800,9 @@
 						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
-				<xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.openecomp.org.v8.PInterfaces" />
-				<xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.openecomp.org.v8.LagInterfaces" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
+				<xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v8.PInterfaces" />
+				<xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v8.LagInterfaces" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="PNF represents a physical network function. typically equipment used in the D1 world." />
@@ -3814,7 +3819,7 @@
 			</xml-properties>
 			<xml-root-element name="physical-links" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="physicalLink" name="physical-link" type="inventory.aai.openecomp.org.v8.PhysicalLink" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="physicalLink" name="physical-link" type="inventory.aai.onap.org.v8.PhysicalLink" />
 			</java-attributes>
 		</java-type>
 
@@ -3861,7 +3866,7 @@
 						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Collection of physical connections, typically between p-interfaces" />
@@ -3875,7 +3880,7 @@
 		<java-type name="VigServers">
 			<xml-root-element name="vig-servers" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="vigServer" name="vig-server" type="inventory.aai.openecomp.org.v8.VigServer" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="vigServer" name="vig-server" type="inventory.aai.onap.org.v8.VigServer" />
 			</java-attributes>
 		</java-type>
 
@@ -3902,7 +3907,7 @@
 						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="vig-server contains information about a vig server used for IPSec-configuration. Populated by SDN-C from 1607" />
@@ -3915,7 +3920,7 @@
 		<java-type name="IpsecConfigurations">
 			<xml-root-element name="ipsec-configurations" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="ipsecConfiguration" name="ipsec-configuration" type="inventory.aai.openecomp.org.v8.IpsecConfiguration" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="ipsecConfiguration" name="ipsec-configuration" type="inventory.aai.onap.org.v8.IpsecConfiguration" />
 			</java-attributes>
 		</java-type>
 
@@ -4032,8 +4037,8 @@
 						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
-				<xml-element java-attribute="vigServers" name="vig-servers" type="inventory.aai.openecomp.org.v8.VigServers" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
+				<xml-element java-attribute="vigServers" name="vig-servers" type="inventory.aai.onap.org.v8.VigServers" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="IPSec configuration node will contain various configuration data for the NMTE VNF. This node will have an edge to the generic-vnf (vnf type = TE). Starting 1607, this data will be populated by SDN-C" />
@@ -4049,7 +4054,7 @@
 			<xml-root-element name="notification-event" />
 			<java-attributes>
 				<xml-element java-attribute="cambriaPartition" name="cambria.partition" type="java.lang.String" />
-				<xml-element java-attribute="eventHeader" name="event-header" type="inventory.aai.openecomp.org.v8.NotificationEventHeader" />
+				<xml-element java-attribute="eventHeader" name="event-header" type="inventory.aai.onap.org.v8.NotificationEventHeader" />
 				<xml-any-element java-attribute="entity" />
 			</java-attributes>
 		</java-type>
@@ -4074,8 +4079,8 @@
 		<java-type name="AaiInternal">
 			<xml-root-element name="aai-internal" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="reservedPropNames" name="reserved-prop-names" type="inventory.aai.openecomp.org.v8.ReservedPropNames" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="edgePropNames" name="edge-prop-names" type="inventory.aai.openecomp.org.v8.EdgePropNames" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="reservedPropNames" name="reserved-prop-names" type="inventory.aai.onap.org.v8.ReservedPropNames" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="edgePropNames" name="edge-prop-names" type="inventory.aai.onap.org.v8.EdgePropNames" />
 			</java-attributes>
 		</java-type>
 		<java-type name="ReservedPropNames">
@@ -4119,7 +4124,7 @@
 			</xml-properties>
 			<xml-root-element name="models" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="model" name="model" type="inventory.aai.openecomp.org.v8.Model" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="model" name="model" type="inventory.aai.onap.org.v8.Model" />
 			</java-attributes>
 		</java-type>
 
@@ -4170,16 +4175,16 @@
 						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.openecomp.org.v8.ModelElements" />
-				<xml-element java-attribute="metadata" name="metadata" type="inventory.aai.openecomp.org.v8.Metadata" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.onap.org.v8.ModelElements" />
+				<xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v8.Metadata" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
 			</java-attributes>
 		</java-type>
 
 		<java-type name="ModelElements">
 			<xml-root-element name="model-elements" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="modelElement" name="model-element" type="inventory.aai.openecomp.org.v8.ModelElement" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="modelElement" name="model-element" type="inventory.aai.onap.org.v8.ModelElement" />
 			</java-attributes>
 		</java-type>
 
@@ -4216,24 +4221,24 @@
 						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.openecomp.org.v8.ModelElements">
+				<xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.onap.org.v8.ModelElements">
 					<xml-properties>
 						<xml-property name="description" value="Defines how other models combine to make up a higher-level model" />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="modelConstraints" name="model-constraints" type="inventory.aai.openecomp.org.v8.ModelConstraints">
+				<xml-element java-attribute="modelConstraints" name="model-constraints" type="inventory.aai.onap.org.v8.ModelConstraints">
 					<xml-properties>
 						<xml-property name="description" value="Describes new constraints on this model element that are not part of that model's definition" />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
 			</java-attributes>
 		</java-type>
 
 		<java-type name="ModelConstraints">
 			<xml-root-element name="model-constraints" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="modelConstraint" name="model-constraint" type="inventory.aai.openecomp.org.v8.ModelConstraint" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="modelConstraint" name="model-constraint" type="inventory.aai.onap.org.v8.ModelConstraint" />
 			</java-attributes>
 		</java-type>
 
@@ -4254,14 +4259,14 @@
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="constrainedElementSetUuidToReplace" name="constrained-element-set-uuid-to-replace" required="true" type="java.lang.String" />
-				<xml-element java-attribute="constrainedElementSets" name="constrained-element-sets" type="inventory.aai.openecomp.org.v8.ConstrainedElementSets" />
+				<xml-element java-attribute="constrainedElementSets" name="constrained-element-sets" type="inventory.aai.onap.org.v8.ConstrainedElementSets" />
 			</java-attributes>
 		</java-type>
 
 		<java-type name="ConstrainedElementSets">
 			<xml-root-element name="constrained-element-sets" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="constrainedElementSet" name="constrained-element-set" type="inventory.aai.openecomp.org.v8.ConstrainedElementSet" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="constrainedElementSet" name="constrained-element-set" type="inventory.aai.onap.org.v8.ConstrainedElementSet" />
 			</java-attributes>
 		</java-type>
 
@@ -4284,15 +4289,15 @@
 				<xml-element java-attribute="constraintType" name="constraint-type" required="true" type="java.lang.String" />
 				<xml-element java-attribute="checkType" name="check-type" required="true" type="java.lang.String" />
 				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" />
-				<xml-element java-attribute="elementChoiceSets" name="element-choice-sets" type="inventory.aai.openecomp.org.v8.ElementChoiceSets" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="elementChoiceSets" name="element-choice-sets" type="inventory.aai.onap.org.v8.ElementChoiceSets" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
 			</java-attributes>
 		</java-type>
 
 		<java-type name="ElementChoiceSets">
 			<xml-root-element name="element-choice-sets" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="elementChoiceSet" name="element-choice-set" type="inventory.aai.openecomp.org.v8.ElementChoiceSet" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="elementChoiceSet" name="element-choice-set" type="inventory.aai.onap.org.v8.ElementChoiceSet" />
 			</java-attributes>
 		</java-type>
 
@@ -4315,15 +4320,15 @@
 				<xml-element java-attribute="elementChoiceSetName" name="element-choice-set-name" required="true" type="java.lang.String" />
 				<xml-element java-attribute="cardinality" name="cardinality" type="java.lang.String" />
 				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" />
-				<xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.openecomp.org.v8.ModelElements" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.onap.org.v8.ModelElements" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
 			</java-attributes>
 		</java-type>
 
 		<java-type name="NamedQueries">
 			<xml-root-element name="named-queries" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="namedQuery" name="named-query" type="inventory.aai.openecomp.org.v8.NamedQuery" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="namedQuery" name="named-query" type="inventory.aai.onap.org.v8.NamedQuery" />
 			</java-attributes>
 		</java-type>
 
@@ -4346,15 +4351,15 @@
 				</xml-element>
 				<xml-element java-attribute="description" name="description" type="java.lang.String" />
 				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" />
-				<xml-element java-attribute="namedQueryElements" name="named-query-elements" type="inventory.aai.openecomp.org.v8.NamedQueryElements" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="namedQueryElements" name="named-query-elements" type="inventory.aai.onap.org.v8.NamedQueryElements" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
 			</java-attributes>
 		</java-type>
 
 		<java-type name="NamedQueryElements">
 			<xml-root-element name="named-query-elements" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="namedQueryElement" name="named-query-element" type="inventory.aai.openecomp.org.v8.NamedQueryElement" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="namedQueryElement" name="named-query-element" type="inventory.aai.onap.org.v8.NamedQueryElement" />
 			</java-attributes>
 		</java-type>
 
@@ -4378,17 +4383,17 @@
 				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" />
 				<xml-element java-attribute="propertyLimitDesc" name="property-limit-desc" type="java.lang.String" />
 				<xml-element java-attribute="doNotOutput" name="do-not-output" type="java.lang.String" />
-				<xml-element java-attribute="namedQueryElements" name="named-query-elements" type="inventory.aai.openecomp.org.v8.NamedQueryElements" />
-				<xml-element java-attribute="relatedLookups" name="related-lookups" type="inventory.aai.openecomp.org.v8.RelatedLookups" />
-				<xml-element java-attribute="propertyConstraints" name="property-constraints" type="inventory.aai.openecomp.org.v8.PropertyConstraints" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="namedQueryElements" name="named-query-elements" type="inventory.aai.onap.org.v8.NamedQueryElements" />
+				<xml-element java-attribute="relatedLookups" name="related-lookups" type="inventory.aai.onap.org.v8.RelatedLookups" />
+				<xml-element java-attribute="propertyConstraints" name="property-constraints" type="inventory.aai.onap.org.v8.PropertyConstraints" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
 			</java-attributes>
 		</java-type>
 
 		<java-type name="RelatedLookups">
 			<xml-root-element name="related-lookups" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="relatedLookup" name="related-lookup" type="inventory.aai.openecomp.org.v8.RelatedLookup" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="relatedLookup" name="related-lookup" type="inventory.aai.onap.org.v8.RelatedLookup" />
 			</java-attributes>
 		</java-type>
 
@@ -4414,14 +4419,14 @@
 				<xml-element java-attribute="targetNodeProperty" name="target-node-property" required="true" type="java.lang.String" />
 				<xml-element container-type="java.util.ArrayList" java-attribute="propertyCollectList" name="property-collect-list" type="java.lang.String" />
 				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
 			</java-attributes>
 		</java-type>
 
 		<java-type name="PropertyConstraints">
 			<xml-root-element name="property-constraints" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="propertyConstraint" name="property-constraint" type="inventory.aai.openecomp.org.v8.PropertyConstraint" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="propertyConstraint" name="property-constraint" type="inventory.aai.onap.org.v8.PropertyConstraint" />
 			</java-attributes>
 		</java-type>
 
@@ -4454,8 +4459,8 @@
 			</xml-properties>
 			<xml-root-element name="model-and-named-query-search" />
 			<java-attributes>
-				<xml-element java-attribute="queryParameters" name="query-parameters" type="inventory.aai.openecomp.org.v8.QueryParameters" />
-				<xml-element java-attribute="instanceFilters" name="instance-filters" type="inventory.aai.openecomp.org.v8.InstanceFilters" />
+				<xml-element java-attribute="queryParameters" name="query-parameters" type="inventory.aai.onap.org.v8.QueryParameters" />
+				<xml-element java-attribute="instanceFilters" name="instance-filters" type="inventory.aai.onap.org.v8.InstanceFilters" />
 				<xml-element java-attribute="topNodeType"     name="top-node-type"    type="java.lang.String" />
 			</java-attributes>
 		</java-type>
@@ -4466,8 +4471,8 @@
 			</xml-properties>
 			<xml-root-element name="query-parameters" />
 			<java-attributes>
-				<xml-element java-attribute="namedQuery" name="named-query" type="inventory.aai.openecomp.org.v8.NamedQuery" />
-				<xml-element java-attribute="model" name="model" type="inventory.aai.openecomp.org.v8.Model" />
+				<xml-element java-attribute="namedQuery" name="named-query" type="inventory.aai.onap.org.v8.NamedQuery" />
+				<xml-element java-attribute="model" name="model" type="inventory.aai.onap.org.v8.Model" />
 			</java-attributes>
 		</java-type>
 
@@ -4477,7 +4482,7 @@
 			</xml-properties>
 			<xml-root-element name="instance-filters" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="instanceFilter" name="instance-filter" type="inventory.aai.openecomp.org.v8.InstanceFilter" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="instanceFilter" name="instance-filter" type="inventory.aai.onap.org.v8.InstanceFilter" />
 			</java-attributes>
 		</java-type>
 
@@ -4509,7 +4514,7 @@
 			</xml-properties>
 			<xml-root-element name="response-list" />
 			<java-attributes>
-				<xml-element java-attribute="inventoryResponseItems" name="inventory-response-items" type="inventory.aai.openecomp.org.v8.InventoryResponseItems" />
+				<xml-element java-attribute="inventoryResponseItems" name="inventory-response-items" type="inventory.aai.onap.org.v8.InventoryResponseItems" />
 			</java-attributes>
 		</java-type>
 
@@ -4520,7 +4525,7 @@
 			</xml-properties>
 			<xml-root-element name="inventory-response-items" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="inventoryResponseItem" name="inventory-response-item" type="inventory.aai.openecomp.org.v8.InventoryResponseItem" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="inventoryResponseItem" name="inventory-response-item" type="inventory.aai.onap.org.v8.InventoryResponseItem" />
 			</java-attributes>
 		</java-type>
 
@@ -4533,8 +4538,8 @@
 			<java-attributes>
 				<xml-element java-attribute="modelName" name="model-name" type="java.lang.String" />
 				<xml-any-element java-attribute="item" />
-				<xml-element java-attribute="extraProperties" name="extra-properties" type="inventory.aai.openecomp.org.v8.ExtraProperties" />
-				<xml-element java-attribute="inventoryResponseItems" name="inventory-response-items" type="inventory.aai.openecomp.org.v8.InventoryResponseItems" />
+				<xml-element java-attribute="extraProperties" name="extra-properties" type="inventory.aai.onap.org.v8.ExtraProperties" />
+				<xml-element java-attribute="inventoryResponseItems" name="inventory-response-items" type="inventory.aai.onap.org.v8.InventoryResponseItems" />
 			</java-attributes>
 		</java-type>
 
@@ -4544,7 +4549,7 @@
 			</xml-properties>
 			<xml-root-element name="extra-properties" />
 			<java-attributes>
-				<xml-any-element container-type="java.util.ArrayList" java-attribute="extraProperty" name="extra-property" type="inventory.aai.openecomp.org.v8.ExtraProperty" />
+				<xml-any-element container-type="java.util.ArrayList" java-attribute="extraProperty" name="extra-property" type="inventory.aai.onap.org.v8.ExtraProperty" />
 			</java-attributes>
 		</java-type>
 
@@ -4562,7 +4567,7 @@
 			</xml-properties>
 			<xml-root-element name="route-table-references" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="routeTableReference" name="route-table-reference" type="inventory.aai.openecomp.org.v8.RouteTableReference" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="routeTableReference" name="route-table-reference" type="inventory.aai.onap.org.v8.RouteTableReference" />
 			</java-attributes>
 		</java-type>
 
@@ -4584,7 +4589,7 @@
 						<xml-property name="description" value="Concurrency value" />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
 			</java-attributes>
 
 			<xml-properties>
@@ -4603,7 +4608,7 @@
 			</xml-properties>
 			<xml-root-element name="segmentation-assignments" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="segmentationAssignment" name="segmentation-assignment" type="inventory.aai.openecomp.org.v8.SegmentationAssignment" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="segmentationAssignment" name="segmentation-assignment" type="inventory.aai.onap.org.v8.SegmentationAssignment" />
 			</java-attributes>
 		</java-type>
 
@@ -4620,7 +4625,7 @@
 						<xml-property name="description" value="Concurrency value" />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Openstack segmentation assignment." />
diff --git a/aai-schema/src/main/resources/oxm/aai_oxm_v9.xml b/aai-schema/src/main/resources/oxm/aai_oxm_v9.xml
index 142145c5..ecffb2fc 100644
--- a/aai-schema/src/main/resources/oxm/aai_oxm_v9.xml
+++ b/aai-schema/src/main/resources/oxm/aai_oxm_v9.xml
@@ -1,23 +1,28 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
-  ============LICENSE_START=======================================================
-  org.openecomp.aai
-  ================================================================================
-  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=========================================================
-  -->
-
-<xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.openecomp.org.v9" xml-mapping-metadata-complete="true">
+
+    ============LICENSE_START=======================================================
+    org.onap.aai
+    ================================================================================
+    Copyright © 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=========================================================
+
+    ECOMP is a trademark and service mark of AT&T Intellectual Property.
+
+-->
+<xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.onap.org.v9" xml-mapping-metadata-complete="true">
     <xml-schema element-form-default="QUALIFIED">
         <xml-ns namespace-uri="http://org.openecomp.aai.inventory/v9" />
     </xml-schema>
@@ -25,14 +30,14 @@
         <java-type name="Inventory">
             <xml-root-element name="inventory" />
             <java-attributes>
-                <xml-element java-attribute="search" name="search" type="inventory.aai.openecomp.org.v9.Search" />
-                <xml-element java-attribute="actions" name="actions" type="inventory.aai.openecomp.org.v9.Actions" />
-                <xml-element java-attribute="cloudInfrastructure" name="cloud-infrastructure" type="inventory.aai.openecomp.org.v9.CloudInfrastructure" />
-                <xml-element java-attribute="business" name="business" type="inventory.aai.openecomp.org.v9.Business" />
-                <xml-element java-attribute="serviceDesignAndCreation" name="service-design-and-creation" type="inventory.aai.openecomp.org.v9.ServiceDesignAndCreation" />
-                <xml-element java-attribute="network" name="network" type="inventory.aai.openecomp.org.v9.Network" />
-                <xml-element java-attribute="aaiInternal" name="aai-internal" type="inventory.aai.openecomp.org.v9.AaiInternal" />
-                <xml-element java-attribute="nodes" name="nodes" type="inventory.aai.openecomp.org.v9.Nodes"/>
+                <xml-element java-attribute="search" name="search" type="inventory.aai.onap.org.v9.Search" />
+                <xml-element java-attribute="actions" name="actions" type="inventory.aai.onap.org.v9.Actions" />
+                <xml-element java-attribute="cloudInfrastructure" name="cloud-infrastructure" type="inventory.aai.onap.org.v9.CloudInfrastructure" />
+                <xml-element java-attribute="business" name="business" type="inventory.aai.onap.org.v9.Business" />
+                <xml-element java-attribute="serviceDesignAndCreation" name="service-design-and-creation" type="inventory.aai.onap.org.v9.ServiceDesignAndCreation" />
+                <xml-element java-attribute="network" name="network" type="inventory.aai.onap.org.v9.Network" />
+                <xml-element java-attribute="aaiInternal" name="aai-internal" type="inventory.aai.onap.org.v9.AaiInternal" />
+                <xml-element java-attribute="nodes" name="nodes" type="inventory.aai.onap.org.v9.Nodes"/>
             </java-attributes>
         </java-type>
 
@@ -42,24 +47,24 @@
         <java-type name="Search">
             <xml-root-element name="search" />
             <java-attributes>
-                <xml-element java-attribute="edgeTagQueryResult" name="edge-tag-query-result" type="inventory.aai.openecomp.org.v9.EdgeTagQueryResult" />
-                <xml-element java-attribute="edgeTagQueryRequest" name="edge-tag-query-request" type="inventory.aai.openecomp.org.v9.EdgeTagQueryRequest" />
-                <xml-element java-attribute="searchResults" name="search-results" type="inventory.aai.openecomp.org.v9.SearchResults" />
-                <xml-element java-attribute="sdnZoneResponse" name="sdn-zone-response" type="inventory.aai.openecomp.org.v9.SdnZoneResponse" />
+                <xml-element java-attribute="edgeTagQueryResult" name="edge-tag-query-result" type="inventory.aai.onap.org.v9.EdgeTagQueryResult" />
+                <xml-element java-attribute="edgeTagQueryRequest" name="edge-tag-query-request" type="inventory.aai.onap.org.v9.EdgeTagQueryRequest" />
+                <xml-element java-attribute="searchResults" name="search-results" type="inventory.aai.onap.org.v9.SearchResults" />
+                <xml-element java-attribute="sdnZoneResponse" name="sdn-zone-response" type="inventory.aai.onap.org.v9.SdnZoneResponse" />
             </java-attributes>
         </java-type>
 
         <java-type name="EdgeTagQueryResult">
             <xml-root-element name="edge-tag-query-result" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="taggedInventoryItemList" name="tagged-inventory-item-list" type="inventory.aai.openecomp.org.v9.TaggedInventoryItemList" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="taggedInventoryItemList" name="tagged-inventory-item-list" type="inventory.aai.onap.org.v9.TaggedInventoryItemList" />
             </java-attributes>
         </java-type>
 
         <java-type name="TaggedInventoryItemList">
             <xml-root-element name="tagged-inventory-item-list" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="inventoryItem" name="inventory-item" type="inventory.aai.openecomp.org.v9.InventoryItem" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="inventoryItem" name="inventory-item" type="inventory.aai.onap.org.v9.InventoryItem" />
             </java-attributes>
         </java-type>
 
@@ -68,8 +73,8 @@
             <java-attributes>
                 <xml-element java-attribute="inventoryItemType" name="inventory-item-type" type="java.lang.String" />
                 <xml-element java-attribute="inventoryItemLink" name="inventory-item-link" type="java.lang.String" />
-                <xml-element container-type="java.util.ArrayList" java-attribute="inventoryItemData" name="inventory-item-data" type="inventory.aai.openecomp.org.v9.InventoryItemData" />
-                <xml-element container-type="java.util.ArrayList" java-attribute="taggedInventoryItemList" name="tagged-inventory-item-list" type="inventory.aai.openecomp.org.v9.TaggedInventoryItemList" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="inventoryItemData" name="inventory-item-data" type="inventory.aai.onap.org.v9.InventoryItemData" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="taggedInventoryItemList" name="tagged-inventory-item-list" type="inventory.aai.onap.org.v9.TaggedInventoryItemList" />
             </java-attributes>
         </java-type>
 
@@ -87,9 +92,9 @@
                 <xml-element java-attribute="edgeTag" name="edge-tag" type="java.lang.String" />
                 <xml-element java-attribute="resultDetail" name="result-detail" type="java.lang.String" />
                 <xml-element java-attribute="startNodeType" name="start-node-type" type="java.lang.String" />
-                <xml-element container-type="java.util.ArrayList" java-attribute="startNodeFilter" name="start-node-filter" type="inventory.aai.openecomp.org.v9.StartNodeFilter" />
-                <xml-element container-type="java.util.ArrayList" java-attribute="includeNodeFilter" name="include-node-filter" type="inventory.aai.openecomp.org.v9.IncludeNodeFilter" />
-                <xml-element container-type="java.util.ArrayList" java-attribute="secondaryFilter" name="secondary-filter" type="inventory.aai.openecomp.org.v9.SecondaryFilter" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="startNodeFilter" name="start-node-filter" type="inventory.aai.onap.org.v9.StartNodeFilter" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="includeNodeFilter" name="include-node-filter" type="inventory.aai.onap.org.v9.IncludeNodeFilter" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="secondaryFilter" name="secondary-filter" type="inventory.aai.onap.org.v9.SecondaryFilter" />
             </java-attributes>
         </java-type>
 
@@ -120,7 +125,7 @@
         <java-type name="SearchResults">
             <xml-root-element name="search-results" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="resultData" name="result-data" type="inventory.aai.openecomp.org.v9.ResultData" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="resultData" name="result-data" type="inventory.aai.onap.org.v9.ResultData" />
             </java-attributes>
         </java-type>
 
@@ -143,16 +148,16 @@
         <java-type name="SdnZoneResponse">
             <xml-root-element name="sdn-zone-response" />
             <java-attributes>
-                <xml-element java-attribute="oamNetworks" name="oam-networks" type="inventory.aai.openecomp.org.v9.OamNetworks" />
-                <xml-element container-type="java.util.ArrayList" java-attribute="azAndDvsSwitches" name="az-and-dvs-switches" type="inventory.aai.openecomp.org.v9.AzAndDvsSwitches" />
+                <xml-element java-attribute="oamNetworks" name="oam-networks" type="inventory.aai.onap.org.v9.OamNetworks" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="azAndDvsSwitches" name="az-and-dvs-switches" type="inventory.aai.onap.org.v9.AzAndDvsSwitches" />
             </java-attributes>
         </java-type>
 
         <java-type name="AzAndDvsSwitches">
             <xml-root-element name="az-and-dvs-switches" />
             <java-attributes>
-                <xml-element java-attribute="dvsSwitches" name="dvs-switches" type="inventory.aai.openecomp.org.v9.DvsSwitches" />
-                <xml-element java-attribute="availabilityZone" name="availability-zone" type="inventory.aai.openecomp.org.v9.AvailabilityZone" />
+                <xml-element java-attribute="dvsSwitches" name="dvs-switches" type="inventory.aai.onap.org.v9.DvsSwitches" />
+                <xml-element java-attribute="availabilityZone" name="availability-zone" type="inventory.aai.onap.org.v9.AvailabilityZone" />
             </java-attributes>
         </java-type>
 
@@ -162,8 +167,8 @@
             </xml-properties>
             <xml-root-element name="actions" />
             <java-attributes>
-                <xml-element java-attribute="update" name="update" type="inventory.aai.openecomp.org.v9.Update" />
-                <xml-element java-attribute="notify" name="notify" type="inventory.aai.openecomp.org.v9.Notify" />
+                <xml-element java-attribute="update" name="update" type="inventory.aai.onap.org.v9.Update" />
+                <xml-element java-attribute="notify" name="notify" type="inventory.aai.onap.org.v9.Notify" />
             </java-attributes>
         </java-type>
 
@@ -174,9 +179,9 @@
             <xml-root-element name="update" />
             <java-attributes>
                 <xml-element java-attribute="updateNodeType" name="update-node-type" required="true" type="java.lang.String" />
-                <xml-element container-type="java.util.ArrayList" java-attribute="updateNodeKey" name="update-node-key" type="inventory.aai.openecomp.org.v9.UpdateNodeKey" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="updateNodeKey" name="update-node-key" type="inventory.aai.onap.org.v9.UpdateNodeKey" />
                 <xml-element java-attribute="updateNodeUri" name="update-node-uri" type="java.lang.String" />
-                <xml-element container-type="java.util.ArrayList" java-attribute="action" name="action" type="inventory.aai.openecomp.org.v9.Action" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="action" name="action" type="inventory.aai.onap.org.v9.Action" />
             </java-attributes>
         </java-type>
 
@@ -184,7 +189,7 @@
             <xml-root-element name="action" />
             <java-attributes>
                 <xml-element java-attribute="actionType" name="action-type" type="java.lang.String" />
-                <xml-element container-type="java.util.ArrayList" java-attribute="actionData" name="action-data" type="inventory.aai.openecomp.org.v9.ActionData" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="actionData" name="action-data" type="inventory.aai.onap.org.v9.ActionData" />
             </java-attributes>
         </java-type>
 
@@ -210,7 +215,7 @@
                 <xml-element java-attribute="eventId" name="event-id" required="true" type="java.lang.String" />
                 <xml-element java-attribute="nodeType" name="node-type" type="java.lang.String" />
                 <xml-element java-attribute="eventTrigger" name="event-trigger" type="java.lang.String" />
-                <xml-element container-type="java.util.ArrayList" java-attribute="keyData" name="key-data" type="inventory.aai.openecomp.org.v9.KeyData" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="keyData" name="key-data" type="inventory.aai.onap.org.v9.KeyData" />
                 <xml-element java-attribute="selflink" name="selflink" type="java.lang.String" />
             </java-attributes>
         </java-type>
@@ -229,18 +234,18 @@
             </xml-properties>
             <xml-root-element name="cloud-infrastructure" />
             <java-attributes>
-                <xml-element java-attribute="complexes" name="complexes" type="inventory.aai.openecomp.org.v9.Complexes" />
-                <xml-element java-attribute="cloudRegions" name="cloud-regions" type="inventory.aai.openecomp.org.v9.CloudRegions" />
-                <xml-element java-attribute="networkProfiles" name="network-profiles" type="inventory.aai.openecomp.org.v9.NetworkProfiles" />
-                <xml-element java-attribute="pservers" name="pservers" type="inventory.aai.openecomp.org.v9.Pservers" />
-                <xml-element java-attribute="virtualDataCenters" name="virtual-data-centers" type="inventory.aai.openecomp.org.v9.VirtualDataCenters" />
+                <xml-element java-attribute="complexes" name="complexes" type="inventory.aai.onap.org.v9.Complexes" />
+                <xml-element java-attribute="cloudRegions" name="cloud-regions" type="inventory.aai.onap.org.v9.CloudRegions" />
+                <xml-element java-attribute="networkProfiles" name="network-profiles" type="inventory.aai.onap.org.v9.NetworkProfiles" />
+                <xml-element java-attribute="pservers" name="pservers" type="inventory.aai.onap.org.v9.Pservers" />
+                <xml-element java-attribute="virtualDataCenters" name="virtual-data-centers" type="inventory.aai.onap.org.v9.VirtualDataCenters" />
             </java-attributes>
         </java-type>
 
         <java-type name="CloudRegions">
             <xml-root-element name="cloud-regions" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="cloudRegion" name="cloud-region" type="inventory.aai.openecomp.org.v9.CloudRegion" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="cloudRegion" name="cloud-region" type="inventory.aai.onap.org.v9.CloudRegion" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="maximumDepth" value="0" />
@@ -295,16 +300,16 @@
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="volumeGroups" name="volume-groups" type="inventory.aai.openecomp.org.v9.VolumeGroups" />
-                <xml-element java-attribute="tenants" name="tenants" type="inventory.aai.openecomp.org.v9.Tenants" />
-                <xml-element java-attribute="flavors" name="flavors" type="inventory.aai.openecomp.org.v9.Flavors" />
-                <xml-element java-attribute="groupAssignments" name="group-assignments" type="inventory.aai.openecomp.org.v9.GroupAssignments" />
-                <xml-element java-attribute="snapshots" name="snapshots" type="inventory.aai.openecomp.org.v9.Snapshots" />
-                <xml-element java-attribute="images" name="images" type="inventory.aai.openecomp.org.v9.Images" />
-                <xml-element java-attribute="dvsSwitches" name="dvs-switches" type="inventory.aai.openecomp.org.v9.DvsSwitches" />
-                <xml-element java-attribute="oamNetworks" name="oam-networks" type="inventory.aai.openecomp.org.v9.OamNetworks" />
-                <xml-element java-attribute="availabilityZones" name="availability-zones" type="inventory.aai.openecomp.org.v9.AvailabilityZones" />
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
+                <xml-element java-attribute="volumeGroups" name="volume-groups" type="inventory.aai.onap.org.v9.VolumeGroups" />
+                <xml-element java-attribute="tenants" name="tenants" type="inventory.aai.onap.org.v9.Tenants" />
+                <xml-element java-attribute="flavors" name="flavors" type="inventory.aai.onap.org.v9.Flavors" />
+                <xml-element java-attribute="groupAssignments" name="group-assignments" type="inventory.aai.onap.org.v9.GroupAssignments" />
+                <xml-element java-attribute="snapshots" name="snapshots" type="inventory.aai.onap.org.v9.Snapshots" />
+                <xml-element java-attribute="images" name="images" type="inventory.aai.onap.org.v9.Images" />
+                <xml-element java-attribute="dvsSwitches" name="dvs-switches" type="inventory.aai.onap.org.v9.DvsSwitches" />
+                <xml-element java-attribute="oamNetworks" name="oam-networks" type="inventory.aai.onap.org.v9.OamNetworks" />
+                <xml-element java-attribute="availabilityZones" name="availability-zones" type="inventory.aai.onap.org.v9.AvailabilityZones" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="cloud-region designates an installation of a cloud cluster or region or instantiation." />
@@ -320,7 +325,7 @@
             </xml-properties>
             <xml-root-element name="volume-groups" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="volumeGroup" name="volume-group" type="inventory.aai.openecomp.org.v9.VolumeGroup" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="volumeGroup" name="volume-group" type="inventory.aai.onap.org.v9.VolumeGroup" />
             </java-attributes>
         </java-type>
 
@@ -369,7 +374,7 @@
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Persistent block-level storage." />
@@ -383,7 +388,7 @@
         <java-type name="RelationshipList">
             <xml-root-element name="relationship-list" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="relationship" name="relationship" type="inventory.aai.openecomp.org.v9.Relationship" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="relationship" name="relationship" type="inventory.aai.onap.org.v9.Relationship" />
             </java-attributes>
         </java-type>
 
@@ -400,8 +405,8 @@
                         <xml-property name="description" value="URL to the object in A&amp;AI." />
                     </xml-properties>
                 </xml-element>
-                <xml-element container-type="java.util.ArrayList" java-attribute="relationshipData" name="relationship-data" type="inventory.aai.openecomp.org.v9.RelationshipData" />
-                <xml-element container-type="java.util.ArrayList" java-attribute="relatedToProperty" name="related-to-property" type="inventory.aai.openecomp.org.v9.RelatedToProperty" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="relationshipData" name="relationship-data" type="inventory.aai.onap.org.v9.RelationshipData" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="relatedToProperty" name="related-to-property" type="inventory.aai.onap.org.v9.RelatedToProperty" />
             </java-attributes>
         </java-type>
 
@@ -443,7 +448,7 @@
             </xml-properties>
             <xml-root-element name="complexes" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="complex" name="complex" type="inventory.aai.openecomp.org.v9.Complex" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="complex" name="complex" type="inventory.aai.onap.org.v9.Complex" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="maximumDepth" value="0" />
@@ -494,8 +499,8 @@
                 <xml-element java-attribute="longitude" name="longitude" type="java.lang.String" />
                 <xml-element java-attribute="elevation" name="elevation" type="java.lang.String" />
                 <xml-element java-attribute="lata" name="lata" type="java.lang.String" />
-                <xml-element java-attribute="ctagPools" name="ctag-pools" type="inventory.aai.openecomp.org.v9.CtagPools" />
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
+                <xml-element java-attribute="ctagPools" name="ctag-pools" type="inventory.aai.onap.org.v9.CtagPools" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Collection of physical locations that can house cloud-regions." />
@@ -510,7 +515,7 @@
         <java-type name="CtagPools">
             <xml-root-element name="ctag-pools" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="ctagPool" name="ctag-pool" type="inventory.aai.openecomp.org.v9.CtagPool" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="ctagPool" name="ctag-pool" type="inventory.aai.onap.org.v9.CtagPool" />
             </java-attributes>
         </java-type>
 
@@ -542,7 +547,7 @@
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="A collection of C tags (vlan tags) grouped for a specific purpose." />
@@ -558,7 +563,7 @@
             </xml-properties>
             <xml-root-element name="tenants" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="tenant" name="tenant" type="inventory.aai.openecomp.org.v9.Tenant" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="tenant" name="tenant" type="inventory.aai.onap.org.v9.Tenant" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="maximumDepth" value="0" />
@@ -583,8 +588,8 @@
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="vservers" name="vservers" type="inventory.aai.openecomp.org.v9.Vservers" />
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
+                <xml-element java-attribute="vservers" name="vservers" type="inventory.aai.onap.org.v9.Vservers" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Openstack tenant" />
@@ -602,7 +607,7 @@
             </xml-properties>
             <xml-root-element name="vservers" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="vserver" name="vserver" type="inventory.aai.openecomp.org.v9.Vserver" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="vserver" name="vserver" type="inventory.aai.onap.org.v9.Vserver" />
             </java-attributes>
         </java-type>
 
@@ -651,9 +656,9 @@
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="volumes" name="volumes" type="inventory.aai.openecomp.org.v9.Volumes" />
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
-                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.openecomp.org.v9.LInterfaces" />
+                <xml-element java-attribute="volumes" name="volumes" type="inventory.aai.onap.org.v9.Volumes" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
+                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v9.LInterfaces" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Virtual Servers, aka virtual machine or VM." />
@@ -671,7 +676,7 @@
             </xml-properties>
             <xml-root-element name="l-interfaces" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="lInterface" name="l-interface" type="inventory.aai.openecomp.org.v9.LInterface" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="lInterface" name="l-interface" type="inventory.aai.onap.org.v9.LInterface" />
             </java-attributes>
         </java-type>
 
@@ -728,11 +733,11 @@
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="vlans" name="vlans" type="inventory.aai.openecomp.org.v9.Vlans" />
-                <xml-element java-attribute="sriovVfs" name="sriov-vfs" type="inventory.aai.openecomp.org.v9.SriovVfs" />
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
-                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.openecomp.org.v9.L3InterfaceIpv4AddressList" />
-                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.openecomp.org.v9.L3InterfaceIpv6AddressList" />
+                <xml-element java-attribute="vlans" name="vlans" type="inventory.aai.onap.org.v9.Vlans" />
+                <xml-element java-attribute="sriovVfs" name="sriov-vfs" type="inventory.aai.onap.org.v9.SriovVfs" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v9.L3InterfaceIpv4AddressList" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v9.L3InterfaceIpv6AddressList" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Logical interfaces, e.g., a vnic." />
@@ -748,7 +753,7 @@
             </xml-properties>
             <xml-root-element name="sriov-vfs" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="sriovVf" name="sriov-vf" type="inventory.aai.openecomp.org.v9.SriovVf" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="sriovVf" name="sriov-vf" type="inventory.aai.onap.org.v9.SriovVf" />
             </java-attributes>
         </java-type>
         <java-type name="SriovVf">
@@ -824,7 +829,7 @@
                         <xml-property name="description" value="Neutron network id of the interface" />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="SR-IOV Virtual Function (not to be confused with virtual network function)" />
@@ -877,7 +882,7 @@
                         <xml-property name="description" value="Neutron id of subnet that address belongs to" />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="IPv4 Address Range" />
@@ -889,7 +894,7 @@
         <java-type name="Vlans">
             <xml-root-element name="vlans" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="vlan" name="vlan" type="inventory.aai.openecomp.org.v9.Vlan" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="vlan" name="vlan" type="inventory.aai.onap.org.v9.Vlan" />
             </java-attributes>
         </java-type>
 
@@ -947,9 +952,9 @@
                         <xml-property name="description" value="Status of a vnf's vlan interface, on which the customer circuit resides, mastered by SDN-C." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
-                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.openecomp.org.v9.L3InterfaceIpv4AddressList" />
-                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.openecomp.org.v9.L3InterfaceIpv6AddressList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v9.L3InterfaceIpv4AddressList" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v9.L3InterfaceIpv6AddressList" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Definition of vlan" />
@@ -1003,7 +1008,7 @@
                         <xml-property name="description" value="Neutron id of subnet that address belongs to" />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="IPv6 Address Range" />
@@ -1018,7 +1023,7 @@
             </xml-properties>
             <xml-root-element name="volumes" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="volume" name="volume" type="inventory.aai.openecomp.org.v9.Volume" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="volume" name="volume" type="inventory.aai.onap.org.v9.Volume" />
             </java-attributes>
         </java-type>
 
@@ -1040,7 +1045,7 @@
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Ephemeral Block storage volume." />
@@ -1056,7 +1061,7 @@
             </xml-properties>
             <xml-root-element name="flavors" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="flavor" name="flavor" type="inventory.aai.openecomp.org.v9.Flavor" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="flavor" name="flavor" type="inventory.aai.onap.org.v9.Flavor" />
             </java-attributes>
         </java-type>
 
@@ -1118,7 +1123,7 @@
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Openstack flavor." />
@@ -1135,7 +1140,7 @@
             </xml-properties>
             <xml-root-element name="snapshots" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="snapshot" name="snapshot" type="inventory.aai.openecomp.org.v9.Snapshot" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="snapshot" name="snapshot" type="inventory.aai.onap.org.v9.Snapshot" />
             </java-attributes>
         </java-type>
 
@@ -1197,7 +1202,7 @@
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Openstack snapshot" />
@@ -1215,7 +1220,7 @@
             </xml-properties>
             <xml-root-element name="group-assignments" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="groupAssignment" name="group-assignment" type="inventory.aai.openecomp.org.v9.GroupAssignment" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="groupAssignment" name="group-assignment" type="inventory.aai.onap.org.v9.GroupAssignment" />
             </java-attributes>
         </java-type>
 
@@ -1247,7 +1252,7 @@
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Openstack group-assignment used to store exclusivity groups (EG)." />
@@ -1264,7 +1269,7 @@
             </xml-properties>
             <xml-root-element name="images" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="image" name="image" type="inventory.aai.openecomp.org.v9.Image" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="image" name="image" type="inventory.aai.onap.org.v9.Image" />
             </java-attributes>
         </java-type>
 
@@ -1321,8 +1326,8 @@
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
-                <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.openecomp.org.v9.Metadata" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
+                <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v9.Metadata" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Openstack image." />
@@ -1339,7 +1344,7 @@
             </xml-properties>
             <xml-root-element name="metadata" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="metadatum" name="metadatum" type="inventory.aai.openecomp.org.v9.Metadatum" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="metadatum" name="metadatum" type="inventory.aai.onap.org.v9.Metadatum" />
             </java-attributes>
         </java-type>
 
@@ -1368,7 +1373,7 @@
             </xml-properties>
             <xml-root-element name="dvs-switches" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="dvsSwitch" name="dvs-switch" type="inventory.aai.openecomp.org.v9.DvsSwitch" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="dvsSwitch" name="dvs-switch" type="inventory.aai.onap.org.v9.DvsSwitch" />
             </java-attributes>
         </java-type>
 
@@ -1390,7 +1395,7 @@
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Digital virtual switch metadata, used by SDN-C to configure VCEs.  A&amp;AI needs to receive this data from the PO deployment team and administer it using the provisioningTool.sh into A&amp;AI. " />
@@ -1406,7 +1411,7 @@
             </xml-properties>
             <xml-root-element name="network-profiles" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="networkProfile" name="network-profile" type="inventory.aai.openecomp.org.v9.NetworkProfile" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="networkProfile" name="network-profile" type="inventory.aai.onap.org.v9.NetworkProfile" />
             </java-attributes>
         </java-type>
 
@@ -1428,7 +1433,7 @@
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Network profile populated by SDN-GP for SNMP" />
@@ -1444,7 +1449,7 @@
             </xml-properties>
             <xml-root-element name="pservers" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="pserver" name="pserver" type="inventory.aai.openecomp.org.v9.Pserver" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="pserver" name="pserver" type="inventory.aai.onap.org.v9.Pserver" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="maximumDepth" value="0" />
@@ -1580,9 +1585,9 @@
                         <xml-property name="description" value="Prov Status of this device (not under canopi control) Valid values [PREPROV/NVTPROV/PROV]" />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
-                <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.openecomp.org.v9.PInterfaces" />
-                <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.openecomp.org.v9.LagInterfaces" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
+                <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v9.PInterfaces" />
+                <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v9.LagInterfaces" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Compute host whose hostname must be unique and must exactly match what is sent as a relationship to a vserver." />
@@ -1600,7 +1605,7 @@
             </xml-properties>
             <xml-root-element name="p-interfaces" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="pInterface" name="p-interface" type="inventory.aai.openecomp.org.v9.PInterface" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="pInterface" name="p-interface" type="inventory.aai.onap.org.v9.PInterface" />
             </java-attributes>
         </java-type>
 
@@ -1652,8 +1657,8 @@
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
-                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.openecomp.org.v9.LInterfaces" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
+                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v9.LInterfaces" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Physical interface (e.g., nic)" />
@@ -1670,7 +1675,7 @@
             </xml-properties>
             <xml-root-element name="lag-interfaces" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="lagInterface" name="lag-interface" type="inventory.aai.openecomp.org.v9.LagInterface" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="lagInterface" name="lag-interface" type="inventory.aai.onap.org.v9.LagInterface" />
             </java-attributes>
         </java-type>
 
@@ -1717,8 +1722,8 @@
                         <xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
-                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.openecomp.org.v9.LInterfaces" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
+                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v9.LInterfaces" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Link aggregate interface" />
@@ -1734,7 +1739,7 @@
             </xml-properties>
             <xml-root-element name="oam-networks" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="oamNetwork" name="oam-network" type="inventory.aai.openecomp.org.v9.OamNetwork" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="oamNetwork" name="oam-network" type="inventory.aai.onap.org.v9.OamNetwork" />
             </java-attributes>
         </java-type>
 
@@ -1771,7 +1776,7 @@
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="OAM network, to be deprecated shortly.  Do not use for new purposes. " />
@@ -1788,7 +1793,7 @@
             </xml-properties>
             <xml-root-element name="availability-zones" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="availabilityZone" name="availability-zone" type="inventory.aai.openecomp.org.v9.AvailabilityZone" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="availabilityZone" name="availability-zone" type="inventory.aai.onap.org.v9.AvailabilityZone" />
             </java-attributes>
         </java-type>
 
@@ -1816,7 +1821,7 @@
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Availability zone, a collection of compute hosts/pservers" />
@@ -1832,7 +1837,7 @@
             </xml-properties>
             <xml-root-element name="virtual-data-centers" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="virtualDataCenter" name="virtual-data-center" type="inventory.aai.openecomp.org.v9.VirtualDataCenter" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="virtualDataCenter" name="virtual-data-center" type="inventory.aai.onap.org.v9.VirtualDataCenter" />
             </java-attributes>
         </java-type>
 
@@ -1854,7 +1859,7 @@
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Virtual organization of cloud infrastructure elements in a data center context" />
@@ -1874,8 +1879,8 @@
             </xml-properties>
             <xml-root-element name="business" />
             <java-attributes>
-                <xml-element java-attribute="connectors" name="connectors" type="inventory.aai.openecomp.org.v9.Connectors" />
-                <xml-element java-attribute="customers" name="customers" type="inventory.aai.openecomp.org.v9.Customers" />
+                <xml-element java-attribute="connectors" name="connectors" type="inventory.aai.onap.org.v9.Connectors" />
+                <xml-element java-attribute="customers" name="customers" type="inventory.aai.onap.org.v9.Customers" />
             </java-attributes>
         </java-type>
 
@@ -1885,7 +1890,7 @@
             </xml-properties>
             <xml-root-element name="connectors" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="connector" name="connector" type="inventory.aai.openecomp.org.v9.Connector" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="connector" name="connector" type="inventory.aai.onap.org.v9.Connector" />
             </java-attributes>
         </java-type>
 
@@ -1935,8 +1940,8 @@
                         <xml-property name="description" value="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
-                <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.openecomp.org.v9.Metadata" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
+                <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v9.Metadata" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Collection of resource instances used to connect a variety of disparate inventory widgets" />
@@ -1952,7 +1957,7 @@
             </xml-properties>
             <xml-root-element name="customers" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="customer" name="customer" type="inventory.aai.openecomp.org.v9.Customer" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="customer" name="customer" type="inventory.aai.onap.org.v9.Customer" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="maximumDepth" value="0" />
@@ -1983,8 +1988,8 @@
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="serviceSubscriptions" name="service-subscriptions" type="inventory.aai.openecomp.org.v9.ServiceSubscriptions" />
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
+                <xml-element java-attribute="serviceSubscriptions" name="service-subscriptions" type="inventory.aai.onap.org.v9.ServiceSubscriptions" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="customer identifiers to provide linkage back to BSS information." />
@@ -2003,7 +2008,7 @@
             </xml-properties>
             <xml-root-element name="service-subscriptions" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="serviceSubscription" name="service-subscription" type="inventory.aai.openecomp.org.v9.ServiceSubscription" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="serviceSubscription" name="service-subscription" type="inventory.aai.onap.org.v9.ServiceSubscription" />
             </java-attributes>
         </java-type>
 
@@ -2025,9 +2030,9 @@
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="serviceInstances" name="service-instances" type="inventory.aai.openecomp.org.v9.ServiceInstances">
+                <xml-element java-attribute="serviceInstances" name="service-instances" type="inventory.aai.onap.org.v9.ServiceInstances">
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Object that group service instances." />
@@ -2044,7 +2049,7 @@
             </xml-properties>
             <xml-root-element name="service-instances" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="serviceInstance" name="service-instance" type="inventory.aai.openecomp.org.v9.ServiceInstance" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="serviceInstance" name="service-instance" type="inventory.aai.onap.org.v9.ServiceInstance" />
             </java-attributes>
         </java-type>
 
@@ -2144,9 +2149,9 @@
                         <xml-property name="description" value="Orchestration status of this service." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
-                <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.openecomp.org.v9.Metadata" />
-                <xml-element java-attribute="allottedResources" name="allotted-resources" type="inventory.aai.openecomp.org.v9.AllottedResources" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
+                <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v9.Metadata" />
+                <xml-element java-attribute="allottedResources" name="allotted-resources" type="inventory.aai.onap.org.v9.AllottedResources" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Instance of a service" />
@@ -2165,11 +2170,11 @@
             </xml-properties>
             <xml-root-element name="service-design-and-creation" />
             <java-attributes>
-                <xml-element java-attribute="vnfImages" name="vnf-images" type="inventory.aai.openecomp.org.v9.VnfImages" />
-                <xml-element java-attribute="services" name="services" type="inventory.aai.openecomp.org.v9.Services" />
-                <xml-element java-attribute="serviceCapabilities" name="service-capabilities" type="inventory.aai.openecomp.org.v9.ServiceCapabilities" />
-                <xml-element java-attribute="models" name="models" type="inventory.aai.openecomp.org.v9.Models" />
-                <xml-element java-attribute="namedQueries" name="named-queries" type="inventory.aai.openecomp.org.v9.NamedQueries" />
+                <xml-element java-attribute="vnfImages" name="vnf-images" type="inventory.aai.onap.org.v9.VnfImages" />
+                <xml-element java-attribute="services" name="services" type="inventory.aai.onap.org.v9.Services" />
+                <xml-element java-attribute="serviceCapabilities" name="service-capabilities" type="inventory.aai.onap.org.v9.ServiceCapabilities" />
+                <xml-element java-attribute="models" name="models" type="inventory.aai.onap.org.v9.Models" />
+                <xml-element java-attribute="namedQueries" name="named-queries" type="inventory.aai.onap.org.v9.NamedQueries" />
             </java-attributes>
         </java-type>
 
@@ -2179,7 +2184,7 @@
             </xml-properties>
             <xml-root-element name="vnf-images" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="vnfImage" name="vnf-image" type="inventory.aai.openecomp.org.v9.VnfImage" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="vnfImage" name="vnf-image" type="inventory.aai.onap.org.v9.VnfImage" />
             </java-attributes>
         </java-type>
 
@@ -2216,7 +2221,7 @@
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Image object that pertain to a VNF that doesn't have associated vservers.  This is a kludge." />
@@ -2233,7 +2238,7 @@
             </xml-properties>
             <xml-root-element name="services" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="service" name="service" type="inventory.aai.openecomp.org.v9.Service" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="service" name="service" type="inventory.aai.onap.org.v9.Service" />
             </java-attributes>
         </java-type>
 
@@ -2265,7 +2270,7 @@
                         <xml-property name="description" value="service version" />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Stand-in for service model definitions.  Likely to be deprecated in favor of models from ASDC.  Does not strictly map to ASDC services." />
@@ -2281,7 +2286,7 @@
             </xml-properties>
             <xml-root-element name="service-capabilities" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="serviceCapability" name="service-capability" type="inventory.aai.openecomp.org.v9.ServiceCapability" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="serviceCapability" name="service-capability" type="inventory.aai.onap.org.v9.ServiceCapability" />
             </java-attributes>
         </java-type>
 
@@ -2303,7 +2308,7 @@
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Early definition of server/resource pairings, likely to be replaced by models.  No new use should be made of this." />
@@ -2319,24 +2324,24 @@
             </xml-properties>
             <xml-root-element name="network" />
             <java-attributes>
-                <xml-element java-attribute="logicalLinks" name="logical-links" type="inventory.aai.openecomp.org.v9.LogicalLinks" />
-                <xml-element java-attribute="sitePairSets" name="site-pair-sets" type="inventory.aai.openecomp.org.v9.SitePairSets" />
-                <xml-element java-attribute="vpnBindings" name="vpn-bindings" type="inventory.aai.openecomp.org.v9.VpnBindings" />
-                <xml-element java-attribute="vplsPes" name="vpls-pes" type="inventory.aai.openecomp.org.v9.VplsPes" />
-                <xml-element java-attribute="multicastConfigurations" name="multicast-configurations" type="inventory.aai.openecomp.org.v9.MulticastConfigurations" />
-                <xml-element java-attribute="vces" name="vces" type="inventory.aai.openecomp.org.v9.Vces" />
-                <xml-element java-attribute="vnfcs" name="vnfcs" type="inventory.aai.openecomp.org.v9.Vnfcs" />
-                <xml-element java-attribute="l3Networks" name="l3-networks" type="inventory.aai.openecomp.org.v9.L3Networks" />
-                <xml-element java-attribute="networkPolicies" name="network-policies" type="inventory.aai.openecomp.org.v9.NetworkPolicies" />
-                <xml-element java-attribute="genericVnfs" name="generic-vnfs" type="inventory.aai.openecomp.org.v9.GenericVnfs" />
-                <xml-element java-attribute="lagLinks" name="lag-links" type="inventory.aai.openecomp.org.v9.LagLinks" />
-                <xml-element java-attribute="newvces" name="newvces" type="inventory.aai.openecomp.org.v9.Newvces" />
-                <xml-element java-attribute="pnfs" name="pnfs" type="inventory.aai.openecomp.org.v9.Pnfs" />
-                <xml-element java-attribute="physicalLinks" name="physical-links" type="inventory.aai.openecomp.org.v9.PhysicalLinks" />
-                <xml-element java-attribute="ipsecConfigurations" name="ipsec-configurations" type="inventory.aai.openecomp.org.v9.IpsecConfigurations" />
-                <xml-element java-attribute="routeTableReferences" name="route-table-references" type="inventory.aai.openecomp.org.v9.RouteTableReferences" />
-                <xml-element java-attribute="instanceGroups" name="instance-groups" type="inventory.aai.openecomp.org.v9.InstanceGroups" />
-                <xml-element java-attribute="zones" name="zones" type="inventory.aai.openecomp.org.v9.Zones" />
+                <xml-element java-attribute="logicalLinks" name="logical-links" type="inventory.aai.onap.org.v9.LogicalLinks" />
+                <xml-element java-attribute="sitePairSets" name="site-pair-sets" type="inventory.aai.onap.org.v9.SitePairSets" />
+                <xml-element java-attribute="vpnBindings" name="vpn-bindings" type="inventory.aai.onap.org.v9.VpnBindings" />
+                <xml-element java-attribute="vplsPes" name="vpls-pes" type="inventory.aai.onap.org.v9.VplsPes" />
+                <xml-element java-attribute="multicastConfigurations" name="multicast-configurations" type="inventory.aai.onap.org.v9.MulticastConfigurations" />
+                <xml-element java-attribute="vces" name="vces" type="inventory.aai.onap.org.v9.Vces" />
+                <xml-element java-attribute="vnfcs" name="vnfcs" type="inventory.aai.onap.org.v9.Vnfcs" />
+                <xml-element java-attribute="l3Networks" name="l3-networks" type="inventory.aai.onap.org.v9.L3Networks" />
+                <xml-element java-attribute="networkPolicies" name="network-policies" type="inventory.aai.onap.org.v9.NetworkPolicies" />
+                <xml-element java-attribute="genericVnfs" name="generic-vnfs" type="inventory.aai.onap.org.v9.GenericVnfs" />
+                <xml-element java-attribute="lagLinks" name="lag-links" type="inventory.aai.onap.org.v9.LagLinks" />
+                <xml-element java-attribute="newvces" name="newvces" type="inventory.aai.onap.org.v9.Newvces" />
+                <xml-element java-attribute="pnfs" name="pnfs" type="inventory.aai.onap.org.v9.Pnfs" />
+                <xml-element java-attribute="physicalLinks" name="physical-links" type="inventory.aai.onap.org.v9.PhysicalLinks" />
+                <xml-element java-attribute="ipsecConfigurations" name="ipsec-configurations" type="inventory.aai.onap.org.v9.IpsecConfigurations" />
+                <xml-element java-attribute="routeTableReferences" name="route-table-references" type="inventory.aai.onap.org.v9.RouteTableReferences" />
+                <xml-element java-attribute="instanceGroups" name="instance-groups" type="inventory.aai.onap.org.v9.InstanceGroups" />
+                <xml-element java-attribute="zones" name="zones" type="inventory.aai.onap.org.v9.Zones" />
             </java-attributes>
         </java-type>
 
@@ -2346,7 +2351,7 @@
             </xml-properties>
             <xml-root-element name="logical-links" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="logicalLink" name="logical-link" type="inventory.aai.openecomp.org.v9.LogicalLink" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="logicalLink" name="logical-link" type="inventory.aai.onap.org.v9.LogicalLink" />
             </java-attributes>
         </java-type>
 
@@ -2456,7 +2461,7 @@
                         <xml-property name="description" value="Reason for this entity, role it is playing" />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Logical links generally connect l-interfaces but are used to express logical connectivity between two points" />
@@ -2474,7 +2479,7 @@
             </xml-properties>
             <xml-root-element name="site-pair-sets" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="sitePairSet" name="site-pair-set" type="inventory.aai.openecomp.org.v9.SitePairSet" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="sitePairSet" name="site-pair-set" type="inventory.aai.onap.org.v9.SitePairSet" />
             </java-attributes>
         </java-type>
 
@@ -2491,8 +2496,8 @@
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="routingInstances" name="routing-instances" type="inventory.aai.openecomp.org.v9.RoutingInstances" />
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
+                <xml-element java-attribute="routingInstances" name="routing-instances" type="inventory.aai.onap.org.v9.RoutingInstances" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Set of instances for probes used to measure service level agreements" />
@@ -2509,7 +2514,7 @@
             </xml-properties>
             <xml-root-element name="routing-instances" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="routingInstance" name="routing-instance" type="inventory.aai.openecomp.org.v9.RoutingInstance" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="routingInstance" name="routing-instance" type="inventory.aai.onap.org.v9.RoutingInstance" />
             </java-attributes>
         </java-type>
 
@@ -2531,8 +2536,8 @@
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="sitePairs" name="site-pairs" type="inventory.aai.openecomp.org.v9.SitePairs" />
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
+                <xml-element java-attribute="sitePairs" name="site-pairs" type="inventory.aai.onap.org.v9.SitePairs" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="indexedProps" value="routing-instance-id" />
@@ -2548,7 +2553,7 @@
             </xml-properties>
             <xml-root-element name="site-pairs" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="sitePair" name="site-pair" type="inventory.aai.openecomp.org.v9.SitePair" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="sitePair" name="site-pair" type="inventory.aai.onap.org.v9.SitePair" />
             </java-attributes>
         </java-type>
 
@@ -2590,8 +2595,8 @@
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="classesOfService" name="classes-of-service" type="inventory.aai.openecomp.org.v9.ClassesOfService" />
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
+                <xml-element java-attribute="classesOfService" name="classes-of-service" type="inventory.aai.onap.org.v9.ClassesOfService" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="indexedProps" value="site-pair-id" />
@@ -2607,7 +2612,7 @@
             </xml-properties>
             <xml-root-element name="classes-of-service" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="classOfService" name="class-of-service" type="inventory.aai.openecomp.org.v9.ClassOfService" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="classOfService" name="class-of-service" type="inventory.aai.onap.org.v9.ClassOfService" />
             </java-attributes>
         </java-type>
 
@@ -2634,7 +2639,7 @@
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="indexedProps" value="cos" />
@@ -2646,7 +2651,7 @@
         <java-type name="VpnBindings">
             <xml-root-element name="vpn-bindings" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="vpnBinding" name="vpn-binding" type="inventory.aai.openecomp.org.v9.VpnBinding" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="vpnBinding" name="vpn-binding" type="inventory.aai.onap.org.v9.VpnBinding" />
             </java-attributes>
         </java-type>
 
@@ -2696,7 +2701,7 @@
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList">
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList">
                     <xml-properties>
                         <xml-property name="description" value="l3-networks relate to vpn-bindings" />
                     </xml-properties>
@@ -2719,7 +2724,7 @@
             </xml-properties>
             <xml-root-element name="vpls-pes" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="vplsPe" name="vpls-pe" type="inventory.aai.openecomp.org.v9.VplsPe" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="vplsPe" name="vpls-pe" type="inventory.aai.onap.org.v9.VplsPe" />
             </java-attributes>
         </java-type>
 
@@ -2752,9 +2757,9 @@
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
-                <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.openecomp.org.v9.PInterfaces" />
-                <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.openecomp.org.v9.LagInterfaces" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
+                <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v9.PInterfaces" />
+                <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v9.LagInterfaces" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="VPLS Provider Edge routers." />
@@ -2770,7 +2775,7 @@
             </xml-properties>
             <xml-root-element name="multicast-configurations" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="multicastConfiguration" name="multicast-configuration" type="inventory.aai.openecomp.org.v9.MulticastConfiguration" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="multicastConfiguration" name="multicast-configuration" type="inventory.aai.onap.org.v9.MulticastConfiguration" />
             </java-attributes>
         </java-type>
 
@@ -2797,7 +2802,7 @@
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="indexedProps" value="multicast-configuration-id" />
@@ -2813,7 +2818,7 @@
             </xml-properties>
             <xml-root-element name="vces" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="vce" name="vce" type="inventory.aai.openecomp.org.v9.Vce" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="vce" name="vce" type="inventory.aai.onap.org.v9.Vce" />
             </java-attributes>
         </java-type>
 
@@ -2916,10 +2921,10 @@
                         <xml-property name="description" value="OBSOLETE -  see child relationships" />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="portGroups" name="port-groups" type="inventory.aai.openecomp.org.v9.PortGroups" />
-                <xml-element java-attribute="licenses" name="licenses" type="inventory.aai.openecomp.org.v9.Licenses" />
-                <xml-element java-attribute="entitlements" name="entitlements" type="inventory.aai.openecomp.org.v9.Entitlements" />
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
+                <xml-element java-attribute="portGroups" name="port-groups" type="inventory.aai.onap.org.v9.PortGroups" />
+                <xml-element java-attribute="licenses" name="licenses" type="inventory.aai.onap.org.v9.Licenses" />
+                <xml-element java-attribute="entitlements" name="entitlements" type="inventory.aai.onap.org.v9.Entitlements" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Virtual Customer Edge Router, used specifically for Gamma.  This object is deprecated." />
@@ -2936,7 +2941,7 @@
         <java-type name="PortGroups">
             <xml-root-element name="port-groups" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="portGroup" name="port-group" type="inventory.aai.openecomp.org.v9.PortGroup" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="portGroup" name="port-group" type="inventory.aai.onap.org.v9.PortGroup" />
             </java-attributes>
         </java-type>
 
@@ -2998,8 +3003,8 @@
                         <xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE" />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="cvlanTags" name="cvlan-tags" type="inventory.aai.openecomp.org.v9.CvlanTags" />
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
+                <xml-element java-attribute="cvlanTags" name="cvlan-tags" type="inventory.aai.onap.org.v9.CvlanTags" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Used to capture the network interfaces of this VCE" />
@@ -3013,7 +3018,7 @@
         <java-type name="CvlanTags">
             <xml-root-element name="cvlan-tags" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="cvlanTagEntry" name="cvlan-tag-entry" type="inventory.aai.openecomp.org.v9.CvlanTagEntry" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="cvlanTagEntry" name="cvlan-tag-entry" type="inventory.aai.onap.org.v9.CvlanTagEntry" />
             </java-attributes>
         </java-type>
 
@@ -3030,7 +3035,7 @@
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="dependentOn" value="port-group" />
@@ -3047,7 +3052,7 @@
             </xml-properties>
             <xml-root-element name="vnfcs" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="vnfc" name="vnfc" type="inventory.aai.openecomp.org.v9.Vnfc" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="vnfc" name="vnfc" type="inventory.aai.onap.org.v9.Vnfc" />
             </java-attributes>
         </java-type>
 
@@ -3107,7 +3112,7 @@
 						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="indexedProps" value="vnfc-name,prov-status,vnfc-type,vnfc-function-code,ipaddress-v4-oam-vip,in-maint,is-closed-loop-disabled,group-notation" />
@@ -3120,7 +3125,7 @@
         <java-type name="L3Networks">
             <xml-root-element name="l3-networks" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="l3Network" name="l3-network" type="inventory.aai.openecomp.org.v9.L3Network" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="l3Network" name="l3-network" type="inventory.aai.onap.org.v9.L3Network" />
             </java-attributes>
         </java-type>
 
@@ -3265,10 +3270,10 @@
                         <xml-property name="description" value="Path to the controller object." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="subnets" name="subnets" type="inventory.aai.openecomp.org.v9.Subnets" />
-                <xml-element java-attribute="ctagAssignments" name="ctag-assignments" type="inventory.aai.openecomp.org.v9.CtagAssignments" />
-                <xml-element java-attribute="segmentationAssignments" name="segmentation-assignments" type="inventory.aai.openecomp.org.v9.SegmentationAssignments" />
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" >
+                <xml-element java-attribute="subnets" name="subnets" type="inventory.aai.onap.org.v9.Subnets" />
+                <xml-element java-attribute="ctagAssignments" name="ctag-assignments" type="inventory.aai.onap.org.v9.CtagAssignments" />
+                <xml-element java-attribute="segmentationAssignments" name="segmentation-assignments" type="inventory.aai.onap.org.v9.SegmentationAssignments" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" >
                     <xml-properties>
                         <xml-property name="description" value="Relates to tenant (or is it a child of tenant), complex, service, vpn-binding" />
                     </xml-properties>
@@ -3287,7 +3292,7 @@
         <java-type name="NetworkPolicies">
             <xml-root-element name="network-policies" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="networkPolicy" name="network-policy" type="inventory.aai.openecomp.org.v9.NetworkPolicy" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="networkPolicy" name="network-policy" type="inventory.aai.onap.org.v9.NetworkPolicy" />
             </java-attributes>
         </java-type>
         <java-type name="NetworkPolicy">
@@ -3313,7 +3318,7 @@
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="nameProps" value="network-policy-fqdn" />
@@ -3327,7 +3332,7 @@
         <java-type name="CtagAssignments">
             <xml-root-element name="ctag-assignments" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="ctagAssignment" name="ctag-assignment" type="inventory.aai.openecomp.org.v9.CtagAssignment" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="ctagAssignment" name="ctag-assignment" type="inventory.aai.onap.org.v9.CtagAssignment" />
             </java-attributes>
         </java-type>
 
@@ -3344,7 +3349,7 @@
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="indexedProps" value="vlan-id-inner" />
@@ -3356,7 +3361,7 @@
         <java-type name="Subnets">
             <xml-root-element name="subnets" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="subnet" name="subnet" type="inventory.aai.openecomp.org.v9.Subnet" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="subnet" name="subnet" type="inventory.aai.onap.org.v9.Subnet" />
             </java-attributes>
         </java-type>
 
@@ -3424,7 +3429,7 @@
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="indexedProps" value="subnet-id,subnet-name" />
@@ -3441,7 +3446,7 @@
             </xml-properties>
             <xml-root-element name="generic-vnfs" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="genericVnf" name="generic-vnf" type="inventory.aai.openecomp.org.v9.GenericVnf" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="genericVnf" name="generic-vnf" type="inventory.aai.onap.org.v9.GenericVnf" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="maximumDepth" value="0" />
@@ -3653,12 +3658,12 @@
                         <xml-property name="description" value="Path to the controller object." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
-                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.openecomp.org.v9.LInterfaces" />
-                <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.openecomp.org.v9.LagInterfaces" />
-                <xml-element java-attribute="vfModules" name="vf-modules" type="inventory.aai.openecomp.org.v9.VfModules" />
-                <xml-element java-attribute="licenses" name="licenses" type="inventory.aai.openecomp.org.v9.Licenses" />
-                <xml-element java-attribute="entitlements" name="entitlements" type="inventory.aai.openecomp.org.v9.Entitlements" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
+                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v9.LInterfaces" />
+                <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v9.LagInterfaces" />
+                <xml-element java-attribute="vfModules" name="vf-modules" type="inventory.aai.onap.org.v9.VfModules" />
+                <xml-element java-attribute="licenses" name="licenses" type="inventory.aai.onap.org.v9.Licenses" />
+                <xml-element java-attribute="entitlements" name="entitlements" type="inventory.aai.onap.org.v9.Entitlements" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="General purpose VNF" />
@@ -3678,7 +3683,7 @@
             </xml-properties>
             <xml-root-element name="vf-modules" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="vfModule" name="vf-module" type="inventory.aai.openecomp.org.v9.VfModule" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="vfModule" name="vf-module" type="inventory.aai.onap.org.v9.VfModule" />
             </java-attributes>
         </java-type>
 
@@ -3770,7 +3775,7 @@
                         <xml-property name="description" value="Path to the controller object." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="a deployment unit of VNFCs" />
@@ -3788,7 +3793,7 @@
             </xml-properties>
             <xml-root-element name="lag-links" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="lagLink" name="lag-link" type="inventory.aai.openecomp.org.v9.LagLink" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="lagLink" name="lag-link" type="inventory.aai.onap.org.v9.LagLink" />
             </java-attributes>
         </java-type>
 
@@ -3805,7 +3810,7 @@
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="LAG links can connect lag-interfaces" />
@@ -3821,7 +3826,7 @@
             </xml-properties>
             <xml-root-element name="newvces" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="newvce" name="newvce" type="inventory.aai.openecomp.org.v9.Newvce" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="newvce" name="newvce" type="inventory.aai.onap.org.v9.Newvce" />
             </java-attributes>
         </java-type>
 
@@ -3899,8 +3904,8 @@
                         <xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE" />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
-                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.openecomp.org.v9.LInterfaces" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
+                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v9.LInterfaces" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="This object fills in the gaps from vce that were incorporated into generic-vnf.  This object will be retired with vce." />
@@ -3919,7 +3924,7 @@
             </xml-properties>
             <xml-root-element name="pnfs" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="pnf" name="pnf" type="inventory.aai.openecomp.org.v9.Pnf" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="pnf" name="pnf" type="inventory.aai.onap.org.v9.Pnf" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="maximumDepth" value="0" />
@@ -4040,9 +4045,9 @@
                         <xml-property name="description" value="Nf Role is the role performed by this instance in the network." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
-                <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.openecomp.org.v9.PInterfaces" />
-                <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.openecomp.org.v9.LagInterfaces" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
+                <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v9.PInterfaces" />
+                <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v9.LagInterfaces" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="PNF represents a physical network function. typically equipment used in the D1 world." />
@@ -4060,7 +4065,7 @@
             </xml-properties>
             <xml-root-element name="physical-links" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="physicalLink" name="physical-link" type="inventory.aai.openecomp.org.v9.PhysicalLink" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="physicalLink" name="physical-link" type="inventory.aai.onap.org.v9.PhysicalLink" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="maximumDepth" value="0" />
@@ -4110,7 +4115,7 @@
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Collection of physical connections, typically between p-interfaces" />
@@ -4125,7 +4130,7 @@
         <java-type name="VigServers">
             <xml-root-element name="vig-servers" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="vigServer" name="vig-server" type="inventory.aai.openecomp.org.v9.VigServer" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="vigServer" name="vig-server" type="inventory.aai.onap.org.v9.VigServer" />
             </java-attributes>
         </java-type>
 
@@ -4152,7 +4157,7 @@
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="vig-server contains information about a vig server used for IPSec-configuration. Populated by SDN-C from 1607" />
@@ -4165,7 +4170,7 @@
         <java-type name="IpsecConfigurations">
             <xml-root-element name="ipsec-configurations" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="ipsecConfiguration" name="ipsec-configuration" type="inventory.aai.openecomp.org.v9.IpsecConfiguration" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="ipsecConfiguration" name="ipsec-configuration" type="inventory.aai.onap.org.v9.IpsecConfiguration" />
             </java-attributes>
         </java-type>
 
@@ -4282,8 +4287,8 @@
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
-                <xml-element java-attribute="vigServers" name="vig-servers" type="inventory.aai.openecomp.org.v9.VigServers" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
+                <xml-element java-attribute="vigServers" name="vig-servers" type="inventory.aai.onap.org.v9.VigServers" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="IPSec configuration node will contain various configuration data for the NMTE VNF. This node will have an edge to the generic-vnf (vnf type = TE). Starting 1607, this data will be populated by SDN-C" />
@@ -4299,7 +4304,7 @@
             <xml-root-element name="notification-event" />
             <java-attributes>
                 <xml-element java-attribute="cambriaPartition" name="cambria.partition" type="java.lang.String" />
-                <xml-element java-attribute="eventHeader" name="event-header" type="inventory.aai.openecomp.org.v9.NotificationEventHeader" />
+                <xml-element java-attribute="eventHeader" name="event-header" type="inventory.aai.onap.org.v9.NotificationEventHeader" />
                 <xml-any-element java-attribute="entity" />
             </java-attributes>
         </java-type>
@@ -4324,8 +4329,8 @@
         <java-type name="AaiInternal">
             <xml-root-element name="aai-internal" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="reservedPropNames" name="reserved-prop-names" type="inventory.aai.openecomp.org.v9.ReservedPropNames" />
-                <xml-element container-type="java.util.ArrayList" java-attribute="edgePropNames" name="edge-prop-names" type="inventory.aai.openecomp.org.v9.EdgePropNames" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="reservedPropNames" name="reserved-prop-names" type="inventory.aai.onap.org.v9.ReservedPropNames" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="edgePropNames" name="edge-prop-names" type="inventory.aai.onap.org.v9.EdgePropNames" />
             </java-attributes>
         </java-type>
         <java-type name="ReservedPropNames">
@@ -4370,7 +4375,7 @@
             </xml-properties>
             <xml-root-element name="models" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="model" name="model" type="inventory.aai.openecomp.org.v9.Model" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="model" name="model" type="inventory.aai.onap.org.v9.Model" />
             </java-attributes>
         </java-type>
 
@@ -4400,8 +4405,8 @@
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="modelVers" name="model-vers" type="inventory.aai.openecomp.org.v9.ModelVers" />
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
+                <xml-element java-attribute="modelVers" name="model-vers" type="inventory.aai.onap.org.v9.ModelVers" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
             </java-attributes>
         </java-type>
 
@@ -4409,7 +4414,7 @@
         <java-type name="ModelVers">
             <xml-root-element name="model-vers" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="modelVer" name="model-ver" type="inventory.aai.openecomp.org.v9.ModelVer" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="modelVer" name="model-ver" type="inventory.aai.onap.org.v9.ModelVer" />
             </java-attributes>
         </java-type>
 
@@ -4448,16 +4453,16 @@
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.openecomp.org.v9.ModelElements" />
-                <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.openecomp.org.v9.Metadata" />
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
+                <xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.onap.org.v9.ModelElements" />
+                <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v9.Metadata" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
             </java-attributes>
         </java-type>
 
         <java-type name="ModelElements">
             <xml-root-element name="model-elements" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="modelElement" name="model-element" type="inventory.aai.openecomp.org.v9.ModelElement" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="modelElement" name="model-element" type="inventory.aai.onap.org.v9.ModelElement" />
             </java-attributes>
         </java-type>
 
@@ -4494,24 +4499,24 @@
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.openecomp.org.v9.ModelElements">
+                <xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.onap.org.v9.ModelElements">
                     <xml-properties>
                         <xml-property name="description" value="Defines how other models combine to make up a higher-level model" />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="modelConstraints" name="model-constraints" type="inventory.aai.openecomp.org.v9.ModelConstraints">
+                <xml-element java-attribute="modelConstraints" name="model-constraints" type="inventory.aai.onap.org.v9.ModelConstraints">
                     <xml-properties>
                         <xml-property name="description" value="Describes new constraints on this model element that are not part of that model's definition" />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
             </java-attributes>
         </java-type>
 
         <java-type name="ModelConstraints">
             <xml-root-element name="model-constraints" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="modelConstraint" name="model-constraint" type="inventory.aai.openecomp.org.v9.ModelConstraint" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="modelConstraint" name="model-constraint" type="inventory.aai.onap.org.v9.ModelConstraint" />
             </java-attributes>
         </java-type>
 
@@ -4532,7 +4537,7 @@
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="constrainedElementSetUuidToReplace" name="constrained-element-set-uuid-to-replace" required="true" type="java.lang.String" />
-                <xml-element java-attribute="constrainedElementSets" name="constrained-element-sets" type="inventory.aai.openecomp.org.v9.ConstrainedElementSets" />
+                <xml-element java-attribute="constrainedElementSets" name="constrained-element-sets" type="inventory.aai.onap.org.v9.ConstrainedElementSets" />
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
@@ -4544,7 +4549,7 @@
         <java-type name="ConstrainedElementSets">
             <xml-root-element name="constrained-element-sets" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="constrainedElementSet" name="constrained-element-set" type="inventory.aai.openecomp.org.v9.ConstrainedElementSet" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="constrainedElementSet" name="constrained-element-set" type="inventory.aai.onap.org.v9.ConstrainedElementSet" />
             </java-attributes>
         </java-type>
 
@@ -4567,15 +4572,15 @@
                 <xml-element java-attribute="constraintType" name="constraint-type" required="true" type="java.lang.String" />
                 <xml-element java-attribute="checkType" name="check-type" required="true" type="java.lang.String" />
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" />
-                <xml-element java-attribute="elementChoiceSets" name="element-choice-sets" type="inventory.aai.openecomp.org.v9.ElementChoiceSets" />
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
+                <xml-element java-attribute="elementChoiceSets" name="element-choice-sets" type="inventory.aai.onap.org.v9.ElementChoiceSets" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
             </java-attributes>
         </java-type>
 
         <java-type name="ElementChoiceSets">
             <xml-root-element name="element-choice-sets" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="elementChoiceSet" name="element-choice-set" type="inventory.aai.openecomp.org.v9.ElementChoiceSet" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="elementChoiceSet" name="element-choice-set" type="inventory.aai.onap.org.v9.ElementChoiceSet" />
             </java-attributes>
         </java-type>
 
@@ -4598,15 +4603,15 @@
                 <xml-element java-attribute="elementChoiceSetName" name="element-choice-set-name" required="true" type="java.lang.String" />
                 <xml-element java-attribute="cardinality" name="cardinality" type="java.lang.String" />
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" />
-                <xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.openecomp.org.v9.ModelElements" />
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
+                <xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.onap.org.v9.ModelElements" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
             </java-attributes>
         </java-type>
 
         <java-type name="NamedQueries">
             <xml-root-element name="named-queries" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="namedQuery" name="named-query" type="inventory.aai.openecomp.org.v9.NamedQuery" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="namedQuery" name="named-query" type="inventory.aai.onap.org.v9.NamedQuery" />
             </java-attributes>
         </java-type>
 
@@ -4629,15 +4634,15 @@
                 </xml-element>
                 <xml-element java-attribute="description" name="description" type="java.lang.String" />
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" />
-                <xml-element java-attribute="namedQueryElements" name="named-query-elements" type="inventory.aai.openecomp.org.v9.NamedQueryElements" />
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
+                <xml-element java-attribute="namedQueryElements" name="named-query-elements" type="inventory.aai.onap.org.v9.NamedQueryElements" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
             </java-attributes>
         </java-type>
 
         <java-type name="NamedQueryElements">
             <xml-root-element name="named-query-elements" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="namedQueryElement" name="named-query-element" type="inventory.aai.openecomp.org.v9.NamedQueryElement" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="namedQueryElement" name="named-query-element" type="inventory.aai.onap.org.v9.NamedQueryElement" />
             </java-attributes>
         </java-type>
 
@@ -4661,17 +4666,17 @@
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" />
                 <xml-element java-attribute="propertyLimitDesc" name="property-limit-desc" type="java.lang.String" />
                 <xml-element java-attribute="doNotOutput" name="do-not-output" type="java.lang.String" />
-                <xml-element java-attribute="namedQueryElements" name="named-query-elements" type="inventory.aai.openecomp.org.v9.NamedQueryElements" />
-                <xml-element java-attribute="relatedLookups" name="related-lookups" type="inventory.aai.openecomp.org.v9.RelatedLookups" />
-                <xml-element java-attribute="propertyConstraints" name="property-constraints" type="inventory.aai.openecomp.org.v9.PropertyConstraints" />
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
+                <xml-element java-attribute="namedQueryElements" name="named-query-elements" type="inventory.aai.onap.org.v9.NamedQueryElements" />
+                <xml-element java-attribute="relatedLookups" name="related-lookups" type="inventory.aai.onap.org.v9.RelatedLookups" />
+                <xml-element java-attribute="propertyConstraints" name="property-constraints" type="inventory.aai.onap.org.v9.PropertyConstraints" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
             </java-attributes>
         </java-type>
 
         <java-type name="RelatedLookups">
             <xml-root-element name="related-lookups" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="relatedLookup" name="related-lookup" type="inventory.aai.openecomp.org.v9.RelatedLookup" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="relatedLookup" name="related-lookup" type="inventory.aai.onap.org.v9.RelatedLookup" />
             </java-attributes>
         </java-type>
 
@@ -4697,14 +4702,14 @@
                 <xml-element java-attribute="targetNodeProperty" name="target-node-property" required="true" type="java.lang.String" />
                 <xml-element container-type="java.util.ArrayList" java-attribute="propertyCollectList" name="property-collect-list" type="java.lang.String" />
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" />
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
             </java-attributes>
         </java-type>
 
         <java-type name="PropertyConstraints">
             <xml-root-element name="property-constraints" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="propertyConstraint" name="property-constraint" type="inventory.aai.openecomp.org.v9.PropertyConstraint" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="propertyConstraint" name="property-constraint" type="inventory.aai.onap.org.v9.PropertyConstraint" />
             </java-attributes>
         </java-type>
 
@@ -4737,9 +4742,9 @@
             </xml-properties>
             <xml-root-element name="model-and-named-query-search" />
             <java-attributes>
-                <xml-element java-attribute="queryParameters" name="query-parameters" type="inventory.aai.openecomp.org.v9.QueryParameters" />
-                <xml-element java-attribute="instanceFilters" name="instance-filters" type="inventory.aai.openecomp.org.v9.InstanceFilters" />
-                <xml-element java-attribute="secondaryFilts" name="secondary-filts" type="inventory.aai.openecomp.org.v9.SecondaryFilts" />
+                <xml-element java-attribute="queryParameters" name="query-parameters" type="inventory.aai.onap.org.v9.QueryParameters" />
+                <xml-element java-attribute="instanceFilters" name="instance-filters" type="inventory.aai.onap.org.v9.InstanceFilters" />
+                <xml-element java-attribute="secondaryFilts" name="secondary-filts" type="inventory.aai.onap.org.v9.SecondaryFilts" />
                 <xml-element java-attribute="topNodeType" name="top-node-type" type="java.lang.String" />
                 <xml-element java-attribute="secondaryFilterCutPoint" name="secondary-filter-cut-point" type="java.lang.String" />
             </java-attributes>
@@ -4751,8 +4756,8 @@
             </xml-properties>
             <xml-root-element name="query-parameters" />
             <java-attributes>
-                <xml-element java-attribute="namedQuery" name="named-query" type="inventory.aai.openecomp.org.v9.NamedQuery" />
-                <xml-element java-attribute="model" name="model" type="inventory.aai.openecomp.org.v9.OverloadedModel" />
+                <xml-element java-attribute="namedQuery" name="named-query" type="inventory.aai.onap.org.v9.NamedQuery" />
+                <xml-element java-attribute="model" name="model" type="inventory.aai.onap.org.v9.OverloadedModel" />
             </java-attributes>
         </java-type>
 
@@ -4802,8 +4807,8 @@
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="modelVers" name="model-vers" type="inventory.aai.openecomp.org.v9.ModelVers" />
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
+                <xml-element java-attribute="modelVers" name="model-vers" type="inventory.aai.onap.org.v9.ModelVers" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
             </java-attributes>
         </java-type>
 
@@ -4813,7 +4818,7 @@
             </xml-properties>
             <xml-root-element name="instance-filters" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="instanceFilter" name="instance-filter" type="inventory.aai.openecomp.org.v9.InstanceFilter" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="instanceFilter" name="instance-filter" type="inventory.aai.onap.org.v9.InstanceFilter" />
             </java-attributes>
         </java-type>
 
@@ -4834,7 +4839,7 @@
             </xml-properties>
             <xml-root-element name="secondary-filts" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="secondaryFilt" name="secondary-filt" type="inventory.aai.openecomp.org.v9.SecondaryFilt" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="secondaryFilt" name="secondary-filt" type="inventory.aai.onap.org.v9.SecondaryFilt" />
             </java-attributes>
         </java-type>
 
@@ -4865,7 +4870,7 @@
             </xml-properties>
             <xml-root-element name="response-list" />
             <java-attributes>
-                <xml-element java-attribute="inventoryResponseItems" name="inventory-response-items" type="inventory.aai.openecomp.org.v9.InventoryResponseItems" />
+                <xml-element java-attribute="inventoryResponseItems" name="inventory-response-items" type="inventory.aai.onap.org.v9.InventoryResponseItems" />
             </java-attributes>
         </java-type>
 
@@ -4876,7 +4881,7 @@
             </xml-properties>
             <xml-root-element name="inventory-response-items" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="inventoryResponseItem" name="inventory-response-item" type="inventory.aai.openecomp.org.v9.InventoryResponseItem" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="inventoryResponseItem" name="inventory-response-item" type="inventory.aai.onap.org.v9.InventoryResponseItem" />
             </java-attributes>
         </java-type>
 
@@ -4889,8 +4894,8 @@
             <java-attributes>
                 <xml-element java-attribute="modelName" name="model-name" type="java.lang.String" />
                 <xml-any-element java-attribute="item" />
-                <xml-element java-attribute="extraProperties" name="extra-properties" type="inventory.aai.openecomp.org.v9.ExtraProperties" />
-                <xml-element java-attribute="inventoryResponseItems" name="inventory-response-items" type="inventory.aai.openecomp.org.v9.InventoryResponseItems" />
+                <xml-element java-attribute="extraProperties" name="extra-properties" type="inventory.aai.onap.org.v9.ExtraProperties" />
+                <xml-element java-attribute="inventoryResponseItems" name="inventory-response-items" type="inventory.aai.onap.org.v9.InventoryResponseItems" />
             </java-attributes>
         </java-type>
 
@@ -4900,7 +4905,7 @@
             </xml-properties>
             <xml-root-element name="extra-properties" />
             <java-attributes>
-                <xml-any-element container-type="java.util.ArrayList" java-attribute="extraProperty" name="extra-property" type="inventory.aai.openecomp.org.v9.ExtraProperty" />
+                <xml-any-element container-type="java.util.ArrayList" java-attribute="extraProperty" name="extra-property" type="inventory.aai.onap.org.v9.ExtraProperty" />
             </java-attributes>
         </java-type>
 
@@ -4918,7 +4923,7 @@
             </xml-properties>
             <xml-root-element name="route-table-references" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="routeTableReference" name="route-table-reference" type="inventory.aai.openecomp.org.v9.RouteTableReference" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="routeTableReference" name="route-table-reference" type="inventory.aai.onap.org.v9.RouteTableReference" />
             </java-attributes>
         </java-type>
 
@@ -4940,7 +4945,7 @@
                         <xml-property name="description" value="Concurrency value" />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
             </java-attributes>
 
             <xml-properties>
@@ -4959,7 +4964,7 @@
             </xml-properties>
             <xml-root-element name="instance-groups" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="instanceGroup" name="instance-group" type="inventory.aai.openecomp.org.v9.InstanceGroup" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="instanceGroup" name="instance-group" type="inventory.aai.onap.org.v9.InstanceGroup" />
             </java-attributes>
         </java-type>
 
@@ -4991,7 +4996,7 @@
                         <xml-property name="description" value="Concurrency value" />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
             </java-attributes>
 
             <xml-properties>
@@ -5011,7 +5016,7 @@
             </xml-properties>
             <xml-root-element name="segmentation-assignments" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="segmentationAssignment" name="segmentation-assignment" type="inventory.aai.openecomp.org.v9.SegmentationAssignment" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="segmentationAssignment" name="segmentation-assignment" type="inventory.aai.onap.org.v9.SegmentationAssignment" />
             </java-attributes>
         </java-type>
 
@@ -5028,7 +5033,7 @@
                         <xml-property name="description" value="Concurrency value" />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Openstack segmentation assignment." />
@@ -5044,7 +5049,7 @@
             </xml-properties>
             <xml-root-element name="allotted-resources" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="allottedResource" name="allotted-resource" type="inventory.aai.openecomp.org.v9.AllottedResource" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="allottedResource" name="allotted-resource" type="inventory.aai.onap.org.v9.AllottedResource" />
             </java-attributes>
         </java-type>
 
@@ -5100,8 +5105,8 @@
                         <xml-property name="description" value="Concurrency value" />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="tunnelXconnects" name="tunnel-xconnects" type="inventory.aai.openecomp.org.v9.TunnelXconnects" />
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
+                <xml-element java-attribute="tunnelXconnects" name="tunnel-xconnects" type="inventory.aai.onap.org.v9.TunnelXconnects" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
             </java-attributes>
 
             <xml-properties>
@@ -5121,7 +5126,7 @@
             </xml-properties>
             <xml-root-element name="tunnel-xconnects" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="tunnelXconnect" name="tunnel-xconnect" type="inventory.aai.openecomp.org.v9.TunnelXconnect" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="tunnelXconnect" name="tunnel-xconnect" type="inventory.aai.onap.org.v9.TunnelXconnect" />
             </java-attributes>
         </java-type>
 
@@ -5158,7 +5163,7 @@
                         <xml-property name="description" value="Concurrency value" />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
             </java-attributes>
 
             <xml-properties>
@@ -5177,7 +5182,7 @@
             </xml-properties>
             <xml-root-element name="entitlements" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="entitlement" name="entitlement" type="inventory.aai.openecomp.org.v9.Entitlement" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="entitlement" name="entitlement" type="inventory.aai.onap.org.v9.Entitlement" />
             </java-attributes>
         </java-type>
 
@@ -5199,7 +5204,7 @@
                         <xml-property name="description" value="Concurrency value" />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Metadata for entitlement group." />
@@ -5216,7 +5221,7 @@
             </xml-properties>
             <xml-root-element name="licenses" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="license" name="license" type="inventory.aai.openecomp.org.v9.License" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="license" name="license" type="inventory.aai.onap.org.v9.License" />
             </java-attributes>
         </java-type>
 
@@ -5238,7 +5243,7 @@
                         <xml-property name="description" value="Concurrency value" />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Metadata for license group." />
@@ -5272,7 +5277,7 @@
             </xml-properties>
             <xml-root-element name="zones" />
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="zone" name="zone" type="inventory.aai.openecomp.org.v9.Zone" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="zone" name="zone" type="inventory.aai.onap.org.v9.Zone" />
             </java-attributes>
         </java-type>
 
@@ -5309,7 +5314,7 @@
                         <xml-property name="description" value="Concurrency value" />
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="A zone is a grouping of assets in a location homing to the same connections into the CBB" />
author	Venkata Harish K Kajur <vk250x@att.com>	2017-09-28 12:43:08 -0400
committer	Venkata Harish K Kajur <vk250x@att.com>	2017-09-28 13:29:27 -0400
commit	1767960099ea2983eef5218b8ce44b167ae0774c (patch)
tree	4efe13601c1f9ebebc6026b32ec749778cd96caf /aai-schema/src/main/resources/oxm
parent	a8a05641920545aa094dffdb016b7b5febe9a879 (diff)