merge in origin/feature/maven
diff --git a/pom.xml b/pom.xml
index 819c6d5..362aba5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -271,7 +271,7 @@
           <artifactId>maven-assembly-plugin</artifactId>
           <version>2.5.3</version>
           <configuration>
-            <finalName>apache-edgent-incubating-${project.version}</finalName>
+            <finalName>apache-edgent-${project.version}-incubating</finalName>
           </configuration>
         </plugin>
 
@@ -792,7 +792,7 @@
                     <descriptor>src/assembly/source-release.xml</descriptor>
                   </descriptors>
                   <tarLongFileMode>gnu</tarLongFileMode>
-                  <finalName>apache-edgent-incubating-${project.version}</finalName>
+                  <finalName>apache-edgent-${project.version}-incubating</finalName>
                 </configuration>
               </execution>
             </executions>
diff --git a/samples/pom.xml b/samples/pom.xml
index ecee16e..98b1b4e 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -168,7 +168,7 @@
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-assembly-plugin</artifactId>
           <configuration>
-            <finalName>apache-edgent-incubating-samples-${project.version}</finalName>
+            <finalName>apache-edgent-${project.version}-incubating-samples</finalName>
             <formats>
               <format>zip</format>
               <format>tar.gz</format>