diff --git a/build.gradle b/build.gradle
index 3a5ed75..10fac34 100644
--- a/build.gradle
+++ b/build.gradle
@@ -66,9 +66,18 @@
 
 // upload anchor for subprojects to upload their artifacts
 // to the local repo.
-task(dist) {
+task dist(type: Zip)  {
     group = BasePlugin.BUILD_GROUP
     description 'Builds distribution artifacts.'
+
+    from project.ext.supportRepoOut
+    into 'm2repository'
+    destinationDir project.ext.distDir
+    baseName = String.format("top-of-tree-m2repository-%s", project.multidexVersion)
+
+    doLast {
+        logger.warn "Compressed maven artifacts to ${archivePath}"
+    }
 }
 
 subprojects {
@@ -89,18 +98,7 @@
         }
     }
 
-    task createArtifactZip(type: Zip, dependsOn: release)  {
-        from release.artifacts
-        into archivesBaseName
-        destinationDir project.parent.distDir
-        baseName = archivesBaseName
-
-        doLast {
-            logger.warn "Compressed maven artifacts to ${archivePath}"
-        }
-    }
-
-    dist.dependsOn createArtifactZip
+    dist.dependsOn release
 
     project.plugins.whenPluginAdded { plugin ->
         if ("com.android.build.gradle.LibraryPlugin".equals(plugin.class.name)) {
diff --git a/instrumentation/build.gradle b/instrumentation/build.gradle
index adea6d7..1e6fd98 100644
--- a/instrumentation/build.gradle
+++ b/instrumentation/build.gradle
@@ -17,7 +17,7 @@
 apply plugin: 'com.android.library'
 
 dependencies {
-    compile project(':support-multidex')
+    compile project(':multidex')
 }
 
 android {
diff --git a/settings.gradle b/settings.gradle
index 516f997..7fffc9b 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-include ':support-multidex'
-project(':support-multidex').projectDir = new File(rootDir, 'library')
+include ':multidex'
+project(':multidex').projectDir = new File(rootDir, 'library')
 
-include ':support-multidex-instrumentation'
-project(':support-multidex-instrumentation').projectDir = new File(rootDir, 'instrumentation')
+include ':multidex-instrumentation'
+project(':multidex-instrumentation').projectDir = new File(rootDir, 'instrumentation')