diff --git a/server-console/package.json b/server-console/package.json
index 6824d1d9cf..ed01a9c89e 100644
--- a/server-console/package.json
+++ b/server-console/package.json
@@ -1,6 +1,6 @@
 {
-  "name": "HighFidelityConsole",
-  "description": "High Fidelity Console",
+  "name": "VircadiaConsole",
+  "description": "Vircadia Console",
   "author": "High Fidelity",
   "license": "Apache-2.0",
   "version": "1.0.0",
@@ -13,7 +13,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/highfidelity/hifi.git"
+    "url": "https://github.com/kasenvr/project-athena.git"
   },
   "main": "src/main.js",
   "scripts": {
diff --git a/server-console/packager.js b/server-console/packager.js
index 60aff6c540..dadc306bbf 100644
--- a/server-console/packager.js
+++ b/server-console/packager.js
@@ -28,15 +28,15 @@ var options = {
 
 const EXEC_NAME = "server-console";
 var SHORT_NAME = argv.client_only ? "Console" : "Sandbox";
-var FULL_NAME = argv.client_only ? "High Fidelity Console" : "High Fidelity Sandbox";
+var FULL_NAME = argv.client_only ? "Vircadia Console" : "Vircadia Sandbox";
 
 // setup per OS options
 if (osType == "Darwin") {
-    options["app-bundle-id"] = "com.highfidelity.server-console" + (argv.production ? "" : "-dev")
+    options["app-bundle-id"] = "com.vircadia.server-console" + (argv.production ? "" : "-dev")
     options["name"] = SHORT_NAME
 } else if (osType == "Windows_NT") {
     options["version-string"] = {
-        CompanyName: "High Fidelity, Inc.",
+        CompanyName: "Vircadia",
         FileDescription: FULL_NAME,
         ProductName: FULL_NAME,
         OriginalFilename: EXEC_NAME + ".exe"
diff --git a/server-console/resources/console-beta.icns b/server-console/resources/console-beta.icns
index 0023636e39..1fe162f88e 100644
Binary files a/server-console/resources/console-beta.icns and b/server-console/resources/console-beta.icns differ
diff --git a/server-console/resources/console-beta.ico b/server-console/resources/console-beta.ico
index 9263623fb4..63a3eff482 100644
Binary files a/server-console/resources/console-beta.ico and b/server-console/resources/console-beta.ico differ
diff --git a/server-console/resources/console-beta.png b/server-console/resources/console-beta.png
index 3494a6ef8f..59fe03c8ee 100644
Binary files a/server-console/resources/console-beta.png and b/server-console/resources/console-beta.png differ
diff --git a/server-console/resources/console-notification.png b/server-console/resources/console-notification.png
index b7df5312e3..e8991cd773 100644
Binary files a/server-console/resources/console-notification.png and b/server-console/resources/console-notification.png differ
diff --git a/server-console/resources/console-tray-osx-stopped.png b/server-console/resources/console-tray-osx-stopped.png
index 53589b60b0..82fcf76d5c 100644
Binary files a/server-console/resources/console-tray-osx-stopped.png and b/server-console/resources/console-tray-osx-stopped.png differ
diff --git a/server-console/resources/console-tray-osx-stopped@2x.png b/server-console/resources/console-tray-osx-stopped@2x.png
index 5356afb93e..535e6b8135 100644
Binary files a/server-console/resources/console-tray-osx-stopped@2x.png and b/server-console/resources/console-tray-osx-stopped@2x.png differ
diff --git a/server-console/resources/console-tray-osx-stopping.png b/server-console/resources/console-tray-osx-stopping.png
index 3255d43f60..c99313d00b 100644
Binary files a/server-console/resources/console-tray-osx-stopping.png and b/server-console/resources/console-tray-osx-stopping.png differ
diff --git a/server-console/resources/console-tray-osx-stopping@2x.png b/server-console/resources/console-tray-osx-stopping@2x.png
index f8fb805350..de09b722d3 100644
Binary files a/server-console/resources/console-tray-osx-stopping@2x.png and b/server-console/resources/console-tray-osx-stopping@2x.png differ
diff --git a/server-console/resources/console-tray-osx.png b/server-console/resources/console-tray-osx.png
index 11dbbbc38f..36756dd16f 100644
Binary files a/server-console/resources/console-tray-osx.png and b/server-console/resources/console-tray-osx.png differ
diff --git a/server-console/resources/console-tray-osx@2x.png b/server-console/resources/console-tray-osx@2x.png
index 8acd094606..86d9eacea2 100644
Binary files a/server-console/resources/console-tray-osx@2x.png and b/server-console/resources/console-tray-osx@2x.png differ
diff --git a/server-console/resources/console-tray-stopped.ico b/server-console/resources/console-tray-stopped.ico
index 8921a80297..2f0251a185 100644
Binary files a/server-console/resources/console-tray-stopped.ico and b/server-console/resources/console-tray-stopped.ico differ
diff --git a/server-console/resources/console-tray-win-stopped.png b/server-console/resources/console-tray-win-stopped.png
index 033ca3dfa4..cedc6e02e1 100644
Binary files a/server-console/resources/console-tray-win-stopped.png and b/server-console/resources/console-tray-win-stopped.png differ
diff --git a/server-console/resources/console-tray-win-stopped@2x.png b/server-console/resources/console-tray-win-stopped@2x.png
index e3d8de7aaa..b176209758 100644
Binary files a/server-console/resources/console-tray-win-stopped@2x.png and b/server-console/resources/console-tray-win-stopped@2x.png differ
diff --git a/server-console/resources/console-tray-win-stopping.png b/server-console/resources/console-tray-win-stopping.png
index 860bddbd3e..ddf60efc8e 100644
Binary files a/server-console/resources/console-tray-win-stopping.png and b/server-console/resources/console-tray-win-stopping.png differ
diff --git a/server-console/resources/console-tray-win-stopping@2x.png b/server-console/resources/console-tray-win-stopping@2x.png
index 46e5e32f59..50f9df457f 100644
Binary files a/server-console/resources/console-tray-win-stopping@2x.png and b/server-console/resources/console-tray-win-stopping@2x.png differ
diff --git a/server-console/resources/console-tray-win.png b/server-console/resources/console-tray-win.png
index 6ff889828c..cd8fa1d691 100644
Binary files a/server-console/resources/console-tray-win.png and b/server-console/resources/console-tray-win.png differ
diff --git a/server-console/resources/console-tray-win@2x.png b/server-console/resources/console-tray-win@2x.png
index 7295647c20..142498f6a1 100644
Binary files a/server-console/resources/console-tray-win@2x.png and b/server-console/resources/console-tray-win@2x.png differ
diff --git a/server-console/resources/console-tray.ico b/server-console/resources/console-tray.ico
index becc1b8e8b..6f06b43f73 100644
Binary files a/server-console/resources/console-tray.ico and b/server-console/resources/console-tray.ico differ
diff --git a/server-console/resources/console.icns b/server-console/resources/console.icns
index 38a7cc5b64..1fe162f88e 100644
Binary files a/server-console/resources/console.icns and b/server-console/resources/console.icns differ
diff --git a/server-console/resources/console.ico b/server-console/resources/console.ico
index a3957ea0eb..63a3eff482 100644
Binary files a/server-console/resources/console.ico and b/server-console/resources/console.ico differ
diff --git a/server-console/resources/console.png b/server-console/resources/console.png
index 0cd3b0a3c0..e6e13081fd 100644
Binary files a/server-console/resources/console.png and b/server-console/resources/console.png differ
diff --git a/server-console/src/content-update.html b/server-console/src/content-update.html
index 9298cd53e6..7c6b4c9971 100644
--- a/server-console/src/content-update.html
+++ b/server-console/src/content-update.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <title>High Fidelity Sandbox</title>
+    <title>Vircadia Sandbox</title>
     <script src="content-update.js"></script>
     <link rel="stylesheet" type="text/css" href="content-update.css"></link>
 </head>
@@ -45,7 +45,7 @@
         </div>
 
         <div class="footer">
-            <p>For more information about managing your high Fidelity Sandbox Server, check out our docs: <a href="https://wiki.highfidelity.com/wiki/Sandbox" target="_blank">wiki.highfidelity.com/wiki/Sandbox</a>
+            <p>For more information about managing your Vircadia Sandbox Server, check out our docs: <a href="https://docs.vircadia.dev/host.html" target="_blank">docs.vircadia.com</a>
             </p>
         </div>
     </div>
diff --git a/server-console/src/downloader.html b/server-console/src/downloader.html
index 07d3392246..f1f7a2024c 100644
--- a/server-console/src/downloader.html
+++ b/server-console/src/downloader.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
     <head>
-        <title>High Fidelity</title>
+        <title>Vircadia</title>
         <script src="downloader.js"></script>
         <link rel="stylesheet" type="text/css" href="downloader.css"></link>
     </head>
diff --git a/server-console/src/images/console-hf-logo-2x.png b/server-console/src/images/console-hf-logo-2x.png
index 420fb18fde..e8b048fae0 100644
Binary files a/server-console/src/images/console-hf-logo-2x.png and b/server-console/src/images/console-hf-logo-2x.png differ
diff --git a/server-console/src/main.js b/server-console/src/main.js
index 5adb4be4cb..d8d6fea4bf 100644
--- a/server-console/src/main.js
+++ b/server-console/src/main.js
@@ -113,7 +113,7 @@ function isInterfaceInstalled () {
         // the executable to a random location before starting it
         // which makes finding the interface near impossible using
         // relative paths.  For now, as there are no server-only
-        // installs, we just assume the interface is installed here 
+        // installs, we just assume the interface is installed here
         return true;
     } else {
         return interfacePath;
@@ -134,7 +134,7 @@ function shutdown() {
             dialog.showMessageBox({
                 type: 'question',
                 buttons: ['Yes', 'No'],
-                title: 'Stopping High Fidelity Sandbox',
+                title: 'Stopping Vircadia Sandbox',
                 message: 'Quitting will stop your Sandbox and your Home domain will no longer be running.\nDo you wish to continue?'
             }, shutdownCallback);
         } else {
@@ -280,7 +280,7 @@ function binaryMissingMessage(displayName, executableName, required) {
     var message = "The " + displayName + " executable was not found.\n";
 
     if (required) {
-        message += "It is required for the High Fidelity Sandbox to run.\n\n";
+        message += "It is required for the Vircadia Sandbox to run.\n\n";
     } else {
         message += "\n";
     }
@@ -293,7 +293,7 @@ function binaryMissingMessage(displayName, executableName, required) {
         message += paths.join("\n");
     } else {
         message += "It is expected to be found beside this executable.\n";
-        message += "You may need to re-install the High Fidelity Sandbox.";
+        message += "You may need to re-install the Vircadia Sandbox.";
     }
 
     return message;
@@ -337,10 +337,10 @@ var notificationState = NotificationState.UNNOTIFIED;
 
 function setNotificationState (notificationType, pending = undefined) {
     if (pending !== undefined) {
-        if ((notificationType === HifiNotificationType.TRANSACTIONS || 
+        if ((notificationType === HifiNotificationType.TRANSACTIONS ||
             notificationType === HifiNotificationType.ITEMS)) {
             // special case, because we want to clear the indicator light
-            // on INVENTORY when either Transactions or Items are 
+            // on INVENTORY when either Transactions or Items are
             // clicked on in the notification popup, we detect that case
             // here and force both to be unnotified.
             pendingNotifications[HifiNotificationType.TRANSACTIONS] = pending;
@@ -399,7 +399,7 @@ function visitSandboxClicked() {
         StartInterface('hifi://localhost');
     } else {
         // show an error to say that we can't go home without an interface instance
-        dialog.showErrorBox("Client Not Found", binaryMissingMessage("High Fidelity client", "Interface", false));
+        dialog.showErrorBox("Client Not Found", binaryMissingMessage("Vircadia client", "Interface", false));
     }
 }
 
@@ -613,7 +613,7 @@ function updateTrayMenu(serverState) {
         tray.setImage(trayIcons[notificationState]);
         tray.setContextMenu(Menu.buildFromTemplate(menuArray));
         if (isShuttingDown) {
-            tray.setToolTip('High Fidelity - Shutting Down');
+            tray.setToolTip('Vircadia - Shutting Down');
         }
     }
 }
@@ -868,7 +868,7 @@ function onContentLoaded() {
                     notifier.notify({
                         icon: notificationIcon,
                         title: 'An update is available!',
-                        message: 'High Fidelity version ' + latestVersion + ' is available',
+                        message: 'Vircadia version ' + latestVersion + ' is available',
                         wait: true,
                         appID: buildInfo.appUserModelId,
                         url: url
@@ -941,7 +941,7 @@ app.on('ready', function() {
 
     // Create tray icon
     tray = new Tray(trayIcons[NotificationState.UNNOTIFIED]);
-    tray.setToolTip('High Fidelity');
+    tray.setToolTip('Vircadia');
 
     tray.on('click', function() {
         tray.popUpContextMenu(tray.menu);
@@ -951,7 +951,7 @@ app.on('ready', function() {
         trayNotifications.startPolling();
     }
     updateTrayMenu(ProcessGroupStates.STOPPED);
-    
+
     if (isServerInstalled()) {
         maybeInstallDefaultContentSet(onContentLoaded);
     }
diff --git a/server-console/src/modules/hf-app.js b/server-console/src/modules/hf-app.js
index af6c38cdb3..cdb744e5e6 100644
--- a/server-console/src/modules/hf-app.js
+++ b/server-console/src/modules/hf-app.js
@@ -34,8 +34,8 @@ exports.getBuildInfo = function() {
         buildIdentifier: "dev",
         buildNumber: "0",
         stableBuild: "0",
-        organization: "High Fidelity - dev",
-        appUserModelId: "com.highfidelity.console"
+        organization: "Vircadia - dev",
+        appUserModelId: "com.vircadia.console"
     };
     var buildInfo = DEFAULT_BUILD_INFO;
 
@@ -63,11 +63,11 @@ exports.startInterface = function(url) {
 
         // do this as a workaround for app translocation on osx, which makes
         // it nearly impossible to find the interface executable
-        var bundle_id = 'com.highfidelity.interface-dev';
+        var bundle_id = 'com.vircadia.interface-dev';
         if (buildInfo.releaseType == 'PR') {
-            bundle_id = 'com.highfidelity.interface-pr';
+            bundle_id = 'com.vircadia.interface-pr';
         } else if (buildInfo.releaseType == 'PRODUCTION') {
-            bundle_id = 'com.highfidelity.interface';
+            bundle_id = 'com.vircadia.interface';
         }
         childProcess.exec('open -b ' + bundle_id + ' --args --url ' + url);
     } else {
diff --git a/server-console/src/splash.html b/server-console/src/splash.html
index d93b742181..f273ef16b7 100644
--- a/server-console/src/splash.html
+++ b/server-console/src/splash.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
     <head>
-        <title>High Fidelity</title>
+        <title>Vircadia</title>
         <script src="splash.js"></script>
         <link rel="stylesheet" type="text/css" href="splash.css"></link>
     </head>
@@ -19,7 +19,7 @@
                 <div class="column left">
                     <p>
                         <h2>What now?</h2>
-High Fidelity is now installed and your Home domain is ready for you to explore. To start you off, we've put a few things in your home to play around with and learn the ropes.
+Vircadia is now installed and your Home domain is ready for you to explore. To start you off, we've put a few things in your home to play around with and learn the ropes.
                     </p>
 
                     <p>
@@ -28,13 +28,13 @@ You can make your home yours by uploading your own models and scripts.
                     </p>
 
                     <p>
-                        <em>To get started exploring and creating,</em> <a target="_blank" href="https://docs.highfidelity.com/docs/explore">check out our Quick-start Guide</a>
+                        <em>To get started exploring and creating,</em> <a target="_blank" href="https://docs.vircadia.dev/explore.html">check out our Quick-start Guide</a>
                     </p>
                 </div>
                 <div class="column center">
                     <p>
                         <h2>How do I use it?</h2>
-                        You can manage your server by clicking on the High Fidelity icon in your
+                        You can manage your server by clicking on the Vircadia icon in your
                         <script>
                             var osType = require('os').type();
                             document.write(osType == 'Windows_NT' ? 'system tray.' : 'menu bar.');
@@ -44,14 +44,14 @@ You can make your home yours by uploading your own models and scripts.
 
                     <p>
                         <ul>
-                            <li>go to your 'Home,' automatically launching High Fidelity</li>
+                            <li>go to your 'Home,' automatically launching Vircadia</li>
                             <li>administer basic function like starting and stopping your server</li>
                             <li>access your server's settings and logs</li>
                         </ul>
                     </p>
 
                     <p>
-                        <em>For more information on managing your server,</em> <a target="_blank" href="https://docs.highfidelity.com/">visit our documentation</a>
+                        <em>For more information on managing your server,</em> <a target="_blank" href="https://docs.vircadia.dev/host.html">visit our documentation</a>
                     </p>
                 </div>
                 <div class="column right">