diff --git a/.travis.yml b/.travis.yml
index 2892970..12f25c5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -105,14 +105,16 @@ after_success:
     # https://travis-ci.org/github/MacPython/numpy-wheels/settings
     # originally generated at
     # anaconda.org/scipy-wheels-nightly/settings/access
-    - if [ "$TRAVIS_BRANCH" == "master" ]; then
+    - if [ "$TRAVIS_BRANCH" == "master" ] ; then
           ANACONDA_ORG="scipy-wheels-nightly";
           TOKEN=${NUMPY_NIGHTLY_UPLOAD_TOKEN};
+          source extra_functions.sh;
+          for f in wheelhouse/*.whl; do rename_wheel $f; done;
       else
           ANACONDA_ORG="multibuild-wheels-staging";
           TOKEN=${NUMPY_STAGING_UPLOAD_TOKEN};
       fi
     - pip install git+https://github.com/Anaconda-Server/anaconda-client;
-    - if [ -n "${TOKEN}" ] ;then
+    - if [ -n "${TOKEN}" ] ; then
         anaconda -t ${TOKEN} upload -u ${ANACONDA_ORG} ${TRAVIS_BUILD_DIR}/wheelhouse/*.whl;
       fi
diff --git a/azure/posix.yml b/azure/posix.yml
index a106a2f..7f77611 100644
--- a/azure/posix.yml
+++ b/azure/posix.yml
@@ -110,8 +110,10 @@ jobs:
 
       - bash: |
           set -e
-          source extra_functions.sh
-          for f in wheelhouse/*.whl; do rename_wheel $f; done
+          if [ $ANACONDA_ORG == "scipy-wheels-nightly" ]; then
+            source extra_functions.sh
+            for f in wheelhouse/*.whl; do rename_wheel $f; done
+          fi
 
           echo uploading wheelhouse/*.whl
 
diff --git a/azure/windows.yml b/azure/windows.yml
index 1b7ef37..e6cff80 100644
--- a/azure/windows.yml
+++ b/azure/windows.yml
@@ -138,8 +138,10 @@ jobs:
 
       - bash: |
           set -e
-          source extra_functions.sh
-          for f in numpy/dist/numpy-*.whl; do rename_wheel $f; done
+          if [ $ANACONDA_ORG == "scipy-wheels-nightly" ]; then
+            source extra_functions.sh
+            for f in wheelhouse/*.whl; do rename_wheel $f; done
+          fi
 
           echo uploading numpy/dist/numpy-*.whl