diff --git a/.github/workflows/pr_build.yml b/.github/workflows/pr_build.yml
index 408bfeec54..8a3dce98ec 100644
--- a/.github/workflows/pr_build.yml
+++ b/.github/workflows/pr_build.yml
@@ -171,7 +171,7 @@ jobs:
     - name: Build for Android + Quest
       if: matrix.build_type == 'android'
       shell: bash
-      working-directory: ${{runner.workspace}}/project-athena
+      working-directory: ${{runner.workspace}}/vircadia
       run: |
         echo "Pre-cache the vcpkg managed dependencies"
         $PYTHON_EXEC prebuild.py --build-root ${{runner.workspace}}/build --android interface
diff --git a/BUILD_ANDROID.md b/BUILD_ANDROID.md
index 0bea3e5a90..fc73d7905e 100644
--- a/BUILD_ANDROID.md
+++ b/BUILD_ANDROID.md
@@ -66,7 +66,7 @@ The above code to suppress modules is not necessary, but will speed up the build
 
 ### Clone the repository
 
-`git clone https://github.com/kasenvr/project-athena.git`
+`git clone https://github.com/vircadia/vircadia.git`
 
 ## Building & Running
 
@@ -119,4 +119,4 @@ Some things you can try if you want to do a clean build
 * In Android Studio, click _File > Invalidate Caches / Restart_ and select _Invalidate and Restart_
 
 If you see lots of "couldn't acquire lock" errors,
-* Open Task Manager and close any running Clang / Gradle processes
\ No newline at end of file
+* Open Task Manager and close any running Clang / Gradle processes
diff --git a/BUILD_LINUX.md b/BUILD_LINUX.md
index 8d6062f5e6..90782e90b4 100644
--- a/BUILD_LINUX.md
+++ b/BUILD_LINUX.md
@@ -4,7 +4,7 @@
 
 Please read the [general build guide](BUILD.md) for information on dependencies required for all platforms. Only Linux specific instructions are found in this file.
 
-You can use the [Vircadia Builder](https://github.com/kasenvr/vircadia-builder) to build on Linux more easily. Alternatively, you can follow the manual steps below.
+You can use the [Vircadia Builder](https://github.com/vircadia/vircadia-builder) to build on Linux more easily. Alternatively, you can follow the manual steps below.
 
 ## Ubuntu 16.04/18.04 specific build guide
 ### Ubuntu 16.04 only
@@ -78,7 +78,7 @@ sudo apt-get install nodejs
 
 Clone this repository:
 ```bash
-git clone https://github.com/kasenvr/project-athena.git
+git clone https://github.com/vircadia/vircadia.git
 ```
 
 To compile a DEV version checkout the branch you need. To get a list of all tags:
@@ -105,7 +105,7 @@ Qt must be installed in `$HIFI_QT_BASE/$VIRCADIA_USE_QT_VERSION/qt5-install`.
 
 Create the build directory:
 ```bash
-cd project-athena
+cd vircadia
 mkdir build
 cd build
 ```
diff --git a/BUILD_WIN.md b/BUILD_WIN.md
index c057d9ca5d..1035b1c366 100644
--- a/BUILD_WIN.md
+++ b/BUILD_WIN.md
@@ -107,7 +107,7 @@ Note: You can also run Interface by launching it from command line or File Explo
 For any problems after Step #6, first try this:  
 * Delete your locally cloned copy of the Vircadia repository  
 * Restart your computer  
-* Redownload the [repository](https://github.com/kasenvr/project-athena)  
+* Redownload the [repository](https://github.com/vircadia/vircadia)  
 * Restart directions from Step #6  
 
 #### CMake gives you the same error message repeatedly after the build fails
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index aeb6f49280..35b7589e0c 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -6,7 +6,7 @@ Contributing
 2. Clone your fork of the repository locally
 
   ```
-  git clone git://github.com/USERNAME/project-athena.git
+  git clone git://github.com/USERNAME/vircadia.git
   ```
 3. Create a new branch
   
@@ -20,7 +20,7 @@ Contributing
 6. Update your branch
   
   ```
-  git remote add upstream https://github.com/kasenvr/project-athena
+  git remote add upstream https://github.com/vircadia/vircadia
   git pull upstream master
   ```
   
@@ -38,10 +38,10 @@ Contributing
 Reporting Bugs
 ===
 1. Always update to the latest code on master, we make many merges every day and it is possible the bug has already been fixed!
-2. Search [issues](https://github.com/kasenvr/project-athena/issues) to make sure that somebody has not already reported the same bug. 
-3. [Add](https://github.com/kasenvr/project-athena/issues/new) your report to the issues list!
+2. Search [issues](https://github.com/vircadia/vircadia/issues) to make sure that somebody has not already reported the same bug. 
+3. [Add](https://github.com/vircadia/vircadia/issues/new) your report to the issues list!
 
 Requesting a Feature
 ===
-1. Search [issues](https://github.com/kasenvr/project-athena/issues) to make sure that somebody has not already requested the same feature. 
-2. [Add](https://github.com/kasenvr/project-athena/issues/new) your request to the issues list!
+1. Search [issues](https://github.com/vircadia/vircadia/issues) to make sure that somebody has not already requested the same feature. 
+2. [Add](https://github.com/vircadia/vircadia/issues/new) your request to the issues list!
diff --git a/README.md b/README.md
index baf333d81f..0368799c73 100644
--- a/README.md
+++ b/README.md
@@ -8,17 +8,17 @@ Vircadia is a 3D social software project seeking to incrementally bring about a
 
 ### Releases
 
-[View Releases here](https://github.com/kasenvr/project-athena/releases/)
+[View Releases here](https://github.com/vircadia/vircadia/releases/)
 
 ### How to build the Interface
 
-[For Windows](https://github.com/kasenvr/project-athena/blob/master/BUILD_WIN.md)
+[For Windows](https://github.com/vircadia/vircadia/blob/master/BUILD_WIN.md)
 
-[For Mac](https://github.com/kasenvr/project-athena/blob/master/BUILD_OSX.md)
+[For Mac](https://github.com/vircadia/vircadia/blob/master/BUILD_OSX.md)
 
-[For Linux](https://github.com/kasenvr/project-athena/blob/master/BUILD_LINUX.md)
+[For Linux](https://github.com/vircadia/vircadia/blob/master/BUILD_LINUX.md)
 
-[For Linux - Vircadia Builder](https://github.com/kasenvr/vircadia-builder)
+[For Linux - Vircadia Builder](https://github.com/vircadia/vircadia-builder)
 
 ### How to deploy a Server
 
@@ -26,13 +26,13 @@ Vircadia is a 3D social software project seeking to incrementally bring about a
 
 ### How to build a Server
 
-[For Linux - Vircadia Builder](https://github.com/kasenvr/vircadia-builder)
+[For Linux - Vircadia Builder](https://github.com/vircadia/vircadia-builder)
 
 ### How to generate an Installer
 
-[For Windows](https://github.com/kasenvr/project-athena/blob/master/INSTALL.md)
+[For Windows](https://github.com/vircadia/vircadia/blob/master/INSTALL.md)
 
-[For Linux - AppImage - Vircadia Builder](https://github.com/kasenvr/vircadia-builder/blob/master/README.md#building-appimages)
+[For Linux - AppImage - Vircadia Builder](https://github.com/vircadia/vircadia-builder/blob/master/README.md#building-appimages)
 
 ### Boot to Metaverse: The Goal
 
diff --git a/android/containerized_build.sh b/android/containerized_build.sh
index 94b5b28831..bbf0b605d8 100755
--- a/android/containerized_build.sh
+++ b/android/containerized_build.sh
@@ -17,7 +17,7 @@ test -z "$STABLE_BUILD" && export STABLE_BUILD=0
 docker run \
    --rm \
    --security-opt seccomp:unconfined \
-   -v "${WORKSPACE}":/home/gha/project-athena \
+   -v "${WORKSPACE}":/home/gha/vircadia \
    -e RELEASE_NUMBER \
    -e RELEASE_TYPE \
    -e ANDROID_APP \
diff --git a/android/docker/Dockerfile b/android/docker/Dockerfile
index 144f6caffa..ab5ddb562d 100644
--- a/android/docker/Dockerfile
+++ b/android/docker/Dockerfile
@@ -72,17 +72,17 @@ RUN mkdir "$HIFI_BASE" && \
     mkdir "$HIFI_ANDROID_PRECOMPILED"
 
 # Download the repo
-RUN git clone https://github.com/kasenvr/project-athena.git
+RUN git clone https://github.com/vircadia/vircadia.git
 
-WORKDIR /home/gha/project-athena
+WORKDIR /home/gha/vircadia
 
 RUN mkdir build
 
 # Pre-cache the vcpkg managed dependencies
-WORKDIR /home/gha/project-athena/build
+WORKDIR /home/gha/vircadia/build
 RUN python3 ../prebuild.py --build-root `pwd` --android interface
 
 # Pre-cache the gradle dependencies
-WORKDIR /home/gha/project-athena/android
+WORKDIR /home/gha/vircadia/android
 RUN ./gradlew -m tasks -PHIFI_ANDROID_PRECOMPILED=$HIFI_ANDROID_PRECOMPILED
 #RUN ./gradlew extractDependencies -PHIFI_ANDROID_PRECOMPILED=$HIFI_ANDROID_PRECOMPILED 
diff --git a/domain-server/resources/metadata_exporter/index.html b/domain-server/resources/metadata_exporter/index.html
index a22d50fe22..1b18c508cc 100644
--- a/domain-server/resources/metadata_exporter/index.html
+++ b/domain-server/resources/metadata_exporter/index.html
@@ -2,7 +2,7 @@
 //
 //  index.html
 //
-//  Created by kasenvr@gmail.com on 21 Jul 2020
+//  Created by somnilibertas@gmail.com on 21 Jul 2020
 //  Copyright 2020 Vircadia and contributors.
 //
 //  Distributed under the Apache License, Version 2.0.
diff --git a/domain-server/resources/web/assignment/placeholder.js b/domain-server/resources/web/assignment/placeholder.js
index 95c9903e32..3666396d6e 100644
--- a/domain-server/resources/web/assignment/placeholder.js
+++ b/domain-server/resources/web/assignment/placeholder.js
@@ -1,3 +1,3 @@
 // Here you can put a script that will be run by an assignment-client (AC)
-// For examples, please go to https://github.com/kasenvr/project-athena/tree/master/script-archive/acScripts
+// For examples, please go to https://github.com/vircadia/vircadia/tree/master/script-archive/acScripts
 // The directory named acScripts contains assignment-client specific scripts you can try.
diff --git a/hifi_qt.py b/hifi_qt.py
index c59c7b1202..48e9b337a6 100644
--- a/hifi_qt.py
+++ b/hifi_qt.py
@@ -81,7 +81,7 @@ endif()
             else:
                 print("Sorry, " + distro.name(pretty=True) + " is not supported. Please consider helping us out.")
                 print("It's also possible to build Qt for your distribution, please see the documentation at:")
-                print("https://github.com/kasenvr/project-athena/tree/master/tools/qt-builder")
+                print("https://github.com/vircadia/vircadia/tree/master/tools/qt-builder")
                 raise Exception('UNKNOWN LINUX VERSION!!!')
         else:
             print("System      : " + platform.system())
diff --git a/interface/resources/qml/hifi/dialogs/TabletAboutDialog.qml b/interface/resources/qml/hifi/dialogs/TabletAboutDialog.qml
index a943da32a0..f7a4061f45 100644
--- a/interface/resources/qml/hifi/dialogs/TabletAboutDialog.qml
+++ b/interface/resources/qml/hifi/dialogs/TabletAboutDialog.qml
@@ -54,10 +54,10 @@ Rectangle {
             textFormat: Text.StyledText
             linkColor: "#00B4EF"
             color: "white"
-            text: "<a href=\"https://github.com/kasenvr/project-athena\">Vircadia Github</a>."
+            text: "<a href=\"https://github.com/vircadia/vircadia\">Vircadia Github</a>."
             size: 20
             onLinkActivated: {
-                About.openUrl("https:/github.com/kasenvr/project-athena");
+                About.openUrl("https:/github.com/vircadia/vircadia");
             }
 
         }
diff --git a/interface/resources/qml/hifi/dialogs/security/EntityScriptQMLWhitelist.qml b/interface/resources/qml/hifi/dialogs/security/EntityScriptQMLWhitelist.qml
index 9e0b6ba4cf..8180475527 100644
--- a/interface/resources/qml/hifi/dialogs/security/EntityScriptQMLWhitelist.qml
+++ b/interface/resources/qml/hifi/dialogs/security/EntityScriptQMLWhitelist.qml
@@ -2,8 +2,8 @@
 //  EntityScriptQMLWhitelist.qml
 //  interface/resources/qml/hifi/dialogs/security
 //
-//  Created by Kasen IO on 2019.12.05 | realities.dev | kasenvr@gmail.com
-//  Copyright 2019 Kasen IO
+//  Created by Kalila L. on 2019.12.05 | realities.dev | somnilibertas@gmail.com
+//  Copyright 2019 Kalila L.
 //
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
diff --git a/interface/resources/qml/hifi/dialogs/security/Security.qml b/interface/resources/qml/hifi/dialogs/security/Security.qml
index 918a0a2ca6..b109f83a23 100644
--- a/interface/resources/qml/hifi/dialogs/security/Security.qml
+++ b/interface/resources/qml/hifi/dialogs/security/Security.qml
@@ -314,7 +314,7 @@ Rectangle {
                         onClicked: {
                             lightboxPopup.titleText = "Script Plugin Infrastructure";
                             lightboxPopup.bodyText = "Toggles the activation of scripting plugins in the 'plugins/scripting' folder. \n\n"
-                              + "Created by:\n    humbletim@gmail.com\n    kasenvr@gmail.com";
+                              + "Created by:\n    humbletim@gmail.com\n    somnilibertas@gmail.com";
                             lightboxPopup.button1text = "OK";
                             lightboxPopup.button1method = function() {
                                 lightboxPopup.visible = false;
diff --git a/libraries/networking/src/NetworkingConstants.h b/libraries/networking/src/NetworkingConstants.h
index 58cefb35ad..b64a0845ac 100644
--- a/libraries/networking/src/NetworkingConstants.h
+++ b/libraries/networking/src/NetworkingConstants.h
@@ -72,7 +72,7 @@ namespace NetworkingConstants {
     const QUrl HELP_FORUM_URL { "https://forums.vircadia.dev" };
     const QUrl HELP_SCRIPTING_REFERENCE_URL{ "https://apidocs.vircadia.dev/" };
     const QUrl HELP_RELEASE_NOTES_URL{ "https://docs.vircadia.dev/release-notes.html" };
-    const QUrl HELP_BUG_REPORT_URL{ "https://github.com/kasenvr/project-athena/issues" };
+    const QUrl HELP_BUG_REPORT_URL{ "https://github.com/vircadia/vircadia/issues" };
     
     const QString DEFAULT_VIRCADIA_ADDRESS = "file:///~/serverless/tutorial.json";
     const QString DEFAULT_HOME_ADDRESS = "file:///~/serverless/tutorial.json";
diff --git a/pkg-scripts/README b/pkg-scripts/README
index 92a9bf00d3..6eb74980d0 100644
--- a/pkg-scripts/README
+++ b/pkg-scripts/README
@@ -1,5 +1,5 @@
 Collection of scripts to create server distribution packages.  Most of these scripts assume
-use of the build script at https://github.com/kasenvr/vircadia-builder, specifically that
+use of the build script at https://github.com/vircadia/vircadia-builder, specifically that
 the following directory structure exists
 
 base folder/
diff --git a/pkg-scripts/server-control b/pkg-scripts/server-control
index c80b8da724..3ed23b7149 100644
--- a/pkg-scripts/server-control
+++ b/pkg-scripts/server-control
@@ -5,8 +5,8 @@ Maintainer: Heather Anderson <heath@odysseus.anderson.name>
 Build-Depends: debhelper (>= 10)
 Standards-Version: 4.1.2
 Homepage: https://vircadia.com
-Vcs-Git: https://github.com/kasenvr/project-athena.git
-Vcs-Browser: https://github.com/kasenvr/project-athena
+Vcs-Git: https://github.com/vircadia/vircadia.git
+Vcs-Browser: https://github.com/vircadia/vircadia
 
 Package: vircadia-server
 Architecture: any
diff --git a/pkg-scripts/vircadia-server.spec b/pkg-scripts/vircadia-server.spec
index 3e0eed896e..575ad9589e 100644
--- a/pkg-scripts/vircadia-server.spec
+++ b/pkg-scripts/vircadia-server.spec
@@ -9,7 +9,7 @@ Summary:        Vircadia metaverse platform, based on the High Fidelity Engine.
 
 License:        ASL 2.0
 URL:            https://vircadia.com
-Source0:        https://github.com/kasenvr/vircadia-builder/blob/master/vircadia-builder
+Source0:        https://github.com/vircadia/vircadia-builder/blob/master/vircadia-builder
 
 #BuildRequires:  systemd-rpm-macros
 BuildRequires:  chrpath
diff --git a/plugins/JSAPIExample/src/JSAPIExample.cpp b/plugins/JSAPIExample/src/JSAPIExample.cpp
index ed637e198b..91aa8bd32a 100644
--- a/plugins/JSAPIExample/src/JSAPIExample.cpp
+++ b/plugins/JSAPIExample/src/JSAPIExample.cpp
@@ -3,7 +3,7 @@
 //  plugins/JSAPIExample/src
 //
 //  Copyright (c) 2019-2020 humbletim (humbletim@gmail.com)
-//  Copyright (c) 2019 Kalila L. (kasenvr@gmail.com)
+//  Copyright (c) 2019 Kalila L. (somnilibertas@gmail.com)
 //
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
diff --git a/prebuild.py b/prebuild.py
index 21363bb9de..d5bed2d813 100644
--- a/prebuild.py
+++ b/prebuild.py
@@ -102,7 +102,7 @@ def parse_args():
     if True:
         args = parser.parse_args()
     else:
-        args = parser.parse_args(['--android', 'questInterface', '--build-root', 'C:/git/project-athena/android/apps/questInterface/.externalNativeBuild/cmake/debug/arm64-v8a'])
+        args = parser.parse_args(['--android', 'questInterface', '--build-root', 'C:/git/vircadia/android/apps/questInterface/.externalNativeBuild/cmake/debug/arm64-v8a'])
     return args
 
 def main():
diff --git a/scripts/system/more/more.html b/scripts/system/more/more.html
index db1f73cc85..a8bdaca913 100644
--- a/scripts/system/more/more.html
+++ b/scripts/system/more/more.html
@@ -5,8 +5,8 @@
 //  Created by Keb Helion, February 2020.
 //  Copyright 2020 Vircadia contributors.
 //
-//  App maintained in: https://github.com/kasenvr/community-apps
-//  App copied to: https://github.com/kasenvr/project-athena
+//  App maintained in: https://github.com/vircadia/community-apps
+//  App copied to: https://github.com/vircadia/vircadia
 //
 //
 //  Distributed under the Apache License, Version 2.0.
diff --git a/server-console/package.json b/server-console/package.json
index 1ceed08d4d..d5b2a0793d 100644
--- a/server-console/package.json
+++ b/server-console/package.json
@@ -13,7 +13,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/kasenvr/project-athena.git"
+    "url": "https://github.com/vircadia/vircadia.git"
   },
   "main": "src/main.js",
   "scripts": {