Merge "Fix incorrect naming on context plugins"

103 files changed, 87 insertions, 101 deletions

diff --git a/auth/pom.xml b/auth/pom.xml
index 6fe1f078d..05562509f 100644
--- a/auth/pom.xml
+++ b/auth/pom.xml
@@ -33,16 +33,8 @@
     <name>${project.artifactId}</name>
     <description>Policy, state, and task authoring for Apex.</description>
 
-    <profiles>
-        <profile>
-            <id>apexDefault</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <modules>
-                <module>cli-editor</module>
-                <module>cli-codegen</module>
-            </modules>
-        </profile>
-    </profiles>
-</project>
\ No newline at end of file
+    <modules>
+        <module>cli-editor</module>
+        <module>cli-codegen</module>
+    </modules>
+</project>
diff --git a/packages/apex-pdp-package-full/pom.xml b/packages/apex-pdp-package-full/pom.xml
index 890f9f55e..2b05807e2 100644
--- a/packages/apex-pdp-package-full/pom.xml
+++ b/packages/apex-pdp-package-full/pom.xml
@@ -43,32 +43,32 @@
 
         <!-- Plugins for Context Distribution -->
         <dependency>
-            <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.context-distribution</groupId>
-            <artifactId>context-distribution-hazelcast</artifactId>
+            <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-distribution</groupId>
+            <artifactId>plugins-context-distribution-hazelcast</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.context-distribution</groupId>
-            <artifactId>context-distribution-infinispan</artifactId>
+            <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-distribution</groupId>
+            <artifactId>plugins-context-distribution-infinispan</artifactId>
             <version>${project.version}</version>
         </dependency>
 
         <!-- Plugins for Context Locking -->
         <dependency>
-            <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.context-locking</groupId>
-            <artifactId>context-locking-hazelcast</artifactId>
+            <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-locking</groupId>
+            <artifactId>plugins-context-locking-hazelcast</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.context-locking</groupId>
-            <artifactId>context-locking-curator</artifactId>
+            <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-locking</groupId>
+            <artifactId>plugins-context-locking-curator</artifactId>
             <version>${project.version}</version>
         </dependency>
 
         <!-- Plugins for Context Schemas -->
         <dependency>
-            <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.context-schema</groupId>
-            <artifactId>context-schema-avro</artifactId>
+            <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-schema</groupId>
+            <artifactId>plugins-context-schema-avro</artifactId>
             <version>${project.version}</version>
         </dependency>
 
diff --git a/plugins/plugins-context/context-distribution/context-distribution-hazelcast/pom.xml b/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-hazelcast/pom.xml
index 71806c54f..e8fe62565 100644
--- a/plugins/plugins-context/context-distribution/context-distribution-hazelcast/pom.xml
+++ b/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-hazelcast/pom.xml
@@ -21,12 +21,12 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.context-distribution</groupId>
-        <artifactId>context-distribution</artifactId>
+        <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-distribution</groupId>
+        <artifactId>plugins-context-distribution</artifactId>
         <version>2.0.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>context-distribution-hazelcast</artifactId>
+    <artifactId>plugins-context-distribution-hazelcast</artifactId>
     <name>${project.artifactId}</name>
     <description>[${project.parent.artifactId}] Plugin for distribution using Hazelcast</description>
 
@@ -43,4 +43,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/plugins-context/context-distribution/context-distribution-hazelcast/src/main/java/org/onap/policy/apex/plugins/context/distribution/hazelcast/HazelcastContextDistributor.java b/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-hazelcast/src/main/java/org/onap/policy/apex/plugins/context/distribution/hazelcast/HazelcastContextDistributor.java
index 2b17b17cf..2b17b17cf 100644
--- a/plugins/plugins-context/context-distribution/context-distribution-hazelcast/src/main/java/org/onap/policy/apex/plugins/context/distribution/hazelcast/HazelcastContextDistributor.java
+++ b/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-hazelcast/src/main/java/org/onap/policy/apex/plugins/context/distribution/hazelcast/HazelcastContextDistributor.java
diff --git a/plugins/plugins-context/context-distribution/context-distribution-hazelcast/src/main/java/org/onap/policy/apex/plugins/context/distribution/hazelcast/package-info.java b/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-hazelcast/src/main/java/org/onap/policy/apex/plugins/context/distribution/hazelcast/package-info.java
index 027aeecde..027aeecde 100644
--- a/plugins/plugins-context/context-distribution/context-distribution-hazelcast/src/main/java/org/onap/policy/apex/plugins/context/distribution/hazelcast/package-info.java
+++ b/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-hazelcast/src/main/java/org/onap/policy/apex/plugins/context/distribution/hazelcast/package-info.java
diff --git a/plugins/plugins-context/context-distribution/context-distribution-hazelcast/src/main/resources/hazelcast/hazelcast.xml.sample b/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-hazelcast/src/main/resources/hazelcast/hazelcast.xml.sample
index 5f6c1b005..5f6c1b005 100644
--- a/plugins/plugins-context/context-distribution/context-distribution-hazelcast/src/main/resources/hazelcast/hazelcast.xml.sample
+++ b/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-hazelcast/src/main/resources/hazelcast/hazelcast.xml.sample
diff --git a/plugins/plugins-context/context-distribution/context-distribution-hazelcast/src/test/java/org/onap/policy/apex/plugins/context/distribution/hazelcast/HazelcastContextDistributorTest.java b/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-hazelcast/src/test/java/org/onap/policy/apex/plugins/context/distribution/hazelcast/HazelcastContextDistributorTest.java
index c999c95f0..c999c95f0 100644
--- a/plugins/plugins-context/context-distribution/context-distribution-hazelcast/src/test/java/org/onap/policy/apex/plugins/context/distribution/hazelcast/HazelcastContextDistributorTest.java
+++ b/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-hazelcast/src/test/java/org/onap/policy/apex/plugins/context/distribution/hazelcast/HazelcastContextDistributorTest.java
diff --git a/plugins/plugins-context/context-distribution/context-distribution-infinispan/pom.xml b/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/pom.xml
index c6985a952..96ed6e85e 100644
--- a/plugins/plugins-context/context-distribution/context-distribution-infinispan/pom.xml
+++ b/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/pom.xml
@@ -21,12 +21,12 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.context-distribution</groupId>
-        <artifactId>context-distribution</artifactId>
+        <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-distribution</groupId>
+        <artifactId>plugins-context-distribution</artifactId>
         <version>2.0.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>context-distribution-infinispan</artifactId>
+    <artifactId>plugins-context-distribution-infinispan</artifactId>
     <name>${project.artifactId}</name>
     <description>[${project.parent.artifactId}] Plugin for distribution using Infinispan</description>
 
@@ -50,4 +50,4 @@
         </dependency>
     </dependencies>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/plugins-context/context-distribution/context-distribution-infinispan/src/main/java/org/onap/policy/apex/plugins/context/distribution/infinispan/InfinispanContextDistributor.java b/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/src/main/java/org/onap/policy/apex/plugins/context/distribution/infinispan/InfinispanContextDistributor.java
index 9361d0b4c..9361d0b4c 100644
--- a/plugins/plugins-context/context-distribution/context-distribution-infinispan/src/main/java/org/onap/policy/apex/plugins/context/distribution/infinispan/InfinispanContextDistributor.java
+++ b/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/src/main/java/org/onap/policy/apex/plugins/context/distribution/infinispan/InfinispanContextDistributor.java
diff --git a/plugins/plugins-context/context-distribution/context-distribution-infinispan/src/main/java/org/onap/policy/apex/plugins/context/distribution/infinispan/InfinispanDistributorParameters.java b/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/src/main/java/org/onap/policy/apex/plugins/context/distribution/infinispan/InfinispanDistributorParameters.java
index d73955224..d73955224 100644
--- a/plugins/plugins-context/context-distribution/context-distribution-infinispan/src/main/java/org/onap/policy/apex/plugins/context/distribution/infinispan/InfinispanDistributorParameters.java
+++ b/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/src/main/java/org/onap/policy/apex/plugins/context/distribution/infinispan/InfinispanDistributorParameters.java
diff --git a/plugins/plugins-context/context-distribution/context-distribution-infinispan/src/main/java/org/onap/policy/apex/plugins/context/distribution/infinispan/InfinispanManager.java b/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/src/main/java/org/onap/policy/apex/plugins/context/distribution/infinispan/InfinispanManager.java
index 1a2076f10..1a2076f10 100644
--- a/plugins/plugins-context/context-distribution/context-distribution-infinispan/src/main/java/org/onap/policy/apex/plugins/context/distribution/infinispan/InfinispanManager.java
+++ b/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/src/main/java/org/onap/policy/apex/plugins/context/distribution/infinispan/InfinispanManager.java
diff --git a/plugins/plugins-context/context-distribution/context-distribution-infinispan/src/main/java/org/onap/policy/apex/plugins/context/distribution/infinispan/package-info.java b/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/src/main/java/org/onap/policy/apex/plugins/context/distribution/infinispan/package-info.java
index b9ceeb668..b9ceeb668 100644
--- a/plugins/plugins-context/context-distribution/context-distribution-infinispan/src/main/java/org/onap/policy/apex/plugins/context/distribution/infinispan/package-info.java
+++ b/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/src/main/java/org/onap/policy/apex/plugins/context/distribution/infinispan/package-info.java
diff --git a/plugins/plugins-context/context-distribution/context-distribution-infinispan/src/main/resources/infinispan/infinispan.xml.sample b/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/src/main/resources/infinispan/infinispan.xml.sample
index 302eac935..302eac935 100644
--- a/plugins/plugins-context/context-distribution/context-distribution-infinispan/src/main/resources/infinispan/infinispan.xml.sample
+++ b/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/src/main/resources/infinispan/infinispan.xml.sample
diff --git a/plugins/plugins-context/context-distribution/context-distribution-infinispan/src/test/java/org/onap/policy/apex/plugins/context/distribution/infinispan/InfinispanContextDistributorTest.java b/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/src/test/java/org/onap/policy/apex/plugins/context/distribution/infinispan/InfinispanContextDistributorTest.java
index 34fa7d439..34fa7d439 100644
--- a/plugins/plugins-context/context-distribution/context-distribution-infinispan/src/test/java/org/onap/policy/apex/plugins/context/distribution/infinispan/InfinispanContextDistributorTest.java
+++ b/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/src/test/java/org/onap/policy/apex/plugins/context/distribution/infinispan/InfinispanContextDistributorTest.java
diff --git a/plugins/plugins-context/context-distribution/pom.xml b/plugins/plugins-context/plugins-context-distribution/pom.xml
index 94e769151..0433b33f6 100644
--- a/plugins/plugins-context/context-distribution/pom.xml
+++ b/plugins/plugins-context/plugins-context-distribution/pom.xml
@@ -27,15 +27,15 @@
         <version>2.0.0-SNAPSHOT</version>
     </parent>
 
-    <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.context-distribution</groupId>
-    <artifactId>context-distribution</artifactId>
+    <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-distribution</groupId>
+    <artifactId>plugins-context-distribution</artifactId>
     <packaging>pom</packaging>
 
     <name>${project.artifactId}</name>
     <description>Plugins for 3pps that distribute context</description>
 
     <modules>
-        <module>context-distribution-hazelcast</module>
-        <module>context-distribution-infinispan</module>
+        <module>plugins-context-distribution-hazelcast</module>
+        <module>plugins-context-distribution-infinispan</module>
     </modules>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/plugins-context/context-locking/context-locking-curator/pom.xml b/plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/pom.xml
index 220bfbae6..cb5a03d24 100644
--- a/plugins/plugins-context/context-locking/context-locking-curator/pom.xml
+++ b/plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/pom.xml
@@ -21,12 +21,12 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.context-locking</groupId>
-        <artifactId>context-locking</artifactId>
+        <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-locking</groupId>
+        <artifactId>plugins-context-locking</artifactId>
         <version>2.0.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>context-locking-curator</artifactId>
+    <artifactId>plugins-context-locking-curator</artifactId>
     <name>${project.artifactId}</name>
     <description>[${project.parent.artifactId}] Plugin for locking using Curator</description>
 
diff --git a/plugins/plugins-context/context-locking/context-locking-curator/src/main/java/org/onap/policy/apex/plugins/context/locking/curator/CuratorLockFacade.java b/plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/src/main/java/org/onap/policy/apex/plugins/context/locking/curator/CuratorLockFacade.java
index 928255031..928255031 100644
--- a/plugins/plugins-context/context-locking/context-locking-curator/src/main/java/org/onap/policy/apex/plugins/context/locking/curator/CuratorLockFacade.java
+++ b/plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/src/main/java/org/onap/policy/apex/plugins/context/locking/curator/CuratorLockFacade.java
diff --git a/plugins/plugins-context/context-locking/context-locking-curator/src/main/java/org/onap/policy/apex/plugins/context/locking/curator/CuratorLockManager.java b/plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/src/main/java/org/onap/policy/apex/plugins/context/locking/curator/CuratorLockManager.java
index 477a010fa..477a010fa 100644
--- a/plugins/plugins-context/context-locking/context-locking-curator/src/main/java/org/onap/policy/apex/plugins/context/locking/curator/CuratorLockManager.java
+++ b/plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/src/main/java/org/onap/policy/apex/plugins/context/locking/curator/CuratorLockManager.java
diff --git a/plugins/plugins-context/context-locking/context-locking-curator/src/main/java/org/onap/policy/apex/plugins/context/locking/curator/CuratorLockManagerParameters.java b/plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/src/main/java/org/onap/policy/apex/plugins/context/locking/curator/CuratorLockManagerParameters.java
index 9e8d5d2af..9e8d5d2af 100644
--- a/plugins/plugins-context/context-locking/context-locking-curator/src/main/java/org/onap/policy/apex/plugins/context/locking/curator/CuratorLockManagerParameters.java
+++ b/plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/src/main/java/org/onap/policy/apex/plugins/context/locking/curator/CuratorLockManagerParameters.java
diff --git a/plugins/plugins-context/context-locking/context-locking-curator/src/main/java/org/onap/policy/apex/plugins/context/locking/curator/CuratorReentrantReadWriteLock.java b/plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/src/main/java/org/onap/policy/apex/plugins/context/locking/curator/CuratorReentrantReadWriteLock.java
index 22bf5e596..22bf5e596 100644
--- a/plugins/plugins-context/context-locking/context-locking-curator/src/main/java/org/onap/policy/apex/plugins/context/locking/curator/CuratorReentrantReadWriteLock.java
+++ b/plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/src/main/java/org/onap/policy/apex/plugins/context/locking/curator/CuratorReentrantReadWriteLock.java
diff --git a/plugins/plugins-context/context-locking/context-locking-curator/src/main/java/org/onap/policy/apex/plugins/context/locking/curator/package-info.java b/plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/src/main/java/org/onap/policy/apex/plugins/context/locking/curator/package-info.java
index d867c396a..d867c396a 100644
--- a/plugins/plugins-context/context-locking/context-locking-curator/src/main/java/org/onap/policy/apex/plugins/context/locking/curator/package-info.java
+++ b/plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/src/main/java/org/onap/policy/apex/plugins/context/locking/curator/package-info.java
diff --git a/plugins/plugins-context/context-locking/context-locking-hazelcast/pom.xml b/plugins/plugins-context/plugins-context-locking/plugins-context-locking-hazelcast/pom.xml
index 3e581ecad..e82aca52d 100644
--- a/plugins/plugins-context/context-locking/context-locking-hazelcast/pom.xml
+++ b/plugins/plugins-context/plugins-context-locking/plugins-context-locking-hazelcast/pom.xml
@@ -22,12 +22,12 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.context-locking</groupId>
-        <artifactId>context-locking</artifactId>
+        <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-locking</groupId>
+        <artifactId>plugins-context-locking</artifactId>
         <version>2.0.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>context-locking-hazelcast</artifactId>
+    <artifactId>plugins-context-locking-hazelcast</artifactId>
     <name>${project.artifactId}</name>
     <description>[${project.parent.artifactId}] Plugin for locking using Hazelcast</description>
 
@@ -44,16 +44,16 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.context-distribution</groupId>
-            <artifactId>context-distribution-hazelcast</artifactId>
+            <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-distribution</groupId>
+            <artifactId>plugins-context-distribution-hazelcast</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.context-distribution</groupId>
-            <artifactId>context-distribution-infinispan</artifactId>
+            <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-distribution</groupId>
+            <artifactId>plugins-context-distribution-infinispan</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/plugins-context/context-locking/context-locking-hazelcast/src/main/java/org/onap/policy/apex/plugins/context/locking/hazelcast/HazelcastLock.java b/plugins/plugins-context/plugins-context-locking/plugins-context-locking-hazelcast/src/main/java/org/onap/policy/apex/plugins/context/locking/hazelcast/HazelcastLock.java
index 73678ad2a..73678ad2a 100644
--- a/plugins/plugins-context/context-locking/context-locking-hazelcast/src/main/java/org/onap/policy/apex/plugins/context/locking/hazelcast/HazelcastLock.java
+++ b/plugins/plugins-context/plugins-context-locking/plugins-context-locking-hazelcast/src/main/java/org/onap/policy/apex/plugins/context/locking/hazelcast/HazelcastLock.java
diff --git a/plugins/plugins-context/context-locking/context-locking-hazelcast/src/main/java/org/onap/policy/apex/plugins/context/locking/hazelcast/HazelcastLockManager.java b/plugins/plugins-context/plugins-context-locking/plugins-context-locking-hazelcast/src/main/java/org/onap/policy/apex/plugins/context/locking/hazelcast/HazelcastLockManager.java
index 34258bf24..34258bf24 100644
--- a/plugins/plugins-context/context-locking/context-locking-hazelcast/src/main/java/org/onap/policy/apex/plugins/context/locking/hazelcast/HazelcastLockManager.java
+++ b/plugins/plugins-context/plugins-context-locking/plugins-context-locking-hazelcast/src/main/java/org/onap/policy/apex/plugins/context/locking/hazelcast/HazelcastLockManager.java
diff --git a/plugins/plugins-context/context-locking/context-locking-hazelcast/src/main/java/org/onap/policy/apex/plugins/context/locking/hazelcast/package-info.java b/plugins/plugins-context/plugins-context-locking/plugins-context-locking-hazelcast/src/main/java/org/onap/policy/apex/plugins/context/locking/hazelcast/package-info.java
index 8d35556c4..8d35556c4 100644
--- a/plugins/plugins-context/context-locking/context-locking-hazelcast/src/main/java/org/onap/policy/apex/plugins/context/locking/hazelcast/package-info.java
+++ b/plugins/plugins-context/plugins-context-locking/plugins-context-locking-hazelcast/src/main/java/org/onap/policy/apex/plugins/context/locking/hazelcast/package-info.java
diff --git a/plugins/plugins-context/context-locking/pom.xml b/plugins/plugins-context/plugins-context-locking/pom.xml
index a25eb927d..58027218c 100644
--- a/plugins/plugins-context/context-locking/pom.xml
+++ b/plugins/plugins-context/plugins-context-locking/pom.xml
@@ -26,14 +26,14 @@
         <version>2.0.0-SNAPSHOT</version>
     </parent>
 
-    <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.context-locking</groupId>
-    <artifactId>context-locking</artifactId>
+    <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-locking</groupId>
+    <artifactId>plugins-context-locking</artifactId>
     <packaging>pom</packaging>
     <name>${project.artifactId}</name>
 
     <description>Plugins for 3pps that lock context</description>
     <modules>
-        <module>context-locking-curator</module>
-        <module>context-locking-hazelcast</module>
+        <module>plugins-context-locking-curator</module>
+        <module>plugins-context-locking-hazelcast</module>
     </modules>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/plugins-context/context-persistence/pom.xml b/plugins/plugins-context/plugins-context-persistence/pom.xml
index ae56b887c..e791f6155 100644
--- a/plugins/plugins-context/context-persistence/pom.xml
+++ b/plugins/plugins-context/plugins-context-persistence/pom.xml
@@ -26,10 +26,10 @@
         <version>2.0.0-SNAPSHOT</version>
     </parent>
 
-    <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.context-persistence</groupId>
-    <artifactId>context-persistence</artifactId>
+    <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-persistence</groupId>
+    <artifactId>plugins-context-persistence</artifactId>
     <packaging>pom</packaging>
 
     <name>${project.artifactId}</name>
     <description>Plugins for 3pps that persist context</description>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/plugins-context/context-schema/context-schema-avro/pom.xml b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/pom.xml
index 37268676b..89152eeb5 100644
--- a/plugins/plugins-context/context-schema/context-schema-avro/pom.xml
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/pom.xml
@@ -21,12 +21,12 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.context-schema</groupId>
-        <artifactId>context-schema</artifactId>
+        <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-schema</groupId>
+        <artifactId>plugins-context-schema</artifactId>
         <version>2.0.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>context-schema-avro</artifactId>
+    <artifactId>plugins-context-schema-avro</artifactId>
     <name>${project.artifactId}</name>
     <description>[${project.parent.artifactId}] Plugin for schemas using Avro</description>
 
@@ -43,4 +43,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroArrayObjectMapper.java b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroArrayObjectMapper.java
index 56d84251f..56d84251f 100644
--- a/plugins/plugins-context/context-schema/context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroArrayObjectMapper.java
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroArrayObjectMapper.java
diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroBytesObjectMapper.java b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroBytesObjectMapper.java
index dc281a52b..dc281a52b 100644
--- a/plugins/plugins-context/context-schema/context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroBytesObjectMapper.java
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroBytesObjectMapper.java
diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroDirectObjectMapper.java b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroDirectObjectMapper.java
index acf64c3c9..acf64c3c9 100644
--- a/plugins/plugins-context/context-schema/context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroDirectObjectMapper.java
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroDirectObjectMapper.java
diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroEnumObjectMapper.java b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroEnumObjectMapper.java
index ec84450d5..ec84450d5 100644
--- a/plugins/plugins-context/context-schema/context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroEnumObjectMapper.java
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroEnumObjectMapper.java
diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroNullableMapper.java b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroNullableMapper.java
index ff8806c86..ff8806c86 100644
--- a/plugins/plugins-context/context-schema/context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroNullableMapper.java
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroNullableMapper.java
diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroObjectMapper.java b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroObjectMapper.java
index 77de5928e..77de5928e 100644
--- a/plugins/plugins-context/context-schema/context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroObjectMapper.java
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroObjectMapper.java
diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroObjectMapperFactory.java b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroObjectMapperFactory.java
index 22152a8da..22152a8da 100644
--- a/plugins/plugins-context/context-schema/context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroObjectMapperFactory.java
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroObjectMapperFactory.java
diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroRecordObjectMapper.java b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroRecordObjectMapper.java
index 9d24a9a86..9d24a9a86 100644
--- a/plugins/plugins-context/context-schema/context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroRecordObjectMapper.java
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroRecordObjectMapper.java
diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroSchemaHelper.java b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroSchemaHelper.java
index 5fba274ce..5fba274ce 100644
--- a/plugins/plugins-context/context-schema/context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroSchemaHelper.java
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroSchemaHelper.java
diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroSchemaHelperParameters.java b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroSchemaHelperParameters.java
index 5a8fac404..5a8fac404 100644
--- a/plugins/plugins-context/context-schema/context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroSchemaHelperParameters.java
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroSchemaHelperParameters.java
diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroSchemaKeyTranslationUtilities.java b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroSchemaKeyTranslationUtilities.java
index dc3770a43..dc3770a43 100644
--- a/plugins/plugins-context/context-schema/context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroSchemaKeyTranslationUtilities.java
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroSchemaKeyTranslationUtilities.java
diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroStringObjectMapper.java b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroStringObjectMapper.java
index cb3625f31..cb3625f31 100644
--- a/plugins/plugins-context/context-schema/context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroStringObjectMapper.java
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroStringObjectMapper.java
diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/package-info.java b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/package-info.java
index 93f4943d5..93f4943d5 100644
--- a/plugins/plugins-context/context-schema/context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/package-info.java
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/package-info.java
diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaAAI.java b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaAAI.java
index 65eef39c2..65eef39c2 100644
--- a/plugins/plugins-context/context-schema/context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaAAI.java
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaAAI.java
diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaArray.java b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaArray.java
index 21fab66d9..21fab66d9 100644
--- a/plugins/plugins-context/context-schema/context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaArray.java
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaArray.java
diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaEnum.java b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaEnum.java
index ae19cd31a..ae19cd31a 100644
--- a/plugins/plugins-context/context-schema/context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaEnum.java
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaEnum.java
diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaFixed.java b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaFixed.java
index 41f622115..41f622115 100644
--- a/plugins/plugins-context/context-schema/context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaFixed.java
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaFixed.java
diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaHelperBadSchemas.java b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaHelperBadSchemas.java
index 1e1a0bee0..1e1a0bee0 100644
--- a/plugins/plugins-context/context-schema/context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaHelperBadSchemas.java
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaHelperBadSchemas.java
diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaHelperMarshal.java b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaHelperMarshal.java
index a710a2376..a710a2376 100644
--- a/plugins/plugins-context/context-schema/context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaHelperMarshal.java
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaHelperMarshal.java
diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaHelperUnmarshal.java b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaHelperUnmarshal.java
index 725ebb221..725ebb221 100644
--- a/plugins/plugins-context/context-schema/context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaHelperUnmarshal.java
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaHelperUnmarshal.java
diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaMap.java b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaMap.java
index 33ca512b9..33ca512b9 100644
--- a/plugins/plugins-context/context-schema/context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaMap.java
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaMap.java
diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaRecord.java b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaRecord.java
index e14236064..e14236064 100644
--- a/plugins/plugins-context/context-schema/context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaRecord.java
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaRecord.java
diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaUnion.java b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaUnion.java
index 100b51d44..100b51d44 100644
--- a/plugins/plugins-context/context-schema/context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaUnion.java
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaUnion.java
diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestHealthCheckSchema.java b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestHealthCheckSchema.java
index 026125af9..026125af9 100644
--- a/plugins/plugins-context/context-schema/context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestHealthCheckSchema.java
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestHealthCheckSchema.java
diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/avsc/AAIInventoryResponseItemType.avsc b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/AAIInventoryResponseItemType.avsc
index d4ae592a1..d4ae592a1 100644
--- a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/avsc/AAIInventoryResponseItemType.avsc
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/AAIInventoryResponseItemType.avsc
diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/avsc/ArrayExampleAddress.avsc b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/ArrayExampleAddress.avsc
index 0967d6210..0967d6210 100644
--- a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/avsc/ArrayExampleAddress.avsc
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/ArrayExampleAddress.avsc
diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/avsc/ArrayExampleLong.avsc b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/ArrayExampleLong.avsc
index 91f391a89..91f391a89 100644
--- a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/avsc/ArrayExampleLong.avsc
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/ArrayExampleLong.avsc
diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/avsc/EnumSchema.avsc b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/EnumSchema.avsc
index ea5c5b7b1..ea5c5b7b1 100644
--- a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/avsc/EnumSchema.avsc
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/EnumSchema.avsc
diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/avsc/FixedSchema.avsc b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/FixedSchema.avsc
index 4642ef577..4642ef577 100644
--- a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/avsc/FixedSchema.avsc
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/FixedSchema.avsc
diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/avsc/HealthCheckBodyType.avsc b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/HealthCheckBodyType.avsc
index 2db1d696d..2db1d696d 100644
--- a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/avsc/HealthCheckBodyType.avsc
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/HealthCheckBodyType.avsc
diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/avsc/MapExampleAddress.avsc b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/MapExampleAddress.avsc
index f8457c690..f8457c690 100644
--- a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/avsc/MapExampleAddress.avsc
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/MapExampleAddress.avsc
diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/avsc/MapExampleAddressInvalidFields.avsc b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/MapExampleAddressInvalidFields.avsc
index 48c476065..48c476065 100644
--- a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/avsc/MapExampleAddressInvalidFields.avsc
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/MapExampleAddressInvalidFields.avsc
diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/avsc/MapExampleLong.avsc b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/MapExampleLong.avsc
index 0bb3729ed..0bb3729ed 100644
--- a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/avsc/MapExampleLong.avsc
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/MapExampleLong.avsc
diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/avsc/RecordExample.avsc b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/RecordExample.avsc
index 274735532..274735532 100644
--- a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/avsc/RecordExample.avsc
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/RecordExample.avsc
diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/avsc/RecordExampleInvalidFields.avsc b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/RecordExampleInvalidFields.avsc
index 102641b44..102641b44 100644
--- a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/avsc/RecordExampleInvalidFields.avsc
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/RecordExampleInvalidFields.avsc
diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/avsc/RecordExampleVPN.avsc b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/RecordExampleVPN.avsc
index b9aac36f9..b9aac36f9 100644
--- a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/avsc/RecordExampleVPN.avsc
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/RecordExampleVPN.avsc
diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/avsc/RecordExampleVPNReuse.avsc b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/RecordExampleVPNReuse.avsc
index 5936bb21f..5936bb21f 100644
--- a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/avsc/RecordExampleVPNReuse.avsc
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/RecordExampleVPNReuse.avsc
diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/avsc/UnionExample.avsc b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/UnionExample.avsc
index 96b6050fb..96b6050fb 100644
--- a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/avsc/UnionExample.avsc
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/UnionExample.avsc
diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/AAIResponse4Policy.json b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/AAIResponse4Policy.json
index 25ca3af8a..25ca3af8a 100644
--- a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/AAIResponse4Policy.json
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/AAIResponse4Policy.json
diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/AAIResponse4VNF.json b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/AAIResponse4VNF.json
index 41cfc5c17..41cfc5c17 100644
--- a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/AAIResponse4VNF.json
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/AAIResponse4VNF.json
diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/AAIResponseExample.json b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/AAIResponseExample.json
index a1a1e19bc..a1a1e19bc 100644
--- a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/AAIResponseExample.json
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/AAIResponseExample.json
diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/ArrayExampleAddressFull.json b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/ArrayExampleAddressFull.json
index 9ad632a8f..9ad632a8f 100644
--- a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/ArrayExampleAddressFull.json
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/ArrayExampleAddressFull.json
diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/ArrayExampleAddressNull.json b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/ArrayExampleAddressNull.json
index 8878e547a..8878e547a 100644
--- a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/ArrayExampleAddressNull.json
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/ArrayExampleAddressNull.json
diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/ArrayExampleLongFull.json b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/ArrayExampleLongFull.json
index ca12244ee..ca12244ee 100644
--- a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/ArrayExampleLongFull.json
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/ArrayExampleLongFull.json
diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/ArrayExampleLongNull.json b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/ArrayExampleLongNull.json
index 8878e547a..8878e547a 100644
--- a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/ArrayExampleLongNull.json
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/ArrayExampleLongNull.json
diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/EnumExampleBad0.json b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/EnumExampleBad0.json
index d1218ca59..d1218ca59 100644
--- a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/EnumExampleBad0.json
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/EnumExampleBad0.json
diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/EnumExampleBad1.json b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/EnumExampleBad1.json
index 67b3fe5c7..67b3fe5c7 100644
--- a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/EnumExampleBad1.json
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/EnumExampleBad1.json
diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/EnumExampleHearts.json b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/EnumExampleHearts.json
index 92bd68a7e..92bd68a7e 100644
--- a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/EnumExampleHearts.json
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/EnumExampleHearts.json
diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/EnumExampleNull.json b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/EnumExampleNull.json
index ec747fa47..ec747fa47 100644
--- a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/EnumExampleNull.json
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/EnumExampleNull.json
diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/FixedExampleBad0.json b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/FixedExampleBad0.json
index f0251f122..f0251f122 100644
--- a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/FixedExampleBad0.json
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/FixedExampleBad0.json
diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/FixedExampleBad1.json b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/FixedExampleBad1.json
index 687d14210..687d14210 100644
--- a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/FixedExampleBad1.json
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/FixedExampleBad1.json
diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/FixedExampleGood.json b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/FixedExampleGood.json
index 846002e51..846002e51 100644
--- a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/FixedExampleGood.json
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/FixedExampleGood.json
diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/FixedExampleNull.json b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/FixedExampleNull.json
index ec747fa47..ec747fa47 100644
--- a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/FixedExampleNull.json
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/FixedExampleNull.json
diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/HealthCheckEvent.json b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/HealthCheckEvent.json
index 4233f3b57..4233f3b57 100644
--- a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/HealthCheckEvent.json
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/HealthCheckEvent.json
diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/MapExampleAddressFull.json b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/MapExampleAddressFull.json
index 2a1911445..2a1911445 100644
--- a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/MapExampleAddressFull.json
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/MapExampleAddressFull.json
diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/MapExampleAddressInvalidFields.json b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/MapExampleAddressInvalidFields.json
index fa23c8328..fa23c8328 100644
--- a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/MapExampleAddressInvalidFields.json
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/MapExampleAddressInvalidFields.json
diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/MapExampleAddressNull.json b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/MapExampleAddressNull.json
index 9e26dfeeb..9e26dfeeb 100644
--- a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/MapExampleAddressNull.json
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/MapExampleAddressNull.json
diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/MapExampleLongFull.json b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/MapExampleLongFull.json
index f94a4f600..f94a4f600 100644
--- a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/MapExampleLongFull.json
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/MapExampleLongFull.json
diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/MapExampleLongNull.json b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/MapExampleLongNull.json
index 9e26dfeeb..9e26dfeeb 100644
--- a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/MapExampleLongNull.json
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/MapExampleLongNull.json
diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/RecordExampleFull.json b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/RecordExampleFull.json
index d4fbf106a..d4fbf106a 100644
--- a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/RecordExampleFull.json
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/RecordExampleFull.json
diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/RecordExampleInvalidFields.json b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/RecordExampleInvalidFields.json
index f40075e27..f40075e27 100644
--- a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/RecordExampleInvalidFields.json
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/RecordExampleInvalidFields.json
diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/RecordExampleNull.json b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/RecordExampleNull.json
index 03eef6c05..03eef6c05 100644
--- a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/RecordExampleNull.json
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/RecordExampleNull.json
diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/RecordExampleVPNFull.json b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/RecordExampleVPNFull.json
index 7e4da3391..7e4da3391 100644
--- a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/RecordExampleVPNFull.json
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/RecordExampleVPNFull.json
diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/UnionExampleAllFields.json b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/UnionExampleAllFields.json
index 88299e3a4..88299e3a4 100644
--- a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/UnionExampleAllFields.json
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/UnionExampleAllFields.json
diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/UnionExampleNullField.json b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/UnionExampleNullField.json
index 4fd33a6eb..4fd33a6eb 100644
--- a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/UnionExampleNullField.json
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/UnionExampleNullField.json
diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/UnionExampleOptionalField.json b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/UnionExampleOptionalField.json
index f62d25b31..f62d25b31 100644
--- a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/UnionExampleOptionalField.json
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/UnionExampleOptionalField.json
diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/logback-test.xml b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/logback-test.xml
index 3dd11e9cb..3dd11e9cb 100644
--- a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/logback-test.xml
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/logback-test.xml
diff --git a/plugins/plugins-context/context-schema/pom.xml b/plugins/plugins-context/plugins-context-schema/pom.xml
index d60cb5570..f515c2015 100644
--- a/plugins/plugins-context/context-schema/pom.xml
+++ b/plugins/plugins-context/plugins-context-schema/pom.xml
@@ -26,13 +26,13 @@
         <version>2.0.0-SNAPSHOT</version>
     </parent>
 
-    <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.context-schema</groupId>
-    <artifactId>context-schema</artifactId>
+    <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-schema</groupId>
+    <artifactId>plugins-context-schema</artifactId>
     <packaging>pom</packaging>
 
     <name>${project.artifactId}</name>
     <description>Plugins for 3pps that handle context schemas</description>
     <modules>
-        <module>context-schema-avro</module>
+        <module>plugins-context-schema-avro</module>
     </modules>
 </project>
diff --git a/plugins/plugins-context/pom.xml b/plugins/plugins-context/pom.xml
index 8e3c72870..d3d2963e6 100644
--- a/plugins/plugins-context/pom.xml
+++ b/plugins/plugins-context/pom.xml
@@ -42,10 +42,10 @@
     </dependencies>
 
     <modules>
-        <module>context-schema</module>
-        <module>context-distribution</module>
-        <module>context-locking</module>
-        <module>context-persistence</module>
+        <module>plugins-context-schema</module>
+        <module>plugins-context-distribution</module>
+        <module>plugins-context-locking</module>
+        <module>plugins-context-persistence</module>
     </modules>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-yaml/pom.xml b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-yaml/pom.xml
index c44b09fd6..b40aab498 100644
--- a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-yaml/pom.xml
+++ b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-yaml/pom.xml
@@ -40,11 +40,5 @@
             <artifactId>snakeyaml</artifactId>
             <version>1.21</version>
         </dependency>
-        <dependency>
-            <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.context-schema</groupId>
-            <artifactId>context-schema-avro</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 </project>
diff --git a/testsuites/integration/integration-context-test/pom.xml b/testsuites/integration/integration-context-test/pom.xml
index 8c62339f2..6454a8cd5 100644
--- a/testsuites/integration/integration-context-test/pom.xml
+++ b/testsuites/integration/integration-context-test/pom.xml
@@ -40,18 +40,18 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.context-distribution</groupId>
-            <artifactId>context-distribution-hazelcast</artifactId>
+            <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-distribution</groupId>
+            <artifactId>plugins-context-distribution-hazelcast</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.context-distribution</groupId>
-            <artifactId>context-distribution-infinispan</artifactId>
+            <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-distribution</groupId>
+            <artifactId>plugins-context-distribution-infinispan</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.context-locking</groupId>
-            <artifactId>context-locking-curator</artifactId>
+            <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-locking</groupId>
+            <artifactId>plugins-context-locking-curator</artifactId>
             <version>${project.version}</version>
             <exclusions>
                 <exclusion>
@@ -61,8 +61,8 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.context-locking</groupId>
-            <artifactId>context-locking-hazelcast</artifactId>
+            <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-locking</groupId>
+            <artifactId>plugins-context-locking-hazelcast</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
@@ -85,4 +85,4 @@
         </dependency>
     </dependencies>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/testsuites/integration/integration-uservice-test/pom.xml b/testsuites/integration/integration-uservice-test/pom.xml
index 8fbafb604..427f70f27 100644
--- a/testsuites/integration/integration-uservice-test/pom.xml
+++ b/testsuites/integration/integration-uservice-test/pom.xml
@@ -53,8 +53,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.context-schema</groupId>
-            <artifactId>context-schema-avro</artifactId>
+            <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-schema</groupId>
+            <artifactId>plugins-context-schema-avro</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
@@ -71,8 +71,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.context-distribution</groupId>
-            <artifactId>context-distribution-infinispan</artifactId>
+            <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-distribution</groupId>
+            <artifactId>plugins-context-distribution-infinispan</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
diff --git a/testsuites/performance/performance-benchmark-test/pom.xml b/testsuites/performance/performance-benchmark-test/pom.xml
index 118fe115c..938884762 100644
--- a/testsuites/performance/performance-benchmark-test/pom.xml
+++ b/testsuites/performance/performance-benchmark-test/pom.xml
@@ -72,8 +72,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.context-schema</groupId>
-            <artifactId>context-schema-avro</artifactId>
+            <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-schema</groupId>
+            <artifactId>plugins-context-schema-avro</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
@@ -96,4 +96,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
\ No newline at end of file
+</project>
diff --git a/testsuites/performance/performance-context-metrics/pom.xml b/testsuites/performance/performance-context-metrics/pom.xml
index 4f6eabf56..830e6ad54 100644
--- a/testsuites/performance/performance-context-metrics/pom.xml
+++ b/testsuites/performance/performance-context-metrics/pom.xml
@@ -43,23 +43,23 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.context-distribution</groupId>
-            <artifactId>context-distribution-hazelcast</artifactId>
+            <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-distribution</groupId>
+            <artifactId>plugins-context-distribution-hazelcast</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.context-distribution</groupId>
-            <artifactId>context-distribution-infinispan</artifactId>
+            <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-distribution</groupId>
+            <artifactId>plugins-context-distribution-infinispan</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.context-locking</groupId>
-            <artifactId>context-locking-curator</artifactId>
+            <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-locking</groupId>
+            <artifactId>plugins-context-locking-curator</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.context-locking</groupId>
-            <artifactId>context-locking-hazelcast</artifactId>
+            <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-locking</groupId>
+            <artifactId>plugins-context-locking-hazelcast</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
@@ -69,4 +69,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/tools/model-generator/pom.xml b/tools/model-generator/pom.xml
index 2cdc7c20f..5da446c77 100644
--- a/tools/model-generator/pom.xml
+++ b/tools/model-generator/pom.xml
@@ -47,8 +47,8 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.context-schema</groupId>
-            <artifactId>context-schema-avro</artifactId>
+            <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-schema</groupId>
+            <artifactId>plugins-context-schema-avro</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
@@ -57,4 +57,4 @@
             <version>${project.version}</version>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>