diff --git a/dmi-stub/dmi-plugin-demo-and-csit-stub-app/pom.xml b/dmi-stub/dmi-stub-app/pom.xml
similarity index 94%
rename from dmi-stub/dmi-plugin-demo-and-csit-stub-app/pom.xml
rename to dmi-stub/dmi-stub-app/pom.xml
index e513d92..210eb5c 100644
--- a/dmi-stub/dmi-plugin-demo-and-csit-stub-app/pom.xml
+++ b/dmi-stub/dmi-stub-app/pom.xml
@@ -22,16 +22,18 @@
 
     <parent>
         <groupId>org.onap.cps</groupId>
-        <artifactId>dmi-plugin-demo-and-csit-stub</artifactId>
-        <version>3.5.5-SNAPSHOT</version>
+        <artifactId>dmi-stub</artifactId>
+        <version>1.6.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>dmi-plugin-demo-and-csit-stub-app</artifactId>
+    <artifactId>dmi-stub-app</artifactId>
     <packaging>jar</packaging>
 
     <properties>
+        <!-- Application Configuration -->
         <app>org.onap.cps.ncmp.dmi.rest.stub.DmiDemoApplication</app>
 
+        <!-- Global properties for version management -->
         <maven.deploy.plugin.version>3.1.2</maven.deploy.plugin.version>
 
         <!-- ONAP Nexus Repository Configuration -->
@@ -61,7 +63,7 @@
         </dependency>
         <dependency>
             <groupId>org.onap.cps</groupId>
-            <artifactId>dmi-plugin-demo-and-csit-stub-service</artifactId>
+            <artifactId>dmi-stub-service</artifactId>
             <version>${project.version}</version>
             <exclusions>
                 <exclusion>
@@ -126,7 +128,7 @@
                 <activeByDefault>true</activeByDefault>
             </activation>
             <properties>
-                <image.name>dmi-plugin-demo-and-csit-stub</image.name>
+                <image.name>dmi-stub</image.name>
             </properties>
             <build>
                 <plugins>
diff --git a/dmi-stub/dmi-plugin-demo-and-csit-stub-app/src/main/java/org/onap/cps/ncmp/dmi/rest/stub/DmiDemoApplication.java b/dmi-stub/dmi-stub-app/src/main/java/org/onap/cps/ncmp/dmi/rest/stub/DmiDemoApplication.java
similarity index 100%
rename from dmi-stub/dmi-plugin-demo-and-csit-stub-app/src/main/java/org/onap/cps/ncmp/dmi/rest/stub/DmiDemoApplication.java
rename to dmi-stub/dmi-stub-app/src/main/java/org/onap/cps/ncmp/dmi/rest/stub/DmiDemoApplication.java
diff --git a/dmi-stub/dmi-plugin-demo-and-csit-stub-app/src/main/java/org/onap/cps/ncmp/dmi/rest/stub/config/NcmpRequestLoggingConfig.java b/dmi-stub/dmi-stub-app/src/main/java/org/onap/cps/ncmp/dmi/rest/stub/config/NcmpRequestLoggingConfig.java
similarity index 100%
rename from dmi-stub/dmi-plugin-demo-and-csit-stub-app/src/main/java/org/onap/cps/ncmp/dmi/rest/stub/config/NcmpRequestLoggingConfig.java
rename to dmi-stub/dmi-stub-app/src/main/java/org/onap/cps/ncmp/dmi/rest/stub/config/NcmpRequestLoggingConfig.java
diff --git a/dmi-stub/dmi-plugin-demo-and-csit-stub-service/pom.xml b/dmi-stub/dmi-stub-service/pom.xml
similarity index 97%
rename from dmi-stub/dmi-plugin-demo-and-csit-stub-service/pom.xml
rename to dmi-stub/dmi-stub-service/pom.xml
index 30f6b10..171b5d9 100644
--- a/dmi-stub/dmi-plugin-demo-and-csit-stub-service/pom.xml
+++ b/dmi-stub/dmi-stub-service/pom.xml
@@ -22,11 +22,11 @@
 
     <parent>
         <groupId>org.onap.cps</groupId>
-        <artifactId>dmi-plugin-demo-and-csit-stub</artifactId>
-        <version>3.5.5-SNAPSHOT</version>
+        <artifactId>dmi-stub</artifactId>
+        <version>1.6.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>dmi-plugin-demo-and-csit-stub-service</artifactId>
+    <artifactId>dmi-stub-service</artifactId>
     <packaging>jar</packaging>
 
     <properties>
diff --git a/dmi-stub/dmi-plugin-demo-and-csit-stub-service/src/main/java/org/onap/cps/ncmp/dmi/rest/stub/controller/DmiRestStubController.java b/dmi-stub/dmi-stub-service/src/main/java/org/onap/cps/ncmp/dmi/rest/stub/controller/DmiRestStubController.java
similarity index 100%
rename from dmi-stub/dmi-plugin-demo-and-csit-stub-service/src/main/java/org/onap/cps/ncmp/dmi/rest/stub/controller/DmiRestStubController.java
rename to dmi-stub/dmi-stub-service/src/main/java/org/onap/cps/ncmp/dmi/rest/stub/controller/DmiRestStubController.java
diff --git a/dmi-stub/dmi-plugin-demo-and-csit-stub-service/src/main/java/org/onap/cps/ncmp/dmi/rest/stub/controller/aop/ModuleInitialProcess.java b/dmi-stub/dmi-stub-service/src/main/java/org/onap/cps/ncmp/dmi/rest/stub/controller/aop/ModuleInitialProcess.java
similarity index 100%
rename from dmi-stub/dmi-plugin-demo-and-csit-stub-service/src/main/java/org/onap/cps/ncmp/dmi/rest/stub/controller/aop/ModuleInitialProcess.java
rename to dmi-stub/dmi-stub-service/src/main/java/org/onap/cps/ncmp/dmi/rest/stub/controller/aop/ModuleInitialProcess.java
diff --git a/dmi-stub/dmi-plugin-demo-and-csit-stub-service/src/main/java/org/onap/cps/ncmp/dmi/rest/stub/controller/aop/ModuleInitialProcessAspect.java b/dmi-stub/dmi-stub-service/src/main/java/org/onap/cps/ncmp/dmi/rest/stub/controller/aop/ModuleInitialProcessAspect.java
similarity index 100%
rename from dmi-stub/dmi-plugin-demo-and-csit-stub-service/src/main/java/org/onap/cps/ncmp/dmi/rest/stub/controller/aop/ModuleInitialProcessAspect.java
rename to dmi-stub/dmi-stub-service/src/main/java/org/onap/cps/ncmp/dmi/rest/stub/controller/aop/ModuleInitialProcessAspect.java
diff --git a/dmi-stub/dmi-plugin-demo-and-csit-stub-service/src/main/java/org/onap/cps/ncmp/dmi/rest/stub/model/data/operational/DataOperationRequest.java b/dmi-stub/dmi-stub-service/src/main/java/org/onap/cps/ncmp/dmi/rest/stub/model/data/operational/DataOperationRequest.java
similarity index 100%
rename from dmi-stub/dmi-plugin-demo-and-csit-stub-service/src/main/java/org/onap/cps/ncmp/dmi/rest/stub/model/data/operational/DataOperationRequest.java
rename to dmi-stub/dmi-stub-service/src/main/java/org/onap/cps/ncmp/dmi/rest/stub/model/data/operational/DataOperationRequest.java
diff --git a/dmi-stub/dmi-plugin-demo-and-csit-stub-service/src/main/java/org/onap/cps/ncmp/dmi/rest/stub/model/data/operational/DmiDataOperationRequest.java b/dmi-stub/dmi-stub-service/src/main/java/org/onap/cps/ncmp/dmi/rest/stub/model/data/operational/DmiDataOperationRequest.java
similarity index 100%
rename from dmi-stub/dmi-plugin-demo-and-csit-stub-service/src/main/java/org/onap/cps/ncmp/dmi/rest/stub/model/data/operational/DmiDataOperationRequest.java
rename to dmi-stub/dmi-stub-service/src/main/java/org/onap/cps/ncmp/dmi/rest/stub/model/data/operational/DmiDataOperationRequest.java
diff --git a/dmi-stub/dmi-plugin-demo-and-csit-stub-service/src/main/java/org/onap/cps/ncmp/dmi/rest/stub/model/data/operational/DmiOperationCmHandle.java b/dmi-stub/dmi-stub-service/src/main/java/org/onap/cps/ncmp/dmi/rest/stub/model/data/operational/DmiOperationCmHandle.java
similarity index 100%
rename from dmi-stub/dmi-plugin-demo-and-csit-stub-service/src/main/java/org/onap/cps/ncmp/dmi/rest/stub/model/data/operational/DmiOperationCmHandle.java
rename to dmi-stub/dmi-stub-service/src/main/java/org/onap/cps/ncmp/dmi/rest/stub/model/data/operational/DmiOperationCmHandle.java
diff --git a/dmi-stub/dmi-plugin-demo-and-csit-stub-service/src/main/java/org/onap/cps/ncmp/dmi/rest/stub/model/module/ModuleReference.java b/dmi-stub/dmi-stub-service/src/main/java/org/onap/cps/ncmp/dmi/rest/stub/model/module/ModuleReference.java
similarity index 100%
rename from dmi-stub/dmi-plugin-demo-and-csit-stub-service/src/main/java/org/onap/cps/ncmp/dmi/rest/stub/model/module/ModuleReference.java
rename to dmi-stub/dmi-stub-service/src/main/java/org/onap/cps/ncmp/dmi/rest/stub/model/module/ModuleReference.java
diff --git a/dmi-stub/dmi-plugin-demo-and-csit-stub-service/src/main/java/org/onap/cps/ncmp/dmi/rest/stub/model/module/ModuleReferences.java b/dmi-stub/dmi-stub-service/src/main/java/org/onap/cps/ncmp/dmi/rest/stub/model/module/ModuleReferences.java
similarity index 100%
rename from dmi-stub/dmi-plugin-demo-and-csit-stub-service/src/main/java/org/onap/cps/ncmp/dmi/rest/stub/model/module/ModuleReferences.java
rename to dmi-stub/dmi-stub-service/src/main/java/org/onap/cps/ncmp/dmi/rest/stub/model/module/ModuleReferences.java
diff --git a/dmi-stub/dmi-plugin-demo-and-csit-stub-service/src/main/java/org/onap/cps/ncmp/dmi/rest/stub/model/module/ModuleResource.java b/dmi-stub/dmi-stub-service/src/main/java/org/onap/cps/ncmp/dmi/rest/stub/model/module/ModuleResource.java
similarity index 100%
rename from dmi-stub/dmi-plugin-demo-and-csit-stub-service/src/main/java/org/onap/cps/ncmp/dmi/rest/stub/model/module/ModuleResource.java
rename to dmi-stub/dmi-stub-service/src/main/java/org/onap/cps/ncmp/dmi/rest/stub/model/module/ModuleResource.java
diff --git a/dmi-stub/dmi-plugin-demo-and-csit-stub-service/src/main/java/org/onap/cps/ncmp/dmi/rest/stub/service/YangModuleFactory.java b/dmi-stub/dmi-stub-service/src/main/java/org/onap/cps/ncmp/dmi/rest/stub/service/YangModuleFactory.java
similarity index 100%
rename from dmi-stub/dmi-plugin-demo-and-csit-stub-service/src/main/java/org/onap/cps/ncmp/dmi/rest/stub/service/YangModuleFactory.java
rename to dmi-stub/dmi-stub-service/src/main/java/org/onap/cps/ncmp/dmi/rest/stub/service/YangModuleFactory.java
diff --git a/dmi-stub/dmi-plugin-demo-and-csit-stub-service/src/main/java/org/onap/cps/ncmp/dmi/rest/stub/utils/EventDateTimeFormatter.java b/dmi-stub/dmi-stub-service/src/main/java/org/onap/cps/ncmp/dmi/rest/stub/utils/EventDateTimeFormatter.java
similarity index 100%
rename from dmi-stub/dmi-plugin-demo-and-csit-stub-service/src/main/java/org/onap/cps/ncmp/dmi/rest/stub/utils/EventDateTimeFormatter.java
rename to dmi-stub/dmi-stub-service/src/main/java/org/onap/cps/ncmp/dmi/rest/stub/utils/EventDateTimeFormatter.java
diff --git a/dmi-stub/dmi-plugin-demo-and-csit-stub-service/src/main/java/org/onap/cps/ncmp/dmi/rest/stub/utils/ModuleResponseType.java b/dmi-stub/dmi-stub-service/src/main/java/org/onap/cps/ncmp/dmi/rest/stub/utils/ModuleResponseType.java
similarity index 100%
rename from dmi-stub/dmi-plugin-demo-and-csit-stub-service/src/main/java/org/onap/cps/ncmp/dmi/rest/stub/utils/ModuleResponseType.java
rename to dmi-stub/dmi-stub-service/src/main/java/org/onap/cps/ncmp/dmi/rest/stub/utils/ModuleResponseType.java
diff --git a/dmi-stub/dmi-plugin-demo-and-csit-stub-service/src/main/java/org/onap/cps/ncmp/dmi/rest/stub/utils/ResourceFileReaderUtil.java b/dmi-stub/dmi-stub-service/src/main/java/org/onap/cps/ncmp/dmi/rest/stub/utils/ResourceFileReaderUtil.java
similarity index 100%
rename from dmi-stub/dmi-plugin-demo-and-csit-stub-service/src/main/java/org/onap/cps/ncmp/dmi/rest/stub/utils/ResourceFileReaderUtil.java
rename to dmi-stub/dmi-stub-service/src/main/java/org/onap/cps/ncmp/dmi/rest/stub/utils/ResourceFileReaderUtil.java
diff --git a/dmi-stub/dmi-plugin-demo-and-csit-stub-service/src/main/resources/application.yml b/dmi-stub/dmi-stub-service/src/main/resources/application.yml
similarity index 100%
rename from dmi-stub/dmi-plugin-demo-and-csit-stub-service/src/main/resources/application.yml
rename to dmi-stub/dmi-stub-service/src/main/resources/application.yml
diff --git a/dmi-stub/dmi-plugin-demo-and-csit-stub-service/src/main/resources/data/ietf-network-topology-sample-rfc8345.json b/dmi-stub/dmi-stub-service/src/main/resources/data/ietf-network-topology-sample-rfc8345.json
similarity index 100%
rename from dmi-stub/dmi-plugin-demo-and-csit-stub-service/src/main/resources/data/ietf-network-topology-sample-rfc8345.json
rename to dmi-stub/dmi-stub-service/src/main/resources/data/ietf-network-topology-sample-rfc8345.json
diff --git a/dmi-stub/dmi-plugin-demo-and-csit-stub-service/src/main/resources/module/ietfYang-ModuleResourcesResponse.json b/dmi-stub/dmi-stub-service/src/main/resources/module/ietfYang-ModuleResourcesResponse.json
similarity index 100%
rename from dmi-stub/dmi-plugin-demo-and-csit-stub-service/src/main/resources/module/ietfYang-ModuleResourcesResponse.json
rename to dmi-stub/dmi-stub-service/src/main/resources/module/ietfYang-ModuleResourcesResponse.json
diff --git a/dmi-stub/dmi-plugin-demo-and-csit-stub-service/src/main/resources/module/ietfYang-ModuleResponse.json b/dmi-stub/dmi-stub-service/src/main/resources/module/ietfYang-ModuleResponse.json
similarity index 100%
rename from dmi-stub/dmi-plugin-demo-and-csit-stub-service/src/main/resources/module/ietfYang-ModuleResponse.json
rename to dmi-stub/dmi-stub-service/src/main/resources/module/ietfYang-ModuleResponse.json
diff --git a/dmi-stub/dmi-plugin-demo-and-csit-stub-service/src/test/groovy/org/onap/cps/ncmp/dmi/rest/stub/utils/EventDateTimeFormatterSpec.groovy b/dmi-stub/dmi-stub-service/src/test/groovy/org/onap/cps/ncmp/dmi/rest/stub/utils/EventDateTimeFormatterSpec.groovy
similarity index 100%
rename from dmi-stub/dmi-plugin-demo-and-csit-stub-service/src/test/groovy/org/onap/cps/ncmp/dmi/rest/stub/utils/EventDateTimeFormatterSpec.groovy
rename to dmi-stub/dmi-stub-service/src/test/groovy/org/onap/cps/ncmp/dmi/rest/stub/utils/EventDateTimeFormatterSpec.groovy
diff --git a/dmi-stub/pom.xml b/dmi-stub/pom.xml
index 854e843..1d361da 100644
--- a/dmi-stub/pom.xml
+++ b/dmi-stub/pom.xml
@@ -23,10 +23,10 @@
     <parent>
         <groupId>org.onap.cps</groupId>
         <artifactId>ncmp-dmi-plugin</artifactId>
-        <version>3.5.5-SNAPSHOT</version>
+        <version>1.6.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>dmi-plugin-demo-and-csit-stub</artifactId>
+    <artifactId>dmi-stub</artifactId>
     <packaging>pom</packaging>
 
 
@@ -39,8 +39,8 @@
     </properties>
 
     <modules>
-        <module>dmi-plugin-demo-and-csit-stub-service</module>
-        <module>dmi-plugin-demo-and-csit-stub-app</module>
+        <module>dmi-stub-service</module>
+        <module>dmi-stub-app</module>
     </modules>
 
 <dependencyManagement>