diff --git a/BUILD.md b/BUILD.md
index f1b93556dc..f647cff476 100644
--- a/BUILD.md
+++ b/BUILD.md
@@ -85,7 +85,7 @@ Where `/path/to/directory` is the path to a directory where you wish the build f
     RELEASE_TYPE=PRODUCTION|PR|DEV
     
     // The Interface will have a custom default home and startup location.
-    INITIAL_STARTUP_LOCATION=Location/IP/URL
+    PRELOADED_STARTUP_LOCATION=Location/IP/URL
     // The Interface will have a custom default script whitelist, comma separated, no spaces.
     // This will also activate the whitelist on Interface's first run.
     PRELOADED_SCRIPT_WHITELIST=ListOfEntries
diff --git a/cmake/macros/SetPackagingParameters.cmake b/cmake/macros/SetPackagingParameters.cmake
index 4c453cdfc0..42fbe0b0d0 100644
--- a/cmake/macros/SetPackagingParameters.cmake
+++ b/cmake/macros/SetPackagingParameters.cmake
@@ -26,7 +26,7 @@ macro(SET_PACKAGING_PARAMETERS)
   set_from_env(RELEASE_NAME RELEASE_NAME "")
   set_from_env(STABLE_BUILD STABLE_BUILD 0)
 
-  set_from_env(INITIAL_STARTUP_LOCATION INITIAL_STARTUP_LOCATION "")
+  set_from_env(PRELOADED_STARTUP_LOCATION PRELOADED_STARTUP_LOCATION "")
   set_from_env(PRELOADED_SCRIPT_WHITELIST PRELOADED_SCRIPT_WHITELIST "")
   
   set_from_env(BYPASS_SIGNING BYPASS_SIGNING 0)
diff --git a/cmake/templates/BuildInfo.h.in b/cmake/templates/BuildInfo.h.in
index 42a7eddb6c..99726d270f 100644
--- a/cmake/templates/BuildInfo.h.in
+++ b/cmake/templates/BuildInfo.h.in
@@ -29,7 +29,7 @@ namespace BuildInfo {
     const QString BUILD_NUMBER = "@BUILD_NUMBER@";
     const QString BUILD_GLOBAL_SERVICES = "@BUILD_GLOBAL_SERVICES@";
     const QString BUILD_TIME = "@BUILD_TIME@";
-    const QString INITIAL_STARTUP_LOCATION = "@INITIAL_STARTUP_LOCATION@";
+    const QString PRELOADED_STARTUP_LOCATION = "@PRELOADED_STARTUP_LOCATION@";
     const QString PRELOADED_SCRIPT_WHITELIST = "@PRELOADED_SCRIPT_WHITELIST@";
 
     enum BuildType {
diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index eec1efbd99..d8338162b6 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -4015,7 +4015,7 @@ void Application::handleSandboxStatus(QNetworkReply* reply) {
 
     // If this is a first run we short-circuit the address passed in
     if (_firstRun.get()) {
-        if (!BuildInfo::INITIAL_STARTUP_LOCATION.isEmpty()) {
+        if (!BuildInfo::PRELOADED_STARTUP_LOCATION.isEmpty()) {
             DependencyManager::get<LocationBookmarks>()->setHomeLocationToAddress(NetworkingConstants::DEFAULT_VIRCADIA_ADDRESS);
             Menu::getInstance()->triggerOption(MenuOption::HomeLocation);
         }
diff --git a/libraries/networking/src/AddressManager.cpp b/libraries/networking/src/AddressManager.cpp
index ffa5a34118..76587118f1 100644
--- a/libraries/networking/src/AddressManager.cpp
+++ b/libraries/networking/src/AddressManager.cpp
@@ -36,11 +36,11 @@ const QString REDIRECT_HIFI_ADDRESS = NetworkingConstants::REDIRECT_HIFI_ADDRESS
 const QString ADDRESS_MANAGER_SETTINGS_GROUP = "AddressManager";
 const QString SETTINGS_CURRENT_ADDRESS_KEY = "address";
 
-const QString DEFAULT_VIRCADIA_ADDRESS = (!BuildInfo::INITIAL_STARTUP_LOCATION.isEmpty())
-                                       ? BuildInfo::INITIAL_STARTUP_LOCATION
+const QString DEFAULT_VIRCADIA_ADDRESS = (!BuildInfo::PRELOADED_STARTUP_LOCATION.isEmpty())
+                                       ? BuildInfo::PRELOADED_STARTUP_LOCATION
                                        : NetworkingConstants::DEFAULT_VIRCADIA_ADDRESS;
-const QString DEFAULT_HOME_ADDRESS = (!BuildInfo::INITIAL_STARTUP_LOCATION.isEmpty()) 
-                                       ? BuildInfo::INITIAL_STARTUP_LOCATION
+const QString DEFAULT_HOME_ADDRESS = (!BuildInfo::PRELOADED_STARTUP_LOCATION.isEmpty()) 
+                                       ? BuildInfo::PRELOADED_STARTUP_LOCATION
                                        : NetworkingConstants::DEFAULT_VIRCADIA_ADDRESS;
 
 Setting::Handle<QUrl> currentAddressHandle(QStringList() << ADDRESS_MANAGER_SETTINGS_GROUP << "address", DEFAULT_VIRCADIA_ADDRESS);