rename from build/build-clang/clang-static-analysis-linux64.json
rename to build/build-clang/clang-linux64.json

rename from build/build-clang/clang-static-analysis-macosx64.json
rename to build/build-clang/clang-macosx64.json

rename from build/build-clang/clang-static-analysis-win32.json
rename to build/build-clang/clang-win32.json

rename from build/build-clang/clang-static-analysis-win64.json
rename to build/build-clang/clang-win64.json

--- a/taskcluster/scripts/misc/build-clang-linux.sh
+++ b/taskcluster/scripts/misc/build-clang-linux.sh
@@ -11,15 +11,15 @@ cd $HOME_DIR/src
 
 . taskcluster/scripts/misc/tooltool-download.sh
 
 # gets a bit too verbose here
 set +x
 
 cd build/build-clang
 # |mach python| sets up a virtualenv for us!
-../../mach python ./build-clang.py -c clang-static-analysis-linux64.json
+../../mach python ./build-clang.py -c clang-linux64.json
 
 set -x
 
 # Put a tarball in the artifacts dir
 mkdir -p $UPLOAD_DIR
 cp clang.tar.* $UPLOAD_DIR

--- a/taskcluster/scripts/misc/build-clang-macosx.sh
+++ b/taskcluster/scripts/misc/build-clang-macosx.sh
@@ -19,15 +19,15 @@ export CROSS_SYSROOT=$HOME_DIR/src/MacOS
 export PATH=$PATH:$CROSS_CCTOOLS_PATH/bin
 ln -sf $CROSS_CCTOOLS_PATH/bin/x86_64-apple-darwin11-lipo $CROSS_CCTOOLS_PATH/bin/lipo
 
 # gets a bit too verbose here
 set +x
 
 cd build/build-clang
 # |mach python| sets up a virtualenv for us!
-../../mach python ./build-clang.py -c clang-static-analysis-macosx64.json
+../../mach python ./build-clang.py -c clang-macosx64.json
 
 set -x
 
 # Put a tarball in the artifacts dir
 mkdir -p $UPLOAD_DIR
 cp clang.tar.* $UPLOAD_DIR

--- a/taskcluster/scripts/misc/build-clang32-windows.sh
+++ b/taskcluster/scripts/misc/build-clang32-windows.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-source build/src/taskcluster/scripts/misc/build-clang-windows-helper32.sh clang-static-analysis-win32.json
+source build/src/taskcluster/scripts/misc/build-clang-windows-helper32.sh clang-win32.json

--- a/taskcluster/scripts/misc/build-clang64-windows.sh
+++ b/taskcluster/scripts/misc/build-clang64-windows.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-source build/src/taskcluster/scripts/misc/build-clang-windows-helper64.sh clang-static-analysis-win64.json
+source build/src/taskcluster/scripts/misc/build-clang-windows-helper64.sh clang-win64.json