diff --git a/client/core/PreInitDeclarations.js b/client/core/PreInitDeclarations.js
index ed53328f..eda3cb29 100644
--- a/client/core/PreInitDeclarations.js
+++ b/client/core/PreInitDeclarations.js
@@ -4,7 +4,8 @@
 // NOTE: This will be preprocessed by preprocess.py and replaced with the proper
 // servers
 
-var __spacesDir = '%%SPACEDIR%%';
+var __spacesDir = '%%SPACES_PATH%%';
+var __mediaDir = '%%MEDIA_PATH%%';
 
 SSLog('SERVER: ' + __server, SSLogForce);
 SSLog('SPACESDIR: ' + __spacesDir, SSLogForce);
diff --git a/config/env/deploy.json b/config/env/deploy.json
index bdffa763..6521a6b1 100644
--- a/config/env/deploy.json
+++ b/config/env/deploy.json
@@ -1,5 +1,5 @@
 {
   "SERVER": "http://shiftspace.org/api/",
-  "SPACEDIR": "http://shiftspace.org/api/spaces/",
+  "SPACES_PATH": "http://shiftspace.org/api/spaces/",
   "LOG_LEVEL": "SSNoLogging"
 }
\ No newline at end of file
diff --git a/shifty.py b/shifty.py
index 83646254..44a57bdb 100755
--- a/shifty.py
+++ b/shifty.py
@@ -54,7 +54,7 @@ def nightly():
 def env(url):
     return {
         "SERVER": url,
-        "SPACEDIR": url + "spaces/",
+        "SPACES_PATH": url + "spaces/",
         "IMAGESDIR": url + "images/",
         "GLOBAL_CSS": "styles/SSGlobalStyles.css",
         "LOG_LEVEL": None,