diff --git a/support/s3/hmac b/support/aws/hmac
similarity index 100%
rename from support/s3/hmac
rename to support/aws/hmac
diff --git a/support/s3/s3 b/support/aws/s3
similarity index 100%
rename from support/s3/s3
rename to support/aws/s3
diff --git a/support/package_node b/support/package_node
index a1e93210a..dc98b9b11 100755
--- a/support/package_node
+++ b/support/package_node
@@ -38,7 +38,7 @@ pushd node-v${node_version}
 heroku make -v -o $tempdir/node-${node_version}.tgz
 
 # upload nodejs to s3
-$basedir/s3/s3 put language-pack-nodejs \
+$basedir/aws/s3 put language-pack-nodejs \
   nodejs-${node_version}.tgz $tempdir/node-${node_version}.tgz
 
 # go into scons
@@ -49,5 +49,5 @@ scons_version=$(ls | grep "scons-local" | cut -d- -f3)
 tar czvf $tempdir/scons-${scons_version}.tgz *
 
 # upload scons to s3
-$basedir/s3/s3 put language-pack-nodejs \
+$basedir/aws/s3 put language-pack-nodejs \
   scons-${scons_version}.tgz $tempdir/scons-${scons_version}.tgz