diff --git a/vid-app-common/pom.xml b/vid-app-common/pom.xml
index 38b06f1..8482ae6 100755
--- a/vid-app-common/pom.xml
+++ b/vid-app-common/pom.xml
@@ -472,6 +472,12 @@
             <version>0.9.3</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.jeasy</groupId>
+            <artifactId>easy-random-core</artifactId>
+            <version>4.0.0.RC1</version>
+            <scope>test</scope>
+        </dependency>
 
         <!-- Helpers -->
         <dependency>
diff --git a/vid-app-common/src/main/java/org/onap/vid/services/AaiServiceImpl.java b/vid-app-common/src/main/java/org/onap/vid/services/AaiServiceImpl.java
index 83757f2..142bf73 100644
--- a/vid-app-common/src/main/java/org/onap/vid/services/AaiServiceImpl.java
+++ b/vid-app-common/src/main/java/org/onap/vid/services/AaiServiceImpl.java
@@ -320,8 +320,6 @@
         return aaiClient.getPNFData(globalCustomerId, serviceType, modelVersionId, modelInvariantId, cloudRegion, equipVendor, equipModel);
     }
 
-
-
     @Override
     public AaiResponse getServices(RoleValidator roleValidator) {
         AaiResponse<GetServicesAAIRespone> subscriberResponse = aaiClient.getServices();
diff --git a/vid-app-common/src/main/java/org/onap/vid/services/WorkflowServiceImpl.java b/vid-app-common/src/main/java/org/onap/vid/services/WorkflowServiceImpl.java
index 097b05e..cbc79e8 100644
--- a/vid-app-common/src/main/java/org/onap/vid/services/WorkflowServiceImpl.java
+++ b/vid-app-common/src/main/java/org/onap/vid/services/WorkflowServiceImpl.java
@@ -20,6 +20,7 @@
 
 package org.onap.vid.services;
 
+import java.util.List;
 import org.onap.vid.model.Workflow;
 import org.springframework.stereotype.Service;
 
@@ -31,29 +32,27 @@
 @Service
 public class WorkflowServiceImpl implements WorkflowService {
     //TODO: Add the list of workflows hard coded or from DB.
-    private ArrayList<Workflow> workflows = new ArrayList<>(Arrays.asList(
+    private List<Workflow> workflows = Arrays.asList(
             new Workflow(0, "Upgrade", new ArrayList<>(Arrays.asList("VNF1", "VNF2", "VNF3", "VNF4"))),
             new Workflow(1, "Clean", new ArrayList<>(Arrays.asList("VNF1", "VNF2", "VNF3"))),
             new Workflow(2, "Reinstall", new ArrayList<>(Arrays.asList("VNF1", "VNF2", "VNF4"))),
             new Workflow(3, "Dump", new ArrayList<>(Arrays.asList("VNF1", "VNF3", "VNF4"))),
             new Workflow(4, "Flush", new ArrayList<>(Arrays.asList("VNF2", "VNF3", "VNF4")))
-    ));
+    );
 
     @Override
     public Collection<String> getWorkflowsForVNFs(Collection<String> vnfNames) {
-        Collection<String> result = workflows.stream()
+        return workflows.stream()
                 .filter(workflow -> workflow.getVnfNames().containsAll(vnfNames))
-                .map(workflow -> workflow.getWorkflowName())
+                .map(Workflow::getWorkflowName)
                 .distinct()
                 .collect(Collectors.toList());
-
-        return result;
     }
 
     @Override
     public Collection<String> getAllWorkflows() {
         return workflows.stream()
-                .map(workflow -> workflow.getWorkflowName())
+                .map(Workflow::getWorkflowName)
                 .distinct()
                 .collect(Collectors.toList());
     }
diff --git a/vid-app-common/src/test/java/org/onap/vid/services/AaiServiceImplTest.java b/vid-app-common/src/test/java/org/onap/vid/services/AaiServiceImplTest.java
index 23951aa..59cee89 100644
--- a/vid-app-common/src/test/java/org/onap/vid/services/AaiServiceImplTest.java
+++ b/vid-app-common/src/test/java/org/onap/vid/services/AaiServiceImplTest.java
@@ -8,9 +8,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -23,24 +23,36 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import javax.ws.rs.core.Response;
+import org.jeasy.random.EasyRandom;
+import org.jeasy.random.EasyRandomParameters;
+import org.jeasy.random.randomizers.misc.BooleanRandomizer;
+import org.jeasy.random.randomizers.text.StringRandomizer;
 import org.junit.Test;
 import org.onap.vid.aai.AaiClientInterface;
 import org.onap.vid.aai.AaiGetVnfResponse;
 import org.onap.vid.aai.AaiOverTLSClientInterface;
 import org.onap.vid.aai.AaiResponse;
 import org.onap.vid.aai.AaiResponseTranslator;
+import org.onap.vid.aai.model.AaiGetServicesRequestModel.GetServicesAAIRespone;
 import org.onap.vid.aai.model.AaiGetTenatns.GetTenantsResponse;
 import org.onap.vid.aai.model.VnfResult;
 import org.onap.vid.roles.RoleValidator;
 
 public class AaiServiceImplTest {
 
+    private static final long STATIC_SEED = 5336L;
+    private EasyRandomParameters parameters = new EasyRandomParameters()
+        .randomize(String.class, new StringRandomizer(4, 4, STATIC_SEED))
+        .randomize(Boolean.class, new BooleanRandomizer(STATIC_SEED));
+    private EasyRandom modelGenerator = new EasyRandom(parameters);
+
     private AaiClientInterface aaiClient = mock(AaiClientInterface.class);
     private AaiOverTLSClientInterface aaiSslClient = mock(AaiOverTLSClientInterface.class);
     private AaiResponseTranslator aaiResponseTranslator = mock(AaiResponseTranslator.class);
@@ -185,4 +197,81 @@
         assertThat(response).isEqualTo(actual);
         assertThat(response.getT().results).containsOnly(genericVnf, serviceInstance);
     }
-}
+
+    @Test
+    @SuppressWarnings("unchecked")
+    public void getServicesShouldMarkAllServicesAsPermitted() {
+        // given
+        RoleValidator roleValidator = modelGenerator.nextObject(RoleValidator.class);
+
+        GetServicesAAIRespone inputPayload = modelGenerator.nextObject(GetServicesAAIRespone.class);
+        assertThat(inputPayload.service.stream().allMatch(service -> service.isPermitted)).isFalse();
+
+        when(aaiClient.getServices()).thenReturn(new AaiResponse<>(inputPayload, "", 200));
+
+        // when
+        AaiResponse<GetServicesAAIRespone> result = aaiService.getServices(roleValidator);
+        GetServicesAAIRespone outputPayload = result.getT();
+
+        // then
+        assertThat(outputPayload.service.stream().allMatch(service -> service.isPermitted)).isTrue();
+    }
+
+    @Test
+    public void shouldGetNodeTemplateInstances() {
+        // given
+        String globalCustomerId = "gcid";
+        String serviceType = "st";
+        String modelVersionId = "mvid";
+        String modelInvariantId = "miid";
+        String cloudRegion = "cr";
+
+        // when
+        aaiService
+            .getNodeTemplateInstances(globalCustomerId, serviceType, modelVersionId, modelInvariantId, cloudRegion);
+
+        // then
+        verify(aaiClient)
+            .getNodeTemplateInstances(globalCustomerId, serviceType, modelVersionId, modelInvariantId, cloudRegion);
+    }
+
+    @Test
+    public void shouldGetNetworkCollectionDetails() {
+        // given
+        String serviceInstanceId = "siid";
+
+        // when
+        aaiService.getNetworkCollectionDetails(serviceInstanceId);
+
+        // then
+        verify(aaiClient).getNetworkCollectionDetails(serviceInstanceId);
+    }
+
+    @Test
+    public void shouldGetInstanceGroupsByCloudRegion() {
+        // given
+        String cloudOwner = "co";
+        String cloudRegionId = "crid";
+        String networkFunction = "nf";
+
+        // when
+        aaiService.getInstanceGroupsByCloudRegion(cloudOwner, cloudRegionId, networkFunction);
+
+        // then
+        verify(aaiClient).getInstanceGroupsByCloudRegion(cloudOwner, cloudRegionId, networkFunction);
+    }
+
+    @Test
+    public void getAAIServiceTree() {
+        // given
+        String globalCustomerId = "gcid";
+        String serviceType = "st";
+        String serviceInstanceId = "siid";
+
+        // when
+        aaiService.getAAIServiceTree(globalCustomerId, serviceType, serviceInstanceId);
+
+        // then
+        verify(aaiServiceTree).getServiceInstanceTopology(globalCustomerId, serviceType, serviceInstanceId);
+    }
+}
\ No newline at end of file
diff --git a/vid-app-common/src/test/java/org/onap/vid/services/WorkflowServiceImplTest.java b/vid-app-common/src/test/java/org/onap/vid/services/WorkflowServiceImplTest.java
index a8ded27..fa53a9a 100644
--- a/vid-app-common/src/test/java/org/onap/vid/services/WorkflowServiceImplTest.java
+++ b/vid-app-common/src/test/java/org/onap/vid/services/WorkflowServiceImplTest.java
@@ -3,13 +3,14 @@
  * VID
  * ================================================================================
  * Copyright (C) 2017 - 2019 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2019 - 2020 Nokia. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,34 +21,23 @@
 
 package org.onap.vid.services;
 
-import java.util.*;
+import static org.assertj.core.api.Assertions.assertThat;
 
+import java.util.Arrays;
+import java.util.Collection;
 import org.junit.Test;
 
 public class WorkflowServiceImplTest {
 
-    private WorkflowServiceImpl createTestSubject() {
-        return new WorkflowServiceImpl();
+    @Test
+    public void testGetWorkflowsForVNFs() {
+        Collection<String> result = new WorkflowServiceImpl().getWorkflowsForVNFs(Arrays.asList("VNF1", "VNF2"));
+        assertThat(result).containsExactly("Upgrade", "Clean", "Reinstall");
     }
 
     @Test
-    public void testGetWorkflowsForVNFs() throws Exception {
-        WorkflowServiceImpl testSubject;
-        Collection<String> vnfNames = new ArrayList<String>();
-        Collection<String> result;
-
-        // default test
-        testSubject = createTestSubject();
-        result = testSubject.getWorkflowsForVNFs(vnfNames);
-    }
-
-    @Test
-    public void testGetAllWorkflows() throws Exception {
-        WorkflowServiceImpl testSubject;
-        Collection<String> result;
-
-        // default test
-        testSubject = createTestSubject();
-        result = testSubject.getAllWorkflows();
+    public void testGetAllWorkflows() {
+        Collection<String> result = new WorkflowServiceImpl().getAllWorkflows();
+        assertThat(result).containsExactly("Upgrade", "Clean", "Reinstall", "Dump", "Flush");
     }
 }
diff --git a/vid-ext-services-simulator/pom.xml b/vid-ext-services-simulator/pom.xml
index 165ae57..8efb948 100644
--- a/vid-ext-services-simulator/pom.xml
+++ b/vid-ext-services-simulator/pom.xml
@@ -14,7 +14,7 @@
         <encoding>UTF-8</encoding>
         <epsdk.version>1.3.0</epsdk.version>
         <springframework.version>4.3.4.RELEASE</springframework.version>
-        <hibernate.version>4.3.11.Final</hibernate.version>
+        <hibernate.version>5.3.4.Final</hibernate.version>
         <!-- Skip assembling the zip by default -->
         <skipassembly>true</skipassembly>
         <!-- Tests usually require some setup that maven cannot do, so skip. -->
@@ -126,6 +126,36 @@
             <artifactId>jaxb-api</artifactId>
             <version>2.2.11</version>
         </dependency>
+
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-entitymanager</artifactId>
+            <version>${hibernate.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-core</artifactId>
+            <version>${hibernate.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.mariadb.jdbc</groupId>
+            <artifactId>mariadb-java-client</artifactId>
+            <version>2.2.6</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.hibernate.javax.persistence</groupId>
+            <artifactId>hibernate-jpa-2.1-api</artifactId>
+            <version>1.0.0.Final</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>2.8.0</version>
+        </dependency>
+
     </dependencies>
 
     <build>
diff --git a/vid-ext-services-simulator/src/main/java/org/onap/simulator/controller/SimulatorController.java b/vid-ext-services-simulator/src/main/java/org/onap/simulator/controller/SimulatorController.java
index 3c193cd..bfed603 100644
--- a/vid-ext-services-simulator/src/main/java/org/onap/simulator/controller/SimulatorController.java
+++ b/vid-ext-services-simulator/src/main/java/org/onap/simulator/controller/SimulatorController.java
@@ -1,13 +1,48 @@
 package org.onap.simulator.controller;
 
+import static org.mockserver.integration.ClientAndServer.startClientAndServer;
+import static org.mockserver.matchers.Times.exactly;
+import static org.mockserver.model.JsonBody.json;
+
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.gson.Gson;
+import java.io.BufferedInputStream;
+import java.io.DataInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Scanner;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.Persistence;
+import javax.persistence.TypedQuery;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import org.mockserver.integration.ClientAndServer;
+import org.mockserver.matchers.MatchType;
 import org.mockserver.matchers.Times;
 import org.mockserver.model.HttpRequest;
 import org.mockserver.model.HttpResponse;
-
 import org.mockserver.model.JsonBody;
+import org.onap.simulator.db.entities.Function;
+import org.onap.simulator.db.entities.User;
 import org.onap.simulator.errorHandling.VidSimulatorException;
 import org.onap.simulator.model.SimulatorRequestResponseExpectation;
 import org.slf4j.Logger;
@@ -17,27 +52,23 @@
 import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
 import org.springframework.core.io.support.PropertiesLoaderUtils;
 import org.springframework.core.io.support.ResourcePatternResolver;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.client.HttpClientErrorException;
+import org.springframework.web.client.RestTemplate;
 import org.springframework.web.servlet.HandlerMapping;
 import org.springframework.web.servlet.View;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.*;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.*;
-import java.util.stream.Collectors;
-
-import static org.mockserver.integration.ClientAndServer.startClientAndServer;
-import static org.mockserver.matchers.Times.exactly;
-
 @RestController
 @Component
 public class SimulatorController {
@@ -48,9 +79,14 @@
     private String mockServerHost;
     private Integer mockServerPort;
     private Boolean enablePresetRegistration;
+    private Boolean enableJPA;
     private volatile boolean isInitialized = false;
 
-    Logger logger = LoggerFactory.getLogger(SimulatorController.class);
+    private EntityManager entityManager;
+    private EntityManagerFactory entityManagerFactory;
+
+
+    private static final Logger logger = LoggerFactory.getLogger(SimulatorController.class);
 
     @PostConstruct
     public void init(){
@@ -58,15 +94,31 @@
         setProperties();
         mockServer = startClientAndServer(mockServerPort);
         presetRegister();
+        try {
+            initJPA();
+        } catch (RuntimeException e) {
+            isInitialized = false;
+            logger.error("Error during the JPA initialization:", e);
+            return;
+        }
         isInitialized = true;
         logger.info("VID Simulator started successfully");
     }
 
+    private void initJPA() {
+        if (enableJPA) {
+            entityManagerFactory = Persistence.createEntityManagerFactory("vid");
+            entityManager = entityManagerFactory.createEntityManager();
+        }
+    }
+
     @PreDestroy
     public void tearDown(){
         logger.info("Stopping VID Simulator....");
+        entityManager.close();
+        entityManagerFactory.close();
         isInitialized = false;
-        mockServer.stop();
+        mockServer.stop(false);
     }
 
 
@@ -82,9 +134,11 @@
         try {
             File presetDir = resolver.getResource("/preset_registration/").getFile();
             if (presetDir.exists() && presetDir.isDirectory()) {
-                resources = Files.walk(Paths.get(presetDir.getPath()))
-                        .filter(p -> p.toString().endsWith(".json"))
-                        .collect(Collectors.toList());
+                try (Stream<Path> files = Files.walk(Paths.get(presetDir.getPath()))) {
+                    resources = files
+                            .filter(p -> p.toString().endsWith(".json"))
+                            .collect(Collectors.toList());
+                }
             } else {
                 logger.error("preset_registration directory is not exists");
             }
@@ -95,8 +149,8 @@
         logger.info("Starting preset registrations, number of requests: {}", resources.size());
         for (Path resource: resources){
             String content;
-            try {
-                content = new Scanner(resource).useDelimiter("\\Z").next();
+            try (Scanner scanner = new Scanner(resource).useDelimiter("\\Z")){
+                content = scanner.next();
             } catch (IOException e){
                 logger.error("Error reading preset registration file {}, skipping to next one. Error: ", resource.getFileName(), e);
                 continue;
@@ -126,6 +180,7 @@
         mockServerHost = (String)props.get("simulator.mockserver.host");
         mockServerPort = Integer.parseInt((String)props.get("simulator.mockserver.port"));
         enablePresetRegistration = Boolean.parseBoolean((String)props.get("simulator.enablePresetRegistration"));
+        enableJPA = Boolean.parseBoolean((String)props.get("simulator.enableCentralizedRoleAccess"));
     }
 
     @RequestMapping(value = {"/registerToVidSimulator"}, method = RequestMethod.POST)
@@ -144,13 +199,10 @@
         return isInitialized ? new ResponseEntity<>("",HttpStatus.OK) : new ResponseEntity<>("",HttpStatus.SERVICE_UNAVAILABLE);
     }
 
-//    @RequestMapping(value = {"/registerToVidSimulator"}, method = RequestMethod.GET)
-//    public ResponseEntity<String> getAllRegisteredRequests() throws JsonProcessingException {
-//        final Expectation[] expectations = mockServer.retrieveExistingExpectations(null);
-//        return new ResponseEntity<>(new ObjectMapper()
-//                .configure(SerializationFeature.INDENT_OUTPUT, true)
-//                .writeValueAsString(expectations), HttpStatus.OK);
-//    }
+    @RequestMapping(value = {"/retrieveRecordedRequests"}, method = RequestMethod.GET)
+    public List<HttpRequest> retrieveRecordedRequests() {
+        return Arrays.asList(mockServer.retrieveRecordedRequests(null));
+    }
 
     @RequestMapping(value = {"/registerToVidSimulator"}, method = RequestMethod.DELETE)
     @ResponseStatus(value = HttpStatus.OK)
@@ -176,10 +228,47 @@
         }
     }
 
-    @RequestMapping(value = {"/**"})
-    public String redirectToMockServer(HttpServletRequest request, HttpServletResponse response) {
-        //Currently, the easiest logic is redirecting
+    //*******portal role access simulator (added by ag137v)
 
+    @RequestMapping(value = {"/ONAPPORTAL/auxapi//v3/user/*"}, method = RequestMethod.GET)
+    public @ResponseBody
+    ResponseEntity auxapiGetUser(HttpServletRequest request) {
+        if (!enableJPA) {
+            return new ResponseEntity<>("Centralized Role Access is disabled", HttpStatus.SERVICE_UNAVAILABLE);
+        }
+        entityManager.clear();
+        String reqUri = request.getRequestURI();
+        String userName = reqUri.substring(reqUri.lastIndexOf('/') + 1);
+        TypedQuery<User> userQuery = entityManager.createQuery("select u from fn_user u where u.loginId = :userName", User.class);
+        userQuery.setParameter("userName", userName);
+        User user = userQuery.getSingleResult();
+
+        Gson g = new Gson();
+        String jsonString = g.toJson(user);
+
+        return new ResponseEntity<>(jsonString, HttpStatus.OK);
+
+    }
+
+    @RequestMapping(value = {"/ONAPPORTAL/auxapi//v3/functions"}, method = RequestMethod.GET)
+    public @ResponseBody
+    ResponseEntity auxapiGetFunctions(HttpServletRequest request) {
+        if (!enableJPA) {
+            return new ResponseEntity<>("Centralized Role Access is disabled", HttpStatus.SERVICE_UNAVAILABLE);
+        }
+        TypedQuery<Function> userQuery = entityManager.createQuery("select f from fn_function f", Function.class);
+        List<Function> functions = userQuery.getResultList();
+        Gson g = new Gson();
+        String jsonString = g.toJson(functions);
+
+        return new ResponseEntity<>(jsonString, HttpStatus.OK);
+
+    }
+    //*******portal role access simulator end
+
+
+    @RequestMapping(value = {"/**"})
+    public ResponseEntity redirectToMockServer(HttpServletRequest request, HttpServletResponse response) throws IOException {
         //This is needed to allow POST redirect - see http://www.baeldung.com/spring-redirect-and-forward
         request.setAttribute(View.RESPONSE_STATUS_ATTRIBUTE, HttpStatus.TEMPORARY_REDIRECT);
 
@@ -196,21 +285,15 @@
         }*/
 
         StringBuilder sb = new StringBuilder();
-        sb.append(mockServerProtocol+"://"+mockServerHost+":"+mockServerPort+"/"+restOfTheUrl);
+        sb.append(mockServerProtocol).append("://").append(mockServerHost).append(":").append(mockServerPort).append(restOfTheUrl);
         String queryString = request.getQueryString();
         if (queryString != null){
             sb.append("?").append(queryString);
         }
         String redirectUrl = sb.toString();
         logger.info("Redirecting the request to : {}", redirectUrl);
-        return ("redirect:"+redirectUrl);
 
-        //This was a try to setup a proxy instead of redirect
-        //Abandoned this direction when trying to return the original HTTP error code which was registered to mock server,  instead of wrapped up HTTP 500.
-
-       /* String restOfTheUrl = "/"+(String) request.getAttribute(
-                HandlerMapping.PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE);
-        URI uri = null;
+        URI uri;
         try {
             uri = new URI("http", null, "localhost", 1080, restOfTheUrl, request.getQueryString(), null);
         } catch (URISyntaxException e) {
@@ -225,11 +308,24 @@
             String headerToSet = headerNames.nextElement();
             headers.set(headerToSet, request.getHeader(headerToSet));
         }
+        HttpEntity<String> proxyRequest;
+        if ("POST".equalsIgnoreCase(request.getMethod()))
+        {
+            String body = request.getReader().lines().collect(Collectors.joining(System.lineSeparator()));
+            proxyRequest = new HttpEntity<>(body, headers);
+        } else {
+            proxyRequest = new HttpEntity<>(headers);
+        }
 
-        ResponseEntity<String> responseEntity =
-                restTemplate.exchange(uri, HttpMethod.resolve(request.getMethod()), new HttpEntity<String>(body, headers), String.class);
-        
-        return responseEntity;*/
+        ResponseEntity<String> responseEntity;
+        try {
+            responseEntity =
+                    restTemplate.exchange(uri, HttpMethod.resolve(request.getMethod()), proxyRequest, String.class);
+        } catch (HttpClientErrorException exception) {
+            responseEntity = new ResponseEntity<>(exception.getResponseBodyAsString(), exception.getStatusCode());
+        }
+
+        return responseEntity;
     }
 
     private void register(SimulatorRequestResponseExpectation expectationModel) throws VidSimulatorException{
@@ -239,6 +335,12 @@
         if (id != null) {
             request.withHeader("x-simulator-id", id);
         }
+
+        if (expectationModel.getSimulatorRequest().getHeaders()!=null) {
+            expectationModel.getSimulatorRequest().getHeaders().forEach(
+                    request::withHeader);
+        }
+
         String method = expectationModel.getSimulatorRequest().getMethod();
         if (method != null) {
             request.withMethod(method);
@@ -249,16 +351,18 @@
         }
         String body = expectationModel.getSimulatorRequest().getBody();
         if (body != null) {
-            request.withBody(new JsonBody(body));
+            if (expectationModel.getSimulatorRequest().getStrict()) {
+                request.withBody(json(body, MatchType.STRICT));
+            } else {
+                request.withBody(new JsonBody(body));
+            }
         }
 
         //Queryparams
         final Map<String, List<String>> queryParams = expectationModel.getSimulatorRequest().getQueryParams();
         if (queryParams != null){
             String[] arr = new String[0];
-            queryParams.entrySet().stream().forEach(x -> {
-                request.withQueryStringParameter(x.getKey(), x.getValue().toArray(arr));
-            });
+            queryParams.forEach((key, value) -> request.withQueryStringParameter(key, value.toArray(arr)));
         }
 
         //Setting response according to what is passed
@@ -300,14 +404,13 @@
 
     private byte[] loadFileString(String filePath) {
         byte[] bytes = null;
+        File file = null;
         try {
-            File file = new ClassPathResource("download_files/" + filePath).getFile();
-            bytes = new byte[(int)file.length()];
-            DataInputStream dataInputStream = null;
-
-            dataInputStream = new DataInputStream(new BufferedInputStream(new FileInputStream(file.getPath())));
-            dataInputStream.readFully(bytes);
-            dataInputStream.close();
+            file = new ClassPathResource("download_files/" + filePath).getFile();
+            try(DataInputStream dataInputStream = new DataInputStream(new BufferedInputStream(new FileInputStream(file.getPath())))) {
+                bytes = new byte[(int)file.length()];
+                dataInputStream.readFully(bytes);
+            }
         } catch (FileNotFoundException e) {
             logger.error("File not found for file:" + filePath);
             e.printStackTrace();
diff --git a/vid-ext-services-simulator/src/main/java/org/onap/simulator/db/entities/App.java b/vid-ext-services-simulator/src/main/java/org/onap/simulator/db/entities/App.java
new file mode 100644
index 0000000..222e753
--- /dev/null
+++ b/vid-ext-services-simulator/src/main/java/org/onap/simulator/db/entities/App.java
@@ -0,0 +1,204 @@
+package org.onap.simulator.db.entities;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import org.hibernate.annotations.Type;
+
+@Entity(name = "fn_app")
+public class App {
+    @Id
+    @Column(name = "app_id")
+    protected Integer id;
+    @Column(name = "app_name")
+    private String name; // app_name
+    @Column(name = "app_image_url")
+    private String imageUrl; // app_image_url
+    @Column(name = "app_description")
+    private String description; // app_description
+    @Column(name = "app_notes")
+    private String notes; // app_notes
+    @Column(name = "app_url")
+    private String url; // app_url
+    @Column(name = "app_alternate_url")
+    private String alternateUrl; // app_alternate_url
+    @Column(name = "app_rest_endpoint")
+    private String restEndpoint; // app_rest_endpoint
+    @Column(name = "ml_app_name")
+    private String mlAppName; // ml_app_name
+    @Column(name = "ml_app_admin_id")
+    private String mlAppAdminId; // ml_app_admin_id
+    @Column(name = "mots_id")
+    private Integer motsId; // mots_id
+    @Column(name = "app_password")
+    private String appPassword; // app_password
+    @Column(columnDefinition = "varchar")
+    @Type(type="yes_no")
+    private Boolean open;
+    @Column(columnDefinition = "varchar")
+    @Type(type="yes_no")
+    private Boolean enabled;
+    @Column(columnDefinition="mediumblob")
+    private byte[] thumbnail;
+    @Column(name = "app_username")
+    private String username; // app_username
+    @Column(name = "ueb_key")
+    private String uebKey; // ueb_key
+    @Column(name = "ueb_secret")
+    private String uebSecret; // ueb_secret
+    @Column(name = "ueb_topic_name")
+    private String uebTopicName; // ueb_topic_name
+
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getImageUrl() {
+        return imageUrl;
+    }
+
+    public void setImageUrl(String imageUrl) {
+        this.imageUrl = imageUrl;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public String getNotes() {
+        return notes;
+    }
+
+    public void setNotes(String notes) {
+        this.notes = notes;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public String getAlternateUrl() {
+        return alternateUrl;
+    }
+
+    public void setAlternateUrl(String alternateUrl) {
+        this.alternateUrl = alternateUrl;
+    }
+
+    public String getRestEndpoint() {
+        return restEndpoint;
+    }
+
+    public void setRestEndpoint(String restEndpoint) {
+        this.restEndpoint = restEndpoint;
+    }
+
+    public String getMlAppName() {
+        return mlAppName;
+    }
+
+    public void setMlAppName(String mlAppName) {
+        this.mlAppName = mlAppName;
+    }
+
+    public String getMlAppAdminId() {
+        return mlAppAdminId;
+    }
+
+    public void setMlAppAdminId(String mlAppAdminId) {
+        this.mlAppAdminId = mlAppAdminId;
+    }
+
+    public Integer getMotsId() {
+        return motsId;
+    }
+
+    public void setMotsId(Integer motsId) {
+        this.motsId = motsId;
+    }
+
+    public String getAppPassword() {
+        return appPassword;
+    }
+
+    public void setAppPassword(String appPassword) {
+        this.appPassword = appPassword;
+    }
+
+    public Boolean getOpen() {
+        return open;
+    }
+
+    public void setOpen(Boolean open) {
+        this.open = open;
+    }
+
+    public Boolean getEnabled() {
+        return enabled;
+    }
+
+    public void setEnabled(Boolean enabled) {
+        this.enabled = enabled;
+    }
+
+    public byte[] getThumbnail() {
+        return thumbnail;
+    }
+
+    public void setThumbnail(byte[] thumbnail) {
+        this.thumbnail = thumbnail;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public String getUebKey() {
+        return uebKey;
+    }
+
+    public void setUebKey(String uebKey) {
+        this.uebKey = uebKey;
+    }
+
+    public String getUebSecret() {
+        return uebSecret;
+    }
+
+    public void setUebSecret(String uebSecret) {
+        this.uebSecret = uebSecret;
+    }
+
+    public String getUebTopicName() {
+        return uebTopicName;
+    }
+
+    public void setUebTopicName(String uebTopicName) {
+        this.uebTopicName = uebTopicName;
+    }
+}
diff --git a/vid-ext-services-simulator/src/main/java/org/onap/simulator/db/entities/Function.java b/vid-ext-services-simulator/src/main/java/org/onap/simulator/db/entities/Function.java
new file mode 100644
index 0000000..0f37ec9
--- /dev/null
+++ b/vid-ext-services-simulator/src/main/java/org/onap/simulator/db/entities/Function.java
@@ -0,0 +1,56 @@
+package org.onap.simulator.db.entities;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+@Entity(name = "fn_function")
+public class Function {
+
+    @Id
+    @Column(name = "function_cd")
+    private String code;
+    @Column(name = "function_name")
+    private String name;
+    private String type;
+    private String action;
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getAction() {
+        return action;
+    }
+
+    public void setAction(String action) {
+        this.action = action;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    @Override
+    public String toString() {
+        return "RoleFunction [code=" + code + ", name=" + name + ", type=" + type + ", action=" + action + "]";
+    }
+
+
+}
diff --git a/vid-ext-services-simulator/src/main/java/org/onap/simulator/db/entities/Role.java b/vid-ext-services-simulator/src/main/java/org/onap/simulator/db/entities/Role.java
new file mode 100644
index 0000000..8b09d1f
--- /dev/null
+++ b/vid-ext-services-simulator/src/main/java/org/onap/simulator/db/entities/Role.java
@@ -0,0 +1,57 @@
+package org.onap.simulator.db.entities;
+
+import java.util.Set;
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
+import org.hibernate.annotations.Type;
+
+@Entity(name = "fn_role")
+public class Role {
+    @Id
+    @Column(name = "role_id")
+    private Integer id;
+    @Column(name = "role_name")
+    private String name;
+    @Column(name = "active_yn", columnDefinition = "varchar")
+    @Type(type="yes_no")
+    private boolean active;
+
+    @OneToMany(cascade = CascadeType.ALL, targetEntity=RoleFunction.class, mappedBy="id")
+    private Set<RoleFunction> roleFunctions;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+
+
+    public Set<RoleFunction> getRoleFunctions() {
+        return roleFunctions;
+    }
+
+    public void setRoleFunctions(Set<RoleFunction> roleFunctions) {
+        this.roleFunctions = roleFunctions;
+    }
+}
diff --git a/vid-ext-services-simulator/src/main/java/org/onap/simulator/db/entities/RoleFunction.java b/vid-ext-services-simulator/src/main/java/org/onap/simulator/db/entities/RoleFunction.java
new file mode 100644
index 0000000..addda53
--- /dev/null
+++ b/vid-ext-services-simulator/src/main/java/org/onap/simulator/db/entities/RoleFunction.java
@@ -0,0 +1,33 @@
+package org.onap.simulator.db.entities;
+
+import java.io.Serializable;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+@Entity(name = "fn_role_function")
+public class RoleFunction implements Serializable {
+
+    @Id
+    @Column(name = "role_id")
+    private Integer id;
+    @Id
+    @Column(name = "function_cd")
+    private String code;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+}
diff --git a/vid-ext-services-simulator/src/main/java/org/onap/simulator/db/entities/User.java b/vid-ext-services-simulator/src/main/java/org/onap/simulator/db/entities/User.java
new file mode 100644
index 0000000..349845f
--- /dev/null
+++ b/vid-ext-services-simulator/src/main/java/org/onap/simulator/db/entities/User.java
@@ -0,0 +1,221 @@
+package org.onap.simulator.db.entities;
+
+import java.math.BigDecimal;
+import java.util.Set;
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
+import org.hibernate.annotations.Type;
+
+@Entity(name = "fn_user")
+public class User {
+
+    @Id @Column(name = "user_id")
+    private Integer id;
+    @Column(name = "created_id")
+    private Integer createdId;
+    @Column(name = "modified_id")
+    private Integer modifiedId;
+    @Column(name = "org_id")
+    private Integer orgId;
+    @Column(name = "org_manager_userid")
+    private String managerId;
+    @Column(name = "first_name")
+    private String firstName;
+    @Column(name = "middle_name")
+    private String middleInitial;
+    @Column(name = "last_name")
+    private String lastName;
+
+    @Column(name = "address_id")
+    private BigDecimal addressId;
+    @Column(name = "alert_method_cd")
+    private String alertMethodCd;
+    private String hrid;
+    @Column(name = "org_user_id")
+    private String orgUserId;
+    @Column(name = "ADDRESS_LINE_1")
+    private String address1;
+    @Column(name = "ADDRESS_LINE_2")
+    private String address2;
+    @Column(name = "login_id")
+    private String loginId;
+    @Column(name = "login_pwd")
+    private String loginPwd;
+    @Column(name = "active_yn", columnDefinition = "varchar")
+    @Type(type="yes_no")
+    private Boolean active;
+    @Column(name = "is_internal_yn", columnDefinition = "varchar")
+    @Type(type="yes_no")
+    private Boolean internal;
+    @Column(name = "timezone")
+    private Integer timeZoneId;
+
+    @OneToMany(cascade = CascadeType.ALL, targetEntity=UserApp.class, mappedBy="userId")
+    private Set<UserApp> userApps;
+
+    public User() {
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getCreatedId() {
+        return createdId;
+    }
+
+    public void setCreatedId(Integer createdId) {
+        this.createdId = createdId;
+    }
+
+    public Integer getModifiedId() {
+        return modifiedId;
+    }
+
+    public void setModifiedId(Integer modifiedId) {
+        this.modifiedId = modifiedId;
+    }
+
+    public Integer getOrgId() {
+        return orgId;
+    }
+
+    public void setOrgId(Integer orgId) {
+        this.orgId = orgId;
+    }
+
+    public String getManagerId() {
+        return managerId;
+    }
+
+    public void setManagerId(String managerId) {
+        this.managerId = managerId;
+    }
+
+    public String getFirstName() {
+        return firstName;
+    }
+
+    public void setFirstName(String firstName) {
+        this.firstName = firstName;
+    }
+
+    public String getMiddleInitial() {
+        return middleInitial;
+    }
+
+    public void setMiddleInitial(String middleInitial) {
+        this.middleInitial = middleInitial;
+    }
+
+    public String getLastName() {
+        return lastName;
+    }
+
+    public void setLastName(String lastName) {
+        this.lastName = lastName;
+    }
+
+    public BigDecimal getAddressId() {
+        return addressId;
+    }
+
+    public void setAddressId(BigDecimal addressId) {
+        this.addressId = addressId;
+    }
+
+    public String getAlertMethodCd() {
+        return alertMethodCd;
+    }
+
+    public void setAlertMethodCd(String alertMethodCd) {
+        this.alertMethodCd = alertMethodCd;
+    }
+
+    public String getHrid() {
+        return hrid;
+    }
+
+    public void setHrid(String hrid) {
+        this.hrid = hrid;
+    }
+
+    public String getOrgUserId() {
+        return orgUserId;
+    }
+
+    public void setOrgUserId(String orgUserId) {
+        this.orgUserId = orgUserId;
+    }
+
+    public String getAddress1() {
+        return address1;
+    }
+
+    public void setAddress1(String address1) {
+        this.address1 = address1;
+    }
+
+    public String getAddress2() {
+        return address2;
+    }
+
+    public void setAddress2(String address2) {
+        this.address2 = address2;
+    }
+
+    public String getLoginId() {
+        return loginId;
+    }
+
+    public void setLoginId(String loginId) {
+        this.loginId = loginId;
+    }
+
+    public String getLoginPwd() {
+        return loginPwd;
+    }
+
+    public void setLoginPwd(String loginPwd) {
+        this.loginPwd = loginPwd;
+    }
+
+    public Boolean getActive() {
+        return active;
+    }
+
+    public void setActive(Boolean active) {
+        this.active = active;
+    }
+
+    public Boolean getInternal() {
+        return internal;
+    }
+
+    public void setInternal(Boolean internal) {
+        this.internal = internal;
+    }
+
+    public Integer getTimeZoneId() {
+        return timeZoneId;
+    }
+
+    public void setTimeZoneId(Integer timeZoneId) {
+        this.timeZoneId = timeZoneId;
+    }
+
+    public Set<UserApp> getUserApps() {
+        return userApps;
+    }
+
+    public void setUserApps(Set<UserApp> userApps) {
+        this.userApps = userApps;
+    }
+}
diff --git a/vid-ext-services-simulator/src/main/java/org/onap/simulator/db/entities/UserApp.java b/vid-ext-services-simulator/src/main/java/org/onap/simulator/db/entities/UserApp.java
new file mode 100644
index 0000000..e4eba79
--- /dev/null
+++ b/vid-ext-services-simulator/src/main/java/org/onap/simulator/db/entities/UserApp.java
@@ -0,0 +1,49 @@
+package org.onap.simulator.db.entities;
+
+import java.io.Serializable;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+
+@Entity(name = "fn_user_role")
+public class UserApp implements Serializable {
+
+    @Id
+    @Column(name = "user_id")
+    private Integer userId;
+    @Id
+    @ManyToOne
+    @JoinColumn(name = "app_id")
+    private App app;
+    @Id
+    @ManyToOne
+    @JoinColumn(name = "role_id")
+    private Role role;
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
+    public App getApp() {
+        return app;
+    }
+
+    public void setApp(App app) {
+        this.app = app;
+    }
+
+    public Role getRole() {
+        return role;
+    }
+
+    public void setRole(Role role) {
+        this.role = role;
+    }
+
+}
diff --git a/vid-ext-services-simulator/src/main/java/org/onap/simulator/model/SimulatorRequest.java b/vid-ext-services-simulator/src/main/java/org/onap/simulator/model/SimulatorRequest.java
index 9e298b9..713c318 100644
--- a/vid-ext-services-simulator/src/main/java/org/onap/simulator/model/SimulatorRequest.java
+++ b/vid-ext-services-simulator/src/main/java/org/onap/simulator/model/SimulatorRequest.java
@@ -2,7 +2,6 @@
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.JsonNode;
-
 import java.util.List;
 import java.util.Map;
 
@@ -12,6 +11,9 @@
     private String method;
     private String path;
     private String body;
+    private boolean strict;
+    private Map<String,String> headers;
+
     private Map<String, List<String>> queryParams;
 
     public Map<String, List<String>> getQueryParams() {
@@ -54,6 +56,22 @@
         this.body = body.isTextual() ? body.textValue() : body.toString();
     }
 
+    public boolean getStrict() {
+        return strict;
+    }
+
+    public void setStrict(boolean strict) {
+        this.strict = strict;
+    }
+
+    public Map<String, String> getHeaders() {
+        return headers;
+    }
+
+    public void setHeaders(Map<String, String> headers) {
+        this.headers = headers;
+    }
+
     @Override
     public String toString() {
         return "SimulatorRequest{" +
diff --git a/vid-ext-services-simulator/src/main/java/org/onap/simulator/model/SimulatorResponse.java b/vid-ext-services-simulator/src/main/java/org/onap/simulator/model/SimulatorResponse.java
index 4836185..1ee185f 100644
--- a/vid-ext-services-simulator/src/main/java/org/onap/simulator/model/SimulatorResponse.java
+++ b/vid-ext-services-simulator/src/main/java/org/onap/simulator/model/SimulatorResponse.java
@@ -2,7 +2,6 @@
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.JsonNode;
-
 import java.util.Map;
 
 public class SimulatorResponse {
diff --git a/vid-ext-services-simulator/src/main/resources/META-INF/persistence.xml b/vid-ext-services-simulator/src/main/resources/META-INF/persistence.xml
new file mode 100644
index 0000000..9e4453f
--- /dev/null
+++ b/vid-ext-services-simulator/src/main/resources/META-INF/persistence.xml
@@ -0,0 +1,23 @@
+<persistence xmlns="http://xmlns.jcp.org/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence
+  http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd"
+             version="2.1">
+
+    <persistence-unit name="vid" transaction-type="RESOURCE_LOCAL">
+        <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
+
+        <properties>
+            <!-- Hibernate properties -->
+            <property name="hibernate.default_schema" value="vid_portal" />
+            <property name="hibernate.show_sql" value="false" />
+            <property name="hibernate.format_sql" value="false" />
+            <property name="hibernate.dialect" value="org.hibernate.dialect.MariaDB103Dialect" />
+            <property name="hibernate.hbm2ddl.auto" value="validate" />
+            <property name="hibernate.connection.driver_class" value="org.mariadb.jdbc.Driver"/>
+            <property name="hibernate.connection.username" value="euser"/>
+            <property name="hibernate.connection.password" value="euser"/>
+            <property name="hibernate.connection.url" value="jdbc:mariadb://localhost:3306/vid_portal"/>
+            <property name="hibernate.id.new_generator_mappings" value="false"/>
+        </properties>
+    </persistence-unit>
+</persistence>
\ No newline at end of file
diff --git a/vid-ext-services-simulator/src/main/resources/download_files/1707vidnf.zip b/vid-ext-services-simulator/src/main/resources/download_files/1707vidnf.zip
index 36d5ab9..41da82a 100644
--- a/vid-ext-services-simulator/src/main/resources/download_files/1707vidnf.zip
+++ b/vid-ext-services-simulator/src/main/resources/download_files/1707vidnf.zip
Binary files differ
diff --git a/vid-ext-services-simulator/src/main/resources/download_files/2f80c596-instantiationTypeMacro.zip b/vid-ext-services-simulator/src/main/resources/download_files/2f80c596-instantiationTypeMacro.zip
index 09e0887..2080bc2 100644
--- a/vid-ext-services-simulator/src/main/resources/download_files/2f80c596-instantiationTypeMacro.zip
+++ b/vid-ext-services-simulator/src/main/resources/download_files/2f80c596-instantiationTypeMacro.zip
Binary files differ
diff --git a/vid-ext-services-simulator/src/main/resources/download_files/2f80c596.zip b/vid-ext-services-simulator/src/main/resources/download_files/2f80c596.zip
index 1f84855..2476da0 100644
--- a/vid-ext-services-simulator/src/main/resources/download_files/2f80c596.zip
+++ b/vid-ext-services-simulator/src/main/resources/download_files/2f80c596.zip
Binary files differ
diff --git a/vid-ext-services-simulator/src/main/resources/download_files/csar-noDynamicFields-ecompNamingFalse-fullModelDetails-1a80c596-vnfEcompNamingFalse.zip b/vid-ext-services-simulator/src/main/resources/download_files/csar-noDynamicFields-ecompNamingFalse-fullModelDetails-1a80c596-vnfEcompNamingFalse.zip
index 390393f..bcbe078 100644
--- a/vid-ext-services-simulator/src/main/resources/download_files/csar-noDynamicFields-ecompNamingFalse-fullModelDetails-1a80c596-vnfEcompNamingFalse.zip
+++ b/vid-ext-services-simulator/src/main/resources/download_files/csar-noDynamicFields-ecompNamingFalse-fullModelDetails-1a80c596-vnfEcompNamingFalse.zip
Binary files differ
diff --git a/vid-ext-services-simulator/src/main/resources/download_files/csar-noDynamicFields-ecompNamingFalse-fullModelDetails-1a80c596.zip b/vid-ext-services-simulator/src/main/resources/download_files/csar-noDynamicFields-ecompNamingFalse-fullModelDetails-1a80c596.zip
index ab25469..749a4f2 100644
--- a/vid-ext-services-simulator/src/main/resources/download_files/csar-noDynamicFields-ecompNamingFalse-fullModelDetails-1a80c596.zip
+++ b/vid-ext-services-simulator/src/main/resources/download_files/csar-noDynamicFields-ecompNamingFalse-fullModelDetails-1a80c596.zip
Binary files differ
diff --git a/vid-ext-services-simulator/src/main/resources/download_files/csar-noDynamicFields-ecompNamingFalse-fullModelDetails.zip b/vid-ext-services-simulator/src/main/resources/download_files/csar-noDynamicFields-ecompNamingFalse-fullModelDetails.zip
index 39f9c8a..30ec25a 100644
--- a/vid-ext-services-simulator/src/main/resources/download_files/csar-noDynamicFields-ecompNamingFalse-fullModelDetails.zip
+++ b/vid-ext-services-simulator/src/main/resources/download_files/csar-noDynamicFields-ecompNamingFalse-fullModelDetails.zip
Binary files differ
diff --git a/vid-ext-services-simulator/src/main/resources/download_files/csar-withDynamicFields-ecompNamingFalse-partialModelDetails-vnfEcompNamingFalse.zip b/vid-ext-services-simulator/src/main/resources/download_files/csar-withDynamicFields-ecompNamingFalse-partialModelDetails-vnfEcompNamingFalse.zip
new file mode 100644
index 0000000..157fffa
--- /dev/null
+++ b/vid-ext-services-simulator/src/main/resources/download_files/csar-withDynamicFields-ecompNamingFalse-partialModelDetails-vnfEcompNamingFalse.zip
Binary files differ
diff --git a/vid-ext-services-simulator/src/main/resources/download_files/csar-withDynamicFields-ecompNamingTrue-partialModelDetails.zip b/vid-ext-services-simulator/src/main/resources/download_files/csar-withDynamicFields-ecompNamingTrue-partialModelDetails.zip
index b3e7bf9..3cdde15 100644
--- a/vid-ext-services-simulator/src/main/resources/download_files/csar-withDynamicFields-ecompNamingTrue-partialModelDetails.zip
+++ b/vid-ext-services-simulator/src/main/resources/download_files/csar-withDynamicFields-ecompNamingTrue-partialModelDetails.zip
Binary files differ
diff --git a/vid-ext-services-simulator/src/main/resources/download_files/csar15782222_instantiationTypeAlacarte_VnfGrouping.zip b/vid-ext-services-simulator/src/main/resources/download_files/csar15782222_instantiationTypeAlacarte_VnfGrouping.zip
new file mode 100644
index 0000000..bf44d05
--- /dev/null
+++ b/vid-ext-services-simulator/src/main/resources/download_files/csar15782222_instantiationTypeAlacarte_VnfGrouping.zip
Binary files differ
diff --git a/vid-ext-services-simulator/src/main/resources/download_files/csar15782222_instantiationTypeAlacarte_invariantUUIDMacro.zip b/vid-ext-services-simulator/src/main/resources/download_files/csar15782222_instantiationTypeAlacarte_invariantUUIDMacro.zip
index c22037d..86b75d1 100644
--- a/vid-ext-services-simulator/src/main/resources/download_files/csar15782222_instantiationTypeAlacarte_invariantUUIDMacro.zip
+++ b/vid-ext-services-simulator/src/main/resources/download_files/csar15782222_instantiationTypeAlacarte_invariantUUIDMacro.zip
Binary files differ
diff --git a/vid-ext-services-simulator/src/main/resources/download_files/csar15782222_instantiationTypeAlacarte_vidNotionsInstantiationUIByUUID.zip b/vid-ext-services-simulator/src/main/resources/download_files/csar15782222_instantiationTypeAlacarte_vidNotionsInstantiationUIByUUID.zip
new file mode 100644
index 0000000..b687c11
--- /dev/null
+++ b/vid-ext-services-simulator/src/main/resources/download_files/csar15782222_instantiationTypeAlacarte_vidNotionsInstantiationUIByUUID.zip
Binary files differ
diff --git a/vid-ext-services-simulator/src/main/resources/download_files/csar15782222_instantiationTypeBoth_invariantUUIDAlacarte.zip b/vid-ext-services-simulator/src/main/resources/download_files/csar15782222_instantiationTypeBoth_invariantUUIDAlacarte.zip
index cc5539f..ff2b9b2 100644
--- a/vid-ext-services-simulator/src/main/resources/download_files/csar15782222_instantiationTypeBoth_invariantUUIDAlacarte.zip
+++ b/vid-ext-services-simulator/src/main/resources/download_files/csar15782222_instantiationTypeBoth_invariantUUIDAlacarte.zip
Binary files differ
diff --git a/vid-ext-services-simulator/src/main/resources/download_files/csar15782222_instantiationTypeEmpty_invariantUUIDAlacarte.zip b/vid-ext-services-simulator/src/main/resources/download_files/csar15782222_instantiationTypeEmpty_invariantUUIDAlacarte.zip
index 343419e..566cae7 100644
--- a/vid-ext-services-simulator/src/main/resources/download_files/csar15782222_instantiationTypeEmpty_invariantUUIDAlacarte.zip
+++ b/vid-ext-services-simulator/src/main/resources/download_files/csar15782222_instantiationTypeEmpty_invariantUUIDAlacarte.zip
Binary files differ
diff --git a/vid-ext-services-simulator/src/main/resources/download_files/csar15782222_instantiationTypeMacroWithCR.zip b/vid-ext-services-simulator/src/main/resources/download_files/csar15782222_instantiationTypeMacroWithCR.zip
index be93cdb..a189f20 100644
--- a/vid-ext-services-simulator/src/main/resources/download_files/csar15782222_instantiationTypeMacroWithCR.zip
+++ b/vid-ext-services-simulator/src/main/resources/download_files/csar15782222_instantiationTypeMacroWithCR.zip
Binary files differ
diff --git a/vid-ext-services-simulator/src/main/resources/download_files/csar15782222_instantiationTypeMacroWithNetwork.zip b/vid-ext-services-simulator/src/main/resources/download_files/csar15782222_instantiationTypeMacroWithNetwork.zip
index bd967eb..d595a2f 100644
--- a/vid-ext-services-simulator/src/main/resources/download_files/csar15782222_instantiationTypeMacroWithNetwork.zip
+++ b/vid-ext-services-simulator/src/main/resources/download_files/csar15782222_instantiationTypeMacroWithNetwork.zip
Binary files differ
diff --git a/vid-ext-services-simulator/src/main/resources/download_files/csar15782222_instantiationTypeMacroWithPnf.zip b/vid-ext-services-simulator/src/main/resources/download_files/csar15782222_instantiationTypeMacroWithPnf.zip
index 55dee5d..dd68145 100644
--- a/vid-ext-services-simulator/src/main/resources/download_files/csar15782222_instantiationTypeMacroWithPnf.zip
+++ b/vid-ext-services-simulator/src/main/resources/download_files/csar15782222_instantiationTypeMacroWithPnf.zip
Binary files differ
diff --git a/vid-ext-services-simulator/src/main/resources/download_files/csar15782222_instantiationTypeMacro_invariantUUIDAlacarte.zip b/vid-ext-services-simulator/src/main/resources/download_files/csar15782222_instantiationTypeMacro_invariantUUIDAlacarte.zip
index ff031c7..6cc6454 100644
--- a/vid-ext-services-simulator/src/main/resources/download_files/csar15782222_instantiationTypeMacro_invariantUUIDAlacarte.zip
+++ b/vid-ext-services-simulator/src/main/resources/download_files/csar15782222_instantiationTypeMacro_invariantUUIDAlacarte.zip
Binary files differ
diff --git a/vid-ext-services-simulator/src/main/resources/download_files/csar15782222_instantiationTypeMacro_invariantUUIDAlacarte_withoutNetworks.zip b/vid-ext-services-simulator/src/main/resources/download_files/csar15782222_instantiationTypeMacro_invariantUUIDAlacarte_withoutNetworks.zip
new file mode 100644
index 0000000..c75b4d5
--- /dev/null
+++ b/vid-ext-services-simulator/src/main/resources/download_files/csar15782222_instantiationTypeMacro_invariantUUIDAlacarte_withoutNetworks.zip
Binary files differ
diff --git a/vid-ext-services-simulator/src/main/resources/download_files/csar15782222_invariantUUIDMacro.zip b/vid-ext-services-simulator/src/main/resources/download_files/csar15782222_invariantUUIDMacro.zip
index 1c30bf8..916d03c 100644
--- a/vid-ext-services-simulator/src/main/resources/download_files/csar15782222_invariantUUIDMacro.zip
+++ b/vid-ext-services-simulator/src/main/resources/download_files/csar15782222_invariantUUIDMacro.zip
Binary files differ
diff --git a/vid-ext-services-simulator/src/main/resources/download_files/csar2f80c596-modified-ecompNaming-false.zip b/vid-ext-services-simulator/src/main/resources/download_files/csar2f80c596-modified-ecompNaming-false.zip
index 5a85d9c..fbe40fa 100644
--- a/vid-ext-services-simulator/src/main/resources/download_files/csar2f80c596-modified-ecompNaming-false.zip
+++ b/vid-ext-services-simulator/src/main/resources/download_files/csar2f80c596-modified-ecompNaming-false.zip
Binary files differ
diff --git a/vid-ext-services-simulator/src/main/resources/download_files/csar317927061915233480.zip b/vid-ext-services-simulator/src/main/resources/download_files/csar317927061915233480.zip
index 627117e..5c229e0 100644
--- a/vid-ext-services-simulator/src/main/resources/download_files/csar317927061915233480.zip
+++ b/vid-ext-services-simulator/src/main/resources/download_files/csar317927061915233480.zip
Binary files differ
diff --git a/vid-ext-services-simulator/src/main/resources/download_files/ggghhh.zip b/vid-ext-services-simulator/src/main/resources/download_files/ggghhh.zip
index daeb9bf..f06b53c 100644
--- a/vid-ext-services-simulator/src/main/resources/download_files/ggghhh.zip
+++ b/vid-ext-services-simulator/src/main/resources/download_files/ggghhh.zip
Binary files differ
diff --git a/vid-ext-services-simulator/src/main/resources/download_files/min_max_initial_vfModule_csar_v4.0.zip b/vid-ext-services-simulator/src/main/resources/download_files/min_max_initial_vfModule_csar_v4.0.zip
index db666bc..6e686ef 100644
--- a/vid-ext-services-simulator/src/main/resources/download_files/min_max_initial_vfModule_csar_v4.0.zip
+++ b/vid-ext-services-simulator/src/main/resources/download_files/min_max_initial_vfModule_csar_v4.0.zip
Binary files differ
diff --git a/vid-ext-services-simulator/src/main/resources/download_files/pm1111.zip b/vid-ext-services-simulator/src/main/resources/download_files/pm1111.zip
index ffbb3f9..3192fbf 100644
--- a/vid-ext-services-simulator/src/main/resources/download_files/pm1111.zip
+++ b/vid-ext-services-simulator/src/main/resources/download_files/pm1111.zip
Binary files differ
diff --git a/vid-ext-services-simulator/src/main/resources/download_files/pm1111_equip_model_rename.zip b/vid-ext-services-simulator/src/main/resources/download_files/pm1111_equip_model_rename.zip
index 31c7a2e..898da77 100644
--- a/vid-ext-services-simulator/src/main/resources/download_files/pm1111_equip_model_rename.zip
+++ b/vid-ext-services-simulator/src/main/resources/download_files/pm1111_equip_model_rename.zip
Binary files differ
diff --git a/vid-ext-services-simulator/src/main/resources/download_files/service-AdiodVmxVpeBvService488-csar-annotations.zip b/vid-ext-services-simulator/src/main/resources/download_files/service-AdiodVmxVpeBvService488-csar-annotations.zip
deleted file mode 100644
index f2337b4..0000000
--- a/vid-ext-services-simulator/src/main/resources/download_files/service-AdiodVmxVpeBvService488-csar-annotations.zip
+++ /dev/null
Binary files differ
diff --git a/vid-ext-services-simulator/src/main/resources/download_files/service-Complexservice-aLaCarte-csar-2.zip b/vid-ext-services-simulator/src/main/resources/download_files/service-Complexservice-aLaCarte-csar-2.zip
new file mode 100644
index 0000000..891a90c
--- /dev/null
+++ b/vid-ext-services-simulator/src/main/resources/download_files/service-Complexservice-aLaCarte-csar-2.zip
Binary files differ
diff --git a/vid-ext-services-simulator/src/main/resources/download_files/service-Complexservice-aLaCarte-csar.zip b/vid-ext-services-simulator/src/main/resources/download_files/service-Complexservice-aLaCarte-csar.zip
index c8a3186..e0ac083 100644
--- a/vid-ext-services-simulator/src/main/resources/download_files/service-Complexservice-aLaCarte-csar.zip
+++ b/vid-ext-services-simulator/src/main/resources/download_files/service-Complexservice-aLaCarte-csar.zip
Binary files differ
diff --git a/vid-ext-services-simulator/src/main/resources/download_files/service-Complexservice-csar.zip b/vid-ext-services-simulator/src/main/resources/download_files/service-Complexservice-csar.zip
index ebaf24c..34f20f0 100644
--- a/vid-ext-services-simulator/src/main/resources/download_files/service-Complexservice-csar.zip
+++ b/vid-ext-services-simulator/src/main/resources/download_files/service-Complexservice-csar.zip
Binary files differ
diff --git a/vid-ext-services-simulator/src/main/resources/download_files/service-MsoExampleService-csar.zip b/vid-ext-services-simulator/src/main/resources/download_files/service-MsoExampleService-csar.zip
index 5bd59b1..83131de 100644
--- a/vid-ext-services-simulator/src/main/resources/download_files/service-MsoExampleService-csar.zip
+++ b/vid-ext-services-simulator/src/main/resources/download_files/service-MsoExampleService-csar.zip
Binary files differ
diff --git a/vid-ext-services-simulator/src/main/resources/download_files/service-PASQUALEVmxVpeBvService488-csar-annotations.zip b/vid-ext-services-simulator/src/main/resources/download_files/service-PASQUALEVmxVpeBvService488-csar-annotations.zip
new file mode 100644
index 0000000..d0ffdb2
--- /dev/null
+++ b/vid-ext-services-simulator/src/main/resources/download_files/service-PASQUALEVmxVpeBvService488-csar-annotations.zip
Binary files differ
diff --git a/vid-ext-services-simulator/src/main/resources/download_files/service-SrIovProvider1-csar.zip b/vid-ext-services-simulator/src/main/resources/download_files/service-SrIovProvider1-csar.zip
new file mode 100644
index 0000000..62bda31
--- /dev/null
+++ b/vid-ext-services-simulator/src/main/resources/download_files/service-SrIovProvider1-csar.zip
Binary files differ
diff --git a/vid-ext-services-simulator/src/main/resources/download_files/service-VdbeSrv-csar.zip b/vid-ext-services-simulator/src/main/resources/download_files/service-VdbeSrv-csar.zip
deleted file mode 100644
index 60c6644..0000000
--- a/vid-ext-services-simulator/src/main/resources/download_files/service-VdbeSrv-csar.zip
+++ /dev/null
Binary files differ
diff --git a/vid-ext-services-simulator/src/main/resources/download_files/service-VdbeSrv-csar_ecomp_false6.zip b/vid-ext-services-simulator/src/main/resources/download_files/service-VdbeSrv-csar_ecomp_false6.zip
deleted file mode 100644
index 140d2e6..0000000
--- a/vid-ext-services-simulator/src/main/resources/download_files/service-VdbeSrv-csar_ecomp_false6.zip
+++ /dev/null
Binary files differ
diff --git a/vid-ext-services-simulator/src/main/resources/download_files/service-VflorenceRvpmsFeAic3011217Svc-csar.csar.zip b/vid-ext-services-simulator/src/main/resources/download_files/service-VflorenceRvpmsFeAic3011217Svc-csar.csar.zip
new file mode 100644
index 0000000..ee11a04
--- /dev/null
+++ b/vid-ext-services-simulator/src/main/resources/download_files/service-VflorenceRvpmsFeAic3011217Svc-csar.csar.zip
Binary files differ
diff --git a/vid-ext-services-simulator/src/main/resources/download_files/service-VmmeRvpmsFeAic3011217Svc-csar.csar.zip b/vid-ext-services-simulator/src/main/resources/download_files/service-VmmeRvpmsFeAic3011217Svc-csar.csar.zip
deleted file mode 100644
index 415ccc5..0000000
--- a/vid-ext-services-simulator/src/main/resources/download_files/service-VmmeRvpmsFeAic3011217Svc-csar.csar.zip
+++ /dev/null
Binary files differ
diff --git a/vid-ext-services-simulator/src/main/resources/download_files/service-fabric-SriovService-csar.zip b/vid-ext-services-simulator/src/main/resources/download_files/service-fabric-SriovService-csar.zip
new file mode 100644
index 0000000..3df7e77
--- /dev/null
+++ b/vid-ext-services-simulator/src/main/resources/download_files/service-fabric-SriovService-csar.zip
Binary files differ
diff --git a/vid-ext-services-simulator/src/main/resources/download_files/service-fabric-configuration.zip b/vid-ext-services-simulator/src/main/resources/download_files/service-fabric-configuration.zip
new file mode 100644
index 0000000..bab0603
--- /dev/null
+++ b/vid-ext-services-simulator/src/main/resources/download_files/service-fabric-configuration.zip
Binary files differ
diff --git a/vid-ext-services-simulator/src/main/resources/download_files/service-network-vl.zip b/vid-ext-services-simulator/src/main/resources/download_files/service-network-vl.zip
index 2932b98..78e4673 100644
--- a/vid-ext-services-simulator/src/main/resources/download_files/service-network-vl.zip
+++ b/vid-ext-services-simulator/src/main/resources/download_files/service-network-vl.zip
Binary files differ
diff --git a/vid-ext-services-simulator/src/main/resources/download_files/service-vDOROTHEASrv-csar.zip b/vid-ext-services-simulator/src/main/resources/download_files/service-vDOROTHEASrv-csar.zip
new file mode 100644
index 0000000..768d502
--- /dev/null
+++ b/vid-ext-services-simulator/src/main/resources/download_files/service-vDOROTHEASrv-csar.zip
Binary files differ
diff --git a/vid-ext-services-simulator/src/main/resources/download_files/service-vDOROTHEASrv-csar_ecomp_false6.zip b/vid-ext-services-simulator/src/main/resources/download_files/service-vDOROTHEASrv-csar_ecomp_false6.zip
new file mode 100644
index 0000000..4b9f545
--- /dev/null
+++ b/vid-ext-services-simulator/src/main/resources/download_files/service-vDOROTHEASrv-csar_ecomp_false6.zip
Binary files differ
diff --git a/vid-ext-services-simulator/src/main/resources/download_files/service-vl-with-5g-network-provider-alacarte.zip b/vid-ext-services-simulator/src/main/resources/download_files/service-vl-with-5g-network-provider-alacarte.zip
new file mode 100644
index 0000000..6b2adaa
--- /dev/null
+++ b/vid-ext-services-simulator/src/main/resources/download_files/service-vl-with-5g-network-provider-alacarte.zip
Binary files differ
diff --git a/vid-ext-services-simulator/src/main/resources/download_files/service-vnf-grouping-csar.zip b/vid-ext-services-simulator/src/main/resources/download_files/service-vnf-grouping-csar.zip
new file mode 100644
index 0000000..ea178fa
--- /dev/null
+++ b/vid-ext-services-simulator/src/main/resources/download_files/service-vnf-grouping-csar.zip
Binary files differ
diff --git a/vid-ext-services-simulator/src/main/resources/download_files/serviceCreationTest.zip b/vid-ext-services-simulator/src/main/resources/download_files/serviceCreationTest.zip
index ddb4bf6..54f7bf5 100644
--- a/vid-ext-services-simulator/src/main/resources/download_files/serviceCreationTest.zip
+++ b/vid-ext-services-simulator/src/main/resources/download_files/serviceCreationTest.zip
Binary files differ
diff --git a/vid-ext-services-simulator/src/main/resources/download_files/vid-test-444-demo-csar.zip b/vid-ext-services-simulator/src/main/resources/download_files/vid-test-444-demo-csar.zip
index 6bdf3fd..6cccded 100644
--- a/vid-ext-services-simulator/src/main/resources/download_files/vid-test-444-demo-csar.zip
+++ b/vid-ext-services-simulator/src/main/resources/download_files/vid-test-444-demo-csar.zip
Binary files differ
diff --git a/vid-ext-services-simulator/src/main/resources/preset_registration/SI-network-vl/aai_filter_service_instance_by_id_network-vl .json b/vid-ext-services-simulator/src/main/resources/preset_registration/SI-network-vl/aai_filter_service_instance_by_id_network-vl.json
similarity index 84%
rename from vid-ext-services-simulator/src/main/resources/preset_registration/SI-network-vl/aai_filter_service_instance_by_id_network-vl .json
rename to vid-ext-services-simulator/src/main/resources/preset_registration/SI-network-vl/aai_filter_service_instance_by_id_network-vl.json
index 0a0f8e5..db46301 100644
--- a/vid-ext-services-simulator/src/main/resources/preset_registration/SI-network-vl/aai_filter_service_instance_by_id_network-vl .json
+++ b/vid-ext-services-simulator/src/main/resources/preset_registration/SI-network-vl/aai_filter_service_instance_by_id_network-vl.json
@@ -13,7 +13,7 @@
       "result-data": [
         {
           "resource-type": "service-instance",
-          "resource-link": "/aai/v11/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/Mobility/service-instances/service-instance/d198cc45-158b-480e-8d2c-03943c51268e"
+          "resource-link": "/aai/v11/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/Emanuel/service-instances/service-instance/d198cc45-158b-480e-8d2c-03943c51268e"
         }
       ]
     }
diff --git a/vid-ext-services-simulator/src/main/resources/preset_registration/SI-network-vl/aai_filter_service_instance_by_name_network-vl.json b/vid-ext-services-simulator/src/main/resources/preset_registration/SI-network-vl/aai_filter_service_instance_by_name_network-vl.json
index 6001372..c732809 100644
--- a/vid-ext-services-simulator/src/main/resources/preset_registration/SI-network-vl/aai_filter_service_instance_by_name_network-vl.json
+++ b/vid-ext-services-simulator/src/main/resources/preset_registration/SI-network-vl/aai_filter_service_instance_by_name_network-vl.json
@@ -13,7 +13,7 @@
       "result-data": [
         {
           "resource-type": "service-instance",
-          "resource-link": "/aai/v11/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/Mobility/service-instances/service-instance/d198cc45-158b-480e-8d2c-03943c51268e"
+          "resource-link": "/aai/v11/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/Emanuel/service-instances/service-instance/d198cc45-158b-480e-8d2c-03943c51268e"
         }
       ]
     }
diff --git a/vid-ext-services-simulator/src/main/resources/preset_registration/SI-network-vl/aai_named_query_for_view_edit_test_network-vl.json b/vid-ext-services-simulator/src/main/resources/preset_registration/SI-network-vl/aai_named_query_for_view_edit_test_network-vl.json
index e5a625a..eeb5486 100644
--- a/vid-ext-services-simulator/src/main/resources/preset_registration/SI-network-vl/aai_named_query_for_view_edit_test_network-vl.json
+++ b/vid-ext-services-simulator/src/main/resources/preset_registration/SI-network-vl/aai_named_query_for_view_edit_test_network-vl.json
@@ -13,7 +13,7 @@
               "service-instance-id": "d198cc45-158b-480e-8d2c-03943c51268e"
             },
             "service-subscription": {
-              "service-type": "Mobility"
+              "service-type": "Emanuel"
             }
           }
         ]
diff --git a/vid-ext-services-simulator/src/main/resources/preset_registration/SI-network-vl/aai_filter_service_instance_by_id_network-vl .json b/vid-ext-services-simulator/src/main/resources/preset_registration/SI-test-fabric-conf/aai_filter_service_instance_by_id_test_fabric_conf.json
similarity index 60%
copy from vid-ext-services-simulator/src/main/resources/preset_registration/SI-network-vl/aai_filter_service_instance_by_id_network-vl .json
copy to vid-ext-services-simulator/src/main/resources/preset_registration/SI-test-fabric-conf/aai_filter_service_instance_by_id_test_fabric_conf.json
index 0a0f8e5..429a2ad 100644
--- a/vid-ext-services-simulator/src/main/resources/preset_registration/SI-network-vl/aai_filter_service_instance_by_id_network-vl .json
+++ b/vid-ext-services-simulator/src/main/resources/preset_registration/SI-test-fabric-conf/aai_filter_service_instance_by_id_test_fabric_conf.json
@@ -4,7 +4,7 @@
     "path": "/aai/v../search/nodes-query",
     "queryParams": {
       "search-node-type": "service-instance",
-      "filter": "service-instance-id:EQUALS:d198cc45-158b-480e-8d2c-03943c51268e"
+      "filter": "service-instance-id:EQUALS:c187e9fe-40c3-4862-b73e-84ff056205f61234"
     }
   },
   "simulatorResponse": {
@@ -13,7 +13,7 @@
       "result-data": [
         {
           "resource-type": "service-instance",
-          "resource-link": "/aai/v11/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/Mobility/service-instances/service-instance/d198cc45-158b-480e-8d2c-03943c51268e"
+          "resource-link": "/aai/v11/business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d891234/service-subscriptions/service-subscription/VIRTUAL%20USP/service-instances/service-instance/c187e9fe-40c3-4862-b73e-84ff056205f61234"
         }
       ]
     }
diff --git a/vid-ext-services-simulator/src/main/resources/preset_registration/SI-network-vl/aai_filter_service_instance_by_id_network-vl .json b/vid-ext-services-simulator/src/main/resources/preset_registration/SI-test-fabric-conf/aai_filter_service_instance_by_name_test_fabric_conf.json
similarity index 61%
copy from vid-ext-services-simulator/src/main/resources/preset_registration/SI-network-vl/aai_filter_service_instance_by_id_network-vl .json
copy to vid-ext-services-simulator/src/main/resources/preset_registration/SI-test-fabric-conf/aai_filter_service_instance_by_name_test_fabric_conf.json
index 0a0f8e5..70d8b59 100644
--- a/vid-ext-services-simulator/src/main/resources/preset_registration/SI-network-vl/aai_filter_service_instance_by_id_network-vl .json
+++ b/vid-ext-services-simulator/src/main/resources/preset_registration/SI-test-fabric-conf/aai_filter_service_instance_by_name_test_fabric_conf.json
@@ -4,7 +4,7 @@
     "path": "/aai/v../search/nodes-query",
     "queryParams": {
       "search-node-type": "service-instance",
-      "filter": "service-instance-id:EQUALS:d198cc45-158b-480e-8d2c-03943c51268e"
+      "filter": "service-instance-name:EQUALS:test_fabric_config"
     }
   },
   "simulatorResponse": {
@@ -13,7 +13,7 @@
       "result-data": [
         {
           "resource-type": "service-instance",
-          "resource-link": "/aai/v11/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/Mobility/service-instances/service-instance/d198cc45-158b-480e-8d2c-03943c51268e"
+          "resource-link": "/aai/v11/business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d891234/service-subscriptions/service-subscription/VIRTUAL%20USP/service-instances/service-instance/c187e9fe-40c3-4862-b73e-84ff056205f61234"
         }
       ]
     }
diff --git a/vid-ext-services-simulator/src/main/resources/preset_registration/SI-test-fabric-conf/aai_named_query_for_view_edit_test_fabric_conf.json b/vid-ext-services-simulator/src/main/resources/preset_registration/SI-test-fabric-conf/aai_named_query_for_view_edit_test_fabric_conf.json
new file mode 100644
index 0000000..917ef4d
--- /dev/null
+++ b/vid-ext-services-simulator/src/main/resources/preset_registration/SI-test-fabric-conf/aai_named_query_for_view_edit_test_fabric_conf.json
@@ -0,0 +1,65 @@
+{
+  "simulatorRequest": {
+    "method": "POST",
+    "path": "/aai/search/named-query",
+    "body": {
+      "instance-filters": {
+        "instance-filter": [
+          {
+            "customer": {
+              "global-customer-id": "e433710f-9217-458d-a79d-1c7aff376d891234"
+            },
+            "service-instance": {
+              "service-instance-id": "c187e9fe-40c3-4862-b73e-84ff056205f61234"
+            },
+            "service-subscription": {
+              "service-type": "TYLER SILVIA"
+            }
+          }
+        ]
+      },
+      "query-parameters": {
+        "named-query": {
+          "named-query-uuid": "0367193e-c785-4d5f-9cb8-7bc89dc9ddb7"
+        }
+      }
+    }
+  },
+  "simulatorResponse": {
+    "responseCode": 200,
+    "body": {
+      "inventory-response-item": [
+        {
+          "model-name": "0eOHz2Yh8WJcBYzKy0791234",
+          "service-instance": {
+            "service-instance-id": "c187e9fe-40c3-4862-b73e-84ff056205f61234",
+            "service-instance-name": "test_fabric_config"
+          },
+          "extra-properties": {},
+          "inventory-response-items": {
+            "inventory-response-item": [
+              {
+                "model-name": "Fabric-Configuration-Instance",
+                "configuration": {
+                  "configuration-id": "1234-fabric-config-LB1113",
+                  "configuration-name": "dummy_instance",
+                  "configuration-type": "fabric-configuration-type-1234",
+                  "configuration-sub-type": "fabric-configuration-sub-type-1234",
+                  "model-invariant-id": "model-invariant-id-1234",
+                  "model-version-id": "model-version-id-1234",
+                  "orchestration-status": "Assigned",
+                  "operational-status": "",
+                  "configuration-selflink": "",
+                  "model-customization-id": "model-customization-id-1234",
+                  "resource-version": "1504038855716"
+                },
+                "extra-properties": {
+                }
+              }
+            ]
+          }
+        }
+      ]
+    }
+  }
+}
diff --git a/vid-ext-services-simulator/src/main/resources/preset_registration/SI-test-fabric-conf/get_sdc_catalog_services_fabric_conf.json b/vid-ext-services-simulator/src/main/resources/preset_registration/SI-test-fabric-conf/get_sdc_catalog_services_fabric_conf.json
new file mode 100644
index 0000000..4ce4612
--- /dev/null
+++ b/vid-ext-services-simulator/src/main/resources/preset_registration/SI-test-fabric-conf/get_sdc_catalog_services_fabric_conf.json
@@ -0,0 +1,38 @@
+[
+  {
+    "simulatorRequest": {
+      "method": "GET",
+      "path": "/sdc/v1/catalog/services/12344bb4-a416-4b4e-997e-0059973630b9/toscaModel"
+    },
+    "simulatorResponse": {
+      "responseCode": 200,
+      "file": "service-fabric-configuration.zip"
+    }
+  },
+  {
+    "simulatorRequest": {
+      "method": "GET",
+      "path": "/sdc/v1/catalog/services/12344bb4-a416-4b4e-997e-0059973630b9/metadata"
+    },
+    "simulatorResponse": {
+      "responseCode": 200,
+      "responseHeaders": {
+        "Content-Type": "application/json"
+      },
+      "body": {
+        "uuid": "12344bb4-a416-4b4e-997e-0059973630b9",
+        "invariantUUID": "12343f9e-3244-4d8f-a8e0-0e5d7a29eda9",
+        "name": "PASQUALE vMX vPE_BV Service 488",
+        "version": "1.0",
+        "toscaModelURL": "./service-fabric-configuration.zip",
+        "category": "Emanuel",
+        "lifecycleState": "CERTIFIED",
+        "lastUpdaterUserId": "rg276b",
+        "lastUpdaterFullName": null,
+        "distributionStatus": "DISTRIBUTED",
+        "artifacts": null,
+        "resources": null
+      }
+    }
+  }
+]
\ No newline at end of file
diff --git a/vid-ext-services-simulator/src/main/resources/preset_registration/SI-test-sssdad/aai_named_query_for_view_edit_test_sssdad.json b/vid-ext-services-simulator/src/main/resources/preset_registration/SI-test-sssdad/aai_named_query_for_view_edit_test_sssdad.json
index e283e87..8fdd8b1 100644
--- a/vid-ext-services-simulator/src/main/resources/preset_registration/SI-test-sssdad/aai_named_query_for_view_edit_test_sssdad.json
+++ b/vid-ext-services-simulator/src/main/resources/preset_registration/SI-test-sssdad/aai_named_query_for_view_edit_test_sssdad.json
@@ -13,7 +13,7 @@
               "service-instance-id": "c187e9fe-40c3-4862-b73e-84ff056205f6"
             },
             "service-subscription": {
-              "service-type": "VIRTUAL USP"
+              "service-type": "TYLER SILVIA"
             }
           }
         ]
diff --git a/vid-ext-services-simulator/src/main/resources/preset_registration/SI-test-sssdad/get_sdc_catalog_services_pm1111.json b/vid-ext-services-simulator/src/main/resources/preset_registration/SI-test-sssdad/get_sdc_catalog_services_pm1111.json
index 1058e6d..ff0aac7 100644
--- a/vid-ext-services-simulator/src/main/resources/preset_registration/SI-test-sssdad/get_sdc_catalog_services_pm1111.json
+++ b/vid-ext-services-simulator/src/main/resources/preset_registration/SI-test-sssdad/get_sdc_catalog_services_pm1111.json
@@ -25,7 +25,7 @@
         "name": "Multiple pProbes",
         "version": "1.0",
         "toscaModelURL": "./pm1111.zip",
-        "category": "Mobility",
+        "category": "Emanuel",
         "lifecycleState": "CERTIFIED",
         "lastUpdaterUserId": "rg276b",
         "lastUpdaterFullName": null,
diff --git a/vid-ext-services-simulator/src/main/resources/preset_registration/SI-vid-test-444/aai_named_query_for_view_edit.json b/vid-ext-services-simulator/src/main/resources/preset_registration/SI-vid-test-444/aai_named_query_for_view_edit.json
index a12f487..2f2479a 100644
--- a/vid-ext-services-simulator/src/main/resources/preset_registration/SI-vid-test-444/aai_named_query_for_view_edit.json
+++ b/vid-ext-services-simulator/src/main/resources/preset_registration/SI-vid-test-444/aai_named_query_for_view_edit.json
@@ -13,7 +13,7 @@
               "service-instance-id":"3f93c7cb-2fd0-4557-9514-e189b7b04f9d"
             },
             "service-subscription":{
-              "service-type":"VIRTUAL USP"
+              "service-type":"TYLER SILVIA"
             }
           }
         ]
@@ -41,11 +41,11 @@
           "inventory-response-items":{
             "inventory-response-item":[
               {
-                "model-name":"VID-PCRF-05-15-17",
+                "model-name":"VID-RODERICK-05-15-17",
                 "generic-vnf":{
                   "vnf-id":"c015cc0f-0f37-4488-aabf-53795fd93cd3",
                   "vnf-name":"fsd",
-                  "vnf-type":"1707vidnf/VID-PCRF-05-15-17 0",
+                  "vnf-type":"1707vidnf/VID-RODERICK-05-15-17 0",
                   "service-id":"36b4733a-53f4-4cc8-8ff0-9172e5fc4b8e",
                   "prov-status":"PREPROV",
                   "orchestration-status":"Created",
@@ -134,11 +134,11 @@
                 }
               },
               {
-                "model-name":"VID-PCRF-05-15-17",
+                "model-name":"VID-RODERICK-05-15-17",
                 "generic-vnf":{
                   "vnf-id":"0846287b-65bf-45a6-88f6-6a1af4149fac",
                   "vnf-name":"kjkjk",
-                  "vnf-type":"1707vidnf/VID-PCRF-05-15-17 0",
+                  "vnf-type":"1707vidnf/VID-RODERICK-05-15-17 0",
                   "service-id":"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
                   "prov-status":"PREPROV",
                   "orchestration-status":"Created",
@@ -207,12 +207,12 @@
                 }
               },
               {
-                "model-name":"VID-PCRF-05-15-17",
+                "model-name":"VID-RODERICK-05-15-17",
                 "generic-vnf":{
                   "vnf-id":"9908b762-136f-4b1f-8eb4-ef670ef58bb4",
                   "vnf-name":"uiui",
-                  "vnf-type":"1707vidnf/VID-PCRF-05-15-17 0",
-                  "service-id":"vHNGWaas",
+                  "vnf-type":"1707vidnf/VID-RODERICK-05-15-17 0",
+                  "service-id":"vRosemarie",
                   "prov-status":"PREPROV",
                   "orchestration-status":"Created",
                   "in-maint":false,
@@ -231,11 +231,11 @@
                 }
               },
               {
-                "model-name":"VID-PCRF-05-15-17",
+                "model-name":"VID-RODERICK-05-15-17",
                 "generic-vnf":{
                   "vnf-id":"543931f5-e50e-45a2-a69f-ab727e4c7f2f",
                   "vnf-name":"sdfsdfdsf",
-                  "vnf-type":"1707vidnf/VID-PCRF-05-15-17 0",
+                  "vnf-type":"1707vidnf/VID-RODERICK-05-15-17 0",
                   "service-id":"LRSI-OSPF",
                   "prov-status":"PREPROV",
                   "orchestration-status":"Created",
@@ -255,12 +255,12 @@
                 }
               },
               {
-                "model-name":"VID-PCRF-05-15-17",
+                "model-name":"VID-RODERICK-05-15-17",
                 "generic-vnf":{
                   "vnf-id":"25e84884-22d5-44c9-8212-cb459f63e0ba",
                   "vnf-name":"sdada",
-                  "vnf-type":"1707vidnf/VID-PCRF-05-15-17 0",
-                  "service-id":"VIPRaaS",
+                  "vnf-type":"1707vidnf/VID-RODERICK-05-15-17 0",
+                  "service-id":"vMuriel",
                   "prov-status":"PREPROV",
                   "orchestration-status":"Created",
                   "in-maint":false,
@@ -279,11 +279,11 @@
                 }
               },
               {
-                "model-name":"VID-PCRF-05-15-17",
+                "model-name":"VID-RODERICK-05-15-17",
                 "generic-vnf":{
                   "vnf-id":"013fb0ba-977b-496c-9faa-7f8e5f083eec",
                   "vnf-name":"gvb",
-                  "vnf-type":"1707vidnf/VID-PCRF-05-15-17 0",
+                  "vnf-type":"1707vidnf/VID-RODERICK-05-15-17 0",
                   "service-id":"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
                   "prov-status":"PREPROV",
                   "orchestration-status":"Created",
@@ -303,11 +303,11 @@
                 }
               },
               {
-                "model-name":"VID-PCRF-05-15-17",
+                "model-name":"VID-RODERICK-05-15-17",
                 "generic-vnf":{
                   "vnf-id":"06914296-cb46-4b62-9453-329a706a6cbb",
                   "vnf-name":"lkllll",
-                  "vnf-type":"1707vidnf/VID-PCRF-05-15-17 0",
+                  "vnf-type":"1707vidnf/VID-RODERICK-05-15-17 0",
                   "service-id":"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
                   "prov-status":"PREPROV",
                   "orchestration-status":"Created",
@@ -327,11 +327,11 @@
                 }
               },
               {
-                "model-name":"VID-PCRF-05-15-17",
+                "model-name":"VID-RODERICK-05-15-17",
                 "generic-vnf":{
                   "vnf-id":"c55da606-cf38-42c7-bc3c-be8e23b19299",
                   "vnf-name":"ss",
-                  "vnf-type":"1707vidnf/VID-PCRF-05-15-17 0",
+                  "vnf-type":"1707vidnf/VID-RODERICK-05-15-17 0",
                   "service-id":"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
                   "prov-status":"PREPROV",
                   "orchestration-status":"Created",
@@ -351,11 +351,11 @@
                 }
               },
               {
-                "model-name":"VID-PCRF-05-15-17",
+                "model-name":"VID-RODERICK-05-15-17",
                 "generic-vnf":{
                   "vnf-id":"27cc0914-70be-453e-b552-3df6b1d6cda9",
                   "vnf-name":"yh",
-                  "vnf-type":"1707vidnf/VID-PCRF-05-15-17 0",
+                  "vnf-type":"1707vidnf/VID-RODERICK-05-15-17 0",
                   "service-id":"db171b8f-115c-4992-a2e3-ee04cae357e0",
                   "prov-status":"PREPROV",
                   "orchestration-status":"Created",
diff --git a/vid-ext-services-simulator/src/main/resources/preset_registration/SI-vid-test-444/get_sdc_catalog_services_vid-test-444.json b/vid-ext-services-simulator/src/main/resources/preset_registration/SI-vid-test-444/get_sdc_catalog_services_vid-test-444.json
index 80d4d7b..8f799c6 100644
--- a/vid-ext-services-simulator/src/main/resources/preset_registration/SI-vid-test-444/get_sdc_catalog_services_vid-test-444.json
+++ b/vid-ext-services-simulator/src/main/resources/preset_registration/SI-vid-test-444/get_sdc_catalog_services_vid-test-444.json
@@ -25,7 +25,7 @@
         "name": "Demo Service",
         "version": "1.0",
         "toscaModelURL": "./vid-test-444-demo-csar.zip",
-        "category": "Mobility",
+        "category": "Emanuel",
         "lifecycleState": "CERTIFIED",
         "lastUpdaterUserId": "rg276b",
         "lastUpdaterFullName": null,
diff --git a/vid-ext-services-simulator/src/main/resources/preset_registration/aai_get_subscribers.json b/vid-ext-services-simulator/src/main/resources/preset_registration/aai_get_subscribers.json
index 225bb36..3bf1ded 100644
--- a/vid-ext-services-simulator/src/main/resources/preset_registration/aai_get_subscribers.json
+++ b/vid-ext-services-simulator/src/main/resources/preset_registration/aai_get_subscribers.json
@@ -12,26 +12,26 @@
     "body": {
       "customer":[
         {
-          "global-customer-id":"MSO_1610_ST",
-          "subscriber-name":"MSO_1610_ST",
+          "global-customer-id":"CAR_2020_ER",
+          "subscriber-name":"CAR_2020_ER",
           "subscriber-type":"INFRA",
           "resource-version":"1494001902987"
         },
         {
           "global-customer-id":"21014aa2-526b-11e6-beb8-9e71128cae77",
-          "subscriber-name":"PACKET CORE",
+          "subscriber-name":"JULIO ERICKSON",
           "subscriber-type":"INFRA",
           "resource-version":"1494001776295"
         },
         {
           "global-customer-id":"DHV1707-TestSubscriber-2",
-          "subscriber-name":"ICORE CORE",
+          "subscriber-name":"DALE BRIDGES",
           "subscriber-type":"INFRA",
           "resource-version":"1498751754450"
         },
         {
           "global-customer-id":"DHV1707-TestSubscriber-1",
-          "subscriber-name":"PACKET1 CORE",
+          "subscriber-name":"LLOYD BRIDGES",
           "subscriber-type":"INFRA",
           "resource-version":"1498595633607"
         },
@@ -48,56 +48,56 @@
           "resource-version":"1494001970225"
         },
         {
-          "global-customer-id":"DHV1802-TestSub-PWT-102",
-          "subscriber-name":"DHV1802-TestSub-PWT-102",
+          "global-customer-id":"ERICA5779-TestSub-PWT-102",
+          "subscriber-name":"ERICA5779-TestSub-PWT-102",
           "subscriber-type":"INFRA",
           "resource-version":"1508852495058"
         },
         {
-          "global-customer-id":"DHV1802-TestSub-PWT-101",
-          "subscriber-name":"DHV1802-TestSub-PWT-101",
+          "global-customer-id":"ERICA5779-TestSub-PWT-101",
+          "subscriber-name":"ERICA5779-TestSub-PWT-101",
           "subscriber-type":"INFRA",
           "resource-version":"1508179953733"
         },
         {
           "global-customer-id":"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
-          "subscriber-name":"Mobility",
+          "subscriber-name":"Emanuel",
           "subscriber-type":"INFRA",
           "resource-version":"1494001894192"
         },
         {
-          "global-customer-id":"DHV1802-Subscriber-4",
-          "subscriber-name":"DHV1802-Subscriber-5",
+          "global-customer-id":"ERICA5779-Subscriber-4",
+          "subscriber-name":"ERICA5779-Subscriber-5",
           "subscriber-type":"INFRA",
           "resource-version":"1509134064531"
         },
         {
-          "global-customer-id":"DHV1802-TestSub-PWT-103",
-          "subscriber-name":"DHV1802-TestSub-PWT-103",
+          "global-customer-id":"ERICA5779-TestSub-PWT-103",
+          "subscriber-name":"ERICA5779-TestSub-PWT-103",
           "subscriber-type":"INFRA",
           "resource-version":"1509045503736"
         },
         {
-          "global-customer-id":"DHV1802-Subscriber-2",
-          "subscriber-name":"DHV1802-Subscriber-2",
+          "global-customer-id":"ERICA5779-Subscriber-2",
+          "subscriber-name":"ERICA5779-Subscriber-2",
           "subscriber-type":"INFRA",
           "resource-version":"1509122065439"
         },
         {
           "global-customer-id":"e433710f-9217-458d-a79d-1c7aff376d89",
-          "subscriber-name":"USP VOICE",
+          "subscriber-name":"SILVIA ROBBINS",
           "subscriber-type":"INFRA",
           "resource-version":"1494001938080"
         },
         {
-          "global-customer-id":"DHV1802-Subscriber-3",
-          "subscriber-name":"DHV1802-Subscriber-3",
+          "global-customer-id":"ERICA5779-Subscriber-3",
+          "subscriber-name":"ERICA5779-Subscriber-3",
           "subscriber-type":"INFRA",
           "resource-version":"1509122759407"
         },
         {
           "global-customer-id":"31739f3e-526b-11e6-beb8-9e71128cae77",
-          "subscriber-name":"FIREWALL/MISC",
+          "subscriber-name":"CRAIG/ROBERTS",
           "subscriber-type":"INFRA",
           "resource-version":"1494001772223"
         }
diff --git a/vid-ext-services-simulator/src/main/resources/preset_registration/changeManagement/get_aai_sub_details.json b/vid-ext-services-simulator/src/main/resources/preset_registration/changeManagement/get_aai_sub_details.json
index 567a0f5..07e11c6 100644
--- a/vid-ext-services-simulator/src/main/resources/preset_registration/changeManagement/get_aai_sub_details.json
+++ b/vid-ext-services-simulator/src/main/resources/preset_registration/changeManagement/get_aai_sub_details.json
@@ -10,13 +10,13 @@
     "responseCode": 200,
 	"body": {
       "global-customer-id":"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
-      "subscriber-name":"Mobility",
+      "subscriber-name":"Emanuel",
       "subscriber-type":"INFRA",
       "resource-version":"1494255056308",
       "service-subscriptions":{
         "service-subscription":[
           {
-            "service-type":"vFlowLogic",
+            "service-type":"vRichardson",
             "resource-version":"1501700976809",
             "service-instances":{
               "service-instance":[
@@ -45,7 +45,7 @@
             "is-permitted":false
           },
           {
-            "service-type":"Mobility",
+            "service-type":"Emanuel",
             "resource-version":"1505402148533",
             "service-instances":{
               "service-instance":[
@@ -81,7 +81,7 @@
                 },
                 {
                   "service-instance-id":"be3f0f35-0cd6-4b64-a9a1-ef66ebf2df38",
-                  "service-instance-name":"mdns_2017_1011_sb063v_1024",
+                  "service-instance-name":"CHARLOTTE_2017_1011_sb063v_1024",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1508858365648",
@@ -91,7 +91,7 @@
                 },
                 {
                   "service-instance-id":"9fb6d4cd-6d8e-41d6-afcf-37d151df1976",
-                  "service-instance-name":"zrdm_Mobility_Service_297772_kk364s_1010_1400",
+                  "service-instance-name":"zrdm_Emanuel_Service_297772_kk364s_1010_1400",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1507658384805",
@@ -101,7 +101,7 @@
                 },
                 {
                   "service-instance-id":"bbbcbe28-850f-42a5-8f46-8bd2a30c3014",
-                  "service-instance-name":"mdns_2017_1011_kk364s",
+                  "service-instance-name":"CHARLOTTE_2017_1011_kk364s",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1508962475505",
@@ -111,7 +111,7 @@
                 },
                 {
                   "service-instance-id":"fd533b88-9e23-4636-8a32-3d2bf24db80b",
-                  "service-instance-name":"Mobility_Service_297772",
+                  "service-instance-name":"Emanuel_Service_297772",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1505500142924",
@@ -121,7 +121,7 @@
                 },
                 {
                   "service-instance-id":"14cfc148-ff07-49a3-a4e2-0aa5ce237624",
-                  "service-instance-name":"rdm5b_mdns_2017_1011_IST_Service_kk364s",
+                  "service-instance-name":"olson5b_CHARLOTTE_2017_1011_IST_Service_kk364s",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1509122521715",
@@ -161,7 +161,7 @@
                 },
                 {
                   "service-instance-id":"3afa7504-be8c-4fb1-b6c2-071f78faee18",
-                  "service-instance-name":"mDNS_preload_1710_0914_01",
+                  "service-instance-name":"CHARLOTTE_preload_1710_0914_01",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1506538704860",
@@ -191,7 +191,7 @@
                 },
                 {
                   "service-instance-id":"18094982-779d-48b7-ab75-93da74944583",
-                  "service-instance-name":"rdm5_mdns_2017_1011",
+                  "service-instance-name":"olson5_CHARLOTTE_2017_1011",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1509045878842",
@@ -241,7 +241,7 @@
                 },
                 {
                   "service-instance-id":"f032606a-5add-4a12-87f7-4df1f0734594",
-                  "service-instance-name":"Zmtn6_Mobility_Service_297772_kk364s_1010_1130",
+                  "service-instance-name":"Zmtn6_Emanuel_Service_297772_kk364s_1010_1130",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1507649564599",
@@ -281,7 +281,7 @@
                 },
                 {
                   "service-instance-id":"0d9d1292-f2bb-4a43-95fc-c9e1e4e9c510",
-                  "service-instance-name":"CR_SVC_Mobility_Service_297772_ss616y_09_28",
+                  "service-instance-name":"CR_SVC_Emanuel_Service_297772_ss616y_09_28",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1506539863926",
@@ -301,7 +301,7 @@
                 },
                 {
                   "service-instance-id":"076bf40a-7eca-4412-ab6e-5de4cf598256",
-                  "service-instance-name":"CService_mDNS_preload_1710_0914_1110",
+                  "service-instance-name":"CService_CHARLOTTE_preload_1710_0914_1110",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1507752734878",
@@ -324,7 +324,7 @@
             "is-permitted":false
           },
           {
-            "service-type":"vBNG",
+            "service-type":"vJamie",
             "resource-version":"1498068165053",
             "service-instances":{
               "service-instance":[
@@ -410,7 +410,7 @@
                 },
                 {
                   "service-instance-id":"7492cc2b-facb-4b81-abbe-a35cd4188fd7",
-                  "service-instance-name":"crSVC_Mobility_Service_297772_ss616y_09_26",
+                  "service-instance-name":"crSVC_Emanuel_Service_297772_ss616y_09_26",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1506440095410",
@@ -479,7 +479,7 @@
                 },
                 {
                   "service-instance-id":"e98d2d5d-ffec-4eee-b32a-229e94ec8b24",
-                  "service-instance-name":"mDNS_1710_preload_test_Svc_01_PB",
+                  "service-instance-name":"CHARLOTTE_1710_preload_test_Svc_01_PB",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1505233873380",
@@ -489,7 +489,7 @@
                 },
                 {
                   "service-instance-id":"258a043f-d8bd-46e8-a5f1-1118da623347",
-                  "service-instance-name":"HnportalSriovProviderNet3_4",
+                  "service-instance-name":"WILKINSSriovProviderNet3_4",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1506021716378",
@@ -509,7 +509,7 @@
                 },
                 {
                   "service-instance-id":"a8ab2c37-db0c-4dca-99f5-8d7a99dc6bf5",
-                  "service-instance-name":"mDNS_1710_preload_test_Svc_PB_02",
+                  "service-instance-name":"CHARLOTTE_1710_preload_test_Svc_PB_02",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1506367121901",
@@ -522,7 +522,7 @@
             "is-permitted":false
           },
           {
-            "service-type":"Nimbus",
+            "service-type":"Kennedy",
             "resource-version":"1509369877126",
             "service-instances":{
               "service-instance":[
@@ -538,7 +538,7 @@
                 },
                 {
                   "service-instance-id":"d93fa084-80f4-4900-ba57-8b736db3271b",
-                  "service-instance-name":"mDNS_preload_1710_0914_1024",
+                  "service-instance-name":"CHARLOTTE_preload_1710_0914_1024",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1508876558729",
@@ -548,7 +548,7 @@
                 },
                 {
                   "service-instance-id":"123466fa-e678-439e-a89f-29bdb2747d13",
-                  "service-instance-name":"MDNS_NETWORK_OAM_ISTinE2E",
+                  "service-instance-name":"CHARLOTTE_NETWORK_OAM_ISTinE2E",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1509557184342",
@@ -558,7 +558,7 @@
                 },
                 {
                   "service-instance-id":"8a4674e2-fbca-4857-af78-e611b1574f5a",
-                  "service-instance-name":"mdns_pa2396_1027",
+                  "service-instance-name":"CHARLOTTE_pa2396_1027",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1509045174529",
@@ -568,7 +568,7 @@
                 },
                 {
                   "service-instance-id":"75442b9d-e3de-4311-bfd8-b8bed4541742",
-                  "service-instance-name":"rdm5b_mdns_2017_1011_kk364s_2910",
+                  "service-instance-name":"olson5b_CHARLOTTE_2017_1011_kk364s_2910",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1509215537269",
@@ -578,7 +578,7 @@
                 },
                 {
                   "service-instance-id":"f022b8c0-9796-4389-90ae-5c46df9e8574",
-                  "service-instance-name":"PCRF_1610_2.4_SVC",
+                  "service-instance-name":"RODERICK_1610_2.4_SVC",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1494255148885",
@@ -598,7 +598,7 @@
                 },
                 {
                   "service-instance-id":"25158088-c7b1-4898-b511-de0c78e093c9",
-                  "service-instance-name":"MOBT-Nimbus-3-Sprint-1-Svc",
+                  "service-instance-name":"MOBT-Kennedy-3-Sprint-1-Svc",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1506094357348",
@@ -608,7 +608,7 @@
                 },
                 {
                   "service-instance-id":"b84af18a-c01a-4408-8e3c-74517a94af6f",
-                  "service-instance-name":"Nimbus-IXLA-0705-Svc",
+                  "service-instance-name":"Kennedy-IXLA-0705-Svc",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1506715142169",
@@ -628,7 +628,7 @@
                 },
                 {
                   "service-instance-id":"fff0b350-ffaa-46ed-b927-8e82b3497af8",
-                  "service-instance-name":"mDNS-1710-AF-SVC",
+                  "service-instance-name":"CHARLOTTE-1710-AF-SVC",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1506435654274",
@@ -638,7 +638,7 @@
                 },
                 {
                   "service-instance-id":"77d79cda-f8f4-4a9e-80d2-3199fefe6eb4",
-                  "service-instance-name":"Nimbus_LDSA_0705_Svc",
+                  "service-instance-name":"Kennedy_LDSA_0705_Svc",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1499869842847",
@@ -648,7 +648,7 @@
                 },
                 {
                   "service-instance-id":"cedac8e7-43ef-47a9-ace6-90aadafdc01a",
-                  "service-instance-name":"Mobility-Ntwking-Svc-Model",
+                  "service-instance-name":"Emanuel-Ntwking-Svc-Model",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1505507866717",
@@ -658,7 +658,7 @@
                 },
                 {
                   "service-instance-id":"b287a10e-6dcb-402e-87bf-fe78fdcc54cf",
-                  "service-instance-name":"zrdm5b_mdns_2017_1011_kk364s_1410_1205",
+                  "service-instance-name":"zolson5b_CHARLOTTE_2017_1011_kk364s_1410_1205",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1507997085749",
@@ -668,7 +668,7 @@
                 },
                 {
                   "service-instance-id":"2ef18b98-b026-4a77-b0e9-71d4e9a1a0ac",
-                  "service-instance-name":"mdns_createServiceInstance",
+                  "service-instance-name":"CHARLOTTE_createServiceInstance",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1508165923307",
@@ -678,7 +678,7 @@
                 },
                 {
                   "service-instance-id":"ab8bcc6c-3bc8-4f0e-8100-5d3bbdf5d8de",
-                  "service-instance-name":"mdns_2017_1011_Create_SerInstance",
+                  "service-instance-name":"CHARLOTTE_2017_1011_Create_SerInstance",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1508082674808",
@@ -688,7 +688,7 @@
                 },
                 {
                   "service-instance-id":"b41a499d-a2e1-4e9e-8717-ee1167bd43e9",
-                  "service-instance-name":"Service_Nimbus_Demo_01",
+                  "service-instance-name":"Service_Kennedy_Demo_01",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1494255135772",
@@ -698,7 +698,7 @@
                 },
                 {
                   "service-instance-id":"af913107-ddea-425d-ab84-886b1a754bd1",
-                  "service-instance-name":"Nimbus_IXLT_0705_Svc",
+                  "service-instance-name":"Kennedy_IXLT_0705_Svc",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1500051698402",
@@ -708,7 +708,7 @@
                 },
                 {
                   "service-instance-id":"ec1eb896-f519-4e71-bec9-ead21fd5d633",
-                  "service-instance-name":"mobility_Service_1011",
+                  "service-instance-name":"emanuel_Service_1011",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1507736303848",
@@ -728,7 +728,7 @@
                 },
                 {
                   "service-instance-id":"66b13cb4-b575-449f-aa45-ffbfe005c7b1",
-                  "service-instance-name":"mDNS_preload_1710_0914",
+                  "service-instance-name":"CHARLOTTE_preload_1710_0914",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1505856078810",
@@ -738,7 +738,7 @@
                 },
                 {
                   "service-instance-id":"870f55a9-692d-45af-970b-7630317b46ea",
-                  "service-instance-name":"Mobisupport_PCRF_Network_Service",
+                  "service-instance-name":"Mobisupport_RODERICK_Network_Service",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1494255152926",
@@ -748,7 +748,7 @@
                 },
                 {
                   "service-instance-id":"abc17093-fad2-41fc-ad30-65985b34bdfc",
-                  "service-instance-name":"rdm5b_mdns_2017_1011_kk364s_2010_1006",
+                  "service-instance-name":"olson5b_CHARLOTTE_2017_1011_kk364s_2010_1006",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1508517379024",
@@ -758,7 +758,7 @@
                 },
                 {
                   "service-instance-id":"b3372b34-2085-40b3-b293-df1e546dddee",
-                  "service-instance-name":"zrdm5bpxmc02_092017_Svc",
+                  "service-instance-name":"zolson5bpxmc02_092017_Svc",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1505937237447",
@@ -778,7 +778,7 @@
                 },
                 {
                   "service-instance-id":"9b24c4e2-6e63-4de5-8a20-741ec8289ae1",
-                  "service-instance-name":"Mobility_Service_297772_pb_1",
+                  "service-instance-name":"Emanuel_Service_297772_pb_1",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1507665028261",
@@ -788,7 +788,7 @@
                 },
                 {
                   "service-instance-id":"ea5650f4-9d80-431e-a177-b6c43fd4ade0",
-                  "service-instance-name":"zrdm_Mobility_Service_297772_kk364s_1110_1045",
+                  "service-instance-name":"zrdm_Emanuel_Service_297772_kk364s_1110_1045",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1507733035901",
@@ -798,7 +798,7 @@
                 },
                 {
                   "service-instance-id":"cd9aa07d-e670-498a-adef-82250a1428a0",
-                  "service-instance-name":"mdns_2017_pa2396_1013",
+                  "service-instance-name":"CHARLOTTE_2017_pa2396_1013",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1507833492086",
@@ -818,7 +818,7 @@
                 },
                 {
                   "service-instance-id":"a15b35f0-81eb-43a7-ad51-a05331e629ca",
-                  "service-instance-name":"Nimbus_FN_Int_Network_Svc",
+                  "service-instance-name":"Kennedy_FN_Int_Network_Svc",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1494255148152",
@@ -828,7 +828,7 @@
                 },
                 {
                   "service-instance-id":"9ad4ac55-a5e0-4b49-95c0-b2d846abf700",
-                  "service-instance-name":"mDNS_preload_1710_0914_100417",
+                  "service-instance-name":"CHARLOTTE_preload_1710_0914_100417",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1507144734087",
@@ -848,7 +848,7 @@
                 },
                 {
                   "service-instance-id":"4183a1b5-6bf0-4446-9c50-01851e8b4f50",
-                  "service-instance-name":"PXMC_Svc",
+                  "service-instance-name":"CORNELIUS_Svc",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1494255148483",
@@ -868,7 +868,7 @@
                 },
                 {
                   "service-instance-id":"e4a7a120-9a19-4757-9d91-41f1dc89a708",
-                  "service-instance-name":"Nimbus_FN_SGI_Network_Svc",
+                  "service-instance-name":"Kennedy_FN_SGI_Network_Svc",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1494255148283",
@@ -898,7 +898,7 @@
                 },
                 {
                   "service-instance-id":"85bfb318-d203-42bd-a13f-e8c7508105df",
-                  "service-instance-name":"mDNS_02-06-2017_Svc",
+                  "service-instance-name":"CHARLOTTE_02-06-2017_Svc",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1494255147914",
@@ -918,7 +918,7 @@
                 },
                 {
                   "service-instance-id":"17901377-cd73-4d92-abc8-b4905e720ae8",
-                  "service-instance-name":"Nimbus_3.0spr1_PCRF_v2.7_Svc",
+                  "service-instance-name":"Kennedy_3.0spr1_RODERICK_v2.7_Svc",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1504819759422",
@@ -928,7 +928,7 @@
                 },
                 {
                   "service-instance-id":"4a55321e-6707-497d-8b06-c4fb1ff065d5",
-                  "service-instance-name":"PXTC_v7_svc_082817",
+                  "service-instance-name":"GRANVILLE_v7_svc_082817",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1504292485665",
@@ -958,7 +958,7 @@
                 },
                 {
                   "service-instance-id":"614e9b44-5388-4a60-a566-35c83ace67b3",
-                  "service-instance-name":"mdns_2017_1011_PB",
+                  "service-instance-name":"CHARLOTTE_2017_1011_PB",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1509739169686",
@@ -978,7 +978,7 @@
                 },
                 {
                   "service-instance-id":"08cdfd4b-9d25-40c8-a8c3-a15a3025d021",
-                  "service-instance-name":"Nimbus_3.1_PCRF_0717_Svc",
+                  "service-instance-name":"Kennedy_3.1_RODERICK_0717_Svc",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1504061752729",
@@ -988,7 +988,7 @@
                 },
                 {
                   "service-instance-id":"0c916c04-d2ca-43f3-90f8-e0266b3e97c8",
-                  "service-instance-name":"mdns_pa23961111",
+                  "service-instance-name":"CHARLOTTE_pa23961111",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1508338875497",
@@ -998,7 +998,7 @@
                 },
                 {
                   "service-instance-id":"ead68f27-e78f-417a-9d74-d7af3871c406",
-                  "service-instance-name":"mdns_2017_1011_oh22u_1103",
+                  "service-instance-name":"CHARLOTTE_2017_1011_oh22u_1103",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1509728889955",
@@ -1008,7 +1008,7 @@
                 },
                 {
                   "service-instance-id":"54ba3628-9ee5-4b32-8a2a-3abf001bed4e",
-                  "service-instance-name":"mdns_2017_1011_oh22u_20171103",
+                  "service-instance-name":"CHARLOTTE_2017_1011_oh22u_20171103",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1509730482946",
@@ -1018,7 +1018,7 @@
                 },
                 {
                   "service-instance-id":"9ecab3e4-c4f4-4c46-a46e-9be98f89a664",
-                  "service-instance-name":"mdns_createservice_pa23961026",
+                  "service-instance-name":"CHARLOTTE_createservice_pa23961026",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1509032288508",
@@ -1028,7 +1028,7 @@
                 },
                 {
                   "service-instance-id":"11d25472-cbfb-4e10-a1f2-bea25d7c0823",
-                  "service-instance-name":"mdns_2017_1011_v4",
+                  "service-instance-name":"CHARLOTTE_2017_1011_v4",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1508054069141",
@@ -1038,7 +1038,7 @@
                 },
                 {
                   "service-instance-id":"8c88375a-fe46-4f03-9729-cb2850d8e122",
-                  "service-instance-name":"mdns_2017_1011_ServiceInstance",
+                  "service-instance-name":"CHARLOTTE_2017_1011_ServiceInstance",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1508097853649",
@@ -1048,7 +1048,7 @@
                 },
                 {
                   "service-instance-id":"f054ce69-a3d0-4061-b6a6-cdb4ea8b4968",
-                  "service-instance-name":"zrdm5b_mdns_2017_1011_kk364s_1014_1700",
+                  "service-instance-name":"zolson5b_CHARLOTTE_2017_1011_kk364s_1014_1700",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1507929319130",
@@ -1068,7 +1068,7 @@
                 },
                 {
                   "service-instance-id":"1abdbf2b-d08d-4f64-b123-7ecca7b8c9aa",
-                  "service-instance-name":"mdns_2017_1011_pa2396",
+                  "service-instance-name":"CHARLOTTE_2017_1011_pa2396",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1507749134293",
@@ -1078,7 +1078,7 @@
                 },
                 {
                   "service-instance-id":"4a7882f6-128f-4303-8a47-9ee44a885965",
-                  "service-instance-name":"zrdm5b_mdns_2017_1011_kk364s_1210",
+                  "service-instance-name":"zolson5b_CHARLOTTE_2017_1011_kk364s_1210",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1507752287291",
@@ -1088,7 +1088,7 @@
                 },
                 {
                   "service-instance-id":"7cdd3596-a11f-4508-87ff-f0a9be0796c9",
-                  "service-instance-name":"Cservice_mdns_2017_1011_sg",
+                  "service-instance-name":"Cservice_CHARLOTTE_2017_1011_sg",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1507755029185",
@@ -1098,7 +1098,7 @@
                 },
                 {
                   "service-instance-id":"a43da41c-1510-4f2c-aef5-435534accf9f",
-                  "service-instance-name":"mdns_2017_1011",
+                  "service-instance-name":"CHARLOTTE_2017_1011",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1507748135880",
@@ -1118,7 +1118,7 @@
                 },
                 {
                   "service-instance-id":"7eef7c51-70fe-4723-b762-bf8de2d4ea52",
-                  "service-instance-name":"Nimbus_LU2_CGWY_Svc",
+                  "service-instance-name":"Kennedy_LU2_CGWY_Svc",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1494255135961",
@@ -1128,7 +1128,7 @@
                 },
                 {
                   "service-instance-id":"745fd172-4a08-4f14-a2d0-a9a0e2a3f725",
-                  "service-instance-name":"rdm5b_mdns_2017_1011_kk364s_1028",
+                  "service-instance-name":"olson5b_CHARLOTTE_2017_1011_kk364s_1028",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1509129321340",
@@ -1158,7 +1158,7 @@
                 },
                 {
                   "service-instance-id":"77b4ba1c-c4df-4e3c-a73a-6c89967086a8",
-                  "service-instance-name":"zrdm5b_mdns_2017_1011_kk364s",
+                  "service-instance-name":"zolson5b_CHARLOTTE_2017_1011_kk364s",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1507812622773",
@@ -1168,7 +1168,7 @@
                 },
                 {
                   "service-instance-id":"f7f8b3d0-bff3-4e10-b973-18ab33a40cb7",
-                  "service-instance-name":"PXMC_v7_Service_062317",
+                  "service-instance-name":"CORNELIUS_v7_Service_062317",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1503434415225",
@@ -1188,7 +1188,7 @@
                 },
                 {
                   "service-instance-id":"a8372edb-c2ff-4008-a5d1-1e790873d92f",
-                  "service-instance-name":"mDNS_Service_New_HEAT",
+                  "service-instance-name":"CHARLOTTE_Service_New_HEAT",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1501704876346",
@@ -1198,7 +1198,7 @@
                 },
                 {
                   "service-instance-id":"7a9e9d7a-820a-46df-8cc9-79ba677fbf70",
-                  "service-instance-name":"mDNS_1710_preload_test_Svc",
+                  "service-instance-name":"CHARLOTTE_1710_preload_test_Svc",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1505319453315",
@@ -1208,7 +1208,7 @@
                 },
                 {
                   "service-instance-id":"f195837b-ef28-42c3-8dea-47ad37eaed95",
-                  "service-instance-name":"mDNS_preload_1710_0914_0920",
+                  "service-instance-name":"CHARLOTTE_preload_1710_0914_0920",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1505964829466",
@@ -1238,7 +1238,7 @@
                 },
                 {
                   "service-instance-id":"f2f54623-94b0-4dcb-a381-c58b82229d12",
-                  "service-instance-name":"mdns_2017_1011_CreateSerInstance",
+                  "service-instance-name":"CHARLOTTE_2017_1011_CreateSerInstance",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1508186235886",
@@ -1268,7 +1268,7 @@
                 },
                 {
                   "service-instance-id":"41de54a4-c2d7-41e6-b7e4-0125231e1a75",
-                  "service-instance-name":"mdns_20171014_298940",
+                  "service-instance-name":"CHARLOTTE_20171014_298940",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1507921979277",
@@ -1278,7 +1278,7 @@
                 },
                 {
                   "service-instance-id":"9b3f5b80-7aaf-4c71-9066-79ba0beea6ae",
-                  "service-instance-name":"mdns_298109_serviceinstance_pa2396",
+                  "service-instance-name":"CHARLOTTE_298109_serviceinstance_pa2396",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1507921462300",
@@ -1288,7 +1288,7 @@
                 },
                 {
                   "service-instance-id":"55dabffc-0f6c-424b-afd1-d3a3c515a8b3",
-                  "service-instance-name":"mDNS_20170705_SVC",
+                  "service-instance-name":"CHARLOTTE_20170705_SVC",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1499710772965",
@@ -1298,7 +1298,7 @@
                 },
                 {
                   "service-instance-id":"b49aadf0-1435-468c-b338-1be1f86a1291",
-                  "service-instance-name":"zrdm5b_mdns_2017_1011_kk364s_1310",
+                  "service-instance-name":"zolson5b_CHARLOTTE_2017_1011_kk364s_1310",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1507906471665",
@@ -1308,7 +1308,7 @@
                 },
                 {
                   "service-instance-id":"f9b00b35-3cb7-4b6f-9e21-922b4c291e70",
-                  "service-instance-name":"mdns_298109",
+                  "service-instance-name":"CHARLOTTE_298109",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1507907071149",
@@ -1318,7 +1318,7 @@
                 },
                 {
                   "service-instance-id":"203d5521-85e9-46f1-9aa2-df593be5f464",
-                  "service-instance-name":"Nimbus_FN_Cor_Network_Svc",
+                  "service-instance-name":"Kennedy_FN_Cor_Network_Svc",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1494255149671",
@@ -1328,7 +1328,7 @@
                 },
                 {
                   "service-instance-id":"5164424e-5cc0-4050-9cd2-3598d0ed23a3",
-                  "service-instance-name":"Nimbus_FN_HSL_Network_Svc",
+                  "service-instance-name":"Kennedy_FN_HSL_Network_Svc",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1494255149745",
@@ -1338,7 +1338,7 @@
                 },
                 {
                   "service-instance-id":"d750f7d0-8543-4c71-8949-12b1cbbb623f",
-                  "service-instance-name":"Nimbus_FN_Internet_Network_Svc",
+                  "service-instance-name":"Kennedy_FN_Internet_Network_Svc",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1494255150967",
@@ -1358,7 +1358,7 @@
                 },
                 {
                   "service-instance-id":"0d867a3c-66c2-49bb-89b3-a934209f04c9",
-                  "service-instance-name":"RDM5b_mdns_2017_1011_oh222u_10312017",
+                  "service-instance-name":"olson5b_CHARLOTTE_2017_1011_oh222u_10312017",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1509393490120",
@@ -1378,7 +1378,7 @@
                 },
                 {
                   "service-instance-id":"0d94c422-73bf-4973-b561-2c9083b7c14c",
-                  "service-instance-name":"mdns_2017_1011_IST_Service",
+                  "service-instance-name":"CHARLOTTE_2017_1011_IST_Service",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1509374793651",
@@ -1388,7 +1388,7 @@
                 },
                 {
                   "service-instance-id":"97d698da-4e7b-44b8-8596-f0fed1cb992e",
-                  "service-instance-name":"MDNS_NETWORK_OAM",
+                  "service-instance-name":"CHARLOTTE_NETWORK_OAM",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1509478420584",
@@ -1398,7 +1398,7 @@
                 },
                 {
                   "service-instance-id":"8bafeb61-f9cd-4afb-b7a5-cd786df0c751",
-                  "service-instance-name":"mdns_2017_1011_ServiceCreation_pa23061030",
+                  "service-instance-name":"CHARLOTTE_2017_1011_ServiceCreation_pa23061030",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1509379856680",
@@ -1418,7 +1418,7 @@
                 },
                 {
                   "service-instance-id":"16cd6439-ebd6-46f2-aa14-fcaa9b8c5ce7",
-                  "service-instance-name":"PXTC_02_23_2017_Svc",
+                  "service-instance-name":"GRANVILLE_02_23_2017_Svc",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1494255150076",
@@ -1428,7 +1428,7 @@
                 },
                 {
                   "service-instance-id":"4767ab93-da7b-492c-833f-d063c7452caa",
-                  "service-instance-name":"Nimbus_LDST_0705_Svc",
+                  "service-instance-name":"Kennedy_LDST_0705_Svc",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1501261983060",
@@ -1438,7 +1438,7 @@
                 },
                 {
                   "service-instance-id":"c6fc80c1-de71-4484-86e5-b15ccc7e3432",
-                  "service-instance-name":"mDNS_02-06-2017_Svc_DS_0814",
+                  "service-instance-name":"CHARLOTTE_02-06-2017_Svc_DS_0814",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1502734680482",
@@ -1518,7 +1518,7 @@
                 },
                 {
                   "service-instance-id":"8de54913-279f-406d-8585-e2152222373f",
-                  "service-instance-name":"Nimbus_IXLA_0705_Svc",
+                  "service-instance-name":"Kennedy_IXLA_0705_Svc",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1499963829384",
@@ -1528,7 +1528,7 @@
                 },
                 {
                   "service-instance-id":"f9dcb4e4-a47a-4f6a-b224-5fd3b30a83a0",
-                  "service-instance-name":"Nimbus_SGI_Network_Svc",
+                  "service-instance-name":"Kennedy_SGI_Network_Svc",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1494255148003",
@@ -1538,7 +1538,7 @@
                 },
                 {
                   "service-instance-id":"d5c83af3-4b48-4778-b2c3-07fba2362c79",
-                  "service-instance-name":"Nimbus_FN_OAM_Network_Svc",
+                  "service-instance-name":"Kennedy_FN_OAM_Network_Svc",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1494255148499",
@@ -1548,7 +1548,7 @@
                 },
                 {
                   "service-instance-id":"dce199f8-bb6a-4e99-a861-19b544c5438f",
-                  "service-instance-name":"Mobility_Service_297772_pb",
+                  "service-instance-name":"Emanuel_Service_297772_pb",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1507663693747",
@@ -1568,7 +1568,7 @@
                 },
                 {
                   "service-instance-id":"38811ee9-901a-46e9-8dbd-4a7faceaebd4",
-                  "service-instance-name":"mdns_createinstance",
+                  "service-instance-name":"CHARLOTTE_createinstance",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1508269726756",
@@ -1578,7 +1578,7 @@
                 },
                 {
                   "service-instance-id":"6fcd3f57-51d0-41b2-8825-ad2820253e5c",
-                  "service-instance-name":"Nimbus_Int_Network_Svc",
+                  "service-instance-name":"Kennedy_Int_Network_Svc",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1494255147871",
@@ -1588,7 +1588,7 @@
                 },
                 {
                   "service-instance-id":"5aaebe92-b062-473b-9a0c-017568386d8b",
-                  "service-instance-name":"mdns_createService",
+                  "service-instance-name":"CHARLOTTE_createService",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1508265751686",
@@ -1598,7 +1598,7 @@
                 },
                 {
                   "service-instance-id":"a146b14c-6b06-435e-9c9a-f78cbcad626e",
-                  "service-instance-name":"zrdm5b_mdns_2017_1011_kk364s_",
+                  "service-instance-name":"zolson5b_CHARLOTTE_2017_1011_kk364s_",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1508266016689",
@@ -1611,13 +1611,13 @@
             "is-permitted":true
           },
           {
-            "service-type":"vSEGW",
+            "service-type":"vPorfirio",
             "resource-version":"1494254851983",
             "service-instances":{
               "service-instance":[
                 {
                   "service-instance-id":"5dfa2fc6-5dfe-4db6-ad73-a66e0cb878f4",
-                  "service-instance-name":"SeGW_012417_Svc",
+                  "service-instance-name":"Porfirio_012417_Svc",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1494255147946",
@@ -1627,7 +1627,7 @@
                 },
                 {
                   "service-instance-id":"8e296fb3-0308-4634-9d8e-d715c8365ae7",
-                  "service-instance-name":"vSeGW_07_05_2017_Svc",
+                  "service-instance-name":"vPorfirio_07_05_2017_Svc",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1499698647185",
@@ -1695,7 +1695,7 @@
               "service-instance":[
                 {
                   "service-instance-id":"70ea5910-b338-417e-a3a5-b63e7780bc13",
-                  "service-instance-name":"RDM3_vOTA3_072717_Svc",
+                  "service-instance-name":"olson3_vOTA3_072717_Svc",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1501863709431",
@@ -1754,7 +1754,7 @@
                 },
                 {
                   "service-instance-id":"05427532-2f81-4d56-921f-52645e40dd9a",
-                  "service-instance-name":"Vive2evmme1020",
+                  "service-instance-name":"Vive2evflorence1020",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1494255148467",
@@ -1983,7 +1983,7 @@
                 },
                 {
                   "service-instance-id":"52bdd6f0-3cf4-4607-a0ee-345e5c1ee370",
-                  "service-instance-name":"MNS_Mobility_Network_RDM6B",
+                  "service-instance-name":"MNS_Emanuel_Network_RDM6B",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1509390672331",
@@ -2023,7 +2023,7 @@
                 },
                 {
                   "service-instance-id":"140b40e4-57a2-4b32-82b9-2f8475368f96",
-                  "service-instance-name":"Mobility_Ntwking_vMNS_Svc",
+                  "service-instance-name":"Emanuel_Ntwking_vMNS_Svc",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1507653879814",
@@ -2053,7 +2053,7 @@
                 },
                 {
                   "service-instance-id":"f2ac821f-d0de-44d2-a635-d3c2768f6e32",
-                  "service-instance-name":"Mobility+Proted+Network+Svc",
+                  "service-instance-name":"Emanuel+Proted+Network+Svc",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1494255135548",
@@ -2073,7 +2073,7 @@
                 },
                 {
                   "service-instance-id":"18c26081-ced9-4295-8363-2f5dec967175",
-                  "service-instance-name":"Mobility+HSL+Network+Svc",
+                  "service-instance-name":"Emanuel+HSL+Network+Svc",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1494255135993",
@@ -2083,7 +2083,7 @@
                 },
                 {
                   "service-instance-id":"100c48e7-ff0e-40b3-b34e-fc7789c361ce",
-                  "service-instance-name":"Mobility+Mgmt+Network+Svc",
+                  "service-instance-name":"Emanuel+Mgmt+Network+Svc",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1494255136003",
@@ -2103,7 +2103,7 @@
                 },
                 {
                   "service-instance-id":"dae4013c-8907-4c40-83e2-e4f28227a2cb",
-                  "service-instance-name":"Mobility+Direct+Network+Svc",
+                  "service-instance-name":"Emanuel+Direct+Network+Svc",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1494255136019",
@@ -2156,13 +2156,13 @@
             "is-permitted":false
           },
           {
-            "service-type":"vSCP",
+            "service-type":"vEsmeralda",
             "resource-version":"1501532104695",
             "service-instances":{
               "service-instance":[
                 {
                   "service-instance-id":"b3614fb3-9430-4e21-824a-69b7838a6afa",
-                  "service-instance-name":"vSCP_FW_INT2_20170727_SVC",
+                  "service-instance-name":"vEsmeralda_FW_INT2_20170727_SVC",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1501864174017",
@@ -2182,7 +2182,7 @@
                 },
                 {
                   "service-instance-id":"116dda7f-1728-4276-b976-e750d3e360d6",
-                  "service-instance-name":"vSCP_FW+INT1+Sept+22+Svc",
+                  "service-instance-name":"vEsmeralda_FW+INT1+Sept+22+Svc",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1494255135497",
@@ -2212,7 +2212,7 @@
                 },
                 {
                   "service-instance-id":"ee52ca93-8309-4b66-b935-ffc1a3a5d2b0",
-                  "service-instance-name":"vSCP_INT1_Sept_20_Svc",
+                  "service-instance-name":"vEsmeralda_INT1_Sept_20_Svc",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1500661099821",
@@ -2232,7 +2232,7 @@
                 },
                 {
                   "service-instance-id":"f64cf888-12d7-4d98-900b-d3bb2f2a096c",
-                  "service-instance-name":"vSCP_SVC_INT2_0722",
+                  "service-instance-name":"vEsmeralda_SVC_INT2_0722",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1494255135475",
@@ -2262,7 +2262,7 @@
                 },
                 {
                   "service-instance-id":"6eac6301-8583-4ac0-b1bf-c79eb528c95d",
-                  "service-instance-name":"vSCP_FW_INT2_20170727_SVC_VL",
+                  "service-instance-name":"vEsmeralda_FW_INT2_20170727_SVC_VL",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1505230561129",
@@ -2292,7 +2292,7 @@
                 },
                 {
                   "service-instance-id":"b229a960-06ab-4994-91d1-5ac6a7dac01c",
-                  "service-instance-name":"vSCP_RDM3_Lab_INT2_0712_SVC",
+                  "service-instance-name":"vEsmeralda_RDM3_Lab_INT2_0712_SVC",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1502889690377",
@@ -2351,7 +2351,7 @@
                 },
                 {
                   "service-instance-id":"cd3a9458-12d7-4e08-91cc-3cb1855625ce",
-                  "service-instance-name":"Vive2evscp_vprobe1025",
+                  "service-instance-name":"Vive2evEsmeralda_vprobe1025",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1494255148167",
@@ -2361,7 +2361,7 @@
                 },
                 {
                   "service-instance-id":"9150328a-922b-46e6-81c0-586d31cdf07a",
-                  "service-instance-name":"Vive2evscp_vprobe1025",
+                  "service-instance-name":"Vive2evEsmeralda_vprobe1025",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1494255152546",
@@ -2371,7 +2371,7 @@
                 },
                 {
                   "service-instance-id":"1bc1002b-d12a-4cbb-a977-f21bf9b4a7a9",
-                  "service-instance-name":"viv2vscpe2e1025",
+                  "service-instance-name":"viv2vEsmeraldae2e1025",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1494255152553",
@@ -2461,7 +2461,7 @@
                 },
                 {
                   "service-instance-id":"b06e9f78-398a-466d-af4e-deb66c19bd7d",
-                  "service-instance-name":"Mobility-vprobe-FE-11-2-1-7-Service",
+                  "service-instance-name":"Emanuel-vprobe-FE-11-2-1-7-Service",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1507062871959",
@@ -2474,13 +2474,13 @@
             "is-permitted":false
           },
           {
-            "service-type":"vMMSC",
+            "service-type":"vWINIFRED",
             "resource-version":"1498752217386",
             "service-instances":{
               "service-instance":[
                 {
                   "service-instance-id":"3364befd-0802-4861-99af-47c5c047239b",
-                  "service-instance-name":"HnportalSriovProviderNet_50",
+                  "service-instance-name":"WILKINSSriovProviderNet_50",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1494255148521",
@@ -2500,7 +2500,7 @@
                 },
                 {
                   "service-instance-id":"240f80d8-4b6e-4882-a069-67512dc66888",
-                  "service-instance-name":"HnportalSriovProviderNet_88",
+                  "service-instance-name":"WILKINSSriovProviderNet_88",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1494255148043",
@@ -2510,7 +2510,7 @@
                 },
                 {
                   "service-instance-id":"48e6f4d3-8335-4669-9708-2e972fd2473f",
-                  "service-instance-name":"HnportalSriovProviderNet_77",
+                  "service-instance-name":"WILKINSSriovProviderNet_77",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1494255149448",
@@ -2570,7 +2570,7 @@
                 },
                 {
                   "service-instance-id":"526fe500-b06d-49e9-ac9c-9e305468f7d9",
-                  "service-instance-name":"HnportalSriovProviderNet_89",
+                  "service-instance-name":"WILKINSSriovProviderNet_89",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1494255151379",
@@ -2610,7 +2610,7 @@
                 },
                 {
                   "service-instance-id":"d12538b2-d2f3-4879-87ac-f0b45fc6f84d",
-                  "service-instance-name":"CRSVC_Mobility_Service_297772_ss616y_09_26_17_1",
+                  "service-instance-name":"CRSVC_Emanuel_Service_297772_ss616y_09_26_17_1",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1506440871179",
@@ -2670,7 +2670,7 @@
                 },
                 {
                   "service-instance-id":"804c924a-00fe-40a9-af10-fbaa4ad99390",
-                  "service-instance-name":"vMMSC_Lab2_020217_Svc_Service_0617",
+                  "service-instance-name":"vWINIFRED_Lab2_020217_Svc_Service_0617",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1497721637609",
@@ -2710,7 +2710,7 @@
                 },
                 {
                   "service-instance-id":"1b9e0bf1-13d9-4122-8364-6d94187a6e76",
-                  "service-instance-name":"vMMSC_Lab2_010517_Svc_DS_0714_01",
+                  "service-instance-name":"vWINIFRED_Lab2_010517_Svc_DS_0714_01",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1500063304219",
@@ -2730,7 +2730,7 @@
                 },
                 {
                   "service-instance-id":"97ed0e33-3031-42c7-a4ce-519f3af21132",
-                  "service-instance-name":"HnportalSriovProviderNet_29",
+                  "service-instance-name":"WILKINSSriovProviderNet_29",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1494255148377",
@@ -2740,7 +2740,7 @@
                 },
                 {
                   "service-instance-id":"022b44be-2fe1-465a-b9ad-e9d6c3c89778",
-                  "service-instance-name":"VMMSC_AIC_3.0_Svc",
+                  "service-instance-name":"vWINIFRED_AIC_3.0_Svc",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1495556113481",
@@ -2750,7 +2750,7 @@
                 },
                 {
                   "service-instance-id":"72117a7f-e304-4f59-9ba5-d2b6419caa6b",
-                  "service-instance-name":"HnportalSriovProviderNet_100",
+                  "service-instance-name":"WILKINSSriovProviderNet_100",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1494255148058",
@@ -2770,7 +2770,7 @@
                 },
                 {
                   "service-instance-id":"26031c62-ca38-4427-a773-ee43a172ed3a",
-                  "service-instance-name":"vMMSC_Test_06292017_Svc_0629_ud6361",
+                  "service-instance-name":"vWINIFRED_Test_06292017_Svc_0629_ud6361",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1498782124079",
@@ -2780,7 +2780,7 @@
                 },
                 {
                   "service-instance-id":"d3055874-7e1c-4a3d-b4d1-8ac3e91fcc28",
-                  "service-instance-name":"vMMSC_Test_08182017_Svc_sb063v",
+                  "service-instance-name":"vWINIFRED_Test_08182017_Svc_sb063v",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1503070451727",
@@ -2830,7 +2830,7 @@
                 },
                 {
                   "service-instance-id":"facedbb9-9703-4b61-a04b-d0f23e6a0188",
-                  "service-instance-name":"crSVC_Mobility_Service_297772_ss616y_1",
+                  "service-instance-name":"crSVC_Emanuel_Service_297772_ss616y_1",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1506374487982",
@@ -2880,7 +2880,7 @@
                 },
                 {
                   "service-instance-id":"fd202522-5f89-4ce9-b892-5f75956f93b3",
-                  "service-instance-name":"HnportalSriovProviderNet_112",
+                  "service-instance-name":"WILKINSSriovProviderNet_112",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1494255149987",
@@ -2890,7 +2890,7 @@
                 },
                 {
                   "service-instance-id":"a83695df-061f-4871-80fe-0be5f7113ad0",
-                  "service-instance-name":"HnportalSriovProviderNet_53",
+                  "service-instance-name":"WILKINSSriovProviderNet_53",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1494255148198",
@@ -2900,7 +2900,7 @@
                 },
                 {
                   "service-instance-id":"3d443a66-504d-49d3-967d-5f6523ec2e7b",
-                  "service-instance-name":"HnportalSriovProviderNet_55",
+                  "service-instance-name":"WILKINSSriovProviderNet_55",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1494255148205",
@@ -2910,7 +2910,7 @@
                 },
                 {
                   "service-instance-id":"9365e5c7-bdd6-4f50-a8d2-96d5b3293842",
-                  "service-instance-name":"HnportalSriovProviderNet_123",
+                  "service-instance-name":"WILKINSSriovProviderNet_123",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1494255149295",
@@ -2960,7 +2960,7 @@
                 },
                 {
                   "service-instance-id":"537b6fdd-1753-4be6-8b12-d325eebc3e32",
-                  "service-instance-name":"createService_Mobility_Service_297772_09_28_ss616y",
+                  "service-instance-name":"createService_Emanuel_Service_297772_09_28_ss616y",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1506543405211",
@@ -2970,7 +2970,7 @@
                 },
                 {
                   "service-instance-id":"7f8b4e13-fc46-4b67-b2b7-d6d8226476fe",
-                  "service-instance-name":"x_mdns_2017_1011_CSI",
+                  "service-instance-name":"x_CHARLOTTE_2017_1011_CSI",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1509729899645",
@@ -2980,7 +2980,7 @@
                 },
                 {
                   "service-instance-id":"4ec4f2c8-6f55-4244-aa36-aac847ac048f",
-                  "service-instance-name":"vMMSC+Sept+22+Svc",
+                  "service-instance-name":"vWINIFRED+Sept+22+Svc",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1494255136029",
@@ -3020,7 +3020,7 @@
                 },
                 {
                   "service-instance-id":"3191493c-46cd-40d0-b659-c7d1e5f14bda",
-                  "service-instance-name":"vMMSC_MMS_Lab_3_121416_Svc",
+                  "service-instance-name":"vWINIFRED_MMS_Lab_3_121416_Svc",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1494255152771",
@@ -3040,7 +3040,7 @@
                 },
                 {
                   "service-instance-id":"ee612d09-aa6d-455d-97ad-3259d2098d75",
-                  "service-instance-name":"HnportalSriovProviderNet_58",
+                  "service-instance-name":"WILKINSSriovProviderNet_58",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1494255151334",
@@ -3050,7 +3050,7 @@
                 },
                 {
                   "service-instance-id":"6301180d-d4d8-447d-88f9-37fa585b1502",
-                  "service-instance-name":"vMMSC_AIC_3.0_0622_Svc",
+                  "service-instance-name":"vWINIFRED_AIC_3.0_0622_Svc",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1500335097279",
@@ -3060,7 +3060,7 @@
                 },
                 {
                   "service-instance-id":"a5c57309-c13c-4d93-b849-78857cbc1620",
-                  "service-instance-name":"Mobility_Service_297772_nb5443",
+                  "service-instance-name":"Emanuel_Service_297772_nb5443",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1505761426908",
@@ -3130,7 +3130,7 @@
                 },
                 {
                   "service-instance-id":"faac5e72-5fa0-4a3c-84f9-7f582cb6dac7",
-                  "service-instance-name":"HNPortal_OAM_NET_VTO_2",
+                  "service-instance-name":"WILKINS_OAM_NET_VTO_2",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1494255151970",
@@ -3170,7 +3170,7 @@
                 },
                 {
                   "service-instance-id":"96ebc75f-fb74-4e90-a907-f8e95e12b2f7",
-                  "service-instance-name":"Mobility_Service_297772_DS_0918_01",
+                  "service-instance-name":"Emanuel_Service_297772_DS_0918_01",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1505761575910",
@@ -3200,7 +3200,7 @@
                 },
                 {
                   "service-instance-id":"ec6b2b5b-b3cc-428d-951a-246b5c520f2d",
-                  "service-instance-name":"VMMSC_AIC_3.0_MVM_0612",
+                  "service-instance-name":"vWINIFRED_AIC_3.0_MVM_0612",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1497298262657",
@@ -3210,7 +3210,7 @@
                 },
                 {
                   "service-instance-id":"8eabacfe-c914-4891-9d1c-68f0ecff1944",
-                  "service-instance-name":"VMMSC_AIC_30_Svc",
+                  "service-instance-name":"vWINIFRED_AIC_30_Svc",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1505484796812",
@@ -3230,7 +3230,7 @@
                 },
                 {
                   "service-instance-id":"7d05c5df-e627-43f2-8684-bac0762dacbd",
-                  "service-instance-name":"HnportalSriovProviderNet_98",
+                  "service-instance-name":"WILKINSSriovProviderNet_98",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1494255149640",
@@ -3280,7 +3280,7 @@
                 },
                 {
                   "service-instance-id":"33c37a25-76a7-40fe-b08e-d88384e5654e",
-                  "service-instance-name":"HnportalSriovProviderNet_96",
+                  "service-instance-name":"WILKINSSriovProviderNet_96",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1494255149632",
@@ -3300,7 +3300,7 @@
                 },
                 {
                   "service-instance-id":"d0dd8197-b506-4118-97c9-29fa49af77fd",
-                  "service-instance-name":"vMMSC_Lab2_010517_Svc_DS_0615_01",
+                  "service-instance-name":"vWINIFRED_Lab2_010517_Svc_DS_0615_01",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1497539173826",
@@ -3340,7 +3340,7 @@
                 },
                 {
                   "service-instance-id":"e0aa3f05-1c5d-4205-be72-b4f53c5caf26",
-                  "service-instance-name":"lll_051817_vmme_svc",
+                  "service-instance-name":"lll_051817_vflorence_svc",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1495131287067",
@@ -3350,7 +3350,7 @@
                 },
                 {
                   "service-instance-id":"8514ebd9-b681-47e7-86bc-6c803b672dc4",
-                  "service-instance-name":"vMMSC_Lab2_020217_Svc",
+                  "service-instance-name":"vWINIFRED_Lab2_020217_Svc",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1494255147818",
@@ -3360,7 +3360,7 @@
                 },
                 {
                   "service-instance-id":"d11b6e9b-0c72-4e65-a93e-a94d9c673d05",
-                  "service-instance-name":"vMMSC_Test_06292017_Svc_ds_0720_01",
+                  "service-instance-name":"vWINIFRED_Test_06292017_Svc_ds_0720_01",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1500490381801",
@@ -3370,7 +3370,7 @@
                 },
                 {
                   "service-instance-id":"78f93382-b473-47c9-b921-3beb1e73477e",
-                  "service-instance-name":"vMMSC_Lab2_010707_Svc_SA",
+                  "service-instance-name":"vWINIFRED_Lab2_010707_Svc_SA",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1499368751374",
@@ -3380,7 +3380,7 @@
                 },
                 {
                   "service-instance-id":"512cea94-0ae9-4df5-a670-75fdeb709574",
-                  "service-instance-name":"vMMSC_Lab2_010517_Svc_710",
+                  "service-instance-name":"vWINIFRED_Lab2_010517_Svc_710",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1499701812485",
@@ -3420,7 +3420,7 @@
                 },
                 {
                   "service-instance-id":"8752cea8-ffee-4dcc-8f80-71641ce7017b",
-                  "service-instance-name":"Service_vMMSC_298109_Svc_DS_0913_01",
+                  "service-instance-name":"Service_vWINIFRED_298109_Svc_DS_0913_01",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1505336746682",
@@ -3430,7 +3430,7 @@
                 },
                 {
                   "service-instance-id":"5cd4b31f-17e3-4bc2-8a53-fd1aebfc40c8",
-                  "service-instance-name":"HnportalSriovProviderNet_97",
+                  "service-instance-name":"WILKINSSriovProviderNet_97",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1494255149102",
@@ -3450,7 +3450,7 @@
                 },
                 {
                   "service-instance-id":"5a2cb0c0-e32d-42a9-9a8c-e47ad9dd7978",
-                  "service-instance-name":"HnportalSriovProviderNet_73",
+                  "service-instance-name":"WILKINSSriovProviderNet_73",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1494255149603",
@@ -3460,7 +3460,7 @@
                 },
                 {
                   "service-instance-id":"1664e68e-5323-4d0a-be16-fbf7a973aede",
-                  "service-instance-name":"HnportalSriovProviderNet_82",
+                  "service-instance-name":"WILKINSSriovProviderNet_82",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1494255149782",
@@ -3480,7 +3480,7 @@
                 },
                 {
                   "service-instance-id":"370073cf-89e9-4526-9fc0-dfff468571a8",
-                  "service-instance-name":"SI_vVIGaas_Test_01",
+                  "service-instance-name":"SI_vSalvatore_Test_01",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1494255148452",
@@ -3668,7 +3668,7 @@
                 },
                 {
                   "service-instance-id":"37aa1cd2-decf-41a8-9edb-ed4407898201",
-                  "service-instance-name":"vMMSC_Lab2_010517_Svc_Rollback",
+                  "service-instance-name":"vWINIFRED_Lab2_010517_Svc_Rollback",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1499697119107",
@@ -3711,13 +3711,13 @@
             "is-permitted":false
           },
           {
-            "service-type":"FIRSTNET",
+            "service-type":"LINDSEY",
             "resource-version":"1509387060781",
             "service-instances":{
               "service-instance":[
                 {
                   "service-instance-id":"72745ee0-4236-43a4-a2a7-5156f7d5db4d",
-                  "service-instance-name":"RDM5a_TFNET_CORE_NTWK_Svc",
+                  "service-instance-name":"olson5a_TFNET_CORE_NTWK_Svc",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1494255151745",
@@ -3727,7 +3727,7 @@
                 },
                 {
                   "service-instance-id":"21343700-a9d3-401c-a9cb-d46dacecac8a",
-                  "service-instance-name":"vSAEGW-FN-0630-Svc-RDM5B1",
+                  "service-instance-name":"vSAEGW-FN-0630-Svc-olson5B1",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1508454188209",
@@ -3797,7 +3797,7 @@
                 },
                 {
                   "service-instance-id":"7bb7ea08-d091-433d-b3e5-1e32617b19d7",
-                  "service-instance-name":"APNDNS-1710-SVC-FN-RDM5a",
+                  "service-instance-name":"APNDNS-1710-SVC-FN-olson5a",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1509999807693",
@@ -3840,7 +3840,7 @@
             "is-permitted":false
           },
           {
-            "service-type":"ACTIVE_CHARGE",
+            "service-type":"JOHANNA_SANTOS",
             "resource-version":"1494255101364",
             "service-instances":{
               "service-instance":[
@@ -3859,13 +3859,13 @@
             "is-permitted":false
           },
           {
-            "service-type":"vHSS",
+            "service-type":"vCarroll",
             "resource-version":"1494254877333",
             "service-instances":{
               "service-instance":[
                 {
                   "service-instance-id":"cebf5d96-09d7-4bee-9b5b-c5e116366c5b",
-                  "service-instance-name":"vHSS-EPC-RDM3-Lab-SVC-0921",
+                  "service-instance-name":"vHSS-EPC-olson3-Lab-SVC-0921",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1507211398987",
@@ -3885,7 +3885,7 @@
                 },
                 {
                   "service-instance-id":"99ec97fc-d9c6-47df-b619-b8d51e693b00",
-                  "service-instance-name":"vHSS-RDM3-Lab1-SVC-0803",
+                  "service-instance-name":"vHSS-olson3-Lab1-SVC-0803",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1502120091585",
@@ -3895,7 +3895,7 @@
                 },
                 {
                   "service-instance-id":"86bad36c-e58a-4681-8d6e-9a72caed750e",
-                  "service-instance-name":"vHSS-EPC-RDM3-Lab-SVC-0830",
+                  "service-instance-name":"vHSS-EPC-olson3-Lab-SVC-0830",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1505856441762",
diff --git a/vid-ext-services-simulator/src/main/resources/preset_registration/changeManagement/get_scheduler_details_short.json b/vid-ext-services-simulator/src/main/resources/preset_registration/changeManagement/get_scheduler_details_short.json
index ad4a831..e8f93de 100644
--- a/vid-ext-services-simulator/src/main/resources/preset_registration/changeManagement/get_scheduler_details_short.json
+++ b/vid-ext-services-simulator/src/main/resources/preset_registration/changeManagement/get_scheduler_details_short.json
@@ -5,6 +5,9 @@
   },
   "simulatorResponse": {
     "responseCode": 200,
+    "responseHeaders": {
+      "Content-Type": "application/json"
+    },
     "body": [
       {
         "vnfName": "ctsf0002v",
@@ -52,7 +55,7 @@
         "schedulesId": 0
       },
       {
-        "vnfName": "ZRDM1MMSC0450d9",
+        "vnfName": "Zolson1MMSC0450d9",
         "vnfId": "",
         "status": "Pending Approval",
         "startTime": "2017-10-06T17:12:39Z",
@@ -68,7 +71,7 @@
           "optimizerAttemptsToSchedule": 0,
           "optimizerReturnDateTime": "2017-10-06T17:11:47Z",
           "optimizerTransactionId": "83aec7bf-602f-49eb-9788-bbc33ac550d9",
-          "schedule": "[{\"groupId\":\"\",\"startTime\":\"2017-10-06 17:12:39\",\"finishTime\":\"2017-10-06 17:14:29\",\"latestInstanceStartTime\":\"2017-10-06 17:12:39\",\"node\":[\"ZRDM1MMSC0450d9\"]}]",
+          "schedule": "[{\"groupId\":\"\",\"startTime\":\"2017-10-06 17:12:39\",\"finishTime\":\"2017-10-06 17:14:29\",\"latestInstanceStartTime\":\"2017-10-06 17:12:39\",\"node\":[\"Zolson1MMSC0450d9\"]}]",
           "scheduleId": "83aec7bf-602f-49eb-9788-bbc33ac550d9",
           "scheduleName": "83aec7bf-602f-49eb-9788-bbc33ac550d9",
           "status": "Pending Approval",
@@ -256,7 +259,7 @@
         "schedulesId": 0
       },
       {
-        "vnfName": "ZRDM1MMSC04482c",
+        "vnfName": "Zolson1MMSC04482c",
         "status": "Deleted",
         "groupId": "",
         "policyId": "SNIRO.Config_MS_Demo_TimeLimitAndVerticalTopology_zone",
diff --git a/vid-ext-services-simulator/src/main/resources/preset_registration/changeManagement/get_sdc_catalog_services_2f80c596.json b/vid-ext-services-simulator/src/main/resources/preset_registration/changeManagement/get_sdc_catalog_services_2f80c596.json
index be0a8c5..fb2204c 100644
--- a/vid-ext-services-simulator/src/main/resources/preset_registration/changeManagement/get_sdc_catalog_services_2f80c596.json
+++ b/vid-ext-services-simulator/src/main/resources/preset_registration/changeManagement/get_sdc_catalog_services_2f80c596.json
@@ -25,7 +25,7 @@
         "name": "action-data",
         "version": "1.0",
         "toscaModelURL": "./2f80c596.zip",
-        "category": "Mobility",
+        "category": "Emanuel",
         "lifecycleState": "CERTIFIED",
         "lastUpdaterUserId": "rg276b",
         "lastUpdaterFullName": null,
diff --git a/vid-ext-services-simulator/src/main/resources/preset_registration/changeManagement/get_sdc_catalog_services_83d587e1.json b/vid-ext-services-simulator/src/main/resources/preset_registration/changeManagement/get_sdc_catalog_services_83d587e1.json
index 0bc179c..ca94ed1 100644
--- a/vid-ext-services-simulator/src/main/resources/preset_registration/changeManagement/get_sdc_catalog_services_83d587e1.json
+++ b/vid-ext-services-simulator/src/main/resources/preset_registration/changeManagement/get_sdc_catalog_services_83d587e1.json
@@ -25,7 +25,7 @@
         "name": "test-pnf",
         "version": "1.0",
         "toscaModelURL": "./csar15782222_instantiationTypeMacroWithPnf.zip",
-        "category": "Mobility",
+        "category": "Emanuel",
         "lifecycleState": "CERTIFIED",
         "lastUpdaterUserId": "rg276b",
         "lastUpdaterFullName": null,
diff --git a/vid-ext-services-simulator/src/main/resources/preset_registration/changeManagement/get_service-design-and-creation.json b/vid-ext-services-simulator/src/main/resources/preset_registration/changeManagement/get_service-design-and-creation.json
index ce226e9..f821390 100644
--- a/vid-ext-services-simulator/src/main/resources/preset_registration/changeManagement/get_service-design-and-creation.json
+++ b/vid-ext-services-simulator/src/main/resources/preset_registration/changeManagement/get_service-design-and-creation.json
@@ -19,9 +19,9 @@
             "model-ver":[
               {
                 "model-version-id":"76e908e0-5201-44d2-a3e2-9e6128d05820",
-                "model-name":"mdns_2017_1011",
+                "model-name":"CHARLOTTE_2017_1011",
                 "model-version":"1.0",
-                "model-description":"mdns_2017_1011",
+                "model-description":"CHARLOTTE_2017_1011",
                 "resource-version":"1507747452925",
                 "model-elements":{
                   "model-element":[
@@ -86,9 +86,9 @@
               },
               {
                 "model-version-id":"90caad85-5d5c-4caf-9ddd-c05f6e088ba2",
-                "model-name":"mdns_2017_1011",
+                "model-name":"CHARLOTTE_2017_1011",
                 "model-version":"3.0",
-                "model-description":"mdns_2017_1011",
+                "model-description":"CHARLOTTE_2017_1011",
                 "resource-version":"1507920105086",
                 "model-elements":{
                   "model-element":[
@@ -175,9 +175,9 @@
               },
               {
                 "model-version-id":"afacccf6-397d-45d6-b5ae-94c39734b168",
-                "model-name":"mdns_2017_1011",
+                "model-name":"CHARLOTTE_2017_1011",
                 "model-version":"4.0",
-                "model-description":"mdns_2017_1011",
+                "model-description":"CHARLOTTE_2017_1011",
                 "resource-version":"1509315798030",
                 "model-elements":{
                   "model-element":[
@@ -264,9 +264,9 @@
               },
               {
                 "model-version-id":"b217c612-7fcf-484c-861b-df0a5c4b5bcb",
-                "model-name":"mdns_2017_1011",
+                "model-name":"CHARLOTTE_2017_1011",
                 "model-version":"2.0",
-                "model-description":"mdns_2017_1011",
+                "model-description":"CHARLOTTE_2017_1011",
                 "resource-version":"1507830869475",
                 "model-elements":{
                   "model-element":[
@@ -340,9 +340,9 @@
             "model-ver": [
               {
                 "model-version-id": "0903e1c0-8e03-4936-b5c2-260653b96413",
-                "model-name": "mdns_2017_1011",
+                "model-name": "CHARLOTTE_2017_1011",
                 "model-version": "1.0",
-                "model-description": "mdns_2017_1011",
+                "model-description": "CHARLOTTE_2017_1011",
                 "distribution-status": "DISTRIBUTION_COMPLETE_ERROR",
                 "resource-version": "1507747452925",
                 "model-elements": {
diff --git a/vid-ext-services-simulator/src/main/resources/preset_registration/changeManagement/get_vnf_data_by_globalid_and_service_type.json b/vid-ext-services-simulator/src/main/resources/preset_registration/changeManagement/get_vnf_data_by_globalid_and_service_type.json
index 775587e..2094edd 100644
--- a/vid-ext-services-simulator/src/main/resources/preset_registration/changeManagement/get_vnf_data_by_globalid_and_service_type.json
+++ b/vid-ext-services-simulator/src/main/resources/preset_registration/changeManagement/get_vnf_data_by_globalid_and_service_type.json
@@ -16,10 +16,10 @@
         {
           "id": "3400916992",
           "node-type": "service-instance",
-          "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/66b13cb4-b575-449f-aa45-ffbfe005c7b1",
+          "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/66b13cb4-b575-449f-aa45-ffbfe005c7b1",
           "properties": {
             "service-instance-id": "66b13cb4-b575-449f-aa45-ffbfe005c7b1",
-            "service-instance-name": "mDNS_preload_1710_0914",
+            "service-instance-name": "CHARLOTTE_preload_1710_0914",
             "model-invariant-id": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0",
             "model-version-id": "1525f534-99a2-408f-b847-ff636997d352",
             "resource-version": "1505856078810",
@@ -29,22 +29,22 @@
             {
               "id": "10207440",
               "node-type": "service-subscription",
-              "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic"
+              "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic"
             },
             {
               "id": "3481829392",
               "node-type": "generic-vnf",
-              "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/0c465dd3-4151-4da9-92a2-541bb3174cec"
+              "url": "https://aai.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/0c465dd3-4151-4da9-92a2-541bb3174cec"
             }
           ]
         },
         {
           "id": "3771572432",
           "node-type": "service-instance",
-          "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/f195837b-ef28-42c3-8dea-47ad37eaed95",
+          "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/f195837b-ef28-42c3-8dea-47ad37eaed95",
           "properties": {
             "service-instance-id": "f195837b-ef28-42c3-8dea-47ad37eaed95",
-            "service-instance-name": "mDNS_preload_1710_0914_0920",
+            "service-instance-name": "CHARLOTTE_preload_1710_0914_0920",
             "model-invariant-id": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0",
             "model-version-id": "3915de55-a904-4cc6-8fc3-86f8bc316616",
             "resource-version": "1505964829466",
@@ -54,22 +54,22 @@
             {
               "id": "10207440",
               "node-type": "service-subscription",
-              "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic"
+              "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic"
             },
             {
               "id": "3484520464",
               "node-type": "generic-vnf",
-              "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/c2d2d389-fa00-4fb4-a269-e46d495719e1"
+              "url": "https://aai.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/c2d2d389-fa00-4fb4-a269-e46d495719e1"
             }
           ]
         },
         {
           "id": "3775807704",
           "node-type": "service-instance",
-          "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/9ad4ac55-a5e0-4b49-95c0-b2d846abf700",
+          "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/9ad4ac55-a5e0-4b49-95c0-b2d846abf700",
           "properties": {
             "service-instance-id": "9ad4ac55-a5e0-4b49-95c0-b2d846abf700",
-            "service-instance-name": "mDNS_preload_1710_0914_100417",
+            "service-instance-name": "CHARLOTTE_preload_1710_0914_100417",
             "model-invariant-id": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0",
             "model-version-id": "3915de55-a904-4cc6-8fc3-86f8bc316616",
             "resource-version": "1507144734087",
@@ -79,22 +79,22 @@
             {
               "id": "10207440",
               "node-type": "service-subscription",
-              "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic"
+              "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic"
             },
             {
               "id": "3783459064",
               "node-type": "generic-vnf",
-              "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/54626a59-ec0d-4fa9-b0c2-08d008688165"
+              "url": "https://aai.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/54626a59-ec0d-4fa9-b0c2-08d008688165"
             }
           ]
         },
         {
           "id": "4178862184",
           "node-type": "service-instance",
-          "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/599c7247-b083-447c-b6b1-0cdd5170dfd2",
+          "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/599c7247-b083-447c-b6b1-0cdd5170dfd2",
           "properties": {
             "service-instance-id": "599c7247-b083-447c-b6b1-0cdd5170dfd2",
-            "service-instance-name": "mDNS_preload_1710_0914_1010",
+            "service-instance-name": "CHARLOTTE_preload_1710_0914_1010",
             "model-invariant-id": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0",
             "model-version-id": "3915de55-a904-4cc6-8fc3-86f8bc316616",
             "resource-version": "1507664240411",
@@ -104,22 +104,22 @@
             {
               "id": "10207440",
               "node-type": "service-subscription",
-              "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic"
+              "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic"
             },
             {
               "id": "3892133896",
               "node-type": "generic-vnf",
-              "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/d74503d8-abab-49c6-ba48-a6211eee9b7a"
+              "url": "https://aai.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/d74503d8-abab-49c6-ba48-a6211eee9b7a"
             }
           ]
         },
         {
           "id": "3008335920",
           "node-type": "service-instance",
-          "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/97315a05-e6f3-4c47-ae7e-d850c327aa08",
+          "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/97315a05-e6f3-4c47-ae7e-d850c327aa08",
           "properties": {
             "service-instance-id": "97315a05-e6f3-4c47-ae7e-d850c327aa08",
-            "service-instance-name": "mDNS_preload_1710_0914_0927",
+            "service-instance-name": "CHARLOTTE_preload_1710_0914_0927",
             "model-invariant-id": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0",
             "model-version-id": "3915de55-a904-4cc6-8fc3-86f8bc316616",
             "resource-version": "1506527653053",
@@ -129,23 +129,23 @@
             {
               "id": "10207440",
               "node-type": "service-subscription",
-              "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic"
+              "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic"
             },
             {
               "id": "3418898432",
               "node-type": "generic-vnf",
-              "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/8e5e3ba1-3fe6-4d86-966e-f9f03dab4855"
+              "url": "https://aai.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/8e5e3ba1-3fe6-4d86-966e-f9f03dab4855"
             }
           ]
         },
         {
           "id": "3481829392",
           "node-type": "generic-vnf",
-          "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/0c465dd3-4151-4da9-92a2-541bb3174cec",
+          "url": "https://aai.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/0c465dd3-4151-4da9-92a2-541bb3174cec",
           "properties": {
             "vnf-id": "0c465dd3-4151-4da9-92a2-541bb3174cec",
             "vnf-name": "Eoghan Fausto",
-            "vnf-type": "mDNS preload 1710 0914/mDNS preload 1710 0914 0",
+            "vnf-type": "CHARLOTTE preload 1710 0914/CHARLOTTE preload 1710 0914 0",
             "service-id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
             "prov-status": "PREPROV",
             "orchestration-status": "Created",
@@ -164,38 +164,38 @@
             {
               "id": "3285635208",
               "node-type": "vf-module",
-              "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/0c465dd3-4151-4da9-92a2-541bb3174cec/vf-modules/vf-module/d49713bf-1bff-4eab-bed1-a8f1bb83aa98"
+              "url": "https://aai.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/0c465dd3-4151-4da9-92a2-541bb3174cec/vf-modules/vf-module/d49713bf-1bff-4eab-bed1-a8f1bb83aa98"
             },
             {
               "id": "3441209432",
               "node-type": "vf-module",
-              "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/0c465dd3-4151-4da9-92a2-541bb3174cec/vf-modules/vf-module/b8397fec-cf13-40b3-be8f-7d0912506419"
+              "url": "https://aai.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/0c465dd3-4151-4da9-92a2-541bb3174cec/vf-modules/vf-module/b8397fec-cf13-40b3-be8f-7d0912506419"
             },
             {
               "id": "3687522312",
               "node-type": "vf-module",
-              "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/0c465dd3-4151-4da9-92a2-541bb3174cec/vf-modules/vf-module/fd098a52-09be-4c48-a9e9-a565d1b39db3"
+              "url": "https://aai.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/0c465dd3-4151-4da9-92a2-541bb3174cec/vf-modules/vf-module/fd098a52-09be-4c48-a9e9-a565d1b39db3"
             },
             {
               "id": "3400916992",
               "node-type": "service-instance",
-              "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/66b13cb4-b575-449f-aa45-ffbfe005c7b1"
+              "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/66b13cb4-b575-449f-aa45-ffbfe005c7b1"
             },
             {
               "id": "3477385312",
               "node-type": "vserver",
-              "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/att-aic/rdm3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/8627b971-1032-420f-a044-6802f0ab6976"
+              "url": "https://aai.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/8627b971-1032-420f-a044-6802f0ab6976"
             }
           ]
         },
         {
           "id": "3484520464",
           "node-type": "generic-vnf",
-          "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/c2d2d389-fa00-4fb4-a269-e46d495719e1",
+          "url": "https://aai.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/c2d2d389-fa00-4fb4-a269-e46d495719e1",
           "properties": {
             "vnf-id": "c2d2d389-fa00-4fb4-a269-e46d495719e1",
             "vnf-name": "Odell Romana",
-            "vnf-type": "mDNS preload 1710 0914/mDNS preload 1710 0914 0",
+            "vnf-type": "CHARLOTTE preload 1710 0914/CHARLOTTE preload 1710 0914 0",
             "service-id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
             "prov-status": "PREPROV",
             "orchestration-status": "Created",
@@ -214,58 +214,58 @@
             {
               "id": "3447107680",
               "node-type": "vf-module",
-              "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/c2d2d389-fa00-4fb4-a269-e46d495719e1/vf-modules/vf-module/c4711b5c-742e-4d03-8146-bff763f69fbd"
+              "url": "https://aai.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/c2d2d389-fa00-4fb4-a269-e46d495719e1/vf-modules/vf-module/c4711b5c-742e-4d03-8146-bff763f69fbd"
             },
             {
               "id": "3448307712",
               "node-type": "vf-module",
-              "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/c2d2d389-fa00-4fb4-a269-e46d495719e1/vf-modules/vf-module/0ba3fcdd-0536-4ac7-a9ec-8d8622db7fb2"
+              "url": "https://aai.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/c2d2d389-fa00-4fb4-a269-e46d495719e1/vf-modules/vf-module/0ba3fcdd-0536-4ac7-a9ec-8d8622db7fb2"
             },
             {
               "id": "3692179528",
               "node-type": "vf-module",
-              "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/c2d2d389-fa00-4fb4-a269-e46d495719e1/vf-modules/vf-module/6bb843eb-ef84-43b1-83b4-3154a7f9928c"
+              "url": "https://aai.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/c2d2d389-fa00-4fb4-a269-e46d495719e1/vf-modules/vf-module/6bb843eb-ef84-43b1-83b4-3154a7f9928c"
             },
             {
               "id": "3771588816",
               "node-type": "vf-module",
-              "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/c2d2d389-fa00-4fb4-a269-e46d495719e1/vf-modules/vf-module/a4c008c6-cac0-4e3f-928f-90fa37dc8c4b"
+              "url": "https://aai.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/c2d2d389-fa00-4fb4-a269-e46d495719e1/vf-modules/vf-module/a4c008c6-cac0-4e3f-928f-90fa37dc8c4b"
             },
             {
               "id": "3904077944",
               "node-type": "vf-module",
-              "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/c2d2d389-fa00-4fb4-a269-e46d495719e1/vf-modules/vf-module/eecb619c-a173-4ead-bf48-d4d09cbbdd5e"
+              "url": "https://aai.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/c2d2d389-fa00-4fb4-a269-e46d495719e1/vf-modules/vf-module/eecb619c-a173-4ead-bf48-d4d09cbbdd5e"
             },
             {
               "id": "4027855088",
               "node-type": "vf-module",
-              "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/c2d2d389-fa00-4fb4-a269-e46d495719e1/vf-modules/vf-module/1e29424e-2dca-45ac-b1df-59a8f74d0bc1"
+              "url": "https://aai.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/c2d2d389-fa00-4fb4-a269-e46d495719e1/vf-modules/vf-module/1e29424e-2dca-45ac-b1df-59a8f74d0bc1"
             },
             {
               "id": "4390871192",
               "node-type": "vf-module",
-              "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/c2d2d389-fa00-4fb4-a269-e46d495719e1/vf-modules/vf-module/b185220a-7f63-4b29-867d-1452813a4f09"
+              "url": "https://aai.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/c2d2d389-fa00-4fb4-a269-e46d495719e1/vf-modules/vf-module/b185220a-7f63-4b29-867d-1452813a4f09"
             },
             {
               "id": "4450529432",
               "node-type": "vf-module",
-              "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/c2d2d389-fa00-4fb4-a269-e46d495719e1/vf-modules/vf-module/7a0c4b98-b3cc-490c-bbab-e2d7f169f2d7"
+              "url": "https://aai.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/c2d2d389-fa00-4fb4-a269-e46d495719e1/vf-modules/vf-module/7a0c4b98-b3cc-490c-bbab-e2d7f169f2d7"
             },
             {
               "id": "3771572432",
               "node-type": "service-instance",
-              "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/f195837b-ef28-42c3-8dea-47ad37eaed95"
+              "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/f195837b-ef28-42c3-8dea-47ad37eaed95"
             }
           ]
         },
         {
           "id": "3783459064",
           "node-type": "generic-vnf",
-          "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/54626a59-ec0d-4fa9-b0c2-08d008688165",
+          "url": "https://aai.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/54626a59-ec0d-4fa9-b0c2-08d008688165",
           "properties": {
             "vnf-id": "54626a59-ec0d-4fa9-b0c2-08d008688165",
             "vnf-name": "Dominika Fionnbharr",
-            "vnf-type": "mDNS preload 1710 0914/mDNS preload 1710 0914 0",
+            "vnf-type": "CHARLOTTE preload 1710 0914/CHARLOTTE preload 1710 0914 0",
             "service-id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
             "prov-status": "PREPROV",
             "orchestration-status": "Created",
@@ -284,18 +284,18 @@
             {
               "id": "3775807704",
               "node-type": "service-instance",
-              "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/9ad4ac55-a5e0-4b49-95c0-b2d846abf700"
+              "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/9ad4ac55-a5e0-4b49-95c0-b2d846abf700"
             }
           ]
         },
         {
           "id": "3892133896",
           "node-type": "generic-vnf",
-          "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/d74503d8-abab-49c6-ba48-a6211eee9b7a",
+          "url": "https://aai.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/d74503d8-abab-49c6-ba48-a6211eee9b7a",
           "properties": {
             "vnf-id": "d74503d8-abab-49c6-ba48-a6211eee9b7a",
-            "vnf-name": "mDNS_PreloadTest_VNF",
-            "vnf-type": "mDNS preload 1710 0914/mDNS preload 1710 0914 0",
+            "vnf-name": "CHARLOTTE_PreloadTest_VNF",
+            "vnf-type": "CHARLOTTE preload 1710 0914/CHARLOTTE preload 1710 0914 0",
             "service-id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
             "prov-status": "PREPROV",
             "orchestration-status": "Created",
@@ -314,18 +314,18 @@
             {
               "id": "4178862184",
               "node-type": "service-instance",
-              "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/599c7247-b083-447c-b6b1-0cdd5170dfd2"
+              "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/599c7247-b083-447c-b6b1-0cdd5170dfd2"
             }
           ]
         },
         {
           "id": "1507690314",
           "node-type": "generic-vnf",
-          "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/385548e2-3f31-4900-9437-317d0346e49a",
+          "url": "https://aai.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/385548e2-3f31-4900-9437-317d0346e49a",
           "properties": {
             "vnf-id": "385548e2-3f31-4900-9437-317d0346e49a",
             "vnf-name": "Senga Gabrielle",
-            "vnf-type": "mDNS preload 1710 0914/mDNS preload 1710 0914 0",
+            "vnf-type": "CHARLOTTE preload 1710 0914/CHARLOTTE preload 1710 0914 0",
             "service-id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
             "prov-status": "PREPROV",
             "orchestration-status": "Created",
@@ -344,28 +344,28 @@
             {
               "id": "3664617648",
               "node-type": "vf-module",
-              "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/8e5e3ba1-3fe6-4d86-966e-f9f03dab4855/vf-modules/vf-module/788cde64-c288-4971-8e8c-77973c5009dc"
+              "url": "https://aai.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/8e5e3ba1-3fe6-4d86-966e-f9f03dab4855/vf-modules/vf-module/788cde64-c288-4971-8e8c-77973c5009dc"
             },
             {
               "id": "3008335920",
               "node-type": "service-instance",
-              "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/97315a05-e6f3-4c47-ae7e-d850c327aa08"
+              "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/97315a05-e6f3-4c47-ae7e-d850c327aa08"
             },
             {
               "id": "3477385312",
               "node-type": "vserver",
-              "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/att-aic/rdm3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/8627b971-1032-420f-a044-6802f0ab6976"
+              "url": "https://aai.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/8627b971-1032-420f-a044-6802f0ab6976"
             }
           ]
         },
         {
           "id": "5278880615",
           "node-type": "generic-vnf",
-          "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/0465e048-92a4-4a7f-bfe7-de39b32de4bd",
+          "url": "https://aai.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/0465e048-92a4-4a7f-bfe7-de39b32de4bd",
           "properties": {
             "vnf-id": "0465e048-92a4-4a7f-bfe7-de39b32de4bd",
             "vnf-name": "Constantius Raghu",
-            "vnf-type": "mDNS preload 1710 0914/mDNS preload 1710 0914 0",
+            "vnf-type": "CHARLOTTE preload 1710 0914/CHARLOTTE preload 1710 0914 0",
             "service-id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
             "prov-status": "PREPROV",
             "orchestration-status": "Created",
@@ -384,28 +384,28 @@
             {
               "id": "3664617648",
               "node-type": "vf-module",
-              "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/8e5e3ba1-3fe6-4d86-966e-f9f03dab4855/vf-modules/vf-module/788cde64-c288-4971-8e8c-77973c5009dc"
+              "url": "https://aai.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/8e5e3ba1-3fe6-4d86-966e-f9f03dab4855/vf-modules/vf-module/788cde64-c288-4971-8e8c-77973c5009dc"
             },
             {
               "id": "3008335920",
               "node-type": "service-instance",
-              "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/97315a05-e6f3-4c47-ae7e-d850c327aa08"
+              "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/97315a05-e6f3-4c47-ae7e-d850c327aa08"
             },
             {
               "id": "3477385312",
               "node-type": "vserver",
-              "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/att-aic/rdm3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/8627b971-1032-420f-a044-6802f0ab6976"
+              "url": "https://aai.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/8627b971-1032-420f-a044-6802f0ab6976"
             }
           ]
         },
         {
           "id": "3418898432",
           "node-type": "generic-vnf",
-          "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/8e5e3ba1-3fe6-4d86-966e-f9f03dab4855",
+          "url": "https://aai.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/8e5e3ba1-3fe6-4d86-966e-f9f03dab4855",
           "properties": {
             "vnf-id": "8e5e3ba1-3fe6-4d86-966e-f9f03dab4855",
-            "vnf-name": "zrdm3amdns02test2",
-            "vnf-type": "mDNS preload 1710 0914/mDNS preload 1710 0914 0",
+            "vnf-name": "zolson3amdns02test2",
+            "vnf-type": "CHARLOTTE preload 1710 0914/CHARLOTTE preload 1710 0914 0",
             "service-id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
             "prov-status": "PREPROV",
             "orchestration-status": "Created",
@@ -424,63 +424,63 @@
             {
               "id": "3664617648",
               "node-type": "vf-module",
-              "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/8e5e3ba1-3fe6-4d86-966e-f9f03dab4855/vf-modules/vf-module/788cde64-c288-4971-8e8c-77973c5009dc"
+              "url": "https://aai.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/8e5e3ba1-3fe6-4d86-966e-f9f03dab4855/vf-modules/vf-module/788cde64-c288-4971-8e8c-77973c5009dc"
             },
             {
               "id": "3008335920",
               "node-type": "service-instance",
-              "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/97315a05-e6f3-4c47-ae7e-d850c327aa08"
+              "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/97315a05-e6f3-4c47-ae7e-d850c327aa08"
             },
             {
               "id": "3477385312",
               "node-type": "vserver",
-              "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/att-aic/rdm3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/8627b971-1032-420f-a044-6802f0ab6976"
+              "url": "https://aai.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/8627b971-1032-420f-a044-6802f0ab6976"
             },
             {
               "id": "3647635704",
               "node-type": "vserver",
-              "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/att-aic/rdm3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/b30b17e9-10d0-4475-b558-7d18ae0aade0"
+              "url": "https://aai.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/b30b17e9-10d0-4475-b558-7d18ae0aade0"
             },
             {
               "id": "3664621744",
               "node-type": "vserver",
-              "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mdt1/tenants/tenant/88a6ca3ee0394ade9403f075db23167e/vservers/vserver/d3b293ba-85de-440e-904b-9dad160fbdce"
+              "url": "https://aai.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/mdt1/tenants/tenant/88a6ca3ee0394ade9403f075db23167e/vservers/vserver/d3b293ba-85de-440e-904b-9dad160fbdce"
             },
             {
               "id": "3975352504",
               "node-type": "vserver",
-              "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mdt1/tenants/tenant/88a6ca3ee0394ade9403f075db23167e/vservers/vserver/495a9a72-c9f6-41ed-93eb-065ebc2bfb1f"
+              "url": "https://aai.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/mdt1/tenants/tenant/88a6ca3ee0394ade9403f075db23167e/vservers/vserver/495a9a72-c9f6-41ed-93eb-065ebc2bfb1f"
             },
             {
               "id": "4059455552",
               "node-type": "vserver",
-              "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mdt1/tenants/tenant/88a6ca3ee0394ade9403f075db23167e/vservers/vserver/b4b9f419-3ed4-4bd8-bb2e-32b0a98e80b7"
+              "url": "https://aai.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/mdt1/tenants/tenant/88a6ca3ee0394ade9403f075db23167e/vservers/vserver/b4b9f419-3ed4-4bd8-bb2e-32b0a98e80b7"
             },
             {
               "id": "4098130088",
               "node-type": "vserver",
-              "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mdt1/tenants/tenant/88a6ca3ee0394ade9403f075db23167e/vservers/vserver/94c79f43-e76d-461e-b8df-8af2acb08e1e"
+              "url": "https://aai.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/mdt1/tenants/tenant/88a6ca3ee0394ade9403f075db23167e/vservers/vserver/94c79f43-e76d-461e-b8df-8af2acb08e1e"
             },
             {
               "id": "4401291416",
               "node-type": "vserver",
-              "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mdt1/tenants/tenant/88a6ca3ee0394ade9403f075db23167e/vservers/vserver/99cad3c6-1301-49c4-ad67-ae3c955de5f1"
+              "url": "https://aai.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/mdt1/tenants/tenant/88a6ca3ee0394ade9403f075db23167e/vservers/vserver/99cad3c6-1301-49c4-ad67-ae3c955de5f1"
             },
             {
               "id": "4458950808",
               "node-type": "vserver",
-              "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mdt1/tenants/tenant/88a6ca3ee0394ade9403f075db23167e/vservers/vserver/047354dc-0244-4241-b24a-7d7b00413b82"
+              "url": "https://aai.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/mdt1/tenants/tenant/88a6ca3ee0394ade9403f075db23167e/vservers/vserver/047354dc-0244-4241-b24a-7d7b00413b82"
             }
           ]
         },
         {
           "id": "1024648346",
           "node-type": "generic-vnf",
-          "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/a58bf551-a79c-42d1-83b4-ed9288036245",
+          "url": "https://aai.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/a58bf551-a79c-42d1-83b4-ed9288036245",
           "properties": {
             "vnf-id": "a58bf551-a79c-42d1-83b4-ed9288036245",
             "vnf-name": "Harrison Kris",
-            "vnf-type": "mDNS preload 1710 0914/mDNS preload 1710 0914 0",
+            "vnf-type": "CHARLOTTE preload 1710 0914/CHARLOTTE preload 1710 0914 0",
             "service-id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
             "prov-status": "PREPROV",
             "orchestration-status": "Created",
@@ -499,52 +499,127 @@
             {
               "id": "3664617648",
               "node-type": "vf-module",
-              "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/8e5e3ba1-3fe6-4d86-966e-f9f03dab4855/vf-modules/vf-module/788cde64-c288-4971-8e8c-77973c5009dc"
+              "url": "https://aai.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/8e5e3ba1-3fe6-4d86-966e-f9f03dab4855/vf-modules/vf-module/788cde64-c288-4971-8e8c-77973c5009dc"
             },
             {
               "id": "3008335920",
               "node-type": "service-instance",
-              "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/97315a05-e6f3-4c47-ae7e-d850c327aa08"
+              "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/97315a05-e6f3-4c47-ae7e-d850c327aa08"
             },
             {
               "id": "3477385312",
               "node-type": "vserver",
-              "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/att-aic/rdm3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/8627b971-1032-420f-a044-6802f0ab6976"
+              "url": "https://aai.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/8627b971-1032-420f-a044-6802f0ab6976"
             },
             {
               "id": "3647635704",
               "node-type": "vserver",
-              "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/att-aic/rdm3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/b30b17e9-10d0-4475-b558-7d18ae0aade0"
+              "url": "https://aai.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/b30b17e9-10d0-4475-b558-7d18ae0aade0"
             },
             {
               "id": "3664621744",
               "node-type": "vserver",
-              "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/att-aic/rdm3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/d3b293ba-85de-440e-904b-9dad160fbdce"
+              "url": "https://aai.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/d3b293ba-85de-440e-904b-9dad160fbdce"
             },
             {
               "id": "3975352504",
               "node-type": "vserver",
-              "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/att-aic/rdm3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/495a9a72-c9f6-41ed-93eb-065ebc2bfb1f"
+              "url": "https://aai.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/495a9a72-c9f6-41ed-93eb-065ebc2bfb1f"
             },
             {
               "id": "4059455552",
               "node-type": "vserver",
-              "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/att-aic/rdm3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/b4b9f419-3ed4-4bd8-bb2e-32b0a98e80b7"
+              "url": "https://aai.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/b4b9f419-3ed4-4bd8-bb2e-32b0a98e80b7"
             },
             {
               "id": "4098130088",
               "node-type": "vserver",
-              "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/att-aic/rdm3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/94c79f43-e76d-461e-b8df-8af2acb08e1e"
+              "url": "https://aai.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/94c79f43-e76d-461e-b8df-8af2acb08e1e"
             },
             {
               "id": "4401291416",
               "node-type": "vserver",
-              "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/att-aic/rdm3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/99cad3c6-1301-49c4-ad67-ae3c955de5f1"
+              "url": "https://aai.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/99cad3c6-1301-49c4-ad67-ae3c955de5f1"
             },
             {
               "id": "4458950808",
               "node-type": "vserver",
-              "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/att-aic/rdm3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/047354dc-0244-4241-b24a-7d7b00413b82"
+              "url": "https://aai.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/047354dc-0244-4241-b24a-7d7b00413b82"
+            }
+          ]
+        },
+        {
+          "id": "1024648346",
+          "node-type": "generic-vf",
+          "url": "https://aai.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/a58bf551-a79c-42d1-83b4-ed9288036245",
+          "properties": {
+            "vnf-id": "a58bf551-a79c-42d1-83b4-ed9288036245",
+            "vnf-name": "Harrison Kris",
+            "vnf-type": "CHARLOTTE preload 1710 0914/CHARLOTTE preload 1710 0914 0",
+            "service-id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
+            "prov-status": "PREPROV",
+            "orchestration-status": "Created",
+            "in-maint": false,
+            "is-closed-loop-disabled": false,
+            "resource-version": "4679861552759",
+            "model-invariant-id": "00beb8f9-6d39-452f-816d-c709b9cbb87d",
+            "model-version-id": "0903e1c0-8e03-4936-b5c2-260653b96413",
+            "model-customization-id": "14e8057d-b22a-405c-84aa-90b82bfd6e46",
+            "nf-type": "DNS",
+            "nf-function": "Mobile DNS",
+            "nf-role": "vMobileDNS",
+            "nf-naming-code": "null"
+          },
+          "related-to": [
+            {
+              "id": "3664617648",
+              "node-type": "vf-module",
+              "url": "https://aai.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/8e5e3ba1-3fe6-4d86-966e-f9f03dab4855/vf-modules/vf-module/788cde64-c288-4971-8e8c-77973c5009dc"
+            },
+            {
+              "id": "3008335920",
+              "node-type": "service-instance",
+              "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/97315a05-e6f3-4c47-ae7e-d850c327aa08"
+            },
+            {
+              "id": "3477385312",
+              "node-type": "vserver",
+              "url": "https://aai.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/8627b971-1032-420f-a044-6802f0ab6976"
+            },
+            {
+              "id": "3647635704",
+              "node-type": "vserver",
+              "url": "https://aai.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/b30b17e9-10d0-4475-b558-7d18ae0aade0"
+            },
+            {
+              "id": "3664621744",
+              "node-type": "vserver",
+              "url": "https://aai.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/d3b293ba-85de-440e-904b-9dad160fbdce"
+            },
+            {
+              "id": "3975352504",
+              "node-type": "vserver",
+              "url": "https://aai.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/495a9a72-c9f6-41ed-93eb-065ebc2bfb1f"
+            },
+            {
+              "id": "4059455552",
+              "node-type": "vserver",
+              "url": "https://aai.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/b4b9f419-3ed4-4bd8-bb2e-32b0a98e80b7"
+            },
+            {
+              "id": "4098130088",
+              "node-type": "vserver",
+              "url": "https://aai.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/94c79f43-e76d-461e-b8df-8af2acb08e1e"
+            },
+            {
+              "id": "4401291416",
+              "node-type": "vserver",
+              "url": "https://aai.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/99cad3c6-1301-49c4-ad67-ae3c955de5f1"
+            },
+            {
+              "id": "4458950808",
+              "node-type": "vserver",
+              "url": "https://aai.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/047354dc-0244-4241-b24a-7d7b00413b82"
             }
           ]
         }
diff --git a/vid-ext-services-simulator/src/main/resources/preset_registration/changeManagement/mso_get_change_managements.json b/vid-ext-services-simulator/src/main/resources/preset_registration/changeManagement/mso_get_change_managements.json
index 36bcfa9..2c6af27 100644
--- a/vid-ext-services-simulator/src/main/resources/preset_registration/changeManagement/mso_get_change_managements.json
+++ b/vid-ext-services-simulator/src/main/resources/preset_registration/changeManagement/mso_get_change_managements.json
@@ -14,15 +14,15 @@
           "request": {
             "requestDetails":{
               "cloudConfiguration":{
-                "lcpCloudRegionId":"mtn6",
+                "lcpCloudRegionId":"hvf6",
                 "tenantId":"ffdf52b5e5104b0e8f329b0b1637ee2e"
               },
               "modelInfo":{
-                "modelCustomizationName":"VSP1710PID298109_vMMSC 0",
+                "modelCustomizationName":"VSP1710PID298109_vWINIFRED 0",
                 "modelCustomizationId":"24d43fdb-9aa6-4287-a68e-1e702ea89d13",
                 "modelInvariantId":"e7961100-cde6-4b5a-bcda-b8945086950a",
                 "modelVersionId":"959a7ba0-89ee-4984-9af6-65d5bdda4b0e",
-                "modelName":"VSP1710PID298109_vMMSC",
+                "modelName":"VSP1710PID298109_vWINIFRED",
                 "modelType":"vnf",
                 "modelVersion":"1.0"
               },
@@ -33,7 +33,7 @@
                     "modelInfo":{
                       "modelInvariantId":"57e00952-0af7-4f0f-b19a-408a6f73c8df",
                       "modelType":"service",
-                      "modelName":"ServicevMMSCPID298109",
+                      "modelName":"ServicevWINIFREDPID298109",
                       "modelVersion":"1.0",
                       "modelVersionId":"fe6985cd-ea33-3346-ac12-ab121484a3fe"
                     }
@@ -61,7 +61,7 @@
                     "modelInfo":{
                       "modelInvariantId":"57e00952-0af7-4f0f-b19a-408a6f73c8df",
                       "modelType":"service",
-                      "modelName":"ServicevMMSCPID298109",
+                      "modelName":"ServicevWINIFREDPID298109",
                       "modelVersion":"1.0",
                       "modelVersionId":"fe6985cd-ea33-3346-ac12-ab121484a3fe"
                     }
@@ -90,15 +90,15 @@
           "request": {
             "requestDetails":{
               "cloudConfiguration":{
-                "lcpCloudRegionId":"mtn6",
+                "lcpCloudRegionId":"hvf6",
                 "tenantId":"ffdf52b5e5104b0e8f329b0b1637ee2e"
               },
               "modelInfo":{
-                "modelCustomizationName":"VSP1710PID298109_vMMSC 0",
+                "modelCustomizationName":"VSP1710PID298109_vWINIFRED 0",
                 "modelCustomizationId":"24d43fdb-9aa6-4287-a68e-1e702ea89d13",
                 "modelInvariantId":"e7961100-cde6-4b5a-bcda-b8945086950a",
                 "modelVersionId":"959a7ba0-89ee-4984-9af6-65d5bdda4b0e",
-                "modelName":"VSP1710PID298109_vMMSC",
+                "modelName":"VSP1710PID298109_vWINIFRED",
                 "modelType":"vnf",
                 "modelVersion":"1.0"
               },
@@ -109,7 +109,7 @@
                     "modelInfo":{
                       "modelInvariantId":"57e00952-0af7-4f0f-b19a-408a6f73c8df",
                       "modelType":"service",
-                      "modelName":"ServicevMMSCPID298109",
+                      "modelName":"ServicevWINIFREDPID298109",
                       "modelVersion":"1.0",
                       "modelVersionId":"fe6985cd-ea33-3346-ac12-ab121484a3fe"
                     }
@@ -137,7 +137,7 @@
                     "modelInfo":{
                       "modelInvariantId":"57e00952-0af7-4f0f-b19a-408a6f73c8df",
                       "modelType":"service",
-                      "modelName":"ServicevMMSCPID298109",
+                      "modelName":"ServicevWINIFREDPID298109",
                       "modelVersion":"1.0",
                       "modelVersionId":"fe6985cd-ea33-3346-ac12-ab121484a3fe"
                     }
@@ -166,15 +166,15 @@
           "request": {
             "requestDetails":{
               "cloudConfiguration":{
-                "lcpCloudRegionId":"mtn6",
+                "lcpCloudRegionId":"hvf6",
                 "tenantId":"ffdf52b5e5104b0e8f329b0b1637ee2e"
               },
               "modelInfo":{
-                "modelCustomizationName":"VSP1710PID298109_vMMSC 0",
+                "modelCustomizationName":"VSP1710PID298109_vWINIFRED 0",
                 "modelCustomizationId":"24d43fdb-9aa6-4287-a68e-1e702ea89d13",
                 "modelInvariantId":"e7961100-cde6-4b5a-bcda-b8945086950a",
                 "modelVersionId":"959a7ba0-89ee-4984-9af6-65d5bdda4b0e",
-                "modelName":"VSP1710PID298109_vMMSC",
+                "modelName":"VSP1710PID298109_vWINIFRED",
                 "modelType":"vnf",
                 "modelVersion":"1.0"
               },
@@ -185,7 +185,7 @@
                     "modelInfo":{
                       "modelInvariantId":"57e00952-0af7-4f0f-b19a-408a6f73c8df",
                       "modelType":"service",
-                      "modelName":"ServicevMMSCPID298109",
+                      "modelName":"ServicevWINIFREDPID298109",
                       "modelVersion":"1.0",
                       "modelVersionId":"fe6985cd-ea33-3346-ac12-ab121484a3fe"
                     }
@@ -213,7 +213,7 @@
                     "modelInfo":{
                       "modelInvariantId":"57e00952-0af7-4f0f-b19a-408a6f73c8df",
                       "modelType":"service",
-                      "modelName":"ServicevMMSCPID298109",
+                      "modelName":"ServicevWINIFREDPID298109",
                       "modelVersion":"1.0",
                       "modelVersionId":"fe6985cd-ea33-3346-ac12-ab121484a3fe"
                     }
@@ -242,15 +242,15 @@
           "request": {
             "requestDetails":{
               "cloudConfiguration":{
-                "lcpCloudRegionId":"mtn6",
+                "lcpCloudRegionId":"hvf6",
                 "tenantId":"ffdf52b5e5104b0e8f329b0b1637ee2e"
               },
               "modelInfo":{
-                "modelCustomizationName":"VSP1710PID298109_vMMSC 0",
+                "modelCustomizationName":"VSP1710PID298109_vWINIFRED 0",
                 "modelCustomizationId":"24d43fdb-9aa6-4287-a68e-1e702ea89d13",
                 "modelInvariantId":"e7961100-cde6-4b5a-bcda-b8945086950a",
                 "modelVersionId":"959a7ba0-89ee-4984-9af6-65d5bdda4b0e",
-                "modelName":"VSP1710PID298109_vMMSC",
+                "modelName":"VSP1710PID298109_vWINIFRED",
                 "modelType":"vnf",
                 "modelVersion":"1.0"
               },
@@ -261,7 +261,7 @@
                     "modelInfo":{
                       "modelInvariantId":"57e00952-0af7-4f0f-b19a-408a6f73c8df",
                       "modelType":"service",
-                      "modelName":"ServicevMMSCPID298109",
+                      "modelName":"ServicevWINIFREDPID298109",
                       "modelVersion":"1.0",
                       "modelVersionId":"fe6985cd-ea33-3346-ac12-ab121484a3fe"
                     }
@@ -289,7 +289,7 @@
                     "modelInfo":{
                       "modelInvariantId":"57e00952-0af7-4f0f-b19a-408a6f73c8df",
                       "modelType":"service",
-                      "modelName":"ServicevMMSCPID298109",
+                      "modelName":"ServicevWINIFREDPID298109",
                       "modelVersion":"1.0",
                       "modelVersionId":"fe6985cd-ea33-3346-ac12-ab121484a3fe"
                     }
@@ -318,15 +318,15 @@
           "request": {
             "requestDetails": {
               "cloudConfiguration": {
-                "lcpCloudRegionId": "mtn6",
+                "lcpCloudRegionId": "hvf6",
                 "tenantId": "ffdf52b5e5104b0e8f329b0b1637ee2e"
               },
               "modelInfo": {
-                "modelCustomizationName": "VSP1710PID298109_vMMSC 0",
+                "modelCustomizationName": "VSP1710PID298109_vWINIFRED 0",
                 "modelCustomizationId": "24d43fdb-9aa6-4287-a68e-1e702ea89d13",
                 "modelInvariantId": "e7961100-cde6-4b5a-bcda-b8945086950a",
                 "modelVersionId": "959a7ba0-89ee-4984-9af6-65d5bdda4b0e",
-                "modelName": "VSP1710PID298109_vMMSC",
+                "modelName": "VSP1710PID298109_vWINIFRED",
                 "modelType": "vnf",
                 "modelVersion": "1.0"
               },
@@ -337,7 +337,7 @@
                     "modelInfo": {
                       "modelInvariantId": "a8dcd72d-d44d-44f2-aa85-53aa9ca0c657",
                       "modelType": "service",
-                      "modelName": "ServicevMMSCPID298109",
+                      "modelName": "ServicevWINIFREDPID298109",
                       "modelVersion": "1.0",
                       "modelVersionId": "57e00952-0af7-4f0f-b19a-408a6f73c8df"
                     }
@@ -365,7 +365,7 @@
                     "modelInfo": {
                       "modelInvariantId": "a8dcd72d-d44d-44f2-aa85-53aa9ca0c657",
                       "modelType": "service",
-                      "modelName": "ServicevMMSCPID298109",
+                      "modelName": "ServicevWINIFREDPID298109",
                       "modelVersion": "1.0",
                       "modelVersionId": "57e00952-0af7-4f0f-b19a-408a6f73c8df"
                     }
@@ -394,7 +394,7 @@
           "request": {
             "requestDetails": {
               "cloudConfiguration": {
-                "lcpCloudRegionId": "rdm5b",
+                "lcpCloudRegionId": "olson5b",
                 "tenantId": "460f35aeb53542dc9f77105066483e83"
               },
               "modelInfo": {
@@ -470,7 +470,7 @@
           "request": {
             "requestDetails": {
               "cloudConfiguration": {
-                "lcpCloudRegionId": "rdm5b",
+                "lcpCloudRegionId": "olson5b",
                 "tenantId": "460f35aeb53542dc9f77105066483e83"
               },
               "modelInfo": {
@@ -546,7 +546,7 @@
           "request": {
             "requestDetails": {
               "cloudConfiguration": {
-                "lcpCloudRegionId": "rdm5b",
+                "lcpCloudRegionId": "olson5b",
                 "tenantId": "460f35aeb53542dc9f77105066483e83"
               },
               "modelInfo": {
@@ -622,7 +622,7 @@
           "request": {
             "requestDetails": {
               "cloudConfiguration": {
-                "lcpCloudRegionId": "rdm5b",
+                "lcpCloudRegionId": "olson5b",
                 "tenantId": "460f35aeb53542dc9f77105066483e83"
               },
               "modelInfo": {
@@ -698,7 +698,7 @@
           "request": {
             "requestDetails": {
               "cloudConfiguration": {
-                "lcpCloudRegionId": "rdm5b",
+                "lcpCloudRegionId": "olson5b",
                 "tenantId": "460f35aeb53542dc9f77105066483e83"
               },
               "modelInfo": {
@@ -774,7 +774,7 @@
           "request": {
             "requestDetails": {
               "cloudConfiguration": {
-                "lcpCloudRegionId": "rdm5b",
+                "lcpCloudRegionId": "olson5b",
                 "tenantId": "460f35aeb53542dc9f77105066483e83"
               },
               "modelInfo": {
@@ -989,7 +989,7 @@
                 "modelCustomizationId": "2a4bcb63-e28b-441c-8df5-b817629d8211",
                 "modelInvariantId": "5d86a112-7157-4a1a-85ce-23fb8403e0e3",
                 "modelVersionId": "207152f3-4f60-41e7-b3f7-5a9e3a0b861f",
-                "modelName": "zrdm3amogx01",
+                "modelName": "zolson3amogx01",
                 "modelType": "vnf",
                 "modelVersion": "1.0"
               },
@@ -1093,7 +1093,7 @@
                 "modelCustomizationId": "1779a999-ea17-4f31-98e9-75b6fbdd0acb",
                 "modelInvariantId": "93e16072-715a-42ef-9d0a-080052d6b716",
                 "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd",
-                "modelName": "mdns_2017_1011_oh22u_20171103",
+                "modelName": "CHARLOTTE_2017_1011_oh22u_20171103",
                 "modelType": "vnf"
               },
               "relatedModelList": [
@@ -1103,7 +1103,7 @@
                     "modelInfo": {
                       "modelInvariantId": "e58733ef-43cb-4b6b-b641-922078b6c88b",
                       "modelType": "service",
-                      "modelName": "mdns_2017_1011",
+                      "modelName": "CHARLOTTE_2017_1011",
                       "modelVersion": "2.0",
                       "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd"
                     }
@@ -1122,7 +1122,7 @@
                     "modelInfo": {
                       "modelInvariantId": "e58733ef-43cb-4b6b-b641-922078b6c88b",
                       "modelType": "service",
-                      "modelName": "mdns_2017_1011",
+                      "modelName": "CHARLOTTE_2017_1011",
                       "modelVersion": "2.0",
                       "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd"
                     }
@@ -1157,7 +1157,7 @@
                 "modelCustomizationId": "1779a999-ea17-4f31-98e9-75b6fbdd0acb",
                 "modelInvariantId": "93e16072-715a-42ef-9d0a-080052d6b716",
                 "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd",
-                "modelName": "mdns_2017_1011_oh22u_20171103",
+                "modelName": "CHARLOTTE_2017_1011_oh22u_20171103",
                 "modelType": "vnf"
               },
               "relatedModelList": [
@@ -1167,7 +1167,7 @@
                     "modelInfo": {
                       "modelInvariantId": "e58733ef-43cb-4b6b-b641-922078b6c88b",
                       "modelType": "service",
-                      "modelName": "mdns_2017_1011",
+                      "modelName": "CHARLOTTE_2017_1011",
                       "modelVersion": "2",
                       "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd"
                     }
@@ -1186,7 +1186,7 @@
                     "modelInfo": {
                       "modelInvariantId": "e58733ef-43cb-4b6b-b641-922078b6c88b",
                       "modelType": "service",
-                      "modelName": "mdns_2017_1011",
+                      "modelName": "CHARLOTTE_2017_1011",
                       "modelVersion": "2",
                       "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd"
                     }
@@ -1221,7 +1221,7 @@
                 "modelCustomizationId": "1779a999-ea17-4f31-98e9-75b6fbdd0acb",
                 "modelInvariantId": "93e16072-715a-42ef-9d0a-080052d6b716",
                 "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd",
-                "modelName": "mdns_2017_1011_oh22u_20171103",
+                "modelName": "CHARLOTTE_2017_1011_oh22u_20171103",
                 "modelType": "vnf"
               },
               "relatedModelList": [
@@ -1231,7 +1231,7 @@
                     "modelInfo": {
                       "modelInvariantId": "e58733ef-43cb-4b6b-b641-922078b6c88b",
                       "modelType": "service",
-                      "modelName": "mdns_2017_1011",
+                      "modelName": "CHARLOTTE_2017_1011",
                       "modelVersion": "2.0",
                       "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd"
                     }
@@ -1250,7 +1250,7 @@
                     "modelInfo": {
                       "modelInvariantId": "e58733ef-43cb-4b6b-b641-922078b6c88b",
                       "modelType": "service",
-                      "modelName": "mdns_2017_1011",
+                      "modelName": "CHARLOTTE_2017_1011",
                       "modelVersion": "2.0",
                       "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd"
                     }
@@ -1285,7 +1285,7 @@
                 "modelCustomizationId": "1779a999-ea17-4f31-98e9-75b6fbdd0acb",
                 "modelInvariantId": "93e16072-715a-42ef-9d0a-080052d6b716",
                 "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd",
-                "modelName": "mdns_2017_1011_oh22u_20171103",
+                "modelName": "CHARLOTTE_2017_1011_oh22u_20171103",
                 "modelType": "vnf",
                 "modelVersion": "2.0"
               },
@@ -1296,7 +1296,7 @@
                     "modelInfo": {
                       "modelInvariantId": "e58733ef-43cb-4b6b-b641-922078b6c88b",
                       "modelType": "service",
-                      "modelName": "mdns_2017_1011",
+                      "modelName": "CHARLOTTE_2017_1011",
                       "modelVersion": "2.0",
                       "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd"
                     }
@@ -1315,7 +1315,7 @@
                     "modelInfo": {
                       "modelInvariantId": "e58733ef-43cb-4b6b-b641-922078b6c88b",
                       "modelType": "service",
-                      "modelName": "mdns_2017_1011",
+                      "modelName": "CHARLOTTE_2017_1011",
                       "modelVersion": "2.0",
                       "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd"
                     }
@@ -1351,7 +1351,7 @@
                 "modelCustomizationId": "1779a999-ea17-4f31-98e9-75b6fbdd0acb",
                 "modelInvariantId": "93e16072-715a-42ef-9d0a-080052d6b716",
                 "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd",
-                "modelName": "mdns_2017_1011_oh22u_20171103",
+                "modelName": "CHARLOTTE_2017_1011_oh22u_20171103",
                 "modelType": "vnf"
               },
               "relatedModelList": [
@@ -1361,7 +1361,7 @@
                     "modelInfo": {
                       "modelInvariantId": "e58733ef-43cb-4b6b-b641-922078b6c88b",
                       "modelType": "service",
-                      "modelName": "mdns_2017_1011",
+                      "modelName": "CHARLOTTE_2017_1011",
                       "modelVersion": "2.0",
                       "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd"
                     }
@@ -1380,7 +1380,7 @@
                     "modelInfo": {
                       "modelInvariantId": "e58733ef-43cb-4b6b-b641-922078b6c88b",
                       "modelType": "service",
-                      "modelName": "mdns_2017_1011",
+                      "modelName": "CHARLOTTE_2017_1011",
                       "modelVersion": "2.0",
                       "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd"
                     }
@@ -1416,7 +1416,7 @@
                 "modelCustomizationId": "1779a999-ea17-4f31-98e9-75b6fbdd0acb",
                 "modelInvariantId": "93e16072-715a-42ef-9d0a-080052d6b716",
                 "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd",
-                "modelName": "mdns_2017_1011_oh22u_20171103",
+                "modelName": "CHARLOTTE_2017_1011_oh22u_20171103",
                 "modelType": "vnf"
               },
               "relatedModelList": [
@@ -1426,7 +1426,7 @@
                     "modelInfo": {
                       "modelInvariantId": "e58733ef-43cb-4b6b-b641-922078b6c88b",
                       "modelType": "service",
-                      "modelName": "mdns_2017_1011",
+                      "modelName": "CHARLOTTE_2017_1011",
                       "modelVersion": "2.0",
                       "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd"
                     }
@@ -1445,7 +1445,7 @@
                     "modelInfo": {
                       "modelInvariantId": "e58733ef-43cb-4b6b-b641-922078b6c88b",
                       "modelType": "service",
-                      "modelName": "mdns_2017_1011",
+                      "modelName": "CHARLOTTE_2017_1011",
                       "modelVersion": "2.0",
                       "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd"
                     }
@@ -1481,7 +1481,7 @@
                 "modelCustomizationId": "1779a999-ea17-4f31-98e9-75b6fbdd0acb",
                 "modelInvariantId": "93e16072-715a-42ef-9d0a-080052d6b716",
                 "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd",
-                "modelName": "mdns_2017_1011_oh22u_20171103",
+                "modelName": "CHARLOTTE_2017_1011_oh22u_20171103",
                 "modelType": "vnf",
                 "modelVersion": "3.0"
               },
@@ -1492,7 +1492,7 @@
                     "modelInfo": {
                       "modelInvariantId": "e58733ef-43cb-4b6b-b641-922078b6c88b",
                       "modelType": "service",
-                      "modelName": "mdns_2017_1011",
+                      "modelName": "CHARLOTTE_2017_1011",
                       "modelVersion": "4.0",
                       "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd"
                     }
@@ -1511,7 +1511,7 @@
                     "modelInfo": {
                       "modelInvariantId": "e58733ef-43cb-4b6b-b641-922078b6c88b",
                       "modelType": "service",
-                      "modelName": "mdns_2017_1011",
+                      "modelName": "CHARLOTTE_2017_1011",
                       "modelVersion": "4.0",
                       "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd"
                     }
@@ -1547,7 +1547,7 @@
                 "modelCustomizationId": "1779a999-ea17-4f31-98e9-75b6fbdd0acb",
                 "modelInvariantId": "93e16072-715a-42ef-9d0a-080052d6b716",
                 "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd",
-                "modelName": "mdns_2017_1011_oh22u_20171103",
+                "modelName": "CHARLOTTE_2017_1011_oh22u_20171103",
                 "modelType": "vnf",
                 "modelVersion": "3.0"
               },
@@ -1558,7 +1558,7 @@
                     "modelInfo": {
                       "modelInvariantId": "e58733ef-43cb-4b6b-b641-922078b6c88b",
                       "modelType": "service",
-                      "modelName": "mdns_2017_1011",
+                      "modelName": "CHARLOTTE_2017_1011",
                       "modelVersion": "4.0",
                       "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd"
                     }
@@ -1577,7 +1577,7 @@
                     "modelInfo": {
                       "modelInvariantId": "e58733ef-43cb-4b6b-b641-922078b6c88b",
                       "modelType": "service",
-                      "modelName": "mdns_2017_1011",
+                      "modelName": "CHARLOTTE_2017_1011",
                       "modelVersion": "4.0",
                       "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd"
                     }
@@ -1613,7 +1613,7 @@
                 "modelCustomizationId": "1779a999-ea17-4f31-98e9-75b6fbdd0acb",
                 "modelInvariantId": "93e16072-715a-42ef-9d0a-080052d6b716",
                 "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd",
-                "modelName": "mdns_2017_1011_oh22u_20171103",
+                "modelName": "CHARLOTTE_2017_1011_oh22u_20171103",
                 "modelType": "vnf",
                 "modelVersion": "3.0"
               },
@@ -1624,7 +1624,7 @@
                     "modelInfo": {
                       "modelInvariantId": "e58733ef-43cb-4b6b-b641-922078b6c88b",
                       "modelType": "service",
-                      "modelName": "mdns_2017_1011",
+                      "modelName": "CHARLOTTE_2017_1011",
                       "modelVersion": "4.0",
                       "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd"
                     }
@@ -1643,7 +1643,7 @@
                     "modelInfo": {
                       "modelInvariantId": "e58733ef-43cb-4b6b-b641-922078b6c88b",
                       "modelType": "service",
-                      "modelName": "mdns_2017_1011",
+                      "modelName": "CHARLOTTE_2017_1011",
                       "modelVersion": "4.0",
                       "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd"
                     }
@@ -1679,7 +1679,7 @@
                 "modelCustomizationId": "1779a999-ea17-4f31-98e9-75b6fbdd0acb",
                 "modelInvariantId": "93e16072-715a-42ef-9d0a-080052d6b716",
                 "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd",
-                "modelName": "mdns_2017_1011_oh22u_20171103",
+                "modelName": "CHARLOTTE_2017_1011_oh22u_20171103",
                 "modelType": "vnf",
                 "modelVersion": "3.0"
               },
@@ -1690,7 +1690,7 @@
                     "modelInfo": {
                       "modelInvariantId": "e58733ef-43cb-4b6b-b641-922078b6c88b",
                       "modelType": "service",
-                      "modelName": "mdns_2017_1011",
+                      "modelName": "CHARLOTTE_2017_1011",
                       "modelVersion": "4.0",
                       "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd"
                     }
@@ -1709,7 +1709,7 @@
                     "modelInfo": {
                       "modelInvariantId": "e58733ef-43cb-4b6b-b641-922078b6c88b",
                       "modelType": "service",
-                      "modelName": "mdns_2017_1011",
+                      "modelName": "CHARLOTTE_2017_1011",
                       "modelVersion": "4.0",
                       "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd"
                     }
diff --git a/vid-ext-services-simulator/src/main/resources/preset_registration/changeManagement/mso_get_manual_task.json b/vid-ext-services-simulator/src/main/resources/preset_registration/changeManagement/mso_get_manual_task.json
index 504cfd6..2b0d1ba 100644
--- a/vid-ext-services-simulator/src/main/resources/preset_registration/changeManagement/mso_get_manual_task.json
+++ b/vid-ext-services-simulator/src/main/resources/preset_registration/changeManagement/mso_get_manual_task.json
@@ -13,8 +13,8 @@
         {
           "taskId": "daf4dd84-b77a-42da-a051-3239b7a9392c",
           "type": "fallout",
-          "nfRole": "vSCP",
-          "subscriptionServiceType": "Mobility",
+          "nfRole": "vEsmeralda",
+          "subscriptionServiceType": "Emanuel",
           "originalRequestId": "d352c70d-5ef8-4977-9ea8-4c8cbe860422",
           "originalRequestorId": "ss835w",
           "errorSource": "A&AI",
diff --git a/vid-ext-services-simulator/src/main/resources/preset_registration/deactivate_service_instance.json b/vid-ext-services-simulator/src/main/resources/preset_registration/deactivate_service_instance.json
index 10db2a7..dc7344a 100644
--- a/vid-ext-services-simulator/src/main/resources/preset_registration/deactivate_service_instance.json
+++ b/vid-ext-services-simulator/src/main/resources/preset_registration/deactivate_service_instance.json
@@ -1,7 +1,7 @@
 {
   "simulatorRequest": {
     "method": "POST",
-    "path": "/mso/serviceInstances/v6/f36f5734-e9df-4fbf-9f35-61be13f028a1/deactivate"
+    "path": "/mso/serviceInstances/v./f36f5734-e9df-4fbf-9f35-61be13f028a1/deactivate"
   } ,
   "simulatorResponse": {
     "responseCode": 202,
diff --git a/vid-ext-services-simulator/src/main/resources/preset_registration/dissociate_pnf_from_service_instance.json b/vid-ext-services-simulator/src/main/resources/preset_registration/dissociate_pnf_from_service_instance.json
index c5e3c6e..ef55118 100644
--- a/vid-ext-services-simulator/src/main/resources/preset_registration/dissociate_pnf_from_service_instance.json
+++ b/vid-ext-services-simulator/src/main/resources/preset_registration/dissociate_pnf_from_service_instance.json
@@ -1,7 +1,7 @@
 {
   "simulatorRequest": {
     "method": "POST",
-    "path": "/mso/serviceInstances/v6/f36f5734-e9df-4fbf-9f35-61be13f028a1/removeRelationships"
+    "path": "/mso/serviceInstances/v./f36f5734-e9df-4fbf-9f35-61be13f028a1/removeRelationships"
   } ,
   "simulatorResponse": {
     "responseCode": 202,
diff --git a/vid-ext-services-simulator/src/main/resources/preset_registration/environment/get_operational_environments_aai.json b/vid-ext-services-simulator/src/main/resources/preset_registration/environment/get_operational_environments_aai.json
index b2834d6..3c9c78b 100644
--- a/vid-ext-services-simulator/src/main/resources/preset_registration/environment/get_operational_environments_aai.json
+++ b/vid-ext-services-simulator/src/main/resources/preset_registration/environment/get_operational_environments_aai.json
@@ -134,7 +134,7 @@
       "method": "GET",
       "path": "/aai/v../cloud-infrastructure/operational-environments",
       "queryParams": {
-        "operational-environment-type": "ECOMP"
+        "operational-environment-type": "ONAP"
       }
     },
     "simulatorResponse": {
@@ -144,7 +144,7 @@
           {
             "operational-environment-id": "f07ca256-96dd-40ad-b4d2-7a77e2a974ec",
             "operational-environment-name": "operational_environment_ec",
-            "operational-environment-type": "ECOMP",
+            "operational-environment-type": "ONAP",
             "operational-environment-status": "Activate",
             "tenant-context": "ECOMP Test",
             "workload-context": "ECOMP_Development",
@@ -153,7 +153,7 @@
           {
             "operational-environment-id": "f07ca256-96dd-40ad-b4d2-7a77e2a974ed",
             "operational-environment-name": "operational_environment_ed",
-            "operational-environment-type": "ECOMP",
+            "operational-environment-type": "ONAP",
             "operational-environment-status": "Activate",
             "tenant-context": "ECOMP Test",
             "workload-context": "ECOMP_Development",
diff --git a/vid-ext-services-simulator/src/main/resources/preset_registration/general/ecompportal_getSessionSlotCheckInterval.json b/vid-ext-services-simulator/src/main/resources/preset_registration/general/ecompportal_getSessionSlotCheckInterval.json
index cc7f76c..0759916 100644
--- a/vid-ext-services-simulator/src/main/resources/preset_registration/general/ecompportal_getSessionSlotCheckInterval.json
+++ b/vid-ext-services-simulator/src/main/resources/preset_registration/general/ecompportal_getSessionSlotCheckInterval.json
@@ -22,6 +22,26 @@
   {
     "simulatorRequest": {
       "method": "GET",
+      "path": "/ONAPPORTAL/auxapi/v[0-9]+/getSessionSlotCheckInterval"
+    },
+    "simulatorResponse": {
+      "responseCode": 200,
+      "body": "300000"
+    }
+  },
+  {
+    "simulatorRequest": {
+      "method": "POST",
+      "path": "/ONAPPORTAL/auxapi/extendSessionTimeOuts"
+    },
+    "simulatorResponse": {
+      "responseCode": 200,
+      "body": "300000"
+    }
+  },
+  {
+    "simulatorRequest": {
+      "method": "GET",
       "path": "/ONAPPORTAL/auxapi/context/get_user"
     },
     "simulatorResponse": {
diff --git a/vid-ext-services-simulator/src/main/resources/preset_registration/mso_activate_fabric_configuration.json b/vid-ext-services-simulator/src/main/resources/preset_registration/mso_activate_fabric_configuration.json
new file mode 100644
index 0000000..987646a
--- /dev/null
+++ b/vid-ext-services-simulator/src/main/resources/preset_registration/mso_activate_fabric_configuration.json
@@ -0,0 +1,15 @@
+{
+  "simulatorRequest": {
+    "method": "POST",
+    "path": "/mso/serviceInstantiation/v./serviceInstances/3f93c7cb-2fd0-4557-9514-e189b7b04f9d/activateFabricConfiguration[\/]?"
+  },
+  "simulatorResponse": {
+    "responseCode": 200,
+    "body": {
+      "requestReferences": {
+        "instanceId": "3f93c7cb-2fd0-4557-9514-e189b7b04f9d",
+        "requestId": "318cc766-b673-4a50-b9c5-471f68914584"
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/vid-ext-services-simulator/src/main/resources/preset_registration/mso_add_relationships.json b/vid-ext-services-simulator/src/main/resources/preset_registration/mso_add_relationships.json
index ec92a6b..ed801d2 100644
--- a/vid-ext-services-simulator/src/main/resources/preset_registration/mso_add_relationships.json
+++ b/vid-ext-services-simulator/src/main/resources/preset_registration/mso_add_relationships.json
@@ -1,15 +1,15 @@
-{
-  "simulatorRequest": {
-    "method": "POST",
-    "path": "/serviceInstances/v6/*/addRelationships"
-  } ,
-  "simulatorResponse": {
-    "responseCode": 200,
-    "body": {
-      "requestReferences": {
-        "instanceId": "8edb3c04-e012-4d5c-9ef4-710600d68dfa",
-        "requestId": "b6dc9806-b094-42f7-9386-a48de8218ce7"
-      }
-    }
-  }
+{
+  "simulatorRequest": {
+    "method": "POST",
+    "path": "/serviceInstances/v./*/addRelationships"
+  } ,
+  "simulatorResponse": {
+    "responseCode": 200,
+    "body": {
+      "requestReferences": {
+        "instanceId": "8edb3c04-e012-4d5c-9ef4-710600d68dfa",
+        "requestId": "b6dc9806-b094-42f7-9386-a48de8218ce7"
+      }
+    }
+  }
 }
\ No newline at end of file
diff --git a/vid-ext-services-simulator/src/main/resources/preset_registration/portMirroringPProbe/aai_get_pnf_instances_by_region.json b/vid-ext-services-simulator/src/main/resources/preset_registration/portMirroringPProbe/aai_get_pnf_instances_by_region.json
index b615f8c..d2ce59c 100644
--- a/vid-ext-services-simulator/src/main/resources/preset_registration/portMirroringPProbe/aai_get_pnf_instances_by_region.json
+++ b/vid-ext-services-simulator/src/main/resources/preset_registration/portMirroringPProbe/aai_get_pnf_instances_by_region.json
@@ -10,7 +10,7 @@
       },
       "body": {
         "start": "/business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89/service-subscriptions/service-subscription/VIRTUAL%20USP/service-instances?model-version-id=8a84e59b-45fe-4851-8ff1-34225a0b32c3&model-invariant-id=83b458fd-5dd3-419b-a9e3-7335814a0911",
-        "query": "query/pnf-fromModel-byRegion?cloudRegionId=AAIAIC25&equipVendor=Cisco&equipModel=Nexus%203048-TP"
+        "query": "query/pnf-fromModel-byRegion?cloudRegionId=JANET25&equipVendor=Cisco&equipModel=Nexus%203048-TP"
       }
     },
     "simulatorResponse": {
@@ -59,7 +59,7 @@
       },
       "body": {
         "start": "/business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89/service-subscriptions/service-subscription/VIRTUAL%20USP/service-instances?model-version-id=8a84e59b-45fe-4851-8ff1-34225a0b32c3&model-invariant-id=83b458fd-5dd3-419b-a9e3-7335814a0911",
-        "query": "query/pnf-fromModel-byRegion?cloudRegionId=mtn6&equipVendor=Cisco&equipModel=Nexus%203048-TP"
+        "query": "query/pnf-fromModel-byRegion?cloudRegionId=hvf6&equipVendor=Cisco&equipModel=Nexus%203048-TP"
       }
     },
     "simulatorResponse": {
diff --git a/vid-ext-services-simulator/src/main/resources/preset_registration/portMirroringPProbe/aai_get_tenants.json b/vid-ext-services-simulator/src/main/resources/preset_registration/portMirroringPProbe/aai_get_tenants.json
index de3560a..fdd9da5 100644
--- a/vid-ext-services-simulator/src/main/resources/preset_registration/portMirroringPProbe/aai_get_tenants.json
+++ b/vid-ext-services-simulator/src/main/resources/preset_registration/portMirroringPProbe/aai_get_tenants.json
@@ -1,26 +1,26 @@
 {
   "simulatorRequest": {
     "method": "GET",
-    "path": "/aai/v../business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89/service-subscriptions/service-subscription/VIRTUAL.USP"
+    "path": "/aai/v../business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89/service-subscriptions/service-subscription/TYLER.SILVIA"
   } ,
   "simulatorResponse": {
     "responseCode": 200,
     "body": {
-      "service-type": "VIRTUAL USP",
+      "service-type": "TYLER SILVIA",
       "resource-version": "1494001841964",
       "relationship-list": {
         "relationship": [
           {
             "related-to": "tenant",
-            "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/AAIAIC25/tenants/tenant/092eb9e8e4b7412e8787dd091bc58e86",
+            "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/JANET25/tenants/tenant/092eb9e8e4b7412e8787dd091bc58e86",
             "relationship-data": [
               {
                 "relationship-key": "cloud-region.cloud-owner",
-                "relationship-value": "att-aic"
+                "relationship-value": "irma-aic"
               },
               {
                 "relationship-key": "cloud-region.cloud-region-id",
-                "relationship-value": "AAIAIC25"
+                "relationship-value": "JANET25"
               },
               {
                 "relationship-key": "tenant.tenant-id",
@@ -36,15 +36,15 @@
           },
           {
             "related-to": "tenant",
-            "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/bae71557c5bb4d5aac6743a4e5f1d054",
+            "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/bae71557c5bb4d5aac6743a4e5f1d054",
             "relationship-data": [
               {
                 "relationship-key": "cloud-region.cloud-owner",
-                "relationship-value": "att-aic"
+                "relationship-value": "irma-aic"
               },
               {
                 "relationship-key": "cloud-region.cloud-region-id",
-                "relationship-value": "mtn6"
+                "relationship-value": "hvf6"
               },
               {
                 "relationship-key": "tenant.tenant-id",
@@ -54,21 +54,21 @@
             "related-to-property": [
               {
                 "property-key": "tenant.tenant-name",
-                "property-value": "AIN Web Tool-15-D-testgamma"
+                "property-value": "AIN Web Tool-15-D-testalexandria"
               }
             ]
           },
           {
             "related-to": "tenant",
-            "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/229bcdc6eaeb4ca59d55221141d01f8e",
+            "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/229bcdc6eaeb4ca59d55221141d01f8e",
             "relationship-data": [
               {
                 "relationship-key": "cloud-region.cloud-owner",
-                "relationship-value": "att-aic"
+                "relationship-value": "irma-aic"
               },
               {
                 "relationship-key": "cloud-region.cloud-region-id",
-                "relationship-value": "mtn6"
+                "relationship-value": "hvf6"
               },
               {
                 "relationship-key": "tenant.tenant-id",
@@ -84,15 +84,15 @@
           },
           {
             "related-to": "tenant",
-            "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/1178612d2b394be4834ad77f567c0af2",
+            "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/1178612d2b394be4834ad77f567c0af2",
             "relationship-data": [
               {
                 "relationship-key": "cloud-region.cloud-owner",
-                "relationship-value": "att-aic"
+                "relationship-value": "irma-aic"
               },
               {
                 "relationship-key": "cloud-region.cloud-region-id",
-                "relationship-value": "mtn6"
+                "relationship-value": "hvf6"
               },
               {
                 "relationship-key": "tenant.tenant-id",
@@ -108,15 +108,15 @@
           },
           {
             "related-to": "tenant",
-            "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/19c5ade915eb461e8af52fb2fd8cd1f2",
+            "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/19c5ade915eb461e8af52fb2fd8cd1f2",
             "relationship-data": [
               {
                 "relationship-key": "cloud-region.cloud-owner",
-                "relationship-value": "att-aic"
+                "relationship-value": "irma-aic"
               },
               {
                 "relationship-key": "cloud-region.cloud-region-id",
-                "relationship-value": "mtn6"
+                "relationship-value": "hvf6"
               },
               {
                 "relationship-key": "tenant.tenant-id",
@@ -132,15 +132,15 @@
           },
           {
             "related-to": "tenant",
-            "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/de007636e25249238447264a988a927b",
+            "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/de007636e25249238447264a988a927b",
             "relationship-data": [
               {
                 "relationship-key": "cloud-region.cloud-owner",
-                "relationship-value": "att-aic"
+                "relationship-value": "irma-aic"
               },
               {
                 "relationship-key": "cloud-region.cloud-region-id",
-                "relationship-value": "mtn6"
+                "relationship-value": "hvf6"
               },
               {
                 "relationship-key": "tenant.tenant-id",
@@ -156,15 +156,15 @@
           },
           {
             "related-to": "tenant",
-            "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/62f29b3613634ca6a3065cbe0e020c44",
+            "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/62f29b3613634ca6a3065cbe0e020c44",
             "relationship-data": [
               {
                 "relationship-key": "cloud-region.cloud-owner",
-                "relationship-value": "att-aic"
+                "relationship-value": "irma-aic"
               },
               {
                 "relationship-key": "cloud-region.cloud-region-id",
-                "relationship-value": "mtn6"
+                "relationship-value": "hvf6"
               },
               {
                 "relationship-key": "tenant.tenant-id",
@@ -180,15 +180,15 @@
           },
           {
             "related-to": "tenant",
-            "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/649289e30d3244e0b48098114d63c2aa",
+            "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/649289e30d3244e0b48098114d63c2aa",
             "relationship-data": [
               {
                 "relationship-key": "cloud-region.cloud-owner",
-                "relationship-value": "att-aic"
+                "relationship-value": "irma-aic"
               },
               {
                 "relationship-key": "cloud-region.cloud-region-id",
-                "relationship-value": "mtn6"
+                "relationship-value": "hvf6"
               },
               {
                 "relationship-key": "tenant.tenant-id",
@@ -204,15 +204,15 @@
           },
           {
             "related-to": "tenant",
-            "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/3f21eeea6c2c486bba31dab816c05a32",
+            "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/3f21eeea6c2c486bba31dab816c05a32",
             "relationship-data": [
               {
                 "relationship-key": "cloud-region.cloud-owner",
-                "relationship-value": "att-aic"
+                "relationship-value": "irma-aic"
               },
               {
                 "relationship-key": "cloud-region.cloud-region-id",
-                "relationship-value": "mtn6"
+                "relationship-value": "hvf6"
               },
               {
                 "relationship-key": "tenant.tenant-id",
@@ -228,15 +228,15 @@
           },
           {
             "related-to": "tenant",
-            "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/f60ce21d3ee6427586cff0d22b03b773",
+            "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/f60ce21d3ee6427586cff0d22b03b773",
             "relationship-data": [
               {
                 "relationship-key": "cloud-region.cloud-owner",
-                "relationship-value": "att-aic"
+                "relationship-value": "irma-aic"
               },
               {
                 "relationship-key": "cloud-region.cloud-region-id",
-                "relationship-value": "mtn6"
+                "relationship-value": "hvf6"
               },
               {
                 "relationship-key": "tenant.tenant-id",
@@ -252,15 +252,15 @@
           },
           {
             "related-to": "tenant",
-            "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/8774659e425f479895ae091bb5d46560",
+            "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/8774659e425f479895ae091bb5d46560",
             "relationship-data": [
               {
                 "relationship-key": "cloud-region.cloud-owner",
-                "relationship-value": "att-aic"
+                "relationship-value": "irma-aic"
               },
               {
                 "relationship-key": "cloud-region.cloud-region-id",
-                "relationship-value": "mtn6"
+                "relationship-value": "hvf6"
               },
               {
                 "relationship-key": "tenant.tenant-id",
@@ -276,15 +276,15 @@
           },
           {
             "related-to": "tenant",
-            "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/624eb554b0d147c19ff8885341760481",
+            "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/624eb554b0d147c19ff8885341760481",
             "relationship-data": [
               {
                 "relationship-key": "cloud-region.cloud-owner",
-                "relationship-value": "att-aic"
+                "relationship-value": "irma-aic"
               },
               {
                 "relationship-key": "cloud-region.cloud-region-id",
-                "relationship-value": "mtn6"
+                "relationship-value": "hvf6"
               },
               {
                 "relationship-key": "tenant.tenant-id",
@@ -300,15 +300,15 @@
           },
           {
             "related-to": "tenant",
-            "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/214f55f5fc414c678059c383b03e4962",
+            "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/214f55f5fc414c678059c383b03e4962",
             "relationship-data": [
               {
                 "relationship-key": "cloud-region.cloud-owner",
-                "relationship-value": "att-aic"
+                "relationship-value": "irma-aic"
               },
               {
                 "relationship-key": "cloud-region.cloud-region-id",
-                "relationship-value": "mtn6"
+                "relationship-value": "hvf6"
               },
               {
                 "relationship-key": "tenant.tenant-id",
@@ -324,15 +324,15 @@
           },
           {
             "related-to": "tenant",
-            "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/c90666c291664841bb98e4d981ff1db5",
+            "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/c90666c291664841bb98e4d981ff1db5",
             "relationship-data": [
               {
                 "relationship-key": "cloud-region.cloud-owner",
-                "relationship-value": "att-aic"
+                "relationship-value": "irma-aic"
               },
               {
                 "relationship-key": "cloud-region.cloud-region-id",
-                "relationship-value": "mtn6"
+                "relationship-value": "hvf6"
               },
               {
                 "relationship-key": "tenant.tenant-id",
@@ -348,15 +348,15 @@
           },
           {
             "related-to": "tenant",
-            "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/ce5b6bc5c7b348e1bf4b91ac9a174278",
+            "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/ce5b6bc5c7b348e1bf4b91ac9a174278",
             "relationship-data": [
               {
                 "relationship-key": "cloud-region.cloud-owner",
-                "relationship-value": "att-aic"
+                "relationship-value": "irma-aic"
               },
               {
                 "relationship-key": "cloud-region.cloud-region-id",
-                "relationship-value": "mtn6"
+                "relationship-value": "hvf6"
               },
               {
                 "relationship-key": "tenant.tenant-id",
@@ -372,15 +372,15 @@
           },
           {
             "related-to": "tenant",
-            "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/b386b768a3f24c8e953abbe0b3488c02",
+            "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/b386b768a3f24c8e953abbe0b3488c02",
             "relationship-data": [
               {
                 "relationship-key": "cloud-region.cloud-owner",
-                "relationship-value": "att-aic"
+                "relationship-value": "irma-aic"
               },
               {
                 "relationship-key": "cloud-region.cloud-region-id",
-                "relationship-value": "mtn6"
+                "relationship-value": "hvf6"
               },
               {
                 "relationship-key": "tenant.tenant-id",
@@ -396,15 +396,15 @@
           },
           {
             "related-to": "tenant",
-            "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/dc6c4dbfd225474e9deaadd34968646c",
+            "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/dc6c4dbfd225474e9deaadd34968646c",
             "relationship-data": [
               {
                 "relationship-key": "cloud-region.cloud-owner",
-                "relationship-value": "att-aic"
+                "relationship-value": "irma-aic"
               },
               {
                 "relationship-key": "cloud-region.cloud-region-id",
-                "relationship-value": "mtn6"
+                "relationship-value": "hvf6"
               },
               {
                 "relationship-key": "tenant.tenant-id",
@@ -420,15 +420,15 @@
           },
           {
             "related-to": "tenant",
-            "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/02cb5030e9914aa4be120bd9ed1e19eb",
+            "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/02cb5030e9914aa4be120bd9ed1e19eb",
             "relationship-data": [
               {
                 "relationship-key": "cloud-region.cloud-owner",
-                "relationship-value": "att-aic"
+                "relationship-value": "irma-aic"
               },
               {
                 "relationship-key": "cloud-region.cloud-region-id",
-                "relationship-value": "mtn6"
+                "relationship-value": "hvf6"
               },
               {
                 "relationship-key": "tenant.tenant-id",
@@ -444,15 +444,15 @@
           },
           {
             "related-to": "tenant",
-            "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/f2f3830e4c984d45bcd00e1a04158a79",
+            "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/f2f3830e4c984d45bcd00e1a04158a79",
             "relationship-data": [
               {
                 "relationship-key": "cloud-region.cloud-owner",
-                "relationship-value": "att-aic"
+                "relationship-value": "irma-aic"
               },
               {
                 "relationship-key": "cloud-region.cloud-region-id",
-                "relationship-value": "mtn6"
+                "relationship-value": "hvf6"
               },
               {
                 "relationship-key": "tenant.tenant-id",
@@ -468,15 +468,15 @@
           },
           {
             "related-to": "tenant",
-            "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/05b91bd5137f4929878edd965755c06d",
+            "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/05b91bd5137f4929878edd965755c06d",
             "relationship-data": [
               {
                 "relationship-key": "cloud-region.cloud-owner",
-                "relationship-value": "att-aic"
+                "relationship-value": "irma-aic"
               },
               {
                 "relationship-key": "cloud-region.cloud-region-id",
-                "relationship-value": "mtn6"
+                "relationship-value": "hvf6"
               },
               {
                 "relationship-key": "tenant.tenant-id",
@@ -492,15 +492,15 @@
           },
           {
             "related-to": "tenant",
-            "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/7002fbe8482d4a989ddf445b1ce336e0",
+            "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/7002fbe8482d4a989ddf445b1ce336e0",
             "relationship-data": [
               {
                 "relationship-key": "cloud-region.cloud-owner",
-                "relationship-value": "att-aic"
+                "relationship-value": "irma-aic"
               },
               {
                 "relationship-key": "cloud-region.cloud-region-id",
-                "relationship-value": "mtn6"
+                "relationship-value": "hvf6"
               },
               {
                 "relationship-key": "tenant.tenant-id",
@@ -516,15 +516,15 @@
           },
           {
             "related-to": "tenant",
-            "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/4008522be43741dcb1f5422022a2aa0b",
+            "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/4008522be43741dcb1f5422022a2aa0b",
             "relationship-data": [
               {
                 "relationship-key": "cloud-region.cloud-owner",
-                "relationship-value": "att-aic"
+                "relationship-value": "irma-aic"
               },
               {
                 "relationship-key": "cloud-region.cloud-region-id",
-                "relationship-value": "mtn6"
+                "relationship-value": "hvf6"
               },
               {
                 "relationship-key": "tenant.tenant-id",
@@ -540,15 +540,15 @@
           },
           {
             "related-to": "tenant",
-            "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/f44e2e96a1b6476abfda2fa407b00169",
+            "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/f44e2e96a1b6476abfda2fa407b00169",
             "relationship-data": [
               {
                 "relationship-key": "cloud-region.cloud-owner",
-                "relationship-value": "att-aic"
+                "relationship-value": "irma-aic"
               },
               {
                 "relationship-key": "cloud-region.cloud-region-id",
-                "relationship-value": "mtn6"
+                "relationship-value": "hvf6"
               },
               {
                 "relationship-key": "tenant.tenant-id",
@@ -564,15 +564,15 @@
           },
           {
             "related-to": "tenant",
-            "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/b69a52bec8a84669a37a1e8b72708be7",
+            "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/b69a52bec8a84669a37a1e8b72708be7",
             "relationship-data": [
               {
                 "relationship-key": "cloud-region.cloud-owner",
-                "relationship-value": "att-aic"
+                "relationship-value": "irma-aic"
               },
               {
                 "relationship-key": "cloud-region.cloud-region-id",
-                "relationship-value": "mtn6"
+                "relationship-value": "hvf6"
               },
               {
                 "relationship-key": "tenant.tenant-id",
@@ -588,15 +588,15 @@
           },
           {
             "related-to": "tenant",
-            "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/fac7d9fd56154caeb9332202dcf2969f",
+            "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/fac7d9fd56154caeb9332202dcf2969f",
             "relationship-data": [
               {
                 "relationship-key": "cloud-region.cloud-owner",
-                "relationship-value": "att-aic"
+                "relationship-value": "irma-aic"
               },
               {
                 "relationship-key": "cloud-region.cloud-region-id",
-                "relationship-value": "mtn6"
+                "relationship-value": "hvf6"
               },
               {
                 "relationship-key": "tenant.tenant-id",
@@ -612,15 +612,15 @@
           },
           {
             "related-to": "tenant",
-            "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/2d34d8396e194eb49969fd61ffbff961",
+            "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/2d34d8396e194eb49969fd61ffbff961",
             "relationship-data": [
               {
                 "relationship-key": "cloud-region.cloud-owner",
-                "relationship-value": "att-aic"
+                "relationship-value": "irma-aic"
               },
               {
                 "relationship-key": "cloud-region.cloud-region-id",
-                "relationship-value": "mtn6"
+                "relationship-value": "hvf6"
               },
               {
                 "relationship-key": "tenant.tenant-id",
@@ -636,15 +636,15 @@
           },
           {
             "related-to": "tenant",
-            "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/cb42a77ff45b48a8b8deb83bb64acc74",
+            "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/cb42a77ff45b48a8b8deb83bb64acc74",
             "relationship-data": [
               {
                 "relationship-key": "cloud-region.cloud-owner",
-                "relationship-value": "att-aic"
+                "relationship-value": "irma-aic"
               },
               {
                 "relationship-key": "cloud-region.cloud-region-id",
-                "relationship-value": "mtn6"
+                "relationship-value": "hvf6"
               },
               {
                 "relationship-key": "tenant.tenant-id",
@@ -660,15 +660,15 @@
           },
           {
             "related-to": "tenant",
-            "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/fa45ca53c80b492fa8be5477cd84fc2b",
+            "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/fa45ca53c80b492fa8be5477cd84fc2b",
             "relationship-data": [
               {
                 "relationship-key": "cloud-region.cloud-owner",
-                "relationship-value": "att-aic"
+                "relationship-value": "irma-aic"
               },
               {
                 "relationship-key": "cloud-region.cloud-region-id",
-                "relationship-value": "mtn6"
+                "relationship-value": "hvf6"
               },
               {
                 "relationship-key": "tenant.tenant-id",
@@ -684,15 +684,15 @@
           },
           {
             "related-to": "tenant",
-            "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/4914ab0ab3a743e58f0eefdacc1dde77",
+            "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/4914ab0ab3a743e58f0eefdacc1dde77",
             "relationship-data": [
               {
                 "relationship-key": "cloud-region.cloud-owner",
-                "relationship-value": "att-aic"
+                "relationship-value": "irma-aic"
               },
               {
                 "relationship-key": "cloud-region.cloud-region-id",
-                "relationship-value": "mtn6"
+                "relationship-value": "hvf6"
               },
               {
                 "relationship-key": "tenant.tenant-id",
@@ -708,15 +708,15 @@
           },
           {
             "related-to": "tenant",
-            "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/d0a3e3f2964542259d155a81c41aadc3",
+            "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/d0a3e3f2964542259d155a81c41aadc3",
             "relationship-data": [
               {
                 "relationship-key": "cloud-region.cloud-owner",
-                "relationship-value": "att-aic"
+                "relationship-value": "irma-aic"
               },
               {
                 "relationship-key": "cloud-region.cloud-region-id",
-                "relationship-value": "mtn6"
+                "relationship-value": "hvf6"
               },
               {
                 "relationship-key": "tenant.tenant-id",
@@ -726,21 +726,21 @@
             "related-to-property": [
               {
                 "property-key": "tenant.tenant-name",
-                "property-value": "test-mtn6-09"
+                "property-value": "test-hvf6-09"
               }
             ]
           },
           {
             "related-to": "tenant",
-            "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/cbb99fe4ada84631b7baf046b6fd2044",
+            "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/cbb99fe4ada84631b7baf046b6fd2044",
             "relationship-data": [
               {
                 "relationship-key": "cloud-region.cloud-owner",
-                "relationship-value": "att-aic"
+                "relationship-value": "irma-aic"
               },
               {
                 "relationship-key": "cloud-region.cloud-region-id",
-                "relationship-value": "mtn6"
+                "relationship-value": "hvf6"
               },
               {
                 "relationship-key": "tenant.tenant-id",
diff --git a/vid-ext-services-simulator/src/main/resources/preset_registration/portMirroringPProbe/aai_get_vnf_instances_by_region.json b/vid-ext-services-simulator/src/main/resources/preset_registration/portMirroringPProbe/aai_get_vnf_instances_by_region.json
index 17cd59b..7a03339 100644
--- a/vid-ext-services-simulator/src/main/resources/preset_registration/portMirroringPProbe/aai_get_vnf_instances_by_region.json
+++ b/vid-ext-services-simulator/src/main/resources/preset_registration/portMirroringPProbe/aai_get_vnf_instances_by_region.json
@@ -10,7 +10,7 @@
       },
       "body": {
         "start": "/business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89/service-subscriptions/service-subscription/VIRTUAL%20USP/service-instances?model-version-id=2a2ea15f-07c6-4b89-bfca-e8aba39a34d6&model-invariant-id=a7eac2b3-8444-40ee-92e3-b3359b32445c",
-        "query": "query/queryvnfFromModelbyRegion?cloudRegionId=AAIAIC25"
+        "query": "query/queryvnfFromModelbyRegion?cloudRegionId=JANET25"
       }
     },
     "simulatorResponse": {
@@ -23,7 +23,7 @@
             "url": "/aai/v11/network/generic-vnfs/generic-vnf/9be14a4f-7367-4cf9-96a1-f08f10f485a7",
             "properties": {
               "vnf-id": "9be14a4f-7367-4cf9-96a1-f08f10f485a7",
-              "vnf-name": "zmtn6aepdg01",
+              "vnf-name": "zhvf6aepdg01",
               "vnf-type": "Service_vEPDG/vf_vEPDG 0",
               "service-id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
               "prov-status": "PREPROV",
@@ -63,37 +63,37 @@
               {
                 "id": "2541699144",
                 "node-type": "service-instance",
-                "url": "/aai/v11/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/Mobility/service-instances/service-instance/b27d786a-eebf-4c79-b504-3f1e1a6b9651"
+                "url": "/aai/v11/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/Emanuel/service-instances/service-instance/b27d786a-eebf-4c79-b504-3f1e1a6b9651"
               },
               {
                 "id": "2376065248",
                 "node-type": "vserver",
-                "url": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/1eddb590b7f04e9890bceeef9e591333/vservers/vserver/a9ee2ed3-9986-4bc5-92d3-a3efdfe4752d"
+                "url": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/1eddb590b7f04e9890bceeef9e591333/vservers/vserver/a9ee2ed3-9986-4bc5-92d3-a3efdfe4752d"
               },
               {
                 "id": "2376069344",
                 "node-type": "vserver",
-                "url": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/1eddb590b7f04e9890bceeef9e591333/vservers/vserver/a9ee2ed3-9986-4bc5-92d3-a3efdfe4753d"
+                "url": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/1eddb590b7f04e9890bceeef9e591333/vservers/vserver/a9ee2ed3-9986-4bc5-92d3-a3efdfe4753d"
               },
               {
                 "id": "2662899848",
                 "node-type": "vserver",
-                "url": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/1eddb590b7f04e9890bceeef9e591333/vservers/vserver/a9ee2ed3-9986-4bc5-92d3-a3efdfe4754d"
+                "url": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/1eddb590b7f04e9890bceeef9e591333/vservers/vserver/a9ee2ed3-9986-4bc5-92d3-a3efdfe4754d"
               },
               {
                 "id": "2662903944",
                 "node-type": "vnfc",
-                "url": "/aai/v11/network/vnfcs/vnfc/zmtn6aefdg01vlb001"
+                "url": "/aai/v11/network/vnfcs/vnfc/zhvf6aefdg01vlb001"
               },
               {
                 "id": "2826555472",
                 "node-type": "vnfc",
-                "url": "/aai/v11/network/vnfcs/vnfc/zmtn6aefdg01vmg001"
+                "url": "/aai/v11/network/vnfcs/vnfc/zhvf6aefdg01vmg001"
               },
               {
                 "id": "2826567688",
                 "node-type": "vnfc",
-                "url": "/aai/v11/network/vnfcs/vnfc/zmtn6aefdg01oam001"
+                "url": "/aai/v11/network/vnfcs/vnfc/zhvf6aefdg01oam001"
               }
             ]
           }
@@ -112,7 +112,7 @@
       },
       "body": {
         "start": "/business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89/service-subscriptions/service-subscription/VIRTUAL%20USP/service-instances?model-version-id=2a2ea15f-07c6-4b89-bfca-e8aba39a34d6&model-invariant-id=a7eac2b3-8444-40ee-92e3-b3359b32445c",
-        "query": "query/queryvnfFromModelbyRegion?cloudRegionId=mtn6"
+        "query": "query/queryvnfFromModelbyRegion?cloudRegionId=hvf6"
       }
     },
     "simulatorResponse": {
@@ -125,7 +125,7 @@
             "url": "/aai/v11/network/generic-vnfs/generic-vnf/9be14a4f-7367-4cf9-96a1-f08f10f485a7",
             "properties": {
               "vnf-id": "9be14a4f-7367-4cf9-96a1-f08f10f485a7",
-              "vnf-name": "zmtn6aepdg01",
+              "vnf-name": "zhvf6aepdg01",
               "vnf-type": "Service_vEPDG/vf_vEPDG 0",
               "service-id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
               "prov-status": "PREPROV",
@@ -165,37 +165,37 @@
               {
                 "id": "2541699144",
                 "node-type": "service-instance",
-                "url": "/aai/v11/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/Mobility/service-instances/service-instance/b27d786a-eebf-4c79-b504-3f1e1a6b9651"
+                "url": "/aai/v11/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/Emanuel/service-instances/service-instance/b27d786a-eebf-4c79-b504-3f1e1a6b9651"
               },
               {
                 "id": "2376065248",
                 "node-type": "vserver",
-                "url": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/1eddb590b7f04e9890bceeef9e591333/vservers/vserver/a9ee2ed3-9986-4bc5-92d3-a3efdfe4752d"
+                "url": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/1eddb590b7f04e9890bceeef9e591333/vservers/vserver/a9ee2ed3-9986-4bc5-92d3-a3efdfe4752d"
               },
               {
                 "id": "2376069344",
                 "node-type": "vserver",
-                "url": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/1eddb590b7f04e9890bceeef9e591333/vservers/vserver/a9ee2ed3-9986-4bc5-92d3-a3efdfe4753d"
+                "url": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/1eddb590b7f04e9890bceeef9e591333/vservers/vserver/a9ee2ed3-9986-4bc5-92d3-a3efdfe4753d"
               },
               {
                 "id": "2662899848",
                 "node-type": "vserver",
-                "url": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/1eddb590b7f04e9890bceeef9e591333/vservers/vserver/a9ee2ed3-9986-4bc5-92d3-a3efdfe4754d"
+                "url": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/1eddb590b7f04e9890bceeef9e591333/vservers/vserver/a9ee2ed3-9986-4bc5-92d3-a3efdfe4754d"
               },
               {
                 "id": "2662903944",
                 "node-type": "vnfc",
-                "url": "/aai/v11/network/vnfcs/vnfc/zmtn6aefdg01vlb001"
+                "url": "/aai/v11/network/vnfcs/vnfc/zhvf6aefdg01vlb001"
               },
               {
                 "id": "2826555472",
                 "node-type": "vnfc",
-                "url": "/aai/v11/network/vnfcs/vnfc/zmtn6aefdg01vmg001"
+                "url": "/aai/v11/network/vnfcs/vnfc/zhvf6aefdg01vmg001"
               },
               {
                 "id": "2826567688",
                 "node-type": "vnfc",
-                "url": "/aai/v11/network/vnfcs/vnfc/zmtn6aefdg01oam001"
+                "url": "/aai/v11/network/vnfcs/vnfc/zhvf6aefdg01oam001"
               }
             ]
           }
diff --git a/vid-ext-services-simulator/src/main/resources/preset_registration/post_mso_create_service_instance.json b/vid-ext-services-simulator/src/main/resources/preset_registration/post_mso_create_service_instance.json
index 43248da..e9f90f0 100644
--- a/vid-ext-services-simulator/src/main/resources/preset_registration/post_mso_create_service_instance.json
+++ b/vid-ext-services-simulator/src/main/resources/preset_registration/post_mso_create_service_instance.json
@@ -2,7 +2,7 @@
   {
     "simulatorRequest": {
       "method": "POST",
-      "path": "/mso/serviceInstances/v6"
+      "path": "/mso/serviceInstances/v."
     },
     "simulatorResponse": {
       "responseCode": 202,
@@ -12,7 +12,7 @@
   {
     "simulatorRequest": {
       "method": "GET",
-      "path": "/mso/orchestrationRequests/v5/c0011670-0e1a-4b74-945d-8bf5aede1d9c"
+      "path": "/mso/orchestrationRequests/v./c0011670-0e1a-4b74-945d-8bf5aede1d9c"
     },
     "simulatorResponse": {
       "responseCode": 200,
diff --git a/vid-ext-services-simulator/src/main/resources/preset_registration/searchForServiceInstance/aai_get_full_subscribers.json b/vid-ext-services-simulator/src/main/resources/preset_registration/searchForServiceInstance/aai_get_full_subscribers.json
index 225bb36..3bf1ded 100644
--- a/vid-ext-services-simulator/src/main/resources/preset_registration/searchForServiceInstance/aai_get_full_subscribers.json
+++ b/vid-ext-services-simulator/src/main/resources/preset_registration/searchForServiceInstance/aai_get_full_subscribers.json
@@ -12,26 +12,26 @@
     "body": {
       "customer":[
         {
-          "global-customer-id":"MSO_1610_ST",
-          "subscriber-name":"MSO_1610_ST",
+          "global-customer-id":"CAR_2020_ER",
+          "subscriber-name":"CAR_2020_ER",
           "subscriber-type":"INFRA",
           "resource-version":"1494001902987"
         },
         {
           "global-customer-id":"21014aa2-526b-11e6-beb8-9e71128cae77",
-          "subscriber-name":"PACKET CORE",
+          "subscriber-name":"JULIO ERICKSON",
           "subscriber-type":"INFRA",
           "resource-version":"1494001776295"
         },
         {
           "global-customer-id":"DHV1707-TestSubscriber-2",
-          "subscriber-name":"ICORE CORE",
+          "subscriber-name":"DALE BRIDGES",
           "subscriber-type":"INFRA",
           "resource-version":"1498751754450"
         },
         {
           "global-customer-id":"DHV1707-TestSubscriber-1",
-          "subscriber-name":"PACKET1 CORE",
+          "subscriber-name":"LLOYD BRIDGES",
           "subscriber-type":"INFRA",
           "resource-version":"1498595633607"
         },
@@ -48,56 +48,56 @@
           "resource-version":"1494001970225"
         },
         {
-          "global-customer-id":"DHV1802-TestSub-PWT-102",
-          "subscriber-name":"DHV1802-TestSub-PWT-102",
+          "global-customer-id":"ERICA5779-TestSub-PWT-102",
+          "subscriber-name":"ERICA5779-TestSub-PWT-102",
           "subscriber-type":"INFRA",
           "resource-version":"1508852495058"
         },
         {
-          "global-customer-id":"DHV1802-TestSub-PWT-101",
-          "subscriber-name":"DHV1802-TestSub-PWT-101",
+          "global-customer-id":"ERICA5779-TestSub-PWT-101",
+          "subscriber-name":"ERICA5779-TestSub-PWT-101",
           "subscriber-type":"INFRA",
           "resource-version":"1508179953733"
         },
         {
           "global-customer-id":"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
-          "subscriber-name":"Mobility",
+          "subscriber-name":"Emanuel",
           "subscriber-type":"INFRA",
           "resource-version":"1494001894192"
         },
         {
-          "global-customer-id":"DHV1802-Subscriber-4",
-          "subscriber-name":"DHV1802-Subscriber-5",
+          "global-customer-id":"ERICA5779-Subscriber-4",
+          "subscriber-name":"ERICA5779-Subscriber-5",
           "subscriber-type":"INFRA",
           "resource-version":"1509134064531"
         },
         {
-          "global-customer-id":"DHV1802-TestSub-PWT-103",
-          "subscriber-name":"DHV1802-TestSub-PWT-103",
+          "global-customer-id":"ERICA5779-TestSub-PWT-103",
+          "subscriber-name":"ERICA5779-TestSub-PWT-103",
           "subscriber-type":"INFRA",
           "resource-version":"1509045503736"
         },
         {
-          "global-customer-id":"DHV1802-Subscriber-2",
-          "subscriber-name":"DHV1802-Subscriber-2",
+          "global-customer-id":"ERICA5779-Subscriber-2",
+          "subscriber-name":"ERICA5779-Subscriber-2",
           "subscriber-type":"INFRA",
           "resource-version":"1509122065439"
         },
         {
           "global-customer-id":"e433710f-9217-458d-a79d-1c7aff376d89",
-          "subscriber-name":"USP VOICE",
+          "subscriber-name":"SILVIA ROBBINS",
           "subscriber-type":"INFRA",
           "resource-version":"1494001938080"
         },
         {
-          "global-customer-id":"DHV1802-Subscriber-3",
-          "subscriber-name":"DHV1802-Subscriber-3",
+          "global-customer-id":"ERICA5779-Subscriber-3",
+          "subscriber-name":"ERICA5779-Subscriber-3",
           "subscriber-type":"INFRA",
           "resource-version":"1509122759407"
         },
         {
           "global-customer-id":"31739f3e-526b-11e6-beb8-9e71128cae77",
-          "subscriber-name":"FIREWALL/MISC",
+          "subscriber-name":"CRAIG/ROBERTS",
           "subscriber-type":"INFRA",
           "resource-version":"1494001772223"
         }
diff --git a/vid-ext-services-simulator/src/main/resources/preset_registration/searchForServiceInstance/aai_get_services.json b/vid-ext-services-simulator/src/main/resources/preset_registration/searchForServiceInstance/aai_get_services.json
index ef9725e..7df5aaa 100644
--- a/vid-ext-services-simulator/src/main/resources/preset_registration/searchForServiceInstance/aai_get_services.json
+++ b/vid-ext-services-simulator/src/main/resources/preset_registration/searchForServiceInstance/aai_get_services.json
@@ -9,17 +9,17 @@
       "service":[
         {
           "service-id":"ebc3bc3d-62fd-4a3f-a037-f619df4ff034",
-          "service-description":"DHV",
+          "service-description":"ERICA",
           "resource-version":"1494001985150"
         },
         {
           "service-id":"17cc1042-527b-11e6-beb8-9e71128cae77",
-          "service-description":"FLEXREACH",
+          "service-description":"IGNACIO",
           "resource-version":"1494001922171"
         },
         {
           "service-id":"36b4733a-53f4-4cc8-8ff0-9172e5fc4b8e",
-          "service-description":"Netbond",
+          "service-description":"Christie",
           "resource-version":"1494001855144"
         },
         {
@@ -28,18 +28,18 @@
           "resource-version":"1494001980153"
         },
         {
-          "service-id":"vRRaaS",
-          "service-description":"vRRaaS",
+          "service-id":"vTerrance",
+          "service-description":"vTerrance",
           "resource-version":"1484865266"
         },
         {
           "service-id":"323d69d9-2efe-4r45-ay0a-89ea7ard4e6f",
-          "service-description":"vSCP",
+          "service-description":"vEsmeralda",
           "resource-version":"1494001903012"
         },
         {
           "service-id":"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
-          "service-description":"Mobility",
+          "service-description":"Emanuel",
           "resource-version":"1503954056794"
         },
         {
@@ -49,7 +49,7 @@
         },
         {
           "service-id":"db171b8f-115c-4992-a2e3-ee04cae357e0",
-          "service-description":"FIRSTNET",
+          "service-description":"LINDSEY",
           "resource-version":"1490910095155"
         },
         {
@@ -58,18 +58,18 @@
           "resource-version":"1494001863930"
         },
         {
-          "service-id":"vHNGWaas",
+          "service-id":"vRosemarie",
           "service-description":"HNGATEWAY",
           "resource-version":"1501192849249"
         },
         {
           "service-id":"vHNPaas",
-          "service-description":"HNPORTAL",
+          "service-description":"WILKINS",
           "resource-version":"1501192982895"
         },
         {
           "service-id":"e433710f-9217-458d-a79d-1c7aff376d89",
-          "service-description":"VIRTUAL USP",
+          "service-description":"TYLER SILVIA",
           "resource-version":"1494001802638"
         },
         {
@@ -78,18 +78,18 @@
           "resource-version":"1492533254036"
         },
         {
-          "service-id":"VIPRaaS",
-          "service-description":"vIPRaaS",
+          "service-id":"vMuriel",
+          "service-description":"vMuriel",
           "resource-version":"1490910058887"
         },
         {
           "service-id":"0ee8c1bc-7cbd-4b0a-a1ac-e9999255abc1",
-          "service-description":"WAN Bonding",
+          "service-description":"CARA Griffin",
           "resource-version":"1498053422512"
         },
         {
           "service-id":"c7611ebe-c324-48f1-8085-94aef0c6ef3d",
-          "service-description":"HOSTED COMMUNICATIONS",
+          "service-description":"DARREN MCGEE",
           "resource-version":"1494001913639"
         },
         {
@@ -98,23 +98,23 @@
           "resource-version":"1506361785997"
         },
         {
-          "service-id":"vVIGaaS",
-          "service-description":"vVIGaaS",
+          "service-id":"vSalvatore",
+          "service-description":"vSalvatore",
           "resource-version":"1494001900545"
         },
         {
           "service-id":"d7bb0a21-66f2-4e6d-87d9-9ef3ced63ae4",
-          "service-description":"uCPE-VMS",
+          "service-description":"JOSEFINA",
           "resource-version":"1494001941772"
         },
         {
-          "service-id":"vPEaaS",
-          "service-description":"vPEaaS",
+          "service-id":"vHubbard",
+          "service-description":"vHubbard",
           "resource-version":"1494001988229"
         },
         {
           "service-id":"12a96a9d-4b4c-4349-a950-fe1159602621",
-          "service-description":"HOSTED COMMUNICATIONS",
+          "service-description":"DARREN MCGEE",
           "resource-version":"1494001817126"
         }
       ]
diff --git a/vid-ext-services-simulator/src/main/resources/preset_registration/searchForServiceInstance/aai_get_subscribers_for_customer_Mobility.json b/vid-ext-services-simulator/src/main/resources/preset_registration/searchForServiceInstance/aai_get_subscribers_for_customer_Emanuel.json
similarity index 97%
rename from vid-ext-services-simulator/src/main/resources/preset_registration/searchForServiceInstance/aai_get_subscribers_for_customer_Mobility.json
rename to vid-ext-services-simulator/src/main/resources/preset_registration/searchForServiceInstance/aai_get_subscribers_for_customer_Emanuel.json
index 8a0fa08..71e525d 100644
--- a/vid-ext-services-simulator/src/main/resources/preset_registration/searchForServiceInstance/aai_get_subscribers_for_customer_Mobility.json
+++ b/vid-ext-services-simulator/src/main/resources/preset_registration/searchForServiceInstance/aai_get_subscribers_for_customer_Emanuel.json
@@ -1,7 +1,7 @@
 {
   "simulatorRequest": {
     "method": "GET",
-    "path": "/aai/v../business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/Mobility",
+    "path": "/aai/v../business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/Emanuel",
     "queryParams": {
       "depth": 2
     }
@@ -11,13 +11,13 @@
     "body":
 {
   "global-customer-id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
-  "subscriber-name": "Mobility",
+  "subscriber-name": "Emanuel",
   "subscriber-type": "INFRA",
   "resource-version": "1494001894192",
   "service-subscriptions": {
     "service-subscription": [
       {
-        "service-type": "vMMSC",
+        "service-type": "vWINIFRED",
         "resource-version": "1503958037264",
         "service-instances": {
           "service-instance": [
@@ -56,7 +56,7 @@
             },
             {
               "service-instance-id": "69f1abac-b1ac-45c4-b954-ff934fc35257",
-              "service-instance-name": "Mobility_VSP_Service_nb5443",
+              "service-instance-name": "Emanuel_VSP_Service_nb5443",
               "service-type": "",
               "service-role": "",
               "model-invariant-id": "f60ed211-2780-40ea-9d05-94c214e0be5c",
@@ -66,7 +66,7 @@
             },
             {
               "service-instance-id": "5161b8d5-659a-42b2-9faa-d000bdba6473",
-              "service-instance-name": "ServicevMMSCPID298109_ap947r_092217_03",
+              "service-instance-name": "ServicevWINIFREDPID298109_ap947r_092217_03",
               "service-type": "",
               "service-role": "",
               "model-invariant-id": "a8dcd72d-d44d-44f2-aa85-53aa9ca0c657",
@@ -76,7 +76,7 @@
             },
             {
               "service-instance-id": "46c729a2-0003-4c6f-8deb-ccd7cb203681",
-              "service-instance-name": "vMMSC_MobReg__Svc_SB_0905_01",
+              "service-instance-name": "vWINIFRED_MobReg__Svc_SB_0905_01",
               "service-type": "",
               "service-role": "",
               "model-invariant-id": "a8dcd72d-d44d-44f2-aa85-53aa9ca0c657",
@@ -98,7 +98,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "vMMSC_MobReg__Vnf_SB_0905_01"
+                        "property-value": "vWINIFRED_MobReg__Vnf_SB_0905_01"
                       }
                     ]
                   }
@@ -198,7 +198,7 @@
             },
             {
               "service-instance-id": "4abb3bd4-75bf-488b-9185-dd6bfe493be9",
-              "service-instance-name": "RG_9-26_vmmsc",
+              "service-instance-name": "RG_9-26_vWINIFRED",
               "service-type": "",
               "service-role": "",
               "environment-context": "null",
@@ -222,7 +222,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "RG_9-26_vmmsctest"
+                        "property-value": "RG_9-26_vWINIFREDtest"
                       }
                     ]
                   }
@@ -231,7 +231,7 @@
             },
             {
               "service-instance-id": "2f4b57f9-c3bb-4734-b790-ceb57b02186a",
-              "service-instance-name": "PREIST_MDNS_mmscInstance",
+              "service-instance-name": "PREIST_CHARLOTTE_mmscInstance",
               "service-type": "",
               "service-role": "",
               "environment-context": "General_Revenue-Bearing",
@@ -255,7 +255,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "PREIST_MDNS_VNFmmsc"
+                        "property-value": "PREIST_CHARLOTTE_VNFmmsc"
                       }
                     ]
                   }
@@ -355,7 +355,7 @@
             },
             {
               "service-instance-id": "8473f088-30a0-453d-88fc-b29bda544d6e",
-              "service-instance-name": "Service_mdns_mobility_nb54433",
+              "service-instance-name": "Service_CHARLOTTE_emanuel_nb54433",
               "service-type": "",
               "service-role": "",
               "model-invariant-id": "b399ddef-4d8c-48c4-88c5-d4cb0f8b4678",
@@ -377,7 +377,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "Service_mdns_mobility_nb54433_ds0928_vnf"
+                        "property-value": "Service_CHARLOTTE_emanuel_nb54433_ds0928_vnf"
                       }
                     ]
                   }
@@ -386,7 +386,7 @@
             },
             {
               "service-instance-id": "035933b7-849c-4a83-a11c-73016fdf557a",
-              "service-instance-name": "Service_vMMSC_MobilityREG_sg_0911",
+              "service-instance-name": "Service_vWINIFRED_EmanuelREG_sg_0911",
               "service-type": "",
               "service-role": "",
               "model-invariant-id": "a8dcd72d-d44d-44f2-aa85-53aa9ca0c657",
@@ -429,7 +429,7 @@
             },
             {
               "service-instance-id": "884233b8-771a-421a-a542-406bda5af2c3",
-              "service-instance-name": "Service_vMMSC_MobilityREG_sg_0913",
+              "service-instance-name": "Service_vWINIFRED_EmanuelREG_sg_0913",
               "service-type": "",
               "service-role": "",
               "model-invariant-id": "a8dcd72d-d44d-44f2-aa85-53aa9ca0c657",
@@ -451,7 +451,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "Service_vMMSC_MobilityREG_sg_0913_Vnf"
+                        "property-value": "Service_vWINIFRED_EmanuelREG_sg_0913_Vnf"
                       }
                     ]
                   }
@@ -577,7 +577,7 @@
             },
             {
               "service-instance-id": "01170b44-d74f-409f-bb84-dee5c6d9ccb8",
-              "service-instance-name": "Mobility_VSP_Service_nb",
+              "service-instance-name": "Emanuel_VSP_Service_nb",
               "service-type": "",
               "service-role": "",
               "model-invariant-id": "f60ed211-2780-40ea-9d05-94c214e0be5c",
@@ -587,7 +587,7 @@
             },
             {
               "service-instance-id": "2f9db809-58f6-4bf2-8759-8e304831bbb9",
-              "service-instance-name": "ServicevMMSCPID298109_ap947r_0926167_02",
+              "service-instance-name": "ServicevWINIFREDPID298109_ap947r_0926167_02",
               "service-type": "",
               "service-role": "",
               "environment-context": "null",
@@ -752,7 +752,7 @@
             },
             {
               "service-instance-id": "ed5d1968-b896-4bd0-b978-4e29485b9086",
-              "service-instance-name": "Service_mdns_mobility_kk364s_927_1515",
+              "service-instance-name": "Service_CHARLOTTE_emanuel_kk364s_927_1515",
               "service-type": "",
               "service-role": "",
               "environment-context": "null",
@@ -776,7 +776,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "CreateVNF_Service_mdns_mobility_kk364s_927_1515"
+                        "property-value": "CreateVNF_Service_CHARLOTTE_emanuel_kk364s_927_1515"
                       }
                     ]
                   }
@@ -785,7 +785,7 @@
             },
             {
               "service-instance-id": "4f590065-d9ea-457b-bec6-3cdd95c993ab",
-              "service-instance-name": "RG_9-25_vMMSCVid",
+              "service-instance-name": "RG_9-25_vWINIFREDVid",
               "service-type": "",
               "service-role": "",
               "environment-context": "null",
@@ -857,7 +857,7 @@
             },
             {
               "service-instance-id": "f6763efd-774f-469d-a90e-b736765144cd",
-              "service-instance-name": "Service_vMMSC_MobilityREG_sb_0912",
+              "service-instance-name": "Service_vWINIFRED_EmanuelREG_sb_0912",
               "service-type": "",
               "service-role": "",
               "model-invariant-id": "a8dcd72d-d44d-44f2-aa85-53aa9ca0c657",
@@ -879,7 +879,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "Service_vMMSC_MobilityREG_sb_0912_Vnf"
+                        "property-value": "Service_vWINIFRED_EmanuelREG_sb_0912_Vnf"
                       }
                     ]
                   }
@@ -888,7 +888,7 @@
             },
             {
               "service-instance-id": "3280694a-7fb1-4450-bee4-ad84abbd9971",
-              "service-instance-name": "vMMSC_MobReg__Svc_DS_0830_01",
+              "service-instance-name": "vWINIFRED_MobReg__Svc_DS_0830_01",
               "service-type": "",
               "service-role": "",
               "model-invariant-id": "a8dcd72d-d44d-44f2-aa85-53aa9ca0c657",
@@ -943,7 +943,7 @@
             },
             {
               "service-instance-id": "2e1b88c0-cc5f-42ea-9a17-c21981107573",
-              "service-instance-name": "vMMSC_MobReg__Svc_DS_0901_01",
+              "service-instance-name": "vWINIFRED_MobReg__Svc_DS_0901_01",
               "service-type": "",
               "service-role": "",
               "model-invariant-id": "a8dcd72d-d44d-44f2-aa85-53aa9ca0c657",
@@ -953,7 +953,7 @@
             },
             {
               "service-instance-id": "6dd0f8de-93c7-48a2-914b-1a8d58e0eb48",
-              "service-instance-name": "vMMSC_MobReg__Svc_DS_0901_02",
+              "service-instance-name": "vWINIFRED_MobReg__Svc_DS_0901_02",
               "service-type": "",
               "service-role": "",
               "model-invariant-id": "a8dcd72d-d44d-44f2-aa85-53aa9ca0c657",
@@ -975,7 +975,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "vMMSC_MobReg__Vnf_DS_0901_02"
+                        "property-value": "vWINIFRED_MobReg__Vnf_DS_0901_02"
                       }
                     ]
                   }
@@ -984,7 +984,7 @@
             },
             {
               "service-instance-id": "7377c571-be4c-445f-bf85-5e7c60d5b1c6",
-              "service-instance-name": "Service_mdns_01",
+              "service-instance-name": "Service_CHARLOTTE_01",
               "service-type": "",
               "service-role": "",
               "environment-context": "Critical_Non-Revenue",
@@ -1135,7 +1135,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "ServicevMMSCVNF"
+                        "property-value": "ServicevWINIFREDVNF"
                       }
                     ]
                   }
@@ -1176,15 +1176,15 @@
             {
               "related-to": "tenant",
               "relationship-label": "org.onap.relationships.inventory.Uses",
-              "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/c2609b7252b6484d89432611cfb2491b",
+              "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/c2609b7252b6484d89432611cfb2491b",
               "relationship-data": [
                 {
                   "relationship-key": "cloud-region.cloud-owner",
-                  "relationship-value": "att-aic"
+                  "relationship-value": "irma-aic"
                 },
                 {
                   "relationship-key": "cloud-region.cloud-region-id",
-                  "relationship-value": "mtn6"
+                  "relationship-value": "hvf6"
                 },
                 {
                   "relationship-key": "tenant.tenant-id",
@@ -1201,15 +1201,15 @@
             {
               "related-to": "tenant",
               "relationship-label": "org.onap.relationships.inventory.Uses",
-              "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/579d80c0cf754d1e9f1ddc2cdc1701e3",
+              "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/579d80c0cf754d1e9f1ddc2cdc1701e3",
               "relationship-data": [
                 {
                   "relationship-key": "cloud-region.cloud-owner",
-                  "relationship-value": "att-aic"
+                  "relationship-value": "irma-aic"
                 },
                 {
                   "relationship-key": "cloud-region.cloud-region-id",
-                  "relationship-value": "mtn6"
+                  "relationship-value": "hvf6"
                 },
                 {
                   "relationship-key": "tenant.tenant-id",
@@ -1226,15 +1226,15 @@
             {
               "related-to": "tenant",
               "relationship-label": "org.onap.relationships.inventory.Uses",
-              "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/2cd3ca9abd25492eb0c6a44bc95fe714",
+              "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/2cd3ca9abd25492eb0c6a44bc95fe714",
               "relationship-data": [
                 {
                   "relationship-key": "cloud-region.cloud-owner",
-                  "relationship-value": "att-aic"
+                  "relationship-value": "irma-aic"
                 },
                 {
                   "relationship-key": "cloud-region.cloud-region-id",
-                  "relationship-value": "mtn6"
+                  "relationship-value": "hvf6"
                 },
                 {
                   "relationship-key": "tenant.tenant-id",
@@ -1280,11 +1280,11 @@
                   {
                     "related-to": "project",
                     "relationship-label": "org.onap.relationships.inventory.Uses",
-                    "related-link": "/aai/v12/business/projects/project/Nimbus",
+                    "related-link": "/aai/v12/business/projects/project/Kennedy",
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "Nimbus"
+                        "relationship-value": "Kennedy"
                       }
                     ]
                   },
@@ -1351,11 +1351,11 @@
                   {
                     "related-to": "project",
                     "relationship-label": "org.onap.relationships.inventory.Uses",
-                    "related-link": "/aai/v12/business/projects/project/Nimbus",
+                    "related-link": "/aai/v12/business/projects/project/Kennedy",
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "Nimbus"
+                        "relationship-value": "Kennedy"
                       }
                     ]
                   },
@@ -1479,15 +1479,15 @@
             {
               "related-to": "tenant",
               "relationship-label": "org.onap.relationships.inventory.Uses",
-              "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/c2609b7252b6484d89432611cfb2491b",
+              "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/c2609b7252b6484d89432611cfb2491b",
               "relationship-data": [
                 {
                   "relationship-key": "cloud-region.cloud-owner",
-                  "relationship-value": "att-aic"
+                  "relationship-value": "irma-aic"
                 },
                 {
                   "relationship-key": "cloud-region.cloud-region-id",
-                  "relationship-value": "mtn6"
+                  "relationship-value": "hvf6"
                 },
                 {
                   "relationship-key": "tenant.tenant-id",
@@ -1504,15 +1504,15 @@
             {
               "related-to": "tenant",
               "relationship-label": "org.onap.relationships.inventory.Uses",
-              "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/579d80c0cf754d1e9f1ddc2cdc1701e3",
+              "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/579d80c0cf754d1e9f1ddc2cdc1701e3",
               "relationship-data": [
                 {
                   "relationship-key": "cloud-region.cloud-owner",
-                  "relationship-value": "att-aic"
+                  "relationship-value": "irma-aic"
                 },
                 {
                   "relationship-key": "cloud-region.cloud-region-id",
-                  "relationship-value": "mtn6"
+                  "relationship-value": "hvf6"
                 },
                 {
                   "relationship-key": "tenant.tenant-id",
@@ -1529,15 +1529,15 @@
             {
               "related-to": "tenant",
               "relationship-label": "org.onap.relationships.inventory.Uses",
-              "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/2cd3ca9abd25492eb0c6a44bc95fe714",
+              "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/2cd3ca9abd25492eb0c6a44bc95fe714",
               "relationship-data": [
                 {
                   "relationship-key": "cloud-region.cloud-owner",
-                  "relationship-value": "att-aic"
+                  "relationship-value": "irma-aic"
                 },
                 {
                   "relationship-key": "cloud-region.cloud-region-id",
-                  "relationship-value": "mtn6"
+                  "relationship-value": "hvf6"
                 },
                 {
                   "relationship-key": "tenant.tenant-id",
@@ -1606,7 +1606,7 @@
             },
             {
               "service-instance-id": "9f44e57f-243d-4e53-8ef8-5892c12f7ac2",
-              "service-instance-name": "Mobility_VSP_Service_01_PB",
+              "service-instance-name": "Emanuel_VSP_Service_01_PB",
               "service-type": "",
               "service-role": "",
               "model-invariant-id": "f60ed211-2780-40ea-9d05-94c214e0be5c",
@@ -1626,7 +1626,7 @@
         }
       },
       {
-        "service-type": "Mobility",
+        "service-type": "Emanuel",
         "resource-version": "1494001853297",
         "service-instances": {
           "service-instance": [
@@ -1788,7 +1788,7 @@
             },
             {
               "service-instance-id": "4064aa68-f4db-4135-a78b-b79809416f80",
-              "service-instance-name": "vDBE_1208_oam_bb389n",
+              "service-instance-name": "vDOROTHEA_1208_oam_bb389n",
               "service-type": "",
               "service-role": "",
               "environment-context": "General_Revenue-Bearing",
@@ -1897,7 +1897,7 @@
             },
             {
               "service-instance-id": "3e18ba93-f47d-41c9-9d4e-bd43b507c4d6",
-              "service-instance-name": "HNPortal_OAM_svc_lll_010917",
+              "service-instance-name": "WILKINS_OAM_svc_lll_010917",
               "model-invariant-id": "24c750cd-a827-4289-9714-b6d214f1bc6b",
               "resource-version": "1494001876432"
             },
@@ -1945,7 +1945,7 @@
             },
             {
               "service-instance-id": "a42eeb3b-ae92-44aa-9da7-2293c1dfa259",
-              "service-instance-name": "MobilityServer_294356_rs768f",
+              "service-instance-name": "EmanuelServer_294356_rs768f",
               "service-type": "",
               "service-role": "",
               "environment-context": "General_Revenue-Bearing",
@@ -1959,11 +1959,11 @@
                   {
                     "related-to": "project",
                     "relationship-label": "org.onap.relationships.inventory.Uses",
-                    "related-link": "/aai/v12/business/projects/project/Nimbus",
+                    "related-link": "/aai/v12/business/projects/project/Kennedy",
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "Nimbus"
+                        "relationship-value": "Kennedy"
                       }
                     ]
                   },
@@ -1980,7 +1980,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "rs768f_MobilityServer_294356_vnf"
+                        "property-value": "rs768f_EmanuelServer_294356_vnf"
                       }
                     ]
                   },
@@ -2014,11 +2014,11 @@
                   {
                     "related-to": "project",
                     "relationship-label": "org.onap.relationships.inventory.Uses",
-                    "related-link": "/aai/v12/business/projects/project/Nimbus",
+                    "related-link": "/aai/v12/business/projects/project/Kennedy",
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "Nimbus"
+                        "relationship-value": "Kennedy"
                       }
                     ]
                   },
@@ -2114,7 +2114,7 @@
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "DFW"
+                        "relationship-value": "WATKINS"
                       }
                     ]
                   },
@@ -2251,7 +2251,7 @@
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "DFW"
+                        "relationship-value": "WATKINS"
                       }
                     ]
                   },
@@ -2315,7 +2315,7 @@
             },
             {
               "service-instance-id": "898cd344-8ec9-4e91-8e01-adc6a09b1822",
-              "service-instance-name": "Mobility_Server_294356",
+              "service-instance-name": "Emanuel_Server_294356",
               "service-type": "",
               "service-role": "",
               "environment-context": "General_Revenue-Bearing",
@@ -2329,11 +2329,11 @@
                   {
                     "related-to": "project",
                     "relationship-label": "org.onap.relationships.inventory.Uses",
-                    "related-link": "/aai/v12/business/projects/project/Nimbus",
+                    "related-link": "/aai/v12/business/projects/project/Kennedy",
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "Nimbus"
+                        "relationship-value": "Kennedy"
                       }
                     ]
                   },
@@ -2350,7 +2350,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6mobserver01"
+                        "property-value": "zhvf6mobserver01"
                       }
                     ]
                   },
@@ -2486,11 +2486,11 @@
                   {
                     "related-to": "project",
                     "relationship-label": "org.onap.relationships.inventory.Uses",
-                    "related-link": "/aai/v12/business/projects/project/Nimbus",
+                    "related-link": "/aai/v12/business/projects/project/Kennedy",
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "Nimbus"
+                        "relationship-value": "Kennedy"
                       }
                     ]
                   },
@@ -2507,7 +2507,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6amdns04_PB"
+                        "property-value": "zhvf6amdns04_PB"
                       }
                     ]
                   },
@@ -2567,7 +2567,7 @@
             },
             {
               "service-instance-id": "58f993c0-c7b9-45fe-ae7a-2ad9a2341870",
-              "service-instance-name": "Mobility_VSP_Service_PB_02",
+              "service-instance-name": "Emanuel_VSP_Service_PB_02",
               "service-type": "",
               "service-role": "",
               "model-invariant-id": "f60ed211-2780-40ea-9d05-94c214e0be5c",
@@ -2589,7 +2589,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "Mobility_VSP_Service_PB_02_VF"
+                        "property-value": "Emanuel_VSP_Service_PB_02_VF"
                       }
                     ]
                   }
@@ -2816,7 +2816,7 @@
             },
             {
               "service-instance-id": "5c766780-2e7b-47e6-b8a3-4bec3b1b0e71",
-              "service-instance-name": "Service_Test_PCRF_Test1707_02",
+              "service-instance-name": "Service_Test_RODERICK_Test1707_02",
               "resource-version": "1494002006171",
               "relationship-list": {
                 "relationship": [
@@ -2915,11 +2915,11 @@
                   {
                     "related-to": "project",
                     "relationship-label": "org.onap.relationships.inventory.Uses",
-                    "related-link": "/aai/v12/business/projects/project/Nimbus",
+                    "related-link": "/aai/v12/business/projects/project/Kennedy",
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "Nimbus"
+                        "relationship-value": "Kennedy"
                       }
                     ]
                   },
@@ -3002,7 +3002,7 @@
             },
             {
               "service-instance-id": "f7d5b93c-483c-4564-a524-1a1bbf5fdc0a",
-              "service-instance-name": "mdns_mobility_01",
+              "service-instance-name": "CHARLOTTE_emanuel_01",
               "service-type": "",
               "service-role": "",
               "environment-context": "Critical_Non-Revenue",
@@ -3026,7 +3026,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6amdns02"
+                        "property-value": "zhvf6amdns02"
                       }
                     ]
                   }
@@ -3049,11 +3049,11 @@
                   {
                     "related-to": "project",
                     "relationship-label": "org.onap.relationships.inventory.Uses",
-                    "related-link": "/aai/v12/business/projects/project/Nimbus",
+                    "related-link": "/aai/v12/business/projects/project/Kennedy",
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "Nimbus"
+                        "relationship-value": "Kennedy"
                       }
                     ]
                   },
@@ -3128,11 +3128,11 @@
                   {
                     "related-to": "project",
                     "relationship-label": "org.onap.relationships.inventory.Uses",
-                    "related-link": "/aai/v12/business/projects/project/Nimbus",
+                    "related-link": "/aai/v12/business/projects/project/Kennedy",
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "Nimbus"
+                        "relationship-value": "Kennedy"
                       }
                     ]
                   },
@@ -3174,7 +3174,7 @@
             },
             {
               "service-instance-id": "716df72e-d61e-45a4-8e50-8ea58d8ad2ac",
-              "service-instance-name": "lll_hngw_oam_net_020217",
+              "service-instance-name": "lll_Rosema_oam_net_020217",
               "model-invariant-id": "cc1db61e-1d9f-4b64-91ec-6844d922c584",
               "model-version-id": "374a0a81-cb42-4ed5-a5fb-5a0bec102f82",
               "resource-version": "1494001815150"
@@ -3227,7 +3227,7 @@
             },
             {
               "service-instance-id": "8da44332-8b5b-4f7c-983a-f78fecd39ef6",
-              "service-instance-name": "mdns_2017_1011_IST_Service_trial1",
+              "service-instance-name": "CHARLOTTE_2017_1011_IST_Service_trial1",
               "service-type": "",
               "service-role": "",
               "environment-context": "General_Revenue-Bearing",
@@ -3251,7 +3251,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6amdns02_un_05"
+                        "property-value": "zhvf6amdns02_un_05"
                       }
                     ]
                   },
@@ -3634,11 +3634,11 @@
                   {
                     "related-to": "project",
                     "relationship-label": "org.onap.relationships.inventory.Uses",
-                    "related-link": "/aai/v12/business/projects/project/Nimbus",
+                    "related-link": "/aai/v12/business/projects/project/Kennedy",
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "Nimbus"
+                        "relationship-value": "Kennedy"
                       }
                     ]
                   },
@@ -3694,11 +3694,11 @@
                   {
                     "related-to": "project",
                     "relationship-label": "org.onap.relationships.inventory.Uses",
-                    "related-link": "/aai/v12/business/projects/project/Nimbus",
+                    "related-link": "/aai/v12/business/projects/project/Kennedy",
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "Nimbus"
+                        "relationship-value": "Kennedy"
                       }
                     ]
                   },
@@ -3819,11 +3819,11 @@
                   {
                     "related-to": "project",
                     "relationship-label": "org.onap.relationships.inventory.Uses",
-                    "related-link": "/aai/v12/business/projects/project/Nimbus",
+                    "related-link": "/aai/v12/business/projects/project/Kennedy",
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "Nimbus"
+                        "relationship-value": "Kennedy"
                       }
                     ]
                   },
@@ -3948,7 +3948,7 @@
             },
             {
               "service-instance-id": "5d4d06c7-0843-4515-853f-73a9240f0c00",
-              "service-instance-name": "VID_Test_PCRF_05",
+              "service-instance-name": "VID_Test_RODERICK_05",
               "model-invariant-id": "f27484eb-7ee8-40d7-b2ff-7fd5a9133a10",
               "model-version-id": "101262c3-74b1-4632-8b60-977770b651d3",
               "resource-version": "1496864225405",
@@ -3973,7 +3973,7 @@
             },
             {
               "service-instance-id": "b388cd75-81f4-46c9-8a67-e2b9d89b9ff5",
-              "service-instance-name": "mdns_2017_1011_IST_Service_kk364s_1021_0244",
+              "service-instance-name": "CHARLOTTE_2017_1011_IST_Service_kk364s_1021_0244",
               "service-type": "",
               "service-role": "",
               "environment-context": "General_Revenue-Bearing",
@@ -4234,7 +4234,7 @@
             },
             {
               "service-instance-id": "515e6c9b-1076-4317-bb4a-482af901c2e4",
-              "service-instance-name": "mDNS_296115b_01",
+              "service-instance-name": "CHARLOTTE_296115b_01",
               "service-type": "",
               "service-role": "",
               "environment-context": "General_Revenue-Bearing",
@@ -4258,7 +4258,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6amdns04_rk"
+                        "property-value": "zhvf6amdns04_rk"
                       }
                     ]
                   },
@@ -4302,7 +4302,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6amdns02_rk_06"
+                        "property-value": "zhvf6amdns02_rk_06"
                       }
                     ]
                   },
@@ -4564,7 +4564,7 @@
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "DFW"
+                        "relationship-value": "WATKINS"
                       }
                     ]
                   },
@@ -4591,7 +4591,7 @@
             },
             {
               "service-instance-id": "7368a2c6-4769-4e07-b79a-69c00f544f20",
-              "service-instance-name": "PreIST_MDNS_9-29-v3_Inst",
+              "service-instance-name": "PreIST_CHARLOTTE_9-29-v3_Inst",
               "service-type": "",
               "service-role": "",
               "environment-context": "General_Revenue-Bearing",
@@ -4626,7 +4626,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "MDNS_9-28_RG_Inst"
+                        "property-value": "CHARLOTTE_9-28_RG_Inst"
                       }
                     ]
                   },
@@ -4936,7 +4936,7 @@
             },
             {
               "service-instance-id": "31ebdedd-fa79-4cb9-afb1-797643b49f08",
-              "service-instance-name": "Mobility_VSP_Service_07",
+              "service-instance-name": "Emanuel_VSP_Service_07",
               "service-type": "",
               "service-role": "",
               "environment-context": "null",
@@ -4960,7 +4960,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6amdns01_module_4"
+                        "property-value": "zhvf6amdns01_module_4"
                       }
                     ]
                   }
@@ -5111,7 +5111,7 @@
             },
             {
               "service-instance-id": "51437314-63a1-4679-bcbd-417a7f892823",
-              "service-instance-name": "lll_HNGW_OAM_net_svc_010917",
+              "service-instance-name": "lll_Rosema_OAM_net_svc_010917",
               "model-invariant-id": "eebacd18-8a9b-4364-a2f6-14c71ab291e3",
               "resource-version": "1494001998003"
             },
@@ -5314,11 +5314,11 @@
                   {
                     "related-to": "project",
                     "relationship-label": "org.onap.relationships.inventory.Uses",
-                    "related-link": "/aai/v12/business/projects/project/Nimbus",
+                    "related-link": "/aai/v12/business/projects/project/Kennedy",
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "Nimbus"
+                        "relationship-value": "Kennedy"
                       }
                     ]
                   },
@@ -5362,7 +5362,7 @@
             },
             {
               "service-instance-id": "7f75d367-a88f-409a-a0e9-028f4b54958e",
-              "service-instance-name": "mdns_2017_1011_IST_Service_rs",
+              "service-instance-name": "CHARLOTTE_2017_1011_IST_Service_rs",
               "service-type": "",
               "service-role": "",
               "environment-context": "General_Revenue-Bearing",
@@ -5593,7 +5593,7 @@
             },
             {
               "service-instance-id": "f4592a90-42a3-4694-b51c-e533db0d82c5",
-              "service-instance-name": "Service_PCRF_01",
+              "service-instance-name": "Service_RODERICK_01",
               "model-invariant-id": "f27484eb-7ee8-40d7-b2ff-7fd5a9133a10",
               "model-version-id": "8ad706d7-1c16-4b64-a6c4-3ee57d7370c3",
               "resource-version": "1494881053230",
@@ -5601,7 +5601,7 @@
             },
             {
               "service-instance-id": "77c03459-39b7-4503-8180-775c83f841b5",
-              "service-instance-name": "zmtn6_apn_dns_294356_kk364_1010",
+              "service-instance-name": "zhvf6_apn_dns_294356_kk364_1010",
               "service-type": "",
               "service-role": "",
               "environment-context": "General_Revenue-Bearing",
@@ -5791,7 +5791,7 @@
             },
             {
               "service-instance-id": "a8ab3d9f-9772-4c2e-a1f6-fe2d46097f91",
-              "service-instance-name": "Service_PCRF_DD_05",
+              "service-instance-name": "Service_RODERICK_DD_05",
               "model-invariant-id": "f27484eb-7ee8-40d7-b2ff-7fd5a9133a10",
               "model-version-id": "8ad706d7-1c16-4b64-a6c4-3ee57d7370c3",
               "resource-version": "1495026907287",
@@ -5826,7 +5826,7 @@
             },
             {
               "service-instance-id": "19347f45-b8bf-471f-915a-108153eba904",
-              "service-instance-name": "Service_PCRF_10_17_1610_Test04",
+              "service-instance-name": "Service_RODERICK_10_17_1610_Test04",
               "model-invariant-id": "103e2e96-97fa-4f9d-8969-f56cc6be9871",
               "model-version-id": "5ab337b0-49cf-4a93-a123-9dc3b35b2ce1",
               "resource-version": "1494002071896",
@@ -5845,7 +5845,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "VNF_PCRF_10_17_Test_06"
+                        "property-value": "VNF_RODERICK_10_17_Test_06"
                       }
                     ]
                   }
@@ -5854,7 +5854,7 @@
             },
             {
               "service-instance-id": "4c583916-9920-48d9-8cde-0db270ef567d",
-              "service-instance-name": "qw_mdns_2017_1011_IST_Service_CSI",
+              "service-instance-name": "qw_CHARLOTTE_2017_1011_IST_Service_CSI",
               "service-type": "",
               "service-role": "",
               "environment-context": "General_Revenue-Bearing",
@@ -5889,7 +5889,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "qw_mdns_2017_1011_IST_Service_CVNF"
+                        "property-value": "qw_CHARLOTTE_2017_1011_IST_Service_CVNF"
                       }
                     ]
                   },
@@ -5965,11 +5965,11 @@
                   {
                     "related-to": "project",
                     "relationship-label": "org.onap.relationships.inventory.Uses",
-                    "related-link": "/aai/v12/business/projects/project/Nimbus",
+                    "related-link": "/aai/v12/business/projects/project/Kennedy",
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "Nimbus"
+                        "relationship-value": "Kennedy"
                       }
                     ]
                   },
@@ -6074,7 +6074,7 @@
             },
             {
               "service-instance-id": "c41a5729-4fe7-4a9d-836f-6fca0839b2ec",
-              "service-instance-name": "SI_HNPortal_00119",
+              "service-instance-name": "SI_WILKINS_00119",
               "model-invariant-id": "5860f54e-020e-4466-80d6-972aef91e524",
               "model-version-id": "36f05b78-8dad-4fb8-8620-db46fd6ada54",
               "resource-version": "1494002069267"
@@ -6105,7 +6105,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6amdns02_rk_17"
+                        "property-value": "zhvf6amdns02_rk_17"
                       }
                     ]
                   },
@@ -6133,7 +6133,7 @@
             },
             {
               "service-instance-id": "b2684da0-5e17-4988-a21e-ea0e03b3f323",
-              "service-instance-name": "mdns_2017_1011_IST_Service_kk364s_1021",
+              "service-instance-name": "CHARLOTTE_2017_1011_IST_Service_kk364s_1021",
               "service-type": "",
               "service-role": "",
               "environment-context": "General_Revenue-Bearing",
@@ -6157,7 +6157,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "mdns_2017_1011_IST_Service_vnf"
+                        "property-value": "CHARLOTTE_2017_1011_IST_Service_vnf"
                       }
                     ]
                   },
@@ -6260,11 +6260,11 @@
                   {
                     "related-to": "project",
                     "relationship-label": "org.onap.relationships.inventory.Uses",
-                    "related-link": "/aai/v12/business/projects/project/Nimbus",
+                    "related-link": "/aai/v12/business/projects/project/Kennedy",
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "Nimbus"
+                        "relationship-value": "Kennedy"
                       }
                     ]
                   },
@@ -6445,11 +6445,11 @@
                   {
                     "related-to": "project",
                     "relationship-label": "org.onap.relationships.inventory.Uses",
-                    "related-link": "/aai/v12/business/projects/project/Nimbus",
+                    "related-link": "/aai/v12/business/projects/project/Kennedy",
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "Nimbus"
+                        "relationship-value": "Kennedy"
                       }
                     ]
                   },
@@ -6466,7 +6466,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6aapndns01_PB"
+                        "property-value": "zhvf6aapndns01_PB"
                       }
                     ]
                   },
@@ -6516,11 +6516,11 @@
                   {
                     "related-to": "project",
                     "relationship-label": "org.onap.relationships.inventory.Uses",
-                    "related-link": "/aai/v12/business/projects/project/Nimbus",
+                    "related-link": "/aai/v12/business/projects/project/Kennedy",
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "Nimbus"
+                        "relationship-value": "Kennedy"
                       }
                     ]
                   },
@@ -6540,7 +6540,7 @@
             },
             {
               "service-instance-id": "fbdbb9f6-f287-4d97-bdab-aeaf23212d22",
-              "service-instance-name": "SI_Test_PCRF_04",
+              "service-instance-name": "SI_Test_RODERICK_04",
               "model-invariant-id": "d2103eaa-8cc7-4422-ad67-1ce582af0097",
               "model-version-id": "5801fed3-b6db-4969-abb4-d1171c4c3202",
               "resource-version": "1497464045652",
@@ -6705,7 +6705,7 @@
             },
             {
               "service-instance-id": "5f3ea460-50db-4f10-8328-2b90aa9b62e4",
-              "service-instance-name": "PreIST_MDNS_9-29-Inst",
+              "service-instance-name": "PreIST_CHARLOTTE_9-29-Inst",
               "service-type": "",
               "service-role": "",
               "environment-context": "General_Revenue-Bearing",
@@ -6740,7 +6740,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "MDNS_9-28_RG-Inst"
+                        "property-value": "CHARLOTTE_9-28_RG-Inst"
                       }
                     ]
                   },
@@ -6922,7 +6922,7 @@
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "DFW"
+                        "relationship-value": "WATKINS"
                       }
                     ]
                   },
@@ -6959,7 +6959,7 @@
             },
             {
               "service-instance-id": "4b6718e0-6f56-4005-9145-a705fff610b9",
-              "service-instance-name": "sanity8_vmee",
+              "service-instance-name": "sanity8_vgeraldine",
               "service-type": "",
               "service-role": "",
               "environment-context": "General_Revenue-Bearing",
@@ -6983,7 +6983,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "SANITY8VMEE"
+                        "property-value": "SANITY8VGERALDINE"
                       }
                     ]
                   },
@@ -7017,11 +7017,11 @@
                   {
                     "related-to": "project",
                     "relationship-label": "org.onap.relationships.inventory.Uses",
-                    "related-link": "/aai/v12/business/projects/project/Nimbus",
+                    "related-link": "/aai/v12/business/projects/project/Kennedy",
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "Nimbus"
+                        "relationship-value": "Kennedy"
                       }
                     ]
                   },
@@ -7169,11 +7169,11 @@
                   {
                     "related-to": "project",
                     "relationship-label": "org.onap.relationships.inventory.Uses",
-                    "related-link": "/aai/v12/business/projects/project/Nimbus",
+                    "related-link": "/aai/v12/business/projects/project/Kennedy",
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "Nimbus"
+                        "relationship-value": "Kennedy"
                       }
                     ]
                   },
@@ -7305,7 +7305,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "VNF_Test1707_PCRF_01"
+                        "property-value": "VNF_Test1707_RODERICK_01"
                       }
                     ]
                   }
@@ -7328,11 +7328,11 @@
                   {
                     "related-to": "project",
                     "relationship-label": "org.onap.relationships.inventory.Uses",
-                    "related-link": "/aai/v12/business/projects/project/Nimbus",
+                    "related-link": "/aai/v12/business/projects/project/Kennedy",
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "Nimbus"
+                        "relationship-value": "Kennedy"
                       }
                     ]
                   },
@@ -7420,7 +7420,7 @@
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "DFW"
+                        "relationship-value": "WATKINS"
                       }
                     ]
                   },
@@ -7517,11 +7517,11 @@
                   {
                     "related-to": "project",
                     "relationship-label": "org.onap.relationships.inventory.Uses",
-                    "related-link": "/aai/v12/business/projects/project/Nimbus",
+                    "related-link": "/aai/v12/business/projects/project/Kennedy",
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "Nimbus"
+                        "relationship-value": "Kennedy"
                       }
                     ]
                   },
@@ -7538,7 +7538,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6avepdg02_pb"
+                        "property-value": "zhvf6avepdg02_pb"
                       }
                     ]
                   },
@@ -7787,11 +7787,11 @@
                   {
                     "related-to": "project",
                     "relationship-label": "org.onap.relationships.inventory.Uses",
-                    "related-link": "/aai/v12/business/projects/project/Nimbus",
+                    "related-link": "/aai/v12/business/projects/project/Kennedy",
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "Nimbus"
+                        "relationship-value": "Kennedy"
                       }
                     ]
                   },
@@ -7808,7 +7808,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6vepdg_01"
+                        "property-value": "zhvf6vepdg_01"
                       }
                     ]
                   },
@@ -8045,7 +8045,7 @@
             },
             {
               "service-instance-id": "b93b8567-1c0e-4b76-8262-3f3c29026615",
-              "service-instance-name": "Mobility_mdn_01",
+              "service-instance-name": "Emanuel_mdn_01",
               "service-type": "",
               "service-role": "",
               "environment-context": "Critical_Non-Revenue",
@@ -8084,7 +8084,7 @@
             },
             {
               "service-instance-id": "6db2dd7c-5936-42f2-a72d-5f6233ccceb2",
-              "service-instance-name": "i_mdns_2017_1011_IST_Service_CSI",
+              "service-instance-name": "i_CHARLOTTE_2017_1011_IST_Service_CSI",
               "service-type": "",
               "service-role": "",
               "environment-context": "General_Revenue-Bearing",
@@ -8119,7 +8119,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "i_mdns_2017_1011_IST_Service_CVNF"
+                        "property-value": "i_CHARLOTTE_2017_1011_IST_Service_CVNF"
                       }
                     ]
                   },
@@ -8286,7 +8286,7 @@
             },
             {
               "service-instance-id": "de8b4d93-f37c-4cd2-9710-c375a3197fc4",
-              "service-instance-name": "HNGWaas_IST1",
+              "service-instance-name": "Rosemaaas_IST1",
               "service-type": "",
               "service-role": "",
               "environment-context": "General_Revenue-Bearing",
@@ -8355,7 +8355,7 @@
             },
             {
               "service-instance-id": "9a32e5ab-7c59-45a7-af44-e9f5abcce125",
-              "service-instance-name": "Mobility_Server_294356_ds4493_1016",
+              "service-instance-name": "Emanuel_Server_294356_ds4493_1016",
               "service-type": "",
               "service-role": "",
               "environment-context": "General_Revenue-Bearing",
@@ -8367,7 +8367,7 @@
             },
             {
               "service-instance-id": "8b5e21c0-6466-4ac5-919f-6469b2a65fe5",
-              "service-instance-name": "VIK_test_VDBE",
+              "service-instance-name": "VIK_test_vDOROTHEA",
               "service-type": "",
               "service-role": "",
               "environment-context": "General_Revenue-Bearing",
@@ -8665,11 +8665,11 @@
                   {
                     "related-to": "project",
                     "relationship-label": "org.onap.relationships.inventory.Uses",
-                    "related-link": "/aai/v12/business/projects/project/Nimbus",
+                    "related-link": "/aai/v12/business/projects/project/Kennedy",
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "Nimbus"
+                        "relationship-value": "Kennedy"
                       }
                     ]
                   },
@@ -8686,7 +8686,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6afpdg02_pj"
+                        "property-value": "zhvf6afpdg02_pj"
                       }
                     ]
                   },
@@ -9026,7 +9026,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6affad01_qwe_02"
+                        "property-value": "zhvf6affad01_qwe_02"
                       }
                     ]
                   },
@@ -9139,7 +9139,7 @@
             },
             {
               "service-instance-id": "2b626ee1-43ab-4417-a23e-615b926a4a48",
-              "service-instance-name": "MDNS_SERVICE_PJ_1030_01",
+              "service-instance-name": "CHARLOTTE_SERVICE_PJ_1030_01",
               "service-type": "",
               "service-role": "",
               "environment-context": "General_Revenue-Bearing",
@@ -9153,11 +9153,11 @@
                   {
                     "related-to": "project",
                     "relationship-label": "org.onap.relationships.inventory.Uses",
-                    "related-link": "/aai/v12/business/projects/project/Nimbus",
+                    "related-link": "/aai/v12/business/projects/project/Kennedy",
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "Nimbus"
+                        "relationship-value": "Kennedy"
                       }
                     ]
                   },
@@ -9174,7 +9174,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6amdns01_pj_03"
+                        "property-value": "zhvf6amdns01_pj_03"
                       }
                     ]
                   },
@@ -9450,11 +9450,11 @@
                   {
                     "related-to": "project",
                     "relationship-label": "org.onap.relationships.inventory.Uses",
-                    "related-link": "/aai/v12/business/projects/project/Nimbus",
+                    "related-link": "/aai/v12/business/projects/project/Kennedy",
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "Nimbus"
+                        "relationship-value": "Kennedy"
                       }
                     ]
                   },
@@ -9783,11 +9783,11 @@
                   {
                     "related-to": "project",
                     "relationship-label": "org.onap.relationships.inventory.Uses",
-                    "related-link": "/aai/v12/business/projects/project/Nimbus",
+                    "related-link": "/aai/v12/business/projects/project/Kennedy",
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "Nimbus"
+                        "relationship-value": "Kennedy"
                       }
                     ]
                   },
@@ -9804,7 +9804,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6vProbesback"
+                        "property-value": "zhvf6vProbesback"
                       }
                     ]
                   },
@@ -9875,11 +9875,11 @@
                   {
                     "related-to": "project",
                     "relationship-label": "org.onap.relationships.inventory.Uses",
-                    "related-link": "/aai/v12/business/projects/project/Nimbus",
+                    "related-link": "/aai/v12/business/projects/project/Kennedy",
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "Nimbus"
+                        "relationship-value": "Kennedy"
                       }
                     ]
                   },
@@ -9956,7 +9956,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6aepdg01_pb_140"
+                        "property-value": "zhvf6aepdg01_pb_140"
                       }
                     ]
                   },
@@ -9973,7 +9973,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6aepdg01_un_901"
+                        "property-value": "zhvf6aepdg01_un_901"
                       }
                     ]
                   },
@@ -9999,7 +9999,7 @@
             },
             {
               "service-instance-id": "05970851-84de-4f37-ab0a-b91c9009f79e",
-              "service-instance-name": "Service_PCRF_Test_DD_03",
+              "service-instance-name": "Service_RODERICK_Test_DD_03",
               "resource-version": "1494002022309",
               "relationship-list": {
                 "relationship": [
@@ -10236,7 +10236,7 @@
             },
             {
               "service-instance-id": "8852fcdb-0bd8-402d-9eda-57d225107c94",
-              "service-instance-name": "HNPortalOAM_service_03",
+              "service-instance-name": "WILKINSOAM_service_03",
               "model-invariant-id": "5860f54e-020e-4466-80d6-972aef91e524",
               "resource-version": "1494001898192"
             },
@@ -10350,7 +10350,7 @@
             },
             {
               "service-instance-id": "59a71f5e-df36-4694-b6e8-cfc6933cbeca",
-              "service-instance-name": "Service_HNGW_AIC_05",
+              "service-instance-name": "Service_Rosema_AIC_05",
               "model-invariant-id": "85a1d941-a353-46fc-afee-73a70e019c8a",
               "model-version-id": "d885f626-0a61-45fd-8546-04daa2198561",
               "resource-version": "1494001899083"
@@ -10606,7 +10606,7 @@
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "DFW"
+                        "relationship-value": "WATKINS"
                       }
                     ]
                   },
@@ -10715,7 +10715,7 @@
             },
             {
               "service-instance-id": "cefa8919-4df3-413a-9536-969387dafedf",
-              "service-instance-name": "new_mdns_2017_1011_IST_Service_CSI",
+              "service-instance-name": "new_CHARLOTTE_2017_1011_IST_Service_CSI",
               "service-type": "",
               "service-role": "",
               "environment-context": "General_Revenue-Bearing",
@@ -10750,7 +10750,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "new_mdns_2017_1011_IST_Service_CVNF"
+                        "property-value": "new_CHARLOTTE_2017_1011_IST_Service_CVNF"
                       }
                     ]
                   },
@@ -10852,7 +10852,7 @@
             },
             {
               "service-instance-id": "3114a6b5-b9e2-433b-bc2b-b32ce0a23aaf",
-              "service-instance-name": "HNGW_Service_Test_OAM_NET_01",
+              "service-instance-name": "Rosema_Service_Test_OAM_NET_01",
               "model-invariant-id": "85a1d941-a353-46fc-afee-73a70e019c8a",
               "model-version-id": "d885f626-0a61-45fd-8546-04daa2198561",
               "resource-version": "1494001898897"
@@ -10895,7 +10895,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6amdns02_rk_20"
+                        "property-value": "zhvf6amdns02_rk_20"
                       }
                     ]
                   },
@@ -11069,7 +11069,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6amobility_Server_rk_02"
+                        "property-value": "zhvf6aemanuel_Server_rk_02"
                       }
                     ]
                   },
@@ -11361,11 +11361,11 @@
                   {
                     "related-to": "project",
                     "relationship-label": "org.onap.relationships.inventory.Uses",
-                    "related-link": "/aai/v12/business/projects/project/Nimbus",
+                    "related-link": "/aai/v12/business/projects/project/Kennedy",
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "Nimbus"
+                        "relationship-value": "Kennedy"
                       }
                     ]
                   },
@@ -11513,7 +11513,7 @@
             },
             {
               "service-instance-id": "d514603d-47dc-43ed-bcd6-a690413e4c90",
-              "service-instance-name": "Service_Idan_vSCP_AIC3.0_1610_Test03",
+              "service-instance-name": "Service_Idan_vEsmeralda_AIC3.0_1610_Test03",
               "model-invariant-id": "36523af8-18fa-4b75-9280-4f533c7da260",
               "resource-version": "1494001999449",
               "relationship-list": {
@@ -11531,7 +11531,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "VNF_vSCP_AIC_Test_04"
+                        "property-value": "VNF_vEsmeralda_AIC_Test_04"
                       }
                     ]
                   },
@@ -11548,7 +11548,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "VNF_vSCP_AIC_Test_05"
+                        "property-value": "VNF_vEsmeralda_AIC_Test_05"
                       }
                     ]
                   }
@@ -11575,7 +11575,7 @@
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "DFW"
+                        "relationship-value": "WATKINS"
                       }
                     ]
                   },
@@ -11627,7 +11627,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6aepdg01_pb_128"
+                        "property-value": "zhvf6aepdg01_pb_128"
                       }
                     ]
                   },
@@ -11678,7 +11678,7 @@
             },
             {
               "service-instance-id": "e4816bd8-bead-4fb6-83dd-0d12611921b9",
-              "service-instance-name": "mDNS_Preload_1102_un",
+              "service-instance-name": "CHARLOTTE_Preload_1102_un",
               "service-type": "",
               "service-role": "",
               "environment-context": "General_Revenue-Bearing",
@@ -11702,7 +11702,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6amdns02_un_17"
+                        "property-value": "zhvf6amdns02_un_17"
                       }
                     ]
                   },
@@ -11719,7 +11719,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6amdns02_module_14_un"
+                        "property-value": "zhvf6amdns02_module_14_un"
                       }
                     ]
                   },
@@ -11747,7 +11747,7 @@
             },
             {
               "service-instance-id": "f39b13e8-5544-4771-af88-f04af5ba1957",
-              "service-instance-name": "mdns_2017_1011_IST_Service_PB",
+              "service-instance-name": "CHARLOTTE_2017_1011_IST_Service_PB",
               "service-type": "",
               "service-role": "",
               "environment-context": "General_Revenue-Bearing",
@@ -11761,11 +11761,11 @@
                   {
                     "related-to": "project",
                     "relationship-label": "org.onap.relationships.inventory.Uses",
-                    "related-link": "/aai/v12/business/projects/project/Nimbus",
+                    "related-link": "/aai/v12/business/projects/project/Kennedy",
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "Nimbus"
+                        "relationship-value": "Kennedy"
                       }
                     ]
                   },
@@ -11782,7 +11782,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6amdns01_PB"
+                        "property-value": "zhvf6amdns01_PB"
                       }
                     ]
                   },
@@ -11898,7 +11898,7 @@
             },
             {
               "service-instance-id": "c44c48d4-2ec1-449b-888d-4eaea6fab0cf",
-              "service-instance-name": "Service_mdns_mobility_vf",
+              "service-instance-name": "Service_CHARLOTTE_emanuel_vf",
               "service-type": "",
               "service-role": "",
               "environment-context": "Critical_Non-Revenue",
@@ -11922,7 +11922,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "Service_mdns_mobility_vnf"
+                        "property-value": "Service_CHARLOTTE_emanuel_vnf"
                       }
                     ]
                   }
@@ -12203,7 +12203,7 @@
             },
             {
               "service-instance-id": "13701874-38b2-46c4-8a9b-72e9a1b37989",
-              "service-instance-name": "xa_mdns_2017_1011_IST_Service_CSI",
+              "service-instance-name": "xa_CHARLOTTE_2017_1011_IST_Service_CSI",
               "service-type": "",
               "service-role": "",
               "environment-context": "General_Revenue-Bearing",
@@ -12238,7 +12238,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "xa_mdns_2017_1011_IST_Service_CVNF"
+                        "property-value": "xa_CHARLOTTE_2017_1011_IST_Service_CVNF"
                       }
                     ]
                   },
@@ -12282,7 +12282,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6aepdg01_pb_111"
+                        "property-value": "zhvf6aepdg01_pb_111"
                       }
                     ]
                   },
@@ -12390,7 +12390,7 @@
             },
             {
               "service-instance-id": "7deb1deb-004d-47fc-bb7b-5eb0f216690e",
-              "service-instance-name": "mobilityyyyyy",
+              "service-instance-name": "emanuelyyyyy",
               "service-type": "",
               "service-role": "",
               "environment-context": "General_Revenue-Bearing",
@@ -12408,7 +12408,7 @@
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "DFW"
+                        "relationship-value": "WATKINS"
                       }
                     ]
                   },
@@ -12445,7 +12445,7 @@
             },
             {
               "service-instance-id": "b305e0a5-79e1-46b5-8610-f3a0bc47d7ed",
-              "service-instance-name": "mdns_1103_service_pj",
+              "service-instance-name": "CHARLOTTE_1103_service_pj",
               "service-type": "",
               "service-role": "",
               "environment-context": "General_Revenue-Bearing",
@@ -12459,11 +12459,11 @@
                   {
                     "related-to": "project",
                     "relationship-label": "org.onap.relationships.inventory.Uses",
-                    "related-link": "/aai/v12/business/projects/project/Nimbus",
+                    "related-link": "/aai/v12/business/projects/project/Kennedy",
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "Nimbus"
+                        "relationship-value": "Kennedy"
                       }
                     ]
                   },
@@ -12480,7 +12480,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6amdns03_pj"
+                        "property-value": "zhvf6amdns03_pj"
                       }
                     ]
                   },
@@ -12885,7 +12885,7 @@
             },
             {
               "service-instance-id": "f7f03302-42d1-444a-ab4c-8957879804e0",
-              "service-instance-name": "Mobility_Server_294356_ds4493_1017",
+              "service-instance-name": "Emanuel_Server_294356_ds4493_1017",
               "service-type": "",
               "service-role": "",
               "environment-context": "General_Revenue-Bearing",
@@ -13439,11 +13439,11 @@
                   {
                     "related-to": "project",
                     "relationship-label": "org.onap.relationships.inventory.Uses",
-                    "related-link": "/aai/v12/business/projects/project/Nimbus",
+                    "related-link": "/aai/v12/business/projects/project/Kennedy",
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "Nimbus"
+                        "relationship-value": "Kennedy"
                       }
                     ]
                   },
@@ -13487,7 +13487,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6amobility_Server_rk_01"
+                        "property-value": "zhvf6aemanuel_Server_rk_01"
                       }
                     ]
                   },
@@ -13609,7 +13609,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6amdns02_rk"
+                        "property-value": "zhvf6amdns02_rk"
                       }
                     ]
                   },
@@ -13653,11 +13653,11 @@
                   {
                     "related-to": "project",
                     "relationship-label": "org.onap.relationships.inventory.Uses",
-                    "related-link": "/aai/v12/business/projects/project/Nimbus",
+                    "related-link": "/aai/v12/business/projects/project/Kennedy",
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "Nimbus"
+                        "relationship-value": "Kennedy"
                       }
                     ]
                   },
@@ -13712,7 +13712,7 @@
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "DFW"
+                        "relationship-value": "WATKINS"
                       }
                     ]
                   },
@@ -13837,7 +13837,7 @@
             },
             {
               "service-instance-id": "06c3f2e6-91da-4dba-aca0-136dc0e6c3c5",
-              "service-instance-name": "Mobility_VPS_01",
+              "service-instance-name": "Emanuel_VPS_01",
               "service-type": "vVoicemail",
               "service-role": "",
               "environment-context": "null",
@@ -13990,7 +13990,7 @@
             {
               "service-instance-id": "0b909dec-a0e4-4941-a292-b66c37980578",
               "service-instance-name": "fghfhfgh",
-              "service-type": "ADIOD",
+              "service-type": "PASQUALE",
               "service-role": "",
               "environment-context": "null",
               "workload-context": "null",
@@ -14242,7 +14242,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6amdns02_rk_05"
+                        "property-value": "zhvf6amdns02_rk_05"
                       }
                     ]
                   },
@@ -14379,7 +14379,7 @@
             },
             {
               "service-instance-id": "b521eb11-2819-4b37-a83d-506d98f9fb2d",
-              "service-instance-name": "Service_HNGW_AIM_3",
+              "service-instance-name": "Service_Rosema_AIM_3",
               "model-invariant-id": "85a1d941-a353-46fc-afee-73a70e019c8a",
               "model-version-id": "d885f626-0a61-45fd-8546-04daa2198561",
               "resource-version": "1494002005218"
@@ -14599,7 +14599,7 @@
             },
             {
               "service-instance-id": "59d325de-2c5c-41d8-8595-fad8041d4b5e",
-              "service-instance-name": "HNPortal_Network13",
+              "service-instance-name": "WILKINS_Network13",
               "model-invariant-id": "5860f54e-020e-4466-80d6-972aef91e524",
               "resource-version": "1494002004126"
             },
@@ -14643,7 +14643,7 @@
             },
             {
               "service-instance-id": "f89dfcf9-292c-4be6-beb0-dd546b0a0b16",
-              "service-instance-name": "Mobility_VSP_Service",
+              "service-instance-name": "Emanuel_VSP_Service",
               "service-type": "vVoicemail",
               "service-role": "",
               "environment-context": "null",
@@ -14667,7 +14667,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6amdns01_module_0"
+                        "property-value": "zhvf6amdns01_module_0"
                       }
                     ]
                   }
@@ -14915,7 +14915,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6avepdg01"
+                        "property-value": "zhvf6avepdg01"
                       }
                     ]
                   }
@@ -15067,7 +15067,7 @@
             },
             {
               "service-instance-id": "2af5e227-b7ed-4209-a32d-eff478f02a1c",
-              "service-instance-name": "xx_mdns_2017_1011_IST_Service_CreateServiceInstance",
+              "service-instance-name": "xx_CHARLOTTE_2017_1011_IST_Service_CreateServiceInstance",
               "service-type": "",
               "service-role": "",
               "environment-context": "General_Revenue-Bearing",
@@ -15102,7 +15102,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "xx_mdns_2017_1011_IST_Service_CreateVNF"
+                        "property-value": "xx_CHARLOTTE_2017_1011_IST_Service_CreateVNF"
                       }
                     ]
                   },
@@ -15166,7 +15166,7 @@
             },
             {
               "service-instance-id": "1f3cbe01-c74c-4975-a5a2-f4f022a85b48",
-              "service-instance-name": "Service_PCRF_Test1707_01",
+              "service-instance-name": "Service_RODERICK_Test1707_01",
               "resource-version": "1494002022306",
               "relationship-list": {
                 "relationship": [
@@ -15183,7 +15183,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "VNF_PCRF_Test1707_01"
+                        "property-value": "VNF_RODERICK_Test1707_01"
                       }
                     ]
                   }
@@ -15301,7 +15301,7 @@
             },
             {
               "service-instance-id": "66b13cb4-b575-449f-aa45-ffbfe005c7b1",
-              "service-instance-name": "mDNS_preload_1710_0914",
+              "service-instance-name": "CHARLOTTE_preload_1710_0914",
               "service-type": "",
               "service-role": "",
               "model-invariant-id": "d03a321a-01b2-4d79-95f4-df10d8214fba",
@@ -15322,7 +15322,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6amdns02test"
+                        "property-value": "zhvf6amdns02test"
                       }
                     ]
                   }
@@ -15472,7 +15472,7 @@
             },
             {
               "service-instance-id": "c7123d4f-7739-43e1-922a-f9393054b7bf",
-              "service-instance-name": "mdns_E1802_Service_PJ",
+              "service-instance-name": "CHARLOTTE_E1802_Service_PJ",
               "service-type": "",
               "service-role": "",
               "environment-context": "General_Revenue-Bearing",
@@ -15486,11 +15486,11 @@
                   {
                     "related-to": "project",
                     "relationship-label": "org.onap.relationships.inventory.Uses",
-                    "related-link": "/aai/v12/business/projects/project/Nimbus",
+                    "related-link": "/aai/v12/business/projects/project/Kennedy",
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "Nimbus"
+                        "relationship-value": "Kennedy"
                       }
                     ]
                   },
@@ -15507,7 +15507,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6amdns01_pj_01"
+                        "property-value": "zhvf6amdns01_pj_01"
                       }
                     ]
                   },
@@ -15678,7 +15678,7 @@
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "DFW"
+                        "relationship-value": "WATKINS"
                       }
                     ]
                   },
@@ -15704,7 +15704,7 @@
             },
             {
               "service-instance-id": "932c5fb3-7642-414d-8257-5575984bfe4f",
-              "service-instance-name": "x_mdns_2017_1011_IST_Service_CserviceInstance",
+              "service-instance-name": "x_CHARLOTTE_2017_1011_IST_Service_CserviceInstance",
               "service-type": "",
               "service-role": "",
               "environment-context": "General_Revenue-Bearing",
@@ -15756,7 +15756,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "x_mdns_2017_1011_IST_Service_CvirtualNF"
+                        "property-value": "x_CHARLOTTE_2017_1011_IST_Service_CvirtualNF"
                       }
                     ]
                   },
@@ -15961,7 +15961,7 @@
             },
             {
               "service-instance-id": "7201f7a5-f4c7-45f0-b773-180e822c81e2",
-              "service-instance-name": "mDNS_Preload_10-19",
+              "service-instance-name": "CHARLOTTE_Preload_10-19",
               "service-type": "",
               "service-role": "",
               "environment-context": "General_Revenue-Bearing",
@@ -15975,11 +15975,11 @@
                   {
                     "related-to": "project",
                     "relationship-label": "org.onap.relationships.inventory.Uses",
-                    "related-link": "/aai/v12/business/projects/project/Nimbus",
+                    "related-link": "/aai/v12/business/projects/project/Kennedy",
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "Nimbus"
+                        "relationship-value": "Kennedy"
                       }
                     ]
                   },
@@ -15996,7 +15996,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "mDNS_Preload_VNF"
+                        "property-value": "CHARLOTTE_Preload_VNF"
                       }
                     ]
                   },
@@ -16209,7 +16209,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "VNF_Test_PCRF_02"
+                        "property-value": "VNF_Test_RODERICK_02"
                       }
                     ]
                   }
@@ -16333,7 +16333,7 @@
             },
             {
               "service-instance-id": "42dab67f-560c-409b-896d-1a9786ed4cf6",
-              "service-instance-name": "mdns_mobility",
+              "service-instance-name": "CHARLOTTE_emanuel",
               "service-type": "",
               "service-role": "",
               "environment-context": "Critical_Non-Revenue",
@@ -16357,7 +16357,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6amdns01"
+                        "property-value": "zhvf6amdns01"
                       }
                     ]
                   }
@@ -16390,7 +16390,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "vnf_mobility"
+                        "property-value": "vnf_emanuel"
                       }
                     ]
                   },
@@ -16485,7 +16485,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6epdg01"
+                        "property-value": "zhvf6epdg01"
                       }
                     ]
                   },
@@ -16502,7 +16502,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6aepdg01_pb_141"
+                        "property-value": "zhvf6aepdg01_pb_141"
                       }
                     ]
                   },
@@ -16519,7 +16519,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6aepdg01_pb_131"
+                        "property-value": "zhvf6aepdg01_pb_131"
                       }
                     ]
                   },
@@ -16536,7 +16536,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6aepdg01_pb_142"
+                        "property-value": "zhvf6aepdg01_pb_142"
                       }
                     ]
                   },
@@ -16709,7 +16709,7 @@
             },
             {
               "service-instance-id": "18bbb764-e510-470f-bf79-daeb2a19164f",
-              "service-instance-name": "Instance_MobilityServer_294356",
+              "service-instance-name": "Instance_EmanuelServer_294356",
               "service-type": "",
               "service-role": "",
               "environment-context": "General_Revenue-Bearing",
@@ -16826,11 +16826,11 @@
                   {
                     "related-to": "project",
                     "relationship-label": "org.onap.relationships.inventory.Uses",
-                    "related-link": "/aai/v12/business/projects/project/Nimbus",
+                    "related-link": "/aai/v12/business/projects/project/Kennedy",
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "Nimbus"
+                        "relationship-value": "Kennedy"
                       }
                     ]
                   },
@@ -16864,11 +16864,11 @@
                   {
                     "related-to": "project",
                     "relationship-label": "org.onap.relationships.inventory.Uses",
-                    "related-link": "/aai/v12/business/projects/project/Nimbus",
+                    "related-link": "/aai/v12/business/projects/project/Kennedy",
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "Nimbus"
+                        "relationship-value": "Kennedy"
                       }
                     ]
                   },
@@ -16905,7 +16905,7 @@
             },
             {
               "service-instance-id": "cfc38218-a288-4ada-a75d-c227d2d9d2c9",
-              "service-instance-name": "HNGW_prov_net_svc_lll_010917",
+              "service-instance-name": "Rosema_prov_net_svc_lll_010917",
               "model-invariant-id": "8f6faa7a-7fd5-4874-9312-b5b194a2e482",
               "resource-version": "1494001793238"
             },
@@ -16930,7 +16930,7 @@
                     "related-to-property": [
                       {
                         "property-key": "l3-network.network-name",
-                        "property-value": "HNGW_OAM_NET_AIC_30_02"
+                        "property-value": "Rosema_OAM_NET_AIC_30_02"
                       }
                     ]
                   }
@@ -16939,7 +16939,7 @@
             },
             {
               "service-instance-id": "ea08d0f5-6fae-4e25-9eae-11bf4dc6c321",
-              "service-instance-name": "Service_Test1702_HNGWOAMNETVTO_001",
+              "service-instance-name": "Service_Test1702_RosemaOAMNETVTO_001",
               "model-invariant-id": "edcff8c1-05a7-4954-9d99-1a71a2ff6536",
               "model-version-id": "b29dc510-99ec-465d-9e20-734e521f3d8b",
               "resource-version": "1494001895673"
@@ -17226,7 +17226,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6aFMBT01_296115b"
+                        "property-value": "zhvf6aFMBT01_296115b"
                       }
                     ]
                   },
@@ -17260,11 +17260,11 @@
                   {
                     "related-to": "project",
                     "relationship-label": "org.onap.relationships.inventory.Uses",
-                    "related-link": "/aai/v12/business/projects/project/Nimbus",
+                    "related-link": "/aai/v12/business/projects/project/Kennedy",
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "Nimbus"
+                        "relationship-value": "Kennedy"
                       }
                     ]
                   },
@@ -17312,7 +17312,7 @@
             },
             {
               "service-instance-id": "02d8c68e-8a98-48e9-a1a0-4fc999ec26e5",
-              "service-instance-name": "SI_PCRF_Test_vnf_01",
+              "service-instance-name": "SI_RODERICK_Test_vnf_01",
               "model-invariant-id": "d2103eaa-8cc7-4422-ad67-1ce582af0097",
               "model-version-id": "5801fed3-b6db-4969-abb4-d1171c4c3202",
               "resource-version": "1497460522960",
@@ -17344,7 +17344,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6aepdg01"
+                        "property-value": "zhvf6aepdg01"
                       }
                     ]
                   },
@@ -17435,7 +17435,7 @@
             },
             {
               "service-instance-id": "89ea3938-8b7e-4103-ae23-dd5a55e14bf2",
-              "service-instance-name": "Service_PCRF_10_17_1610_Test03",
+              "service-instance-name": "Service_RODERICK_10_17_1610_Test03",
               "model-invariant-id": "103e2e96-97fa-4f9d-8969-f56cc6be9871",
               "model-version-id": "5ab337b0-49cf-4a93-a123-9dc3b35b2ce1",
               "resource-version": "1494002071522",
@@ -17454,7 +17454,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "VNF_PCRF_10_17_Test_05"
+                        "property-value": "VNF_RODERICK_10_17_Test_05"
                       }
                     ]
                   }
@@ -17477,11 +17477,11 @@
                   {
                     "related-to": "project",
                     "relationship-label": "org.onap.relationships.inventory.Uses",
-                    "related-link": "/aai/v12/business/projects/project/Nimbus",
+                    "related-link": "/aai/v12/business/projects/project/Kennedy",
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "Nimbus"
+                        "relationship-value": "Kennedy"
                       }
                     ]
                   },
@@ -17542,7 +17542,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6aFMBT01_rs"
+                        "property-value": "zhvf6aFMBT01_rs"
                       }
                     ]
                   },
@@ -17726,7 +17726,7 @@
             },
             {
               "service-instance-id": "10865c41-8423-4ccd-ae24-07dcd5da621c",
-              "service-instance-name": "SI_PCRF_Test_02",
+              "service-instance-name": "SI_RODERICK_Test_02",
               "model-invariant-id": "f27484eb-7ee8-40d7-b2ff-7fd5a9133a10",
               "model-version-id": "101262c3-74b1-4632-8b60-977770b651d3",
               "resource-version": "1496839043578",
@@ -18203,14 +18203,14 @@
             },
             {
               "service-instance-id": "886c4464-3f36-47bc-9743-eaf1f1ebc748",
-              "service-instance-name": "HNGW_AIC_Service_01",
+              "service-instance-name": "Rosema_AIC_Service_01",
               "model-invariant-id": "85a1d941-a353-46fc-afee-73a70e019c8a",
               "model-version-id": "d885f626-0a61-45fd-8546-04daa2198561",
               "resource-version": "1494001974066"
             },
             {
               "service-instance-id": "8d31a1d9-8977-41c9-937a-dc768450f63a",
-              "service-instance-name": "Mobility_OEY_Project_Nimbus",
+              "service-instance-name": "Emanuel_OEY_Project_Kennedy",
               "service-type": "",
               "service-role": "",
               "environment-context": "null",
@@ -18224,11 +18224,11 @@
                   {
                     "related-to": "project",
                     "relationship-label": "org.onap.relationships.inventory.Uses",
-                    "related-link": "/aai/v12/business/projects/project/Nimbus",
+                    "related-link": "/aai/v12/business/projects/project/Kennedy",
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "Nimbus"
+                        "relationship-value": "Kennedy"
                       }
                     ]
                   },
@@ -18288,7 +18288,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6afapn01dns01_module_1"
+                        "property-value": "zhvf6afapn01dns01_module_1"
                       }
                     ]
                   }
@@ -18344,7 +18344,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6vprobe01"
+                        "property-value": "zhvf6vprobe01"
                       }
                     ]
                   },
@@ -18409,7 +18409,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6affad01_qwe_03"
+                        "property-value": "zhvf6affad01_qwe_03"
                       }
                     ]
                   },
@@ -18879,7 +18879,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6amdns02_rk_16"
+                        "property-value": "zhvf6amdns02_rk_16"
                       }
                     ]
                   },
@@ -18899,7 +18899,7 @@
             },
             {
               "service-instance-id": "74608b03-fe0b-4539-ac66-7236e7d2f0cf",
-              "service-instance-name": "Service_HNGW_Test1702_01",
+              "service-instance-name": "Service_Rosema_Test1702_01",
               "model-invariant-id": "cc1db61e-1d9f-4b64-91ec-6844d922c584",
               "model-version-id": "374a0a81-cb42-4ed5-a5fb-5a0bec102f82",
               "resource-version": "1494001769907",
@@ -18918,7 +18918,7 @@
                     "related-to-property": [
                       {
                         "property-key": "l3-network.network-name",
-                        "property-value": "HNGW_OAM_NET_VTO_30_01"
+                        "property-value": "Rosema_OAM_NET_VTO_30_01"
                       }
                     ]
                   }
@@ -18939,7 +18939,7 @@
             },
             {
               "service-instance-id": "fcca3de3-609d-4796-a488-811243d29345",
-              "service-instance-name": "Mobility_VSP",
+              "service-instance-name": "Emanuel_VSP",
               "service-type": "vVoicemail",
               "service-role": "",
               "environment-context": "null",
@@ -18994,7 +18994,7 @@
             },
             {
               "service-instance-id": "d7cd586c-457f-4e49-93fe-71e923b0f1fb",
-              "service-instance-name": "RG_5-16_vMMSC_Srvc_DS_0614_01",
+              "service-instance-name": "RG_5-16_vWINIFRED_Srvc_DS_0614_01",
               "model-invariant-id": "fd0ee2a5-2596-4d7b-97a1-b2932a6498be",
               "model-version-id": "d6b5e8ca-4db3-433f-8eba-414019a2989c",
               "resource-version": "1497463580269",
@@ -19008,7 +19008,7 @@
             },
             {
               "service-instance-id": "8da51d4e-5fa6-4e45-b828-11807e6dad49",
-              "service-instance-name": "mdns_2017_1011_IST_Service_realMSO",
+              "service-instance-name": "CHARLOTTE_2017_1011_IST_Service_realMSO",
               "service-type": "",
               "service-role": "",
               "environment-context": "General_Revenue-Bearing",
@@ -19035,7 +19035,7 @@
             },
             {
               "service-instance-id": "a3816027-6d74-490b-8f4e-303e6cb929c3",
-              "service-instance-name": "mdns_2017_1011_IST_Service_CSI",
+              "service-instance-name": "CHARLOTTE_2017_1011_IST_Service_CSI",
               "service-type": "",
               "service-role": "",
               "environment-context": "General_Revenue-Bearing",
@@ -19070,7 +19070,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "mdns_2017_1011_IST_Service_CVNF"
+                        "property-value": "CHARLOTTE_2017_1011_IST_Service_CVNF"
                       }
                     ]
                   },
@@ -19139,7 +19139,7 @@
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "DFW"
+                        "relationship-value": "WATKINS"
                       }
                     ]
                   },
@@ -19186,7 +19186,7 @@
             },
             {
               "service-instance-id": "6b547a48-e745-42ee-92f0-b049b733a001",
-              "service-instance-name": "HNPortalOAM_service",
+              "service-instance-name": "WILKINSOAM_service",
               "model-invariant-id": "5860f54e-020e-4466-80d6-972aef91e524",
               "resource-version": "1494001992133"
             },
@@ -19271,7 +19271,7 @@
             },
             {
               "service-instance-id": "c0531062-0f58-4ffd-9b32-f4eb84687ab1",
-              "service-instance-name": "Mobility_Server_294356_115b_rk_01",
+              "service-instance-name": "Emanuel_Server_294356_115b_rk_01",
               "service-type": "",
               "service-role": "",
               "environment-context": "General_Revenue-Bearing",
@@ -19295,7 +19295,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6amobility_Server_115b_rk_01"
+                        "property-value": "zhvf6aemanuel_Server_115b_rk_01"
                       }
                     ]
                   },
@@ -19360,7 +19360,7 @@
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "DFW"
+                        "relationship-value": "WATKINS"
                       }
                     ]
                   },
@@ -19394,11 +19394,11 @@
                   {
                     "related-to": "project",
                     "relationship-label": "org.onap.relationships.inventory.Uses",
-                    "related-link": "/aai/v12/business/projects/project/Nimbus",
+                    "related-link": "/aai/v12/business/projects/project/Kennedy",
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "Nimbus"
+                        "relationship-value": "Kennedy"
                       }
                     ]
                   },
@@ -19514,7 +19514,7 @@
             },
             {
               "service-instance-id": "1f7a317b-119c-4814-8856-094732ae50aa",
-              "service-instance-name": "Mobility_VSP_Service_PB",
+              "service-instance-name": "Emanuel_VSP_Service_PB",
               "service-type": "",
               "service-role": "",
               "model-invariant-id": "f60ed211-2780-40ea-9d05-94c214e0be5c",
@@ -19536,7 +19536,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "Mobility_VSP_Service_PB_01_VnF"
+                        "property-value": "Emanuel_VSP_Service_PB_01_VnF"
                       }
                     ]
                   },
@@ -19553,7 +19553,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "Mobility_VSP_Service_PB_2"
+                        "property-value": "Emanuel_VSP_Service_PB_2"
                       }
                     ]
                   }
@@ -19638,7 +19638,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6abfprb01"
+                        "property-value": "zhvf6abfprb01"
                       }
                     ]
                   },
@@ -19665,7 +19665,7 @@
             },
             {
               "service-instance-id": "f1fd6c38-7844-45bc-afe6-f4c7912d2e67",
-              "service-instance-name": "Service_HNGW_OAM_NET_AIC_30_Test1702",
+              "service-instance-name": "Service_Rosema_OAM_NET_AIC_30_Test1702",
               "model-invariant-id": "85a1d941-a353-46fc-afee-73a70e019c8a",
               "model-version-id": "d885f626-0a61-45fd-8546-04daa2198561",
               "resource-version": "1494002012869"
@@ -19696,7 +19696,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6aepdg01_un_601"
+                        "property-value": "zhvf6aepdg01_un_601"
                       }
                     ]
                   },
@@ -19782,7 +19782,7 @@
             },
             {
               "service-instance-id": "ece338b0-05ae-481d-bbe0-1fd1aea1fa10",
-              "service-instance-name": "mDNS_1206_pmtest_v3",
+              "service-instance-name": "CHARLOTTE_1206_pmtest_v3",
               "service-type": "",
               "service-role": "",
               "environment-context": "General_Revenue-Bearing",
@@ -19882,7 +19882,7 @@
             },
             {
               "service-instance-id": "8d58adb8-764e-492f-9d9f-5ff6a5614e77",
-              "service-instance-name": "Mobility_Server_294356_Pb",
+              "service-instance-name": "Emanuel_Server_294356_Pb",
               "service-type": "",
               "service-role": "",
               "environment-context": "General_Revenue-Bearing",
@@ -19896,11 +19896,11 @@
                   {
                     "related-to": "project",
                     "relationship-label": "org.onap.relationships.inventory.Uses",
-                    "related-link": "/aai/v12/business/projects/project/Nimbus",
+                    "related-link": "/aai/v12/business/projects/project/Kennedy",
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "Nimbus"
+                        "relationship-value": "Kennedy"
                       }
                     ]
                   },
@@ -19917,7 +19917,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6amts001"
+                        "property-value": "zhvf6amts001"
                       }
                     ]
                   },
@@ -19959,11 +19959,11 @@
                   {
                     "related-to": "project",
                     "relationship-label": "org.onap.relationships.inventory.Uses",
-                    "related-link": "/aai/v12/business/projects/project/Nimbus",
+                    "related-link": "/aai/v12/business/projects/project/Kennedy",
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "Nimbus"
+                        "relationship-value": "Kennedy"
                       }
                     ]
                   },
@@ -20018,7 +20018,7 @@
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "DFW"
+                        "relationship-value": "WATKINS"
                       }
                     ]
                   },
@@ -20284,7 +20284,7 @@
             },
             {
               "service-instance-id": "dc1f1b7f-64a2-4b8c-ae92-4de8d6c02efe",
-              "service-instance-name": "Mobility_VSP_Service_01",
+              "service-instance-name": "Emanuel_VSP_Service_01",
               "service-type": "vVoicemail",
               "service-role": "",
               "environment-context": "null",
@@ -20617,7 +20617,7 @@
             },
             {
               "service-instance-id": "e9f63a01-0615-4a4d-9998-a34b8832fcd4",
-              "service-instance-name": "z_mdns_2017_1011_IST_Service_CSInstance",
+              "service-instance-name": "z_CHARLOTTE_2017_1011_IST_Service_CSInstance",
               "service-type": "",
               "service-role": "",
               "environment-context": "General_Revenue-Bearing",
@@ -20652,7 +20652,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "z_mdns_2017_1011_IST_Service_CVNFunction"
+                        "property-value": "z_CHARLOTTE_2017_1011_IST_Service_CVNFunction"
                       }
                     ]
                   },
@@ -20707,7 +20707,7 @@
             },
             {
               "service-instance-id": "ec884145-dbe8-4228-8165-f0c4d7123f8b",
-              "service-instance-name": "abc_mdns_2017_1011_IST_Service_CSI",
+              "service-instance-name": "abc_CHARLOTTE_2017_1011_IST_Service_CSI",
               "service-type": "",
               "service-role": "",
               "environment-context": "General_Revenue-Bearing",
@@ -20742,7 +20742,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "abc_mdns_2017_1011_IST_Service_CVNF"
+                        "property-value": "abc_CHARLOTTE_2017_1011_IST_Service_CVNF"
                       }
                     ]
                   },
@@ -20795,7 +20795,7 @@
             },
             {
               "service-instance-id": "d3156836-aca9-4f46-9324-7cb85ef31126",
-              "service-instance-name": "q_mdns_2017_1011_IST_Service_CSI",
+              "service-instance-name": "q_CHARLOTTE_2017_1011_IST_Service_CSI",
               "service-type": "",
               "service-role": "",
               "environment-context": "General_Revenue-Bearing",
@@ -20830,7 +20830,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "q_mdns_2017_1011_IST_Service_CVNF"
+                        "property-value": "q_CHARLOTTE_2017_1011_IST_Service_CVNF"
                       }
                     ]
                   },
@@ -20894,7 +20894,7 @@
             },
             {
               "service-instance-id": "5b098953-0820-4080-bcba-cbd6906ea8ac",
-              "service-instance-name": "Service_Idan_vSCP_AIC3.0_1610-9-23_Test-1",
+              "service-instance-name": "Service_Idan_vEsmeralda_AIC3.0_1610-9-23_Test-1",
               "model-invariant-id": "36523af8-18fa-4b75-9280-4f533c7da260",
               "resource-version": "1494002005482"
             },
@@ -20989,11 +20989,11 @@
                   {
                     "related-to": "project",
                     "relationship-label": "org.onap.relationships.inventory.Uses",
-                    "related-link": "/aai/v12/business/projects/project/Nimbus",
+                    "related-link": "/aai/v12/business/projects/project/Kennedy",
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "Nimbus"
+                        "relationship-value": "Kennedy"
                       }
                     ]
                   },
@@ -21010,7 +21010,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6afprb02_pj"
+                        "property-value": "zhvf6afprb02_pj"
                       }
                     ]
                   },
@@ -21068,7 +21068,7 @@
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "DFW"
+                        "relationship-value": "WATKINS"
                       }
                     ]
                   },
@@ -21473,11 +21473,11 @@
                   {
                     "related-to": "project",
                     "relationship-label": "org.onap.relationships.inventory.Uses",
-                    "related-link": "/aai/v12/business/projects/project/Nimbus",
+                    "related-link": "/aai/v12/business/projects/project/Kennedy",
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "Nimbus"
+                        "relationship-value": "Kennedy"
                       }
                     ]
                   },
@@ -21577,11 +21577,11 @@
                   {
                     "related-to": "project",
                     "relationship-label": "org.onap.relationships.inventory.Uses",
-                    "related-link": "/aai/v12/business/projects/project/Nimbus",
+                    "related-link": "/aai/v12/business/projects/project/Kennedy",
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "Nimbus"
+                        "relationship-value": "Kennedy"
                       }
                     ]
                   },
@@ -21664,7 +21664,7 @@
             },
             {
               "service-instance-id": "554fe72b-0874-4816-a83d-b3e8f2458fba",
-              "service-instance-name": "Service_Robot_Test_HNGW_01",
+              "service-instance-name": "Service_Robot_Test_Rosema_01",
               "model-invariant-id": "85a1d941-a353-46fc-afee-73a70e019c8a",
               "model-version-id": "d885f626-0a61-45fd-8546-04daa2198561",
               "resource-version": "1494001815772"
@@ -21707,7 +21707,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6aepdg01_pb_123"
+                        "property-value": "zhvf6aepdg01_pb_123"
                       }
                     ]
                   },
@@ -22024,7 +22024,7 @@
             },
             {
               "service-instance-id": "6c5ae371-d8de-49fa-8fdd-79b782dfd896",
-              "service-instance-name": "PREIST_MDNS_ServiceInstance",
+              "service-instance-name": "PREIST_CHARLOTTE_ServiceInstance",
               "service-type": "",
               "service-role": "",
               "environment-context": "General_Revenue-Bearing",
@@ -22048,7 +22048,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "PREIST_MDNS_VNFInstance"
+                        "property-value": "PREIST_CHARLOTTE_VNFInstance"
                       }
                     ]
                   }
@@ -22084,7 +22084,7 @@
             },
             {
               "service-instance-id": "3afa7504-be8c-4fb1-b6c2-071f78faee18",
-              "service-instance-name": "mDNS_preload_1710_0914_01",
+              "service-instance-name": "CHARLOTTE_preload_1710_0914_01",
               "service-type": "",
               "service-role": "",
               "model-invariant-id": "d03a321a-01b2-4d79-95f4-df10d8214fba",
@@ -22105,7 +22105,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "mDNS_preload_1710_0914_01"
+                        "property-value": "CHARLOTTE_preload_1710_0914_01"
                       }
                     ]
                   }
@@ -22177,7 +22177,7 @@
             },
             {
               "service-instance-id": "fff595a8-747a-4157-8d16-309411c9594b",
-              "service-instance-name": "mdns_2017_1011_IST_Service_01",
+              "service-instance-name": "CHARLOTTE_2017_1011_IST_Service_01",
               "service-type": "",
               "service-role": "",
               "environment-context": "General_Revenue-Bearing",
@@ -22201,7 +22201,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6amdns02_un_01"
+                        "property-value": "zhvf6amdns02_un_01"
                       }
                     ]
                   },
@@ -22655,7 +22655,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6amdns02_rk_01"
+                        "property-value": "zhvf6amdns02_rk_01"
                       }
                     ]
                   },
@@ -22849,7 +22849,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6affad01_un_01"
+                        "property-value": "zhvf6affad01_un_01"
                       }
                     ]
                   },
@@ -22876,7 +22876,7 @@
             },
             {
               "service-instance-id": "0f77ec28-2e63-4045-8ac4-0ce399a91fbd",
-              "service-instance-name": "Service_mdns_mobility",
+              "service-instance-name": "Service_CHARLOTTE_emanuel",
               "service-type": "",
               "service-role": "",
               "environment-context": "General_Non-Revenue",
@@ -23140,7 +23140,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "mobilityyyyyy"
+                        "property-value": "emanuelyyyyy"
                       }
                     ]
                   },
@@ -23182,11 +23182,11 @@
                   {
                     "related-to": "project",
                     "relationship-label": "org.onap.relationships.inventory.Uses",
-                    "related-link": "/aai/v12/business/projects/project/Nimbus",
+                    "related-link": "/aai/v12/business/projects/project/Kennedy",
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "Nimbus"
+                        "relationship-value": "Kennedy"
                       }
                     ]
                   },
@@ -23276,7 +23276,7 @@
             },
             {
               "service-instance-id": "381ea672-599e-4919-b3c8-e1b9a2fc0a25",
-              "service-instance-name": "Service_HNGW_AIC_4",
+              "service-instance-name": "Service_Rosema_AIC_4",
               "model-invariant-id": "85a1d941-a353-46fc-afee-73a70e019c8a",
               "model-version-id": "d885f626-0a61-45fd-8546-04daa2198561",
               "resource-version": "1494001975016"
@@ -23342,11 +23342,11 @@
                   {
                     "related-to": "project",
                     "relationship-label": "org.onap.relationships.inventory.Uses",
-                    "related-link": "/aai/v12/business/projects/project/Nimbus",
+                    "related-link": "/aai/v12/business/projects/project/Kennedy",
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "Nimbus"
+                        "relationship-value": "Kennedy"
                       }
                     ]
                   },
@@ -23420,11 +23420,11 @@
                   {
                     "related-to": "project",
                     "relationship-label": "org.onap.relationships.inventory.Uses",
-                    "related-link": "/aai/v12/business/projects/project/Nimbus",
+                    "related-link": "/aai/v12/business/projects/project/Kennedy",
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "Nimbus"
+                        "relationship-value": "Kennedy"
                       }
                     ]
                   },
@@ -23441,7 +23441,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6fprb01"
+                        "property-value": "zhvf6fprb01"
                       }
                     ]
                   },
@@ -23490,7 +23490,7 @@
             },
             {
               "service-instance-id": "d3a60493-3b46-4c49-be6f-2ea2a5d371d7",
-              "service-instance-name": "SI_PCRF_Test1707_11",
+              "service-instance-name": "SI_RODERICK_Test1707_11",
               "model-invariant-id": "d2103eaa-8cc7-4422-ad67-1ce582af0097",
               "model-version-id": "5801fed3-b6db-4969-abb4-d1171c4c3202",
               "resource-version": "1498141423646",
@@ -23547,11 +23547,11 @@
                   {
                     "related-to": "project",
                     "relationship-label": "org.onap.relationships.inventory.Uses",
-                    "related-link": "/aai/v12/business/projects/project/Nimbus",
+                    "related-link": "/aai/v12/business/projects/project/Kennedy",
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "Nimbus"
+                        "relationship-value": "Kennedy"
                       }
                     ]
                   },
@@ -23864,7 +23864,7 @@
             },
             {
               "service-instance-id": "0d2a39c5-fc33-42b7-a7be-49740cfd411b",
-              "service-instance-name": "Steph_Preload_Demo_Service_for_mDNS_05_07",
+              "service-instance-name": "Steph_Preload_Demo_Service_for_CHARLOTTE_05_07",
               "model-invariant-id": "2c39974c-7cbf-4f61-aec6-b43e26e3e199",
               "model-version-id": "a58640fd-d419-410c-b023-ff7081d4d8d3",
               "resource-version": "1499286765483",
@@ -23906,7 +23906,7 @@
             },
             {
               "service-instance-id": "7c8df66e-b8e1-470f-9e22-1e20cbc28c4c",
-              "service-instance-name": "Service_mdns_mobility_PB_01",
+              "service-instance-name": "Service_CHARLOTTE_emanuel_PB_01",
               "service-type": "",
               "service-role": "",
               "model-invariant-id": "b399ddef-4d8c-48c4-88c5-d4cb0f8b4678",
@@ -23928,7 +23928,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "Service_mdns_mobility_PB_01_VNF"
+                        "property-value": "Service_CHARLOTTE_emanuel_PB_01_VNF"
                       }
                     ]
                   }
@@ -24124,11 +24124,11 @@
                   {
                     "related-to": "project",
                     "relationship-label": "org.onap.relationships.inventory.Uses",
-                    "related-link": "/aai/v12/business/projects/project/Nimbus",
+                    "related-link": "/aai/v12/business/projects/project/Kennedy",
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "Nimbus"
+                        "relationship-value": "Kennedy"
                       }
                     ]
                   },
@@ -24145,7 +24145,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6afprb01_pj"
+                        "property-value": "zhvf6afprb01_pj"
                       }
                     ]
                   },
@@ -24216,7 +24216,7 @@
             },
             {
               "service-instance-id": "bbe206af-c2cb-4575-897a-8090b22b6d8c",
-              "service-instance-name": "Service_Test_HNGWOAM_02",
+              "service-instance-name": "Service_Test_RosemaOAM_02",
               "model-invariant-id": "cc1db61e-1d9f-4b64-91ec-6844d922c584",
               "model-version-id": "374a0a81-cb42-4ed5-a5fb-5a0bec102f82",
               "resource-version": "1494001983344"
@@ -24364,7 +24364,7 @@
             },
             {
               "service-instance-id": "d57c2641-472b-4840-a51f-f8ce12e162b3",
-              "service-instance-name": "mobility_vid_test_789",
+              "service-instance-name": "emanuel_vid_test_789",
               "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3",
               "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586",
               "resource-version": "1500399147743",
@@ -24419,7 +24419,7 @@
             },
             {
               "service-instance-id": "73f7512d-1497-49c1-a41d-76f198dd0207",
-              "service-instance-name": "Service_Test1702_HNGWOAMNETAIC30_01",
+              "service-instance-name": "Service_Test1702_RosemaOAMNETAIC30_01",
               "model-invariant-id": "85a1d941-a353-46fc-afee-73a70e019c8a",
               "model-version-id": "d885f626-0a61-45fd-8546-04daa2198561",
               "resource-version": "1494001918414"
@@ -24505,11 +24505,11 @@
                   {
                     "related-to": "project",
                     "relationship-label": "org.onap.relationships.inventory.Uses",
-                    "related-link": "/aai/v12/business/projects/project/Nimbus",
+                    "related-link": "/aai/v12/business/projects/project/Kennedy",
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "Nimbus"
+                        "relationship-value": "Kennedy"
                       }
                     ]
                   },
@@ -24632,7 +24632,7 @@
             },
             {
               "service-instance-id": "fdc8e231-12a5-4f7a-a9fe-b372f1c40d83",
-              "service-instance-name": "mdns_2017_1011_IST_Service_createInstance",
+              "service-instance-name": "CHARLOTTE_2017_1011_IST_Service_createInstance",
               "service-type": "",
               "service-role": "",
               "environment-context": "General_Revenue-Bearing",
@@ -24667,7 +24667,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "mdns_2017_1011_IST_Service_createVNF"
+                        "property-value": "CHARLOTTE_2017_1011_IST_Service_createVNF"
                       }
                     ]
                   },
@@ -24722,7 +24722,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6abfprb02"
+                        "property-value": "zhvf6abfprb02"
                       }
                     ]
                   },
@@ -24769,11 +24769,11 @@
                   {
                     "related-to": "project",
                     "relationship-label": "org.onap.relationships.inventory.Uses",
-                    "related-link": "/aai/v12/business/projects/project/Nimbus",
+                    "related-link": "/aai/v12/business/projects/project/Kennedy",
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "Nimbus"
+                        "relationship-value": "Kennedy"
                       }
                     ]
                   },
@@ -24836,7 +24836,7 @@
             },
             {
               "service-instance-id": "e688ac1d-8b10-48ac-8b57-80f18a57fdb2",
-              "service-instance-name": "HNPortalOAMnet_2",
+              "service-instance-name": "WILKINSOAMnet_2",
               "model-invariant-id": "5860f54e-020e-4466-80d6-972aef91e524",
               "resource-version": "1494001767696"
             },
@@ -24856,11 +24856,11 @@
                   {
                     "related-to": "project",
                     "relationship-label": "org.onap.relationships.inventory.Uses",
-                    "related-link": "/aai/v12/business/projects/project/Nimbus",
+                    "related-link": "/aai/v12/business/projects/project/Kennedy",
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "Nimbus"
+                        "relationship-value": "Kennedy"
                       }
                     ]
                   },
@@ -25232,7 +25232,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6amdns02_rk_23"
+                        "property-value": "zhvf6amdns02_rk_23"
                       }
                     ]
                   },
@@ -25364,7 +25364,7 @@
             },
             {
               "service-instance-id": "744b9082-7419-4b6f-99f9-cf1302ce5fe3",
-              "service-instance-name": "Mobility_ProjectName_OE_Name_DFW_oe40",
+              "service-instance-name": "Emanuel_ProjectName_OE_Name_DFW_oe40",
               "service-type": "",
               "service-role": "",
               "environment-context": "null",
@@ -25382,7 +25382,7 @@
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "DFW"
+                        "relationship-value": "WATKINS"
                       }
                     ]
                   },
@@ -25434,7 +25434,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6amdns02_rk_15"
+                        "property-value": "zhvf6amdns02_rk_15"
                       }
                     ]
                   },
@@ -25505,13 +25505,13 @@
             },
             {
               "service-instance-id": "61c9d61c-3588-4b11-8495-c11c0ac1319f",
-              "service-instance-name": "Service_Idan_vSCP_AIC3.0_1610_Test01",
+              "service-instance-name": "Service_Idan_vEsmeralda_AIC3.0_1610_Test01",
               "model-invariant-id": "36523af8-18fa-4b75-9280-4f533c7da260",
               "resource-version": "1494001977459"
             },
             {
               "service-instance-id": "53a26982-5f2b-4985-a3c9-ffe41a887336",
-              "service-instance-name": "Service_Test_1707_PCRF_01",
+              "service-instance-name": "Service_Test_1707_RODERICK_01",
               "model-version-id": "a609e05a-fbf0-4850-b03b-75d50f9232e4",
               "resource-version": "1494001920123",
               "relationship-list": {
@@ -25529,7 +25529,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "VNF_Test_PCRF_01"
+                        "property-value": "VNF_Test_RODERICK_01"
                       }
                     ]
                   },
@@ -25572,7 +25572,7 @@
             },
             {
               "service-instance-id": "db553133-d8f1-441a-b86c-84b5ff0b6e9f",
-              "service-instance-name": "SI_PCRF_Test_mso_01",
+              "service-instance-name": "SI_RODERICK_Test_mso_01",
               "model-invariant-id": "b1ed0d58-0700-4631-be18-d2f1e527d637",
               "model-version-id": "849a6347-cca7-4ae6-b5c2-7d41e9f6d9b2",
               "resource-version": "1497633595024",
@@ -25635,7 +25635,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6amdns02_rk_22"
+                        "property-value": "zhvf6amdns02_rk_22"
                       }
                     ]
                   },
@@ -25984,11 +25984,11 @@
                   {
                     "related-to": "project",
                     "relationship-label": "org.onap.relationships.inventory.Uses",
-                    "related-link": "/aai/v12/business/projects/project/Nimbus",
+                    "related-link": "/aai/v12/business/projects/project/Kennedy",
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "Nimbus"
+                        "relationship-value": "Kennedy"
                       }
                     ]
                   },
@@ -26104,7 +26104,7 @@
             },
             {
               "service-instance-id": "24566aea-f633-4032-82b3-7158b3db8f05",
-              "service-instance-name": "pr_mdns_2017_1011_IST_Service_CSI",
+              "service-instance-name": "pr_CHARLOTTE_2017_1011_IST_Service_CSI",
               "service-type": "",
               "service-role": "",
               "environment-context": "General_Revenue-Bearing",
@@ -26139,7 +26139,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "pr_mdns_2017_1011_IST_Service_CVNF"
+                        "property-value": "pr_CHARLOTTE_2017_1011_IST_Service_CVNF"
                       }
                     ]
                   },
@@ -26332,7 +26332,7 @@
             },
             {
               "service-instance-id": "04f7dfd3-12a7-479d-94be-c5da2fd8e96f",
-              "service-instance-name": "mdns_2017_1011_IST_Service_2410",
+              "service-instance-name": "CHARLOTTE_2017_1011_IST_Service_2410",
               "service-type": "",
               "service-role": "",
               "environment-context": "General_Revenue-Bearing",
@@ -26356,7 +26356,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6amdns02_un_02"
+                        "property-value": "zhvf6amdns02_un_02"
                       }
                     ]
                   },
@@ -26414,7 +26414,7 @@
             },
             {
               "service-instance-id": "3266e8c0-70bd-43c7-8c00-377be595f60c",
-              "service-instance-name": "Mobility_VSP_Service_04",
+              "service-instance-name": "Emanuel_VSP_Service_04",
               "service-type": "vVoicemail",
               "service-role": "",
               "environment-context": "null",
@@ -26438,7 +26438,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6amdns01_module_3"
+                        "property-value": "zhvf6amdns01_module_3"
                       }
                     ]
                   }
@@ -26557,15 +26557,15 @@
             {
               "related-to": "tenant",
               "relationship-label": "org.onap.relationships.inventory.Uses",
-              "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/fe4400a8e96e4caa85ccdca8a850255b",
+              "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/fe4400a8e96e4caa85ccdca8a850255b",
               "relationship-data": [
                 {
                   "relationship-key": "cloud-region.cloud-owner",
-                  "relationship-value": "att-aic"
+                  "relationship-value": "irma-aic"
                 },
                 {
                   "relationship-key": "cloud-region.cloud-region-id",
-                  "relationship-value": "mtn6"
+                  "relationship-value": "hvf6"
                 },
                 {
                   "relationship-key": "tenant.tenant-id",
@@ -26582,15 +26582,15 @@
             {
               "related-to": "tenant",
               "relationship-label": "org.onap.relationships.inventory.Uses",
-              "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/a259ae7b7c3f493cb3d91f95a7c18149",
+              "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/a259ae7b7c3f493cb3d91f95a7c18149",
               "relationship-data": [
                 {
                   "relationship-key": "cloud-region.cloud-owner",
-                  "relationship-value": "att-aic"
+                  "relationship-value": "irma-aic"
                 },
                 {
                   "relationship-key": "cloud-region.cloud-region-id",
-                  "relationship-value": "mtn6"
+                  "relationship-value": "hvf6"
                 },
                 {
                   "relationship-key": "tenant.tenant-id",
@@ -26607,15 +26607,15 @@
             {
               "related-to": "tenant",
               "relationship-label": "org.onap.relationships.inventory.Uses",
-              "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn16/tenants/tenant/a259ae7b7c3f493cb3d91f95a7c18149",
+              "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf16/tenants/tenant/a259ae7b7c3f493cb3d91f95a7c18149",
               "relationship-data": [
                 {
                   "relationship-key": "cloud-region.cloud-owner",
-                  "relationship-value": "att-aic"
+                  "relationship-value": "irma-aic"
                 },
                 {
                   "relationship-key": "cloud-region.cloud-region-id",
-                  "relationship-value": "mtn16"
+                  "relationship-value": "hvf16"
                 },
                 {
                   "relationship-key": "tenant.tenant-id",
@@ -26682,15 +26682,15 @@
             {
               "related-to": "tenant",
               "relationship-label": "org.onap.relationships.inventory.Uses",
-              "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/c2609b7252b6484d89432611cfb2491b",
+              "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/c2609b7252b6484d89432611cfb2491b",
               "relationship-data": [
                 {
                   "relationship-key": "cloud-region.cloud-owner",
-                  "relationship-value": "att-aic"
+                  "relationship-value": "irma-aic"
                 },
                 {
                   "relationship-key": "cloud-region.cloud-region-id",
-                  "relationship-value": "mtn6"
+                  "relationship-value": "hvf6"
                 },
                 {
                   "relationship-key": "tenant.tenant-id",
@@ -26732,15 +26732,15 @@
             {
               "related-to": "tenant",
               "relationship-label": "org.onap.relationships.inventory.Uses",
-              "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/1eddb590b7f04e9890bceeef9e591333",
+              "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/1eddb590b7f04e9890bceeef9e591333",
               "relationship-data": [
                 {
                   "relationship-key": "cloud-region.cloud-owner",
-                  "relationship-value": "att-aic"
+                  "relationship-value": "irma-aic"
                 },
                 {
                   "relationship-key": "cloud-region.cloud-region-id",
-                  "relationship-value": "mtn6"
+                  "relationship-value": "hvf6"
                 },
                 {
                   "relationship-key": "tenant.tenant-id",
@@ -26757,15 +26757,15 @@
             {
               "related-to": "tenant",
               "relationship-label": "org.onap.relationships.inventory.Uses",
-              "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/579d80c0cf754d1e9f1ddc2cdc1701e3",
+              "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/579d80c0cf754d1e9f1ddc2cdc1701e3",
               "relationship-data": [
                 {
                   "relationship-key": "cloud-region.cloud-owner",
-                  "relationship-value": "att-aic"
+                  "relationship-value": "irma-aic"
                 },
                 {
                   "relationship-key": "cloud-region.cloud-region-id",
-                  "relationship-value": "mtn6"
+                  "relationship-value": "hvf6"
                 },
                 {
                   "relationship-key": "tenant.tenant-id",
@@ -26782,15 +26782,15 @@
             {
               "related-to": "tenant",
               "relationship-label": "org.onap.relationships.inventory.Uses",
-              "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/2cd3ca9abd25492eb0c6a44bc95fe714",
+              "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/2cd3ca9abd25492eb0c6a44bc95fe714",
               "relationship-data": [
                 {
                   "relationship-key": "cloud-region.cloud-owner",
-                  "relationship-value": "att-aic"
+                  "relationship-value": "irma-aic"
                 },
                 {
                   "relationship-key": "cloud-region.cloud-region-id",
-                  "relationship-value": "mtn6"
+                  "relationship-value": "hvf6"
                 },
                 {
                   "relationship-key": "tenant.tenant-id",
@@ -26906,7 +26906,7 @@
         }
       },
       {
-        "service-type": "vSCP",
+        "service-type": "vEsmeralda",
         "resource-version": "1494001943181",
         "service-instances": {
           "service-instance": [
@@ -27035,7 +27035,7 @@
             },
             {
               "service-instance-id": "4b4bb55a-c31d-47ef-a502-10b8cb515f84",
-              "service-instance-name": "vmee-mor-test-34949",
+              "service-instance-name": "vgeraldine-mor-test-34949",
               "service-type": "",
               "service-role": "",
               "environment-context": "General_Revenue-Bearing",
@@ -27059,7 +27059,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "vmee-vnf-test-9868"
+                        "property-value": "vgeraldine-vnf-test-9868"
                       }
                     ]
                   }
@@ -27086,7 +27086,7 @@
             },
             {
               "service-instance-id": "f416d2f3-92c1-43e3-8d36-2adb10e180bc",
-              "service-instance-name": "oren-adiod",
+              "service-instance-name": "oren-PASQUALE",
               "service-type": "",
               "service-role": "",
               "environment-context": "null",
@@ -27168,7 +27168,7 @@
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "DFW"
+                        "relationship-value": "WATKINS"
                       }
                     ]
                   },
@@ -27328,7 +27328,7 @@
             },
             {
               "service-instance-id": "c3831b9d-40be-4421-b5b8-d516041b45c6",
-              "service-instance-name": "ShaniMobility",
+              "service-instance-name": "ShaniEmanuel",
               "service-type": "",
               "service-role": "",
               "environment-context": "null",
@@ -27393,11 +27393,11 @@
                   {
                     "related-to": "project",
                     "relationship-label": "org.onap.relationships.inventory.Uses",
-                    "related-link": "/aai/v12/business/projects/project/Nimbus",
+                    "related-link": "/aai/v12/business/projects/project/Kennedy",
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "Nimbus"
+                        "relationship-value": "Kennedy"
                       }
                     ]
                   },
@@ -27417,7 +27417,7 @@
             },
             {
               "service-instance-id": "b38e1a8a-894c-408c-a91c-fc1c54901636",
-              "service-instance-name": "Viv+IST+vMMSC",
+              "service-instance-name": "Viv+IST+vWINIFRED",
               "model-invariant-id": "e6f1d393-6432-4820-ab86-7a10ba4b31ac",
               "resource-version": "1494001800547"
             },
@@ -27596,7 +27596,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "RG_1707vidnf_PCRF"
+                        "property-value": "RG_1707vidnf_RODERICK"
                       }
                     ]
                   }
@@ -28506,7 +28506,7 @@
             },
             {
               "service-instance-id": "f9ece995-9b70-48df-83ad-2c358ef650c8",
-              "service-instance-name": "Lital_PXTC-1",
+              "service-instance-name": "Lital_GRANVILLE-1",
               "service-type": "",
               "service-role": "",
               "model-invariant-id": "33447249-7870-4536-a7ea-f827b375222c",
@@ -28629,7 +28629,7 @@
             },
             {
               "service-instance-id": "01633eba-947c-457c-8d37-3c763027d392",
-              "service-instance-name": "Mobility_VSP_Service_DS_0915_01",
+              "service-instance-name": "Emanuel_VSP_Service_DS_0915_01",
               "service-type": "",
               "service-role": "",
               "model-invariant-id": "f60ed211-2780-40ea-9d05-94c214e0be5c",
@@ -28651,7 +28651,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "Mobility_VSP_Vnf_DS_0915_01"
+                        "property-value": "Emanuel_VSP_Vnf_DS_0915_01"
                       }
                     ]
                   }
@@ -28698,7 +28698,7 @@
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "DFW"
+                        "relationship-value": "WATKINS"
                       }
                     ]
                   },
@@ -28732,11 +28732,11 @@
                   {
                     "related-to": "project",
                     "relationship-label": "org.onap.relationships.inventory.Uses",
-                    "related-link": "/aai/v12/business/projects/project/Nimbus",
+                    "related-link": "/aai/v12/business/projects/project/Kennedy",
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "Nimbus"
+                        "relationship-value": "Kennedy"
                       }
                     ]
                   },
@@ -28841,15 +28841,15 @@
             {
               "related-to": "tenant",
               "relationship-label": "org.onap.relationships.inventory.Uses",
-              "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/fe4400a8e96e4caa85ccdca8a850255b",
+              "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/fe4400a8e96e4caa85ccdca8a850255b",
               "relationship-data": [
                 {
                   "relationship-key": "cloud-region.cloud-owner",
-                  "relationship-value": "att-aic"
+                  "relationship-value": "irma-aic"
                 },
                 {
                   "relationship-key": "cloud-region.cloud-region-id",
-                  "relationship-value": "mtn6"
+                  "relationship-value": "hvf6"
                 },
                 {
                   "relationship-key": "tenant.tenant-id",
@@ -28866,15 +28866,15 @@
             {
               "related-to": "tenant",
               "relationship-label": "org.onap.relationships.inventory.Uses",
-              "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/a259ae7b7c3f493cb3d91f95a7c18149",
+              "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/a259ae7b7c3f493cb3d91f95a7c18149",
               "relationship-data": [
                 {
                   "relationship-key": "cloud-region.cloud-owner",
-                  "relationship-value": "att-aic"
+                  "relationship-value": "irma-aic"
                 },
                 {
                   "relationship-key": "cloud-region.cloud-region-id",
-                  "relationship-value": "mtn6"
+                  "relationship-value": "hvf6"
                 },
                 {
                   "relationship-key": "tenant.tenant-id",
@@ -28891,15 +28891,15 @@
             {
               "related-to": "tenant",
               "relationship-label": "org.onap.relationships.inventory.Uses",
-              "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn16/tenants/tenant/a259ae7b7c3f493cb3d91f95a7c18149",
+              "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf16/tenants/tenant/a259ae7b7c3f493cb3d91f95a7c18149",
               "relationship-data": [
                 {
                   "relationship-key": "cloud-region.cloud-owner",
-                  "relationship-value": "att-aic"
+                  "relationship-value": "irma-aic"
                 },
                 {
                   "relationship-key": "cloud-region.cloud-region-id",
-                  "relationship-value": "mtn16"
+                  "relationship-value": "hvf16"
                 },
                 {
                   "relationship-key": "tenant.tenant-id",
@@ -28917,7 +28917,7 @@
         }
       },
       {
-        "service-type": "vBNG",
+        "service-type": "vJamie",
         "resource-version": "1494002017973",
         "service-instances": {
           "service-instance": [
@@ -29038,13 +29038,13 @@
         }
       },
       {
-        "service-type": "Nimbus",
+        "service-type": "Kennedy",
         "resource-version": "1507044117208",
         "service-instances": {
           "service-instance": [
             {
               "service-instance-id": "a8ca34fc-44f4-433c-9935-2254fe1fc0c9",
-              "service-instance-name": "mDNS_Preload_1710_10-19_2810_11",
+              "service-instance-name": "CHARLOTTE_Preload_1710_10-19_2810_11",
               "service-type": "",
               "service-role": "",
               "environment-context": "General_Revenue-Bearing",
@@ -29163,7 +29163,7 @@
             },
             {
               "service-instance-id": "c28ad9ff-80ed-487e-a111-5dee381d7313",
-              "service-instance-name": "mdns_2017_111701_su249t",
+              "service-instance-name": "CHARLOTTE_2017_111701_su249t",
               "service-type": "",
               "service-role": "",
               "environment-context": "General_Revenue-Bearing",
@@ -29187,7 +29187,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "mdns_2017_111701_vnf"
+                        "property-value": "CHARLOTTE_2017_111701_vnf"
                       }
                     ]
                   },
@@ -29221,11 +29221,11 @@
                   {
                     "related-to": "project",
                     "relationship-label": "org.onap.relationships.inventory.Uses",
-                    "related-link": "/aai/v12/business/projects/project/Nimbus",
+                    "related-link": "/aai/v12/business/projects/project/Kennedy",
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "Nimbus"
+                        "relationship-value": "Kennedy"
                       }
                     ]
                   },
@@ -29276,11 +29276,11 @@
                   {
                     "related-to": "project",
                     "relationship-label": "org.onap.relationships.inventory.Uses",
-                    "related-link": "/aai/v12/business/projects/project/Nimbus",
+                    "related-link": "/aai/v12/business/projects/project/Kennedy",
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "Nimbus"
+                        "relationship-value": "Kennedy"
                       }
                     ]
                   },
@@ -29300,7 +29300,7 @@
             },
             {
               "service-instance-id": "702bb528-579c-4440-b190-91676a2a8628",
-              "service-instance-name": "mdns_2017_1011_hk096q_svc_v4",
+              "service-instance-name": "CHARLOTTE_2017_1011_hk096q_svc_v4",
               "service-type": "",
               "service-role": "",
               "environment-context": "General_Revenue-Bearing",
@@ -29324,7 +29324,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "mdns_2017_1011_hk096q_svc_vnf_v4"
+                        "property-value": "CHARLOTTE_2017_1011_hk096q_svc_vnf_v4"
                       }
                     ]
                   },
@@ -29368,7 +29368,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6aepdg01_un_105"
+                        "property-value": "zhvf6aepdg01_un_105"
                       }
                     ]
                   },
@@ -29450,7 +29450,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6aepdg01_un_102"
+                        "property-value": "zhvf6aepdg01_un_102"
                       }
                     ]
                   },
@@ -29549,11 +29549,11 @@
                   {
                     "related-to": "project",
                     "relationship-label": "org.onap.relationships.inventory.Uses",
-                    "related-link": "/aai/v12/business/projects/project/Nimbus",
+                    "related-link": "/aai/v12/business/projects/project/Kennedy",
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "Nimbus"
+                        "relationship-value": "Kennedy"
                       }
                     ]
                   },
@@ -29570,7 +29570,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6fapn01dns01"
+                        "property-value": "zhvf6fapn01dns01"
                       }
                     ]
                   },
@@ -29604,11 +29604,11 @@
                   {
                     "related-to": "project",
                     "relationship-label": "org.onap.relationships.inventory.Uses",
-                    "related-link": "/aai/v12/business/projects/project/Nimbus",
+                    "related-link": "/aai/v12/business/projects/project/Kennedy",
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "Nimbus"
+                        "relationship-value": "Kennedy"
                       }
                     ]
                   },
@@ -29642,11 +29642,11 @@
                   {
                     "related-to": "project",
                     "relationship-label": "org.onap.relationships.inventory.Uses",
-                    "related-link": "/aai/v12/business/projects/project/Nimbus",
+                    "related-link": "/aai/v12/business/projects/project/Kennedy",
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "Nimbus"
+                        "relationship-value": "Kennedy"
                       }
                     ]
                   },
@@ -29799,7 +29799,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6afapn02"
+                        "property-value": "zhvf6afapn02"
                       }
                     ]
                   }
@@ -29846,7 +29846,7 @@
             },
             {
               "service-instance-id": "bad8e354-5ce5-4732-af13-100105b1c02b",
-              "service-instance-name": "mdns_2017_1011_hk096q_svc_v5",
+              "service-instance-name": "CHARLOTTE_2017_1011_hk096q_svc_v5",
               "service-type": "",
               "service-role": "",
               "environment-context": "General_Revenue-Bearing",
@@ -29870,7 +29870,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "mdns_2017_1011_hk096q_svc_vnf_v5"
+                        "property-value": "CHARLOTTE_2017_1011_hk096q_svc_vnf_v5"
                       }
                     ]
                   },
@@ -29988,7 +29988,7 @@
             },
             {
               "service-instance-id": "629e0f59-f966-449b-ac90-8be904a51b55",
-              "service-instance-name": "mdns_2017_1011_hk096q_svc_v5_2",
+              "service-instance-name": "CHARLOTTE_2017_1011_hk096q_svc_v5_2",
               "service-type": "",
               "service-role": "",
               "environment-context": "General_Revenue-Bearing",
@@ -30012,7 +30012,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "mdns_2017_1011_hk096q_svc_v5_2"
+                        "property-value": "CHARLOTTE_2017_1011_hk096q_svc_v5_2"
                       }
                     ]
                   },
@@ -30046,11 +30046,11 @@
                   {
                     "related-to": "project",
                     "relationship-label": "org.onap.relationships.inventory.Uses",
-                    "related-link": "/aai/v12/business/projects/project/Nimbus",
+                    "related-link": "/aai/v12/business/projects/project/Kennedy",
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "Nimbus"
+                        "relationship-value": "Kennedy"
                       }
                     ]
                   },
@@ -30067,7 +30067,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6afnso01_nso_pj_01"
+                        "property-value": "zhvf6afnso01_nso_pj_01"
                       }
                     ]
                   },
@@ -30111,7 +30111,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6affad01_qwe_04"
+                        "property-value": "zhvf6affad01_qwe_04"
                       }
                     ]
                   },
@@ -30191,7 +30191,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6aepdg01_un_308"
+                        "property-value": "zhvf6aepdg01_un_308"
                       }
                     ]
                   },
@@ -30208,7 +30208,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6aepdg01_un_306"
+                        "property-value": "zhvf6aepdg01_un_306"
                       }
                     ]
                   },
@@ -30225,7 +30225,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6aepdg01_un_307"
+                        "property-value": "zhvf6aepdg01_un_307"
                       }
                     ]
                   },
@@ -30340,7 +30340,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6afprb01"
+                        "property-value": "zhvf6afprb01"
                       }
                     ]
                   },
@@ -30378,7 +30378,7 @@
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "DFW"
+                        "relationship-value": "WATKINS"
                       }
                     ]
                   },
@@ -30439,7 +30439,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6aepdg01_un_316"
+                        "property-value": "zhvf6aepdg01_un_316"
                       }
                     ]
                   },
@@ -30456,7 +30456,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6aepdg01_un_317"
+                        "property-value": "zhvf6aepdg01_un_317"
                       }
                     ]
                   },
@@ -30473,7 +30473,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6aepdg01_un_318"
+                        "property-value": "zhvf6aepdg01_un_318"
                       }
                     ]
                   },
@@ -30490,7 +30490,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6aepdg01_un_315"
+                        "property-value": "zhvf6aepdg01_un_315"
                       }
                     ]
                   },
@@ -30534,7 +30534,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6aepdg01_577h"
+                        "property-value": "zhvf6aepdg01_577h"
                       }
                     ]
                   },
@@ -30589,7 +30589,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6apndns_v6_01"
+                        "property-value": "zhvf6apndns_v6_01"
                       }
                     ]
                   },
@@ -30633,7 +30633,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6vAPNDNS01_vnf"
+                        "property-value": "zhvf6vAPNDNS01_vnf"
                       }
                     ]
                   },
@@ -30704,7 +30704,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6aepdg01_un_313"
+                        "property-value": "zhvf6aepdg01_un_313"
                       }
                     ]
                   },
@@ -30721,7 +30721,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6aepdg01_un_312"
+                        "property-value": "zhvf6aepdg01_un_312"
                       }
                     ]
                   },
@@ -30738,7 +30738,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6aepdg01_un_310"
+                        "property-value": "zhvf6aepdg01_un_310"
                       }
                     ]
                   },
@@ -30755,7 +30755,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6aepdg01_un_311"
+                        "property-value": "zhvf6aepdg01_un_311"
                       }
                     ]
                   },
@@ -30772,7 +30772,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6aepdg01_un_309"
+                        "property-value": "zhvf6aepdg01_un_309"
                       }
                     ]
                   },
@@ -30860,7 +30860,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6affad01"
+                        "property-value": "zhvf6affad01"
                       }
                     ]
                   },
@@ -31012,7 +31012,7 @@
             },
             {
               "service-instance-id": "f325bbef-10fd-40d1-9887-9383731b81d1",
-              "service-instance-name": "mdns_2017_1117_su249t",
+              "service-instance-name": "CHARLOTTE_2017_1117_su249t",
               "service-type": "",
               "service-role": "",
               "environment-context": "General_Revenue-Bearing",
@@ -31036,7 +31036,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "mdns_2017_1117_vnf01"
+                        "property-value": "CHARLOTTE_2017_1117_vnf01"
                       }
                     ]
                   },
@@ -31134,7 +31134,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6aepdg01_pb_1121"
+                        "property-value": "zhvf6aepdg01_pb_1121"
                       }
                     ]
                   },
@@ -31304,11 +31304,11 @@
                   {
                     "related-to": "project",
                     "relationship-label": "org.onap.relationships.inventory.Uses",
-                    "related-link": "/aai/v12/business/projects/project/Nimbus",
+                    "related-link": "/aai/v12/business/projects/project/Kennedy",
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "Nimbus"
+                        "relationship-value": "Kennedy"
                       }
                     ]
                   },
@@ -31406,7 +31406,7 @@
             },
             {
               "service-instance-id": "be85c437-1efe-4779-9557-11dffbbd98af",
-              "service-instance-name": "shani_pm_test_Subsciber_mobility_ServiceType_Nimbus",
+              "service-instance-name": "shani_pm_test_Subsciber_emanuel_ServiceType_Kennedy",
               "service-type": "service_type_shani",
               "service-role": "service_role_shani",
               "environment-context": "General_Revenue-Bearing",
@@ -31589,11 +31589,11 @@
                   {
                     "related-to": "project",
                     "relationship-label": "org.onap.relationships.inventory.Uses",
-                    "related-link": "/aai/v12/business/projects/project/Nimbus",
+                    "related-link": "/aai/v12/business/projects/project/Kennedy",
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "Nimbus"
+                        "relationship-value": "Kennedy"
                       }
                     ]
                   },
@@ -31667,7 +31667,7 @@
             },
             {
               "service-instance-id": "d1c8daf5-69f1-4d2a-ac2f-5b0cd09338b8",
-              "service-instance-name": "mdns_2017_1011_IST_Service_un_try1",
+              "service-instance-name": "CHARLOTTE_2017_1011_IST_Service_un_try1",
               "service-type": "",
               "service-role": "",
               "environment-context": "General_Revenue-Bearing",
@@ -31708,11 +31708,11 @@
                   {
                     "related-to": "project",
                     "relationship-label": "org.onap.relationships.inventory.Uses",
-                    "related-link": "/aai/v12/business/projects/project/Nimbus",
+                    "related-link": "/aai/v12/business/projects/project/Kennedy",
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "Nimbus"
+                        "relationship-value": "Kennedy"
                       }
                     ]
                   },
@@ -31746,11 +31746,11 @@
                   {
                     "related-to": "project",
                     "relationship-label": "org.onap.relationships.inventory.Uses",
-                    "related-link": "/aai/v12/business/projects/project/Nimbus",
+                    "related-link": "/aai/v12/business/projects/project/Kennedy",
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "Nimbus"
+                        "relationship-value": "Kennedy"
                       }
                     ]
                   },
@@ -31767,7 +31767,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6afnso03_pj"
+                        "property-value": "zhvf6afnso03_pj"
                       }
                     ]
                   },
@@ -31801,11 +31801,11 @@
                   {
                     "related-to": "project",
                     "relationship-label": "org.onap.relationships.inventory.Uses",
-                    "related-link": "/aai/v12/business/projects/project/Nimbus",
+                    "related-link": "/aai/v12/business/projects/project/Kennedy",
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "Nimbus"
+                        "relationship-value": "Kennedy"
                       }
                     ]
                   },
@@ -31839,11 +31839,11 @@
                   {
                     "related-to": "project",
                     "relationship-label": "org.onap.relationships.inventory.Uses",
-                    "related-link": "/aai/v12/business/projects/project/Nimbus",
+                    "related-link": "/aai/v12/business/projects/project/Kennedy",
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "Nimbus"
+                        "relationship-value": "Kennedy"
                       }
                     ]
                   },
@@ -31863,7 +31863,7 @@
             },
             {
               "service-instance-id": "501264ad-950f-49ab-90e4-f4d08348f5ce",
-              "service-instance-name": "mdns_2017_1011_IST_1029",
+              "service-instance-name": "CHARLOTTE_2017_1011_IST_1029",
               "service-type": "",
               "service-role": "",
               "environment-context": "General_Revenue-Bearing",
@@ -31877,11 +31877,11 @@
                   {
                     "related-to": "project",
                     "relationship-label": "org.onap.relationships.inventory.Uses",
-                    "related-link": "/aai/v12/business/projects/project/Nimbus",
+                    "related-link": "/aai/v12/business/projects/project/Kennedy",
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "Nimbus"
+                        "relationship-value": "Kennedy"
                       }
                     ]
                   },
@@ -31925,7 +31925,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6afapn01"
+                        "property-value": "zhvf6afapn01"
                       }
                     ]
                   }
@@ -31948,11 +31948,11 @@
                   {
                     "related-to": "project",
                     "relationship-label": "org.onap.relationships.inventory.Uses",
-                    "related-link": "/aai/v12/business/projects/project/Nimbus",
+                    "related-link": "/aai/v12/business/projects/project/Kennedy",
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "Nimbus"
+                        "relationship-value": "Kennedy"
                       }
                     ]
                   },
@@ -31996,7 +31996,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6afprb01_un"
+                        "property-value": "zhvf6afprb01_un"
                       }
                     ]
                   },
@@ -32034,7 +32034,7 @@
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "DFW"
+                        "relationship-value": "WATKINS"
                       }
                     ]
                   },
@@ -32068,11 +32068,11 @@
                   {
                     "related-to": "project",
                     "relationship-label": "org.onap.relationships.inventory.Uses",
-                    "related-link": "/aai/v12/business/projects/project/Nimbus",
+                    "related-link": "/aai/v12/business/projects/project/Kennedy",
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "Nimbus"
+                        "relationship-value": "Kennedy"
                       }
                     ]
                   },
@@ -32092,7 +32092,7 @@
             },
             {
               "service-instance-id": "62da6f45-cbcb-4bc0-9c02-7750234f8d3a",
-              "service-instance-name": "mDNS_Preload_1102_un_01",
+              "service-instance-name": "CHARLOTTE_Preload_1102_un_01",
               "service-type": "",
               "service-role": "",
               "environment-context": "General_Revenue-Bearing",
@@ -32116,7 +32116,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6amdns02_un_557h"
+                        "property-value": "zhvf6amdns02_un_557h"
                       }
                     ]
                   },
@@ -32136,7 +32136,7 @@
             },
             {
               "service-instance-id": "e248f8c6-7c08-4502-b27b-08bc20fa0789",
-              "service-instance-name": "Mobility_Server_294356_Pause",
+              "service-instance-name": "Emanuel_Server_294356_Pause",
               "service-type": "",
               "service-role": "",
               "environment-context": "General_Revenue-Bearing",
@@ -32150,11 +32150,11 @@
                   {
                     "related-to": "project",
                     "relationship-label": "org.onap.relationships.inventory.Uses",
-                    "related-link": "/aai/v12/business/projects/project/Nimbus",
+                    "related-link": "/aai/v12/business/projects/project/Kennedy",
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "Nimbus"
+                        "relationship-value": "Kennedy"
                       }
                     ]
                   },
@@ -32171,7 +32171,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6mobpause1"
+                        "property-value": "zhvf6mobpause1"
                       }
                     ]
                   },
@@ -32226,7 +32226,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6apndns_v8_01"
+                        "property-value": "zhvf6apndns_v8_01"
                       }
                     ]
                   },
@@ -32260,11 +32260,11 @@
                   {
                     "related-to": "project",
                     "relationship-label": "org.onap.relationships.inventory.Uses",
-                    "related-link": "/aai/v12/business/projects/project/Nimbus",
+                    "related-link": "/aai/v12/business/projects/project/Kennedy",
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "Nimbus"
+                        "relationship-value": "Kennedy"
                       }
                     ]
                   },
@@ -32284,7 +32284,7 @@
             },
             {
               "service-instance-id": "54606e01-b3a5-464d-8299-ed519d967efb",
-              "service-instance-name": "mdns_2017_1011_hk096q_svc_v2",
+              "service-instance-name": "CHARLOTTE_2017_1011_hk096q_svc_v2",
               "service-type": "",
               "service-role": "",
               "environment-context": "General_Revenue-Bearing",
@@ -32328,7 +32328,7 @@
             },
             {
               "service-instance-id": "b1bb2d22-ebbb-4a8f-8ded-33d12856025f",
-              "service-instance-name": "mDNS_Preload_1710_10-19_2810_trial02",
+              "service-instance-name": "CHARLOTTE_Preload_1710_10-19_2810_trial02",
               "service-type": "",
               "service-role": "",
               "environment-context": "General_Revenue-Bearing",
@@ -32369,11 +32369,11 @@
                   {
                     "related-to": "project",
                     "relationship-label": "org.onap.relationships.inventory.Uses",
-                    "related-link": "/aai/v12/business/projects/project/Nimbus",
+                    "related-link": "/aai/v12/business/projects/project/Kennedy",
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "Nimbus"
+                        "relationship-value": "Kennedy"
                       }
                     ]
                   },
@@ -32424,11 +32424,11 @@
                   {
                     "related-to": "project",
                     "relationship-label": "org.onap.relationships.inventory.Uses",
-                    "related-link": "/aai/v12/business/projects/project/Nimbus",
+                    "related-link": "/aai/v12/business/projects/project/Kennedy",
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "Nimbus"
+                        "relationship-value": "Kennedy"
                       }
                     ]
                   },
@@ -32510,7 +32510,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6affad01_un"
+                        "property-value": "zhvf6affad01_un"
                       }
                     ]
                   },
@@ -32623,7 +32623,7 @@
             },
             {
               "service-instance-id": "9fe54eb3-db98-42bf-92cb-2ae298d787e2",
-              "service-instance-name": "mDNS_Preload_1710_10-19_2810_03",
+              "service-instance-name": "CHARLOTTE_Preload_1710_10-19_2810_03",
               "service-type": "",
               "service-role": "",
               "environment-context": "General_Revenue-Bearing",
@@ -32664,11 +32664,11 @@
                   {
                     "related-to": "project",
                     "relationship-label": "org.onap.relationships.inventory.Uses",
-                    "related-link": "/aai/v12/business/projects/project/Nimbus",
+                    "related-link": "/aai/v12/business/projects/project/Kennedy",
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "Nimbus"
+                        "relationship-value": "Kennedy"
                       }
                     ]
                   },
@@ -32685,7 +32685,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6fapndns01"
+                        "property-value": "zhvf6fapndns01"
                       }
                     ]
                   },
@@ -32705,7 +32705,7 @@
             },
             {
               "service-instance-id": "48d2b51b-cab9-445f-8270-834daccde28b",
-              "service-instance-name": "mdns_2017_1011_hk096q_svc",
+              "service-instance-name": "CHARLOTTE_2017_1011_hk096q_svc",
               "service-type": "",
               "service-role": "",
               "environment-context": "General_Revenue-Bearing",
@@ -32729,7 +32729,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "mdns_2017_1011_hk096q_svc"
+                        "property-value": "CHARLOTTE_2017_1011_hk096q_svc"
                       }
                     ]
                   },
@@ -32773,7 +32773,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6aepdg01_un_701"
+                        "property-value": "zhvf6aepdg01_un_701"
                       }
                     ]
                   },
@@ -32828,7 +32828,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6vprobe_sk_01"
+                        "property-value": "zhvf6vprobe_sk_01"
                       }
                     ]
                   },
@@ -32872,7 +32872,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6aepdg01_un_605"
+                        "property-value": "zhvf6aepdg01_un_605"
                       }
                     ]
                   },
@@ -33047,7 +33047,7 @@
             },
             {
               "service-instance-id": "69bf7bfc-9d20-40f4-8589-d8177209edfc",
-              "service-instance-name": "service_mdns_instance",
+              "service-instance-name": "service_CHARLOTTE_instance",
               "service-type": "",
               "service-role": "",
               "environment-context": "General_Revenue-Bearing",
@@ -33061,11 +33061,11 @@
                   {
                     "related-to": "project",
                     "relationship-label": "org.onap.relationships.inventory.Uses",
-                    "related-link": "/aai/v12/business/projects/project/Nimbus",
+                    "related-link": "/aai/v12/business/projects/project/Kennedy",
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "Nimbus"
+                        "relationship-value": "Kennedy"
                       }
                     ]
                   },
@@ -33082,7 +33082,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "vnf_mdns_instance"
+                        "property-value": "vnf_CHARLOTTE_instance"
                       }
                     ]
                   },
@@ -33149,11 +33149,11 @@
                   {
                     "related-to": "project",
                     "relationship-label": "org.onap.relationships.inventory.Uses",
-                    "related-link": "/aai/v12/business/projects/project/Nimbus",
+                    "related-link": "/aai/v12/business/projects/project/Kennedy",
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "Nimbus"
+                        "relationship-value": "Kennedy"
                       }
                     ]
                   },
@@ -33231,11 +33231,11 @@
                   {
                     "related-to": "project",
                     "relationship-label": "org.onap.relationships.inventory.Uses",
-                    "related-link": "/aai/v12/business/projects/project/Nimbus",
+                    "related-link": "/aai/v12/business/projects/project/Kennedy",
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "Nimbus"
+                        "relationship-value": "Kennedy"
                       }
                     ]
                   },
@@ -33252,7 +33252,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6aepdg01_PB"
+                        "property-value": "zhvf6aepdg01_PB"
                       }
                     ]
                   },
@@ -33296,7 +33296,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6aepdg01_un_106"
+                        "property-value": "zhvf6aepdg01_un_106"
                       }
                     ]
                   },
@@ -33316,7 +33316,7 @@
             },
             {
               "service-instance-id": "3a4b0451-77c7-4537-b866-0d8bda745fd0",
-              "service-instance-name": "INT_FW_DNS_MDNS",
+              "service-instance-name": "INT_FW_DNS_CHARLOTTE",
               "service-type": "",
               "service-role": "",
               "environment-context": "General_Revenue-Bearing",
@@ -33330,11 +33330,11 @@
                   {
                     "related-to": "project",
                     "relationship-label": "org.onap.relationships.inventory.Uses",
-                    "related-link": "/aai/v12/business/projects/project/Nimbus",
+                    "related-link": "/aai/v12/business/projects/project/Kennedy",
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "Nimbus"
+                        "relationship-value": "Kennedy"
                       }
                     ]
                   },
@@ -33494,11 +33494,11 @@
                   {
                     "related-to": "project",
                     "relationship-label": "org.onap.relationships.inventory.Uses",
-                    "related-link": "/aai/v12/business/projects/project/Nimbus",
+                    "related-link": "/aai/v12/business/projects/project/Kennedy",
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "Nimbus"
+                        "relationship-value": "Kennedy"
                       }
                     ]
                   },
@@ -33535,7 +33535,7 @@
             },
             {
               "service-instance-id": "d07719dd-e7a6-4c60-87fe-3294b1d10653",
-              "service-instance-name": "mDNS_Preload_E1802",
+              "service-instance-name": "CHARLOTTE_Preload_E1802",
               "service-type": "",
               "service-role": "",
               "environment-context": "General_Revenue-Bearing",
@@ -33549,11 +33549,11 @@
                   {
                     "related-to": "project",
                     "relationship-label": "org.onap.relationships.inventory.Uses",
-                    "related-link": "/aai/v12/business/projects/project/Nimbus",
+                    "related-link": "/aai/v12/business/projects/project/Kennedy",
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "Nimbus"
+                        "relationship-value": "Kennedy"
                       }
                     ]
                   },
@@ -33570,7 +33570,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6mdns_01"
+                        "property-value": "zhvf6mdns_01"
                       }
                     ]
                   },
@@ -33614,7 +33614,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6aepdg01_un_101"
+                        "property-value": "zhvf6aepdg01_un_101"
                       }
                     ]
                   },
@@ -33648,11 +33648,11 @@
                   {
                     "related-to": "project",
                     "relationship-label": "org.onap.relationships.inventory.Uses",
-                    "related-link": "/aai/v12/business/projects/project/Nimbus",
+                    "related-link": "/aai/v12/business/projects/project/Kennedy",
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "Nimbus"
+                        "relationship-value": "Kennedy"
                       }
                     ]
                   },
@@ -33751,7 +33751,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6vprobefe_sk_1111"
+                        "property-value": "zhvf6vprobefe_sk_1111"
                       }
                     ]
                   },
@@ -33812,11 +33812,11 @@
                   {
                     "related-to": "project",
                     "relationship-label": "org.onap.relationships.inventory.Uses",
-                    "related-link": "/aai/v12/business/projects/project/Nimbus",
+                    "related-link": "/aai/v12/business/projects/project/Kennedy",
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "Nimbus"
+                        "relationship-value": "Kennedy"
                       }
                     ]
                   },
@@ -33888,7 +33888,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6afdns01"
+                        "property-value": "zhvf6afdns01"
                       }
                     ]
                   }
@@ -33932,7 +33932,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6apndns1117"
+                        "property-value": "zhvf6apndns1117"
                       }
                     ]
                   },
@@ -34014,7 +34014,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6aepdg01_un_303"
+                        "property-value": "zhvf6aepdg01_un_303"
                       }
                     ]
                   },
@@ -34031,7 +34031,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6aepdg01_un_304"
+                        "property-value": "zhvf6aepdg01_un_304"
                       }
                     ]
                   },
@@ -34086,7 +34086,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6vepdg01"
+                        "property-value": "zhvf6vepdg01"
                       }
                     ]
                   },
@@ -34130,7 +34130,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6aepdg01_pb_122"
+                        "property-value": "zhvf6aepdg01_pb_122"
                       }
                     ]
                   },
@@ -34191,11 +34191,11 @@
                   {
                     "related-to": "project",
                     "relationship-label": "org.onap.relationships.inventory.Uses",
-                    "related-link": "/aai/v12/business/projects/project/Nimbus",
+                    "related-link": "/aai/v12/business/projects/project/Kennedy",
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "Nimbus"
+                        "relationship-value": "Kennedy"
                       }
                     ]
                   },
@@ -34259,7 +34259,7 @@
             },
             {
               "service-instance-id": "38cb4717-9a3f-4212-8521-268a2f1aa07b",
-              "service-instance-name": "mdns_2017_1011_hk096q_svc_v3",
+              "service-instance-name": "CHARLOTTE_2017_1011_hk096q_svc_v3",
               "service-type": "",
               "service-role": "",
               "environment-context": "General_Revenue-Bearing",
@@ -34283,7 +34283,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "mdns_2017_1011_hk096q_svc_v3"
+                        "property-value": "CHARLOTTE_2017_1011_hk096q_svc_v3"
                       }
                     ]
                   },
@@ -34448,7 +34448,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "mtn6aepdg01"
+                        "property-value": "hvf6aepdg01"
                       }
                     ]
                   },
@@ -34509,11 +34509,11 @@
                   {
                     "related-to": "project",
                     "relationship-label": "org.onap.relationships.inventory.Uses",
-                    "related-link": "/aai/v12/business/projects/project/Nimbus",
+                    "related-link": "/aai/v12/business/projects/project/Kennedy",
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "Nimbus"
+                        "relationship-value": "Kennedy"
                       }
                     ]
                   },
@@ -34530,7 +34530,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6apndns_v10_01"
+                        "property-value": "zhvf6apndns_v10_01"
                       }
                     ]
                   },
@@ -34621,7 +34621,7 @@
             },
             {
               "service-instance-id": "60877585-731b-4a9b-ac0c-1dc77a919582",
-              "service-instance-name": "mdns_2017_1011_hk096q_svc12",
+              "service-instance-name": "CHARLOTTE_2017_1011_hk096q_svc12",
               "service-type": "",
               "service-role": "",
               "environment-context": "General_Revenue-Bearing",
@@ -34717,7 +34717,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6afprb01_un_01"
+                        "property-value": "zhvf6afprb01_un_01"
                       }
                     ]
                   },
@@ -34761,7 +34761,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6aepdg01_un_1122"
+                        "property-value": "zhvf6aepdg01_un_1122"
                       }
                     ]
                   },
@@ -34860,11 +34860,11 @@
                   {
                     "related-to": "project",
                     "relationship-label": "org.onap.relationships.inventory.Uses",
-                    "related-link": "/aai/v12/business/projects/project/Nimbus",
+                    "related-link": "/aai/v12/business/projects/project/Kennedy",
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "Nimbus"
+                        "relationship-value": "Kennedy"
                       }
                     ]
                   },
@@ -34881,7 +34881,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6vEPDG01_pb"
+                        "property-value": "zhvf6vEPDG01_pb"
                       }
                     ]
                   },
@@ -34915,11 +34915,11 @@
                   {
                     "related-to": "project",
                     "relationship-label": "org.onap.relationships.inventory.Uses",
-                    "related-link": "/aai/v12/business/projects/project/Nimbus",
+                    "related-link": "/aai/v12/business/projects/project/Kennedy",
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "Nimbus"
+                        "relationship-value": "Kennedy"
                       }
                     ]
                   },
@@ -34936,7 +34936,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6vprobe_01"
+                        "property-value": "zhvf6vprobe_01"
                       }
                     ]
                   },
@@ -34980,7 +34980,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6aepdg01_un_501"
+                        "property-value": "zhvf6aepdg01_un_501"
                       }
                     ]
                   },
@@ -35017,7 +35017,7 @@
             },
             {
               "service-instance-id": "eca2bb8a-cdd2-4caf-bd87-cf0d9516cee3",
-              "service-instance-name": "mdns_2017_1127_IST_su249t",
+              "service-instance-name": "CHARLOTTE_2017_1127_IST_su249t",
               "service-type": "",
               "service-role": "",
               "environment-context": "General_Revenue-Bearing",
@@ -35052,7 +35052,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "mdns_2017_1127_IST_vNF_su249t"
+                        "property-value": "CHARLOTTE_2017_1127_IST_vNF_su249t"
                       }
                     ]
                   },
@@ -35086,11 +35086,11 @@
                   {
                     "related-to": "project",
                     "relationship-label": "org.onap.relationships.inventory.Uses",
-                    "related-link": "/aai/v12/business/projects/project/Nimbus",
+                    "related-link": "/aai/v12/business/projects/project/Kennedy",
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "Nimbus"
+                        "relationship-value": "Kennedy"
                       }
                     ]
                   },
@@ -35145,7 +35145,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "ZMTN6APNDNS_V4"
+                        "property-value": "Zhvf6APNDNS_V4"
                       }
                     ]
                   },
@@ -35216,7 +35216,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6aepdg01_un_117"
+                        "property-value": "zhvf6aepdg01_un_117"
                       }
                     ]
                   },
@@ -35233,7 +35233,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6aepdg01_un_117"
+                        "property-value": "zhvf6aepdg01_un_117"
                       }
                     ]
                   },
@@ -35253,7 +35253,7 @@
             },
             {
               "service-instance-id": "080a47f6-d124-4944-a032-d575b236ac0b",
-              "service-instance-name": "mDNS_Preload_1107_un",
+              "service-instance-name": "CHARLOTTE_Preload_1107_un",
               "service-type": "",
               "service-role": "",
               "environment-context": "General_Revenue-Bearing",
@@ -35277,7 +35277,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6amdns02_un_577h"
+                        "property-value": "zhvf6amdns02_un_577h"
                       }
                     ]
                   },
@@ -35355,11 +35355,11 @@
                   {
                     "related-to": "project",
                     "relationship-label": "org.onap.relationships.inventory.Uses",
-                    "related-link": "/aai/v12/business/projects/project/Nimbus",
+                    "related-link": "/aai/v12/business/projects/project/Kennedy",
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "Nimbus"
+                        "relationship-value": "Kennedy"
                       }
                     ]
                   },
@@ -35420,7 +35420,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6aepdg01_un_02"
+                        "property-value": "zhvf6aepdg01_un_02"
                       }
                     ]
                   },
@@ -35440,7 +35440,7 @@
             },
             {
               "service-instance-id": "83d40e54-55b1-40b0-a79d-966d37cb0c10",
-              "service-instance-name": "mDNS_Preload_577h_01",
+              "service-instance-name": "CHARLOTTE_Preload_577h_01",
               "service-type": "",
               "service-role": "",
               "environment-context": "General_Revenue-Bearing",
@@ -35464,7 +35464,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6amdns02_un_577h_15"
+                        "property-value": "zhvf6amdns02_un_577h_15"
                       }
                     ]
                   },
@@ -35541,7 +35541,7 @@
             },
             {
               "service-instance-id": "9c59f7df-f4c2-4107-bcbc-08b40514064d",
-              "service-instance-name": "Service_mdns_mobility_pb",
+              "service-instance-name": "Service_CHARLOTTE_emanuel_pb",
               "service-type": "",
               "service-role": "",
               "environment-context": "Critical_Non-Revenue",
@@ -35565,7 +35565,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "Service_mdns_mobility_pb_vnf"
+                        "property-value": "Service_CHARLOTTE_emanuel_pb_vnf"
                       }
                     ]
                   }
@@ -35598,7 +35598,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6aepdg01_un_104"
+                        "property-value": "zhvf6aepdg01_un_104"
                       }
                     ]
                   },
@@ -35662,7 +35662,7 @@
             },
             {
               "service-instance-id": "76241370-d42d-444b-8c01-85f38c97dc61",
-              "service-instance-name": "mdns_2017_1011_IST_Service",
+              "service-instance-name": "CHARLOTTE_2017_1011_IST_Service",
               "service-type": "",
               "service-role": "",
               "environment-context": "General_Revenue-Bearing",
@@ -35697,7 +35697,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "mdns_vnf_uk182r"
+                        "property-value": "CHARLOTTE_vnf_uk182r"
                       }
                     ]
                   },
@@ -35741,7 +35741,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6aepdg01_un_103"
+                        "property-value": "zhvf6aepdg01_un_103"
                       }
                     ]
                   },
@@ -35879,7 +35879,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6aepdg01_pb_101"
+                        "property-value": "zhvf6aepdg01_pb_101"
                       }
                     ]
                   },
@@ -35934,7 +35934,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6apndns_v5_01"
+                        "property-value": "zhvf6apndns_v5_01"
                       }
                     ]
                   },
@@ -35954,7 +35954,7 @@
             },
             {
               "service-instance-id": "c0e9ab1e-a8a0-43ac-a900-ab458a214a7d",
-              "service-instance-name": "mDNS_1206_pmtest",
+              "service-instance-name": "CHARLOTTE_1206_pmtest",
               "service-type": "",
               "service-role": "",
               "environment-context": "General_Revenue-Bearing",
@@ -35978,7 +35978,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "mDNS_1206_pmtest"
+                        "property-value": "CHARLOTTE_1206_pmtest"
                       }
                     ]
                   },
@@ -36060,7 +36060,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6afapn01dns01"
+                        "property-value": "zhvf6afapn01dns01"
                       }
                     ]
                   }
@@ -36093,7 +36093,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6aepdg01_un_109"
+                        "property-value": "zhvf6aepdg01_un_109"
                       }
                     ]
                   },
@@ -36110,7 +36110,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6aepdg01_un_116"
+                        "property-value": "zhvf6aepdg01_un_116"
                       }
                     ]
                   },
@@ -36154,7 +36154,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6aepdg01_un_603"
+                        "property-value": "zhvf6aepdg01_un_603"
                       }
                     ]
                   },
@@ -36174,7 +36174,7 @@
             },
             {
               "service-instance-id": "2648b61d-62fe-4a26-a15c-6cbe0bfde0b7",
-              "service-instance-name": "mdns_1106_service_pj",
+              "service-instance-name": "CHARLOTTE_1106_service_pj",
               "service-type": "",
               "service-role": "",
               "environment-context": "General_Revenue-Bearing",
@@ -36188,11 +36188,11 @@
                   {
                     "related-to": "project",
                     "relationship-label": "org.onap.relationships.inventory.Uses",
-                    "related-link": "/aai/v12/business/projects/project/Nimbus",
+                    "related-link": "/aai/v12/business/projects/project/Kennedy",
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "Nimbus"
+                        "relationship-value": "Kennedy"
                       }
                     ]
                   },
@@ -36209,7 +36209,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6amdns04_pj"
+                        "property-value": "zhvf6amdns04_pj"
                       }
                     ]
                   },
@@ -36308,7 +36308,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6affad01_qwe_01"
+                        "property-value": "zhvf6affad01_qwe_01"
                       }
                     ]
                   },
@@ -36328,7 +36328,7 @@
             },
             {
               "service-instance-id": "5ae69a18-3993-4e15-92a4-907644d42501",
-              "service-instance-name": "zrdm5b_1802_svc_ssc_vibc_appc",
+              "service-instance-name": "zolson5b_1802_svc_ssc_vibc_appc",
               "service-type": "",
               "service-role": "",
               "environment-context": "null",
@@ -36836,7 +36836,7 @@
             },
             {
               "service-instance-id": "7b653fa4-52b5-4067-a04f-0f439610fd14",
-              "service-instance-name": "mtn6_mdns_2017_1011_IST_Service_kk364",
+              "service-instance-name": "hvf6_CHARLOTTE_2017_1011_IST_Service_kk364",
               "service-type": "",
               "service-role": "",
               "environment-context": "General_Revenue-Bearing",
@@ -36871,7 +36871,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "mdns_vnf"
+                        "property-value": "CHARLOTTE_vnf"
                       }
                     ]
                   },
@@ -36905,11 +36905,11 @@
                   {
                     "related-to": "project",
                     "relationship-label": "org.onap.relationships.inventory.Uses",
-                    "related-link": "/aai/v12/business/projects/project/Nimbus",
+                    "related-link": "/aai/v12/business/projects/project/Kennedy",
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "Nimbus"
+                        "relationship-value": "Kennedy"
                       }
                     ]
                   },
@@ -36926,7 +36926,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6fapndns_01"
+                        "property-value": "zhvf6fapndns_01"
                       }
                     ]
                   },
@@ -37200,7 +37200,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6affad01_bm_01"
+                        "property-value": "zhvf6affad01_bm_01"
                       }
                     ]
                   },
@@ -37362,7 +37362,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6vprobe_v2_01"
+                        "property-value": "zhvf6vprobe_v2_01"
                       }
                     ]
                   },
@@ -37494,7 +37494,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6aepdg01_un_903"
+                        "property-value": "zhvf6aepdg01_un_903"
                       }
                     ]
                   },
@@ -37511,7 +37511,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6aepdg01_un_902"
+                        "property-value": "zhvf6aepdg01_un_902"
                       }
                     ]
                   },
@@ -37719,11 +37719,11 @@
                   {
                     "related-to": "project",
                     "relationship-label": "org.onap.relationships.inventory.Uses",
-                    "related-link": "/aai/v12/business/projects/project/Nimbus",
+                    "related-link": "/aai/v12/business/projects/project/Kennedy",
                     "relationship-data": [
                       {
                         "relationship-key": "project.project-name",
-                        "relationship-value": "Nimbus"
+                        "relationship-value": "Kennedy"
                       }
                     ]
                   },
@@ -37740,7 +37740,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6afnso01_pj"
+                        "property-value": "zhvf6afnso01_pj"
                       }
                     ]
                   },
@@ -37760,7 +37760,7 @@
             },
             {
               "service-instance-id": "64ec9f6a-bc90-4d3c-8372-74433c2bfc59",
-              "service-instance-name": "zrdm5b_1802_svc_ssc_VLBC_APPC",
+              "service-instance-name": "zolson5b_1802_svc_ssc_VLBC_APPC",
               "service-type": "",
               "service-role": "",
               "environment-context": "null",
@@ -37833,7 +37833,7 @@
                     "related-to-property": [
                       {
                         "property-key": "generic-vnf.vnf-name",
-                        "property-value": "zmtn6apndns_01"
+                        "property-value": "zhvf6apndns_01"
                       }
                     ]
                   },
@@ -37886,15 +37886,15 @@
             {
               "related-to": "tenant",
               "relationship-label": "org.onap.relationships.inventory.Uses",
-              "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/c2609b7252b6484d89432611cfb2491b",
+              "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/c2609b7252b6484d89432611cfb2491b",
               "relationship-data": [
                 {
                   "relationship-key": "cloud-region.cloud-owner",
-                  "relationship-value": "att-aic"
+                  "relationship-value": "irma-aic"
                 },
                 {
                   "relationship-key": "cloud-region.cloud-region-id",
-                  "relationship-value": "mtn6"
+                  "relationship-value": "hvf6"
                 },
                 {
                   "relationship-key": "tenant.tenant-id",
@@ -37911,15 +37911,15 @@
             {
               "related-to": "tenant",
               "relationship-label": "org.onap.relationships.inventory.Uses",
-              "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/1eddb590b7f04e9890bceeef9e591333",
+              "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/1eddb590b7f04e9890bceeef9e591333",
               "relationship-data": [
                 {
                   "relationship-key": "cloud-region.cloud-owner",
-                  "relationship-value": "att-aic"
+                  "relationship-value": "irma-aic"
                 },
                 {
                   "relationship-key": "cloud-region.cloud-region-id",
-                  "relationship-value": "mtn6"
+                  "relationship-value": "hvf6"
                 },
                 {
                   "relationship-key": "tenant.tenant-id",
@@ -37936,15 +37936,15 @@
             {
               "related-to": "tenant",
               "relationship-label": "org.onap.relationships.inventory.Uses",
-              "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/579d80c0cf754d1e9f1ddc2cdc1701e3",
+              "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/579d80c0cf754d1e9f1ddc2cdc1701e3",
               "relationship-data": [
                 {
                   "relationship-key": "cloud-region.cloud-owner",
-                  "relationship-value": "att-aic"
+                  "relationship-value": "irma-aic"
                 },
                 {
                   "relationship-key": "cloud-region.cloud-region-id",
-                  "relationship-value": "mtn6"
+                  "relationship-value": "hvf6"
                 },
                 {
                   "relationship-key": "tenant.tenant-id",
@@ -37961,15 +37961,15 @@
             {
               "related-to": "tenant",
               "relationship-label": "org.onap.relationships.inventory.Uses",
-              "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/2cd3ca9abd25492eb0c6a44bc95fe714",
+              "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/2cd3ca9abd25492eb0c6a44bc95fe714",
               "relationship-data": [
                 {
                   "relationship-key": "cloud-region.cloud-owner",
-                  "relationship-value": "att-aic"
+                  "relationship-value": "irma-aic"
                 },
                 {
                   "relationship-key": "cloud-region.cloud-region-id",
-                  "relationship-value": "mtn6"
+                  "relationship-value": "hvf6"
                 },
                 {
                   "relationship-key": "tenant.tenant-id",
diff --git a/vid-ext-services-simulator/src/main/resources/preset_registration/searchForServiceInstance/aai_get_subscribers_for_customer_USP-VOICE.json b/vid-ext-services-simulator/src/main/resources/preset_registration/searchForServiceInstance/aai_get_subscribers_for_customer_SILVIA-ROBBINS.json
similarity index 97%
rename from vid-ext-services-simulator/src/main/resources/preset_registration/searchForServiceInstance/aai_get_subscribers_for_customer_USP-VOICE.json
rename to vid-ext-services-simulator/src/main/resources/preset_registration/searchForServiceInstance/aai_get_subscribers_for_customer_SILVIA-ROBBINS.json
index edbe23e..1da40f5 100644
--- a/vid-ext-services-simulator/src/main/resources/preset_registration/searchForServiceInstance/aai_get_subscribers_for_customer_USP-VOICE.json
+++ b/vid-ext-services-simulator/src/main/resources/preset_registration/searchForServiceInstance/aai_get_subscribers_for_customer_SILVIA-ROBBINS.json
@@ -10,13 +10,13 @@
     "responseCode": 200,
     "body": {
       "global-customer-id": "e433710f-9217-458d-a79d-1c7aff376d89",
-      "subscriber-name": "USP VOICE",
+      "subscriber-name": "SILVIA ROBBINS",
       "subscriber-type": "INFRA",
       "resource-version": "1494001938080",
       "service-subscriptions": {
         "service-subscription": [
           {
-            "service-type": "HOSTED COMMUNICATIONS",
+            "service-type": "DARREN MCGEE",
             "resource-version": "1494001920845",
             "service-instances": {
               "service-instance": [
@@ -706,15 +706,15 @@
               "relationship": [
                 {
                   "related-to": "tenant",
-                  "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/5a8dba3e75e7433185b8004e2f2c546e",
+                  "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/5a8dba3e75e7433185b8004e2f2c546e",
                   "relationship-data": [
                     {
                       "relationship-key": "cloud-region.cloud-owner",
-                      "relationship-value": "att-aic"
+                      "relationship-value": "irma-aic"
                     },
                     {
                       "relationship-key": "cloud-region.cloud-region-id",
-                      "relationship-value": "mtn6"
+                      "relationship-value": "hvf6"
                     },
                     {
                       "relationship-key": "tenant.tenant-id",
@@ -730,15 +730,15 @@
                 },
                 {
                   "related-to": "tenant",
-                  "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/0ee101c4b53542f49cfc5e1e49d28f88",
+                  "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/0ee101c4b53542f49cfc5e1e49d28f88",
                   "relationship-data": [
                     {
                       "relationship-key": "cloud-region.cloud-owner",
-                      "relationship-value": "att-aic"
+                      "relationship-value": "irma-aic"
                     },
                     {
                       "relationship-key": "cloud-region.cloud-region-id",
-                      "relationship-value": "mtn6"
+                      "relationship-value": "hvf6"
                     },
                     {
                       "relationship-key": "tenant.tenant-id",
@@ -754,15 +754,15 @@
                 },
                 {
                   "related-to": "tenant",
-                  "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/d0b6d63ca975464b9fc2c759a8b21270",
+                  "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/d0b6d63ca975464b9fc2c759a8b21270",
                   "relationship-data": [
                     {
                       "relationship-key": "cloud-region.cloud-owner",
-                      "relationship-value": "att-aic"
+                      "relationship-value": "irma-aic"
                     },
                     {
                       "relationship-key": "cloud-region.cloud-region-id",
-                      "relationship-value": "mtn6"
+                      "relationship-value": "hvf6"
                     },
                     {
                       "relationship-key": "tenant.tenant-id",
@@ -780,7 +780,7 @@
             }
           },
           {
-            "service-type": "VIRTUAL USP",
+            "service-type": "TYLER SILVIA",
             "resource-version": "1494001841964",
             "service-instances": {
               "service-instance": [
@@ -1857,7 +1857,7 @@
                         "relationship-data": [
                           {
                             "relationship-key": "project.project-name",
-                            "relationship-value": "DFW"
+                            "relationship-value": "WATKINS"
                           }
                         ]
                       },
@@ -1893,7 +1893,7 @@
                         "relationship-data": [
                           {
                             "relationship-key": "project.project-name",
-                            "relationship-value": "DFW"
+                            "relationship-value": "WATKINS"
                           }
                         ]
                       },
@@ -2490,7 +2490,7 @@
                 },
                 {
                   "service-instance-id": "0f2624ba-94cf-4ac5-b903-652d49002c97",
-                  "service-instance-name": "vmee1",
+                  "service-instance-name": "vgeraldine1",
                   "service-type": "",
                   "service-role": "",
                   "environment-context": "General_Revenue-Bearing",
@@ -4931,7 +4931,7 @@
                 },
                 {
                   "service-instance-id": "e089b589-5227-4a7c-aa19-92c99507f147",
-                  "service-instance-name": "Mobility_VSP_Service_DS_0906_01",
+                  "service-instance-name": "Emanuel_VSP_Service_DS_0906_01",
                   "service-type": "",
                   "service-role": "",
                   "model-invariant-id": "f60ed211-2780-40ea-9d05-94c214e0be5c",
@@ -6594,7 +6594,7 @@
                         "relationship-data": [
                           {
                             "relationship-key": "project.project-name",
-                            "relationship-value": "DFW"
+                            "relationship-value": "WATKINS"
                           }
                         ]
                       },
@@ -6908,11 +6908,11 @@
                     "relationship": [
                       {
                         "related-to": "project",
-                        "related-link": "/aai/v11/business/projects/project/Nimbus",
+                        "related-link": "/aai/v11/business/projects/project/Kennedy",
                         "relationship-data": [
                           {
                             "relationship-key": "project.project-name",
-                            "relationship-value": "Nimbus"
+                            "relationship-value": "Kennedy"
                           }
                         ]
                       },
@@ -7319,15 +7319,15 @@
               "relationship": [
                 {
                   "related-to": "tenant",
-                  "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/AAIAIC25/tenants/tenant/092eb9e8e4b7412e8787dd091bc58e86",
+                  "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/JANET25/tenants/tenant/092eb9e8e4b7412e8787dd091bc58e86",
                   "relationship-data": [
                     {
                       "relationship-key": "cloud-region.cloud-owner",
-                      "relationship-value": "att-aic"
+                      "relationship-value": "irma-aic"
                     },
                     {
                       "relationship-key": "cloud-region.cloud-region-id",
-                      "relationship-value": "AAIAIC25"
+                      "relationship-value": "JANET25"
                     },
                     {
                       "relationship-key": "tenant.tenant-id",
@@ -7343,15 +7343,15 @@
                 },
                 {
                   "related-to": "tenant",
-                  "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/bae71557c5bb4d5aac6743a4e5f1d054",
+                  "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/bae71557c5bb4d5aac6743a4e5f1d054",
                   "relationship-data": [
                     {
                       "relationship-key": "cloud-region.cloud-owner",
-                      "relationship-value": "att-aic"
+                      "relationship-value": "irma-aic"
                     },
                     {
                       "relationship-key": "cloud-region.cloud-region-id",
-                      "relationship-value": "mtn6"
+                      "relationship-value": "hvf6"
                     },
                     {
                       "relationship-key": "tenant.tenant-id",
@@ -7361,21 +7361,21 @@
                   "related-to-property": [
                     {
                       "property-key": "tenant.tenant-name",
-                      "property-value": "AIN Web Tool-15-D-testgamma"
+                      "property-value": "AIN Web Tool-15-D-testalexandria"
                     }
                   ]
                 },
                 {
                   "related-to": "tenant",
-                  "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/229bcdc6eaeb4ca59d55221141d01f8e",
+                  "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/229bcdc6eaeb4ca59d55221141d01f8e",
                   "relationship-data": [
                     {
                       "relationship-key": "cloud-region.cloud-owner",
-                      "relationship-value": "att-aic"
+                      "relationship-value": "irma-aic"
                     },
                     {
                       "relationship-key": "cloud-region.cloud-region-id",
-                      "relationship-value": "mtn6"
+                      "relationship-value": "hvf6"
                     },
                     {
                       "relationship-key": "tenant.tenant-id",
@@ -7391,15 +7391,15 @@
                 },
                 {
                   "related-to": "tenant",
-                  "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/1178612d2b394be4834ad77f567c0af2",
+                  "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/1178612d2b394be4834ad77f567c0af2",
                   "relationship-data": [
                     {
                       "relationship-key": "cloud-region.cloud-owner",
-                      "relationship-value": "att-aic"
+                      "relationship-value": "irma-aic"
                     },
                     {
                       "relationship-key": "cloud-region.cloud-region-id",
-                      "relationship-value": "mtn6"
+                      "relationship-value": "hvf6"
                     },
                     {
                       "relationship-key": "tenant.tenant-id",
@@ -7415,15 +7415,15 @@
                 },
                 {
                   "related-to": "tenant",
-                  "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/19c5ade915eb461e8af52fb2fd8cd1f2",
+                  "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/19c5ade915eb461e8af52fb2fd8cd1f2",
                   "relationship-data": [
                     {
                       "relationship-key": "cloud-region.cloud-owner",
-                      "relationship-value": "att-aic"
+                      "relationship-value": "irma-aic"
                     },
                     {
                       "relationship-key": "cloud-region.cloud-region-id",
-                      "relationship-value": "mtn6"
+                      "relationship-value": "hvf6"
                     },
                     {
                       "relationship-key": "tenant.tenant-id",
@@ -7439,15 +7439,15 @@
                 },
                 {
                   "related-to": "tenant",
-                  "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/de007636e25249238447264a988a927b",
+                  "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/de007636e25249238447264a988a927b",
                   "relationship-data": [
                     {
                       "relationship-key": "cloud-region.cloud-owner",
-                      "relationship-value": "att-aic"
+                      "relationship-value": "irma-aic"
                     },
                     {
                       "relationship-key": "cloud-region.cloud-region-id",
-                      "relationship-value": "mtn6"
+                      "relationship-value": "hvf6"
                     },
                     {
                       "relationship-key": "tenant.tenant-id",
@@ -7463,15 +7463,15 @@
                 },
                 {
                   "related-to": "tenant",
-                  "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/62f29b3613634ca6a3065cbe0e020c44",
+                  "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/62f29b3613634ca6a3065cbe0e020c44",
                   "relationship-data": [
                     {
                       "relationship-key": "cloud-region.cloud-owner",
-                      "relationship-value": "att-aic"
+                      "relationship-value": "irma-aic"
                     },
                     {
                       "relationship-key": "cloud-region.cloud-region-id",
-                      "relationship-value": "mtn6"
+                      "relationship-value": "hvf6"
                     },
                     {
                       "relationship-key": "tenant.tenant-id",
@@ -7487,15 +7487,15 @@
                 },
                 {
                   "related-to": "tenant",
-                  "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/649289e30d3244e0b48098114d63c2aa",
+                  "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/649289e30d3244e0b48098114d63c2aa",
                   "relationship-data": [
                     {
                       "relationship-key": "cloud-region.cloud-owner",
-                      "relationship-value": "att-aic"
+                      "relationship-value": "irma-aic"
                     },
                     {
                       "relationship-key": "cloud-region.cloud-region-id",
-                      "relationship-value": "mtn6"
+                      "relationship-value": "hvf6"
                     },
                     {
                       "relationship-key": "tenant.tenant-id",
@@ -7511,15 +7511,15 @@
                 },
                 {
                   "related-to": "tenant",
-                  "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/3f21eeea6c2c486bba31dab816c05a32",
+                  "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/3f21eeea6c2c486bba31dab816c05a32",
                   "relationship-data": [
                     {
                       "relationship-key": "cloud-region.cloud-owner",
-                      "relationship-value": "att-aic"
+                      "relationship-value": "irma-aic"
                     },
                     {
                       "relationship-key": "cloud-region.cloud-region-id",
-                      "relationship-value": "mtn6"
+                      "relationship-value": "hvf6"
                     },
                     {
                       "relationship-key": "tenant.tenant-id",
@@ -7535,15 +7535,15 @@
                 },
                 {
                   "related-to": "tenant",
-                  "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/f60ce21d3ee6427586cff0d22b03b773",
+                  "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/f60ce21d3ee6427586cff0d22b03b773",
                   "relationship-data": [
                     {
                       "relationship-key": "cloud-region.cloud-owner",
-                      "relationship-value": "att-aic"
+                      "relationship-value": "irma-aic"
                     },
                     {
                       "relationship-key": "cloud-region.cloud-region-id",
-                      "relationship-value": "mtn6"
+                      "relationship-value": "hvf6"
                     },
                     {
                       "relationship-key": "tenant.tenant-id",
@@ -7559,15 +7559,15 @@
                 },
                 {
                   "related-to": "tenant",
-                  "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/8774659e425f479895ae091bb5d46560",
+                  "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/8774659e425f479895ae091bb5d46560",
                   "relationship-data": [
                     {
                       "relationship-key": "cloud-region.cloud-owner",
-                      "relationship-value": "att-aic"
+                      "relationship-value": "irma-aic"
                     },
                     {
                       "relationship-key": "cloud-region.cloud-region-id",
-                      "relationship-value": "mtn6"
+                      "relationship-value": "hvf6"
                     },
                     {
                       "relationship-key": "tenant.tenant-id",
@@ -7583,15 +7583,15 @@
                 },
                 {
                   "related-to": "tenant",
-                  "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/624eb554b0d147c19ff8885341760481",
+                  "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/624eb554b0d147c19ff8885341760481",
                   "relationship-data": [
                     {
                       "relationship-key": "cloud-region.cloud-owner",
-                      "relationship-value": "att-aic"
+                      "relationship-value": "irma-aic"
                     },
                     {
                       "relationship-key": "cloud-region.cloud-region-id",
-                      "relationship-value": "mtn6"
+                      "relationship-value": "hvf6"
                     },
                     {
                       "relationship-key": "tenant.tenant-id",
@@ -7607,15 +7607,15 @@
                 },
                 {
                   "related-to": "tenant",
-                  "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/214f55f5fc414c678059c383b03e4962",
+                  "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/214f55f5fc414c678059c383b03e4962",
                   "relationship-data": [
                     {
                       "relationship-key": "cloud-region.cloud-owner",
-                      "relationship-value": "att-aic"
+                      "relationship-value": "irma-aic"
                     },
                     {
                       "relationship-key": "cloud-region.cloud-region-id",
-                      "relationship-value": "mtn6"
+                      "relationship-value": "hvf6"
                     },
                     {
                       "relationship-key": "tenant.tenant-id",
@@ -7631,15 +7631,15 @@
                 },
                 {
                   "related-to": "tenant",
-                  "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/c90666c291664841bb98e4d981ff1db5",
+                  "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/c90666c291664841bb98e4d981ff1db5",
                   "relationship-data": [
                     {
                       "relationship-key": "cloud-region.cloud-owner",
-                      "relationship-value": "att-aic"
+                      "relationship-value": "irma-aic"
                     },
                     {
                       "relationship-key": "cloud-region.cloud-region-id",
-                      "relationship-value": "mtn6"
+                      "relationship-value": "hvf6"
                     },
                     {
                       "relationship-key": "tenant.tenant-id",
@@ -7655,15 +7655,15 @@
                 },
                 {
                   "related-to": "tenant",
-                  "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/ce5b6bc5c7b348e1bf4b91ac9a174278",
+                  "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/ce5b6bc5c7b348e1bf4b91ac9a174278",
                   "relationship-data": [
                     {
                       "relationship-key": "cloud-region.cloud-owner",
-                      "relationship-value": "att-aic"
+                      "relationship-value": "irma-aic"
                     },
                     {
                       "relationship-key": "cloud-region.cloud-region-id",
-                      "relationship-value": "mtn6"
+                      "relationship-value": "hvf6"
                     },
                     {
                       "relationship-key": "tenant.tenant-id",
@@ -7679,15 +7679,15 @@
                 },
                 {
                   "related-to": "tenant",
-                  "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/b386b768a3f24c8e953abbe0b3488c02",
+                  "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/b386b768a3f24c8e953abbe0b3488c02",
                   "relationship-data": [
                     {
                       "relationship-key": "cloud-region.cloud-owner",
-                      "relationship-value": "att-aic"
+                      "relationship-value": "irma-aic"
                     },
                     {
                       "relationship-key": "cloud-region.cloud-region-id",
-                      "relationship-value": "mtn6"
+                      "relationship-value": "hvf6"
                     },
                     {
                       "relationship-key": "tenant.tenant-id",
@@ -7703,15 +7703,15 @@
                 },
                 {
                   "related-to": "tenant",
-                  "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/dc6c4dbfd225474e9deaadd34968646c",
+                  "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/dc6c4dbfd225474e9deaadd34968646c",
                   "relationship-data": [
                     {
                       "relationship-key": "cloud-region.cloud-owner",
-                      "relationship-value": "att-aic"
+                      "relationship-value": "irma-aic"
                     },
                     {
                       "relationship-key": "cloud-region.cloud-region-id",
-                      "relationship-value": "mtn6"
+                      "relationship-value": "hvf6"
                     },
                     {
                       "relationship-key": "tenant.tenant-id",
@@ -7727,15 +7727,15 @@
                 },
                 {
                   "related-to": "tenant",
-                  "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/02cb5030e9914aa4be120bd9ed1e19eb",
+                  "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/02cb5030e9914aa4be120bd9ed1e19eb",
                   "relationship-data": [
                     {
                       "relationship-key": "cloud-region.cloud-owner",
-                      "relationship-value": "att-aic"
+                      "relationship-value": "irma-aic"
                     },
                     {
                       "relationship-key": "cloud-region.cloud-region-id",
-                      "relationship-value": "mtn6"
+                      "relationship-value": "hvf6"
                     },
                     {
                       "relationship-key": "tenant.tenant-id",
@@ -7751,15 +7751,15 @@
                 },
                 {
                   "related-to": "tenant",
-                  "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/f2f3830e4c984d45bcd00e1a04158a79",
+                  "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/f2f3830e4c984d45bcd00e1a04158a79",
                   "relationship-data": [
                     {
                       "relationship-key": "cloud-region.cloud-owner",
-                      "relationship-value": "att-aic"
+                      "relationship-value": "irma-aic"
                     },
                     {
                       "relationship-key": "cloud-region.cloud-region-id",
-                      "relationship-value": "mtn6"
+                      "relationship-value": "hvf6"
                     },
                     {
                       "relationship-key": "tenant.tenant-id",
@@ -7775,15 +7775,15 @@
                 },
                 {
                   "related-to": "tenant",
-                  "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/05b91bd5137f4929878edd965755c06d",
+                  "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/05b91bd5137f4929878edd965755c06d",
                   "relationship-data": [
                     {
                       "relationship-key": "cloud-region.cloud-owner",
-                      "relationship-value": "att-aic"
+                      "relationship-value": "irma-aic"
                     },
                     {
                       "relationship-key": "cloud-region.cloud-region-id",
-                      "relationship-value": "mtn6"
+                      "relationship-value": "hvf6"
                     },
                     {
                       "relationship-key": "tenant.tenant-id",
@@ -7799,15 +7799,15 @@
                 },
                 {
                   "related-to": "tenant",
-                  "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/7002fbe8482d4a989ddf445b1ce336e0",
+                  "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/7002fbe8482d4a989ddf445b1ce336e0",
                   "relationship-data": [
                     {
                       "relationship-key": "cloud-region.cloud-owner",
-                      "relationship-value": "att-aic"
+                      "relationship-value": "irma-aic"
                     },
                     {
                       "relationship-key": "cloud-region.cloud-region-id",
-                      "relationship-value": "mtn6"
+                      "relationship-value": "hvf6"
                     },
                     {
                       "relationship-key": "tenant.tenant-id",
@@ -7823,15 +7823,15 @@
                 },
                 {
                   "related-to": "tenant",
-                  "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/4008522be43741dcb1f5422022a2aa0b",
+                  "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/4008522be43741dcb1f5422022a2aa0b",
                   "relationship-data": [
                     {
                       "relationship-key": "cloud-region.cloud-owner",
-                      "relationship-value": "att-aic"
+                      "relationship-value": "irma-aic"
                     },
                     {
                       "relationship-key": "cloud-region.cloud-region-id",
-                      "relationship-value": "mtn6"
+                      "relationship-value": "hvf6"
                     },
                     {
                       "relationship-key": "tenant.tenant-id",
@@ -7847,15 +7847,15 @@
                 },
                 {
                   "related-to": "tenant",
-                  "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/f44e2e96a1b6476abfda2fa407b00169",
+                  "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/f44e2e96a1b6476abfda2fa407b00169",
                   "relationship-data": [
                     {
                       "relationship-key": "cloud-region.cloud-owner",
-                      "relationship-value": "att-aic"
+                      "relationship-value": "irma-aic"
                     },
                     {
                       "relationship-key": "cloud-region.cloud-region-id",
-                      "relationship-value": "mtn6"
+                      "relationship-value": "hvf6"
                     },
                     {
                       "relationship-key": "tenant.tenant-id",
@@ -7871,15 +7871,15 @@
                 },
                 {
                   "related-to": "tenant",
-                  "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/b69a52bec8a84669a37a1e8b72708be7",
+                  "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/b69a52bec8a84669a37a1e8b72708be7",
                   "relationship-data": [
                     {
                       "relationship-key": "cloud-region.cloud-owner",
-                      "relationship-value": "att-aic"
+                      "relationship-value": "irma-aic"
                     },
                     {
                       "relationship-key": "cloud-region.cloud-region-id",
-                      "relationship-value": "mtn6"
+                      "relationship-value": "hvf6"
                     },
                     {
                       "relationship-key": "tenant.tenant-id",
@@ -7895,15 +7895,15 @@
                 },
                 {
                   "related-to": "tenant",
-                  "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/fac7d9fd56154caeb9332202dcf2969f",
+                  "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/fac7d9fd56154caeb9332202dcf2969f",
                   "relationship-data": [
                     {
                       "relationship-key": "cloud-region.cloud-owner",
-                      "relationship-value": "att-aic"
+                      "relationship-value": "irma-aic"
                     },
                     {
                       "relationship-key": "cloud-region.cloud-region-id",
-                      "relationship-value": "mtn6"
+                      "relationship-value": "hvf6"
                     },
                     {
                       "relationship-key": "tenant.tenant-id",
@@ -7919,15 +7919,15 @@
                 },
                 {
                   "related-to": "tenant",
-                  "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/cb42a77ff45b48a8b8deb83bb64acc74",
+                  "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/cb42a77ff45b48a8b8deb83bb64acc74",
                   "relationship-data": [
                     {
                       "relationship-key": "cloud-region.cloud-owner",
-                      "relationship-value": "att-aic"
+                      "relationship-value": "irma-aic"
                     },
                     {
                       "relationship-key": "cloud-region.cloud-region-id",
-                      "relationship-value": "mtn6"
+                      "relationship-value": "hvf6"
                     },
                     {
                       "relationship-key": "tenant.tenant-id",
@@ -7943,15 +7943,15 @@
                 },
                 {
                   "related-to": "tenant",
-                  "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/fa45ca53c80b492fa8be5477cd84fc2b",
+                  "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/fa45ca53c80b492fa8be5477cd84fc2b",
                   "relationship-data": [
                     {
                       "relationship-key": "cloud-region.cloud-owner",
-                      "relationship-value": "att-aic"
+                      "relationship-value": "irma-aic"
                     },
                     {
                       "relationship-key": "cloud-region.cloud-region-id",
-                      "relationship-value": "mtn6"
+                      "relationship-value": "hvf6"
                     },
                     {
                       "relationship-key": "tenant.tenant-id",
@@ -8113,15 +8113,15 @@
               "relationship": [
                 {
                   "related-to": "tenant",
-                  "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/ece35e4a79d547d193451ac38d700046",
+                  "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/ece35e4a79d547d193451ac38d700046",
                   "relationship-data": [
                     {
                       "relationship-key": "cloud-region.cloud-owner",
-                      "relationship-value": "att-aic"
+                      "relationship-value": "irma-aic"
                     },
                     {
                       "relationship-key": "cloud-region.cloud-region-id",
-                      "relationship-value": "mtn6"
+                      "relationship-value": "hvf6"
                     },
                     {
                       "relationship-key": "tenant.tenant-id",
@@ -8137,15 +8137,15 @@
                 },
                 {
                   "related-to": "tenant",
-                  "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/23cbbd1872864ea08aa53ade25d34172",
+                  "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/23cbbd1872864ea08aa53ade25d34172",
                   "relationship-data": [
                     {
                       "relationship-key": "cloud-region.cloud-owner",
-                      "relationship-value": "att-aic"
+                      "relationship-value": "irma-aic"
                     },
                     {
                       "relationship-key": "cloud-region.cloud-region-id",
-                      "relationship-value": "mtn6"
+                      "relationship-value": "hvf6"
                     },
                     {
                       "relationship-key": "tenant.tenant-id",
@@ -8161,15 +8161,15 @@
                 },
                 {
                   "related-to": "tenant",
-                  "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/ded2432abb5a4100801331d07787afc2",
+                  "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/ded2432abb5a4100801331d07787afc2",
                   "relationship-data": [
                     {
                       "relationship-key": "cloud-region.cloud-owner",
-                      "relationship-value": "att-aic"
+                      "relationship-value": "irma-aic"
                     },
                     {
                       "relationship-key": "cloud-region.cloud-region-id",
-                      "relationship-value": "mtn6"
+                      "relationship-value": "hvf6"
                     },
                     {
                       "relationship-key": "tenant.tenant-id",
@@ -8185,15 +8185,15 @@
                 },
                 {
                   "related-to": "tenant",
-                  "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/ad5aab08f5f7435e9983311af543f311",
+                  "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/ad5aab08f5f7435e9983311af543f311",
                   "relationship-data": [
                     {
                       "relationship-key": "cloud-region.cloud-owner",
-                      "relationship-value": "att-aic"
+                      "relationship-value": "irma-aic"
                     },
                     {
                       "relationship-key": "cloud-region.cloud-region-id",
-                      "relationship-value": "mtn6"
+                      "relationship-value": "hvf6"
                     },
                     {
                       "relationship-key": "tenant.tenant-id",
@@ -8209,15 +8209,15 @@
                 },
                 {
                   "related-to": "tenant",
-                  "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/8071dc66981c4294b05483a1cddac801",
+                  "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/8071dc66981c4294b05483a1cddac801",
                   "relationship-data": [
                     {
                       "relationship-key": "cloud-region.cloud-owner",
-                      "relationship-value": "att-aic"
+                      "relationship-value": "irma-aic"
                     },
                     {
                       "relationship-key": "cloud-region.cloud-region-id",
-                      "relationship-value": "mtn6"
+                      "relationship-value": "hvf6"
                     },
                     {
                       "relationship-key": "tenant.tenant-id",
@@ -8233,15 +8233,15 @@
                 },
                 {
                   "related-to": "tenant",
-                  "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/036f769581904ca08ead1415c22b9ec0",
+                  "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/036f769581904ca08ead1415c22b9ec0",
                   "relationship-data": [
                     {
                       "relationship-key": "cloud-region.cloud-owner",
-                      "relationship-value": "att-aic"
+                      "relationship-value": "irma-aic"
                     },
                     {
                       "relationship-key": "cloud-region.cloud-region-id",
-                      "relationship-value": "mtn6"
+                      "relationship-value": "hvf6"
                     },
                     {
                       "relationship-key": "tenant.tenant-id",
@@ -8257,15 +8257,15 @@
                 },
                 {
                   "related-to": "tenant",
-                  "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/c2475a36c5e04f12a21593849ae83420",
+                  "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/c2475a36c5e04f12a21593849ae83420",
                   "relationship-data": [
                     {
                       "relationship-key": "cloud-region.cloud-owner",
-                      "relationship-value": "att-aic"
+                      "relationship-value": "irma-aic"
                     },
                     {
                       "relationship-key": "cloud-region.cloud-region-id",
-                      "relationship-value": "mtn6"
+                      "relationship-value": "hvf6"
                     },
                     {
                       "relationship-key": "tenant.tenant-id",
diff --git a/vid-ext-services-simulator/src/main/resources/simulator.properties b/vid-ext-services-simulator/src/main/resources/simulator.properties
index be5b8e9..922e7b1 100644
--- a/vid-ext-services-simulator/src/main/resources/simulator.properties
+++ b/vid-ext-services-simulator/src/main/resources/simulator.properties
@@ -5,4 +5,5 @@
 simulator.mockserver.port = 1080
 
 #Simulator proprietary
-simulator.enablePresetRegistration=false
\ No newline at end of file
+simulator.enablePresetRegistration=false
+simulator.enableCentralizedRoleAccess=false
diff --git a/vid-ext-services-simulator/src/main/webapp/WEB-INF/rest-servlet.xml b/vid-ext-services-simulator/src/main/webapp/WEB-INF/rest-servlet.xml
index 30c3128..0d979aa 100644
--- a/vid-ext-services-simulator/src/main/webapp/WEB-INF/rest-servlet.xml
+++ b/vid-ext-services-simulator/src/main/webapp/WEB-INF/rest-servlet.xml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
-       xmlns:aop="http://www.springframework.org/schema/aop" xmlns:util="http://www.springframework.org/schema/util"
-       xsi:schemaLocation="
-        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:context="http://www.springframework.org/schema/context"
+  xmlns:mvc="http://www.springframework.org/schema/mvc"
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
         http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.0.xsd
-        http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-4.0.xsd
-        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.0.xsd">
+
+          http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd">
 
 
     <context:component-scan
             base-package="org.onap.simulator" />
+    <mvc:annotation-driven/>
 </beans>
\ No newline at end of file