diff --git a/openjpa-all/pom.xml b/openjpa-all/pom.xml
index fdf990e03..75cd90c49 100644
--- a/openjpa-all/pom.xml
+++ b/openjpa-all/pom.xml
@@ -22,12 +22,12 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
         http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>openjpa-all</artifactId>
+    <artifactId>openjpa</artifactId>
     <packaging>jar</packaging>
     <name>OpenJPA Aggregate Jar</name>
     <parent>
         <groupId>org.apache.openjpa</groupId>
-        <artifactId>openjpa</artifactId>
+        <artifactId>openjpa-parent</artifactId>
         <version>0.9.8-incubating-SNAPSHOT</version>
     </parent>
     <build>
diff --git a/openjpa-examples/pom.xml b/openjpa-examples/pom.xml
index bd76c5313..e6473f39b 100644
--- a/openjpa-examples/pom.xml
+++ b/openjpa-examples/pom.xml
@@ -29,7 +29,7 @@
     <url>http://incubator.apache.org/projects/openjpa</url>
     <parent>
         <groupId>org.apache.openjpa</groupId>
-        <artifactId>openjpa</artifactId>
+        <artifactId>openjpa-parent</artifactId>
         <version>0.9.8-incubating-SNAPSHOT</version>
     </parent>
     <dependencies>
diff --git a/openjpa-integration/examples/pom.xml b/openjpa-integration/examples/pom.xml
index b7b2f64a4..ea562feb0 100644
--- a/openjpa-integration/examples/pom.xml
+++ b/openjpa-integration/examples/pom.xml
@@ -85,7 +85,7 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.openjpa</groupId>
-            <artifactId>openjpa-all</artifactId>
+            <artifactId>openjpa</artifactId>
             <version>${pom.version}</version>
         </dependency>
     </dependencies>
diff --git a/openjpa-integration/pom.xml b/openjpa-integration/pom.xml
index d52a6abc8..39ed6ec33 100644
--- a/openjpa-integration/pom.xml
+++ b/openjpa-integration/pom.xml
@@ -27,7 +27,7 @@
     <name>OpenJPA Integration Tests</name>
     <parent>
         <groupId>org.apache.openjpa</groupId>
-        <artifactId>openjpa</artifactId>
+        <artifactId>openjpa-parent</artifactId>
         <version>0.9.8-incubating-SNAPSHOT</version>
     </parent>
     <modules>
diff --git a/openjpa-jdbc-5/pom.xml b/openjpa-jdbc-5/pom.xml
index 6fdc69c7f..d3fb7d1b0 100644
--- a/openjpa-jdbc-5/pom.xml
+++ b/openjpa-jdbc-5/pom.xml
@@ -29,7 +29,7 @@
     <url>http://incubator.apache.org/projects/openjpa</url>
     <parent>
         <groupId>org.apache.openjpa</groupId>
-        <artifactId>openjpa</artifactId>
+        <artifactId>openjpa-parent</artifactId>
         <version>0.9.8-incubating-SNAPSHOT</version>
     </parent>
     <dependencies>
diff --git a/openjpa-jdbc/pom.xml b/openjpa-jdbc/pom.xml
index e982ff282..9e3c9c0c7 100644
--- a/openjpa-jdbc/pom.xml
+++ b/openjpa-jdbc/pom.xml
@@ -29,7 +29,7 @@
     <url>http://incubator.apache.org/projects/openjpa</url>
     <parent>
         <groupId>org.apache.openjpa</groupId>
-        <artifactId>openjpa</artifactId>
+        <artifactId>openjpa-parent</artifactId>
         <version>0.9.8-incubating-SNAPSHOT</version>
     </parent>
     <dependencies>
diff --git a/openjpa-kernel-5/pom.xml b/openjpa-kernel-5/pom.xml
index 0bcf97242..2fd453ea5 100644
--- a/openjpa-kernel-5/pom.xml
+++ b/openjpa-kernel-5/pom.xml
@@ -29,7 +29,7 @@
     <url>http://incubator.apache.org/projects/openjpa</url>
     <parent>
         <groupId>org.apache.openjpa</groupId>
-        <artifactId>openjpa</artifactId>
+        <artifactId>openjpa-parent</artifactId>
         <version>0.9.8-incubating-SNAPSHOT</version>
     </parent>
     <dependencies>
diff --git a/openjpa-kernel/pom.xml b/openjpa-kernel/pom.xml
index 7a0bcde5b..1f5957b49 100644
--- a/openjpa-kernel/pom.xml
+++ b/openjpa-kernel/pom.xml
@@ -29,7 +29,7 @@
     <url>http://incubator.apache.org/projects/openjpa</url>
     <parent>
         <groupId>org.apache.openjpa</groupId>
-        <artifactId>openjpa</artifactId>
+        <artifactId>openjpa-parent</artifactId>
         <version>0.9.8-incubating-SNAPSHOT</version>
     </parent>
     <dependencies>
diff --git a/openjpa-lib/pom.xml b/openjpa-lib/pom.xml
index 3c04306a5..47e462ef9 100644
--- a/openjpa-lib/pom.xml
+++ b/openjpa-lib/pom.xml
@@ -29,7 +29,7 @@
     <url>http://incubator.apache.org/projects/openjpa</url>
     <parent>
         <groupId>org.apache.openjpa</groupId>
-        <artifactId>openjpa</artifactId>
+        <artifactId>openjpa-parent</artifactId>
         <version>0.9.8-incubating-SNAPSHOT</version>
     </parent>
     <dependencies>
diff --git a/openjpa-persistence-jdbc/pom.xml b/openjpa-persistence-jdbc/pom.xml
index 44b3f49d9..9b68c1ae0 100644
--- a/openjpa-persistence-jdbc/pom.xml
+++ b/openjpa-persistence-jdbc/pom.xml
@@ -29,7 +29,7 @@
     <url>http://incubator.apache.org/projects/openjpa</url>
     <parent>
         <groupId>org.apache.openjpa</groupId>
-        <artifactId>openjpa</artifactId>
+        <artifactId>openjpa-parent</artifactId>
         <version>0.9.8-incubating-SNAPSHOT</version>
     </parent>
 
diff --git a/openjpa-persistence/pom.xml b/openjpa-persistence/pom.xml
index 0d39186cd..864c688e0 100644
--- a/openjpa-persistence/pom.xml
+++ b/openjpa-persistence/pom.xml
@@ -29,7 +29,7 @@
     <url>http://incubator.apache.org/projects/openjpa</url>
     <parent>
         <groupId>org.apache.openjpa</groupId>
-        <artifactId>openjpa</artifactId>
+        <artifactId>openjpa-parent</artifactId>
         <version>0.9.8-incubating-SNAPSHOT</version>
     </parent>
     <dependencies>
diff --git a/openjpa-project/assembly.xml b/openjpa-project/assembly.xml
index 132024c93..69e8a335b 100644
--- a/openjpa-project/assembly.xml
+++ b/openjpa-project/assembly.xml
@@ -86,9 +86,8 @@
             <outputDirectory>/</outputDirectory>
             <unpack>false</unpack>
             <scope>runtime</scope>
-            <outputFileNameMapping>openjpa-${version}.${extension}</outputFileNameMapping>
             <includes>
-                <include>org.apache.openjpa:openjpa-all</include>
+                <include>org.apache.openjpa:openjpa</include>
             </includes>
         </dependencySet>
         <dependencySet>
diff --git a/openjpa-project/pom.xml b/openjpa-project/pom.xml
index 1eb4c1db0..3d355ae10 100644
--- a/openjpa-project/pom.xml
+++ b/openjpa-project/pom.xml
@@ -34,12 +34,12 @@
         create a key. See http://apache.org/dev/release-signing.html
     -->
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>openjpa-project</artifactId>
+    <artifactId>apache-openjpa</artifactId>
     <packaging>pom</packaging>
     <name>OpenJPA Distribution</name>
     <parent>
         <groupId>org.apache.openjpa</groupId>
-        <artifactId>openjpa</artifactId>
+        <artifactId>openjpa-parent</artifactId>
         <version>0.9.8-incubating-SNAPSHOT</version>
     </parent>
 
@@ -354,7 +354,7 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.openjpa</groupId>
-            <artifactId>openjpa-all</artifactId>
+            <artifactId>openjpa</artifactId>
             <version>${pom.version}</version>
         </dependency>
 
diff --git a/openjpa-xmlstore/pom.xml b/openjpa-xmlstore/pom.xml
index 124dbb87c..8f547efe4 100644
--- a/openjpa-xmlstore/pom.xml
+++ b/openjpa-xmlstore/pom.xml
@@ -29,7 +29,7 @@
     <url>http://incubator.apache.org/projects/openjpa</url>
     <parent>
         <groupId>org.apache.openjpa</groupId>
-        <artifactId>openjpa</artifactId>
+        <artifactId>openjpa-parent</artifactId>
         <version>0.9.8-incubating-SNAPSHOT</version>
     </parent>
     <dependencies>
diff --git a/pom.xml b/pom.xml
index bd448fafa..632ce75f8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,10 +26,15 @@
         <maven>2.0.4</maven>
     </prerequisites>
     <groupId>org.apache.openjpa</groupId>
-    <artifactId>openjpa</artifactId>
+    <artifactId>openjpa-parent</artifactId>
     <packaging>pom</packaging>
     <name>OpenJPA</name>
     <description>OpenJPA</description>
+
+    <properties>
+        <scm.dir>svn.apache.org/repos/asf/incubator/openjpa/trunk</scm.dir>
+    </properties>
+
     <!--
         Changing this version needs to also be done in all children poms
         See: http://jira.codehaus.org/browse/MNG-624
@@ -95,9 +100,9 @@
         <url>http://www.apache.org</url>
     </organization>
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/openjpa/trunk</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/openjpa/trunk</developerConnection>
-        <url>https://svn.apache.org/repos/asf/incubator/openjpa/trunk</url>
+        <connection>scm:svn:http://${scm.dir}</connection>
+        <developerConnection>scm:svn:https://${scm.dir}</developerConnection>
+        <url>https://${scm.dir}</url>
     </scm>
     <modules>
         <module>openjpa-lib</module>