29 files changed, 51 insertions, 51 deletions
diff --git a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/BasePresetAAIGetVersion.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/BasePresetAAIGetVersion.java
index 18644b819..2452a24f7 100644
--- a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/BasePresetAAIGetVersion.java
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/BasePresetAAIGetVersion.java
@@ -1,7 +1,7 @@
-package org.opencomp.simulator.presetGenerator.presets.aai;
+package org.onap.simulator.presetGenerator.presets.aai;
 
 import com.google.common.collect.ImmutableMap;
-import org.opencomp.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
+import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
 import org.springframework.http.HttpMethod;
 
 import java.util.Collections;
diff --git a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIBadBodyForGetServicesGet.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIBadBodyForGetServicesGet.java
index 0a90bf8df..9b7fb36cc 100644
--- a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIBadBodyForGetServicesGet.java
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIBadBodyForGetServicesGet.java
@@ -1,4 +1,4 @@
-package org.opencomp.simulator.presetGenerator.presets.aai;
+package org.onap.simulator.presetGenerator.presets.aai;
 
 public class PresetAAIBadBodyForGetServicesGet extends PresetAAIBaseGetServicesGet {
 
diff --git a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIBaseGetServicesGet.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIBaseGetServicesGet.java
index 82e3f406e..461644cf8 100644
--- a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIBaseGetServicesGet.java
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIBaseGetServicesGet.java
@@ -1,6 +1,6 @@
-package org.opencomp.simulator.presetGenerator.presets.aai;
+package org.onap.simulator.presetGenerator.presets.aai;
 
-import org.opencomp.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
+import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
 import org.springframework.http.HttpMethod;
 
 public class PresetAAIBaseGetServicesGet extends BaseAAIPreset {
diff --git a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIBaseSearchNodeQuery.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIBaseSearchNodeQuery.java
index d8553ca8d..2fa8ccbe6 100644
--- a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIBaseSearchNodeQuery.java
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIBaseSearchNodeQuery.java
@@ -1,6 +1,6 @@
-package org.opencomp.simulator.presetGenerator.presets.aai;
+package org.onap.simulator.presetGenerator.presets.aai;
 
-import org.opencomp.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
+import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
 import org.springframework.http.HttpMethod;
 
 public abstract class PresetAAIBaseSearchNodeQuery extends BaseAAIPreset {
diff --git a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAICloudRegionAndSourceFromConfigurationPut.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAICloudRegionAndSourceFromConfigurationPut.java
index 2e634bd9e..c74cc0b14 100644
--- a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAICloudRegionAndSourceFromConfigurationPut.java
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAICloudRegionAndSourceFromConfigurationPut.java
@@ -1,8 +1,8 @@
-package org.opencomp.simulator.presetGenerator.presets.aai;
+package org.onap.simulator.presetGenerator.presets.aai;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
-import org.opencomp.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
+import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
 import org.springframework.http.HttpMethod;
 
 import java.util.Collections;
diff --git a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetInstanceGroupsByCloudRegion.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetInstanceGroupsByCloudRegion.java
index 283befefa..a50462a3d 100644
--- a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetInstanceGroupsByCloudRegion.java
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetInstanceGroupsByCloudRegion.java
@@ -1,8 +1,8 @@
-package org.opencomp.simulator.presetGenerator.presets.aai;
+package org.onap.simulator.presetGenerator.presets.aai;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
-import org.opencomp.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
+import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
 import org.springframework.http.HttpMethod;
 
 import java.util.Collections;
diff --git a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetInstanceGroupsByCloudRegionInvalidRequest.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetInstanceGroupsByCloudRegionInvalidRequest.java
index e47612d15..9dae89be5 100644
--- a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetInstanceGroupsByCloudRegionInvalidRequest.java
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetInstanceGroupsByCloudRegionInvalidRequest.java
@@ -1,8 +1,8 @@
-package org.opencomp.simulator.presetGenerator.presets.aai;
+package org.onap.simulator.presetGenerator.presets.aai;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
-import org.opencomp.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
+import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
 import org.springframework.http.HttpMethod;
 
 import java.util.Collections;
diff --git a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetInstanceGroupsByCloudRegionRequiredMissing.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetInstanceGroupsByCloudRegionRequiredMissing.java
index 9c8f82d18..4d596e527 100644
--- a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetInstanceGroupsByCloudRegionRequiredMissing.java
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetInstanceGroupsByCloudRegionRequiredMissing.java
@@ -1,8 +1,8 @@
-package org.opencomp.simulator.presetGenerator.presets.aai;
+package org.onap.simulator.presetGenerator.presets.aai;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
-import org.opencomp.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
+import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
 import org.springframework.http.HttpMethod;
 
 import java.util.Collections;
diff --git a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetModelsByOwningEntity.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetModelsByOwningEntity.java
index 0cf32095e..610ab6b48 100644
--- a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetModelsByOwningEntity.java
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetModelsByOwningEntity.java
@@ -1,7 +1,7 @@
-package org.opencomp.simulator.presetGenerator.presets.aai;
+package org.onap.simulator.presetGenerator.presets.aai;
 
 import com.google.common.collect.ImmutableMap;
-import org.opencomp.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
+import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
 import org.springframework.http.HttpMethod;
 
 import java.util.Collections;
diff --git a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetModelsByProject.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetModelsByProject.java
index df0df6ccc..96372abb4 100644
--- a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetModelsByProject.java
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetModelsByProject.java
@@ -1,7 +1,7 @@
-package org.opencomp.simulator.presetGenerator.presets.aai;
+package org.onap.simulator.presetGenerator.presets.aai;
 
 import com.google.common.collect.ImmutableMap;
-import org.opencomp.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
+import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
 import org.springframework.http.HttpMethod;
 
 import java.util.Collections;
diff --git a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetMultipleVersion.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetMultipleVersion.java
index 6586eb1bc..a9c63196a 100644
--- a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetMultipleVersion.java
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetMultipleVersion.java
@@ -1,4 +1,4 @@
-package org.opencomp.simulator.presetGenerator.presets.aai;
+package org.onap.simulator.presetGenerator.presets.aai;
 
 public class PresetAAIGetMultipleVersion extends BasePresetAAIGetVersion {
         public String modelVersionId2;
diff --git a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetNetworkCollectionDetails.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetNetworkCollectionDetails.java
index 8a27fbce8..e1fa74ec8 100644
--- a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetNetworkCollectionDetails.java
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetNetworkCollectionDetails.java
@@ -1,8 +1,8 @@
-package org.opencomp.simulator.presetGenerator.presets.aai;
+package org.onap.simulator.presetGenerator.presets.aai;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
-import org.opencomp.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
+import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
 import org.springframework.http.HttpMethod;
 
 import java.util.Collections;
diff --git a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetNetworkCollectionDetailsInvalidRequest.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetNetworkCollectionDetailsInvalidRequest.java
index 9e4d653d2..d0e4baf60 100644
--- a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetNetworkCollectionDetailsInvalidRequest.java
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetNetworkCollectionDetailsInvalidRequest.java
@@ -1,8 +1,8 @@
-package org.opencomp.simulator.presetGenerator.presets.aai;
+package org.onap.simulator.presetGenerator.presets.aai;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
-import org.opencomp.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
+import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
 import org.springframework.http.HttpMethod;
 
 import java.util.Collections;
diff --git a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetNetworkCollectionDetailsRequiredMissing.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetNetworkCollectionDetailsRequiredMissing.java
index e137ee233..c32a3b563 100644
--- a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetNetworkCollectionDetailsRequiredMissing.java
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetNetworkCollectionDetailsRequiredMissing.java
@@ -1,8 +1,8 @@
-package org.opencomp.simulator.presetGenerator.presets.aai;
+package org.onap.simulator.presetGenerator.presets.aai;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
-import org.opencomp.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
+import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
 import org.springframework.http.HttpMethod;
 
 import java.util.Collections;
diff --git a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetNetworkZones.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetNetworkZones.java
index 02f01bd7a..e8449b320 100644
--- a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetNetworkZones.java
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetNetworkZones.java
@@ -1,6 +1,6 @@
-package org.opencomp.simulator.presetGenerator.presets.aai;
+package org.onap.simulator.presetGenerator.presets.aai;
 
-import org.opencomp.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
+import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
 import org.springframework.http.HttpMethod;
 
 public class PresetAAIGetNetworkZones extends BaseAAIPreset {
diff --git a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetOneVersion.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetOneVersion.java
index 1ccf8b9ea..74e2102f1 100644
--- a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetOneVersion.java
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetOneVersion.java
@@ -1,4 +1,4 @@
-package org.opencomp.simulator.presetGenerator.presets.aai;
+package org.onap.simulator.presetGenerator.presets.aai;
 
 public class PresetAAIGetOneVersion extends BasePresetAAIGetVersion {
 
diff --git a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetPNFByRegionErrorPut.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetPNFByRegionErrorPut.java
index dd5d0abfc..d363619e5 100644
--- a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetPNFByRegionErrorPut.java
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetPNFByRegionErrorPut.java
@@ -1,6 +1,6 @@
-package org.opencomp.simulator.presetGenerator.presets.aai;
+package org.onap.simulator.presetGenerator.presets.aai;
 
-import org.opencomp.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
+import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
 import org.springframework.http.HttpMethod;
 
 /**
diff --git a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetPortMirroringSourcePorts.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetPortMirroringSourcePorts.java
index 22accac1d..a95df4592 100644
--- a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetPortMirroringSourcePorts.java
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetPortMirroringSourcePorts.java
@@ -1,7 +1,7 @@
-package org.opencomp.simulator.presetGenerator.presets.aai;
+package org.onap.simulator.presetGenerator.presets.aai;
 
 import com.google.common.collect.ImmutableMap;
-import org.opencomp.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
+import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
 import org.springframework.http.HttpMethod;
 
 import java.util.Collections;
diff --git a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetPortMirroringSourcePortsError.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetPortMirroringSourcePortsError.java
index 0f2332397..e8a4d3b8a 100644
--- a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetPortMirroringSourcePortsError.java
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetPortMirroringSourcePortsError.java
@@ -1,4 +1,4 @@
-package org.opencomp.simulator.presetGenerator.presets.aai;
+package org.onap.simulator.presetGenerator.presets.aai;
 
 public class PresetAAIGetPortMirroringSourcePortsError extends PresetAAIGetPortMirroringSourcePorts {
 
diff --git a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetRelatedInstanceGroupsByVnfId.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetRelatedInstanceGroupsByVnfId.java
index a70a43232..97186c9da 100644
--- a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetRelatedInstanceGroupsByVnfId.java
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetRelatedInstanceGroupsByVnfId.java
@@ -1,7 +1,7 @@
-package org.opencomp.simulator.presetGenerator.presets.aai;
+package org.onap.simulator.presetGenerator.presets.aai;
 
 import com.google.common.collect.ImmutableMap;
-import org.opencomp.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
+import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
 import org.springframework.http.HttpMethod;
 
 import java.util.Collections;
diff --git a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetServiceModelList.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetServiceModelList.java
index 48d630139..e99630639 100644
--- a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetServiceModelList.java
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetServiceModelList.java
@@ -1,4 +1,4 @@
-package org.opencomp.simulator.presetGenerator.presets.aai;
+package org.onap.simulator.presetGenerator.presets.aai;
 
 public class PresetAAIGetServiceModelList extends BasePresetAAIGetVersion {
 
diff --git a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetServicesGet.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetServicesGet.java
index e97e5fe3b..04cef06ad 100644
--- a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetServicesGet.java
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetServicesGet.java
@@ -1,4 +1,4 @@
-package org.opencomp.simulator.presetGenerator.presets.aai;
+package org.onap.simulator.presetGenerator.presets.aai;
 
 public class PresetAAIGetServicesGet extends PresetAAIBaseGetServicesGet {
 
diff --git a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetSubDetailsGet.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetSubDetailsGet.java
index 5b9f2ff96..3033c027f 100644
--- a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetSubDetailsGet.java
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetSubDetailsGet.java
@@ -1,6 +1,6 @@
-package org.opencomp.simulator.presetGenerator.presets.aai;
+package org.onap.simulator.presetGenerator.presets.aai;
 
-import org.opencomp.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
+import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
 import org.springframework.http.HttpMethod;
 
 import java.util.Collections;
diff --git a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetSubscribersGet.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetSubscribersGet.java
index 955771295..b21e9de27 100644
--- a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetSubscribersGet.java
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetSubscribersGet.java
@@ -1,10 +1,10 @@
-package org.opencomp.simulator.presetGenerator.presets.aai;
+package org.onap.simulator.presetGenerator.presets.aai;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.ImmutableMap;
-import org.opencomp.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
-import org.opencomp.simulator.presetGenerator.presets.model.Subscriber;
+import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
+import org.onap.simulator.presetGenerator.presets.model.Subscriber;
 import org.springframework.http.HttpMethod;
 
 import java.io.IOException;
diff --git a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetSubscribersGetInvalidResponse.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetSubscribersGetInvalidResponse.java
index d5da2a92a..064c30786 100644
--- a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetSubscribersGetInvalidResponse.java
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetSubscribersGetInvalidResponse.java
@@ -1,4 +1,4 @@
-package org.opencomp.simulator.presetGenerator.presets.aai;
+package org.onap.simulator.presetGenerator.presets.aai;
 
 public class PresetAAIGetSubscribersGetInvalidResponse extends PresetAAIGetSubscribersGet {
     private int httpCode;
diff --git a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetTenants.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetTenants.java
index 45b577df4..ed370cf15 100644
--- a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetTenants.java
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetTenants.java
@@ -1,6 +1,6 @@
-package org.opencomp.simulator.presetGenerator.presets.aai;
+package org.onap.simulator.presetGenerator.presets.aai;
 
-import org.opencomp.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
+import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
 import org.springframework.http.HttpMethod;
 
 import static vid.automation.test.utils.ReadFile.loadResourceAsString;
diff --git a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIPostNamedQueryForViewEdit.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIPostNamedQueryForViewEdit.java
index 07d7f1df6..e098a576d 100644
--- a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIPostNamedQueryForViewEdit.java
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIPostNamedQueryForViewEdit.java
@@ -1,6 +1,6 @@
-package org.opencomp.simulator.presetGenerator.presets.aai;
+package org.onap.simulator.presetGenerator.presets.aai;
 
-import org.opencomp.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
+import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
 import org.springframework.http.HttpMethod;
 
 public class PresetAAIPostNamedQueryForViewEdit extends BaseAAIPreset {
diff --git a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAISearchNodeQueryEmptyResult.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAISearchNodeQueryEmptyResult.java
index 154aff755..f5ab2d1f7 100644
--- a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAISearchNodeQueryEmptyResult.java
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAISearchNodeQueryEmptyResult.java
@@ -1,4 +1,4 @@
-package org.opencomp.simulator.presetGenerator.presets.aai;
+package org.onap.simulator.presetGenerator.presets.aai;
 
 public class PresetAAISearchNodeQueryEmptyResult extends PresetAAIBaseSearchNodeQuery {
 
diff --git a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIServiceDesignAndCreationPut.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIServiceDesignAndCreationPut.java
index 6a20c4796..6a97e1159 100644
--- a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIServiceDesignAndCreationPut.java
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIServiceDesignAndCreationPut.java
@@ -1,8 +1,8 @@
-package org.opencomp.simulator.presetGenerator.presets.aai;
+package org.onap.simulator.presetGenerator.presets.aai;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
-import org.opencomp.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
+import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
 import org.springframework.http.HttpMethod;
 
 import java.util.Collections;