Renaming openecomp to onap

Issue-ID: AAI-208
Change-Id: I2635c4ed4f9e5d17b93a8ec2c3a0d82b79f75320
Signed-off-by: Arul.Nambi <arul.nambi@amdocs.com>

128 files changed, 591 insertions, 579 deletions

diff --git a/README.md b/README.md
index 79700f3..08489f2 100644
--- a/README.md
+++ b/README.md
@@ -383,7 +383,7 @@ There is a jar-with-dependencies provided in maven that contains a performance t
 
 ```
 
-java -cp champ-0.0.1-SNAPSHOT-jar-with-dependencies.jar org.openecomp.aai.champ.perf.ChampAPIPerformanceTest --champ.graph.type=IN_MEMORY
+java -cp champ-0.0.1-SNAPSHOT-jar-with-dependencies.jar org.onap.aai.champ.perf.ChampAPIPerformanceTest --champ.graph.type=IN_MEMORY
 
 
 ```
@@ -394,7 +394,7 @@ Note that after the --champ.graph.type=TITAN parameter is provided, you may prov
 
 ```
 
-java -cp champ-0.0.1-SNAPSHOT-jar-with-dependencies.jar org.openecomp.aai.champ.perf.ChampAPIPerformanceTest --champ.graph.type=TITAN --storage.backend=cassandrathrift --storage.hostname=localhost
+java -cp champ-0.0.1-SNAPSHOT-jar-with-dependencies.jar org.onap.aai.champ.perf.ChampAPIPerformanceTest --champ.graph.type=TITAN --storage.backend=cassandrathrift --storage.hostname=localhost
 
 
 ```
diff --git a/pom.xml b/pom.xml
index c99e9b9..7a1c572 100755
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 		<version>1.0.0-SNAPSHOT</version>
 	</parent>
 
-	<groupId>org.openecomp.aai</groupId>
+	<groupId>org.onap.aai</groupId>
 	<artifactId>champ</artifactId>
 	<version>1.1.0-SNAPSHOT</version>
 	<name>aai-champ</name>
diff --git a/src/main/java/org/openecomp/aai/champ/ChampAPI.java b/src/main/java/org/onap/aai/champ/ChampAPI.java
index 1eb3758..364f8e9 100644
--- a/src/main/java/org/openecomp/aai/champ/ChampAPI.java
+++ b/src/main/java/org/onap/aai/champ/ChampAPI.java
@@ -19,9 +19,9 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ;
+package org.onap.aai.champ;
 
-import org.openecomp.aai.champ.graph.impl.ChampAPIImpl;
+import org.onap.aai.champ.graph.impl.ChampAPIImpl;
 
 public interface ChampAPI {
 
diff --git a/src/main/java/org/openecomp/aai/champ/ChampCapabilities.java b/src/main/java/org/onap/aai/champ/ChampCapabilities.java
index 31624c7..c7ded86 100644
--- a/src/main/java/org/openecomp/aai/champ/ChampCapabilities.java
+++ b/src/main/java/org/onap/aai/champ/ChampCapabilities.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ;
+package org.onap.aai.champ;
 
 public interface ChampCapabilities {
 
diff --git a/src/main/java/org/openecomp/aai/champ/ChampGraph.java b/src/main/java/org/onap/aai/champ/ChampGraph.java
index 20b9a17..c70294b 100644
--- a/src/main/java/org/openecomp/aai/champ/ChampGraph.java
+++ b/src/main/java/org/onap/aai/champ/ChampGraph.java
@@ -19,28 +19,28 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ;
+package org.onap.aai.champ;
 
 import java.util.Map;
 import java.util.Optional;
 import java.util.stream.Stream;
 
-import org.openecomp.aai.champ.exceptions.ChampIndexNotExistsException;
-import org.openecomp.aai.champ.exceptions.ChampMarshallingException;
-import org.openecomp.aai.champ.exceptions.ChampObjectNotExistsException;
-import org.openecomp.aai.champ.exceptions.ChampRelationshipNotExistsException;
-import org.openecomp.aai.champ.exceptions.ChampSchemaViolationException;
-import org.openecomp.aai.champ.exceptions.ChampUnmarshallingException;
-import org.openecomp.aai.champ.graph.impl.InMemoryChampGraphImpl;
-import org.openecomp.aai.champ.graph.impl.TitanChampGraphImpl;
-import org.openecomp.aai.champ.model.ChampObject;
-import org.openecomp.aai.champ.model.ChampObjectConstraint;
-import org.openecomp.aai.champ.model.ChampObjectIndex;
-import org.openecomp.aai.champ.model.ChampPartition;
-import org.openecomp.aai.champ.model.ChampRelationship;
-import org.openecomp.aai.champ.model.ChampRelationshipConstraint;
-import org.openecomp.aai.champ.model.ChampRelationshipIndex;
-import org.openecomp.aai.champ.model.ChampSchema;
+import org.onap.aai.champ.exceptions.ChampIndexNotExistsException;
+import org.onap.aai.champ.exceptions.ChampMarshallingException;
+import org.onap.aai.champ.exceptions.ChampObjectNotExistsException;
+import org.onap.aai.champ.exceptions.ChampRelationshipNotExistsException;
+import org.onap.aai.champ.exceptions.ChampSchemaViolationException;
+import org.onap.aai.champ.exceptions.ChampUnmarshallingException;
+import org.onap.aai.champ.graph.impl.InMemoryChampGraphImpl;
+import org.onap.aai.champ.graph.impl.TitanChampGraphImpl;
+import org.onap.aai.champ.model.ChampObject;
+import org.onap.aai.champ.model.ChampObjectConstraint;
+import org.onap.aai.champ.model.ChampObjectIndex;
+import org.onap.aai.champ.model.ChampPartition;
+import org.onap.aai.champ.model.ChampRelationship;
+import org.onap.aai.champ.model.ChampRelationshipConstraint;
+import org.onap.aai.champ.model.ChampRelationshipIndex;
+import org.onap.aai.champ.model.ChampSchema;
 
 public interface ChampGraph {
 
@@ -86,7 +86,7 @@ public interface ChampGraph {
 	 * @return The ChampObject as it was stored
 	 * @throws ChampMarshallingException If the {@code object} is not able to be marshalled into the backend representation
 	 * @throws ChampSchemaViolationException If the {@code object} violates the constraints specifed by {@link ChampGraph#retrieveSchema}
-	 * @throws ChampObjectNotExistsException If {@link org.openecomp.aai.champ.model.ChampObject#getKey}.isPresent() but the object cannot be found in the graph 
+	 * @throws ChampObjectNotExistsException If {@link org.onap.aai.champ.model.ChampObject#getKey}.isPresent() but the object cannot be found in the graph 
 	 */
 	public ChampObject storeObject(ChampObject object) throws ChampMarshallingException, ChampSchemaViolationException, ChampObjectNotExistsException;
 	
@@ -98,14 +98,14 @@ public interface ChampGraph {
 	 * @return The ChampObject as it was stored
 	 * @throws ChampMarshallingException If the {@code object} is not able to be marshalled into the backend representation
 	 * @throws ChampSchemaViolationException If the {@code object} violates the constraints specifed by {@link ChampGraph#retrieveSchema}
-	 * @throws ChampObjectNotExistsException If {@link org.openecomp.aai.champ.model.ChampObject#getKey} is not present or object not found in the graph
+	 * @throws ChampObjectNotExistsException If {@link org.onap.aai.champ.model.ChampObject#getKey} is not present or object not found in the graph
 	 */
 	public ChampObject replaceObject(ChampObject object) throws ChampMarshallingException, ChampSchemaViolationException, ChampObjectNotExistsException;
 
 	/**
 	 * Retrieve an object by its key.
-	 * @param key The key of the ChampObject in the graph {@link org.openecomp.aai.champ.model.ChampObject#getKey()}
-	 * @return The {@link org.openecomp.aai.champ.model.ChampObject} if it was present, otherwise {@link Optional#empty()}
+	 * @param key The key of the ChampObject in the graph {@link org.onap.aai.champ.model.ChampObject#getKey()}
+	 * @return The {@link org.onap.aai.champ.model.ChampObject} if it was present, otherwise {@link Optional#empty()}
 	 * @throws ChampUnmarshallingException If the object was found, but could not be unmarshalled
 	 */
 	public Optional<ChampObject> retrieveObject(Object key) throws ChampUnmarshallingException;
@@ -133,7 +133,7 @@ public interface ChampGraph {
 	 * @throws ChampMarshallingException If the {@code relationship} is not able to be marshalled into the backend representation
 	 * @throws ChampSchemaViolationException If the {@code relationship} violates the constraints specifed by {@link ChampGraph#retrieveSchema}
 	 * @throws ChampObjectNotExistsException If either the source or target object referenced by this relationship does not exist in the graph
-	 * @throws ChampRelationshipNotExistsException If {@link org.openecomp.aai.champ.model.ChampRelationship#getKey}.isPresent() but the object cannot be found in the graph 
+	 * @throws ChampRelationshipNotExistsException If {@link org.onap.aai.champ.model.ChampRelationship#getKey}.isPresent() but the object cannot be found in the graph 
 	 * @throws ChampUnmarshallingException If the edge which was created could not be unmarshalled into a ChampRelationship
 	 */
 	public ChampRelationship storeRelationship(ChampRelationship relationship) throws ChampMarshallingException, ChampObjectNotExistsException, ChampSchemaViolationException, ChampRelationshipNotExistsException, ChampUnmarshallingException;
@@ -146,7 +146,7 @@ public interface ChampGraph {
 	 * @return The ChampRelationship as it was stored
 	 * @throws ChampMarshallingException If the {@code relationship} is not able to be marshalled into the backend representation
 	 * @throws ChampSchemaViolationException If the {@code relationship} violates the constraints specifed by {@link ChampGraph#retrieveSchema}
-	 * @throws ChampRelationshipNotExistsException If {@link org.openecomp.aai.champ.model.ChampRelationship#getKey} is not present or object not found in the graph 
+	 * @throws ChampRelationshipNotExistsException If {@link org.onap.aai.champ.model.ChampRelationship#getKey} is not present or object not found in the graph 
 	 * @throws ChampUnmarshallingException If the edge which was created could not be unmarshalled into a ChampRelationship
 	 */
 	public ChampRelationship replaceRelationship(ChampRelationship relationship) throws ChampMarshallingException, ChampSchemaViolationException, ChampRelationshipNotExistsException, ChampUnmarshallingException;	
@@ -154,8 +154,8 @@ public interface ChampGraph {
 	
 	/**
 	 * Retrieve a relationship by its key.
-	 * @param key The key of the ChampRelationship in the graph {@link org.openecomp.aai.champ.model.ChampRelationship#getKey()}
-	 * @return The {@link org.openecomp.aai.champ.model.ChampRelationship} if it was present, otherwise {@link Optional#empty()}
+	 * @param key The key of the ChampRelationship in the graph {@link org.onap.aai.champ.model.ChampRelationship#getKey()}
+	 * @return The {@link org.onap.aai.champ.model.ChampRelationship} if it was present, otherwise {@link Optional#empty()}
 	 * @throws ChampUnmarshallingException If the relationship was found, but could not be unmarshalled
 	 */
 	public Optional<ChampRelationship> retrieveRelationship(Object key) throws ChampUnmarshallingException;
diff --git a/src/main/java/org/openecomp/aai/champ/event/AbstractLoggingChampGraph.java b/src/main/java/org/onap/aai/champ/event/AbstractLoggingChampGraph.java
index a8e0e2f..fe4a1ec 100644
--- a/src/main/java/org/openecomp/aai/champ/event/AbstractLoggingChampGraph.java
+++ b/src/main/java/org/onap/aai/champ/event/AbstractLoggingChampGraph.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.event;
+package org.onap.aai.champ.event;
 
 import java.io.IOException;
 import java.net.MalformedURLException;
@@ -32,23 +32,23 @@ import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Stream;
 
-import org.openecomp.aai.champ.ChampCapabilities;
-import org.openecomp.aai.champ.ChampGraph;
-import org.openecomp.aai.champ.event.ChampEvent.ChampOperation;
-import org.openecomp.aai.champ.exceptions.ChampIndexNotExistsException;
-import org.openecomp.aai.champ.exceptions.ChampMarshallingException;
-import org.openecomp.aai.champ.exceptions.ChampObjectNotExistsException;
-import org.openecomp.aai.champ.exceptions.ChampRelationshipNotExistsException;
-import org.openecomp.aai.champ.exceptions.ChampSchemaViolationException;
-import org.openecomp.aai.champ.exceptions.ChampUnmarshallingException;
-import org.openecomp.aai.champ.model.ChampObject;
-import org.openecomp.aai.champ.model.ChampObjectConstraint;
-import org.openecomp.aai.champ.model.ChampObjectIndex;
-import org.openecomp.aai.champ.model.ChampPartition;
-import org.openecomp.aai.champ.model.ChampRelationship;
-import org.openecomp.aai.champ.model.ChampRelationshipConstraint;
-import org.openecomp.aai.champ.model.ChampRelationshipIndex;
-import org.openecomp.aai.champ.model.ChampSchema;
+import org.onap.aai.champ.ChampCapabilities;
+import org.onap.aai.champ.ChampGraph;
+import org.onap.aai.champ.event.ChampEvent.ChampOperation;
+import org.onap.aai.champ.exceptions.ChampIndexNotExistsException;
+import org.onap.aai.champ.exceptions.ChampMarshallingException;
+import org.onap.aai.champ.exceptions.ChampObjectNotExistsException;
+import org.onap.aai.champ.exceptions.ChampRelationshipNotExistsException;
+import org.onap.aai.champ.exceptions.ChampSchemaViolationException;
+import org.onap.aai.champ.exceptions.ChampUnmarshallingException;
+import org.onap.aai.champ.model.ChampObject;
+import org.onap.aai.champ.model.ChampObjectConstraint;
+import org.onap.aai.champ.model.ChampObjectIndex;
+import org.onap.aai.champ.model.ChampPartition;
+import org.onap.aai.champ.model.ChampRelationship;
+import org.onap.aai.champ.model.ChampRelationshipConstraint;
+import org.onap.aai.champ.model.ChampRelationshipIndex;
+import org.onap.aai.champ.model.ChampSchema;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/org/openecomp/aai/champ/event/ChampEvent.java b/src/main/java/org/onap/aai/champ/event/ChampEvent.java
index f56601d..639a03e 100644
--- a/src/main/java/org/openecomp/aai/champ/event/ChampEvent.java
+++ b/src/main/java/org/onap/aai/champ/event/ChampEvent.java
@@ -19,16 +19,16 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.event;
+package org.onap.aai.champ.event;
 
 
 import java.io.IOException;
 
-import org.openecomp.aai.champ.model.ChampObject;
-import org.openecomp.aai.champ.model.ChampObjectIndex;
-import org.openecomp.aai.champ.model.ChampPartition;
-import org.openecomp.aai.champ.model.ChampRelationship;
-import org.openecomp.aai.champ.model.ChampRelationshipIndex;
+import org.onap.aai.champ.model.ChampObject;
+import org.onap.aai.champ.model.ChampObjectIndex;
+import org.onap.aai.champ.model.ChampPartition;
+import org.onap.aai.champ.model.ChampRelationship;
+import org.onap.aai.champ.model.ChampRelationshipIndex;
 
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.core.JsonParseException;
diff --git a/src/main/java/org/openecomp/aai/champ/exceptions/ChampIndexNotExistsException.java b/src/main/java/org/onap/aai/champ/exceptions/ChampIndexNotExistsException.java
index 806d91a..ae97ea6 100644
--- a/src/main/java/org/openecomp/aai/champ/exceptions/ChampIndexNotExistsException.java
+++ b/src/main/java/org/onap/aai/champ/exceptions/ChampIndexNotExistsException.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.exceptions;
+package org.onap.aai.champ.exceptions;
 
 public final class ChampIndexNotExistsException extends Exception {
 
diff --git a/src/main/java/org/openecomp/aai/champ/exceptions/ChampMarshallingException.java b/src/main/java/org/onap/aai/champ/exceptions/ChampMarshallingException.java
index 33797ab..2880960 100644
--- a/src/main/java/org/openecomp/aai/champ/exceptions/ChampMarshallingException.java
+++ b/src/main/java/org/onap/aai/champ/exceptions/ChampMarshallingException.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.exceptions;
+package org.onap.aai.champ.exceptions;
 
 public final class ChampMarshallingException extends Exception {
 
diff --git a/src/main/java/org/openecomp/aai/champ/exceptions/ChampObjectNotExistsException.java b/src/main/java/org/onap/aai/champ/exceptions/ChampObjectNotExistsException.java
index 1651a45..09db181 100644
--- a/src/main/java/org/openecomp/aai/champ/exceptions/ChampObjectNotExistsException.java
+++ b/src/main/java/org/onap/aai/champ/exceptions/ChampObjectNotExistsException.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.exceptions;
+package org.onap.aai.champ.exceptions;
 
 public final class ChampObjectNotExistsException extends Exception {
 	
diff --git a/src/main/java/org/openecomp/aai/champ/exceptions/ChampRelationshipNotExistsException.java b/src/main/java/org/onap/aai/champ/exceptions/ChampRelationshipNotExistsException.java
index f4c40d7..944ee04 100644
--- a/src/main/java/org/openecomp/aai/champ/exceptions/ChampRelationshipNotExistsException.java
+++ b/src/main/java/org/onap/aai/champ/exceptions/ChampRelationshipNotExistsException.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.exceptions;
+package org.onap.aai.champ.exceptions;
 
 public final class ChampRelationshipNotExistsException extends Exception {
 
diff --git a/src/main/java/org/openecomp/aai/champ/exceptions/ChampSchemaViolationException.java b/src/main/java/org/onap/aai/champ/exceptions/ChampSchemaViolationException.java
index 7521b2f..44df636 100644
--- a/src/main/java/org/openecomp/aai/champ/exceptions/ChampSchemaViolationException.java
+++ b/src/main/java/org/onap/aai/champ/exceptions/ChampSchemaViolationException.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.exceptions;
+package org.onap.aai.champ.exceptions;
 
 public final class ChampSchemaViolationException extends Exception {
 
diff --git a/src/main/java/org/openecomp/aai/champ/exceptions/ChampUnmarshallingException.java b/src/main/java/org/onap/aai/champ/exceptions/ChampUnmarshallingException.java
index 619c991..f63d879 100644
--- a/src/main/java/org/openecomp/aai/champ/exceptions/ChampUnmarshallingException.java
+++ b/src/main/java/org/onap/aai/champ/exceptions/ChampUnmarshallingException.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.exceptions;
+package org.onap.aai.champ.exceptions;
 
 public final class ChampUnmarshallingException extends Exception {
 
diff --git a/src/main/java/org/openecomp/aai/champ/graph/impl/AbstractGremlinChampGraph.java b/src/main/java/org/onap/aai/champ/graph/impl/AbstractGremlinChampGraph.java
index 130693f..8f806bf 100644
--- a/src/main/java/org/openecomp/aai/champ/graph/impl/AbstractGremlinChampGraph.java
+++ b/src/main/java/org/onap/aai/champ/graph/impl/AbstractGremlinChampGraph.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.graph.impl;
+package org.onap.aai.champ.graph.impl;
 
 import java.util.HashMap;
 import java.util.List;
@@ -35,16 +35,16 @@ import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSo
 import org.apache.tinkerpop.gremlin.structure.Edge;
 import org.apache.tinkerpop.gremlin.structure.Vertex;
 import org.apache.tinkerpop.gremlin.structure.VertexProperty;
-import org.openecomp.aai.champ.exceptions.ChampMarshallingException;
-import org.openecomp.aai.champ.exceptions.ChampObjectNotExistsException;
-import org.openecomp.aai.champ.exceptions.ChampRelationshipNotExistsException;
-import org.openecomp.aai.champ.exceptions.ChampUnmarshallingException;
-import org.openecomp.aai.champ.graph.impl.TitanChampGraphImpl.Builder;
-import org.openecomp.aai.champ.model.ChampElement;
-import org.openecomp.aai.champ.model.ChampObject;
-import org.openecomp.aai.champ.model.ChampPartition;
-import org.openecomp.aai.champ.model.ChampRelationship;
-import org.openecomp.aai.champ.model.fluent.partition.CreateChampPartitionable;
+import org.onap.aai.champ.exceptions.ChampMarshallingException;
+import org.onap.aai.champ.exceptions.ChampObjectNotExistsException;
+import org.onap.aai.champ.exceptions.ChampRelationshipNotExistsException;
+import org.onap.aai.champ.exceptions.ChampUnmarshallingException;
+import org.onap.aai.champ.graph.impl.TitanChampGraphImpl.Builder;
+import org.onap.aai.champ.model.ChampElement;
+import org.onap.aai.champ.model.ChampObject;
+import org.onap.aai.champ.model.ChampPartition;
+import org.onap.aai.champ.model.ChampRelationship;
+import org.onap.aai.champ.model.fluent.partition.CreateChampPartitionable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/org/openecomp/aai/champ/graph/impl/AbstractTinkerpopChampGraph.java b/src/main/java/org/onap/aai/champ/graph/impl/AbstractTinkerpopChampGraph.java
index 8128ec6..fbe30f7 100644
--- a/src/main/java/org/openecomp/aai/champ/graph/impl/AbstractTinkerpopChampGraph.java
+++ b/src/main/java/org/onap/aai/champ/graph/impl/AbstractTinkerpopChampGraph.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.graph.impl;
+package org.onap.aai.champ.graph.impl;
 
 import java.io.IOException;
 import java.util.HashMap;
@@ -43,20 +43,20 @@ import org.apache.tinkerpop.gremlin.structure.Graph;
 import org.apache.tinkerpop.gremlin.structure.Property;
 import org.apache.tinkerpop.gremlin.structure.Vertex;
 import org.apache.tinkerpop.gremlin.structure.VertexProperty;
-import org.openecomp.aai.champ.event.ChampEvent;
-import org.openecomp.aai.champ.event.ChampEvent.ChampOperation;
-import org.openecomp.aai.champ.exceptions.ChampMarshallingException;
-import org.openecomp.aai.champ.exceptions.ChampObjectNotExistsException;
-import org.openecomp.aai.champ.exceptions.ChampRelationshipNotExistsException;
-import org.openecomp.aai.champ.exceptions.ChampSchemaViolationException;
-import org.openecomp.aai.champ.exceptions.ChampUnmarshallingException;
-import org.openecomp.aai.champ.graph.impl.TitanChampGraphImpl.Builder;
-import org.openecomp.aai.champ.model.ChampObject;
-import org.openecomp.aai.champ.model.ChampPartition;
-import org.openecomp.aai.champ.model.ChampRelationship;
-import org.openecomp.aai.champ.model.ChampSchema;
-import org.openecomp.aai.champ.model.fluent.partition.CreateChampPartitionable;
-import org.openecomp.aai.champ.transform.TinkerpopChampformer;
+import org.onap.aai.champ.event.ChampEvent;
+import org.onap.aai.champ.event.ChampEvent.ChampOperation;
+import org.onap.aai.champ.exceptions.ChampMarshallingException;
+import org.onap.aai.champ.exceptions.ChampObjectNotExistsException;
+import org.onap.aai.champ.exceptions.ChampRelationshipNotExistsException;
+import org.onap.aai.champ.exceptions.ChampSchemaViolationException;
+import org.onap.aai.champ.exceptions.ChampUnmarshallingException;
+import org.onap.aai.champ.graph.impl.TitanChampGraphImpl.Builder;
+import org.onap.aai.champ.model.ChampObject;
+import org.onap.aai.champ.model.ChampPartition;
+import org.onap.aai.champ.model.ChampRelationship;
+import org.onap.aai.champ.model.ChampSchema;
+import org.onap.aai.champ.model.fluent.partition.CreateChampPartitionable;
+import org.onap.aai.champ.transform.TinkerpopChampformer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/org/openecomp/aai/champ/graph/impl/AbstractValidatingChampGraph.java b/src/main/java/org/onap/aai/champ/graph/impl/AbstractValidatingChampGraph.java
index 35d56f0..a4161df 100644
--- a/src/main/java/org/openecomp/aai/champ/graph/impl/AbstractValidatingChampGraph.java
+++ b/src/main/java/org/onap/aai/champ/graph/impl/AbstractValidatingChampGraph.java
@@ -19,28 +19,28 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.graph.impl;
+package org.onap.aai.champ.graph.impl;
 
 import java.util.Map;
 import java.util.Optional;
 
-import org.openecomp.aai.champ.ChampGraph;
-import org.openecomp.aai.champ.event.AbstractLoggingChampGraph;
-import org.openecomp.aai.champ.event.ChampEvent;
-import org.openecomp.aai.champ.event.ChampEvent.ChampOperation;
-import org.openecomp.aai.champ.exceptions.ChampMarshallingException;
-import org.openecomp.aai.champ.exceptions.ChampObjectNotExistsException;
-import org.openecomp.aai.champ.exceptions.ChampRelationshipNotExistsException;
-import org.openecomp.aai.champ.exceptions.ChampSchemaViolationException;
-import org.openecomp.aai.champ.exceptions.ChampUnmarshallingException;
-import org.openecomp.aai.champ.graph.impl.TitanChampGraphImpl.Builder;
-import org.openecomp.aai.champ.model.ChampObject;
-import org.openecomp.aai.champ.model.ChampObjectConstraint;
-import org.openecomp.aai.champ.model.ChampPartition;
-import org.openecomp.aai.champ.model.ChampRelationship;
-import org.openecomp.aai.champ.model.ChampRelationshipConstraint;
-import org.openecomp.aai.champ.model.ChampSchema;
-import org.openecomp.aai.champ.schema.ChampSchemaEnforcer;
+import org.onap.aai.champ.ChampGraph;
+import org.onap.aai.champ.event.AbstractLoggingChampGraph;
+import org.onap.aai.champ.event.ChampEvent;
+import org.onap.aai.champ.event.ChampEvent.ChampOperation;
+import org.onap.aai.champ.exceptions.ChampMarshallingException;
+import org.onap.aai.champ.exceptions.ChampObjectNotExistsException;
+import org.onap.aai.champ.exceptions.ChampRelationshipNotExistsException;
+import org.onap.aai.champ.exceptions.ChampSchemaViolationException;
+import org.onap.aai.champ.exceptions.ChampUnmarshallingException;
+import org.onap.aai.champ.graph.impl.TitanChampGraphImpl.Builder;
+import org.onap.aai.champ.model.ChampObject;
+import org.onap.aai.champ.model.ChampObjectConstraint;
+import org.onap.aai.champ.model.ChampPartition;
+import org.onap.aai.champ.model.ChampRelationship;
+import org.onap.aai.champ.model.ChampRelationshipConstraint;
+import org.onap.aai.champ.model.ChampSchema;
+import org.onap.aai.champ.schema.ChampSchemaEnforcer;
 
 public abstract class AbstractValidatingChampGraph extends AbstractLoggingChampGraph {
 
diff --git a/src/main/java/org/openecomp/aai/champ/graph/impl/ChampAPIImpl.java b/src/main/java/org/onap/aai/champ/graph/impl/ChampAPIImpl.java
index 34453fc..ed06429 100644
--- a/src/main/java/org/openecomp/aai/champ/graph/impl/ChampAPIImpl.java
+++ b/src/main/java/org/onap/aai/champ/graph/impl/ChampAPIImpl.java
@@ -19,14 +19,14 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.graph.impl;
+package org.onap.aai.champ.graph.impl;
 
 import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import org.openecomp.aai.champ.ChampAPI;
-import org.openecomp.aai.champ.ChampGraph;
+import org.onap.aai.champ.ChampAPI;
+import org.onap.aai.champ.ChampGraph;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/org/openecomp/aai/champ/graph/impl/InMemoryChampGraphImpl.java b/src/main/java/org/onap/aai/champ/graph/impl/InMemoryChampGraphImpl.java
index ab59e64..7afb813 100644
--- a/src/main/java/org/openecomp/aai/champ/graph/impl/InMemoryChampGraphImpl.java
+++ b/src/main/java/org/onap/aai/champ/graph/impl/InMemoryChampGraphImpl.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.graph.impl;
+package org.onap.aai.champ.graph.impl;
 
 import java.io.IOException;
 import java.util.Collection;
@@ -32,12 +32,12 @@ import java.util.stream.Stream;
 import org.apache.tinkerpop.gremlin.structure.Edge;
 import org.apache.tinkerpop.gremlin.structure.Vertex;
 import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
-import org.openecomp.aai.champ.ChampCapabilities;
-import org.openecomp.aai.champ.exceptions.ChampIndexNotExistsException;
-import org.openecomp.aai.champ.model.ChampObjectIndex;
-import org.openecomp.aai.champ.model.ChampRelationshipIndex;
-import org.openecomp.aai.champ.schema.ChampSchemaEnforcer;
-import org.openecomp.aai.champ.schema.DefaultChampSchemaEnforcer;
+import org.onap.aai.champ.ChampCapabilities;
+import org.onap.aai.champ.exceptions.ChampIndexNotExistsException;
+import org.onap.aai.champ.model.ChampObjectIndex;
+import org.onap.aai.champ.model.ChampRelationshipIndex;
+import org.onap.aai.champ.schema.ChampSchemaEnforcer;
+import org.onap.aai.champ.schema.DefaultChampSchemaEnforcer;
 import org.slf4j.Logger;
 
 import com.att.nsa.cambria.client.CambriaPublisher;
diff --git a/src/main/java/org/openecomp/aai/champ/graph/impl/TitanChampGraphImpl.java b/src/main/java/org/onap/aai/champ/graph/impl/TitanChampGraphImpl.java
index d4f194a..73f24a5 100644
--- a/src/main/java/org/openecomp/aai/champ/graph/impl/TitanChampGraphImpl.java
+++ b/src/main/java/org/onap/aai/champ/graph/impl/TitanChampGraphImpl.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.graph.impl;
+package org.onap.aai.champ.graph.impl;
 
 import com.thinkaurelius.titan.core.Cardinality;
 import com.thinkaurelius.titan.core.EdgeLabel;
@@ -36,20 +36,20 @@ import com.thinkaurelius.titan.core.schema.TitanManagement;
 import com.thinkaurelius.titan.graphdb.database.management.ManagementSystem;
 import org.apache.tinkerpop.gremlin.structure.Edge;
 import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.openecomp.aai.champ.ChampCapabilities;
-import org.openecomp.aai.champ.exceptions.ChampIndexNotExistsException;
-import org.openecomp.aai.champ.exceptions.ChampSchemaViolationException;
-import org.openecomp.aai.champ.model.ChampCardinality;
-import org.openecomp.aai.champ.model.ChampObject;
-import org.openecomp.aai.champ.model.ChampObjectConstraint;
-import org.openecomp.aai.champ.model.ChampObjectIndex;
-import org.openecomp.aai.champ.model.ChampPropertyConstraint;
-import org.openecomp.aai.champ.model.ChampRelationship;
-import org.openecomp.aai.champ.model.ChampRelationshipConstraint;
-import org.openecomp.aai.champ.model.ChampRelationshipIndex;
-import org.openecomp.aai.champ.model.ChampSchema;
-import org.openecomp.aai.champ.schema.ChampSchemaEnforcer;
-import org.openecomp.aai.champ.schema.DefaultChampSchemaEnforcer;
+import org.onap.aai.champ.ChampCapabilities;
+import org.onap.aai.champ.exceptions.ChampIndexNotExistsException;
+import org.onap.aai.champ.exceptions.ChampSchemaViolationException;
+import org.onap.aai.champ.model.ChampCardinality;
+import org.onap.aai.champ.model.ChampObject;
+import org.onap.aai.champ.model.ChampObjectConstraint;
+import org.onap.aai.champ.model.ChampObjectIndex;
+import org.onap.aai.champ.model.ChampPropertyConstraint;
+import org.onap.aai.champ.model.ChampRelationship;
+import org.onap.aai.champ.model.ChampRelationshipConstraint;
+import org.onap.aai.champ.model.ChampRelationshipIndex;
+import org.onap.aai.champ.model.ChampSchema;
+import org.onap.aai.champ.schema.ChampSchemaEnforcer;
+import org.onap.aai.champ.schema.DefaultChampSchemaEnforcer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/org/openecomp/aai/champ/ie/Exporter.java b/src/main/java/org/onap/aai/champ/ie/Exporter.java
index e897e2b..5c96915 100644
--- a/src/main/java/org/openecomp/aai/champ/ie/Exporter.java
+++ b/src/main/java/org/onap/aai/champ/ie/Exporter.java
@@ -19,11 +19,11 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.ie;
+package org.onap.aai.champ.ie;
 
 import java.io.OutputStream;
 
-import org.openecomp.aai.champ.ChampGraph;
+import org.onap.aai.champ.ChampGraph;
 
 public interface Exporter {
 
diff --git a/src/main/java/org/openecomp/aai/champ/ie/GraphMLImporterExporter.java b/src/main/java/org/onap/aai/champ/ie/GraphMLImporterExporter.java
index 05b4919..4e108e9 100644
--- a/src/main/java/org/openecomp/aai/champ/ie/GraphMLImporterExporter.java
+++ b/src/main/java/org/onap/aai/champ/ie/GraphMLImporterExporter.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.ie;
+package org.onap.aai.champ.ie;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -42,16 +42,16 @@ import javax.xml.stream.XMLOutputFactory;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamWriter;
 
-import org.openecomp.aai.champ.ChampAPI;
-import org.openecomp.aai.champ.ChampGraph;
-import org.openecomp.aai.champ.exceptions.ChampMarshallingException;
-import org.openecomp.aai.champ.exceptions.ChampObjectNotExistsException;
-import org.openecomp.aai.champ.exceptions.ChampRelationshipNotExistsException;
-import org.openecomp.aai.champ.exceptions.ChampSchemaViolationException;
-import org.openecomp.aai.champ.exceptions.ChampUnmarshallingException;
-import org.openecomp.aai.champ.model.ChampObject;
-import org.openecomp.aai.champ.model.ChampObjectIndex;
-import org.openecomp.aai.champ.model.ChampRelationship;
+import org.onap.aai.champ.ChampAPI;
+import org.onap.aai.champ.ChampGraph;
+import org.onap.aai.champ.exceptions.ChampMarshallingException;
+import org.onap.aai.champ.exceptions.ChampObjectNotExistsException;
+import org.onap.aai.champ.exceptions.ChampRelationshipNotExistsException;
+import org.onap.aai.champ.exceptions.ChampSchemaViolationException;
+import org.onap.aai.champ.exceptions.ChampUnmarshallingException;
+import org.onap.aai.champ.model.ChampObject;
+import org.onap.aai.champ.model.ChampObjectIndex;
+import org.onap.aai.champ.model.ChampRelationship;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
diff --git a/src/main/java/org/openecomp/aai/champ/ie/Importer.java b/src/main/java/org/onap/aai/champ/ie/Importer.java
index c7aa6a1..d28da22 100644
--- a/src/main/java/org/openecomp/aai/champ/ie/Importer.java
+++ b/src/main/java/org/onap/aai/champ/ie/Importer.java
@@ -19,11 +19,11 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.ie;
+package org.onap.aai.champ.ie;
 
 import java.io.InputStream;
 
-import org.openecomp.aai.champ.ChampAPI;
+import org.onap.aai.champ.ChampAPI;
 
 public interface Importer {
 
diff --git a/src/main/java/org/openecomp/aai/champ/model/ChampCardinality.java b/src/main/java/org/onap/aai/champ/model/ChampCardinality.java
index b9735ea..ab8f0a2 100644
--- a/src/main/java/org/openecomp/aai/champ/model/ChampCardinality.java
+++ b/src/main/java/org/onap/aai/champ/model/ChampCardinality.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.model;
+package org.onap.aai.champ.model;
 
 public enum ChampCardinality {
 	SINGLE,
diff --git a/src/main/java/org/openecomp/aai/champ/model/ChampConnectionConstraint.java b/src/main/java/org/onap/aai/champ/model/ChampConnectionConstraint.java
index c16e659..4e6ff59 100644
--- a/src/main/java/org/openecomp/aai/champ/model/ChampConnectionConstraint.java
+++ b/src/main/java/org/onap/aai/champ/model/ChampConnectionConstraint.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.model;
+package org.onap.aai.champ.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
diff --git a/src/main/java/org/openecomp/aai/champ/model/ChampConnectionMultiplicity.java b/src/main/java/org/onap/aai/champ/model/ChampConnectionMultiplicity.java
index 337c03c..1615a5a 100644
--- a/src/main/java/org/openecomp/aai/champ/model/ChampConnectionMultiplicity.java
+++ b/src/main/java/org/onap/aai/champ/model/ChampConnectionMultiplicity.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.model;
+package org.onap.aai.champ.model;
 
 public enum ChampConnectionMultiplicity {
 	NONE, //Cannot have any relationships of a type between two object types
diff --git a/src/main/java/org/openecomp/aai/champ/model/ChampElement.java b/src/main/java/org/onap/aai/champ/model/ChampElement.java
index 329bbfd..d92669b 100644
--- a/src/main/java/org/openecomp/aai/champ/model/ChampElement.java
+++ b/src/main/java/org/onap/aai/champ/model/ChampElement.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.model;
+package org.onap.aai.champ.model;
 
 public interface ChampElement {
 
diff --git a/src/main/java/org/openecomp/aai/champ/model/ChampField.java b/src/main/java/org/onap/aai/champ/model/ChampField.java
index 6d2df69..1b6ec90 100644
--- a/src/main/java/org/openecomp/aai/champ/model/ChampField.java
+++ b/src/main/java/org/onap/aai/champ/model/ChampField.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.model;
+package org.onap.aai.champ.model;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/src/main/java/org/openecomp/aai/champ/model/ChampObject.java b/src/main/java/org/onap/aai/champ/model/ChampObject.java
index 6297e63..9593ef1 100644
--- a/src/main/java/org/openecomp/aai/champ/model/ChampObject.java
+++ b/src/main/java/org/onap/aai/champ/model/ChampObject.java
@@ -19,15 +19,16 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.model;
+package org.onap.aai.champ.model;
 
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
-import java.util.Optional;
 
-import org.openecomp.aai.champ.model.fluent.object.CreateChampObjectable;
-import org.openecomp.aai.champ.model.fluent.object.impl.CreateChampObjectableImpl;
+import org.onap.aai.champ.model.fluent.object.CreateChampObjectable;
+import org.onap.aai.champ.model.fluent.object.impl.CreateChampObjectableImpl;
+
+import java.util.Optional;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/src/main/java/org/openecomp/aai/champ/model/ChampObjectConstraint.java b/src/main/java/org/onap/aai/champ/model/ChampObjectConstraint.java
index 5afd803..0423da4 100644
--- a/src/main/java/org/openecomp/aai/champ/model/ChampObjectConstraint.java
+++ b/src/main/java/org/onap/aai/champ/model/ChampObjectConstraint.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.model;
+package org.onap.aai.champ.model;
 
 import java.util.HashMap;
 import java.util.HashSet;
diff --git a/src/main/java/org/openecomp/aai/champ/model/ChampObjectIndex.java b/src/main/java/org/onap/aai/champ/model/ChampObjectIndex.java
index 9b588c7..7d52334 100644
--- a/src/main/java/org/openecomp/aai/champ/model/ChampObjectIndex.java
+++ b/src/main/java/org/onap/aai/champ/model/ChampObjectIndex.java
@@ -19,10 +19,10 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.model;
+package org.onap.aai.champ.model;
 
-import org.openecomp.aai.champ.model.fluent.index.CreateObjectIndexable;
-import org.openecomp.aai.champ.model.fluent.index.impl.CreateObjectIndexableImpl;
+import org.onap.aai.champ.model.fluent.index.CreateObjectIndexable;
+import org.onap.aai.champ.model.fluent.index.impl.CreateObjectIndexableImpl;
 
 public final class ChampObjectIndex {
 
diff --git a/src/main/java/org/openecomp/aai/champ/model/ChampPartition.java b/src/main/java/org/onap/aai/champ/model/ChampPartition.java
index ca7de74..2c5c1a5 100644
--- a/src/main/java/org/openecomp/aai/champ/model/ChampPartition.java
+++ b/src/main/java/org/onap/aai/champ/model/ChampPartition.java
@@ -19,15 +19,15 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.model;
+package org.onap.aai.champ.model;
 
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
-import org.openecomp.aai.champ.model.fluent.partition.CreateChampPartitionable;
-import org.openecomp.aai.champ.model.fluent.partition.impl.CreateChampPartionableImpl;
+import org.onap.aai.champ.model.fluent.partition.CreateChampPartitionable;
+import org.onap.aai.champ.model.fluent.partition.impl.CreateChampPartionableImpl;
 
 public final class ChampPartition {
 
diff --git a/src/main/java/org/openecomp/aai/champ/model/ChampPropertyConstraint.java b/src/main/java/org/onap/aai/champ/model/ChampPropertyConstraint.java
index d244f5a..a881cd9 100644
--- a/src/main/java/org/openecomp/aai/champ/model/ChampPropertyConstraint.java
+++ b/src/main/java/org/onap/aai/champ/model/ChampPropertyConstraint.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.model;
+package org.onap.aai.champ.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
diff --git a/src/main/java/org/openecomp/aai/champ/model/ChampRelationship.java b/src/main/java/org/onap/aai/champ/model/ChampRelationship.java
index 3e5e366..2b4e61b 100644
--- a/src/main/java/org/openecomp/aai/champ/model/ChampRelationship.java
+++ b/src/main/java/org/onap/aai/champ/model/ChampRelationship.java
@@ -19,15 +19,16 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.model;
+package org.onap.aai.champ.model;
 
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
-import java.util.Optional;
 
-import org.openecomp.aai.champ.model.fluent.relationship.CreateChampRelationshipable;
-import org.openecomp.aai.champ.model.fluent.relationship.impl.CreateChampRelationshipableImpl;
+import org.onap.aai.champ.model.fluent.relationship.CreateChampRelationshipable;
+import org.onap.aai.champ.model.fluent.relationship.impl.CreateChampRelationshipableImpl;
+
+import java.util.Optional;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/src/main/java/org/openecomp/aai/champ/model/ChampRelationshipConstraint.java b/src/main/java/org/onap/aai/champ/model/ChampRelationshipConstraint.java
index 238637d..ac030e9 100644
--- a/src/main/java/org/openecomp/aai/champ/model/ChampRelationshipConstraint.java
+++ b/src/main/java/org/onap/aai/champ/model/ChampRelationshipConstraint.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.model;
+package org.onap.aai.champ.model;
 
 import java.util.HashMap;
 import java.util.HashSet;
diff --git a/src/main/java/org/openecomp/aai/champ/model/ChampRelationshipIndex.java b/src/main/java/org/onap/aai/champ/model/ChampRelationshipIndex.java
index 7f8f36f..6b2cee5 100644
--- a/src/main/java/org/openecomp/aai/champ/model/ChampRelationshipIndex.java
+++ b/src/main/java/org/onap/aai/champ/model/ChampRelationshipIndex.java
@@ -19,10 +19,10 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.model;
+package org.onap.aai.champ.model;
 
-import org.openecomp.aai.champ.model.fluent.index.CreateRelationshipIndexable;
-import org.openecomp.aai.champ.model.fluent.index.impl.CreateRelationshipIndexableImpl;
+import org.onap.aai.champ.model.fluent.index.CreateRelationshipIndexable;
+import org.onap.aai.champ.model.fluent.index.impl.CreateRelationshipIndexableImpl;
 
 public final class ChampRelationshipIndex {
 
diff --git a/src/main/java/org/openecomp/aai/champ/model/ChampSchema.java b/src/main/java/org/onap/aai/champ/model/ChampSchema.java
index 90c42b3..bd612df 100644
--- a/src/main/java/org/openecomp/aai/champ/model/ChampSchema.java
+++ b/src/main/java/org/onap/aai/champ/model/ChampSchema.java
@@ -19,15 +19,16 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.model;
+package org.onap.aai.champ.model;
 
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
-import java.util.Optional;
 
-import org.openecomp.aai.champ.model.fluent.schema.CreateChampSchemable;
-import org.openecomp.aai.champ.model.fluent.schema.impl.CreateChampSchemableImpl;
+import org.onap.aai.champ.model.fluent.schema.CreateChampSchemable;
+import org.onap.aai.champ.model.fluent.schema.impl.CreateChampSchemableImpl;
+
+import java.util.Optional;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
diff --git a/src/main/java/org/openecomp/aai/champ/model/fluent/BuildStep.java b/src/main/java/org/onap/aai/champ/model/fluent/BuildStep.java
index 4da29c3..97f7445 100644
--- a/src/main/java/org/openecomp/aai/champ/model/fluent/BuildStep.java
+++ b/src/main/java/org/onap/aai/champ/model/fluent/BuildStep.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.model.fluent;
+package org.onap.aai.champ.model.fluent;
 
 public interface BuildStep<T> {
 	public T build();
diff --git a/src/main/java/org/openecomp/aai/champ/model/fluent/KeyStep.java b/src/main/java/org/onap/aai/champ/model/fluent/KeyStep.java
index 291f087..6b34de1 100644
--- a/src/main/java/org/openecomp/aai/champ/model/fluent/KeyStep.java
+++ b/src/main/java/org/onap/aai/champ/model/fluent/KeyStep.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.model.fluent;
+package org.onap.aai.champ.model.fluent;
 
 public interface KeyStep<T> {
 	public T withKey(Object key);
diff --git a/src/main/java/org/openecomp/aai/champ/model/fluent/PropertiesStep.java b/src/main/java/org/onap/aai/champ/model/fluent/PropertiesStep.java
index 3f67650..44b8ada 100644
--- a/src/main/java/org/openecomp/aai/champ/model/fluent/PropertiesStep.java
+++ b/src/main/java/org/onap/aai/champ/model/fluent/PropertiesStep.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.model.fluent;
+package org.onap.aai.champ.model.fluent;
 
 import java.util.Map;
 
diff --git a/src/main/java/org/openecomp/aai/champ/model/fluent/index/CreateObjectIndexable.java b/src/main/java/org/onap/aai/champ/model/fluent/index/CreateObjectIndexable.java
index f2281ed..57372e5 100644
--- a/src/main/java/org/openecomp/aai/champ/model/fluent/index/CreateObjectIndexable.java
+++ b/src/main/java/org/onap/aai/champ/model/fluent/index/CreateObjectIndexable.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.model.fluent.index;
+package org.onap.aai.champ.model.fluent.index;
 
 public interface CreateObjectIndexable {
 
diff --git a/src/main/java/org/openecomp/aai/champ/model/fluent/index/CreateRelationshipIndexable.java b/src/main/java/org/onap/aai/champ/model/fluent/index/CreateRelationshipIndexable.java
index e4f42ae..16048ca 100644
--- a/src/main/java/org/openecomp/aai/champ/model/fluent/index/CreateRelationshipIndexable.java
+++ b/src/main/java/org/onap/aai/champ/model/fluent/index/CreateRelationshipIndexable.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.model.fluent.index;
+package org.onap.aai.champ.model.fluent.index;
 
 public interface CreateRelationshipIndexable {
 
diff --git a/src/main/java/org/openecomp/aai/champ/model/fluent/index/ObjectIndexFieldStep.java b/src/main/java/org/onap/aai/champ/model/fluent/index/ObjectIndexFieldStep.java
index be1d60b..4450e84 100644
--- a/src/main/java/org/openecomp/aai/champ/model/fluent/index/ObjectIndexFieldStep.java
+++ b/src/main/java/org/onap/aai/champ/model/fluent/index/ObjectIndexFieldStep.java
@@ -19,10 +19,10 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.model.fluent.index;
+package org.onap.aai.champ.model.fluent.index;
 
-import org.openecomp.aai.champ.model.ChampObjectIndex;
-import org.openecomp.aai.champ.model.fluent.BuildStep;
+import org.onap.aai.champ.model.ChampObjectIndex;
+import org.onap.aai.champ.model.fluent.BuildStep;
 
 public interface ObjectIndexFieldStep {
 
diff --git a/src/main/java/org/openecomp/aai/champ/model/fluent/index/ObjectIndexTypeStep.java b/src/main/java/org/onap/aai/champ/model/fluent/index/ObjectIndexTypeStep.java
index 99977e6..71b201f 100644
--- a/src/main/java/org/openecomp/aai/champ/model/fluent/index/ObjectIndexTypeStep.java
+++ b/src/main/java/org/onap/aai/champ/model/fluent/index/ObjectIndexTypeStep.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.model.fluent.index;
+package org.onap.aai.champ.model.fluent.index;
 
 public interface ObjectIndexTypeStep {
 
diff --git a/src/main/java/org/openecomp/aai/champ/model/fluent/index/RelationshipIndexFieldStep.java b/src/main/java/org/onap/aai/champ/model/fluent/index/RelationshipIndexFieldStep.java
index fb784e5..f2bd33f 100644
--- a/src/main/java/org/openecomp/aai/champ/model/fluent/index/RelationshipIndexFieldStep.java
+++ b/src/main/java/org/onap/aai/champ/model/fluent/index/RelationshipIndexFieldStep.java
@@ -19,10 +19,10 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.model.fluent.index;
+package org.onap.aai.champ.model.fluent.index;
 
-import org.openecomp.aai.champ.model.ChampRelationshipIndex;
-import org.openecomp.aai.champ.model.fluent.BuildStep;
+import org.onap.aai.champ.model.ChampRelationshipIndex;
+import org.onap.aai.champ.model.fluent.BuildStep;
 
 public interface RelationshipIndexFieldStep {
 
diff --git a/src/main/java/org/openecomp/aai/champ/model/fluent/index/RelationshipIndexTypeStep.java b/src/main/java/org/onap/aai/champ/model/fluent/index/RelationshipIndexTypeStep.java
index 988dc05..add1063 100644
--- a/src/main/java/org/openecomp/aai/champ/model/fluent/index/RelationshipIndexTypeStep.java
+++ b/src/main/java/org/onap/aai/champ/model/fluent/index/RelationshipIndexTypeStep.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.model.fluent.index;
+package org.onap.aai.champ.model.fluent.index;
 
 public interface RelationshipIndexTypeStep {
 
diff --git a/src/main/java/org/openecomp/aai/champ/model/fluent/index/impl/CreateObjectIndexableImpl.java b/src/main/java/org/onap/aai/champ/model/fluent/index/impl/CreateObjectIndexableImpl.java
index 675dbb2..f9b58c9 100644
--- a/src/main/java/org/openecomp/aai/champ/model/fluent/index/impl/CreateObjectIndexableImpl.java
+++ b/src/main/java/org/onap/aai/champ/model/fluent/index/impl/CreateObjectIndexableImpl.java
@@ -19,15 +19,15 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.model.fluent.index.impl;
+package org.onap.aai.champ.model.fluent.index.impl;
 
-import org.openecomp.aai.champ.model.ChampField;
-import org.openecomp.aai.champ.model.ChampObject;
-import org.openecomp.aai.champ.model.ChampObjectIndex;
-import org.openecomp.aai.champ.model.fluent.BuildStep;
-import org.openecomp.aai.champ.model.fluent.index.CreateObjectIndexable;
-import org.openecomp.aai.champ.model.fluent.index.ObjectIndexFieldStep;
-import org.openecomp.aai.champ.model.fluent.index.ObjectIndexTypeStep;
+import org.onap.aai.champ.model.ChampField;
+import org.onap.aai.champ.model.ChampObject;
+import org.onap.aai.champ.model.ChampObjectIndex;
+import org.onap.aai.champ.model.fluent.BuildStep;
+import org.onap.aai.champ.model.fluent.index.CreateObjectIndexable;
+import org.onap.aai.champ.model.fluent.index.ObjectIndexFieldStep;
+import org.onap.aai.champ.model.fluent.index.ObjectIndexTypeStep;
 
 public final class CreateObjectIndexableImpl implements CreateObjectIndexable {
 
diff --git a/src/main/java/org/openecomp/aai/champ/model/fluent/index/impl/CreateRelationshipIndexableImpl.java b/src/main/java/org/onap/aai/champ/model/fluent/index/impl/CreateRelationshipIndexableImpl.java
index d41839e..7c21a62 100644
--- a/src/main/java/org/openecomp/aai/champ/model/fluent/index/impl/CreateRelationshipIndexableImpl.java
+++ b/src/main/java/org/onap/aai/champ/model/fluent/index/impl/CreateRelationshipIndexableImpl.java
@@ -19,14 +19,14 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.model.fluent.index.impl;
+package org.onap.aai.champ.model.fluent.index.impl;
 
-import org.openecomp.aai.champ.model.ChampField;
-import org.openecomp.aai.champ.model.ChampRelationshipIndex;
-import org.openecomp.aai.champ.model.fluent.BuildStep;
-import org.openecomp.aai.champ.model.fluent.index.CreateRelationshipIndexable;
-import org.openecomp.aai.champ.model.fluent.index.RelationshipIndexFieldStep;
-import org.openecomp.aai.champ.model.fluent.index.RelationshipIndexTypeStep;
+import org.onap.aai.champ.model.ChampField;
+import org.onap.aai.champ.model.ChampRelationshipIndex;
+import org.onap.aai.champ.model.fluent.BuildStep;
+import org.onap.aai.champ.model.fluent.index.CreateRelationshipIndexable;
+import org.onap.aai.champ.model.fluent.index.RelationshipIndexFieldStep;
+import org.onap.aai.champ.model.fluent.index.RelationshipIndexTypeStep;
 
 public final class CreateRelationshipIndexableImpl implements CreateRelationshipIndexable {
 
diff --git a/src/main/java/org/openecomp/aai/champ/model/fluent/object/CreateChampObjectable.java b/src/main/java/org/onap/aai/champ/model/fluent/object/CreateChampObjectable.java
index 79c2026..8c586f5 100644
--- a/src/main/java/org/openecomp/aai/champ/model/fluent/object/CreateChampObjectable.java
+++ b/src/main/java/org/onap/aai/champ/model/fluent/object/CreateChampObjectable.java
@@ -19,10 +19,10 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.model.fluent.object;
+package org.onap.aai.champ.model.fluent.object;
 
-import org.openecomp.aai.champ.model.ChampObject;
-import org.openecomp.aai.champ.model.fluent.KeyStep;
+import org.onap.aai.champ.model.ChampObject;
+import org.onap.aai.champ.model.fluent.KeyStep;
 
 public interface CreateChampObjectable {
 	public KeyStep<ObjectBuildOrPropertiesStep> ofType(String type);
diff --git a/src/main/java/org/openecomp/aai/champ/model/fluent/object/ObjectBuildOrPropertiesStep.java b/src/main/java/org/onap/aai/champ/model/fluent/object/ObjectBuildOrPropertiesStep.java
index 73cdb78..42db899 100644
--- a/src/main/java/org/openecomp/aai/champ/model/fluent/object/ObjectBuildOrPropertiesStep.java
+++ b/src/main/java/org/onap/aai/champ/model/fluent/object/ObjectBuildOrPropertiesStep.java
@@ -19,11 +19,11 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.model.fluent.object;
+package org.onap.aai.champ.model.fluent.object;
 
-import org.openecomp.aai.champ.model.ChampObject;
-import org.openecomp.aai.champ.model.fluent.BuildStep;
-import org.openecomp.aai.champ.model.fluent.PropertiesStep;
+import org.onap.aai.champ.model.ChampObject;
+import org.onap.aai.champ.model.fluent.BuildStep;
+import org.onap.aai.champ.model.fluent.PropertiesStep;
 
 public interface ObjectBuildOrPropertiesStep extends BuildStep<ChampObject>, PropertiesStep<ObjectBuildOrPropertiesStep> {
 
diff --git a/src/main/java/org/openecomp/aai/champ/model/fluent/object/ObjectBuildOrPropertiesStepImpl.java b/src/main/java/org/onap/aai/champ/model/fluent/object/ObjectBuildOrPropertiesStepImpl.java
index 5feabcf..b28045c 100644
--- a/src/main/java/org/openecomp/aai/champ/model/fluent/object/ObjectBuildOrPropertiesStepImpl.java
+++ b/src/main/java/org/onap/aai/champ/model/fluent/object/ObjectBuildOrPropertiesStepImpl.java
@@ -19,12 +19,12 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.model.fluent.object;
+package org.onap.aai.champ.model.fluent.object;
 
 import java.util.Map;
 
-import org.openecomp.aai.champ.model.ChampObject;
-import org.openecomp.aai.champ.model.ChampObject.Builder;
+import org.onap.aai.champ.model.ChampObject;
+import org.onap.aai.champ.model.ChampObject.Builder;
 
 public final class ObjectBuildOrPropertiesStepImpl implements ObjectBuildOrPropertiesStep {
 
diff --git a/src/main/java/org/openecomp/aai/champ/model/fluent/object/ObjectKeyStepImpl.java b/src/main/java/org/onap/aai/champ/model/fluent/object/ObjectKeyStepImpl.java
index a21aecc..f926b66 100644
--- a/src/main/java/org/openecomp/aai/champ/model/fluent/object/ObjectKeyStepImpl.java
+++ b/src/main/java/org/onap/aai/champ/model/fluent/object/ObjectKeyStepImpl.java
@@ -19,11 +19,11 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.model.fluent.object;
+package org.onap.aai.champ.model.fluent.object;
 
-import org.openecomp.aai.champ.model.ChampObject;
-import org.openecomp.aai.champ.model.ChampObject.Builder;
-import org.openecomp.aai.champ.model.fluent.KeyStep;
+import org.onap.aai.champ.model.ChampObject;
+import org.onap.aai.champ.model.ChampObject.Builder;
+import org.onap.aai.champ.model.fluent.KeyStep;
 
 public final class ObjectKeyStepImpl implements KeyStep<ObjectBuildOrPropertiesStep> {
 
diff --git a/src/main/java/org/openecomp/aai/champ/model/fluent/object/impl/CreateChampObjectableImpl.java b/src/main/java/org/onap/aai/champ/model/fluent/object/impl/CreateChampObjectableImpl.java
index 4645b44..d6b7e48 100644
--- a/src/main/java/org/openecomp/aai/champ/model/fluent/object/impl/CreateChampObjectableImpl.java
+++ b/src/main/java/org/onap/aai/champ/model/fluent/object/impl/CreateChampObjectableImpl.java
@@ -19,13 +19,13 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.model.fluent.object.impl;
+package org.onap.aai.champ.model.fluent.object.impl;
 
-import org.openecomp.aai.champ.model.ChampObject;
-import org.openecomp.aai.champ.model.fluent.KeyStep;
-import org.openecomp.aai.champ.model.fluent.object.CreateChampObjectable;
-import org.openecomp.aai.champ.model.fluent.object.ObjectBuildOrPropertiesStep;
-import org.openecomp.aai.champ.model.fluent.object.ObjectKeyStepImpl;
+import org.onap.aai.champ.model.ChampObject;
+import org.onap.aai.champ.model.fluent.KeyStep;
+import org.onap.aai.champ.model.fluent.object.CreateChampObjectable;
+import org.onap.aai.champ.model.fluent.object.ObjectBuildOrPropertiesStep;
+import org.onap.aai.champ.model.fluent.object.ObjectKeyStepImpl;
 
 public final class CreateChampObjectableImpl implements CreateChampObjectable {
 
diff --git a/src/main/java/org/openecomp/aai/champ/model/fluent/partition/CreateChampPartitionable.java b/src/main/java/org/onap/aai/champ/model/fluent/partition/CreateChampPartitionable.java
index e2a36fb..785bd88 100644
--- a/src/main/java/org/openecomp/aai/champ/model/fluent/partition/CreateChampPartitionable.java
+++ b/src/main/java/org/onap/aai/champ/model/fluent/partition/CreateChampPartitionable.java
@@ -19,12 +19,12 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.model.fluent.partition;
+package org.onap.aai.champ.model.fluent.partition;
 
-import org.openecomp.aai.champ.model.ChampObject;
-import org.openecomp.aai.champ.model.ChampPartition;
-import org.openecomp.aai.champ.model.ChampRelationship;
-import org.openecomp.aai.champ.model.fluent.BuildStep;
+import org.onap.aai.champ.model.ChampObject;
+import org.onap.aai.champ.model.ChampPartition;
+import org.onap.aai.champ.model.ChampRelationship;
+import org.onap.aai.champ.model.fluent.BuildStep;
 
 public interface CreateChampPartitionable extends BuildStep<ChampPartition> {
 
diff --git a/src/main/java/org/openecomp/aai/champ/model/fluent/partition/impl/CreateChampPartionableImpl.java b/src/main/java/org/onap/aai/champ/model/fluent/partition/impl/CreateChampPartionableImpl.java
index ddf9663..f6774fc 100644
--- a/src/main/java/org/openecomp/aai/champ/model/fluent/partition/impl/CreateChampPartionableImpl.java
+++ b/src/main/java/org/onap/aai/champ/model/fluent/partition/impl/CreateChampPartionableImpl.java
@@ -19,12 +19,12 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.model.fluent.partition.impl;
+package org.onap.aai.champ.model.fluent.partition.impl;
 
-import org.openecomp.aai.champ.model.ChampObject;
-import org.openecomp.aai.champ.model.ChampPartition;
-import org.openecomp.aai.champ.model.ChampRelationship;
-import org.openecomp.aai.champ.model.fluent.partition.CreateChampPartitionable;
+import org.onap.aai.champ.model.ChampObject;
+import org.onap.aai.champ.model.ChampPartition;
+import org.onap.aai.champ.model.ChampRelationship;
+import org.onap.aai.champ.model.fluent.partition.CreateChampPartitionable;
 
 public final class CreateChampPartionableImpl implements CreateChampPartitionable {
 
diff --git a/src/main/java/org/openecomp/aai/champ/model/fluent/relationship/CreateChampRelationshipable.java b/src/main/java/org/onap/aai/champ/model/fluent/relationship/CreateChampRelationshipable.java
index 15b96f1..d59a4f0 100644
--- a/src/main/java/org/openecomp/aai/champ/model/fluent/relationship/CreateChampRelationshipable.java
+++ b/src/main/java/org/onap/aai/champ/model/fluent/relationship/CreateChampRelationshipable.java
@@ -19,10 +19,10 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.model.fluent.relationship;
+package org.onap.aai.champ.model.fluent.relationship;
 
-import org.openecomp.aai.champ.model.ChampRelationship;
-import org.openecomp.aai.champ.model.fluent.KeyStep;
+import org.onap.aai.champ.model.ChampRelationship;
+import org.onap.aai.champ.model.fluent.KeyStep;
 
 public interface CreateChampRelationshipable {
 	public KeyStep<SourceStep> ofType(String type);
diff --git a/src/main/java/org/openecomp/aai/champ/model/fluent/relationship/RelationshipBuildOrPropertiesStep.java b/src/main/java/org/onap/aai/champ/model/fluent/relationship/RelationshipBuildOrPropertiesStep.java
index 09c18b8..5c103cd 100644
--- a/src/main/java/org/openecomp/aai/champ/model/fluent/relationship/RelationshipBuildOrPropertiesStep.java
+++ b/src/main/java/org/onap/aai/champ/model/fluent/relationship/RelationshipBuildOrPropertiesStep.java
@@ -19,11 +19,11 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.model.fluent.relationship;
+package org.onap.aai.champ.model.fluent.relationship;
 
-import org.openecomp.aai.champ.model.ChampRelationship;
-import org.openecomp.aai.champ.model.fluent.BuildStep;
-import org.openecomp.aai.champ.model.fluent.PropertiesStep;
+import org.onap.aai.champ.model.ChampRelationship;
+import org.onap.aai.champ.model.fluent.BuildStep;
+import org.onap.aai.champ.model.fluent.PropertiesStep;
 
 public interface RelationshipBuildOrPropertiesStep extends BuildStep<ChampRelationship>, PropertiesStep<RelationshipBuildOrPropertiesStep> {
 }
diff --git a/src/main/java/org/openecomp/aai/champ/model/fluent/relationship/SourceBuildOrPropertiesStep.java b/src/main/java/org/onap/aai/champ/model/fluent/relationship/SourceBuildOrPropertiesStep.java
index 51d4dda..8650b8a 100644
--- a/src/main/java/org/openecomp/aai/champ/model/fluent/relationship/SourceBuildOrPropertiesStep.java
+++ b/src/main/java/org/onap/aai/champ/model/fluent/relationship/SourceBuildOrPropertiesStep.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.model.fluent.relationship;
+package org.onap.aai.champ.model.fluent.relationship;
 
 public interface SourceBuildOrPropertiesStep {
 
diff --git a/src/main/java/org/openecomp/aai/champ/model/fluent/relationship/SourceFromStep.java b/src/main/java/org/onap/aai/champ/model/fluent/relationship/SourceFromStep.java
index 4dbc845..d7b2601 100644
--- a/src/main/java/org/openecomp/aai/champ/model/fluent/relationship/SourceFromStep.java
+++ b/src/main/java/org/onap/aai/champ/model/fluent/relationship/SourceFromStep.java
@@ -19,9 +19,9 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.model.fluent.relationship;
+package org.onap.aai.champ.model.fluent.relationship;
 
-import org.openecomp.aai.champ.model.ChampObject;
+import org.onap.aai.champ.model.ChampObject;
 
 public interface SourceFromStep {
 
diff --git a/src/main/java/org/openecomp/aai/champ/model/fluent/relationship/SourceKeyStep.java b/src/main/java/org/onap/aai/champ/model/fluent/relationship/SourceKeyStep.java
index c054364..03991db 100644
--- a/src/main/java/org/openecomp/aai/champ/model/fluent/relationship/SourceKeyStep.java
+++ b/src/main/java/org/onap/aai/champ/model/fluent/relationship/SourceKeyStep.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.model.fluent.relationship;
+package org.onap.aai.champ.model.fluent.relationship;
 
 public interface SourceKeyStep {
 
diff --git a/src/main/java/org/openecomp/aai/champ/model/fluent/relationship/SourceStep.java b/src/main/java/org/onap/aai/champ/model/fluent/relationship/SourceStep.java
index 6e467bc..5b6d737 100644
--- a/src/main/java/org/openecomp/aai/champ/model/fluent/relationship/SourceStep.java
+++ b/src/main/java/org/onap/aai/champ/model/fluent/relationship/SourceStep.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.model.fluent.relationship;
+package org.onap.aai.champ.model.fluent.relationship;
 
 public interface SourceStep {
 	public SourceTypeOrFromStep withSource();
diff --git a/src/main/java/org/openecomp/aai/champ/model/fluent/relationship/SourceTypeOrFromStep.java b/src/main/java/org/onap/aai/champ/model/fluent/relationship/SourceTypeOrFromStep.java
index 5597496..932b480 100644
--- a/src/main/java/org/openecomp/aai/champ/model/fluent/relationship/SourceTypeOrFromStep.java
+++ b/src/main/java/org/onap/aai/champ/model/fluent/relationship/SourceTypeOrFromStep.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.model.fluent.relationship;
+package org.onap.aai.champ.model.fluent.relationship;
 
 public interface SourceTypeOrFromStep extends SourceTypeStep, SourceFromStep {
 
diff --git a/src/main/java/org/openecomp/aai/champ/model/fluent/relationship/SourceTypeStep.java b/src/main/java/org/onap/aai/champ/model/fluent/relationship/SourceTypeStep.java
index 6c1f976..1466143 100644
--- a/src/main/java/org/openecomp/aai/champ/model/fluent/relationship/SourceTypeStep.java
+++ b/src/main/java/org/onap/aai/champ/model/fluent/relationship/SourceTypeStep.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.model.fluent.relationship;
+package org.onap.aai.champ.model.fluent.relationship;
 
 public interface SourceTypeStep {
 
diff --git a/src/main/java/org/openecomp/aai/champ/model/fluent/relationship/TargetBuildOrPropertiesStep.java b/src/main/java/org/onap/aai/champ/model/fluent/relationship/TargetBuildOrPropertiesStep.java
index b02b7af..a6b5a32 100644
--- a/src/main/java/org/openecomp/aai/champ/model/fluent/relationship/TargetBuildOrPropertiesStep.java
+++ b/src/main/java/org/onap/aai/champ/model/fluent/relationship/TargetBuildOrPropertiesStep.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.model.fluent.relationship;
+package org.onap.aai.champ.model.fluent.relationship;
 
 public interface TargetBuildOrPropertiesStep {
 
diff --git a/src/main/java/org/openecomp/aai/champ/model/fluent/relationship/TargetFromStep.java b/src/main/java/org/onap/aai/champ/model/fluent/relationship/TargetFromStep.java
index afcdf4a..5c296d9 100644
--- a/src/main/java/org/openecomp/aai/champ/model/fluent/relationship/TargetFromStep.java
+++ b/src/main/java/org/onap/aai/champ/model/fluent/relationship/TargetFromStep.java
@@ -19,9 +19,9 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.model.fluent.relationship;
+package org.onap.aai.champ.model.fluent.relationship;
 
-import org.openecomp.aai.champ.model.ChampObject;
+import org.onap.aai.champ.model.ChampObject;
 
 public interface TargetFromStep {
 
diff --git a/src/main/java/org/openecomp/aai/champ/model/fluent/relationship/TargetKeyStep.java b/src/main/java/org/onap/aai/champ/model/fluent/relationship/TargetKeyStep.java
index e236be0..41e6922 100644
--- a/src/main/java/org/openecomp/aai/champ/model/fluent/relationship/TargetKeyStep.java
+++ b/src/main/java/org/onap/aai/champ/model/fluent/relationship/TargetKeyStep.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.model.fluent.relationship;
+package org.onap.aai.champ.model.fluent.relationship;
 
 public interface TargetKeyStep {
 
diff --git a/src/main/java/org/openecomp/aai/champ/model/fluent/relationship/TargetStep.java b/src/main/java/org/onap/aai/champ/model/fluent/relationship/TargetStep.java
index 4a9f047..25d38ed 100644
--- a/src/main/java/org/openecomp/aai/champ/model/fluent/relationship/TargetStep.java
+++ b/src/main/java/org/onap/aai/champ/model/fluent/relationship/TargetStep.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.model.fluent.relationship;
+package org.onap.aai.champ.model.fluent.relationship;
 
 public interface TargetStep {
 	public TargetTypeOrFromStep withTarget();
diff --git a/src/main/java/org/openecomp/aai/champ/model/fluent/relationship/TargetTypeOrFromStep.java b/src/main/java/org/onap/aai/champ/model/fluent/relationship/TargetTypeOrFromStep.java
index 31a5a63..35a16c3 100644
--- a/src/main/java/org/openecomp/aai/champ/model/fluent/relationship/TargetTypeOrFromStep.java
+++ b/src/main/java/org/onap/aai/champ/model/fluent/relationship/TargetTypeOrFromStep.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.model.fluent.relationship;
+package org.onap.aai.champ.model.fluent.relationship;
 
 public interface TargetTypeOrFromStep extends TargetTypeStep, TargetFromStep {
 
diff --git a/src/main/java/org/openecomp/aai/champ/model/fluent/relationship/TargetTypeStep.java b/src/main/java/org/onap/aai/champ/model/fluent/relationship/TargetTypeStep.java
index 308c06f..6de8915 100644
--- a/src/main/java/org/openecomp/aai/champ/model/fluent/relationship/TargetTypeStep.java
+++ b/src/main/java/org/onap/aai/champ/model/fluent/relationship/TargetTypeStep.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.model.fluent.relationship;
+package org.onap.aai.champ.model.fluent.relationship;
 
 public interface TargetTypeStep {
 
diff --git a/src/main/java/org/openecomp/aai/champ/model/fluent/relationship/impl/ChampRelationshipKeyStepImpl.java b/src/main/java/org/onap/aai/champ/model/fluent/relationship/impl/ChampRelationshipKeyStepImpl.java
index 2875d8a..0a69413 100644
--- a/src/main/java/org/openecomp/aai/champ/model/fluent/relationship/impl/ChampRelationshipKeyStepImpl.java
+++ b/src/main/java/org/onap/aai/champ/model/fluent/relationship/impl/ChampRelationshipKeyStepImpl.java
@@ -19,11 +19,11 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.model.fluent.relationship.impl;
+package org.onap.aai.champ.model.fluent.relationship.impl;
 
-import org.openecomp.aai.champ.model.ChampRelationship;
-import org.openecomp.aai.champ.model.fluent.KeyStep;
-import org.openecomp.aai.champ.model.fluent.relationship.SourceStep;
+import org.onap.aai.champ.model.ChampRelationship;
+import org.onap.aai.champ.model.fluent.KeyStep;
+import org.onap.aai.champ.model.fluent.relationship.SourceStep;
 
 public final class ChampRelationshipKeyStepImpl implements KeyStep<SourceStep> {
 
diff --git a/src/main/java/org/openecomp/aai/champ/model/fluent/relationship/impl/CreateChampRelationshipableImpl.java b/src/main/java/org/onap/aai/champ/model/fluent/relationship/impl/CreateChampRelationshipableImpl.java
index 3182416..6125dcd 100644
--- a/src/main/java/org/openecomp/aai/champ/model/fluent/relationship/impl/CreateChampRelationshipableImpl.java
+++ b/src/main/java/org/onap/aai/champ/model/fluent/relationship/impl/CreateChampRelationshipableImpl.java
@@ -19,13 +19,13 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.model.fluent.relationship.impl;
+package org.onap.aai.champ.model.fluent.relationship.impl;
 
-import org.openecomp.aai.champ.model.ChampRelationship;
-import org.openecomp.aai.champ.model.fluent.KeyStep;
-import org.openecomp.aai.champ.model.fluent.relationship.CreateChampRelationshipable;
-import org.openecomp.aai.champ.model.fluent.relationship.RelationshipBuildOrPropertiesStep;
-import org.openecomp.aai.champ.model.fluent.relationship.SourceStep;
+import org.onap.aai.champ.model.ChampRelationship;
+import org.onap.aai.champ.model.fluent.KeyStep;
+import org.onap.aai.champ.model.fluent.relationship.CreateChampRelationshipable;
+import org.onap.aai.champ.model.fluent.relationship.RelationshipBuildOrPropertiesStep;
+import org.onap.aai.champ.model.fluent.relationship.SourceStep;
 
 public final class CreateChampRelationshipableImpl implements CreateChampRelationshipable {
 
diff --git a/src/main/java/org/openecomp/aai/champ/model/fluent/relationship/impl/RelationshipBuildOrPropertiesStepImpl.java b/src/main/java/org/onap/aai/champ/model/fluent/relationship/impl/RelationshipBuildOrPropertiesStepImpl.java
index 6233b8f..bb37e3b 100644
--- a/src/main/java/org/openecomp/aai/champ/model/fluent/relationship/impl/RelationshipBuildOrPropertiesStepImpl.java
+++ b/src/main/java/org/onap/aai/champ/model/fluent/relationship/impl/RelationshipBuildOrPropertiesStepImpl.java
@@ -19,12 +19,12 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.model.fluent.relationship.impl;
+package org.onap.aai.champ.model.fluent.relationship.impl;
 
 import java.util.Map;
 
-import org.openecomp.aai.champ.model.ChampRelationship;
-import org.openecomp.aai.champ.model.fluent.relationship.RelationshipBuildOrPropertiesStep;
+import org.onap.aai.champ.model.ChampRelationship;
+import org.onap.aai.champ.model.fluent.relationship.RelationshipBuildOrPropertiesStep;
 
 public final class RelationshipBuildOrPropertiesStepImpl implements RelationshipBuildOrPropertiesStep {
 
diff --git a/src/main/java/org/openecomp/aai/champ/model/fluent/relationship/impl/SourceBuildOrPropertiesStepImpl.java b/src/main/java/org/onap/aai/champ/model/fluent/relationship/impl/SourceBuildOrPropertiesStepImpl.java
index e7324a3..c218472 100644
--- a/src/main/java/org/openecomp/aai/champ/model/fluent/relationship/impl/SourceBuildOrPropertiesStepImpl.java
+++ b/src/main/java/org/onap/aai/champ/model/fluent/relationship/impl/SourceBuildOrPropertiesStepImpl.java
@@ -19,12 +19,12 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.model.fluent.relationship.impl;
+package org.onap.aai.champ.model.fluent.relationship.impl;
 
-import org.openecomp.aai.champ.model.ChampObject;
-import org.openecomp.aai.champ.model.ChampRelationship;
-import org.openecomp.aai.champ.model.fluent.relationship.SourceBuildOrPropertiesStep;
-import org.openecomp.aai.champ.model.fluent.relationship.TargetStep;
+import org.onap.aai.champ.model.ChampObject;
+import org.onap.aai.champ.model.ChampRelationship;
+import org.onap.aai.champ.model.fluent.relationship.SourceBuildOrPropertiesStep;
+import org.onap.aai.champ.model.fluent.relationship.TargetStep;
 
 public final class SourceBuildOrPropertiesStepImpl implements SourceBuildOrPropertiesStep {
 
diff --git a/src/main/java/org/openecomp/aai/champ/model/fluent/relationship/impl/SourceKeyStepImpl.java b/src/main/java/org/onap/aai/champ/model/fluent/relationship/impl/SourceKeyStepImpl.java
index 5b99d90..7612b55 100644
--- a/src/main/java/org/openecomp/aai/champ/model/fluent/relationship/impl/SourceKeyStepImpl.java
+++ b/src/main/java/org/onap/aai/champ/model/fluent/relationship/impl/SourceKeyStepImpl.java
@@ -19,13 +19,13 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.model.fluent.relationship.impl;
+package org.onap.aai.champ.model.fluent.relationship.impl;
 
-import org.openecomp.aai.champ.model.ChampObject;
-import org.openecomp.aai.champ.model.ChampObject.Builder;
-import org.openecomp.aai.champ.model.ChampRelationship;
-import org.openecomp.aai.champ.model.fluent.relationship.SourceBuildOrPropertiesStep;
-import org.openecomp.aai.champ.model.fluent.relationship.SourceKeyStep;
+import org.onap.aai.champ.model.ChampObject;
+import org.onap.aai.champ.model.ChampRelationship;
+import org.onap.aai.champ.model.ChampObject.Builder;
+import org.onap.aai.champ.model.fluent.relationship.SourceBuildOrPropertiesStep;
+import org.onap.aai.champ.model.fluent.relationship.SourceKeyStep;
 
 public final class SourceKeyStepImpl implements SourceKeyStep {
 
diff --git a/src/main/java/org/openecomp/aai/champ/model/fluent/relationship/impl/SourceStepImpl.java b/src/main/java/org/onap/aai/champ/model/fluent/relationship/impl/SourceStepImpl.java
index 9203072..cc432d0 100644
--- a/src/main/java/org/openecomp/aai/champ/model/fluent/relationship/impl/SourceStepImpl.java
+++ b/src/main/java/org/onap/aai/champ/model/fluent/relationship/impl/SourceStepImpl.java
@@ -19,11 +19,11 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.model.fluent.relationship.impl;
+package org.onap.aai.champ.model.fluent.relationship.impl;
 
-import org.openecomp.aai.champ.model.ChampRelationship;
-import org.openecomp.aai.champ.model.fluent.relationship.SourceStep;
-import org.openecomp.aai.champ.model.fluent.relationship.SourceTypeOrFromStep;
+import org.onap.aai.champ.model.ChampRelationship;
+import org.onap.aai.champ.model.fluent.relationship.SourceStep;
+import org.onap.aai.champ.model.fluent.relationship.SourceTypeOrFromStep;
 
 public final class SourceStepImpl implements SourceStep {
 
diff --git a/src/main/java/org/openecomp/aai/champ/model/fluent/relationship/impl/SourceTypeOrFromStepImpl.java b/src/main/java/org/onap/aai/champ/model/fluent/relationship/impl/SourceTypeOrFromStepImpl.java
index be7fa3d..9cc0ca2 100644
--- a/src/main/java/org/openecomp/aai/champ/model/fluent/relationship/impl/SourceTypeOrFromStepImpl.java
+++ b/src/main/java/org/onap/aai/champ/model/fluent/relationship/impl/SourceTypeOrFromStepImpl.java
@@ -19,13 +19,13 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.model.fluent.relationship.impl;
+package org.onap.aai.champ.model.fluent.relationship.impl;
 
-import org.openecomp.aai.champ.model.ChampObject;
-import org.openecomp.aai.champ.model.ChampRelationship;
-import org.openecomp.aai.champ.model.fluent.relationship.SourceBuildOrPropertiesStep;
-import org.openecomp.aai.champ.model.fluent.relationship.SourceKeyStep;
-import org.openecomp.aai.champ.model.fluent.relationship.SourceTypeOrFromStep;
+import org.onap.aai.champ.model.ChampObject;
+import org.onap.aai.champ.model.ChampRelationship;
+import org.onap.aai.champ.model.fluent.relationship.SourceBuildOrPropertiesStep;
+import org.onap.aai.champ.model.fluent.relationship.SourceKeyStep;
+import org.onap.aai.champ.model.fluent.relationship.SourceTypeOrFromStep;
 
 public final class SourceTypeOrFromStepImpl implements SourceTypeOrFromStep {
 
diff --git a/src/main/java/org/openecomp/aai/champ/model/fluent/relationship/impl/TargetBuildOrPropertiesStepImpl.java b/src/main/java/org/onap/aai/champ/model/fluent/relationship/impl/TargetBuildOrPropertiesStepImpl.java
index 50ad6ab..3b0d7a4 100644
--- a/src/main/java/org/openecomp/aai/champ/model/fluent/relationship/impl/TargetBuildOrPropertiesStepImpl.java
+++ b/src/main/java/org/onap/aai/champ/model/fluent/relationship/impl/TargetBuildOrPropertiesStepImpl.java
@@ -19,12 +19,12 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.model.fluent.relationship.impl;
+package org.onap.aai.champ.model.fluent.relationship.impl;
 
-import org.openecomp.aai.champ.model.ChampObject;
-import org.openecomp.aai.champ.model.ChampRelationship;
-import org.openecomp.aai.champ.model.fluent.relationship.RelationshipBuildOrPropertiesStep;
-import org.openecomp.aai.champ.model.fluent.relationship.TargetBuildOrPropertiesStep;
+import org.onap.aai.champ.model.ChampObject;
+import org.onap.aai.champ.model.ChampRelationship;
+import org.onap.aai.champ.model.fluent.relationship.RelationshipBuildOrPropertiesStep;
+import org.onap.aai.champ.model.fluent.relationship.TargetBuildOrPropertiesStep;
 
 public final class TargetBuildOrPropertiesStepImpl implements TargetBuildOrPropertiesStep {
 
diff --git a/src/main/java/org/openecomp/aai/champ/model/fluent/relationship/impl/TargetKeyStepImpl.java b/src/main/java/org/onap/aai/champ/model/fluent/relationship/impl/TargetKeyStepImpl.java
index 0d4e45c..5400142 100644
--- a/src/main/java/org/openecomp/aai/champ/model/fluent/relationship/impl/TargetKeyStepImpl.java
+++ b/src/main/java/org/onap/aai/champ/model/fluent/relationship/impl/TargetKeyStepImpl.java
@@ -19,12 +19,12 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.model.fluent.relationship.impl;
+package org.onap.aai.champ.model.fluent.relationship.impl;
 
-import org.openecomp.aai.champ.model.ChampObject;
-import org.openecomp.aai.champ.model.ChampRelationship;
-import org.openecomp.aai.champ.model.fluent.relationship.TargetBuildOrPropertiesStep;
-import org.openecomp.aai.champ.model.fluent.relationship.TargetKeyStep;
+import org.onap.aai.champ.model.ChampObject;
+import org.onap.aai.champ.model.ChampRelationship;
+import org.onap.aai.champ.model.fluent.relationship.TargetBuildOrPropertiesStep;
+import org.onap.aai.champ.model.fluent.relationship.TargetKeyStep;
 
 public final class TargetKeyStepImpl implements TargetKeyStep {
 
diff --git a/src/main/java/org/openecomp/aai/champ/model/fluent/relationship/impl/TargetStepImpl.java b/src/main/java/org/onap/aai/champ/model/fluent/relationship/impl/TargetStepImpl.java
index a0df564..7b2b582 100644
--- a/src/main/java/org/openecomp/aai/champ/model/fluent/relationship/impl/TargetStepImpl.java
+++ b/src/main/java/org/onap/aai/champ/model/fluent/relationship/impl/TargetStepImpl.java
@@ -19,12 +19,12 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.model.fluent.relationship.impl;
+package org.onap.aai.champ.model.fluent.relationship.impl;
 
-import org.openecomp.aai.champ.model.ChampObject;
-import org.openecomp.aai.champ.model.ChampRelationship;
-import org.openecomp.aai.champ.model.fluent.relationship.TargetStep;
-import org.openecomp.aai.champ.model.fluent.relationship.TargetTypeOrFromStep;
+import org.onap.aai.champ.model.ChampObject;
+import org.onap.aai.champ.model.ChampRelationship;
+import org.onap.aai.champ.model.fluent.relationship.TargetStep;
+import org.onap.aai.champ.model.fluent.relationship.TargetTypeOrFromStep;
 
 public final class TargetStepImpl implements TargetStep {
 
diff --git a/src/main/java/org/openecomp/aai/champ/model/fluent/relationship/impl/TargetTypeOrFromStepImpl.java b/src/main/java/org/onap/aai/champ/model/fluent/relationship/impl/TargetTypeOrFromStepImpl.java
index e2f4153..0c813a5 100644
--- a/src/main/java/org/openecomp/aai/champ/model/fluent/relationship/impl/TargetTypeOrFromStepImpl.java
+++ b/src/main/java/org/onap/aai/champ/model/fluent/relationship/impl/TargetTypeOrFromStepImpl.java
@@ -19,13 +19,13 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.model.fluent.relationship.impl;
+package org.onap.aai.champ.model.fluent.relationship.impl;
 
-import org.openecomp.aai.champ.model.ChampObject;
-import org.openecomp.aai.champ.model.ChampRelationship;
-import org.openecomp.aai.champ.model.fluent.relationship.TargetBuildOrPropertiesStep;
-import org.openecomp.aai.champ.model.fluent.relationship.TargetKeyStep;
-import org.openecomp.aai.champ.model.fluent.relationship.TargetTypeOrFromStep;
+import org.onap.aai.champ.model.ChampObject;
+import org.onap.aai.champ.model.ChampRelationship;
+import org.onap.aai.champ.model.fluent.relationship.TargetBuildOrPropertiesStep;
+import org.onap.aai.champ.model.fluent.relationship.TargetKeyStep;
+import org.onap.aai.champ.model.fluent.relationship.TargetTypeOrFromStep;
 
 public final class TargetTypeOrFromStepImpl implements TargetTypeOrFromStep {
 
diff --git a/src/main/java/org/openecomp/aai/champ/model/fluent/schema/CreateChampSchemable.java b/src/main/java/org/onap/aai/champ/model/fluent/schema/CreateChampSchemable.java
index 804f8c0..b0a8a2b 100644
--- a/src/main/java/org/openecomp/aai/champ/model/fluent/schema/CreateChampSchemable.java
+++ b/src/main/java/org/onap/aai/champ/model/fluent/schema/CreateChampSchemable.java
@@ -19,10 +19,10 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.model.fluent.schema;
+package org.onap.aai.champ.model.fluent.schema;
 
-import org.openecomp.aai.champ.model.ChampSchema;
-import org.openecomp.aai.champ.model.fluent.BuildStep;
+import org.onap.aai.champ.model.ChampSchema;
+import org.onap.aai.champ.model.fluent.BuildStep;
 
 public interface CreateChampSchemable extends BuildStep<ChampSchema> {
 
diff --git a/src/main/java/org/openecomp/aai/champ/model/fluent/schema/ObjectConstraintBuildStep.java b/src/main/java/org/onap/aai/champ/model/fluent/schema/ObjectConstraintBuildStep.java
index 00ea332..57e677d 100644
--- a/src/main/java/org/openecomp/aai/champ/model/fluent/schema/ObjectConstraintBuildStep.java
+++ b/src/main/java/org/onap/aai/champ/model/fluent/schema/ObjectConstraintBuildStep.java
@@ -19,9 +19,9 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.model.fluent.schema;
+package org.onap.aai.champ.model.fluent.schema;
 
-import org.openecomp.aai.champ.model.fluent.BuildStep;
+import org.onap.aai.champ.model.fluent.BuildStep;
 
 public interface ObjectConstraintBuildStep extends BuildStep<ObjectConstraintPropertyStep> {
 
diff --git a/src/main/java/org/openecomp/aai/champ/model/fluent/schema/ObjectConstraintFieldStep.java b/src/main/java/org/onap/aai/champ/model/fluent/schema/ObjectConstraintFieldStep.java
index ea8d00c..d3ac1b5 100644
--- a/src/main/java/org/openecomp/aai/champ/model/fluent/schema/ObjectConstraintFieldStep.java
+++ b/src/main/java/org/onap/aai/champ/model/fluent/schema/ObjectConstraintFieldStep.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.model.fluent.schema;
+package org.onap.aai.champ.model.fluent.schema;
 
 public interface ObjectConstraintFieldStep {
 
diff --git a/src/main/java/org/openecomp/aai/champ/model/fluent/schema/ObjectConstraintFieldTypeStep.java b/src/main/java/org/onap/aai/champ/model/fluent/schema/ObjectConstraintFieldTypeStep.java
index fe88b34..b4831ab 100644
--- a/src/main/java/org/openecomp/aai/champ/model/fluent/schema/ObjectConstraintFieldTypeStep.java
+++ b/src/main/java/org/onap/aai/champ/model/fluent/schema/ObjectConstraintFieldTypeStep.java
@@ -19,9 +19,9 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.model.fluent.schema;
+package org.onap.aai.champ.model.fluent.schema;
 
-import org.openecomp.aai.champ.model.ChampField;
+import org.onap.aai.champ.model.ChampField;
 
 public interface ObjectConstraintFieldTypeStep {
 
diff --git a/src/main/java/org/openecomp/aai/champ/model/fluent/schema/ObjectConstraintPropertyStep.java b/src/main/java/org/onap/aai/champ/model/fluent/schema/ObjectConstraintPropertyStep.java
index 921af34..90a100f 100644
--- a/src/main/java/org/openecomp/aai/champ/model/fluent/schema/ObjectConstraintPropertyStep.java
+++ b/src/main/java/org/onap/aai/champ/model/fluent/schema/ObjectConstraintPropertyStep.java
@@ -19,9 +19,9 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.model.fluent.schema;
+package org.onap.aai.champ.model.fluent.schema;
 
-import org.openecomp.aai.champ.model.fluent.BuildStep;
+import org.onap.aai.champ.model.fluent.BuildStep;
 
 public interface ObjectConstraintPropertyStep extends BuildStep<CreateChampSchemable> {
 
diff --git a/src/main/java/org/openecomp/aai/champ/model/fluent/schema/ObjectConstraintRequiredOptionalStep.java b/src/main/java/org/onap/aai/champ/model/fluent/schema/ObjectConstraintRequiredOptionalStep.java
index 5d40c24..1979770 100644
--- a/src/main/java/org/openecomp/aai/champ/model/fluent/schema/ObjectConstraintRequiredOptionalStep.java
+++ b/src/main/java/org/onap/aai/champ/model/fluent/schema/ObjectConstraintRequiredOptionalStep.java
@@ -19,9 +19,9 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.model.fluent.schema;
+package org.onap.aai.champ.model.fluent.schema;
 
-import org.openecomp.aai.champ.model.ChampCardinality;
+import org.onap.aai.champ.model.ChampCardinality;
 
 public interface ObjectConstraintRequiredOptionalStep {
 
diff --git a/src/main/java/org/openecomp/aai/champ/model/fluent/schema/ObjectConstraintSubStep.java b/src/main/java/org/onap/aai/champ/model/fluent/schema/ObjectConstraintSubStep.java
index 709cea6..6fb1266 100644
--- a/src/main/java/org/openecomp/aai/champ/model/fluent/schema/ObjectConstraintSubStep.java
+++ b/src/main/java/org/onap/aai/champ/model/fluent/schema/ObjectConstraintSubStep.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.model.fluent.schema;
+package org.onap.aai.champ.model.fluent.schema;
 
 public interface ObjectConstraintSubStep extends ObjectConstraintFieldTypeStep, ObjectConstraintRequiredOptionalStep{
 
diff --git a/src/main/java/org/openecomp/aai/champ/model/fluent/schema/ObjectConstraintTypeStep.java b/src/main/java/org/onap/aai/champ/model/fluent/schema/ObjectConstraintTypeStep.java
index a81c30f..5d8a80b 100644
--- a/src/main/java/org/openecomp/aai/champ/model/fluent/schema/ObjectConstraintTypeStep.java
+++ b/src/main/java/org/onap/aai/champ/model/fluent/schema/ObjectConstraintTypeStep.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.model.fluent.schema;
+package org.onap.aai.champ.model.fluent.schema;
 
 public interface ObjectConstraintTypeStep {
 
diff --git a/src/main/java/org/openecomp/aai/champ/model/fluent/schema/RelationshipConstraintBuildStep.java b/src/main/java/org/onap/aai/champ/model/fluent/schema/RelationshipConstraintBuildStep.java
index 9fb3e30..a8a9513 100644
--- a/src/main/java/org/openecomp/aai/champ/model/fluent/schema/RelationshipConstraintBuildStep.java
+++ b/src/main/java/org/onap/aai/champ/model/fluent/schema/RelationshipConstraintBuildStep.java
@@ -19,9 +19,9 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.model.fluent.schema;
+package org.onap.aai.champ.model.fluent.schema;
 
-import org.openecomp.aai.champ.model.fluent.BuildStep;
+import org.onap.aai.champ.model.fluent.BuildStep;
 
 public interface RelationshipConstraintBuildStep extends BuildStep<RelationshipConstraintSubStep> {
 }
diff --git a/src/main/java/org/openecomp/aai/champ/model/fluent/schema/RelationshipConstraintFieldStep.java b/src/main/java/org/onap/aai/champ/model/fluent/schema/RelationshipConstraintFieldStep.java
index 2ef66b4..3673e3f 100644
--- a/src/main/java/org/openecomp/aai/champ/model/fluent/schema/RelationshipConstraintFieldStep.java
+++ b/src/main/java/org/onap/aai/champ/model/fluent/schema/RelationshipConstraintFieldStep.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.model.fluent.schema;
+package org.onap.aai.champ.model.fluent.schema;
 
 public interface RelationshipConstraintFieldStep {
 
diff --git a/src/main/java/org/openecomp/aai/champ/model/fluent/schema/RelationshipConstraintFieldTypeStep.java b/src/main/java/org/onap/aai/champ/model/fluent/schema/RelationshipConstraintFieldTypeStep.java
index 67d612c..59e969e 100644
--- a/src/main/java/org/openecomp/aai/champ/model/fluent/schema/RelationshipConstraintFieldTypeStep.java
+++ b/src/main/java/org/onap/aai/champ/model/fluent/schema/RelationshipConstraintFieldTypeStep.java
@@ -19,9 +19,9 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.model.fluent.schema;
+package org.onap.aai.champ.model.fluent.schema;
 
-import org.openecomp.aai.champ.model.ChampField;
+import org.onap.aai.champ.model.ChampField;
 
 public interface RelationshipConstraintFieldTypeStep {
 
diff --git a/src/main/java/org/openecomp/aai/champ/model/fluent/schema/RelationshipConstraintMultiplicityStep.java b/src/main/java/org/onap/aai/champ/model/fluent/schema/RelationshipConstraintMultiplicityStep.java
index 2c712de..dd8e76e 100644
--- a/src/main/java/org/openecomp/aai/champ/model/fluent/schema/RelationshipConstraintMultiplicityStep.java
+++ b/src/main/java/org/onap/aai/champ/model/fluent/schema/RelationshipConstraintMultiplicityStep.java
@@ -19,10 +19,10 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.model.fluent.schema;
+package org.onap.aai.champ.model.fluent.schema;
 
-import org.openecomp.aai.champ.model.ChampConnectionMultiplicity;
-import org.openecomp.aai.champ.model.fluent.BuildStep;
+import org.onap.aai.champ.model.ChampConnectionMultiplicity;
+import org.onap.aai.champ.model.fluent.BuildStep;
 
 public interface RelationshipConstraintMultiplicityStep extends BuildStep<RelationshipConstraintSubStep> {
 
diff --git a/src/main/java/org/openecomp/aai/champ/model/fluent/schema/RelationshipConstraintPropertyOptionalsStep.java b/src/main/java/org/onap/aai/champ/model/fluent/schema/RelationshipConstraintPropertyOptionalsStep.java
index f8ea388..3d46437 100644
--- a/src/main/java/org/openecomp/aai/champ/model/fluent/schema/RelationshipConstraintPropertyOptionalsStep.java
+++ b/src/main/java/org/onap/aai/champ/model/fluent/schema/RelationshipConstraintPropertyOptionalsStep.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.model.fluent.schema;
+package org.onap.aai.champ.model.fluent.schema;
 
 public interface RelationshipConstraintPropertyOptionalsStep extends RelationshipConstraintFieldTypeStep, RelationshipConstraintRequiredOptionalStep {
 }
diff --git a/src/main/java/org/openecomp/aai/champ/model/fluent/schema/RelationshipConstraintRequiredOptionalStep.java b/src/main/java/org/onap/aai/champ/model/fluent/schema/RelationshipConstraintRequiredOptionalStep.java
index b318d73..54cf61d 100644
--- a/src/main/java/org/openecomp/aai/champ/model/fluent/schema/RelationshipConstraintRequiredOptionalStep.java
+++ b/src/main/java/org/onap/aai/champ/model/fluent/schema/RelationshipConstraintRequiredOptionalStep.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.model.fluent.schema;
+package org.onap.aai.champ.model.fluent.schema;
 
 public interface RelationshipConstraintRequiredOptionalStep {
 
diff --git a/src/main/java/org/openecomp/aai/champ/model/fluent/schema/RelationshipConstraintSourceStep.java b/src/main/java/org/onap/aai/champ/model/fluent/schema/RelationshipConstraintSourceStep.java
index a497f56..53a17bf 100644
--- a/src/main/java/org/openecomp/aai/champ/model/fluent/schema/RelationshipConstraintSourceStep.java
+++ b/src/main/java/org/onap/aai/champ/model/fluent/schema/RelationshipConstraintSourceStep.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.model.fluent.schema;
+package org.onap.aai.champ.model.fluent.schema;
 
 public interface RelationshipConstraintSourceStep {
 
diff --git a/src/main/java/org/openecomp/aai/champ/model/fluent/schema/RelationshipConstraintSubStep.java b/src/main/java/org/onap/aai/champ/model/fluent/schema/RelationshipConstraintSubStep.java
index 67fda0e..9de5fe7 100644
--- a/src/main/java/org/openecomp/aai/champ/model/fluent/schema/RelationshipConstraintSubStep.java
+++ b/src/main/java/org/onap/aai/champ/model/fluent/schema/RelationshipConstraintSubStep.java
@@ -19,9 +19,9 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.model.fluent.schema;
+package org.onap.aai.champ.model.fluent.schema;
 
-import org.openecomp.aai.champ.model.fluent.BuildStep;
+import org.onap.aai.champ.model.fluent.BuildStep;
 
 public interface RelationshipConstraintSubStep extends BuildStep<CreateChampSchemable> {
 
diff --git a/src/main/java/org/openecomp/aai/champ/model/fluent/schema/RelationshipConstraintTargetStep.java b/src/main/java/org/onap/aai/champ/model/fluent/schema/RelationshipConstraintTargetStep.java
index 0b31918..6b86b40 100644
--- a/src/main/java/org/openecomp/aai/champ/model/fluent/schema/RelationshipConstraintTargetStep.java
+++ b/src/main/java/org/onap/aai/champ/model/fluent/schema/RelationshipConstraintTargetStep.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.model.fluent.schema;
+package org.onap.aai.champ.model.fluent.schema;
 
 public interface RelationshipConstraintTargetStep {
 
diff --git a/src/main/java/org/openecomp/aai/champ/model/fluent/schema/RelationshipConstraintTypeStep.java b/src/main/java/org/onap/aai/champ/model/fluent/schema/RelationshipConstraintTypeStep.java
index e0f7d7b..fc20d37 100644
--- a/src/main/java/org/openecomp/aai/champ/model/fluent/schema/RelationshipConstraintTypeStep.java
+++ b/src/main/java/org/onap/aai/champ/model/fluent/schema/RelationshipConstraintTypeStep.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.model.fluent.schema;
+package org.onap.aai.champ.model.fluent.schema;
 
 public interface RelationshipConstraintTypeStep {
 
diff --git a/src/main/java/org/openecomp/aai/champ/model/fluent/schema/impl/CreateChampSchemableImpl.java b/src/main/java/org/onap/aai/champ/model/fluent/schema/impl/CreateChampSchemableImpl.java
index 2d1c2ed..dd27842 100644
--- a/src/main/java/org/openecomp/aai/champ/model/fluent/schema/impl/CreateChampSchemableImpl.java
+++ b/src/main/java/org/onap/aai/champ/model/fluent/schema/impl/CreateChampSchemableImpl.java
@@ -19,16 +19,16 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.model.fluent.schema.impl;
+package org.onap.aai.champ.model.fluent.schema.impl;
 
-import org.openecomp.aai.champ.model.ChampObjectConstraint;
-import org.openecomp.aai.champ.model.ChampRelationshipConstraint;
-import org.openecomp.aai.champ.model.ChampSchema;
-import org.openecomp.aai.champ.model.fluent.schema.CreateChampSchemable;
-import org.openecomp.aai.champ.model.fluent.schema.ObjectConstraintPropertyStep;
-import org.openecomp.aai.champ.model.fluent.schema.ObjectConstraintTypeStep;
-import org.openecomp.aai.champ.model.fluent.schema.RelationshipConstraintSubStep;
-import org.openecomp.aai.champ.model.fluent.schema.RelationshipConstraintTypeStep;
+import org.onap.aai.champ.model.ChampObjectConstraint;
+import org.onap.aai.champ.model.ChampRelationshipConstraint;
+import org.onap.aai.champ.model.ChampSchema;
+import org.onap.aai.champ.model.fluent.schema.CreateChampSchemable;
+import org.onap.aai.champ.model.fluent.schema.ObjectConstraintPropertyStep;
+import org.onap.aai.champ.model.fluent.schema.ObjectConstraintTypeStep;
+import org.onap.aai.champ.model.fluent.schema.RelationshipConstraintSubStep;
+import org.onap.aai.champ.model.fluent.schema.RelationshipConstraintTypeStep;
 
 public class CreateChampSchemableImpl implements CreateChampSchemable {
 
diff --git a/src/main/java/org/openecomp/aai/champ/model/fluent/schema/impl/ObjectConstraintBuildStepImpl.java b/src/main/java/org/onap/aai/champ/model/fluent/schema/impl/ObjectConstraintBuildStepImpl.java
index d344350..7d595a9 100644
--- a/src/main/java/org/openecomp/aai/champ/model/fluent/schema/impl/ObjectConstraintBuildStepImpl.java
+++ b/src/main/java/org/onap/aai/champ/model/fluent/schema/impl/ObjectConstraintBuildStepImpl.java
@@ -19,12 +19,12 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.model.fluent.schema.impl;
+package org.onap.aai.champ.model.fluent.schema.impl;
 
-import org.openecomp.aai.champ.model.ChampObjectConstraint;
-import org.openecomp.aai.champ.model.ChampSchema;
-import org.openecomp.aai.champ.model.fluent.schema.ObjectConstraintBuildStep;
-import org.openecomp.aai.champ.model.fluent.schema.ObjectConstraintPropertyStep;
+import org.onap.aai.champ.model.ChampObjectConstraint;
+import org.onap.aai.champ.model.ChampSchema;
+import org.onap.aai.champ.model.fluent.schema.ObjectConstraintBuildStep;
+import org.onap.aai.champ.model.fluent.schema.ObjectConstraintPropertyStep;
 
 public class ObjectConstraintBuildStepImpl implements ObjectConstraintBuildStep {
 
diff --git a/src/main/java/org/openecomp/aai/champ/model/fluent/schema/impl/ObjectConstraintFieldStepImpl.java b/src/main/java/org/onap/aai/champ/model/fluent/schema/impl/ObjectConstraintFieldStepImpl.java
index 9ce1d03..609f0e3 100644
--- a/src/main/java/org/openecomp/aai/champ/model/fluent/schema/impl/ObjectConstraintFieldStepImpl.java
+++ b/src/main/java/org/onap/aai/champ/model/fluent/schema/impl/ObjectConstraintFieldStepImpl.java
@@ -19,13 +19,13 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.model.fluent.schema.impl;
+package org.onap.aai.champ.model.fluent.schema.impl;
 
-import org.openecomp.aai.champ.model.ChampField;
-import org.openecomp.aai.champ.model.ChampObjectConstraint;
-import org.openecomp.aai.champ.model.ChampSchema;
-import org.openecomp.aai.champ.model.fluent.schema.ObjectConstraintFieldStep;
-import org.openecomp.aai.champ.model.fluent.schema.ObjectConstraintSubStep;
+import org.onap.aai.champ.model.ChampField;
+import org.onap.aai.champ.model.ChampObjectConstraint;
+import org.onap.aai.champ.model.ChampSchema;
+import org.onap.aai.champ.model.fluent.schema.ObjectConstraintFieldStep;
+import org.onap.aai.champ.model.fluent.schema.ObjectConstraintSubStep;
 
 public class ObjectConstraintFieldStepImpl implements ObjectConstraintFieldStep {
 
diff --git a/src/main/java/org/openecomp/aai/champ/model/fluent/schema/impl/ObjectConstraintPropertyStepImpl.java b/src/main/java/org/onap/aai/champ/model/fluent/schema/impl/ObjectConstraintPropertyStepImpl.java
index de2406e..1e85e8b 100644
--- a/src/main/java/org/openecomp/aai/champ/model/fluent/schema/impl/ObjectConstraintPropertyStepImpl.java
+++ b/src/main/java/org/onap/aai/champ/model/fluent/schema/impl/ObjectConstraintPropertyStepImpl.java
@@ -19,13 +19,13 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.model.fluent.schema.impl;
+package org.onap.aai.champ.model.fluent.schema.impl;
 
-import org.openecomp.aai.champ.model.ChampObjectConstraint;
-import org.openecomp.aai.champ.model.ChampSchema;
-import org.openecomp.aai.champ.model.fluent.schema.CreateChampSchemable;
-import org.openecomp.aai.champ.model.fluent.schema.ObjectConstraintFieldStep;
-import org.openecomp.aai.champ.model.fluent.schema.ObjectConstraintPropertyStep;
+import org.onap.aai.champ.model.ChampObjectConstraint;
+import org.onap.aai.champ.model.ChampSchema;
+import org.onap.aai.champ.model.fluent.schema.CreateChampSchemable;
+import org.onap.aai.champ.model.fluent.schema.ObjectConstraintFieldStep;
+import org.onap.aai.champ.model.fluent.schema.ObjectConstraintPropertyStep;
 
 public class ObjectConstraintPropertyStepImpl implements ObjectConstraintPropertyStep {
 
diff --git a/src/main/java/org/openecomp/aai/champ/model/fluent/schema/impl/ObjectConstraintSubStepImpl.java b/src/main/java/org/onap/aai/champ/model/fluent/schema/impl/ObjectConstraintSubStepImpl.java
index 01eba74..6564cf4 100644
--- a/src/main/java/org/openecomp/aai/champ/model/fluent/schema/impl/ObjectConstraintSubStepImpl.java
+++ b/src/main/java/org/onap/aai/champ/model/fluent/schema/impl/ObjectConstraintSubStepImpl.java
@@ -19,17 +19,17 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.model.fluent.schema.impl;
-
-import org.openecomp.aai.champ.model.ChampCardinality;
-import org.openecomp.aai.champ.model.ChampField;
-import org.openecomp.aai.champ.model.ChampObjectConstraint;
-import org.openecomp.aai.champ.model.ChampPropertyConstraint;
-import org.openecomp.aai.champ.model.ChampSchema;
-import org.openecomp.aai.champ.model.fluent.schema.ObjectConstraintBuildStep;
-import org.openecomp.aai.champ.model.fluent.schema.ObjectConstraintPropertyStep;
-import org.openecomp.aai.champ.model.fluent.schema.ObjectConstraintRequiredOptionalStep;
-import org.openecomp.aai.champ.model.fluent.schema.ObjectConstraintSubStep;
+package org.onap.aai.champ.model.fluent.schema.impl;
+
+import org.onap.aai.champ.model.ChampCardinality;
+import org.onap.aai.champ.model.ChampField;
+import org.onap.aai.champ.model.ChampObjectConstraint;
+import org.onap.aai.champ.model.ChampPropertyConstraint;
+import org.onap.aai.champ.model.ChampSchema;
+import org.onap.aai.champ.model.fluent.schema.ObjectConstraintBuildStep;
+import org.onap.aai.champ.model.fluent.schema.ObjectConstraintPropertyStep;
+import org.onap.aai.champ.model.fluent.schema.ObjectConstraintRequiredOptionalStep;
+import org.onap.aai.champ.model.fluent.schema.ObjectConstraintSubStep;
 
 public class ObjectConstraintSubStepImpl implements ObjectConstraintSubStep {
 
diff --git a/src/main/java/org/openecomp/aai/champ/model/fluent/schema/impl/RelationshipConstraintBuildStepImpl.java b/src/main/java/org/onap/aai/champ/model/fluent/schema/impl/RelationshipConstraintBuildStepImpl.java
index 018c73f..d20d596 100644
--- a/src/main/java/org/openecomp/aai/champ/model/fluent/schema/impl/RelationshipConstraintBuildStepImpl.java
+++ b/src/main/java/org/onap/aai/champ/model/fluent/schema/impl/RelationshipConstraintBuildStepImpl.java
@@ -19,13 +19,13 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.model.fluent.schema.impl;
+package org.onap.aai.champ.model.fluent.schema.impl;
 
-import org.openecomp.aai.champ.model.ChampRelationshipConstraint;
-import org.openecomp.aai.champ.model.ChampSchema;
-import org.openecomp.aai.champ.model.ChampSchema.Builder;
-import org.openecomp.aai.champ.model.fluent.schema.RelationshipConstraintBuildStep;
-import org.openecomp.aai.champ.model.fluent.schema.RelationshipConstraintSubStep;
+import org.onap.aai.champ.model.ChampRelationshipConstraint;
+import org.onap.aai.champ.model.ChampSchema;
+import org.onap.aai.champ.model.ChampSchema.Builder;
+import org.onap.aai.champ.model.fluent.schema.RelationshipConstraintBuildStep;
+import org.onap.aai.champ.model.fluent.schema.RelationshipConstraintSubStep;
 
 public class RelationshipConstraintBuildStepImpl implements RelationshipConstraintBuildStep {
 
diff --git a/src/main/java/org/openecomp/aai/champ/model/fluent/schema/impl/RelationshipConstraintPropertyOptionalsStepImpl.java b/src/main/java/org/onap/aai/champ/model/fluent/schema/impl/RelationshipConstraintPropertyOptionalsStepImpl.java
index 62176b7..7ef822d 100644
--- a/src/main/java/org/openecomp/aai/champ/model/fluent/schema/impl/RelationshipConstraintPropertyOptionalsStepImpl.java
+++ b/src/main/java/org/onap/aai/champ/model/fluent/schema/impl/RelationshipConstraintPropertyOptionalsStepImpl.java
@@ -19,15 +19,15 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.model.fluent.schema.impl;
+package org.onap.aai.champ.model.fluent.schema.impl;
 
-import org.openecomp.aai.champ.model.ChampField;
-import org.openecomp.aai.champ.model.ChampPropertyConstraint;
-import org.openecomp.aai.champ.model.ChampRelationshipConstraint;
-import org.openecomp.aai.champ.model.ChampSchema;
-import org.openecomp.aai.champ.model.fluent.schema.RelationshipConstraintBuildStep;
-import org.openecomp.aai.champ.model.fluent.schema.RelationshipConstraintPropertyOptionalsStep;
-import org.openecomp.aai.champ.model.fluent.schema.RelationshipConstraintRequiredOptionalStep;
+import org.onap.aai.champ.model.ChampField;
+import org.onap.aai.champ.model.ChampPropertyConstraint;
+import org.onap.aai.champ.model.ChampRelationshipConstraint;
+import org.onap.aai.champ.model.ChampSchema;
+import org.onap.aai.champ.model.fluent.schema.RelationshipConstraintBuildStep;
+import org.onap.aai.champ.model.fluent.schema.RelationshipConstraintPropertyOptionalsStep;
+import org.onap.aai.champ.model.fluent.schema.RelationshipConstraintRequiredOptionalStep;
 
 public class RelationshipConstraintPropertyOptionalsStepImpl implements RelationshipConstraintPropertyOptionalsStep {
 
diff --git a/src/main/java/org/openecomp/aai/champ/model/fluent/schema/impl/RelationshipConstraintRequiredOptionalStepImpl.java b/src/main/java/org/onap/aai/champ/model/fluent/schema/impl/RelationshipConstraintRequiredOptionalStepImpl.java
index 63720a4..58db7bb 100644
--- a/src/main/java/org/openecomp/aai/champ/model/fluent/schema/impl/RelationshipConstraintRequiredOptionalStepImpl.java
+++ b/src/main/java/org/onap/aai/champ/model/fluent/schema/impl/RelationshipConstraintRequiredOptionalStepImpl.java
@@ -19,15 +19,15 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.model.fluent.schema.impl;
+package org.onap.aai.champ.model.fluent.schema.impl;
 
-import org.openecomp.aai.champ.model.ChampField;
-import org.openecomp.aai.champ.model.ChampPropertyConstraint;
-import org.openecomp.aai.champ.model.ChampRelationshipConstraint;
-import org.openecomp.aai.champ.model.ChampSchema;
-import org.openecomp.aai.champ.model.ChampSchema.Builder;
-import org.openecomp.aai.champ.model.fluent.schema.RelationshipConstraintBuildStep;
-import org.openecomp.aai.champ.model.fluent.schema.RelationshipConstraintRequiredOptionalStep;
+import org.onap.aai.champ.model.ChampField;
+import org.onap.aai.champ.model.ChampPropertyConstraint;
+import org.onap.aai.champ.model.ChampRelationshipConstraint;
+import org.onap.aai.champ.model.ChampSchema;
+import org.onap.aai.champ.model.ChampSchema.Builder;
+import org.onap.aai.champ.model.fluent.schema.RelationshipConstraintBuildStep;
+import org.onap.aai.champ.model.fluent.schema.RelationshipConstraintRequiredOptionalStep;
 
 public class RelationshipConstraintRequiredOptionalStepImpl implements RelationshipConstraintRequiredOptionalStep {
 
diff --git a/src/main/java/org/openecomp/aai/champ/model/fluent/schema/impl/RelationshipConstraintSubStepImpl.java b/src/main/java/org/onap/aai/champ/model/fluent/schema/impl/RelationshipConstraintSubStepImpl.java
index 4d88690..aca9c0c 100644
--- a/src/main/java/org/openecomp/aai/champ/model/fluent/schema/impl/RelationshipConstraintSubStepImpl.java
+++ b/src/main/java/org/onap/aai/champ/model/fluent/schema/impl/RelationshipConstraintSubStepImpl.java
@@ -19,22 +19,22 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.model.fluent.schema.impl;
-
-import org.openecomp.aai.champ.model.ChampConnectionConstraint;
-import org.openecomp.aai.champ.model.ChampField;
-import org.openecomp.aai.champ.model.ChampObject;
-import org.openecomp.aai.champ.model.ChampRelationshipConstraint;
-import org.openecomp.aai.champ.model.ChampConnectionMultiplicity;
-import org.openecomp.aai.champ.model.ChampSchema;
-import org.openecomp.aai.champ.model.fluent.BuildStep;
-import org.openecomp.aai.champ.model.fluent.schema.CreateChampSchemable;
-import org.openecomp.aai.champ.model.fluent.schema.RelationshipConstraintFieldStep;
-import org.openecomp.aai.champ.model.fluent.schema.RelationshipConstraintMultiplicityStep;
-import org.openecomp.aai.champ.model.fluent.schema.RelationshipConstraintPropertyOptionalsStep;
-import org.openecomp.aai.champ.model.fluent.schema.RelationshipConstraintSourceStep;
-import org.openecomp.aai.champ.model.fluent.schema.RelationshipConstraintSubStep;
-import org.openecomp.aai.champ.model.fluent.schema.RelationshipConstraintTargetStep;
+package org.onap.aai.champ.model.fluent.schema.impl;
+
+import org.onap.aai.champ.model.ChampConnectionConstraint;
+import org.onap.aai.champ.model.ChampConnectionMultiplicity;
+import org.onap.aai.champ.model.ChampField;
+import org.onap.aai.champ.model.ChampObject;
+import org.onap.aai.champ.model.ChampRelationshipConstraint;
+import org.onap.aai.champ.model.ChampSchema;
+import org.onap.aai.champ.model.fluent.BuildStep;
+import org.onap.aai.champ.model.fluent.schema.CreateChampSchemable;
+import org.onap.aai.champ.model.fluent.schema.RelationshipConstraintFieldStep;
+import org.onap.aai.champ.model.fluent.schema.RelationshipConstraintMultiplicityStep;
+import org.onap.aai.champ.model.fluent.schema.RelationshipConstraintPropertyOptionalsStep;
+import org.onap.aai.champ.model.fluent.schema.RelationshipConstraintSourceStep;
+import org.onap.aai.champ.model.fluent.schema.RelationshipConstraintSubStep;
+import org.onap.aai.champ.model.fluent.schema.RelationshipConstraintTargetStep;
 
 public class RelationshipConstraintSubStepImpl implements RelationshipConstraintSubStep {
 
diff --git a/src/main/java/org/openecomp/aai/champ/perf/ChampAPIPerformanceTest.java b/src/main/java/org/onap/aai/champ/perf/ChampAPIPerformanceTest.java
index 563ae67..e1266aa 100644
--- a/src/main/java/org/openecomp/aai/champ/perf/ChampAPIPerformanceTest.java
+++ b/src/main/java/org/onap/aai/champ/perf/ChampAPIPerformanceTest.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.perf;
+package org.onap.aai.champ.perf;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -30,21 +30,21 @@ import java.util.Map.Entry;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import org.openecomp.aai.champ.ChampGraph;
-import org.openecomp.aai.champ.exceptions.ChampMarshallingException;
-import org.openecomp.aai.champ.exceptions.ChampObjectNotExistsException;
-import org.openecomp.aai.champ.exceptions.ChampRelationshipNotExistsException;
-import org.openecomp.aai.champ.exceptions.ChampSchemaViolationException;
-import org.openecomp.aai.champ.exceptions.ChampUnmarshallingException;
-import org.openecomp.aai.champ.graph.impl.InMemoryChampGraphImpl;
-import org.openecomp.aai.champ.graph.impl.TitanChampGraphImpl;
-import org.openecomp.aai.champ.model.ChampField;
-import org.openecomp.aai.champ.model.ChampObject;
-import org.openecomp.aai.champ.model.ChampObjectIndex;
-import org.openecomp.aai.champ.model.ChampRelationship;
-import org.openecomp.aai.champ.model.ChampRelationshipIndex;
-import org.openecomp.aai.champ.model.ChampSchema;
-import org.openecomp.aai.champ.schema.ChampSchemaEnforcer;
+import org.onap.aai.champ.ChampGraph;
+import org.onap.aai.champ.exceptions.ChampMarshallingException;
+import org.onap.aai.champ.exceptions.ChampObjectNotExistsException;
+import org.onap.aai.champ.exceptions.ChampRelationshipNotExistsException;
+import org.onap.aai.champ.exceptions.ChampSchemaViolationException;
+import org.onap.aai.champ.exceptions.ChampUnmarshallingException;
+import org.onap.aai.champ.graph.impl.InMemoryChampGraphImpl;
+import org.onap.aai.champ.graph.impl.TitanChampGraphImpl;
+import org.onap.aai.champ.model.ChampField;
+import org.onap.aai.champ.model.ChampObject;
+import org.onap.aai.champ.model.ChampObjectIndex;
+import org.onap.aai.champ.model.ChampRelationship;
+import org.onap.aai.champ.model.ChampRelationshipIndex;
+import org.onap.aai.champ.model.ChampSchema;
+import org.onap.aai.champ.schema.ChampSchemaEnforcer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/org/openecomp/aai/champ/schema/AlwaysValidChampSchemaEnforcer.java b/src/main/java/org/onap/aai/champ/schema/AlwaysValidChampSchemaEnforcer.java
index 25083b1..292ff4c 100644
--- a/src/main/java/org/openecomp/aai/champ/schema/AlwaysValidChampSchemaEnforcer.java
+++ b/src/main/java/org/onap/aai/champ/schema/AlwaysValidChampSchemaEnforcer.java
@@ -19,14 +19,14 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.schema;
+package org.onap.aai.champ.schema;
 
-import org.openecomp.aai.champ.model.ChampObject;
-import org.openecomp.aai.champ.model.ChampObjectConstraint;
-import org.openecomp.aai.champ.model.ChampPartition;
-import org.openecomp.aai.champ.model.ChampRelationship;
-import org.openecomp.aai.champ.model.ChampRelationshipConstraint;
-import org.openecomp.aai.champ.model.ChampSchema;
+import org.onap.aai.champ.model.ChampObject;
+import org.onap.aai.champ.model.ChampObjectConstraint;
+import org.onap.aai.champ.model.ChampPartition;
+import org.onap.aai.champ.model.ChampRelationship;
+import org.onap.aai.champ.model.ChampRelationshipConstraint;
+import org.onap.aai.champ.model.ChampSchema;
 
 public final class AlwaysValidChampSchemaEnforcer implements ChampSchemaEnforcer {
 
diff --git a/src/main/java/org/openecomp/aai/champ/schema/ChampSchemaEnforcer.java b/src/main/java/org/onap/aai/champ/schema/ChampSchemaEnforcer.java
index 7918e14..978b2a0 100644
--- a/src/main/java/org/openecomp/aai/champ/schema/ChampSchemaEnforcer.java
+++ b/src/main/java/org/onap/aai/champ/schema/ChampSchemaEnforcer.java
@@ -19,15 +19,15 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.schema;
+package org.onap.aai.champ.schema;
 
-import org.openecomp.aai.champ.exceptions.ChampSchemaViolationException;
-import org.openecomp.aai.champ.model.ChampObject;
-import org.openecomp.aai.champ.model.ChampObjectConstraint;
-import org.openecomp.aai.champ.model.ChampPartition;
-import org.openecomp.aai.champ.model.ChampRelationship;
-import org.openecomp.aai.champ.model.ChampRelationshipConstraint;
-import org.openecomp.aai.champ.model.ChampSchema;
+import org.onap.aai.champ.exceptions.ChampSchemaViolationException;
+import org.onap.aai.champ.model.ChampObject;
+import org.onap.aai.champ.model.ChampObjectConstraint;
+import org.onap.aai.champ.model.ChampPartition;
+import org.onap.aai.champ.model.ChampRelationship;
+import org.onap.aai.champ.model.ChampRelationshipConstraint;
+import org.onap.aai.champ.model.ChampSchema;
 
 public interface ChampSchemaEnforcer {
 
diff --git a/src/main/java/org/openecomp/aai/champ/schema/DefaultChampSchemaEnforcer.java b/src/main/java/org/onap/aai/champ/schema/DefaultChampSchemaEnforcer.java
index 19ae46f..8ea93e5 100644
--- a/src/main/java/org/openecomp/aai/champ/schema/DefaultChampSchemaEnforcer.java
+++ b/src/main/java/org/onap/aai/champ/schema/DefaultChampSchemaEnforcer.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.schema;
+package org.onap.aai.champ.schema;
 
 import java.util.HashMap;
 import java.util.List;
@@ -28,16 +28,16 @@ import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.openecomp.aai.champ.exceptions.ChampSchemaViolationException;
-import org.openecomp.aai.champ.model.ChampConnectionConstraint;
-import org.openecomp.aai.champ.model.ChampField;
-import org.openecomp.aai.champ.model.ChampObject;
-import org.openecomp.aai.champ.model.ChampObjectConstraint;
-import org.openecomp.aai.champ.model.ChampPartition;
-import org.openecomp.aai.champ.model.ChampPropertyConstraint;
-import org.openecomp.aai.champ.model.ChampRelationship;
-import org.openecomp.aai.champ.model.ChampRelationshipConstraint;
-import org.openecomp.aai.champ.model.ChampSchema;
+import org.onap.aai.champ.exceptions.ChampSchemaViolationException;
+import org.onap.aai.champ.model.ChampConnectionConstraint;
+import org.onap.aai.champ.model.ChampField;
+import org.onap.aai.champ.model.ChampObject;
+import org.onap.aai.champ.model.ChampObjectConstraint;
+import org.onap.aai.champ.model.ChampPartition;
+import org.onap.aai.champ.model.ChampPropertyConstraint;
+import org.onap.aai.champ.model.ChampRelationship;
+import org.onap.aai.champ.model.ChampRelationshipConstraint;
+import org.onap.aai.champ.model.ChampSchema;
 
 public final class DefaultChampSchemaEnforcer implements ChampSchemaEnforcer {
 
diff --git a/src/main/java/org/openecomp/aai/champ/transform/Champformer.java b/src/main/java/org/onap/aai/champ/transform/Champformer.java
index dc79cd8..da2fce7 100644
--- a/src/main/java/org/openecomp/aai/champ/transform/Champformer.java
+++ b/src/main/java/org/onap/aai/champ/transform/Champformer.java
@@ -19,11 +19,11 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.transform;
+package org.onap.aai.champ.transform;
 
-import org.openecomp.aai.champ.exceptions.ChampUnmarshallingException;
-import org.openecomp.aai.champ.model.ChampObject;
-import org.openecomp.aai.champ.model.ChampRelationship;
+import org.onap.aai.champ.exceptions.ChampUnmarshallingException;
+import org.onap.aai.champ.model.ChampObject;
+import org.onap.aai.champ.model.ChampRelationship;
 
 public interface Champformer<V, E> {
 	public V marshallObject(ChampObject object) throws ChampUnmarshallingException;
diff --git a/src/main/java/org/openecomp/aai/champ/transform/TinkerpopChampformer.java b/src/main/java/org/onap/aai/champ/transform/TinkerpopChampformer.java
index 412c8c3..e24f2dc 100644
--- a/src/main/java/org/openecomp/aai/champ/transform/TinkerpopChampformer.java
+++ b/src/main/java/org/onap/aai/champ/transform/TinkerpopChampformer.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.transform;
+package org.onap.aai.champ.transform;
 
 import java.util.Iterator;
 
@@ -27,11 +27,11 @@ import org.apache.tinkerpop.gremlin.structure.Edge;
 import org.apache.tinkerpop.gremlin.structure.Property;
 import org.apache.tinkerpop.gremlin.structure.Vertex;
 import org.apache.tinkerpop.gremlin.structure.VertexProperty;
-import org.openecomp.aai.champ.exceptions.ChampUnmarshallingException;
-import org.openecomp.aai.champ.model.ChampObject;
-import org.openecomp.aai.champ.model.ChampRelationship;
-import org.openecomp.aai.champ.model.fluent.object.ObjectBuildOrPropertiesStep;
-import org.openecomp.aai.champ.model.fluent.relationship.RelationshipBuildOrPropertiesStep;
+import org.onap.aai.champ.exceptions.ChampUnmarshallingException;
+import org.onap.aai.champ.model.ChampObject;
+import org.onap.aai.champ.model.ChampRelationship;
+import org.onap.aai.champ.model.fluent.object.ObjectBuildOrPropertiesStep;
+import org.onap.aai.champ.model.fluent.relationship.RelationshipBuildOrPropertiesStep;
 
 public final class TinkerpopChampformer implements Champformer<Vertex, Edge> {
 
diff --git a/src/test/java/org/openecomp/aai/champ/concurrency/ConcurrencyTest.java b/src/test/java/org/onap/aai/champ/concurrency/ConcurrencyTest.java
index a9a6b75..f33266d 100644
--- a/src/test/java/org/openecomp/aai/champ/concurrency/ConcurrencyTest.java
+++ b/src/test/java/org/onap/aai/champ/concurrency/ConcurrencyTest.java
@@ -19,17 +19,17 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.concurrency;
+package org.onap.aai.champ.concurrency;
 
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 
 import org.junit.Test;
-import org.openecomp.aai.champ.ChampAPI;
-import org.openecomp.aai.champ.ChampGraph;
-import org.openecomp.aai.champ.core.ChampObjectTest;
-import org.openecomp.aai.champ.core.ChampRelationshipTest;
+import org.onap.aai.champ.ChampAPI;
+import org.onap.aai.champ.ChampGraph;
+import org.onap.aai.champ.core.ChampObjectTest;
+import org.onap.aai.champ.core.ChampRelationshipTest;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/test/java/org/openecomp/aai/champ/core/BaseChampAPITest.java b/src/test/java/org/onap/aai/champ/core/BaseChampAPITest.java
index 7d374c3..af737bc 100644
--- a/src/test/java/org/openecomp/aai/champ/core/BaseChampAPITest.java
+++ b/src/test/java/org/onap/aai/champ/core/BaseChampAPITest.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.core;
+package org.onap.aai.champ.core;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/src/test/java/org/openecomp/aai/champ/core/ChampAPITest.java b/src/test/java/org/onap/aai/champ/core/ChampAPITest.java
index 7cd259e..d0097d9 100644
--- a/src/test/java/org/openecomp/aai/champ/core/ChampAPITest.java
+++ b/src/test/java/org/onap/aai/champ/core/ChampAPITest.java
@@ -19,15 +19,15 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.core;
+package org.onap.aai.champ.core;
 
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
-import org.openecomp.aai.champ.ChampAPI;
-import org.openecomp.aai.champ.ChampGraph;
-import org.openecomp.aai.champ.model.ChampObjectConstraint;
-import org.openecomp.aai.champ.model.ChampRelationshipConstraint;
+import org.onap.aai.champ.ChampAPI;
+import org.onap.aai.champ.ChampGraph;
+import org.onap.aai.champ.model.ChampObjectConstraint;
+import org.onap.aai.champ.model.ChampRelationshipConstraint;
 
 public class ChampAPITest {
 
diff --git a/src/test/java/org/openecomp/aai/champ/core/ChampElementTest.java b/src/test/java/org/onap/aai/champ/core/ChampElementTest.java
index 4d34f8a..af19cc2 100644
--- a/src/test/java/org/openecomp/aai/champ/core/ChampElementTest.java
+++ b/src/test/java/org/onap/aai/champ/core/ChampElementTest.java
@@ -19,14 +19,14 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.core;
+package org.onap.aai.champ.core;
 
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
-import org.openecomp.aai.champ.model.ChampElement;
-import org.openecomp.aai.champ.model.ChampObject;
-import org.openecomp.aai.champ.model.ChampRelationship;
+import org.onap.aai.champ.model.ChampElement;
+import org.onap.aai.champ.model.ChampObject;
+import org.onap.aai.champ.model.ChampRelationship;
 
 public class ChampElementTest {
 
diff --git a/src/test/java/org/openecomp/aai/champ/core/ChampFieldTest.java b/src/test/java/org/onap/aai/champ/core/ChampFieldTest.java
index f852d9d..0b4dbb8 100644
--- a/src/test/java/org/openecomp/aai/champ/core/ChampFieldTest.java
+++ b/src/test/java/org/onap/aai/champ/core/ChampFieldTest.java
@@ -19,12 +19,12 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.core;
+package org.onap.aai.champ.core;
 
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
-import org.openecomp.aai.champ.model.ChampField;
+import org.onap.aai.champ.model.ChampField;
 
 public class ChampFieldTest {
 
diff --git a/src/test/java/org/openecomp/aai/champ/core/ChampObjectIndexTest.java b/src/test/java/org/onap/aai/champ/core/ChampObjectIndexTest.java
index 6f71664..a11b67b 100644
--- a/src/test/java/org/openecomp/aai/champ/core/ChampObjectIndexTest.java
+++ b/src/test/java/org/onap/aai/champ/core/ChampObjectIndexTest.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.core;
+package org.onap.aai.champ.core;
 
 import static org.junit.Assert.assertTrue;
 
@@ -29,10 +29,10 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import org.junit.Test;
-import org.openecomp.aai.champ.ChampAPI;
-import org.openecomp.aai.champ.ChampGraph;
-import org.openecomp.aai.champ.exceptions.ChampIndexNotExistsException;
-import org.openecomp.aai.champ.model.ChampObjectIndex;
+import org.onap.aai.champ.ChampAPI;
+import org.onap.aai.champ.ChampGraph;
+import org.onap.aai.champ.exceptions.ChampIndexNotExistsException;
+import org.onap.aai.champ.model.ChampObjectIndex;
 
 public class ChampObjectIndexTest extends BaseChampAPITest {
 	@Test
diff --git a/src/test/java/org/openecomp/aai/champ/core/ChampObjectTest.java b/src/test/java/org/onap/aai/champ/core/ChampObjectTest.java
index f149243..fea167b 100644
--- a/src/test/java/org/openecomp/aai/champ/core/ChampObjectTest.java
+++ b/src/test/java/org/onap/aai/champ/core/ChampObjectTest.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.core;
+package org.onap.aai.champ.core;
 
 import static org.junit.Assert.assertTrue;
 
@@ -31,16 +31,16 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import org.junit.Test;
-import org.openecomp.aai.champ.ChampAPI;
-import org.openecomp.aai.champ.ChampGraph;
-import org.openecomp.aai.champ.exceptions.ChampMarshallingException;
-import org.openecomp.aai.champ.exceptions.ChampObjectNotExistsException;
-import org.openecomp.aai.champ.exceptions.ChampSchemaViolationException;
-import org.openecomp.aai.champ.exceptions.ChampUnmarshallingException;
-import org.openecomp.aai.champ.model.ChampCardinality;
-import org.openecomp.aai.champ.model.ChampField;
-import org.openecomp.aai.champ.model.ChampObject;
-import org.openecomp.aai.champ.model.ChampSchema;
+import org.onap.aai.champ.ChampAPI;
+import org.onap.aai.champ.ChampGraph;
+import org.onap.aai.champ.exceptions.ChampMarshallingException;
+import org.onap.aai.champ.exceptions.ChampObjectNotExistsException;
+import org.onap.aai.champ.exceptions.ChampSchemaViolationException;
+import org.onap.aai.champ.exceptions.ChampUnmarshallingException;
+import org.onap.aai.champ.model.ChampCardinality;
+import org.onap.aai.champ.model.ChampField;
+import org.onap.aai.champ.model.ChampObject;
+import org.onap.aai.champ.model.ChampSchema;
 
 public class ChampObjectTest extends BaseChampAPITest {
 
diff --git a/src/test/java/org/openecomp/aai/champ/core/ChampPartitionTest.java b/src/test/java/org/onap/aai/champ/core/ChampPartitionTest.java
index c8671bb..42894f4 100644
--- a/src/test/java/org/openecomp/aai/champ/core/ChampPartitionTest.java
+++ b/src/test/java/org/onap/aai/champ/core/ChampPartitionTest.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.core;
+package org.onap.aai.champ.core;
 
 import static org.junit.Assert.assertTrue;
 
@@ -27,16 +27,16 @@ import java.util.Collections;
 import java.util.Optional;
 
 import org.junit.Test;
-import org.openecomp.aai.champ.ChampAPI;
-import org.openecomp.aai.champ.ChampGraph;
-import org.openecomp.aai.champ.exceptions.ChampMarshallingException;
-import org.openecomp.aai.champ.exceptions.ChampObjectNotExistsException;
-import org.openecomp.aai.champ.exceptions.ChampRelationshipNotExistsException;
-import org.openecomp.aai.champ.exceptions.ChampSchemaViolationException;
-import org.openecomp.aai.champ.exceptions.ChampUnmarshallingException;
-import org.openecomp.aai.champ.model.ChampObject;
-import org.openecomp.aai.champ.model.ChampPartition;
-import org.openecomp.aai.champ.model.ChampRelationship;
+import org.onap.aai.champ.ChampAPI;
+import org.onap.aai.champ.ChampGraph;
+import org.onap.aai.champ.exceptions.ChampMarshallingException;
+import org.onap.aai.champ.exceptions.ChampObjectNotExistsException;
+import org.onap.aai.champ.exceptions.ChampRelationshipNotExistsException;
+import org.onap.aai.champ.exceptions.ChampSchemaViolationException;
+import org.onap.aai.champ.exceptions.ChampUnmarshallingException;
+import org.onap.aai.champ.model.ChampObject;
+import org.onap.aai.champ.model.ChampPartition;
+import org.onap.aai.champ.model.ChampRelationship;
 
 public class ChampPartitionTest extends BaseChampAPITest {
 
diff --git a/src/test/java/org/openecomp/aai/champ/core/ChampPropertyConstraintTest.java b/src/test/java/org/onap/aai/champ/core/ChampPropertyConstraintTest.java
index 8ee45f4..5dfbadf 100644
--- a/src/test/java/org/openecomp/aai/champ/core/ChampPropertyConstraintTest.java
+++ b/src/test/java/org/onap/aai/champ/core/ChampPropertyConstraintTest.java
@@ -19,14 +19,14 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.core;
+package org.onap.aai.champ.core;
 
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
-import org.openecomp.aai.champ.model.ChampCardinality;
-import org.openecomp.aai.champ.model.ChampField;
-import org.openecomp.aai.champ.model.ChampPropertyConstraint;
+import org.onap.aai.champ.model.ChampCardinality;
+import org.onap.aai.champ.model.ChampField;
+import org.onap.aai.champ.model.ChampPropertyConstraint;
 
 public class ChampPropertyConstraintTest {
 
diff --git a/src/test/java/org/openecomp/aai/champ/core/ChampRelationshipIndexTest.java b/src/test/java/org/onap/aai/champ/core/ChampRelationshipIndexTest.java
index a611df7..58c7d79 100644
--- a/src/test/java/org/openecomp/aai/champ/core/ChampRelationshipIndexTest.java
+++ b/src/test/java/org/onap/aai/champ/core/ChampRelationshipIndexTest.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.core;
+package org.onap.aai.champ.core;
 
 import static org.junit.Assert.assertTrue;
 
@@ -29,17 +29,17 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import org.junit.Test;
-import org.openecomp.aai.champ.ChampAPI;
-import org.openecomp.aai.champ.ChampGraph;
-import org.openecomp.aai.champ.exceptions.ChampIndexNotExistsException;
-import org.openecomp.aai.champ.exceptions.ChampMarshallingException;
-import org.openecomp.aai.champ.exceptions.ChampObjectNotExistsException;
-import org.openecomp.aai.champ.exceptions.ChampRelationshipNotExistsException;
-import org.openecomp.aai.champ.exceptions.ChampSchemaViolationException;
-import org.openecomp.aai.champ.exceptions.ChampUnmarshallingException;
-import org.openecomp.aai.champ.model.ChampField;
-import org.openecomp.aai.champ.model.ChampRelationship;
-import org.openecomp.aai.champ.model.ChampRelationshipIndex;
+import org.onap.aai.champ.ChampAPI;
+import org.onap.aai.champ.ChampGraph;
+import org.onap.aai.champ.exceptions.ChampIndexNotExistsException;
+import org.onap.aai.champ.exceptions.ChampMarshallingException;
+import org.onap.aai.champ.exceptions.ChampObjectNotExistsException;
+import org.onap.aai.champ.exceptions.ChampRelationshipNotExistsException;
+import org.onap.aai.champ.exceptions.ChampSchemaViolationException;
+import org.onap.aai.champ.exceptions.ChampUnmarshallingException;
+import org.onap.aai.champ.model.ChampField;
+import org.onap.aai.champ.model.ChampRelationship;
+import org.onap.aai.champ.model.ChampRelationshipIndex;
 
 public class ChampRelationshipIndexTest extends BaseChampAPITest {
 
diff --git a/src/test/java/org/openecomp/aai/champ/core/ChampRelationshipTest.java b/src/test/java/org/onap/aai/champ/core/ChampRelationshipTest.java
index cf025d6..3d95268 100644
--- a/src/test/java/org/openecomp/aai/champ/core/ChampRelationshipTest.java
+++ b/src/test/java/org/onap/aai/champ/core/ChampRelationshipTest.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.core;
+package org.onap.aai.champ.core;
 
 import static org.junit.Assert.assertTrue;
 
@@ -28,17 +28,17 @@ import java.util.Optional;
 import java.util.stream.Collectors;
 
 import org.junit.Test;
-import org.openecomp.aai.champ.ChampAPI;
-import org.openecomp.aai.champ.ChampGraph;
-import org.openecomp.aai.champ.exceptions.ChampMarshallingException;
-import org.openecomp.aai.champ.exceptions.ChampObjectNotExistsException;
-import org.openecomp.aai.champ.exceptions.ChampRelationshipNotExistsException;
-import org.openecomp.aai.champ.exceptions.ChampSchemaViolationException;
-import org.openecomp.aai.champ.exceptions.ChampUnmarshallingException;
-import org.openecomp.aai.champ.model.ChampObject;
-import org.openecomp.aai.champ.model.ChampRelationship;
-import org.openecomp.aai.champ.model.ChampRelationship.ReservedPropertyKeys;
-import org.openecomp.aai.champ.model.ChampRelationship.ReservedTypes;
+import org.onap.aai.champ.ChampAPI;
+import org.onap.aai.champ.ChampGraph;
+import org.onap.aai.champ.exceptions.ChampMarshallingException;
+import org.onap.aai.champ.exceptions.ChampObjectNotExistsException;
+import org.onap.aai.champ.exceptions.ChampRelationshipNotExistsException;
+import org.onap.aai.champ.exceptions.ChampSchemaViolationException;
+import org.onap.aai.champ.exceptions.ChampUnmarshallingException;
+import org.onap.aai.champ.model.ChampObject;
+import org.onap.aai.champ.model.ChampRelationship;
+import org.onap.aai.champ.model.ChampRelationship.ReservedPropertyKeys;
+import org.onap.aai.champ.model.ChampRelationship.ReservedTypes;
 
 public class ChampRelationshipTest extends BaseChampAPITest {
 
diff --git a/src/test/java/org/openecomp/aai/champ/core/ChampSchemaTest.java b/src/test/java/org/onap/aai/champ/core/ChampSchemaTest.java
index e3f099e..df33631 100644
--- a/src/test/java/org/openecomp/aai/champ/core/ChampSchemaTest.java
+++ b/src/test/java/org/onap/aai/champ/core/ChampSchemaTest.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.core;
+package org.onap.aai.champ.core;
 
 import static org.junit.Assert.assertTrue;
 
@@ -27,25 +27,25 @@ import java.io.IOException;
 import java.util.Set;
 
 import org.junit.Test;
-import org.openecomp.aai.champ.ChampAPI;
-import org.openecomp.aai.champ.ChampGraph;
-import org.openecomp.aai.champ.exceptions.ChampMarshallingException;
-import org.openecomp.aai.champ.exceptions.ChampObjectNotExistsException;
-import org.openecomp.aai.champ.exceptions.ChampSchemaViolationException;
-import org.openecomp.aai.champ.model.ChampConnectionConstraint;
-import org.openecomp.aai.champ.model.ChampConnectionMultiplicity;
-import org.openecomp.aai.champ.model.ChampField;
-import org.openecomp.aai.champ.model.ChampObject;
-import org.openecomp.aai.champ.model.ChampObject.ReservedTypes;
-import org.openecomp.aai.champ.model.ChampObjectConstraint;
-import org.openecomp.aai.champ.model.ChampPartition;
-import org.openecomp.aai.champ.model.ChampPropertyConstraint;
-import org.openecomp.aai.champ.model.ChampRelationship;
-import org.openecomp.aai.champ.model.ChampRelationshipConstraint;
-import org.openecomp.aai.champ.model.ChampSchema;
-import org.openecomp.aai.champ.schema.AlwaysValidChampSchemaEnforcer;
-import org.openecomp.aai.champ.schema.ChampSchemaEnforcer;
-import org.openecomp.aai.champ.schema.DefaultChampSchemaEnforcer;
+import org.onap.aai.champ.ChampAPI;
+import org.onap.aai.champ.ChampGraph;
+import org.onap.aai.champ.exceptions.ChampMarshallingException;
+import org.onap.aai.champ.exceptions.ChampObjectNotExistsException;
+import org.onap.aai.champ.exceptions.ChampSchemaViolationException;
+import org.onap.aai.champ.model.ChampConnectionConstraint;
+import org.onap.aai.champ.model.ChampConnectionMultiplicity;
+import org.onap.aai.champ.model.ChampField;
+import org.onap.aai.champ.model.ChampObject;
+import org.onap.aai.champ.model.ChampObjectConstraint;
+import org.onap.aai.champ.model.ChampPartition;
+import org.onap.aai.champ.model.ChampPropertyConstraint;
+import org.onap.aai.champ.model.ChampRelationship;
+import org.onap.aai.champ.model.ChampRelationshipConstraint;
+import org.onap.aai.champ.model.ChampSchema;
+import org.onap.aai.champ.model.ChampObject.ReservedTypes;
+import org.onap.aai.champ.schema.AlwaysValidChampSchemaEnforcer;
+import org.onap.aai.champ.schema.ChampSchemaEnforcer;
+import org.onap.aai.champ.schema.DefaultChampSchemaEnforcer;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
diff --git a/src/test/java/org/openecomp/aai/champ/event/AbstractLoggingChampGraphTest.java b/src/test/java/org/onap/aai/champ/event/AbstractLoggingChampGraphTest.java
index 5383d28..388b16f 100644
--- a/src/test/java/org/openecomp/aai/champ/event/AbstractLoggingChampGraphTest.java
+++ b/src/test/java/org/onap/aai/champ/event/AbstractLoggingChampGraphTest.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.event;
+package org.onap.aai.champ.event;
 
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
@@ -37,21 +37,22 @@ import java.util.stream.Stream;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.openecomp.aai.champ.ChampCapabilities;
-import org.openecomp.aai.champ.exceptions.ChampIndexNotExistsException;
-import org.openecomp.aai.champ.exceptions.ChampMarshallingException;
-import org.openecomp.aai.champ.exceptions.ChampObjectNotExistsException;
-import org.openecomp.aai.champ.exceptions.ChampRelationshipNotExistsException;
-import org.openecomp.aai.champ.exceptions.ChampSchemaViolationException;
-import org.openecomp.aai.champ.exceptions.ChampUnmarshallingException;
-import org.openecomp.aai.champ.model.ChampObject;
-import org.openecomp.aai.champ.model.ChampObjectConstraint;
-import org.openecomp.aai.champ.model.ChampObjectIndex;
-import org.openecomp.aai.champ.model.ChampPartition;
-import org.openecomp.aai.champ.model.ChampRelationship;
-import org.openecomp.aai.champ.model.ChampRelationshipConstraint;
-import org.openecomp.aai.champ.model.ChampRelationshipIndex;
-import org.openecomp.aai.champ.model.ChampSchema;
+import org.onap.aai.champ.ChampCapabilities;
+import org.onap.aai.champ.event.AbstractLoggingChampGraph;
+import org.onap.aai.champ.exceptions.ChampIndexNotExistsException;
+import org.onap.aai.champ.exceptions.ChampMarshallingException;
+import org.onap.aai.champ.exceptions.ChampObjectNotExistsException;
+import org.onap.aai.champ.exceptions.ChampRelationshipNotExistsException;
+import org.onap.aai.champ.exceptions.ChampSchemaViolationException;
+import org.onap.aai.champ.exceptions.ChampUnmarshallingException;
+import org.onap.aai.champ.model.ChampObject;
+import org.onap.aai.champ.model.ChampObjectConstraint;
+import org.onap.aai.champ.model.ChampObjectIndex;
+import org.onap.aai.champ.model.ChampPartition;
+import org.onap.aai.champ.model.ChampRelationship;
+import org.onap.aai.champ.model.ChampRelationshipConstraint;
+import org.onap.aai.champ.model.ChampRelationshipIndex;
+import org.onap.aai.champ.model.ChampSchema;
 import org.slf4j.Logger;
 
 import com.att.nsa.cambria.client.CambriaPublisher;
diff --git a/src/test/java/org/openecomp/aai/champ/exceptions/ChampExceptionTest.java b/src/test/java/org/onap/aai/champ/exceptions/ChampExceptionTest.java
index 3f813f5..b92ccdf 100644
--- a/src/test/java/org/openecomp/aai/champ/exceptions/ChampExceptionTest.java
+++ b/src/test/java/org/onap/aai/champ/exceptions/ChampExceptionTest.java
@@ -19,11 +19,17 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.exceptions;
+package org.onap.aai.champ.exceptions;
 
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
+import org.onap.aai.champ.exceptions.ChampIndexNotExistsException;
+import org.onap.aai.champ.exceptions.ChampMarshallingException;
+import org.onap.aai.champ.exceptions.ChampObjectNotExistsException;
+import org.onap.aai.champ.exceptions.ChampRelationshipNotExistsException;
+import org.onap.aai.champ.exceptions.ChampSchemaViolationException;
+import org.onap.aai.champ.exceptions.ChampUnmarshallingException;
 
 public class ChampExceptionTest {
 
diff --git a/src/test/java/org/openecomp/aai/champ/ie/ExportTest.java b/src/test/java/org/onap/aai/champ/ie/ExportTest.java
index 7ecb3de..80142b2 100644
--- a/src/test/java/org/openecomp/aai/champ/ie/ExportTest.java
+++ b/src/test/java/org/onap/aai/champ/ie/ExportTest.java
@@ -19,11 +19,12 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.ie;
+package org.onap.aai.champ.ie;
 
 import org.junit.Test;
-import org.openecomp.aai.champ.ChampAPI;
-import org.openecomp.aai.champ.ChampGraph;
+import org.onap.aai.champ.ChampAPI;
+import org.onap.aai.champ.ChampGraph;
+import org.onap.aai.champ.ie.GraphMLImporterExporter;
 
 public class ExportTest {
 
diff --git a/src/test/java/org/openecomp/aai/champ/ie/ImportTest.java b/src/test/java/org/onap/aai/champ/ie/ImportTest.java
index ba2cbb1..0dca95e 100644
--- a/src/test/java/org/openecomp/aai/champ/ie/ImportTest.java
+++ b/src/test/java/org/onap/aai/champ/ie/ImportTest.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.ie;
+package org.onap.aai.champ.ie;
 
 import static org.junit.Assert.assertTrue;
 
@@ -27,8 +27,9 @@ import java.util.Collections;
 import java.util.Optional;
 
 import org.junit.Test;
-import org.openecomp.aai.champ.ChampAPI;
-import org.openecomp.aai.champ.ChampGraph;
+import org.onap.aai.champ.ChampAPI;
+import org.onap.aai.champ.ChampGraph;
+import org.onap.aai.champ.ie.GraphMLImporterExporter;
 
 public class ImportTest {