commit a4c77bf83c6090fb9b29bb13adee2f34647085a6
author Christofer Dutz <christofer.dutz@c-ware.de> Sun Nov 12 22:35:30 2017 +0100
committer Christofer Dutz <christofer.dutz@c-ware.de> Sun Nov 12 22:35:30 2017 +0100
tree c0b9bbd3c5f7d2a00fc928b1c44abb30251197a3
parent f46dd81a5a72118922dab634f5851d3a314862da

- Replaced a lot of the structural variables with constants to eventually make releasing easier.

analytics/math3/pom.xml

diff --git a/analytics/math3/pom.xml b/analytics/math3/pom.xml
index 552772c..93114bb 100644
--- a/analytics/math3/pom.xml
+++ b/analytics/math3/pom.xml
@@ -28,7 +28,7 @@
 
   <artifactId>edgent-analytics-math3</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Analytics: Math3</name>
+  <name>Apache Edgent (Java 8): Analytics: Math3</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -36,7 +36,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
@@ -47,20 +47,20 @@
     </dependency>
 
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>

analytics/pom.xml

diff --git a/analytics/pom.xml b/analytics/pom.xml
index 58c35f1..a7fb779 100644
--- a/analytics/pom.xml
+++ b/analytics/pom.xml
@@ -29,7 +29,7 @@
   <artifactId>edgent-analytics</artifactId>
   <packaging>pom</packaging>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Analytics</name>
+  <name>Apache Edgent (Java 8): Analytics</name>
 
   <modules>
     <module>sensors</module>

analytics/sensors/pom.xml

diff --git a/analytics/sensors/pom.xml b/analytics/sensors/pom.xml
index 3707220..598e14c 100644
--- a/analytics/sensors/pom.xml
+++ b/analytics/sensors/pom.xml
@@ -28,7 +28,7 @@
 
   <artifactId>edgent-analytics-sensors</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Analytics: Sensors</name>
+  <name>Apache Edgent (Java 8): Analytics: Sensors</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -36,26 +36,26 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>

api/execution/pom.xml

diff --git a/api/execution/pom.xml b/api/execution/pom.xml
index 74b27b0..c6219a7 100644
--- a/api/execution/pom.xml
+++ b/api/execution/pom.xml
@@ -28,7 +28,7 @@
 
   <artifactId>edgent-api-execution</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: API: Execution</name>
+  <name>Apache Edgent (Java 8): API: Execution</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -36,7 +36,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-function</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

api/function/pom.xml

diff --git a/api/function/pom.xml b/api/function/pom.xml
index 366bc3c..9b277ff 100644
--- a/api/function/pom.xml
+++ b/api/function/pom.xml
@@ -28,7 +28,7 @@
 
   <artifactId>edgent-api-function</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: API: Function</name>
+  <name>Apache Edgent (Java 8): API: Function</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>

api/graph/pom.xml

diff --git a/api/graph/pom.xml b/api/graph/pom.xml
index 3956fe5..f6dd8f7 100644
--- a/api/graph/pom.xml
+++ b/api/graph/pom.xml
@@ -28,7 +28,7 @@
 
   <artifactId>edgent-api-graph</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: API: Graph</name>
+  <name>Apache Edgent (Java 8): API: Graph</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -36,7 +36,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-oplet</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

api/oplet/pom.xml

diff --git a/api/oplet/pom.xml b/api/oplet/pom.xml
index 08e48e8..ec0d015 100644
--- a/api/oplet/pom.xml
+++ b/api/oplet/pom.xml
@@ -28,7 +28,7 @@
 
   <artifactId>edgent-api-oplet</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: API: Oplet</name>
+  <name>Apache Edgent (Java 8): API: Oplet</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -36,17 +36,17 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-function</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-execution</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-window</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

api/pom.xml

diff --git a/api/pom.xml b/api/pom.xml
index 06517fe..f9f0e39 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -29,7 +29,7 @@
   <artifactId>edgent-api</artifactId>
   <packaging>pom</packaging>
 
-  <name>Apache Edgent ${edgent.projname.platform}: API</name>
+  <name>Apache Edgent (Java 8): API</name>
 
   <modules>
     <module>execution</module>

api/topology/pom.xml

diff --git a/api/topology/pom.xml b/api/topology/pom.xml
index eec89ee..c3e8376 100644
--- a/api/topology/pom.xml
+++ b/api/topology/pom.xml
@@ -28,7 +28,7 @@
 
   <artifactId>edgent-api-topology</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: API: Topology</name>
+  <name>Apache Edgent (Java 8): API: Topology</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -36,22 +36,22 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-execution</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-function</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-graph</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-oplet</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

api/window/pom.xml

diff --git a/api/window/pom.xml b/api/window/pom.xml
index f68ab67..6c41d3e 100644
--- a/api/window/pom.xml
+++ b/api/window/pom.xml
@@ -28,7 +28,7 @@
 
   <artifactId>edgent-api-window</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: API: Window</name>
+  <name>Apache Edgent (Java 8): API: Window</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -36,7 +36,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-function</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

apps/iot/pom.xml

diff --git a/apps/iot/pom.xml b/apps/iot/pom.xml
index c921cb7..d852884 100644
--- a/apps/iot/pom.xml
+++ b/apps/iot/pom.xml
@@ -28,27 +28,27 @@
 
   <artifactId>edgent-apps-iot</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Apps: IoT</name>
+  <name>Apache Edgent (Java 8): Apps: IoT</name>
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-iot</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-pubsub</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>

apps/pom.xml

diff --git a/apps/pom.xml b/apps/pom.xml
index 2319fa1..54f794b 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -29,7 +29,7 @@
   <artifactId>edgent-apps</artifactId>
   <packaging>pom</packaging>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Apps</name>
+  <name>Apache Edgent (Java 8): Apps</name>
 
   <modules>
     <module>iot</module>

apps/runtime/pom.xml

diff --git a/apps/runtime/pom.xml b/apps/runtime/pom.xml
index 001bfa6..363a38d 100644
--- a/apps/runtime/pom.xml
+++ b/apps/runtime/pom.xml
@@ -28,28 +28,28 @@
 
   <artifactId>edgent-apps-runtime</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Apps: Runtime</name>
+  <name>Apache Edgent (Java 8): Apps: Runtime</name>
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-runtime-jobregistry</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-runtime-jmxcontrol</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>

connectors/command/pom.xml

diff --git a/connectors/command/pom.xml b/connectors/command/pom.xml
index cf3ea4c..90d7803 100644
--- a/connectors/command/pom.xml
+++ b/connectors/command/pom.xml
@@ -28,42 +28,42 @@
 
   <artifactId>edgent-connectors-command</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: Command</name>
+  <name>Apache Edgent (Java 8): Connectors: Command</name>
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-common</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-common</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>

connectors/common/pom.xml

diff --git a/connectors/common/pom.xml b/connectors/common/pom.xml
index aaa96e0..96f3cc5 100644
--- a/connectors/common/pom.xml
+++ b/connectors/common/pom.xml
@@ -28,7 +28,7 @@
 
   <artifactId>edgent-connectors-common</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: Common</name>
+  <name>Apache Edgent (Java 8): Connectors: Common</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -36,26 +36,26 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>

connectors/csv/pom.xml

diff --git a/connectors/csv/pom.xml b/connectors/csv/pom.xml
index ce620d4..2563a41 100644
--- a/connectors/csv/pom.xml
+++ b/connectors/csv/pom.xml
@@ -28,7 +28,7 @@
 
   <artifactId>edgent-connectors-csv</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: CSV</name>
+  <name>Apache Edgent (Java 8): Connectors: CSV</name>
 
   <dependencies>
     <dependency>
@@ -38,20 +38,20 @@
     </dependency>
 
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>

connectors/file/pom.xml

diff --git a/connectors/file/pom.xml b/connectors/file/pom.xml
index bf5d065..a43c21c 100644
--- a/connectors/file/pom.xml
+++ b/connectors/file/pom.xml
@@ -28,7 +28,7 @@
 
   <artifactId>edgent-connectors-file</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: File</name>
+  <name>Apache Edgent (Java 8): Connectors: File</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -36,43 +36,43 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-function</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-oplet</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-common</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>

connectors/http/pom.xml

diff --git a/connectors/http/pom.xml b/connectors/http/pom.xml
index 4866693..ba8b77c 100644
--- a/connectors/http/pom.xml
+++ b/connectors/http/pom.xml
@@ -28,7 +28,7 @@
 
   <artifactId>edgent-connectors-http</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: HTTP</name>
+  <name>Apache Edgent (Java 8): Connectors: HTTP</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -36,7 +36,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
@@ -52,13 +52,13 @@
     </dependency>
 
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>

connectors/iot/pom.xml

diff --git a/connectors/iot/pom.xml b/connectors/iot/pom.xml
index fee160f..fbb5d2d 100644
--- a/connectors/iot/pom.xml
+++ b/connectors/iot/pom.xml
@@ -28,7 +28,7 @@
 
   <artifactId>edgent-connectors-iot</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: IoT</name>
+  <name>Apache Edgent (Java 8): Connectors: IoT</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -36,12 +36,12 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-function</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

connectors/iotp/pom.xml

diff --git a/connectors/iotp/pom.xml b/connectors/iotp/pom.xml
index 5813c90..72dedbf 100644
--- a/connectors/iotp/pom.xml
+++ b/connectors/iotp/pom.xml
@@ -28,7 +28,7 @@
 
   <artifactId>edgent-connectors-iotp</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: IoTP</name>
+  <name>Apache Edgent (Java 8): Connectors: IoTP</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -36,17 +36,17 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-function</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-iot</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

connectors/jdbc/pom.xml

diff --git a/connectors/jdbc/pom.xml b/connectors/jdbc/pom.xml
index cdd2cf6..c31d3d2 100644
--- a/connectors/jdbc/pom.xml
+++ b/connectors/jdbc/pom.xml
@@ -28,7 +28,7 @@
 
   <artifactId>edgent-connectors-jdbc</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: JDBC</name>
+  <name>Apache Edgent (Java 8): Connectors: JDBC</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -62,38 +62,38 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-function</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-common</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>

connectors/kafka/pom.xml

diff --git a/connectors/kafka/pom.xml b/connectors/kafka/pom.xml
index 9f7bd27..52fd8f1 100644
--- a/connectors/kafka/pom.xml
+++ b/connectors/kafka/pom.xml
@@ -28,7 +28,7 @@
 
   <artifactId>edgent-connectors-kafka</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: Kafka</name>
+  <name>Apache Edgent (Java 8): Connectors: Kafka</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -49,7 +49,7 @@
    -->
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
@@ -132,27 +132,27 @@
     </dependency>
 
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-common</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>

connectors/mqtt/pom.xml

diff --git a/connectors/mqtt/pom.xml b/connectors/mqtt/pom.xml
index 2af1c89..253afef 100644
--- a/connectors/mqtt/pom.xml
+++ b/connectors/mqtt/pom.xml
@@ -28,7 +28,7 @@
 
   <artifactId>edgent-connectors-mqtt</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: MQTT</name>
+  <name>Apache Edgent (Java 8): Connectors: MQTT</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -65,17 +65,17 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-iot</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-common</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
@@ -86,27 +86,27 @@
     </dependency>
 
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-common</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>

connectors/pom.xml

diff --git a/connectors/pom.xml b/connectors/pom.xml
index 32197e5..9190cfa 100644
--- a/connectors/pom.xml
+++ b/connectors/pom.xml
@@ -29,7 +29,7 @@
   <artifactId>edgent-connectors</artifactId>
   <packaging>pom</packaging>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors</name>
+  <name>Apache Edgent (Java 8): Connectors</name>
 
   <modules>
     <module>command</module>

connectors/pubsub/pom.xml

diff --git a/connectors/pubsub/pom.xml b/connectors/pubsub/pom.xml
index 138c562..308d656 100644
--- a/connectors/pubsub/pom.xml
+++ b/connectors/pubsub/pom.xml
@@ -28,17 +28,17 @@
 
   <artifactId>edgent-connectors-pubsub</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: PubSub</name>
+  <name>Apache Edgent (Java 8): Connectors: PubSub</name>
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>

connectors/serial/pom.xml

diff --git a/connectors/serial/pom.xml b/connectors/serial/pom.xml
index 2e0b0fc..25515a1 100644
--- a/connectors/serial/pom.xml
+++ b/connectors/serial/pom.xml
@@ -28,7 +28,7 @@
 
   <artifactId>edgent-connectors-serial</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: Serial</name>
+  <name>Apache Edgent (Java 8): Connectors: Serial</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -36,7 +36,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

connectors/websocket-base/pom.xml

diff --git a/connectors/websocket-base/pom.xml b/connectors/websocket-base/pom.xml
index 3e1b0a8..b99767a 100644
--- a/connectors/websocket-base/pom.xml
+++ b/connectors/websocket-base/pom.xml
@@ -28,7 +28,7 @@
 
   <artifactId>edgent-connectors-websocket-base</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: Websocket: Base</name>
+  <name>Apache Edgent (Java 8): Connectors: Websocket: Base</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -36,7 +36,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

connectors/websocket-jetty/pom.xml

diff --git a/connectors/websocket-jetty/pom.xml b/connectors/websocket-jetty/pom.xml
index 6bffee3..517174a 100644
--- a/connectors/websocket-jetty/pom.xml
+++ b/connectors/websocket-jetty/pom.xml
@@ -28,7 +28,7 @@
 
   <artifactId>edgent-connectors-websocket-jetty</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: Websocket: Jetty</name>
+  <name>Apache Edgent (Java 8): Connectors: Websocket: Jetty</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -36,7 +36,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-websocket-misc</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

connectors/websocket-misc/pom.xml

diff --git a/connectors/websocket-misc/pom.xml b/connectors/websocket-misc/pom.xml
index bf3ff91..d20b00c 100644
--- a/connectors/websocket-misc/pom.xml
+++ b/connectors/websocket-misc/pom.xml
@@ -28,7 +28,7 @@
 
   <artifactId>edgent-connectors-websocket-misc</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: Websocket: Misc</name>
+  <name>Apache Edgent (Java 8): Connectors: Websocket: Misc</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>

connectors/websocket-server/pom.xml

diff --git a/connectors/websocket-server/pom.xml b/connectors/websocket-server/pom.xml
index e529418..b3a9a60 100644
--- a/connectors/websocket-server/pom.xml
+++ b/connectors/websocket-server/pom.xml
@@ -28,7 +28,7 @@
 
   <artifactId>edgent-connectors-websocket-server</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: Websocket: Server</name>
+  <name>Apache Edgent (Java 8): Connectors: Websocket: Server</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -36,7 +36,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-websocket-jetty</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

connectors/websocket/pom.xml

diff --git a/connectors/websocket/pom.xml b/connectors/websocket/pom.xml
index fb8eb3f..c018fd7 100644
--- a/connectors/websocket/pom.xml
+++ b/connectors/websocket/pom.xml
@@ -28,7 +28,7 @@
 
   <artifactId>edgent-connectors-websocket</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: Websocket</name>
+  <name>Apache Edgent (Java 8): Connectors: Websocket</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -36,17 +36,17 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-common</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-websocket-misc</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-websocket-base</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
@@ -81,34 +81,34 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-common</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-websocket-jetty</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>

console/pom.xml

diff --git a/console/pom.xml b/console/pom.xml
index 2b79fc0..35f7c91 100644
--- a/console/pom.xml
+++ b/console/pom.xml
@@ -29,7 +29,7 @@
   <artifactId>edgent-console</artifactId>
   <packaging>pom</packaging>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Console</name>
+  <name>Apache Edgent (Java 8): Console</name>
 
   <modules>
     <module>server</module>

console/server/pom.xml

diff --git a/console/server/pom.xml b/console/server/pom.xml
index fbd0c53..eb9fb04 100644
--- a/console/server/pom.xml
+++ b/console/server/pom.xml
@@ -28,7 +28,7 @@
 
   <artifactId>edgent-console-server</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Console: Server</name>
+  <name>Apache Edgent (Java 8): Console: Server</name>
 
   <build>
     <resources>
@@ -72,7 +72,7 @@
                -->
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.runtime.groupId}</groupId>
+                  <groupId>${project.groupId}</groupId>
                   <artifactId>edgent-console-servlets</artifactId>
                   <version>${project.version}</version>
                   <type>war</type>
@@ -141,7 +141,7 @@
         prior to this module.
     -->
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-console-servlets</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>war</type>

console/servlets/pom.xml

diff --git a/console/servlets/pom.xml b/console/servlets/pom.xml
index 50f14ba..8061847 100644
--- a/console/servlets/pom.xml
+++ b/console/servlets/pom.xml
@@ -29,7 +29,7 @@
   <artifactId>edgent-console-servlets</artifactId>
   <packaging>war</packaging>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Console: Servlets</name>
+  <name>Apache Edgent (Java 8): Console: Servlets</name>
 
   <build>
     <!-- Add the directory where all the external resources were unpacked to the build -->
@@ -162,7 +162,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-utils-streamscope</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

distribution/pom.xml

diff --git a/distribution/pom.xml b/distribution/pom.xml
index a60e332..be94f0e 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -30,7 +30,7 @@
 
   <artifactId>edgent-distribution</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Distribution</name>
+  <name>Apache Edgent (Java 8): Distribution</name>
 
   <build>
     <plugins>
@@ -78,113 +78,113 @@
 
     <!-- Providers -->
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-development</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-iot</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
 
     <!-- Analytics -->
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-analytics-math3</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-analytics-sensors</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
 
     <!-- Utils -->
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-utils-metrics</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-utils-streamscope</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
 
     <!-- Connectors -->
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-command</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-common</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-csv</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-file</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-http</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-iot</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-iotp</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-jdbc</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-kafka</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-mqtt</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-pubsub</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-serial</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-websocket</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-websocket-jetty</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
@@ -196,7 +196,7 @@
          of the development provider.
     -->
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-console-servlets</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>war</type>

platforms/android/analytics/math3/pom.xml

diff --git a/platforms/android/analytics/math3/pom.xml b/platforms/android/analytics/math3/pom.xml
index 484cba3..7e108db 100644
--- a/platforms/android/analytics/math3/pom.xml
+++ b/platforms/android/analytics/math3/pom.xml
@@ -29,7 +29,7 @@
 
   <artifactId>edgent-analytics-math3</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Analytics: Math3</name>
+  <name>Apache Edgent (Android): Analytics: Math3</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,7 +50,7 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent.java7</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -66,7 +66,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

platforms/android/analytics/pom.xml

diff --git a/platforms/android/analytics/pom.xml b/platforms/android/analytics/pom.xml
index 3fd6c73..eca01a5 100644
--- a/platforms/android/analytics/pom.xml
+++ b/platforms/android/analytics/pom.xml
@@ -30,7 +30,7 @@
   <artifactId>edgent-analytics</artifactId>
   <packaging>pom</packaging>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Analytics</name>
+  <name>Apache Edgent (Android): Analytics</name>
 
   <modules>
     <module>math3</module>

platforms/android/analytics/sensors/pom.xml

diff --git a/platforms/android/analytics/sensors/pom.xml b/platforms/android/analytics/sensors/pom.xml
index 1142079..1bf0538 100644
--- a/platforms/android/analytics/sensors/pom.xml
+++ b/platforms/android/analytics/sensors/pom.xml
@@ -29,7 +29,7 @@
 
   <artifactId>edgent-analytics-sensors</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Analytics: Sensors</name>
+  <name>Apache Edgent (Android): Analytics: Sensors</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,7 +50,7 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent.java7</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -66,7 +66,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

platforms/android/android/hardware/pom.xml

diff --git a/platforms/android/android/hardware/pom.xml b/platforms/android/android/hardware/pom.xml
index 0da84c6..a583dea 100644
--- a/platforms/android/android/hardware/pom.xml
+++ b/platforms/android/android/hardware/pom.xml
@@ -29,7 +29,7 @@
 
   <artifactId>edgent-android-hardware</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Android: Hardware</name>
+  <name>Apache Edgent (Android): Android: Hardware</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -37,7 +37,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

platforms/android/android/pom.xml

diff --git a/platforms/android/android/pom.xml b/platforms/android/android/pom.xml
index 047cd2a..772925a 100644
--- a/platforms/android/android/pom.xml
+++ b/platforms/android/android/pom.xml
@@ -30,7 +30,7 @@
   <artifactId>edgent-android</artifactId>
   <packaging>pom</packaging>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Android</name>
+  <name>Apache Edgent (Android): Android</name>
 
   <modules>
     <module>hardware</module>

platforms/android/android/topology/pom.xml

diff --git a/platforms/android/android/topology/pom.xml b/platforms/android/android/topology/pom.xml
index 29b7dd8..2c36d13 100644
--- a/platforms/android/android/topology/pom.xml
+++ b/platforms/android/android/topology/pom.xml
@@ -29,7 +29,7 @@
 
   <artifactId>edgent-android-topology</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Android: Topology</name>
+  <name>Apache Edgent (Android): Android: Topology</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -37,12 +37,12 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-oplet</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

platforms/android/api/execution/pom.xml

diff --git a/platforms/android/api/execution/pom.xml b/platforms/android/api/execution/pom.xml
index b63902d..ca44dbc 100644
--- a/platforms/android/api/execution/pom.xml
+++ b/platforms/android/api/execution/pom.xml
@@ -29,7 +29,7 @@
 
   <artifactId>edgent-api-execution</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: API: Execution</name>
+  <name>Apache Edgent (Android): API: Execution</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,7 +50,7 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent.java7</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -66,7 +66,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-function</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

platforms/android/api/function/pom.xml

diff --git a/platforms/android/api/function/pom.xml b/platforms/android/api/function/pom.xml
index 7d1ef14..95b0355 100644
--- a/platforms/android/api/function/pom.xml
+++ b/platforms/android/api/function/pom.xml
@@ -29,7 +29,7 @@
 
   <artifactId>edgent-api-function</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: API: Function</name>
+  <name>Apache Edgent (Android): API: Function</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,7 +50,7 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent.java7</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>

platforms/android/api/graph/pom.xml

diff --git a/platforms/android/api/graph/pom.xml b/platforms/android/api/graph/pom.xml
index 846cb39..a8a7610 100644
--- a/platforms/android/api/graph/pom.xml
+++ b/platforms/android/api/graph/pom.xml
@@ -29,7 +29,7 @@
 
   <artifactId>edgent-api-graph</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: API: Graph</name>
+  <name>Apache Edgent (Android): API: Graph</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,7 +50,7 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent.java7</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -66,7 +66,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-oplet</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

platforms/android/api/oplet/pom.xml

diff --git a/platforms/android/api/oplet/pom.xml b/platforms/android/api/oplet/pom.xml
index 95bf8fd..b9ef08f 100644
--- a/platforms/android/api/oplet/pom.xml
+++ b/platforms/android/api/oplet/pom.xml
@@ -29,7 +29,7 @@
 
   <artifactId>edgent-api-oplet</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: API: Oplet</name>
+  <name>Apache Edgent (Android): API: Oplet</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,7 +50,7 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent.java7</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -66,17 +66,17 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-function</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-execution</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-window</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

platforms/android/api/pom.xml

diff --git a/platforms/android/api/pom.xml b/platforms/android/api/pom.xml
index c3a8f33..3ca0ebd 100644
--- a/platforms/android/api/pom.xml
+++ b/platforms/android/api/pom.xml
@@ -30,7 +30,7 @@
   <artifactId>edgent-api</artifactId>
   <packaging>pom</packaging>
 
-  <name>Apache Edgent ${edgent.projname.platform}: API</name>
+  <name>Apache Edgent (Android): API</name>
 
   <modules>
     <module>execution</module>

platforms/android/api/topology/pom.xml

diff --git a/platforms/android/api/topology/pom.xml b/platforms/android/api/topology/pom.xml
index 878f1fd..865f192 100644
--- a/platforms/android/api/topology/pom.xml
+++ b/platforms/android/api/topology/pom.xml
@@ -29,7 +29,7 @@
 
   <artifactId>edgent-api-topology</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: API: Topology</name>
+  <name>Apache Edgent (Android): API: Topology</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,7 +50,7 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent.java7</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -66,22 +66,22 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-execution</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-function</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-graph</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-oplet</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

platforms/android/api/window/pom.xml

diff --git a/platforms/android/api/window/pom.xml b/platforms/android/api/window/pom.xml
index 2181691..a2af80c 100644
--- a/platforms/android/api/window/pom.xml
+++ b/platforms/android/api/window/pom.xml
@@ -29,7 +29,7 @@
 
   <artifactId>edgent-api-window</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: API: Window</name>
+  <name>Apache Edgent (Android): API: Window</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,7 +50,7 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent.java7</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -66,7 +66,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-function</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

platforms/android/apps/iot/pom.xml

diff --git a/platforms/android/apps/iot/pom.xml b/platforms/android/apps/iot/pom.xml
index 1b44ca4..d411cce 100644
--- a/platforms/android/apps/iot/pom.xml
+++ b/platforms/android/apps/iot/pom.xml
@@ -29,7 +29,7 @@
 
   <artifactId>edgent-apps-iot</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Apps: IoT</name>
+  <name>Apache Edgent (Android): Apps: IoT</name>
 
   <build>
     <plugins>
@@ -46,7 +46,7 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent.java7</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -62,17 +62,17 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-iot</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-pubsub</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

platforms/android/apps/pom.xml

diff --git a/platforms/android/apps/pom.xml b/platforms/android/apps/pom.xml
index 9117696..b9c1de6 100644
--- a/platforms/android/apps/pom.xml
+++ b/platforms/android/apps/pom.xml
@@ -30,7 +30,7 @@
   <artifactId>edgent-apps</artifactId>
   <packaging>pom</packaging>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Apps</name>
+  <name>Apache Edgent (Android): Apps</name>
 
   <modules>
     <module>iot</module>

platforms/android/apps/runtime/pom.xml

diff --git a/platforms/android/apps/runtime/pom.xml b/platforms/android/apps/runtime/pom.xml
index 216c8fa..e3fdd30 100644
--- a/platforms/android/apps/runtime/pom.xml
+++ b/platforms/android/apps/runtime/pom.xml
@@ -29,7 +29,7 @@
 
   <artifactId>edgent-apps-runtime</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Apps: Runtime</name>
+  <name>Apache Edgent (Android): Apps: Runtime</name>
 
   <build>
     <plugins>
@@ -46,7 +46,7 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent.java7</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -62,12 +62,12 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-runtime-jobregistry</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

platforms/android/connectors/command/pom.xml

diff --git a/platforms/android/connectors/command/pom.xml b/platforms/android/connectors/command/pom.xml
index 8493a21..d2ae21a 100644
--- a/platforms/android/connectors/command/pom.xml
+++ b/platforms/android/connectors/command/pom.xml
@@ -29,7 +29,7 @@
 
   <artifactId>edgent-connectors-command</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: Command</name>
+  <name>Apache Edgent (Android): Connectors: Command</name>
 
   <build>
     <plugins>
@@ -46,7 +46,7 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent.java7</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -62,12 +62,12 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-common</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

platforms/android/connectors/common/pom.xml

diff --git a/platforms/android/connectors/common/pom.xml b/platforms/android/connectors/common/pom.xml
index bdb407b..57292ef 100644
--- a/platforms/android/connectors/common/pom.xml
+++ b/platforms/android/connectors/common/pom.xml
@@ -29,7 +29,7 @@
 
   <artifactId>edgent-connectors-common</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: Common</name>
+  <name>Apache Edgent (Android): Connectors: Common</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,7 +50,7 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent.java7</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -66,7 +66,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

platforms/android/connectors/csv/pom.xml

diff --git a/platforms/android/connectors/csv/pom.xml b/platforms/android/connectors/csv/pom.xml
index cfbc439..f2cb18b 100644
--- a/platforms/android/connectors/csv/pom.xml
+++ b/platforms/android/connectors/csv/pom.xml
@@ -29,7 +29,7 @@
 
   <artifactId>edgent-connectors-csv</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: CSV</name>
+  <name>Apache Edgent (Android): Connectors: CSV</name>
 
   <build>
     <plugins>
@@ -46,7 +46,7 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent.java7</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>

platforms/android/connectors/file/pom.xml

diff --git a/platforms/android/connectors/file/pom.xml b/platforms/android/connectors/file/pom.xml
index d87fd74..b845f53 100644
--- a/platforms/android/connectors/file/pom.xml
+++ b/platforms/android/connectors/file/pom.xml
@@ -29,7 +29,7 @@
 
   <artifactId>edgent-connectors-file</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: File</name>
+  <name>Apache Edgent (Android): Connectors: File</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,7 +50,7 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent.java7</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -66,17 +66,17 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-function</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-oplet</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

platforms/android/connectors/http/pom.xml

diff --git a/platforms/android/connectors/http/pom.xml b/platforms/android/connectors/http/pom.xml
index d3c8fe4..d321de7 100644
--- a/platforms/android/connectors/http/pom.xml
+++ b/platforms/android/connectors/http/pom.xml
@@ -29,7 +29,7 @@
 
   <artifactId>edgent-connectors-http</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: HTTP</name>
+  <name>Apache Edgent (Android): Connectors: HTTP</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,7 +50,7 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent.java7</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -66,7 +66,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

platforms/android/connectors/iot/pom.xml

diff --git a/platforms/android/connectors/iot/pom.xml b/platforms/android/connectors/iot/pom.xml
index b21ca48..1339eae 100644
--- a/platforms/android/connectors/iot/pom.xml
+++ b/platforms/android/connectors/iot/pom.xml
@@ -29,7 +29,7 @@
 
   <artifactId>edgent-connectors-iot</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: IoT</name>
+  <name>Apache Edgent (Android): Connectors: IoT</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,7 +50,7 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent.java7</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -66,12 +66,12 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-function</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

platforms/android/connectors/iotp/pom.xml

diff --git a/platforms/android/connectors/iotp/pom.xml b/platforms/android/connectors/iotp/pom.xml
index c674167..2a65211 100644
--- a/platforms/android/connectors/iotp/pom.xml
+++ b/platforms/android/connectors/iotp/pom.xml
@@ -29,7 +29,7 @@
 
   <artifactId>edgent-connectors-iotp</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: IoTP</name>
+  <name>Apache Edgent (Android): Connectors: IoTP</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,7 +50,7 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent.java7</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -66,17 +66,17 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-function</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-iot</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

platforms/android/connectors/jdbc/pom.xml

diff --git a/platforms/android/connectors/jdbc/pom.xml b/platforms/android/connectors/jdbc/pom.xml
index fff2af4..eeb6207 100644
--- a/platforms/android/connectors/jdbc/pom.xml
+++ b/platforms/android/connectors/jdbc/pom.xml
@@ -29,7 +29,7 @@
 
   <artifactId>edgent-connectors-jdbc</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: JDBC</name>
+  <name>Apache Edgent (Android): Connectors: JDBC</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,7 +50,7 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent.java7</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -66,12 +66,12 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-function</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

platforms/android/connectors/kafka/pom.xml

diff --git a/platforms/android/connectors/kafka/pom.xml b/platforms/android/connectors/kafka/pom.xml
index 6c8d6f3..7ce9ee2 100644
--- a/platforms/android/connectors/kafka/pom.xml
+++ b/platforms/android/connectors/kafka/pom.xml
@@ -29,7 +29,7 @@
 
   <artifactId>edgent-connectors-kafka</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: Kafka</name>
+  <name>Apache Edgent (Android): Connectors: Kafka</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,7 +50,7 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent.java7</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -80,7 +80,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

platforms/android/connectors/mqtt/pom.xml

diff --git a/platforms/android/connectors/mqtt/pom.xml b/platforms/android/connectors/mqtt/pom.xml
index cbeb953..d9eeddf 100644
--- a/platforms/android/connectors/mqtt/pom.xml
+++ b/platforms/android/connectors/mqtt/pom.xml
@@ -29,7 +29,7 @@
 
   <artifactId>edgent-connectors-mqtt</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: MQTT</name>
+  <name>Apache Edgent (Android): Connectors: MQTT</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,7 +50,7 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent.java7</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -66,17 +66,17 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-iot</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-common</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

platforms/android/connectors/pom.xml

diff --git a/platforms/android/connectors/pom.xml b/platforms/android/connectors/pom.xml
index b3417d9..2059acb 100644
--- a/platforms/android/connectors/pom.xml
+++ b/platforms/android/connectors/pom.xml
@@ -30,7 +30,7 @@
   <artifactId>edgent-connectors</artifactId>
   <packaging>pom</packaging>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors</name>
+  <name>Apache Edgent (Android): Connectors</name>
 
   <modules>
     <module>command</module>

platforms/android/connectors/pubsub/pom.xml

diff --git a/platforms/android/connectors/pubsub/pom.xml b/platforms/android/connectors/pubsub/pom.xml
index 37041ca..9abf32c 100644
--- a/platforms/android/connectors/pubsub/pom.xml
+++ b/platforms/android/connectors/pubsub/pom.xml
@@ -29,7 +29,7 @@
 
   <artifactId>edgent-connectors-pubsub</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: PubSub</name>
+  <name>Apache Edgent (Android): Connectors: PubSub</name>
 
   <build>
     <plugins>
@@ -46,7 +46,7 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent.java7</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -62,7 +62,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

platforms/android/connectors/serial/pom.xml

diff --git a/platforms/android/connectors/serial/pom.xml b/platforms/android/connectors/serial/pom.xml
index 08d7261..dc13a49 100644
--- a/platforms/android/connectors/serial/pom.xml
+++ b/platforms/android/connectors/serial/pom.xml
@@ -29,7 +29,7 @@
 
   <artifactId>edgent-connectors-serial</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: Serial</name>
+  <name>Apache Edgent (Android): Connectors: Serial</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,7 +50,7 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent.java7</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -66,7 +66,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

platforms/android/connectors/websocket-base/pom.xml

diff --git a/platforms/android/connectors/websocket-base/pom.xml b/platforms/android/connectors/websocket-base/pom.xml
index 4ab3273..0df1f47 100644
--- a/platforms/android/connectors/websocket-base/pom.xml
+++ b/platforms/android/connectors/websocket-base/pom.xml
@@ -29,7 +29,7 @@
 
   <artifactId>edgent-connectors-websocket-base</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: Websocket: Base</name>
+  <name>Apache Edgent (Android): Connectors: Websocket: Base</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,7 +50,7 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent.java7</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -66,7 +66,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

platforms/android/connectors/websocket-jetty/pom.xml

diff --git a/platforms/android/connectors/websocket-jetty/pom.xml b/platforms/android/connectors/websocket-jetty/pom.xml
index 4f87c5f..63bf264 100644
--- a/platforms/android/connectors/websocket-jetty/pom.xml
+++ b/platforms/android/connectors/websocket-jetty/pom.xml
@@ -29,7 +29,7 @@
 
   <artifactId>edgent-connectors-websocket-jetty</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: Websocket: Jetty</name>
+  <name>Apache Edgent (Android): Connectors: Websocket: Jetty</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,7 +50,7 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent.java7</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -66,7 +66,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-websocket-misc</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

platforms/android/connectors/websocket-misc/pom.xml

diff --git a/platforms/android/connectors/websocket-misc/pom.xml b/platforms/android/connectors/websocket-misc/pom.xml
index 7b64013..188956f 100644
--- a/platforms/android/connectors/websocket-misc/pom.xml
+++ b/platforms/android/connectors/websocket-misc/pom.xml
@@ -29,7 +29,7 @@
 
   <artifactId>edgent-connectors-websocket-misc</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: Websocket: Misc</name>
+  <name>Apache Edgent (Android): Connectors: Websocket: Misc</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,7 +50,7 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent.java7</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>

platforms/android/connectors/websocket-server/pom.xml

diff --git a/platforms/android/connectors/websocket-server/pom.xml b/platforms/android/connectors/websocket-server/pom.xml
index 206780e..7806705 100644
--- a/platforms/android/connectors/websocket-server/pom.xml
+++ b/platforms/android/connectors/websocket-server/pom.xml
@@ -29,7 +29,7 @@
 
   <artifactId>edgent-connectors-websocket-server</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: Websocket: Server</name>
+  <name>Apache Edgent (Android): Connectors: Websocket: Server</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,7 +50,7 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent.java7</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -66,7 +66,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-websocket-jetty</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

platforms/android/connectors/websocket/pom.xml

diff --git a/platforms/android/connectors/websocket/pom.xml b/platforms/android/connectors/websocket/pom.xml
index 88405fa..c8cfce7 100644
--- a/platforms/android/connectors/websocket/pom.xml
+++ b/platforms/android/connectors/websocket/pom.xml
@@ -29,7 +29,7 @@
 
   <artifactId>edgent-connectors-websocket</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: Websocket</name>
+  <name>Apache Edgent (Android): Connectors: Websocket</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,7 +50,7 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent.java7</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -66,17 +66,17 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-common</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-websocket-misc</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-websocket-base</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

platforms/android/distribution/pom.xml

diff --git a/platforms/android/distribution/pom.xml b/platforms/android/distribution/pom.xml
index 8e259b0..f8f61d0 100644
--- a/platforms/android/distribution/pom.xml
+++ b/platforms/android/distribution/pom.xml
@@ -30,7 +30,7 @@
 
   <artifactId>edgent-distribution</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Distribution</name>
+  <name>Apache Edgent (Android): Distribution</name>
 
   <build>
     <plugins>
@@ -78,125 +78,125 @@
 
     <!-- Providers -->
     <!-- Not on android <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-development</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency-->
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-iot</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
 
     <!-- Android platform speficic -->
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-android-hardware</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-android-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
 
     <!-- Analytics -->
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-analytics-math3</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-analytics-sensors</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
 
     <!-- Utils -->
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-utils-metrics</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-utils-streamscope</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
 
     <!-- Connectors -->
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-command</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-common</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-csv</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-file</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-http</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-iot</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-iotp</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-jdbc</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-kafka</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-mqtt</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-pubsub</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-serial</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-websocket</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-websocket-jetty</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
@@ -208,7 +208,7 @@
          of the development provider.
     -->
     <!-- Not on android <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-console-servlets</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>war</type>

platforms/android/pom.xml

diff --git a/platforms/android/pom.xml b/platforms/android/pom.xml
index 07874ab..4f48fa3 100644
--- a/platforms/android/pom.xml
+++ b/platforms/android/pom.xml
@@ -31,15 +31,7 @@
   <artifactId>edgent-platforms-android</artifactId>
   <packaging>pom</packaging>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Platforms: Android</name>
-
-  <properties>
-    <edgent.projname.platform>(Android)</edgent.projname.platform>
-    <edgent.runtime.groupId>org.apache.edgent.android</edgent.runtime.groupId>
-
-    <!-- Edgent groupId of jars the retrolambda processing will use -->
-    <edgent.retrolambda.srcArtifactGroupId>org.apache.edgent.java7</edgent.retrolambda.srcArtifactGroupId>
-  </properties>
+  <name>Apache Edgent (Android): Platforms: Android</name>
 
   <modules>
     <!-- Real modules -->

platforms/android/providers/direct/pom.xml

diff --git a/platforms/android/providers/direct/pom.xml b/platforms/android/providers/direct/pom.xml
index 4266634..57931ad 100644
--- a/platforms/android/providers/direct/pom.xml
+++ b/platforms/android/providers/direct/pom.xml
@@ -29,7 +29,7 @@
 
   <artifactId>edgent-providers-direct</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Providers: Direct</name>
+  <name>Apache Edgent (Android): Providers: Direct</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,7 +50,7 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent.java7</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -66,32 +66,32 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-spi-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-spi-graph</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-runtime-appservice</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-runtime-etiao</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-runtime-jsoncontrol</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

platforms/android/providers/iot/pom.xml

diff --git a/platforms/android/providers/iot/pom.xml b/platforms/android/providers/iot/pom.xml
index ce19fca..c9e787b 100644
--- a/platforms/android/providers/iot/pom.xml
+++ b/platforms/android/providers/iot/pom.xml
@@ -29,7 +29,7 @@
 
   <artifactId>edgent-providers-iot</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Providers: IoT</name>
+  <name>Apache Edgent (Android): Providers: IoT</name>
 
   <build>
     <plugins>
@@ -46,7 +46,7 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent.java7</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -62,37 +62,37 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-runtime-jsoncontrol</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-runtime-appservice</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-iot</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-pubsub</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-apps-iot</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-apps-runtime</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

platforms/android/providers/pom.xml

diff --git a/platforms/android/providers/pom.xml b/platforms/android/providers/pom.xml
index e289a9e..9962d9a 100644
--- a/platforms/android/providers/pom.xml
+++ b/platforms/android/providers/pom.xml
@@ -30,7 +30,7 @@
   <artifactId>edgent-providers</artifactId>
   <packaging>pom</packaging>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Providers</name>
+  <name>Apache Edgent (Android): Providers</name>
 
   <modules>
     <module>direct</module>

platforms/android/runtime/appservice/pom.xml

diff --git a/platforms/android/runtime/appservice/pom.xml b/platforms/android/runtime/appservice/pom.xml
index a48a232..f887246 100644
--- a/platforms/android/runtime/appservice/pom.xml
+++ b/platforms/android/runtime/appservice/pom.xml
@@ -29,7 +29,7 @@
 
   <artifactId>edgent-runtime-appservice</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Runtime: AppService</name>
+  <name>Apache Edgent (Android): Runtime: AppService</name>
 
   <build>
     <plugins>
@@ -46,7 +46,7 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent.java7</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -62,12 +62,12 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-execution</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

platforms/android/runtime/etiao/pom.xml

diff --git a/platforms/android/runtime/etiao/pom.xml b/platforms/android/runtime/etiao/pom.xml
index e0fbdae..4f9695e 100644
--- a/platforms/android/runtime/etiao/pom.xml
+++ b/platforms/android/runtime/etiao/pom.xml
@@ -29,7 +29,7 @@
 
   <artifactId>edgent-runtime-etiao</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Runtime: Etiao</name>
+  <name>Apache Edgent (Android): Runtime: Etiao</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,7 +50,7 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent.java7</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -66,17 +66,17 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-execution</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-graph</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-spi-graph</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

platforms/android/runtime/jobregistry/pom.xml

diff --git a/platforms/android/runtime/jobregistry/pom.xml b/platforms/android/runtime/jobregistry/pom.xml
index 74e2192..122138c 100644
--- a/platforms/android/runtime/jobregistry/pom.xml
+++ b/platforms/android/runtime/jobregistry/pom.xml
@@ -29,7 +29,7 @@
 
   <artifactId>edgent-runtime-jobregistry</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Runtime: JobRegistry</name>
+  <name>Apache Edgent (Android): Runtime: JobRegistry</name>
 
   <build>
     <plugins>
@@ -46,7 +46,7 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent.java7</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -62,12 +62,12 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-execution</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

platforms/android/runtime/jsoncontrol/pom.xml

diff --git a/platforms/android/runtime/jsoncontrol/pom.xml b/platforms/android/runtime/jsoncontrol/pom.xml
index ccc376d..d3351be 100644
--- a/platforms/android/runtime/jsoncontrol/pom.xml
+++ b/platforms/android/runtime/jsoncontrol/pom.xml
@@ -29,7 +29,7 @@
 
   <artifactId>edgent-runtime-jsoncontrol</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Runtime: JSONControl</name>
+  <name>Apache Edgent (Android): Runtime: JSONControl</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,7 +50,7 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent.java7</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -66,12 +66,12 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-execution</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-function</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

platforms/android/runtime/pom.xml

diff --git a/platforms/android/runtime/pom.xml b/platforms/android/runtime/pom.xml
index e04966e..67c5259 100644
--- a/platforms/android/runtime/pom.xml
+++ b/platforms/android/runtime/pom.xml
@@ -30,7 +30,7 @@
   <artifactId>edgent-runtime</artifactId>
   <packaging>pom</packaging>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Runtimes</name>
+  <name>Apache Edgent (Android): Runtimes</name>
 
   <modules>
     <module>appservice</module>

platforms/android/spi/graph/pom.xml

diff --git a/platforms/android/spi/graph/pom.xml b/platforms/android/spi/graph/pom.xml
index 2070eb5..3cf71ad 100644
--- a/platforms/android/spi/graph/pom.xml
+++ b/platforms/android/spi/graph/pom.xml
@@ -29,7 +29,7 @@
 
   <artifactId>edgent-spi-graph</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: SPI: Graph</name>
+  <name>Apache Edgent (Android): SPI: Graph</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,7 +50,7 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent.java7</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -66,12 +66,12 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-execution</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-graph</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

platforms/android/spi/pom.xml

diff --git a/platforms/android/spi/pom.xml b/platforms/android/spi/pom.xml
index 019befc..7ade849 100644
--- a/platforms/android/spi/pom.xml
+++ b/platforms/android/spi/pom.xml
@@ -30,7 +30,7 @@
   <artifactId>edgent-spi</artifactId>
   <packaging>pom</packaging>
 
-  <name>Apache Edgent ${edgent.projname.platform}: SPI</name>
+  <name>Apache Edgent (Android): SPI</name>
 
   <modules>
     <module>graph</module>

platforms/android/spi/topology/pom.xml

diff --git a/platforms/android/spi/topology/pom.xml b/platforms/android/spi/topology/pom.xml
index 785ff32..de29c6c 100644
--- a/platforms/android/spi/topology/pom.xml
+++ b/platforms/android/spi/topology/pom.xml
@@ -29,7 +29,7 @@
 
   <artifactId>edgent-spi-topology</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: SPI: Topology</name>
+  <name>Apache Edgent (Android): SPI: Topology</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,7 +50,7 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent.java7</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -66,7 +66,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

platforms/android/utils/metrics/pom.xml

diff --git a/platforms/android/utils/metrics/pom.xml b/platforms/android/utils/metrics/pom.xml
index 85644fc..2c1e19d 100644
--- a/platforms/android/utils/metrics/pom.xml
+++ b/platforms/android/utils/metrics/pom.xml
@@ -29,7 +29,7 @@
 
   <artifactId>edgent-utils-metrics</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Utils: Metrics</name>
+  <name>Apache Edgent (Android): Utils: Metrics</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,7 +50,7 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent.java7</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -66,7 +66,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

platforms/android/utils/pom.xml

diff --git a/platforms/android/utils/pom.xml b/platforms/android/utils/pom.xml
index 9d60d54..3d67baa 100644
--- a/platforms/android/utils/pom.xml
+++ b/platforms/android/utils/pom.xml
@@ -30,7 +30,7 @@
   <artifactId>edgent-utils</artifactId>
   <packaging>pom</packaging>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Utils</name>
+  <name>Apache Edgent (Android): Utils</name>
 
   <modules>
     <module>metrics</module>

platforms/android/utils/streamscope/pom.xml

diff --git a/platforms/android/utils/streamscope/pom.xml b/platforms/android/utils/streamscope/pom.xml
index 7857569..f9e7957 100644
--- a/platforms/android/utils/streamscope/pom.xml
+++ b/platforms/android/utils/streamscope/pom.xml
@@ -29,7 +29,7 @@
 
   <artifactId>edgent-utils-streamscope</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Utils: Streamscope</name>
+  <name>Apache Edgent (Android): Utils: Streamscope</name>
 
   <build>
     <plugins>
@@ -46,7 +46,7 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent.java7</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -62,7 +62,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

platforms/java7/analytics/math3/pom.xml

diff --git a/platforms/java7/analytics/math3/pom.xml b/platforms/java7/analytics/math3/pom.xml
index db21f4f..d92ba35 100644
--- a/platforms/java7/analytics/math3/pom.xml
+++ b/platforms/java7/analytics/math3/pom.xml
@@ -29,7 +29,7 @@
 
   <artifactId>edgent-analytics-math3</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Analytics: Math3</name>
+  <name>Apache Edgent (Java 7): Analytics: Math3</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,14 +50,25 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
                   <excludes>META-INF/**</excludes>
                 </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-test</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <classifier>tests</classifier>
@@ -74,7 +85,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
@@ -85,20 +96,20 @@
     </dependency>
 
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>

platforms/java7/analytics/pom.xml

diff --git a/platforms/java7/analytics/pom.xml b/platforms/java7/analytics/pom.xml
index 3fd5d29..7816032 100644
--- a/platforms/java7/analytics/pom.xml
+++ b/platforms/java7/analytics/pom.xml
@@ -30,7 +30,7 @@
   <artifactId>edgent-analytics</artifactId>
   <packaging>pom</packaging>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Analytics</name>
+  <name>Apache Edgent (Java 7): Analytics</name>
 
   <modules>
     <module>math3</module>

platforms/java7/analytics/sensors/pom.xml

diff --git a/platforms/java7/analytics/sensors/pom.xml b/platforms/java7/analytics/sensors/pom.xml
index fb83d28..be6c5c9 100644
--- a/platforms/java7/analytics/sensors/pom.xml
+++ b/platforms/java7/analytics/sensors/pom.xml
@@ -29,7 +29,7 @@
 
   <artifactId>edgent-analytics-sensors</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Analytics: Sensors</name>
+  <name>Apache Edgent (Java 7): Analytics: Sensors</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,14 +50,25 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
                   <excludes>META-INF/**</excludes>
                 </artifactItem>
-                <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-test</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
+              <artifactItem>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <classifier>tests</classifier>
@@ -74,26 +85,26 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>

platforms/java7/api/execution/pom.xml

diff --git a/platforms/java7/api/execution/pom.xml b/platforms/java7/api/execution/pom.xml
index e535f59..e532819 100644
--- a/platforms/java7/api/execution/pom.xml
+++ b/platforms/java7/api/execution/pom.xml
@@ -29,7 +29,7 @@
 
   <artifactId>edgent-api-execution</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: API: Execution</name>
+  <name>Apache Edgent (Java 7): API: Execution</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,14 +50,25 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
                   <excludes>META-INF/**</excludes>
                 </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-test</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <classifier>tests</classifier>
@@ -74,7 +85,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-function</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

platforms/java7/api/function/pom.xml

diff --git a/platforms/java7/api/function/pom.xml b/platforms/java7/api/function/pom.xml
index 854690b..328ae12 100644
--- a/platforms/java7/api/function/pom.xml
+++ b/platforms/java7/api/function/pom.xml
@@ -29,7 +29,7 @@
 
   <artifactId>edgent-api-function</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: API: Function</name>
+  <name>Apache Edgent (Java 7): API: Function</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,14 +50,25 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
                   <excludes>META-INF/**</excludes>
                 </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-test</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <classifier>tests</classifier>

platforms/java7/api/graph/pom.xml

diff --git a/platforms/java7/api/graph/pom.xml b/platforms/java7/api/graph/pom.xml
index a950f53..bdd09aa 100644
--- a/platforms/java7/api/graph/pom.xml
+++ b/platforms/java7/api/graph/pom.xml
@@ -29,7 +29,7 @@
 
   <artifactId>edgent-api-graph</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: API: Graph</name>
+  <name>Apache Edgent (Java 7): API: Graph</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,14 +50,25 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
                   <excludes>META-INF/**</excludes>
                 </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-test</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <classifier>tests</classifier>
@@ -74,7 +85,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-oplet</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

platforms/java7/api/oplet/pom.xml

diff --git a/platforms/java7/api/oplet/pom.xml b/platforms/java7/api/oplet/pom.xml
index 245bf4e..b15b00e 100644
--- a/platforms/java7/api/oplet/pom.xml
+++ b/platforms/java7/api/oplet/pom.xml
@@ -29,7 +29,7 @@
 
   <artifactId>edgent-api-oplet</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: API: Oplet</name>
+  <name>Apache Edgent (Java 7): API: Oplet</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,14 +50,25 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
                   <excludes>META-INF/**</excludes>
                 </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-test</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <classifier>tests</classifier>
@@ -74,17 +85,17 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-function</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-execution</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-window</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

platforms/java7/api/pom.xml

diff --git a/platforms/java7/api/pom.xml b/platforms/java7/api/pom.xml
index 50466ff..270dee9 100644
--- a/platforms/java7/api/pom.xml
+++ b/platforms/java7/api/pom.xml
@@ -30,7 +30,7 @@
   <artifactId>edgent-api</artifactId>
   <packaging>pom</packaging>
 
-  <name>Apache Edgent ${edgent.projname.platform}: API</name>
+  <name>Apache Edgent (Java 7): API</name>
 
   <modules>
     <module>execution</module>

platforms/java7/api/topology/pom.xml

diff --git a/platforms/java7/api/topology/pom.xml b/platforms/java7/api/topology/pom.xml
index e9645d5..a3e0711 100644
--- a/platforms/java7/api/topology/pom.xml
+++ b/platforms/java7/api/topology/pom.xml
@@ -29,7 +29,7 @@
 
   <artifactId>edgent-api-topology</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: API: Topology</name>
+  <name>Apache Edgent (Java 7): API: Topology</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,14 +50,25 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
                   <excludes>META-INF/**</excludes>
                 </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-test</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <classifier>tests</classifier>
@@ -114,22 +125,22 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-execution</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-function</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-graph</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-oplet</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

platforms/java7/api/window/pom.xml

diff --git a/platforms/java7/api/window/pom.xml b/platforms/java7/api/window/pom.xml
index 0b9932a..572515b 100644
--- a/platforms/java7/api/window/pom.xml
+++ b/platforms/java7/api/window/pom.xml
@@ -29,7 +29,7 @@
 
   <artifactId>edgent-api-window</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: API: Window</name>
+  <name>Apache Edgent (Java 7): API: Window</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,14 +50,25 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
                   <excludes>META-INF/**</excludes>
                 </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-test</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <classifier>tests</classifier>
@@ -74,7 +85,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-function</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

platforms/java7/apps/iot/pom.xml

diff --git a/platforms/java7/apps/iot/pom.xml b/platforms/java7/apps/iot/pom.xml
index c4b3cd2..2fd7272 100644
--- a/platforms/java7/apps/iot/pom.xml
+++ b/platforms/java7/apps/iot/pom.xml
@@ -29,7 +29,7 @@
 
   <artifactId>edgent-apps-iot</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Apps: IoT</name>
+  <name>Apache Edgent (Java 7): Apps: IoT</name>
 
   <build>
     <plugins>
@@ -46,14 +46,25 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
                   <excludes>META-INF/**</excludes>
                 </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-test</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <classifier>tests</classifier>
@@ -70,23 +81,23 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-iot</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-pubsub</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>

platforms/java7/apps/pom.xml

diff --git a/platforms/java7/apps/pom.xml b/platforms/java7/apps/pom.xml
index fc1c331..b16126c 100644
--- a/platforms/java7/apps/pom.xml
+++ b/platforms/java7/apps/pom.xml
@@ -30,7 +30,7 @@
   <artifactId>edgent-apps</artifactId>
   <packaging>pom</packaging>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Apps</name>
+  <name>Apache Edgent (Java 7): Apps</name>
 
   <modules>
     <module>iot</module>

platforms/java7/apps/runtime/pom.xml

diff --git a/platforms/java7/apps/runtime/pom.xml b/platforms/java7/apps/runtime/pom.xml
index 9cdd3af..9ca129a 100644
--- a/platforms/java7/apps/runtime/pom.xml
+++ b/platforms/java7/apps/runtime/pom.xml
@@ -29,7 +29,7 @@
 
   <artifactId>edgent-apps-runtime</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Apps: Runtime</name>
+  <name>Apache Edgent (Java 7): Apps: Runtime</name>
 
   <build>
     <plugins>
@@ -46,14 +46,25 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
                   <excludes>META-INF/**</excludes>
                 </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-test</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <classifier>tests</classifier>
@@ -70,24 +81,24 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-runtime-jobregistry</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-runtime-jmxcontrol</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>

platforms/java7/connectors/command/pom.xml

diff --git a/platforms/java7/connectors/command/pom.xml b/platforms/java7/connectors/command/pom.xml
index 78a5a04..3590770 100644
--- a/platforms/java7/connectors/command/pom.xml
+++ b/platforms/java7/connectors/command/pom.xml
@@ -29,7 +29,7 @@
 
   <artifactId>edgent-connectors-command</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: Command</name>
+  <name>Apache Edgent (Java 7): Connectors: Command</name>
 
   <build>
     <plugins>
@@ -46,14 +46,25 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
                   <excludes>META-INF/**</excludes>
                 </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-test</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <classifier>tests</classifier>
@@ -70,38 +81,38 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-common</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-common</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>

platforms/java7/connectors/common/pom.xml

diff --git a/platforms/java7/connectors/common/pom.xml b/platforms/java7/connectors/common/pom.xml
index 3290378..32f7233 100644
--- a/platforms/java7/connectors/common/pom.xml
+++ b/platforms/java7/connectors/common/pom.xml
@@ -29,7 +29,7 @@
 
   <artifactId>edgent-connectors-common</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: Common</name>
+  <name>Apache Edgent (Java 7): Connectors: Common</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,14 +50,25 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
                   <excludes>META-INF/**</excludes>
                 </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-test</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <classifier>tests</classifier>
@@ -74,26 +85,26 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>

platforms/java7/connectors/csv/pom.xml

diff --git a/platforms/java7/connectors/csv/pom.xml b/platforms/java7/connectors/csv/pom.xml
index 0973c91..721955c 100644
--- a/platforms/java7/connectors/csv/pom.xml
+++ b/platforms/java7/connectors/csv/pom.xml
@@ -29,7 +29,7 @@
 
   <artifactId>edgent-connectors-csv</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: CSV</name>
+  <name>Apache Edgent (Java 7): Connectors: CSV</name>
 
   <build>
     <plugins>
@@ -46,14 +46,25 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
                   <excludes>META-INF/**</excludes>
                 </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-test</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <classifier>tests</classifier>
@@ -76,20 +87,20 @@
     </dependency>
 
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>

platforms/java7/connectors/file/pom.xml

diff --git a/platforms/java7/connectors/file/pom.xml b/platforms/java7/connectors/file/pom.xml
index 6b9493a..5981306 100644
--- a/platforms/java7/connectors/file/pom.xml
+++ b/platforms/java7/connectors/file/pom.xml
@@ -29,7 +29,7 @@
 
   <artifactId>edgent-connectors-file</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: File</name>
+  <name>Apache Edgent (Java 7): Connectors: File</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,14 +50,25 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
                   <excludes>META-INF/**</excludes>
                 </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-test</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <classifier>tests</classifier>
@@ -74,43 +85,43 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-function</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-oplet</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-common</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>

platforms/java7/connectors/http/pom.xml

diff --git a/platforms/java7/connectors/http/pom.xml b/platforms/java7/connectors/http/pom.xml
index 33fcecc..b1a422a 100644
--- a/platforms/java7/connectors/http/pom.xml
+++ b/platforms/java7/connectors/http/pom.xml
@@ -29,7 +29,7 @@
 
   <artifactId>edgent-connectors-http</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: HTTP</name>
+  <name>Apache Edgent (Java 7): Connectors: HTTP</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,14 +50,25 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
                   <excludes>META-INF/**</excludes>
                 </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-test</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <classifier>tests</classifier>
@@ -74,7 +85,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
@@ -90,13 +101,13 @@
     </dependency>
 
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>

platforms/java7/connectors/iot/pom.xml

diff --git a/platforms/java7/connectors/iot/pom.xml b/platforms/java7/connectors/iot/pom.xml
index ccb1c87..8ae7a33 100644
--- a/platforms/java7/connectors/iot/pom.xml
+++ b/platforms/java7/connectors/iot/pom.xml
@@ -29,7 +29,7 @@
 
   <artifactId>edgent-connectors-iot</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: IoT</name>
+  <name>Apache Edgent (Java 7): Connectors: IoT</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,14 +50,25 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
                   <excludes>META-INF/**</excludes>
                 </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-test</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <classifier>tests</classifier>
@@ -74,12 +85,12 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-function</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

platforms/java7/connectors/iotp/pom.xml

diff --git a/platforms/java7/connectors/iotp/pom.xml b/platforms/java7/connectors/iotp/pom.xml
index b330429..205319f 100644
--- a/platforms/java7/connectors/iotp/pom.xml
+++ b/platforms/java7/connectors/iotp/pom.xml
@@ -29,7 +29,7 @@
 
   <artifactId>edgent-connectors-iotp</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: IoTP</name>
+  <name>Apache Edgent (Java 7): Connectors: IoTP</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,14 +50,25 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
                   <excludes>META-INF/**</excludes>
                 </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-test</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <classifier>tests</classifier>
@@ -74,17 +85,17 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-function</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-iot</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

platforms/java7/connectors/jdbc/pom.xml

diff --git a/platforms/java7/connectors/jdbc/pom.xml b/platforms/java7/connectors/jdbc/pom.xml
index 0841a89..8fda586 100644
--- a/platforms/java7/connectors/jdbc/pom.xml
+++ b/platforms/java7/connectors/jdbc/pom.xml
@@ -29,7 +29,7 @@
 
   <artifactId>edgent-connectors-jdbc</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: JDBC</name>
+  <name>Apache Edgent (Java 7): Connectors: JDBC</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -71,14 +71,25 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
                   <excludes>META-INF/**</excludes>
                 </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-test</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <classifier>tests</classifier>
@@ -95,38 +106,38 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-function</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-common</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>

platforms/java7/connectors/kafka/pom.xml

diff --git a/platforms/java7/connectors/kafka/pom.xml b/platforms/java7/connectors/kafka/pom.xml
index 1c73470..d446b2a 100644
--- a/platforms/java7/connectors/kafka/pom.xml
+++ b/platforms/java7/connectors/kafka/pom.xml
@@ -29,7 +29,7 @@
 
   <artifactId>edgent-connectors-kafka</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: Kafka</name>
+  <name>Apache Edgent (Java 7): Connectors: Kafka</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,14 +50,25 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
                   <excludes>META-INF/**</excludes>
                 </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-test</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <classifier>tests</classifier>
@@ -88,7 +99,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
@@ -171,27 +182,27 @@
     </dependency>
 
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-common</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>

platforms/java7/connectors/mqtt/pom.xml

diff --git a/platforms/java7/connectors/mqtt/pom.xml b/platforms/java7/connectors/mqtt/pom.xml
index 5ad801d..4b77212 100644
--- a/platforms/java7/connectors/mqtt/pom.xml
+++ b/platforms/java7/connectors/mqtt/pom.xml
@@ -29,7 +29,7 @@
 
   <artifactId>edgent-connectors-mqtt</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: MQTT</name>
+  <name>Apache Edgent (Java 7): Connectors: MQTT</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,14 +50,25 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
                   <excludes>META-INF/**</excludes>
                 </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-test</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <classifier>tests</classifier>
@@ -74,17 +85,17 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-iot</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-common</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
@@ -95,27 +106,27 @@
     </dependency>
 
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-common</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>

platforms/java7/connectors/pom.xml

diff --git a/platforms/java7/connectors/pom.xml b/platforms/java7/connectors/pom.xml
index 3a8eb4c..0c824ce 100644
--- a/platforms/java7/connectors/pom.xml
+++ b/platforms/java7/connectors/pom.xml
@@ -30,7 +30,7 @@
   <artifactId>edgent-connectors</artifactId>
   <packaging>pom</packaging>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors</name>
+  <name>Apache Edgent (Java 7): Connectors</name>
 
   <modules>
     <module>command</module>

platforms/java7/connectors/pubsub/pom.xml

diff --git a/platforms/java7/connectors/pubsub/pom.xml b/platforms/java7/connectors/pubsub/pom.xml
index e81da8b..0a4ce67 100644
--- a/platforms/java7/connectors/pubsub/pom.xml
+++ b/platforms/java7/connectors/pubsub/pom.xml
@@ -29,7 +29,7 @@
 
   <artifactId>edgent-connectors-pubsub</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: PubSub</name>
+  <name>Apache Edgent (Java 7): Connectors: PubSub</name>
 
   <build>
     <plugins>
@@ -46,14 +46,25 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
                   <excludes>META-INF/**</excludes>
                 </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-test</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <classifier>tests</classifier>
@@ -70,13 +81,13 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>

platforms/java7/connectors/serial/pom.xml

diff --git a/platforms/java7/connectors/serial/pom.xml b/platforms/java7/connectors/serial/pom.xml
index 88e562b..14fd296 100644
--- a/platforms/java7/connectors/serial/pom.xml
+++ b/platforms/java7/connectors/serial/pom.xml
@@ -29,7 +29,7 @@
 
   <artifactId>edgent-connectors-serial</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: Serial</name>
+  <name>Apache Edgent (Java 7): Connectors: Serial</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,14 +50,25 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
                   <excludes>META-INF/**</excludes>
                 </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-test</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <classifier>tests</classifier>
@@ -74,7 +85,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

platforms/java7/connectors/websocket-base/pom.xml

diff --git a/platforms/java7/connectors/websocket-base/pom.xml b/platforms/java7/connectors/websocket-base/pom.xml
index 00e1b91..34b46a2 100644
--- a/platforms/java7/connectors/websocket-base/pom.xml
+++ b/platforms/java7/connectors/websocket-base/pom.xml
@@ -29,7 +29,7 @@
 
   <artifactId>edgent-connectors-websocket-base</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: Websocket: Base</name>
+  <name>Apache Edgent (Java 7): Connectors: Websocket: Base</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,14 +50,25 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
                   <excludes>META-INF/**</excludes>
                 </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-test</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <classifier>tests</classifier>
@@ -74,7 +85,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

platforms/java7/connectors/websocket-jetty/pom.xml

diff --git a/platforms/java7/connectors/websocket-jetty/pom.xml b/platforms/java7/connectors/websocket-jetty/pom.xml
index 7942b5b..bb6e574 100644
--- a/platforms/java7/connectors/websocket-jetty/pom.xml
+++ b/platforms/java7/connectors/websocket-jetty/pom.xml
@@ -29,7 +29,7 @@
 
   <artifactId>edgent-connectors-websocket-jetty</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: Websocket: Jetty</name>
+  <name>Apache Edgent (Java 7): Connectors: Websocket: Jetty</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,14 +50,25 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
                   <excludes>META-INF/*,META-INF/maven/**</excludes>
                 </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-test</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <classifier>tests</classifier>
@@ -84,7 +95,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-websocket-misc</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

platforms/java7/connectors/websocket-misc/pom.xml

diff --git a/platforms/java7/connectors/websocket-misc/pom.xml b/platforms/java7/connectors/websocket-misc/pom.xml
index 4357c3b..2113f5a 100644
--- a/platforms/java7/connectors/websocket-misc/pom.xml
+++ b/platforms/java7/connectors/websocket-misc/pom.xml
@@ -29,7 +29,7 @@
 
   <artifactId>edgent-connectors-websocket-misc</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: Websocket: Misc</name>
+  <name>Apache Edgent (Java 7): Connectors: Websocket: Misc</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,14 +50,25 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
                   <excludes>META-INF/**</excludes>
                 </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-test</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <classifier>tests</classifier>

platforms/java7/connectors/websocket-server/pom.xml

diff --git a/platforms/java7/connectors/websocket-server/pom.xml b/platforms/java7/connectors/websocket-server/pom.xml
index 05f6b54..a7d0bfa 100644
--- a/platforms/java7/connectors/websocket-server/pom.xml
+++ b/platforms/java7/connectors/websocket-server/pom.xml
@@ -29,7 +29,7 @@
 
   <artifactId>edgent-connectors-websocket-server</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: Websocket: Server</name>
+  <name>Apache Edgent (Java 7): Connectors: Websocket: Server</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,14 +50,25 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
                   <excludes>META-INF/**</excludes>
                 </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-test</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <classifier>tests</classifier>
@@ -74,7 +85,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-websocket-jetty</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

platforms/java7/connectors/websocket/pom.xml

diff --git a/platforms/java7/connectors/websocket/pom.xml b/platforms/java7/connectors/websocket/pom.xml
index aa4eae6..ac590c2 100644
--- a/platforms/java7/connectors/websocket/pom.xml
+++ b/platforms/java7/connectors/websocket/pom.xml
@@ -29,7 +29,7 @@
 
   <artifactId>edgent-connectors-websocket</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: Websocket</name>
+  <name>Apache Edgent (Java 7): Connectors: Websocket</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,14 +50,25 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
                   <excludes>META-INF/**</excludes>
                 </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-test</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <classifier>tests</classifier>
@@ -74,17 +85,17 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-common</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-websocket-misc</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-websocket-base</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
@@ -119,34 +130,34 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-common</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-websocket-jetty</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>

platforms/java7/console/pom.xml

diff --git a/platforms/java7/console/pom.xml b/platforms/java7/console/pom.xml
index 457f83f..5cd1026 100644
--- a/platforms/java7/console/pom.xml
+++ b/platforms/java7/console/pom.xml
@@ -30,7 +30,7 @@
   <artifactId>edgent-console</artifactId>
   <packaging>pom</packaging>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Console</name>
+  <name>Apache Edgent (Java 7): Console</name>
 
   <modules>
     <module>server</module>

platforms/java7/console/server/pom.xml

diff --git a/platforms/java7/console/server/pom.xml b/platforms/java7/console/server/pom.xml
index 6d06223..0710f5a 100644
--- a/platforms/java7/console/server/pom.xml
+++ b/platforms/java7/console/server/pom.xml
@@ -29,7 +29,7 @@
 
   <artifactId>edgent-console-server</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Console: Server</name>
+  <name>Apache Edgent (Java 7): Console: Server</name>
 
   <build>
     <resources>
@@ -47,32 +47,6 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
         <executions>
-          <execution>
-            <id>copy</id>
-            <phase>compile</phase>
-            <goals>
-              <goal>unpack</goal>
-            </goals>
-            <configuration>
-              <artifactItems>
-                <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
-                  <artifactId>${project.artifactId}</artifactId>
-                  <version>${project.version}</version>
-                  <outputDirectory>${project.build.directory}/classes</outputDirectory>
-                  <excludes>META-INF/**,resources/**</excludes>
-                </artifactItem>
-                <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
-                  <artifactId>${project.artifactId}</artifactId>
-                  <version>${project.version}</version>
-                  <classifier>tests</classifier>
-                  <outputDirectory>${project.build.directory}/test-classes</outputDirectory>
-                  <excludes>META-INF/**</excludes>
-                </artifactItem>
-              </artifactItems>
-            </configuration>
-          </execution>
           <!--
            Copy the servlets.war into the build output so it is embedded as
            resource into the jar.
@@ -86,7 +60,7 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.runtime.groupId}</groupId>
+                  <groupId>${project.groupId}</groupId>
                   <artifactId>edgent-console-servlets</artifactId>
                   <version>${project.version}</version>
                   <type>war</type>
@@ -96,6 +70,43 @@
               </artifactItems>
             </configuration>
           </execution>
+          <execution>
+            <id>copy</id>
+            <phase>compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
+                <artifactItem>
+                  <groupId>org.apache.edgent</groupId>
+                  <artifactId>${project.artifactId}</artifactId>
+                  <version>${project.version}</version>
+                  <outputDirectory>${project.build.directory}/classes</outputDirectory>
+                  <excludes>META-INF/**,resources/**</excludes>
+                </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-test</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
+                <artifactItem>
+                  <groupId>org.apache.edgent</groupId>
+                  <artifactId>${project.artifactId}</artifactId>
+                  <version>${project.version}</version>
+                  <classifier>tests</classifier>
+                  <outputDirectory>${project.build.directory}/test-classes</outputDirectory>
+                  <excludes>META-INF/**</excludes>
+                </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
         </executions>
       </plugin>
     </plugins>
@@ -169,7 +180,7 @@
         prior to this module.
     -->
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-console-servlets</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>war</type>

platforms/java7/console/servlets/pom.xml

diff --git a/platforms/java7/console/servlets/pom.xml b/platforms/java7/console/servlets/pom.xml
index 866ccb5..0b4a24b 100644
--- a/platforms/java7/console/servlets/pom.xml
+++ b/platforms/java7/console/servlets/pom.xml
@@ -30,7 +30,7 @@
   <artifactId>edgent-console-servlets</artifactId>
   <packaging>war</packaging>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Console: Servlets</name>
+  <name>Apache Edgent (Java 7): Console: Servlets</name>
 
   <build>
     <resources>
@@ -60,15 +60,26 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <type>war</type>
                   <outputDirectory>${project.build.directory}/${project.artifactId}-${project.version}</outputDirectory>
                   <excludes>META-INF/**</excludes>
                 </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-test</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <classifier>tests</classifier>
@@ -112,7 +123,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-utils-streamscope</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

platforms/java7/distribution/pom.xml

diff --git a/platforms/java7/distribution/pom.xml b/platforms/java7/distribution/pom.xml
index 6965afd..2fcddeb 100644
--- a/platforms/java7/distribution/pom.xml
+++ b/platforms/java7/distribution/pom.xml
@@ -30,7 +30,7 @@
 
   <artifactId>edgent-distribution</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Distribution</name>
+  <name>Apache Edgent (Java 7): Distribution</name>
 
   <build>
     <plugins>
@@ -78,113 +78,113 @@
 
     <!-- Providers -->
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-development</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-iot</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
 
     <!-- Analytics -->
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-analytics-math3</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-analytics-sensors</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
 
     <!-- Utils -->
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-utils-metrics</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-utils-streamscope</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
 
     <!-- Connectors -->
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-command</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-common</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-csv</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-file</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-http</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-iot</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-iotp</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-jdbc</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-kafka</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-mqtt</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-pubsub</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-serial</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-websocket</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-websocket-jetty</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
@@ -196,7 +196,7 @@
          of the development provider.
     -->
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-console-servlets</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>war</type>

platforms/java7/pom.xml

diff --git a/platforms/java7/pom.xml b/platforms/java7/pom.xml
index 832b6ad..9170b46 100644
--- a/platforms/java7/pom.xml
+++ b/platforms/java7/pom.xml
@@ -31,16 +31,11 @@
   <artifactId>edgent-platforms-java7</artifactId>
   <packaging>pom</packaging>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Platforms: Java7</name>
+  <name>Apache Edgent (Java 7): Platforms: Java7</name>
 
   <properties>
     <!-- The 9.2 version is the last to support Java7 -->
     <jetty.version>9.2.21.v20170120</jetty.version>
-    <edgent.projname.platform>(Java 7)</edgent.projname.platform>
-    <edgent.runtime.groupId>org.apache.edgent.java7</edgent.runtime.groupId>
-    
-    <!-- Edgent groupId of jars the retrolambda processing will use -->
-    <edgent.retrolambda.srcArtifactGroupId>org.apache.edgent</edgent.retrolambda.srcArtifactGroupId>
   </properties>
 
   <modules>

platforms/java7/providers/development/pom.xml

diff --git a/platforms/java7/providers/development/pom.xml b/platforms/java7/providers/development/pom.xml
index 8cd2b71..4bd3fd4 100644
--- a/platforms/java7/providers/development/pom.xml
+++ b/platforms/java7/providers/development/pom.xml
@@ -29,7 +29,7 @@
 
   <artifactId>edgent-providers-development</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Providers: Development</name>
+  <name>Apache Edgent (Java 7): Providers: Development</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,14 +50,25 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
                   <excludes>META-INF/**</excludes>
                 </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-test</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <classifier>tests</classifier>
@@ -74,40 +85,40 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-console-server</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-utils-metrics</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-utils-streamscope</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-runtime-jmxcontrol</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-utils-streamscope</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>

platforms/java7/providers/direct/pom.xml

diff --git a/platforms/java7/providers/direct/pom.xml b/platforms/java7/providers/direct/pom.xml
index b00afd1..8e23cce 100644
--- a/platforms/java7/providers/direct/pom.xml
+++ b/platforms/java7/providers/direct/pom.xml
@@ -29,7 +29,7 @@
 
   <artifactId>edgent-providers-direct</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Providers: Direct</name>
+  <name>Apache Edgent (Java 7): Providers: Direct</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,14 +50,25 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
                   <excludes>META-INF/**</excludes>
                 </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-test</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <classifier>tests</classifier>
@@ -76,7 +87,7 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.runtime.groupId}</groupId>
+                  <groupId>${project.groupId}</groupId>
                   <artifactId>edgent-test-appservice-applications</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/test-resources</outputDirectory>
@@ -92,51 +103,51 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-spi-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-spi-graph</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-runtime-appservice</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-runtime-etiao</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-runtime-jsoncontrol</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-utils-metrics</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-utils-metrics</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>

platforms/java7/providers/iot/pom.xml

diff --git a/platforms/java7/providers/iot/pom.xml b/platforms/java7/providers/iot/pom.xml
index 9f4dc81..29653ff 100644
--- a/platforms/java7/providers/iot/pom.xml
+++ b/platforms/java7/providers/iot/pom.xml
@@ -29,7 +29,7 @@
 
   <artifactId>edgent-providers-iot</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Providers: IoT</name>
+  <name>Apache Edgent (Java 7): Providers: IoT</name>
 
   <build>
     <plugins>
@@ -46,14 +46,25 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
                   <excludes>META-INF/**</excludes>
                 </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-test</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <classifier>tests</classifier>
@@ -70,37 +81,37 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-runtime-jsoncontrol</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-runtime-appservice</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-iot</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-pubsub</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-apps-iot</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-apps-runtime</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

platforms/java7/providers/pom.xml

diff --git a/platforms/java7/providers/pom.xml b/platforms/java7/providers/pom.xml
index 3e2cd07..77d3632 100644
--- a/platforms/java7/providers/pom.xml
+++ b/platforms/java7/providers/pom.xml
@@ -30,7 +30,7 @@
   <artifactId>edgent-providers</artifactId>
   <packaging>pom</packaging>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Providers</name>
+  <name>Apache Edgent (Java 7): Providers</name>
 
   <modules>
     <module>development</module>

platforms/java7/runtime/appservice/pom.xml

diff --git a/platforms/java7/runtime/appservice/pom.xml b/platforms/java7/runtime/appservice/pom.xml
index fbf14aa..a8ef363 100644
--- a/platforms/java7/runtime/appservice/pom.xml
+++ b/platforms/java7/runtime/appservice/pom.xml
@@ -29,7 +29,7 @@
 
   <artifactId>edgent-runtime-appservice</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Runtime: AppService</name>
+  <name>Apache Edgent (Java 7): Runtime: AppService</name>
 
   <build>
     <plugins>
@@ -46,14 +46,25 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
                   <excludes>META-INF/**</excludes>
                 </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-test</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <classifier>tests</classifier>
@@ -70,19 +81,19 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-execution</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
 
     <!-- Just needed to make sure it is scheduled before this module in the reactor -->
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-test-appservice-applications</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>

platforms/java7/runtime/etiao/pom.xml

diff --git a/platforms/java7/runtime/etiao/pom.xml b/platforms/java7/runtime/etiao/pom.xml
index 7044d30..95b1ac8 100644
--- a/platforms/java7/runtime/etiao/pom.xml
+++ b/platforms/java7/runtime/etiao/pom.xml
@@ -29,7 +29,7 @@
 
   <artifactId>edgent-runtime-etiao</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Runtime: Etiao</name>
+  <name>Apache Edgent (Java 7): Runtime: Etiao</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,14 +50,25 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
                   <excludes>META-INF/**</excludes>
                 </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-test</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <classifier>tests</classifier>
@@ -74,23 +85,23 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-execution</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-graph</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-spi-graph</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-graph</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>

platforms/java7/runtime/jmxcontrol/pom.xml

diff --git a/platforms/java7/runtime/jmxcontrol/pom.xml b/platforms/java7/runtime/jmxcontrol/pom.xml
index fdfb532..36cda27 100644
--- a/platforms/java7/runtime/jmxcontrol/pom.xml
+++ b/platforms/java7/runtime/jmxcontrol/pom.xml
@@ -29,7 +29,7 @@
 
   <artifactId>edgent-runtime-jmxcontrol</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Runtime: JMXControl</name>
+  <name>Apache Edgent (Java 7): Runtime: JMXControl</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,14 +50,25 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
                   <excludes>META-INF/**</excludes>
                 </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-test</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <classifier>tests</classifier>
@@ -74,12 +85,12 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-execution</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-function</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

platforms/java7/runtime/jobregistry/pom.xml

diff --git a/platforms/java7/runtime/jobregistry/pom.xml b/platforms/java7/runtime/jobregistry/pom.xml
index 78dbcb4..4ade1d9 100644
--- a/platforms/java7/runtime/jobregistry/pom.xml
+++ b/platforms/java7/runtime/jobregistry/pom.xml
@@ -29,7 +29,7 @@
 
   <artifactId>edgent-runtime-jobregistry</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Runtime: JobRegistry</name>
+  <name>Apache Edgent (Java 7): Runtime: JobRegistry</name>
 
   <build>
     <plugins>
@@ -46,14 +46,25 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
                   <excludes>META-INF/**</excludes>
                 </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-test</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <classifier>tests</classifier>
@@ -70,12 +81,12 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-execution</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

platforms/java7/runtime/jsoncontrol/pom.xml

diff --git a/platforms/java7/runtime/jsoncontrol/pom.xml b/platforms/java7/runtime/jsoncontrol/pom.xml
index a065f8a..cfbadcf 100644
--- a/platforms/java7/runtime/jsoncontrol/pom.xml
+++ b/platforms/java7/runtime/jsoncontrol/pom.xml
@@ -29,7 +29,7 @@
 
   <artifactId>edgent-runtime-jsoncontrol</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Runtime: JSONControl</name>
+  <name>Apache Edgent (Java 7): Runtime: JSONControl</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,14 +50,25 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
                   <excludes>META-INF/**</excludes>
                 </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-test</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <classifier>tests</classifier>
@@ -74,12 +85,12 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-execution</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-function</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

platforms/java7/runtime/pom.xml

diff --git a/platforms/java7/runtime/pom.xml b/platforms/java7/runtime/pom.xml
index f2ae3f5..fafe398 100644
--- a/platforms/java7/runtime/pom.xml
+++ b/platforms/java7/runtime/pom.xml
@@ -30,7 +30,7 @@
   <artifactId>edgent-runtime</artifactId>
   <packaging>pom</packaging>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Runtime</name>
+  <name>Apache Edgent (Java 7): Runtime</name>
 
   <modules>
     <module>appservice</module>

platforms/java7/spi/graph/pom.xml

diff --git a/platforms/java7/spi/graph/pom.xml b/platforms/java7/spi/graph/pom.xml
index d8ef618..8fc3d3f 100644
--- a/platforms/java7/spi/graph/pom.xml
+++ b/platforms/java7/spi/graph/pom.xml
@@ -29,7 +29,7 @@
 
   <artifactId>edgent-spi-graph</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: SPI: Graph</name>
+  <name>Apache Edgent (Java 7): SPI: Graph</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,14 +50,25 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
                   <excludes>META-INF/**</excludes>
                 </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-test</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <classifier>tests</classifier>
@@ -74,12 +85,12 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-execution</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-graph</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

platforms/java7/spi/pom.xml

diff --git a/platforms/java7/spi/pom.xml b/platforms/java7/spi/pom.xml
index d074de7..4f8b265 100644
--- a/platforms/java7/spi/pom.xml
+++ b/platforms/java7/spi/pom.xml
@@ -30,7 +30,7 @@
   <artifactId>edgent-spi</artifactId>
   <packaging>pom</packaging>
 
-  <name>Apache Edgent ${edgent.projname.platform}: SPI</name>
+  <name>Apache Edgent (Java 7): SPI</name>
 
   <modules>
     <module>graph</module>

platforms/java7/spi/topology/pom.xml

diff --git a/platforms/java7/spi/topology/pom.xml b/platforms/java7/spi/topology/pom.xml
index 84fa3e4..81f72e4 100644
--- a/platforms/java7/spi/topology/pom.xml
+++ b/platforms/java7/spi/topology/pom.xml
@@ -29,7 +29,7 @@
 
   <artifactId>edgent-spi-topology</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: SPI: Topology</name>
+  <name>Apache Edgent (Java 7): SPI: Topology</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,14 +50,25 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
                   <excludes>META-INF/**</excludes>
                 </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-test</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <classifier>tests</classifier>
@@ -74,7 +85,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

platforms/java7/test/appservice-applications/pom.xml

diff --git a/platforms/java7/test/appservice-applications/pom.xml b/platforms/java7/test/appservice-applications/pom.xml
index 1c78e6b..56bcac4 100644
--- a/platforms/java7/test/appservice-applications/pom.xml
+++ b/platforms/java7/test/appservice-applications/pom.xml
@@ -29,7 +29,7 @@
 
   <artifactId>edgent-test-appservice-applications</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Test: AppService Applications</name>
+  <name>Apache Edgent (Java 7): Test: AppService Applications</name>
 
   <build>
     <plugins>
@@ -46,14 +46,25 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
                   <excludes>META-INF/*,META-INF/maven/**</excludes>
                 </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-test</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <classifier>tests</classifier>
@@ -80,7 +91,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

platforms/java7/test/fvtiot/pom.xml

diff --git a/platforms/java7/test/fvtiot/pom.xml b/platforms/java7/test/fvtiot/pom.xml
index 3048bd6..274604f 100644
--- a/platforms/java7/test/fvtiot/pom.xml
+++ b/platforms/java7/test/fvtiot/pom.xml
@@ -29,7 +29,7 @@
 
   <artifactId>edgent-test-fvtiot</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Test: fvtiot</name>
+  <name>Apache Edgent (Java 7): Test: fvtiot</name>
 
   <build>
     <plugins>
@@ -46,14 +46,25 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
                   <excludes>META-INF/**</excludes>
                 </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-test</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <classifier>tests</classifier>
@@ -72,7 +83,7 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.runtime.groupId}</groupId>
+                  <groupId>${project.groupId}</groupId>
                   <artifactId>edgent-test-appservice-applications</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/test-resources</outputDirectory>
@@ -88,38 +99,38 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-pubsub</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-runtime-jsoncontrol</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-apps-iot</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-apps-iot</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-iot</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>

platforms/java7/test/pom.xml

diff --git a/platforms/java7/test/pom.xml b/platforms/java7/test/pom.xml
index c24bc4f..fbbef13 100644
--- a/platforms/java7/test/pom.xml
+++ b/platforms/java7/test/pom.xml
@@ -30,7 +30,7 @@
   <artifactId>edgent-test</artifactId>
   <packaging>pom</packaging>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Test</name>
+  <name>Apache Edgent (Java 7): Test</name>
 
   <modules>
     <module>appservice-applications</module>

platforms/java7/test/svt/pom.xml

diff --git a/platforms/java7/test/svt/pom.xml b/platforms/java7/test/svt/pom.xml
index 8a1713e..b1ffdae 100644
--- a/platforms/java7/test/svt/pom.xml
+++ b/platforms/java7/test/svt/pom.xml
@@ -29,7 +29,7 @@
 
   <artifactId>edgent-test-svt</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Test: SVT</name>
+  <name>Apache Edgent (Java 7): Test: SVT</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,14 +50,25 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
                   <excludes>META-INF/**</excludes>
                 </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-test</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <classifier>tests</classifier>
@@ -74,22 +85,22 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-console-server</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-utils-metrics</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-development</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

platforms/java7/utils/metrics/pom.xml

diff --git a/platforms/java7/utils/metrics/pom.xml b/platforms/java7/utils/metrics/pom.xml
index b7bf1c8..b926536 100644
--- a/platforms/java7/utils/metrics/pom.xml
+++ b/platforms/java7/utils/metrics/pom.xml
@@ -29,7 +29,7 @@
 
   <artifactId>edgent-utils-metrics</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Utils: Metrics</name>
+  <name>Apache Edgent (Java 7): Utils: Metrics</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,14 +50,25 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
                   <excludes>META-INF/**</excludes>
                 </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-test</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <classifier>tests</classifier>
@@ -74,14 +85,14 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
 
     <!-- TODO: This is only required because of a dependency to TopologyAbstractTest -> Would suggest to move test-util stutt into a dedicated test-utils artifact -->
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>

platforms/java7/utils/pom.xml

diff --git a/platforms/java7/utils/pom.xml b/platforms/java7/utils/pom.xml
index cda954d..5c09a2a 100644
--- a/platforms/java7/utils/pom.xml
+++ b/platforms/java7/utils/pom.xml
@@ -30,7 +30,7 @@
   <artifactId>edgent-utils</artifactId>
   <packaging>pom</packaging>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Utils</name>
+  <name>Apache Edgent (Java 7): Utils</name>
 
   <modules>
     <module>metrics</module>

platforms/java7/utils/streamscope/pom.xml

diff --git a/platforms/java7/utils/streamscope/pom.xml b/platforms/java7/utils/streamscope/pom.xml
index 224bd70..6bcd4da 100644
--- a/platforms/java7/utils/streamscope/pom.xml
+++ b/platforms/java7/utils/streamscope/pom.xml
@@ -29,7 +29,7 @@
 
   <artifactId>edgent-utils-streamscope</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Utils: Streamscope</name>
+  <name>Apache Edgent (Java 7): Utils: Streamscope</name>
 
   <build>
     <plugins>
@@ -46,14 +46,25 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
                   <excludes>META-INF/**</excludes>
                 </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-test</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <classifier>tests</classifier>
@@ -70,14 +81,14 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
 
     <!-- TODO: This is only required because of a dependency to TopologyAbstractTest -> Would suggest to move test-util stutt into a dedicated test-utils artifact -->
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>

platforms/pom.xml

diff --git a/platforms/pom.xml b/platforms/pom.xml
index 1808912..3d92e54 100644
--- a/platforms/pom.xml
+++ b/platforms/pom.xml
@@ -29,7 +29,7 @@
   <artifactId>edgent-platforms</artifactId>
   <packaging>pom</packaging>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Platforms</name>
+  <name>Apache Edgent (Java 8): Platforms</name>
 
   <build>
     <plugins>

pom.xml

diff --git a/pom.xml b/pom.xml
index 84d02bf..b20ffa4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,13 +46,6 @@
   </scm>
 
   <properties>
-    <!-- Up here and not in the java8 profile, so hopefully the maven-release-plugin will find it -->
-    <edgent.runtime.version>1.3.0-SNAPSHOT</edgent.runtime.version>
-
-    <!-- The next two are overriden by platforms/{java7,android}/pom -->
-    <edgent.projname.platform>(Java 8)</edgent.projname.platform>
-    <edgent.runtime.groupId>org.apache.edgent</edgent.runtime.groupId>
-
     <java.version>1.8</java.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputencoding>UTF-8</project.reporting.outputencoding>
@@ -115,6 +108,12 @@
     <pluginManagement>
       <plugins>
         <plugin>
+          <groupId>com.buschmais.jqassistant</groupId>
+          <artifactId>jqassistant-maven-plugin</artifactId>
+          <version>1.3.0</version>
+        </plugin>
+
+        <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
           <version>3.6.1</version>
@@ -359,6 +358,22 @@
         </configuration>
       </plugin>
 
+      <plugin>
+        <groupId>com.buschmais.jqassistant</groupId>
+        <artifactId>jqassistant-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>scan</goal>
+              <goal>analyze</goal>
+            </goals>
+            <configuration>
+              <failOnSeverity>MAJOR</failOnSeverity>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
       <!--
         This plugin doesn't really do much, it makes sure the jacoco agent
         is downloaded and that the path to this is saved in an environment
@@ -613,6 +628,18 @@
 
   <reporting>
     <plugins>
+      <plugin>
+        <groupId>com.buschmais.jqassistant</groupId>
+        <artifactId>jqassistant-maven-plugin</artifactId>
+        <reportSets>
+          <reportSet>
+            <reports>
+              <report>report</report>
+            </reports>
+          </reportSet>
+        </reportSets>
+      </plugin>
+
       <!-- Generates a changelog report from GIT commits -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>

providers/development/pom.xml

diff --git a/providers/development/pom.xml b/providers/development/pom.xml
index 8bf9af6..1b82b41 100644
--- a/providers/development/pom.xml
+++ b/providers/development/pom.xml
@@ -28,7 +28,7 @@
 
   <artifactId>edgent-providers-development</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Providers: Development</name>
+  <name>Apache Edgent (Java 8): Providers: Development</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -36,40 +36,40 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-console-server</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-utils-metrics</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-utils-streamscope</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-runtime-jmxcontrol</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-utils-streamscope</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>

providers/direct/pom.xml

diff --git a/providers/direct/pom.xml b/providers/direct/pom.xml
index eab588a..5e44f29 100644
--- a/providers/direct/pom.xml
+++ b/providers/direct/pom.xml
@@ -28,7 +28,7 @@
 
   <artifactId>edgent-providers-direct</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Providers: Direct</name>
+  <name>Apache Edgent (Java 8): Providers: Direct</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -49,7 +49,7 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.runtime.groupId}</groupId>
+                  <groupId>${project.groupId}</groupId>
                   <artifactId>edgent-test-appservice-applications</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/test-resources</outputDirectory>
@@ -65,51 +65,51 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-spi-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-spi-graph</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-runtime-appservice</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-runtime-etiao</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-runtime-jsoncontrol</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-utils-metrics</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-utils-metrics</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>

providers/iot/pom.xml

diff --git a/providers/iot/pom.xml b/providers/iot/pom.xml
index f341f90..c5b7f8d 100644
--- a/providers/iot/pom.xml
+++ b/providers/iot/pom.xml
@@ -28,41 +28,41 @@
 
   <artifactId>edgent-providers-iot</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Providers: IoT</name>
+  <name>Apache Edgent (Java 8): Providers: IoT</name>
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-runtime-jsoncontrol</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-runtime-appservice</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-iot</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-pubsub</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-apps-iot</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-apps-runtime</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

providers/pom.xml

diff --git a/providers/pom.xml b/providers/pom.xml
index a1b35e0..49672d9 100644
--- a/providers/pom.xml
+++ b/providers/pom.xml
@@ -29,7 +29,7 @@
   <artifactId>edgent-providers</artifactId>
   <packaging>pom</packaging>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Providers</name>
+  <name>Apache Edgent (Java 8): Providers</name>
 
   <modules>
     <module>development</module>

runtime/appservice/pom.xml

diff --git a/runtime/appservice/pom.xml b/runtime/appservice/pom.xml
index 4126b89..f8db481 100644
--- a/runtime/appservice/pom.xml
+++ b/runtime/appservice/pom.xml
@@ -28,23 +28,23 @@
 
   <artifactId>edgent-runtime-appservice</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Runtime: AppService</name>
+  <name>Apache Edgent (Java 8): Runtime: AppService</name>
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-execution</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
 
     <!-- Just needed to make sure it is scheduled before this module in the reactor -->
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-test-appservice-applications</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>

runtime/etiao/pom.xml

diff --git a/runtime/etiao/pom.xml b/runtime/etiao/pom.xml
index 5c3c429..0351975 100644
--- a/runtime/etiao/pom.xml
+++ b/runtime/etiao/pom.xml
@@ -28,7 +28,7 @@
 
   <artifactId>edgent-runtime-etiao</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Runtime: Etiao</name>
+  <name>Apache Edgent (Java 8): Runtime: Etiao</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -36,23 +36,23 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-execution</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-graph</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-spi-graph</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-graph</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>

runtime/jmxcontrol/pom.xml

diff --git a/runtime/jmxcontrol/pom.xml b/runtime/jmxcontrol/pom.xml
index 99781d3..c09128c 100644
--- a/runtime/jmxcontrol/pom.xml
+++ b/runtime/jmxcontrol/pom.xml
@@ -28,7 +28,7 @@
 
   <artifactId>edgent-runtime-jmxcontrol</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Runtime: JMXControl</name>
+  <name>Apache Edgent (Java 8): Runtime: JMXControl</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -36,12 +36,12 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-execution</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-function</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

runtime/jobregistry/pom.xml

diff --git a/runtime/jobregistry/pom.xml b/runtime/jobregistry/pom.xml
index d8b8d06..b4e6ee9 100644
--- a/runtime/jobregistry/pom.xml
+++ b/runtime/jobregistry/pom.xml
@@ -28,16 +28,16 @@
 
   <artifactId>edgent-runtime-jobregistry</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Runtime: JobRegistry</name>
+  <name>Apache Edgent (Java 8): Runtime: JobRegistry</name>
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-execution</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

runtime/jsoncontrol/pom.xml

diff --git a/runtime/jsoncontrol/pom.xml b/runtime/jsoncontrol/pom.xml
index ae081fd..a6f0bb2 100644
--- a/runtime/jsoncontrol/pom.xml
+++ b/runtime/jsoncontrol/pom.xml
@@ -28,7 +28,7 @@
 
   <artifactId>edgent-runtime-jsoncontrol</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Runtime: JSONControl</name>
+  <name>Apache Edgent (Java 8): Runtime: JSONControl</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -36,12 +36,12 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-execution</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-function</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

runtime/pom.xml

diff --git a/runtime/pom.xml b/runtime/pom.xml
index b6604f1..70a68bc 100644
--- a/runtime/pom.xml
+++ b/runtime/pom.xml
@@ -29,7 +29,7 @@
   <artifactId>edgent-runtime</artifactId>
   <packaging>pom</packaging>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Runtime</name>
+  <name>Apache Edgent (Java 8): Runtime</name>
 
   <modules>
     <module>appservice</module>

samples/apps/pom.xml

diff --git a/samples/apps/pom.xml b/samples/apps/pom.xml
index 3423571..bf0750a 100644
--- a/samples/apps/pom.xml
+++ b/samples/apps/pom.xml
@@ -35,32 +35,32 @@
     <!-- parent pom has Platforms and SLF4J dependencies -->
 
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-analytics-sensors</artifactId>
       <version>${edgent.runtime.version}</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-file</artifactId>
       <version>${edgent.runtime.version}</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-analytics-math3</artifactId>
       <version>${edgent.runtime.version}</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-iot</artifactId>
       <version>${edgent.runtime.version}</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-iotp</artifactId>
       <version>${edgent.runtime.version}</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-mqtt</artifactId>
       <version>${edgent.runtime.version}</version>
     </dependency>

samples/connectors/pom.xml

diff --git a/samples/connectors/pom.xml b/samples/connectors/pom.xml
index 1f7b3dd..cd14499 100644
--- a/samples/connectors/pom.xml
+++ b/samples/connectors/pom.xml
@@ -35,37 +35,37 @@
     <!-- parent pom has Platforms and SLF4J dependencies -->
 
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-mqtt</artifactId>
       <version>${edgent.runtime.version}</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-kafka</artifactId>
       <version>${edgent.runtime.version}</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-jdbc</artifactId>
       <version>${edgent.runtime.version}</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-serial</artifactId>
       <version>${edgent.runtime.version}</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-file</artifactId>
       <version>${edgent.runtime.version}</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-iotp</artifactId>
       <version>${edgent.runtime.version}</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-analytics-math3</artifactId>
       <version>${edgent.runtime.version}</version>
     </dependency>

samples/console/pom.xml

diff --git a/samples/console/pom.xml b/samples/console/pom.xml
index da45e56..335336b 100644
--- a/samples/console/pom.xml
+++ b/samples/console/pom.xml
@@ -35,12 +35,12 @@
     <!-- parent pom has Platforms and SLF4J dependencies -->
 
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-console-server</artifactId>
       <version>${edgent.runtime.version}</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-utils-metrics</artifactId>
       <version>${edgent.runtime.version}</version>
     </dependency>

samples/pom.xml

diff --git a/samples/pom.xml b/samples/pom.xml
index a3ca547..4206c9c 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -116,17 +116,17 @@
 
     <!-- Other common sample dependencies -->
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>${edgent.runtime.version}</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-development</artifactId>
       <version>${edgent.runtime.version}</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-iot</artifactId>
       <version>${edgent.runtime.version}</version>
     </dependency>

samples/scenarios/pom.xml

diff --git a/samples/scenarios/pom.xml b/samples/scenarios/pom.xml
index 2880387..f18a207 100644
--- a/samples/scenarios/pom.xml
+++ b/samples/scenarios/pom.xml
@@ -58,12 +58,12 @@
     <!-- parent pom has Providers and SLF4J dependencies -->
 
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-iotp</artifactId>
       <version>${edgent.runtime.version}</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-analytics-math3</artifactId>
       <version>${edgent.runtime.version}</version>
     </dependency>

samples/template/pom.xml

diff --git a/samples/template/pom.xml b/samples/template/pom.xml
index 72739d2..db0c7c7 100644
--- a/samples/template/pom.xml
+++ b/samples/template/pom.xml
@@ -69,17 +69,17 @@
 
     <!-- declare the Edgent provider(s) being used -->
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>${edgent.runtime.version}</version>
     </dependency>
     <!--dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-development</artifactId>
       <version>${edgent.runtime.version}</version>
     </dependency-->
     <!--dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-iot</artifactId>
       <version>${edgent.runtime.version}</version>
     </dependency-->
@@ -87,12 +87,12 @@
     <!-- declare Edgent Android dependencies
     -->
     <!--dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-android-hardware</artifactId>
       <version>${edgent.runtime.version}</version>
     </dependency-->
     <!--dependency>
-      <groupId>${edgent.runtime.groupId}.android</groupId>
+      <groupId>${project.groupId}.android</groupId>
       <artifactId>edgent-android-topology</artifactId>
       <version>${edgent.runtime.version}</version>
     </dependency-->
@@ -100,12 +100,12 @@
     <!-- declare Edgent Analytics dependencies
     -->
     <!--dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-analytics-math3</artifactId>
       <version>${edgent.runtime.version}</version>
     </dependency-->
     <!--dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-analytics-sensors</artifactId>
       <version>${edgent.runtime.version}</version>
     </dependency-->
@@ -113,7 +113,7 @@
     <!-- declare Edgent Utils dependencies
     -->
     <!--dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-utils-metrics</artifactId>
       <version>${edgent.runtime.version}</version>
     </dependency-->
@@ -121,37 +121,37 @@
     <!-- declare Edgent Connector dependencies
     -->
     <!--dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-file</artifactId>
       <version>${edgent.runtime.version}</version>
     </dependency-->
     <!--dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-iot</artifactId>
       <version>${edgent.runtime.version}</version>
     </dependency-->
     <!--dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-iotp</artifactId>
       <version>${edgent.runtime.version}</version>
     </dependency-->
     <!--dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-jdbc</artifactId>
       <version>${edgent.runtime.version}</version>
     </dependency-->
     <!--dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-kafka</artifactId>
       <version>${edgent.runtime.version}</version>
     </dependency-->
     <!--dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-mqtt</artifactId>
       <version>${edgent.runtime.version}</version>
     </dependency-->
     <!--dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-serial</artifactId>
       <version>${edgent.runtime.version}</version>
     </dependency-->

samples/topology/pom.xml

diff --git a/samples/topology/pom.xml b/samples/topology/pom.xml
index 8aa5274..77f24a1 100644
--- a/samples/topology/pom.xml
+++ b/samples/topology/pom.xml
@@ -35,7 +35,7 @@
     <!-- parent pom has Providers and SLF4J dependencies -->
 
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-analytics-math3</artifactId>
       <version>${edgent.runtime.version}</version>
     </dependency>

samples/utils/pom.xml

diff --git a/samples/utils/pom.xml b/samples/utils/pom.xml
index 4eff56a..c806cde 100644
--- a/samples/utils/pom.xml
+++ b/samples/utils/pom.xml
@@ -35,17 +35,17 @@
     <!-- parent pom has Providers and SLF4J dependencies -->
 
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-utils-metrics</artifactId>
       <version>${edgent.runtime.version}</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-analytics-sensors</artifactId>
       <version>${edgent.runtime.version}</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-console-server</artifactId>
       <version>${edgent.runtime.version}</version>
     </dependency>

spi/graph/pom.xml

diff --git a/spi/graph/pom.xml b/spi/graph/pom.xml
index b479b9a..5042fb2 100644
--- a/spi/graph/pom.xml
+++ b/spi/graph/pom.xml
@@ -28,7 +28,7 @@
 
   <artifactId>edgent-spi-graph</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: SPI: Graph</name>
+  <name>Apache Edgent (Java 8): SPI: Graph</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -36,12 +36,12 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-execution</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-graph</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

spi/pom.xml

diff --git a/spi/pom.xml b/spi/pom.xml
index 10c2316..ad916e0 100644
--- a/spi/pom.xml
+++ b/spi/pom.xml
@@ -29,7 +29,7 @@
   <artifactId>edgent-spi</artifactId>
   <packaging>pom</packaging>
 
-  <name>Apache Edgent ${edgent.projname.platform}: SPI</name>
+  <name>Apache Edgent (Java 8): SPI</name>
 
   <modules>
     <module>graph</module>

spi/topology/pom.xml

diff --git a/spi/topology/pom.xml b/spi/topology/pom.xml
index ad413bb..57bdb0f 100644
--- a/spi/topology/pom.xml
+++ b/spi/topology/pom.xml
@@ -28,7 +28,7 @@
 
   <artifactId>edgent-spi-topology</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: SPI: Topology</name>
+  <name>Apache Edgent (Java 8): SPI: Topology</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -36,7 +36,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

test/appservice-applications/pom.xml

diff --git a/test/appservice-applications/pom.xml b/test/appservice-applications/pom.xml
index 87d8818..a13256c 100644
--- a/test/appservice-applications/pom.xml
+++ b/test/appservice-applications/pom.xml
@@ -28,11 +28,11 @@
 
   <artifactId>edgent-test-appservice-applications</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Test: AppService Applications</name>
+  <name>Apache Edgent (Java 8): Test: AppService Applications</name>
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

test/fvtiot/pom.xml

diff --git a/test/fvtiot/pom.xml b/test/fvtiot/pom.xml
index 7a11a04..4bfbea9 100644
--- a/test/fvtiot/pom.xml
+++ b/test/fvtiot/pom.xml
@@ -28,7 +28,7 @@
 
   <artifactId>edgent-test-fvtiot</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Test: fvtiot</name>
+  <name>Apache Edgent (Java 8): Test: fvtiot</name>
 
   <build>
     <plugins>
@@ -45,7 +45,7 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.runtime.groupId}</groupId>
+                  <groupId>${project.groupId}</groupId>
                   <artifactId>edgent-test-appservice-applications</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/test-resources</outputDirectory>
@@ -61,38 +61,38 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-pubsub</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-runtime-jsoncontrol</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-apps-iot</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-apps-iot</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-iot</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>

test/pom.xml

diff --git a/test/pom.xml b/test/pom.xml
index 03afcf1..f2c6c0d 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -29,7 +29,7 @@
   <artifactId>edgent-test</artifactId>
   <packaging>pom</packaging>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Test</name>
+  <name>Apache Edgent (Java 8): Test</name>
 
   <modules>
     <module>appservice-applications</module>

test/svt/pom.xml

diff --git a/test/svt/pom.xml b/test/svt/pom.xml
index fc5bc26..b9a11f7 100644
--- a/test/svt/pom.xml
+++ b/test/svt/pom.xml
@@ -28,7 +28,7 @@
 
   <artifactId>edgent-test-svt</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Test: SVT</name>
+  <name>Apache Edgent (Java 8): Test: SVT</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -36,22 +36,22 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-console-server</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-utils-metrics</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-development</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

utils/metrics/pom.xml

diff --git a/utils/metrics/pom.xml b/utils/metrics/pom.xml
index 2449243..ec217ed 100644
--- a/utils/metrics/pom.xml
+++ b/utils/metrics/pom.xml
@@ -28,7 +28,7 @@
 
   <artifactId>edgent-utils-metrics</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Utils: Metrics</name>
+  <name>Apache Edgent (Java 8): Utils: Metrics</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -36,14 +36,14 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
 
     <!-- TODO: This is only required because of a dependency to TopologyAbstractTest -> Would suggest to move test-util stutt into a dedicated test-utils artifact -->
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>

utils/pom.xml

diff --git a/utils/pom.xml b/utils/pom.xml
index 06b154f..27f3136 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -29,7 +29,7 @@
   <artifactId>edgent-utils</artifactId>
   <packaging>pom</packaging>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Utils</name>
+  <name>Apache Edgent (Java 8): Utils</name>
 
   <modules>
     <module>metrics</module>

utils/streamscope/pom.xml

diff --git a/utils/streamscope/pom.xml b/utils/streamscope/pom.xml
index 819aae5..0ca790a 100644
--- a/utils/streamscope/pom.xml
+++ b/utils/streamscope/pom.xml
@@ -28,18 +28,18 @@
 
   <artifactId>edgent-utils-streamscope</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Utils: Streamscope</name>
+  <name>Apache Edgent (Java 8): Utils: Streamscope</name>
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
 
     <!-- TODO: This is only required because of a dependency to TopologyAbstractTest -> Would suggest to move test-util stutt into a dedicated test-utils artifact -->
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>