diff --git a/docs/content/Examples.md b/docs/content/Examples.md
index 03948a6a4d8..1b931f5186a 100644
--- a/docs/content/Examples.md
+++ b/docs/content/Examples.md
@@ -25,11 +25,11 @@ git checkout druid-0.7.0-rc3
 
 ### Downloading the DSK (Druid Standalone Kit)
 
-[Download](http://static.druid.io/artifacts/releases/druid-services-0.7.0-rc3-bin.tar.gz) a stand-alone tarball and run it:
+[Download](http://static.druid.io/artifacts/releases/druid-0.7.0-rc3-bin.tar.gz) a stand-alone tarball and run it:
 
 ``` bash
-tar -xzf druid-services-0.X.X-bin.tar.gz
-cd druid-services-0.X.X
+tar -xzf druid-0.7.0-rc3-bin.tar.gz
+cd druid-0.7.0-rc3
 ```
 
 Twitter Example
diff --git a/docs/content/Tutorial:-A-First-Look-at-Druid.md b/docs/content/Tutorial:-A-First-Look-at-Druid.md
index b5512b5b7ef..401011e6e3b 100644
--- a/docs/content/Tutorial:-A-First-Look-at-Druid.md
+++ b/docs/content/Tutorial:-A-First-Look-at-Druid.md
@@ -47,18 +47,18 @@ There are two ways to setup Druid: download a tarball, or [Build From Source](Bu
 
 ### Download a Tarball
 
-We've built a tarball that contains everything you'll need. You'll find it [here](http://static.druid.io/artifacts/releases/druid-services-0.7.0-rc3-bin.tar.gz). Download this file to a directory of your choosing.
+We've built a tarball that contains everything you'll need. You'll find it [here](http://static.druid.io/artifacts/releases/druid-0.7.0-rc3-bin.tar.gz). Download this file to a directory of your choosing.
 
 You can extract the content within by issuing:
 
 ```
-tar -zxvf druid-services-*-bin.tar.gz
+tar -zxvf druid-0.7.0-rc3-bin.tar.gz
 ```
 
 If you cd into the directory:
 
 ```
-cd druid-services-0.7.0-rc3
+cd druid-0.7.0-rc3
 ```
 
 You should see a bunch of files:
diff --git a/docs/content/Tutorial:-The-Druid-Cluster.md b/docs/content/Tutorial:-The-Druid-Cluster.md
index c32d200c884..5b5c264b36a 100644
--- a/docs/content/Tutorial:-The-Druid-Cluster.md
+++ b/docs/content/Tutorial:-The-Druid-Cluster.md
@@ -13,13 +13,13 @@ In this tutorial, we will set up other types of Druid nodes and external depende
 
 If you followed the first tutorial, you should already have Druid downloaded. If not, let's go back and do that first.
 
-You can download the latest version of druid [here](http://static.druid.io/artifacts/releases/druid-services-0.7.0-rc3-bin.tar.gz)
+You can download the latest version of druid [here](http://static.druid.io/artifacts/releases/druid-0.7.0-rc3-bin.tar.gz)
 
 and untar the contents within by issuing:
 
 ```bash
-tar -zxvf druid-services-*-bin.tar.gz
-cd druid-services-*
+tar -zxvf druid-0.7.0-rc3-bin.tar.gz
+cd druid-0.7.0-rc3
 ```
 
 You can also [Build From Source](Build-from-source.html).
diff --git a/examples/bin/examples/indexing/wikipedia_hadoop_config.json b/examples/bin/examples/indexing/wikipedia_hadoop_config.json
index 104e6c96c9b..95b89b58a10 100644
--- a/examples/bin/examples/indexing/wikipedia_hadoop_config.json
+++ b/examples/bin/examples/indexing/wikipedia_hadoop_config.json
@@ -61,7 +61,7 @@
     "type": "hadoop",
     "inputSpec": {
       "type": "static",
-      "paths": "/myPath/druid-services-0.7.0-rc3/examples/indexing/wikipedia_data.json"
+      "paths": "/myPath/druid-0.7.0-rc3/examples/indexing/wikipedia_data.json"
     },
     "metadataUpdateSpec": {
       "type": "db",
diff --git a/services/pom.xml b/services/pom.xml
index 81c9d84a7a3..0af62f217a5 100644
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -98,9 +98,10 @@
                         <id>distro-assembly</id>
                         <phase>package</phase>
                         <goals>
-                            <goal>assembly</goal>
+                            <goal>single</goal>
                         </goals>
                         <configuration>
+                            <finalName>${project.parent.artifactId}-${project.parent.version}</finalName>
                             <descriptors>
                                 <descriptor>src/assembly/assembly.xml</descriptor>
                             </descriptors>
diff --git a/upload.sh b/upload.sh
index 430d450122a..fb3ca2fbdb6 100755
--- a/upload.sh
+++ b/upload.sh
@@ -3,4 +3,19 @@
 #
 # Script to upload tarball of assembly build to static.druid.io for serving
 #
-s3cmd put services/target/druid-services-*-bin.tar.gz s3://static.druid.io/artifacts/releases/
+
+if [ $# -lt 1 ]; then
+  echo "Usage: $0 <version>" >&2
+  exit 2
+fi
+
+VERSION=$1
+TAR=druid-$VERSION-bin.tar.gz
+S3PATH=s3://static.druid.io/artifacts/releases
+
+if [ ! -z "`s3cmd ls "$S3PATH/$TAR"`" ]; then
+  echo "ERROR: Refusing to overwrite $S3PATH/$TAR" >&2
+  exit 2
+fi
+
+s3cmd put services/target/$TAR $S3PATH/$TAR