diff --git a/project/build/AkkaProject.scala b/project/build/AkkaProject.scala
index 79f42869fe..f8a91ad62f 100644
--- a/project/build/AkkaProject.scala
+++ b/project/build/AkkaProject.scala
@@ -30,7 +30,7 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) {
   // -------------------------------------------------------------------------------------------------------------------
   // Deploy/dist settings
   // -------------------------------------------------------------------------------------------------------------------
-  def distName = "%s_%s-%s".format(name, buildScalaVersion, version)
+  def distName = "%s-%s".format(name, version)
   lazy val deployPath = info.projectPath / "deploy"
   lazy val distPath = info.projectPath / "dist"
 
@@ -307,6 +307,7 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) {
   // -------------------------------------------------------------------------------------------------------------------
   // Miscellaneous
   // -------------------------------------------------------------------------------------------------------------------
+  override def artifactID: String = this.name
 
   override def mainClass = Some("akka.kernel.Main")
 
@@ -328,23 +329,23 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) {
     .mkString(" ") +
     " config/" +
     " scala-library.jar" +
-    " dist/akka-actor_%s-%s.jar".format(buildScalaVersion, version) +
-    " dist/akka-stm_%s-%s.jar".format(buildScalaVersion, version) +
-    " dist/akka-typed-actor_%s-%s.jar".format(buildScalaVersion, version) +
-    " dist/akka-remote_%s-%s.jar".format(buildScalaVersion, version) +
-    " dist/akka-http_%s-%s.jar".format(buildScalaVersion, version) +
-    " dist/akka-camel_%s-%s.jar".format(buildScalaVersion, version) +
-    " dist/akka-amqp_%s-%s.jar".format(buildScalaVersion, version) +
-    " dist/akka-persistence-common_%s-%s.jar".format(buildScalaVersion, version) +
-    " dist/akka-persistence-redis_%s-%s.jar".format(buildScalaVersion, version) +
-    " dist/akka-persistence-mongo_%s-%s.jar".format(buildScalaVersion, version) +
-    " dist/akka-persistence-cassandra_%s-%s.jar".format(buildScalaVersion, version) +
-    " dist/akka-persistence-voldemort_%s-%s.jar".format(buildScalaVersion, version) +
-    " dist/akka-persistence-riak_%s-%s.jar".format(buildScalaVersion, version) +
-    " dist/akka-persistence-hbase_%s-%s.jar".format(buildScalaVersion, version) +
-    " dist/akka-kernel_%s-%s.jar".format(buildScalaVersion, version) +
-    " dist/akka-spring_%s-%s.jar".format(buildScalaVersion, version) +
-    " dist/akka-jta_%s-%s.jar".format(buildScalaVersion, version)
+    " dist/akka-actor-%s.jar".format(version) +
+    " dist/akka-stm-%s.jar".format(version) +
+    " dist/akka-typed-actor-%s.jar".format(version) +
+    " dist/akka-remote-%s.jar".format(version) +
+    " dist/akka-http-%s.jar".format(version) +
+    " dist/akka-camel-%s.jar".format(version) +
+    " dist/akka-amqp-%s.jar".format(version) +
+    " dist/akka-persistence-common-%s.jar".format(version) +
+    " dist/akka-persistence-redis-%s.jar".format(version) +
+    " dist/akka-persistence-mongo-%s.jar".format(version) +
+    " dist/akka-persistence-cassandra-%s.jar".format(version) +
+    " dist/akka-persistence-voldemort-%s.jar".format(version) +
+    " dist/akka-persistence-riak-%s.jar".format(version) +
+    " dist/akka-persistence-hbase-%s.jar".format(version) +
+    " dist/akka-kernel-%s.jar".format(version) +
+    " dist/akka-spring-%s.jar".format(version) +
+    " dist/akka-jta-%s.jar".format(version)
     )
 
   //Exclude slf4j1.5.11 from the classpath, it's conflicting...
@@ -942,12 +943,13 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) {
     )
   }
 
-  def akkaArtifacts = descendents(info.projectPath / "dist", "*" + buildScalaVersion  + "-" + version + ".jar")
+  def akkaArtifacts = descendents(info.projectPath / "dist", "*-" + version + ".jar")
   lazy val integrationTestsEnabled = systemOptional[Boolean]("integration.tests",false)
   lazy val stressTestsEnabled = systemOptional[Boolean]("stress.tests",false)
 
   // ------------------------------------------------------------
   class AkkaDefaultProject(info: ProjectInfo, val deployPath: Path) extends DefaultProject(info) with DeployProject with OSGiProject {
+    override def artifactID: String = this.name
     lazy val sourceArtifact = Artifact(this.artifactID, "source", "jar", Some("sources"), Nil, None)
     lazy val docsArtifact = Artifact(this.artifactID, "doc", "jar", Some("docs"), Nil, None)
     override def runClasspath = super.runClasspath +++ (AkkaParentProject.this.info.projectPath / "config")