Merge pull request #149 from overte-org/fix/cdn_urls

Rebranding and fixing URLs, including CDN ones
2025-04-11 09:04:24 +02:00 · 2022-09-09 17:23:18 +02:00 · 2022-09-09 17:23:18 +02:00 · 702ddb30d6
commit 702ddb30d6
parent 619e36e9a9 88046506c3
269 changed files with 959 additions and 958 deletions
--- a/.github/workflows/master_build.yml
+++ b/.github/workflows/master_build.yml
@ -64,7 +64,7 @@ jobs:
          echo "PYTHON_EXEC=python3" >> $GITHUB_ENV
          echo "INSTALLER_EXT=tgz" >> $GITHUB_ENV
          echo "CMAKE_BUILD_EXTRA=-- -j$(nproc)" >> $GITHUB_ENV
-          echo "CMAKE_EXTRA=-DVIRCADIA_CPU_ARCHITECTURE=-msse3 -DBUILD_TOOLS:BOOLEAN=FALSE -DHIFI_PYTHON_EXEC:FILEPATH=$(which python3)" >> $GITHUB_ENV
+          echo "CMAKE_EXTRA=-DOVERTE_CPU_ARCHITECTURE=-msse3 -DBUILD_TOOLS:BOOLEAN=FALSE -DHIFI_PYTHON_EXEC:FILEPATH=$(which python3)" >> $GITHUB_ENV
        fi
        # Mac build variables
        if [ "${{ matrix.os }}" = "macOS-10.15" ]; then
@ -72,9 +72,9 @@ jobs:
          echo "ZIP_COMMAND=zip" >> $GITHUB_ENV
          echo "ZIP_ARGS=-r" >> $GITHUB_ENV
          echo "INSTALLER_EXT=dmg" >> $GITHUB_ENV
-          echo "CMAKE_EXTRA=-DVIRCADIA_CPU_ARCHITECTURE= -DCMAKE_OSX_SYSROOT=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED=OFF -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DOPENSSL_LIBRARIES=/usr/local/opt/openssl/lib -G Xcode" >> $GITHUB_ENV
+          echo "CMAKE_EXTRA=-DOVERTE_CPU_ARCHITECTURE= -DCMAKE_OSX_SYSROOT=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED=OFF -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DOPENSSL_LIBRARIES=/usr/local/opt/openssl/lib -G Xcode" >> $GITHUB_ENV
          echo "::set-output name=symbols_archive::${BUILD_NUMBER}-${{ matrix.build_type }}-mac-symbols.zip"
-          echo "APP_TARGET_NAME=Vircadia" >> $GITHUB_ENV
+          echo "APP_TARGET_NAME=Overte" >> $GITHUB_ENV
        fi
        # Windows build variables
        if [ "${{ matrix.os }}" = "windows-2019" ]; then
--- a/.github/workflows/pr_build.yml
+++ b/.github/workflows/pr_build.yml
@ -76,27 +76,27 @@ jobs:
          echo "CMAKE_BUILD_EXTRA=-- -j$(nproc)" >> $GITHUB_ENV
          # Variables specific to our aarch64 runner
          if [ "${{ matrix.os }}" = "self-hosted_debian-11_aarch64" ]; then
-            echo "VIRCADIA_USE_SYSTEM_QT=true" >> $GITHUB_ENV
+            echo "OVERTE_USE_SYSTEM_QT=true" >> $GITHUB_ENV
            echo "CI_WORKSPACE=${{runner.workspace}}" >> $GITHUB_ENV
            # Don't optimize builds to save build time.
-            echo "VIRCADIA_OPTIMIZE=false" >> $GITHUB_ENV
+            echo "OVERTE_OPTIMIZE=false" >> $GITHUB_ENV
          fi

          if [[ "${{ matrix.os }}" = *"aarch64" ]]; then
            echo "VCPKG_FORCE_SYSTEM_BINARIES=true" >> $GITHUB_ENV
            if [ "${{ matrix.build_type }}" = "full" ]; then
-              echo "CMAKE_EXTRA=-DVIRCADIA_CPU_ARCHITECTURE= -DBUILD_TOOLS:BOOLEAN=FALSE -DHIFI_PYTHON_EXEC:FILEPATH=$(which python3)" >> $GITHUB_ENV
+              echo "CMAKE_EXTRA=-DOVERTE_CPU_ARCHITECTURE= -DBUILD_TOOLS:BOOLEAN=FALSE -DHIFI_PYTHON_EXEC:FILEPATH=$(which python3)" >> $GITHUB_ENV
            else
-              echo "CMAKE_EXTRA=-DVIRCADIA_CPU_ARCHITECTURE= -DCLIENT_ONLY=1 -DBUILD_TOOLS:BOOLEAN=FALSE -DHIFI_PYTHON_EXEC:FILEPATH=$(which python3)" >> $GITHUB_ENV
+              echo "CMAKE_EXTRA=-DOVERTE_CPU_ARCHITECTURE= -DCLIENT_ONLY=1 -DBUILD_TOOLS:BOOLEAN=FALSE -DHIFI_PYTHON_EXEC:FILEPATH=$(which python3)" >> $GITHUB_ENV
            fi

          fi

          if [[ "${{ matrix.os }}" != *"aarch64" ]]; then
            if [ "${{ matrix.build_type }}" = "full" ]; then
-              echo "CMAKE_EXTRA=-DVIRCADIA_CPU_ARCHITECTURE=-msse3 -DBUILD_TOOLS:BOOLEAN=FALSE -DHIFI_PYTHON_EXEC:FILEPATH=$(which python3)" >> $GITHUB_ENV
+              echo "CMAKE_EXTRA=-DOVERTE_CPU_ARCHITECTURE=-msse3 -DBUILD_TOOLS:BOOLEAN=FALSE -DHIFI_PYTHON_EXEC:FILEPATH=$(which python3)" >> $GITHUB_ENV
            else
-              echo "CMAKE_EXTRA=-DVIRCADIA_CPU_ARCHITECTURE=-msse3 -DCLIENT_ONLY=1 -DBUILD_TOOLS:BOOLEAN=FALSE -DHIFI_PYTHON_EXEC:FILEPATH=$(which python3)" >> $GITHUB_ENV
+              echo "CMAKE_EXTRA=-DOVERTE_CPU_ARCHITECTURE=-msse3 -DCLIENT_ONLY=1 -DBUILD_TOOLS:BOOLEAN=FALSE -DHIFI_PYTHON_EXEC:FILEPATH=$(which python3)" >> $GITHUB_ENV
            fi
          fi
        fi
@ -106,11 +106,11 @@ jobs:
          echo "PYTHON_EXEC=python3" >> $GITHUB_ENV
          echo "INSTALLER_EXT=dmg" >> $GITHUB_ENV
          if [ "${{ matrix.build_type }}" = "full" ]; then
-            echo "CMAKE_EXTRA=-DVIRCADIA_CPU_ARCHITECTURE= -DCMAKE_OSX_SYSROOT=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED=OFF -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DOPENSSL_LIBRARIES=/usr/local/opt/openssl/lib -G Xcode" >> $GITHUB_ENV
+            echo "CMAKE_EXTRA=-DOVERTE_CPU_ARCHITECTURE= -DCMAKE_OSX_SYSROOT=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED=OFF -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DOPENSSL_LIBRARIES=/usr/local/opt/openssl/lib -G Xcode" >> $GITHUB_ENV
          else
-            echo "CMAKE_EXTRA=-DVIRCADIA_CPU_ARCHITECTURE= -DCMAKE_OSX_SYSROOT=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk -DCLIENT_ONLY=1 -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED=OFF -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DOPENSSL_LIBRARIES=/usr/local/opt/openssl/lib -G Xcode" >> $GITHUB_ENV
+            echo "CMAKE_EXTRA=-DOVERTE_CPU_ARCHITECTURE= -DCMAKE_OSX_SYSROOT=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk -DCLIENT_ONLY=1 -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED=OFF -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DOPENSSL_LIBRARIES=/usr/local/opt/openssl/lib -G Xcode" >> $GITHUB_ENV
          fi
-          echo "APP_TARGET_NAME=Vircadia" >> $GITHUB_ENV
+          echo "APP_TARGET_NAME=Overte" >> $GITHUB_ENV
        fi
        # Windows build variables
        if [ "${{ matrix.os }}" = "windows-2019" ]; then
@ -226,9 +226,9 @@ jobs:
        fi

        if [ ${{ env.CI_WORKSPACE }} ]; then
-          find "$CI_WORKSPACE/vircadia-files/vcpkg" -name '*log' -type f -print0 | $TAR --null --force-local -T - -c --xz -v -f "${{ runner.workspace }}/cmake-logs-${{ matrix.os }}-${{ github.event.number }}.tar.xz"
+          find "$CI_WORKSPACE/overte-files/vcpkg" -name '*log' -type f -print0 | $TAR --null --force-local -T - -c --xz -v -f "${{ runner.workspace }}/cmake-logs-${{ matrix.os }}-${{ github.event.number }}.tar.xz"
        else
-          find "$HOME/vircadia-files/vcpkg" -name '*log' -type f -print0 | $TAR --null --force-local -T - -c --xz -v -f "${{ runner.workspace }}/cmake-logs-${{ matrix.os }}-${{ github.event.number }}.tar.xz"
+          find "$HOME/overte-files/vcpkg" -name '*log' -type f -print0 | $TAR --null --force-local -T - -c --xz -v -f "${{ runner.workspace }}/cmake-logs-${{ matrix.os }}-${{ github.event.number }}.tar.xz"
        fi

    - name: Archive cmake logs
--- a/BUILD.md
+++ b/BUILD.md
@ -128,7 +128,7 @@ PRODUCTION_BUILD=0|1
 PR_BUILD=0|1
 STABLE_BUILD=0|1

-// Determine if to utilize testing or stable Metaverse URLs
+// Determine if to utilize testing or stable directory services URLs
 USE_STABLE_GLOBAL_SERVICES=1
 BUILD_GLOBAL_SERVICES=STABLE
 ```
@ -194,8 +194,8 @@ The following build options can be used when running CMake

 ### Optimization build options

-* VIRCADIA_OPTIMIZE - This variable defaults to 1 if not set and enables compiler optimization flags on Linux and MacOS. Setting it to 0 will result in unoptimized build.
-* VIRCADIA_CPU_ARCHITECTURE - This variable contains architecture specific compiler flags which are used if `VIRCADIA_OPTIMIZE` is true. If it is not set, it defaults to `-march=native -mtune=native`, which helps yield more performance for locally used build, but for packaging it needs to be set to different value for portability, for example `-msse3`. Setting `VIRCADIA_CPU_ARCHITECTURE` to empty string will use default compiler settings and yield
+* OVERTE_OPTIMIZE - This variable defaults to 1 if not set and enables compiler optimization flags on Linux and MacOS. Setting it to 0 will result in unoptimized build.
+* OVERTE_CPU_ARCHITECTURE - This variable contains architecture specific compiler flags which are used if `OVERTE_OPTIMIZE` is true. If it is not set, it defaults to `-march=native -mtune=native`, which helps yield more performance for locally used build, but for packaging it needs to be set to different value for portability, for example `-msse3`. Setting `OVERTE_CPU_ARCHITECTURE` to empty string will use default compiler settings and yield
 maximum compatibility.


--- a/BUILD_ANDROID.md
+++ b/BUILD_ANDROID.md
@ -36,7 +36,7 @@ If Android Studio pops open the "Plugin Update Recommeded" dialog, do not click
 ## Environment

 ### Create a keystore in Android Studio
-Follow the directions [here](https://developer.android.com/studio/publish/app-signing#generate-key) to create a keystore file. You can save it anywhere (preferably not in the `vircadia` folder).
+Follow the directions [here](https://developer.android.com/studio/publish/app-signing#generate-key) to create a keystore file. You can save it anywhere (preferably not in the `overte` folder).

 ### Set up machine specific Gradle properties

@ -87,12 +87,12 @@ SUPPRESS_QUEST_FRAME_PLAYER

 * Open Android Studio
 * Choose _Open an existing Android Studio project_
-* Navigate to the `vircadia` repository that had you cloned and choose the `android` folder and select _OK_
+* Navigate to the `overte` repository that had you cloned and choose the `android` folder and select _OK_
 * Wait for Gradle to sync (this should take around 20 minutes the first time)
 * If a dialog pops open saying "Plugin Update Recommeded" dialog, do not click update, just click X on the top right to close.
 * In the _Project_ window click on the project you wish to build (i.e. "questInterface") then click _Build_ in the top menu and choose _Make Module 'questInterface'_
 * By default this will build the "debug" apk, you can change this by opening the _Build Variants_ window along the left side and select other build types such as "release".
-* Your newly build APK should reside in `vircadia\android\apps\questInterface\release` (if you chose release).
+* Your newly build APK should reside in `overte\android\apps\questInterface\release` (if you chose release).

 ### Running a Module

@ -140,7 +140,7 @@ With your start menu, search for 'Edit the System Environment Variables' and ope

 Some things you can try if you want to do a clean build
 
-* Delete the `build` and `.externalNativeBuild` folders from the folder for each module you're building (for example, `vircadia/android/apps/interface`)
+* Delete the `build` and `.externalNativeBuild` folders from the folder for each module you're building (for example, `overte/android/apps/interface`)
 * If you have set your `HIFI_VCPKG_ROOT` environment variable, delete the contents of that directory; otherwise, delete `AppData/Local/Temp/hifi`
 * In Android Studio, click _File > Invalidate Caches / Restart_ and select _Invalidate and Restart_

--- a/BUILD_LINUX.md
+++ b/BUILD_LINUX.md
@ -101,19 +101,19 @@ git tag
 ### Using a custom Qt build

 Qt binaries are only provided for Ubuntu. In order to build on other distributions, a Qt5 install
-needs to be provided by setting the `VIRCADIA_QT_PATH` environment variable to a directory containing
+needs to be provided by setting the `OVERTE_QT_PATH` environment variable to a directory containing
 a Qt install.

 ### Using the system's Qt

 The system's Qt can be used, if the development packages are installed, by setting the
-`VIRCADIA_USE_SYSTEM_QT` environment variable. The minimum recommended version is Qt 5.15.2, which is
+`OVERTE_USE_SYSTEM_QT` environment variable. The minimum recommended version is Qt 5.15.2, which is
 also the last version available in the Qt 5 branch. It is expected that Linux distributions will have
 Qt 5.15.2 available for a long time.

 ### Architecture support

-If the build is intended to be packaged for distribution, the `VIRCADIA_CPU_ARCHITECTURE`
+If the build is intended to be packaged for distribution, the `OVERTE_CPU_ARCHITECTURE`
 CMake variable needs to be set to an architecture specific value.

 By default, it is set to `-march=native -mtune=native`, which yields builds optimized for a particular
@ -121,7 +121,7 @@ machine, but these builds will not work on machines lacking same CPU instruction

 For packaging, it is recommended to set it to a different value, for example `-msse3`. This will help ensure that the build will run on all reasonably modern CPUs.

-Setting `VIRCADIA_CPU_ARCHITECTURE` to an empty string will use the default compiler settings and yield maximum compatibility.
+Setting `OVERTE_CPU_ARCHITECTURE` to an empty string will use the default compiler settings and yield maximum compatibility.

 ### Compiling

@ -137,7 +137,7 @@ Prepare makefiles:
 cmake ..
 ```

-If cmake fails with a vcpkg error, then delete `~/vircadia-files/vcpkg/`.  
+If cmake fails with a vcpkg error, then delete `~/overte-files/vcpkg/`.  

 #### Server

@ -190,4 +190,4 @@ Go to "localhost" in the running Interface to visit your newly launched Domain s
 If your goal is to set up a development environment, it is desirable to set the directory that vcpkg builds into with the `HIFI_VCPKG_BASE` environment variable.
 For example, you might set `HIFI_VCPKG_BASE` to `/home/$USER/vcpkg`.

-By default, vcpkg will build in the `~/vircadia-files/vcpkg/` directory.
+By default, vcpkg will build in the `~/overte-files/vcpkg/` directory.
--- a/BUILD_OSX.md
+++ b/BUILD_OSX.md
@ -48,7 +48,7 @@ sudo xcode-select --switch /Applications/Xcode.app/Contents/Developer
 cmake ../ -DCMAKE_OSX_SYSROOT="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk" -DCMAKE_OSX_DEPLOYMENT_TARGET=10.12 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -G Xcode -DOSX_SDK=10.12  ..
 ```

-After running CMake, you will have the make files or Xcode project file necessary to build all of the components. Open the `vircadia.xcodeproj` file, choose `ALL_BUILD` from the Product > Scheme menu (or target drop down), and click Run.
+After running CMake, you will have the make files or Xcode project file necessary to build all of the components. Open the `overte.xcodeproj` file, choose `ALL_BUILD` from the Product > Scheme menu (or target drop down), and click Run.

 If the build completes successfully, you will have built targets for all components located in the `build/${target_name}/Debug` directories.

@ -66,7 +66,7 @@ To package the installation, you can simply run `make package` afterwards.

 ## Architecture Support

-If the build is intended to be packaged for distribution, the `VIRCADIA_CPU_ARCHITECTURE`
+If the build is intended to be packaged for distribution, the `OVERTE_CPU_ARCHITECTURE`
 CMake variable needs to be set to an architecture specific value.

 By default, it is set to `-march=native -mtune=native`, which yields builds optimized for a particular
@ -74,7 +74,7 @@ machine, but these builds will not work on machines lacking same CPU instruction

 For packaging, it is recommended to set it to a different value, for example `-msse3`. This will help ensure that the build will run on all reasonably modern CPUs.

-Setting `VIRCADIA_CPU_ARCHITECTURE` to an empty string will use the default compiler settings and yield
+Setting `OVERTE_CPU_ARCHITECTURE` to an empty string will use the default compiler settings and yield
 maximum compatibility.

 ## FAQ
--- a/BUILD_WIN.md
+++ b/BUILD_WIN.md
@ -89,18 +89,18 @@ To create this variable:
 ## Step 7. Running CMake to Generate Build Files

 Run Command Prompt from Start and run the following commands:
-`cd "%VIRCADIA_DIR%"`
+`cd "%OVERTE_DIR%"`
 `mkdir build`
 `cd build`

 ### Visual Studio 2019
 Run `cmake .. -G "Visual Studio 16 2019" -A x64`.

-Where `%VIRCADIA_DIR%` is the directory for the Overte repository.
+Where `%OVERTE_DIR%` is the directory for the Overte repository.

 ## Step 8. Making a Build

-Open `%VIRCADIA_DIR%\build\vircadia.sln` using Visual Studio.
+Open `%OVERTE_DIR%\build\overte.sln` using Visual Studio.

 Change the Solution Configuration (menu ribbon under the menu bar, next to the green play button) from "Debug" to "Release" for best performance.

@ -118,7 +118,7 @@ In Visual Studio, right-click "interface" under the Apps folder in Solution Expl

 Now, you should have a full build of Overte and be able to run the Interface using Visual Studio.

-Note: You can also run Interface by launching it from command line or File Explorer from `%VIRCADIA_DIR%\build\interface\Release\interface.exe`
+Note: You can also run Interface by launching it from command line or File Explorer from `%OVERTE_DIR%\build\interface\Release\interface.exe`

 # Troubleshooting

@ -130,8 +130,8 @@ For any problems after Step #7, first try this:

 ## CMake gives you the same error message repeatedly after the build fails

-Remove `CMakeCache.txt` found in the `%VIRCADIA_DIR%\build` directory.
+Remove `CMakeCache.txt` found in the `%OVERTE_DIR%\build` directory.

 ## CMake can't find OpenSSL

-Remove `CMakeCache.txt` found in the `%VIRCADIA_DIR%\build` directory.  Verify that your HIFI_VCPKG_BASE environment variable is set and pointing to the correct location. Verify that the file `${HIFI_VCPKG_BASE}/installed/x64-windows/include/openssl/ssl.h` exists.
+Remove `CMakeCache.txt` found in the `%OVERTE_DIR%\build` directory.  Verify that your HIFI_VCPKG_BASE environment variable is set and pointing to the correct location. Verify that the file `${HIFI_VCPKG_BASE}/installed/x64-windows/include/openssl/ssl.h` exists.
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -74,62 +74,62 @@ if ((NOT "${RELEASE_TYPE}" STREQUAL "PRODUCTION") AND (NOT "${RELEASE_TYPE}" STR
    set(RELEASE_TYPE "DEV")
 endif()

-# VIRCADIA_OPTIMIZE
+# OVERTE_OPTIMIZE
 # Variable determining Overte optimization. If not set, it defaults to true.
 # It's used to determine build flags for main codebase and for VCPKG dependencies.
 # Should be set to false to get completely unoptimized build for easier line-by-line debugging

 if( NOT WIN32 )
-    if(NOT DEFINED VIRCADIA_OPTIMIZE)
+    if(NOT DEFINED OVERTE_OPTIMIZE)
        message("Enabling code optimization for Overte and compiled dependencies")
-        set(VIRCADIA_OPTIMIZE true CACHE BOOL "Enable code optimization for Overte and compiled dependencies")
+        set(OVERTE_OPTIMIZE true CACHE BOOL "Enable code optimization for Overte and compiled dependencies")
    endif()

    #compiler needs to be detected before building VCPKG dependencies
    set(CMAKE_PLATFORM_INFO_DIR "${CMAKE_CURRENT_BINARY_DIR}")
    include(CMakeDetermineCXXCompiler)

-    set(VIRCADIA_OPTIMIZE_FLAGS "")
+    set(OVERTE_OPTIMIZE_FLAGS "")

-    if(VIRCADIA_OPTIMIZE)
+    if(OVERTE_OPTIMIZE)

-        file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/_env/VIRCADIA_OPTIMIZE.txt" "${VIRCADIA_OPTIMIZE}")
+        file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/_env/OVERTE_OPTIMIZE.txt" "${OVERTE_OPTIMIZE}")
        if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
            message("Clang compiler detected, adding -O3 -fPIC -g flags")
-            set(VIRCADIA_OPTIMIZE_FLAGS "-O3 -fPIC -g")
+            set(OVERTE_OPTIMIZE_FLAGS "-O3 -fPIC -g")
        elseif (CMAKE_CXX_COMPILER_ID MATCHES "GNU")
            message("GCC compiler detected, adding -O3 -fPIC -ggdb flags")
-            set(VIRCADIA_OPTIMIZE_FLAGS "-O3 -fPIC -ggdb")
+            set(OVERTE_OPTIMIZE_FLAGS "-O3 -fPIC -ggdb")
        else()
            message("No predefined optimization flags for compiler ${CMAKE_CXX_COMPILER_ID}")
        endif()
    endif()
-    MESSAGE(STATUS "VIRCADIA_OPTIMIZE: ${VIRCADIA_OPTIMIZE}")
+    MESSAGE(STATUS "OVERTE_OPTIMIZE: ${OVERTE_OPTIMIZE}")

-    # VIRCADIA_CPU_ARCHITECTURE
+    # OVERTE_CPU_ARCHITECTURE
    # Variable determining CPU architecture for which Overte will be built.
    # If defined, it's appended to CXXFLAGS and CFLAGS for both Overte and VCPKG dependencies

    #Assume -march=native for compilers that allow it if architecture is not specified
-    if(NOT DEFINED VIRCADIA_CPU_ARCHITECTURE)
-        if(VIRCADIA_OPTIMIZE AND ( (CMAKE_CXX_COMPILER_ID MATCHES "Clang") OR (CMAKE_CXX_COMPILER_ID MATCHES "GNU") ) )
+    if(NOT DEFINED OVERTE_CPU_ARCHITECTURE)
+        if(OVERTE_OPTIMIZE AND ( (CMAKE_CXX_COMPILER_ID MATCHES "Clang") OR (CMAKE_CXX_COMPILER_ID MATCHES "GNU") ) )
            message("Optimization is enabled, but architecture is not specified. Assuming native build")
-            set(VIRCADIA_CPU_ARCHITECTURE "-march=native -mtune=native" CACHE STRING "Specify architecture dependent compiler flags here")
+            set(OVERTE_CPU_ARCHITECTURE "-march=native -mtune=native" CACHE STRING "Specify architecture dependent compiler flags here")
        endif()
    endif()

-    if(DEFINED VIRCADIA_CPU_ARCHITECTURE)
-        file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/_env/VIRCADIA_CPU_ARCHITECTURE.txt" "${VIRCADIA_CPU_ARCHITECTURE}")
-        set(VIRCADIA_OPTIMIZE_FLAGS "${VIRCADIA_OPTIMIZE_FLAGS} ${VIRCADIA_CPU_ARCHITECTURE}")
-        message("Adding CPU architecture flags: ${VIRCADIA_CPU_ARCHITECTURE}")
-        MESSAGE(STATUS "VIRCADIA_CPU_ARCHITECTURE: ${VIRCADIA_CPU_ARCHITECTURE}")
+    if(DEFINED OVERTE_CPU_ARCHITECTURE)
+        file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/_env/OVERTE_CPU_ARCHITECTURE.txt" "${OVERTE_CPU_ARCHITECTURE}")
+        set(OVERTE_OPTIMIZE_FLAGS "${OVERTE_OPTIMIZE_FLAGS} ${OVERTE_CPU_ARCHITECTURE}")
+        message("Adding CPU architecture flags: ${OVERTE_CPU_ARCHITECTURE}")
+        MESSAGE(STATUS "OVERTE_CPU_ARCHITECTURE: ${OVERTE_CPU_ARCHITECTURE}")
    endif()

-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${VIRCADIA_OPTIMIZE_FLAGS}")
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${VIRCADIA_OPTIMIZE_FLAGS}")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OVERTE_OPTIMIZE_FLAGS}")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OVERTE_OPTIMIZE_FLAGS}")

-    set(ENV{CXXFLAGS} "$ENV{CXXFLAGS} ${VIRCADIA_OPTIMIZE_FLAGS}")
-    set(ENV{CFLAGS} "$ENV{CFLAGS} ${VIRCADIA_OPTIMIZE_FLAGS}")
+    set(ENV{CXXFLAGS} "$ENV{CXXFLAGS} ${OVERTE_OPTIMIZE_FLAGS}")
+    set(ENV{CFLAGS} "$ENV{CFLAGS} ${OVERTE_OPTIMIZE_FLAGS}")
    message($ENV{CXXFLAGS})
 endif()

@ -207,7 +207,7 @@ include("${CMAKE_BINARY_DIR}/vcpkg.cmake")
 if (HIFI_ANDROID)
  set(QT_CMAKE_PREFIX_PATH "$ENV{HIFI_ANDROID_PRECOMPILED}/qt/lib/cmake")
 else()
-  if ("$ENV{VIRCADIA_USE_SYSTEM_QT}" STREQUAL "")
+  if ("$ENV{OVERTE_USE_SYSTEM_QT}" STREQUAL "")
     if(NOT EXISTS "${CMAKE_BINARY_DIR}/qt.cmake")
        message(FATAL_ERROR "qt configuration missing.")
    endif()
@ -220,7 +220,7 @@ endif()

 option(VCPKG_APPLOCAL_DEPS OFF)

-project(vircadia)
+project(overte)
 include("cmake/init.cmake")
 include("cmake/compiler.cmake")
 option(VCPKG_APPLOCAL_DEPS OFF)
@ -391,20 +391,20 @@ GroupSources("unpublishedScripts")
 unset(JS_SRC)

 # Include Overte Web app files if cloned into a subdirectory.
-if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/vircadia-web")
-    file(GLOB_RECURSE WEB_APP_SRC vircadia-web/*.*)
-    list(FILTER WEB_APP_SRC EXCLUDE REGEX "vircadia-web/(dist|node_modules|public)/*" )
-    add_custom_target(vircadia-web SOURCES ${WEB_APP_SRC})
-    GroupSources("vircadia-web")
+if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/overte-web")
+    file(GLOB_RECURSE WEB_APP_SRC overte-web/*.*)
+    list(FILTER WEB_APP_SRC EXCLUDE REGEX "overte-web/(dist|node_modules|public)/*" )
+    overte(overte-web SOURCES ${WEB_APP_SRC})
+    GroupSources("overte-web")
    unset(WEB_APP_SRC)
 endif()

 # Include Overte Web SDK files if cloned into a subdirectory.
-if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/vircadia-web-sdk")
-    file(GLOB_RECURSE WEB_SDK_SRC vircadia-web-sdk/*.*)
-    list(FILTER WEB_SDK_SRC EXCLUDE REGEX "vircadia-web-sdk/(dist|node_modules|public)/*" )
-    add_custom_target(vircadia-web-sdk SOURCES ${WEB_SDK_SRC})
-    GroupSources("vircadia-web-sdk")
+if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/overte-web-sdk")
+    file(GLOB_RECURSE WEB_SDK_SRC overte-web-sdk/*.*)
+    list(FILTER WEB_SDK_SRC EXCLUDE REGEX "overte-web-sdk/(dist|node_modules|public)/*" )
+    add_custom_target(overte-web-sdk SOURCES ${WEB_SDK_SRC})
+    GroupSources("overte-web-sdk")
    unset(WEB_SDK_SRC)
 endif()

@ -413,7 +413,7 @@ set_packaging_parameters()
 # Locate the required Qt build on the filesystem
 setup_qt()

-if ("$ENV{VIRCADIA_USE_SYSTEM_QT}" STREQUAL "")
+if ("$ENV{OVERTE_USE_SYSTEM_QT}" STREQUAL "")
  list(APPEND CMAKE_PREFIX_PATH "${QT_CMAKE_PREFIX_PATH}")
 endif()

@ -471,7 +471,7 @@ endif()
 if (BUILD_CLIENT)
  add_subdirectory(interface)
  if (APPLE)
-    set_target_properties(Vircadia PROPERTIES FOLDER "Apps")
+    set_target_properties(Overte PROPERTIES FOLDER "Apps")
  else()
    set_target_properties(interface PROPERTIES FOLDER "Apps")
  endif()
--- a/INSTALLER.md
+++ b/INSTALLER.md
@ -70,7 +70,7 @@ For code signing to work, you will need to set the `HF_PFX_FILE` and `HF_PFX_PAS
 #### Creating the Installer
    
 1.  Perform a clean cmake from a new terminal.
-1.  Open the `vircadia.sln` solution with elevated (administrator) permissions on Visual Studio and select the **Release** configuration.
+1.  Open the `overte.sln` solution with elevated (administrator) permissions on Visual Studio and select the **Release** configuration.
 1.  Build the solution.
 1.  Build `packaged-server-console-npm-install` (found under **hidden/Server Console**)
 1.  Build `packaged-server-console` (found under **Server Console**)  
@ -140,7 +140,7 @@ rm -rf *
 ```
 Add `PRODUCTION_BUILD=1` to below command for release and release candidate builds.
 ```bash
-VIRCADIA_USE_SYSTEM_QT=true cmake .. -DVIRCADIA_CPU_ARCHITECTURE=-msse3 -DVCPKG_BUILD_TYPE=release -DSERVER_ONLY=true -DBUILD_TOOLS=true
+OVERTE_USE_SYSTEM_QT=true cmake .. -DOVERTE_CPU_ARCHITECTURE=-msse3 -DVCPKG_BUILD_TYPE=release -DSERVER_ONLY=true -DBUILD_TOOLS=true
 ```

 4. Build
@ -179,7 +179,7 @@ rm -rf *
 ```
 Add `PRODUCTION_BUILD=1` to below command for release and release candidate builds.
 ```bash
-VIRCADIA_USE_SYSTEM_QT=true cmake .. -DVIRCADIA_CPU_ARCHITECTURE=-msse3 -DVCPKG_BUILD_TYPE=release -DSERVER_ONLY=true -DBUILD_TOOLS=true
+OVERTE_USE_SYSTEM_QT=true cmake .. -DOVERTE_CPU_ARCHITECTURE=-msse3 -DVCPKG_BUILD_TYPE=release -DSERVER_ONLY=true -DBUILD_TOOLS=true
 ```

 4. Build
--- a/README.md
+++ b/README.md
@ -16,10 +16,11 @@

 ### What is this?

-Overte is a 3D social software project seeking to incrementally bring about a truly free and open metaverse.
+Overte is a free and open source 3D social virtual worlds software.

 * Desktop and VR use
 * Hundreds of users simultaneously
+* Collaborative in-game creation
 * Full-body avatars
 * FBX, glTF, and OBJ support
 * JavaScript scripting engine
@ -43,33 +44,33 @@ Overte is a 3D social software project seeking to incrementally bring about a tr
 - [For Windows](https://github.com/overte-org/overte/blob/master/BUILD_WIN.md)
 - [For Mac](https://github.com/overte-org/overte/blob/master/BUILD_OSX.md)
 - [For Linux](https://github.com/overte-org/overte/blob/master/BUILD_LINUX.md)
- [For Linux - Vircadia Builder](https://github.com/overte-org/overte-builder)
+- [For Linux - Overte Builder](https://github.com/overte-org/overte-builder)

 #### How to build a Server

 - [For Windows](https://github.com/overte-org/overte/blob/master/BUILD_WIN.md)
 - [For Linux](https://github.com/overte-org/overte/blob/master/BUILD_LINUX.md)
- [For Linux - Vircadia Builder](https://github.com/overte-org/overte-builder)
+- [For Linux - Overte Builder](https://github.com/overte-org/overte-builder)

 #### How to generate an Installer

 - [For Windows - Interface & Server](https://github.com/overte-org/overte/blob/master/INSTALLER.md)
 - [For Mac - Interface](https://github.com/overte-org/overte/blob/master/INSTALLER.md#os-x)
- [For Linux - Server .deb - Vircadia Builder](INSTALLER.md#ubuntu-1804--deb)
- [For Linux - Interface AppImage - Vircadia Builder](https://github.com/overte-org/overte-builder/blob/master/README.md#building-appimages)
+- [For Linux - Server .deb - Overte Builder](INSTALLER.md#ubuntu-1804--deb)
+- [For Linux - Interface AppImage - Overte Builder](https://github.com/overte-org/overte-builder/blob/master/README.md#building-appimages)

-### Boot to Metaverse: The Goal
+### Mission statement

-Having a place to experience adventure, a place to relax with calm breath, that's a world to live in. An engine to support infinite combinations and possibilities of worlds without censorship and interruption, that's metaverse. Finding a way to make infinite realities our reality is the dream.
+Overte aims to provide social virtual worlds experience with entitely free and open source infrastructure.

-### Boot to Metaverse: The Technicals
+### Technical details

-Overte consists of many projects and codebases with its unifying structure's goal being a decentralized metaverse.
+Overte consists of many projects and codebases with its unifying structure's goal being free and open source self-hosted virtual worlds.

 - The Interface - You are here!
 - The Server - You are also here!
- [The Metaverse Server (Codename Iamus)](https://github.com/overte/Iamus/)
- [The Metaverse Server Dashboard (Codename Iamus)](https://github.com/overte/project-iamus-dashboard/)
+- [The Directory Server (Codename Iamus)](https://github.com/overte/Iamus/)
+- [The Directory Server Dashboard (Codename Iamus)](https://github.com/overte/project-iamus-dashboard/)
 - [The Launcher (Codename Pantheon)](https://github.com/overte/pantheon-launcher/) - Currently Windows only.

 #### Tools
--- a/android/build.gradle
+++ b/android/build.gradle
@ -48,7 +48,7 @@ ext {

 def appDir = new File(projectDir, 'apps/interface')
 def jniFolder = new File(appDir, 'src/main/jniLibs/arm64-v8a')
-def baseUrl = 'https://cdn-1.vircadia.com/eu-c-1/vircadia-public/dependencies/android/'
+def baseUrl = 'https://build-deps.overte.org/dependencies/android/'
 def breakpadDumpSymsDir = new File("${appDir}/build/tmp/breakpadDumpSyms")

 task extractGvrBinaries() {
--- a/android/build_android.sh
+++ b/android/build_android.sh
@ -17,7 +17,7 @@ fi
 ANDROID_APP=interface
 ANDROID_OUTPUT_DIR=./apps/${ANDROID_APP}/build/outputs/apk/${ANDROID_BUILD_TYPE}
 ANDROID_OUTPUT_FILE=${ANDROID_APP}-${ANDROID_BUILD_TYPE}.apk
-ANDROID_APK_NAME=Vircadia-${ANDROID_APK_SUFFIX}
+ANDROID_APK_NAME=Overte-${ANDROID_APK_SUFFIX}
 ./gradlew -PHIFI_ANDROID_PRECOMPILED=${HIFI_ANDROID_PRECOMPILED} -PVERSION_CODE=${VERSION_CODE} -PRELEASE_NUMBER=${RELEASE_NUMBER} -PRELEASE_TYPE=${RELEASE_TYPE} ${ANDROID_APP}:${ANDROID_BUILD_TARGET}
 cp ${ANDROID_OUTPUT_DIR}/${ANDROID_OUTPUT_FILE} ./${ANDROID_APK_NAME}

@ -25,7 +25,7 @@ cp ${ANDROID_OUTPUT_DIR}/${ANDROID_OUTPUT_FILE} ./${ANDROID_APK_NAME}
 ANDROID_APP=questInterface
 ANDROID_OUTPUT_DIR=./apps/${ANDROID_APP}/build/outputs/apk/${ANDROID_BUILD_TYPE}
 ANDROID_OUTPUT_FILE=${ANDROID_APP}-${ANDROID_BUILD_TYPE}.apk
-ANDROID_APK_NAME=Vircadia-Quest-Alpha-${ANDROID_APK_SUFFIX}
+ANDROID_APK_NAME=Overte-Quest-Alpha-${ANDROID_APK_SUFFIX}
 ./gradlew -PHIFI_ANDROID_PRECOMPILED=${HIFI_ANDROID_PRECOMPILED} -PVERSION_CODE=${VERSION_CODE} -PRELEASE_NUMBER=${RELEASE_NUMBER} -PRELEASE_TYPE=${RELEASE_TYPE} ${ANDROID_APP}:${ANDROID_BUILD_TARGET} || true
 cp ${ANDROID_OUTPUT_DIR}/${ANDROID_OUTPUT_FILE} ./${ANDROID_APK_NAME}

--- a/android/containerized_build.sh
+++ b/android/containerized_build.sh
@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -xeuo pipefail

-DOCKER_IMAGE_NAME="vircadia_androidbuild"
+DOCKER_IMAGE_NAME="overte_androidbuild"

 docker build --build-arg BUILD_UID=`id -u` -t "${DOCKER_IMAGE_NAME}" -f ./android/docker/Dockerfile ./android/docker

@ -17,7 +17,7 @@ test -z "$STABLE_BUILD" && export STABLE_BUILD=0
 docker run \
   --rm \
   --security-opt seccomp:unconfined \
-   -v "${WORKSPACE}":/home/gha/vircadia \
+   -v "${WORKSPACE}":/home/gha/overte \
   -e RELEASE_NUMBER \
   -e RELEASE_TYPE \
   -e ANDROID_APP \
--- a/android/docker/Dockerfile
+++ b/android/docker/Dockerfile
@ -62,8 +62,8 @@ RUN echo "gha ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
 USER gha
 WORKDIR /home/gha

-# Vircadia dependencies
-ENV HIFI_BASE="/home/gha/vircadia_android"
+# Overte dependencies
+ENV HIFI_BASE="/home/gha/overte_android"
 ENV HIFI_ANDROID_PRECOMPILED="$HIFI_BASE/dependencies"    
 ENV HIFI_VCPKG_BASE="$HIFI_BASE/vcpkg"

@ -72,17 +72,17 @@ RUN mkdir "$HIFI_BASE" && \
    mkdir "$HIFI_ANDROID_PRECOMPILED"

 # Download the repo
-RUN git clone https://github.com/vircadia/vircadia.git
+RUN git clone https://github.com/overte-org/overte.git

-WORKDIR /home/gha/vircadia
+WORKDIR /home/gha/overte

 RUN mkdir build

 # Pre-cache the vcpkg managed dependencies
-WORKDIR /home/gha/vircadia/build
+WORKDIR /home/gha/overte/build
 RUN python3 ../prebuild.py --build-root `pwd` --android interface

 # Pre-cache the gradle dependencies
-WORKDIR /home/gha/vircadia/android
+WORKDIR /home/gha/overte/android
 RUN ./gradlew -m tasks -PHIFI_ANDROID_PRECOMPILED=$HIFI_ANDROID_PRECOMPILED
 #RUN ./gradlew extractDependencies -PHIFI_ANDROID_PRECOMPILED=$HIFI_ANDROID_PRECOMPILED 
--- a/android/setupGVR.gradle
+++ b/android/setupGVR.gradle
@ -11,7 +11,7 @@ buildscript {


 def file='gvrsdk_v1.101.0.tgz'
-def url='https://cdn-1.vircadia.com/eu-c-1/vircadia-public/austin/android/' + file
+def url='https://build-deps.overte.org/dependencies/android/' + file
 def destFile = new File(HIFI_ANDROID_PRECOMPILED, file)

 // FIXME find a way to only download if the file doesn't exist
--- a/assignment-client/src/avatars/MixerAvatar.cpp
+++ b/assignment-client/src/avatars/MixerAvatar.cpp
@ -230,7 +230,7 @@ void MixerAvatar::ownerRequestComplete() {
 }

 void MixerAvatar::requestCurrentOwnership() {
-    // Get registered owner's public key from metaverse.
+    // Get registered owner's public key from directory server.
    static const QString POP_MARKETPLACE_API { "/api/v1/commerce/proof_of_purchase_status/transfer" };
    auto& networkAccessManager = NetworkAccessManager::getInstance();
    QNetworkRequest networkRequest;
--- a/assignment-client/src/avatars/ScriptableAvatar.cpp
+++ b/assignment-client/src/avatars/ScriptableAvatar.cpp
@ -222,7 +222,7 @@ void ScriptableAvatar::updateJointMappings() {
        QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
        QNetworkRequest networkRequest = QNetworkRequest(_skeletonModelURL);
        networkRequest.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
-        networkRequest.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::VIRCADIA_USER_AGENT);
+        networkRequest.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::OVERTE_USER_AGENT);
        DependencyManager::get<ResourceRequestObserver>()->update(
            _skeletonModelURL, -1, "AvatarData::updateJointMappings");
        QNetworkReply* networkReply = networkAccessManager.get(networkRequest);
--- a/cmake/macros/MemoryDebugger.cmake
+++ b/cmake/macros/MemoryDebugger.cmake
@ -8,15 +8,15 @@
 #

 macro(SETUP_MEMORY_DEBUGGER)
-if ("$ENV{VIRCADIA_MEMORY_DEBUGGING}")
-  if (VIRCADIA_THREAD_DEBUGGING)
+if ("$ENV{OVERTE_MEMORY_DEBUGGING}")
+  if (OVERTE_THREAD_DEBUGGING)
    message(FATAL_ERROR "Thread debugging and memory debugging can't be enabled at the same time." )
  endif()

-  SET( VIRCADIA_MEMORY_DEBUGGING true )
+  SET( OVERTE_MEMORY_DEBUGGING true )
 endif ()

-if (VIRCADIA_MEMORY_DEBUGGING)
+if (OVERTE_MEMORY_DEBUGGING)
  if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-omit-frame-pointer -fsanitize=undefined -fsanitize=address -fsanitize-recover=address")
    SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=undefined -fsanitize=address -fsanitize-recover=address")
--- a/cmake/macros/SetPackagingParameters.cmake
+++ b/cmake/macros/SetPackagingParameters.cmake
@ -39,7 +39,7 @@ macro(SET_PACKAGING_PARAMETERS)
  set(SERVER_COMPONENT server)

  if (APPLE)
-    set(INTERFACE_BUNDLE_NAME "Vircadia")
+    set(INTERFACE_BUNDLE_NAME "Overte")
  else()
    set(INTERFACE_BUNDLE_NAME "interface")
  endif()
@ -188,7 +188,7 @@ macro(SET_PACKAGING_PARAMETERS)
      set(INTERFACE_SHORTCUT_NAME "Overte")
      set(CONSOLE_SHORTCUT_NAME "Console")
      set(SANDBOX_SHORTCUT_NAME "Server")
-      set(APP_USER_MODEL_ID "com.vircadia.console")
+      set(APP_USER_MODEL_ID "org.overte.console")
    else ()
      set(INTERFACE_SHORTCUT_NAME "Overte - ${BUILD_VERSION_NO_SHA}")
      set(CONSOLE_SHORTCUT_NAME "Console - ${BUILD_VERSION_NO_SHA}")
--- a/cmake/macros/SetupHifiClientServerPlugin.cmake
+++ b/cmake/macros/SetupHifiClientServerPlugin.cmake
@ -12,7 +12,7 @@ macro(SETUP_HIFI_CLIENT_SERVER_PLUGIN)

  if (BUILD_CLIENT)
    if (APPLE)
-      add_dependencies(Vircadia ${TARGET_NAME})
+      add_dependencies(Overte ${TARGET_NAME})
    else()
      add_dependencies(interface ${TARGET_NAME})
    endif()
--- a/cmake/macros/SetupHifiPlugin.cmake
+++ b/cmake/macros/SetupHifiPlugin.cmake
@ -10,7 +10,7 @@ macro(SETUP_HIFI_PLUGIN)
    setup_hifi_library(${ARGV})
    if (BUILD_CLIENT)
        if (APPLE)
-            add_dependencies(Vircadia ${TARGET_NAME})
+            add_dependencies(Overte ${TARGET_NAME})
        else()
            add_dependencies(interface ${TARGET_NAME})
        endif()
--- a/cmake/macros/SetupQt.cmake
+++ b/cmake/macros/SetupQt.cmake
@ -51,7 +51,7 @@ endfunction()
 # Sets the QT_CMAKE_PREFIX_PATH and QT_DIR variables
 # Also enables CMAKE_AUTOMOC and CMAKE_AUTORCC
 macro(setup_qt)
-    if ($ENV{VIRCADIA_USE_SYSTEM_QT})
+    if ($ENV{OVERTE_USE_SYSTEM_QT})
        message(STATUS "Using system Qt")
    else()
        # if we are in a development build and QT_CMAKE_PREFIX_PATH is specified
--- a/cmake/macros/ThreadDebugger.cmake
+++ b/cmake/macros/ThreadDebugger.cmake
@ -8,15 +8,15 @@
 #

 macro(SETUP_THREAD_DEBUGGER)
-if ("$ENV{VIRCADIA_THREAD_DEBUGGING}")
-  if (VIRCADIA_MEMORY_DEBUGGING )
+if ("$ENV{OVERTE_THREAD_DEBUGGING}")
+  if (OVERTE_MEMORY_DEBUGGING )
    message(FATAL_ERROR "Thread debugging and memory debugging can't be enabled at the same time." )
  endif ()

-  SET(VIRCADIA_THREAD_DEBUGGING true)
+  SET(OVERTE_THREAD_DEBUGGING true)
 endif ()

-if (VIRCADIA_THREAD_DEBUGGING)
+if (OVERTE_THREAD_DEBUGGING)
  if (UNIX)
    if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
        # for clang on Linux
--- a/cmake/ports/draco/portfile.cmake
+++ b/cmake/ports/draco/portfile.cmake
@ -17,7 +17,7 @@ endif()

 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
-    REPO vircadia/draco
+    REPO overte-org/draco
    REF 1.3.5-fixed
    SHA512 68bb15de013093077946d431ab1f4080b84a66d45d20873f2c0dc44aa28034fb4ec1f6e24f9300fde563da53943b73d47163b9c6acf2667312128c50c6d075bd
    HEAD_REF master
--- a/cmake/ports/etc2comp/portfile.cmake
+++ b/cmake/ports/etc2comp/portfile.cmake
@ -17,7 +17,7 @@ endif()

 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
-    REPO vircadia/etc2comp
+    REPO overte-org/etc2comp
    REF 7f1843bf07825c21cab711360c1ddbad04641036
    SHA512 d747076acda8537d39585858c793a35c3dcc9ef283d723619a47f8c81ec1454c95b3340ad35f0655a939eae5b8271c801c48a9a7568311a01903a344c44af25b
    HEAD_REF master
--- a/cmake/ports/hifi-scribe/portfile.cmake
+++ b/cmake/ports/hifi-scribe/portfile.cmake
@ -2,7 +2,7 @@ set(VCPKG_POLICY_EMPTY_PACKAGE enabled)

 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
-    REPO vircadia/scribe
+    REPO overte-org/scribe
    REF 1bd638a36ca771e5a68d01985b6389b71835cbd2
    SHA512 dbe241d86df3912e544f6b9839873f9875df54efc93822b145e7b13243eaf2e3d690bc8a28b1e52d05bdcd7e68fca6b0b2f5c43ffd0f56a9b7a50d54dcf9e31e
    HEAD_REF master
--- a/cmake/ports/webrtc/README.md
+++ b/cmake/ports/webrtc/README.md
@ -98,7 +98,7 @@ https://bugs.webrtc.org/9213#c13
  ```

 #### Exclude BoringSSL
-A separate OpenSSL VCPKG is used for building Vircadia.
+A separate OpenSSL VCPKG is used for building Overte.
 The following patches are needed even though SSL is excluded in the `gn gen` build commands.
 - Rename *third_party\boringssl* to *third_party\boringssl-NO*.
 - Edit *third_party\libsrtp\BUILD.gn:\
@ -158,9 +158,9 @@ The following patches are needed even though SSL is excluded in the `gn gen` bui
 ### Set Up OpenSSL

 Do one of the following to provide OpenSSL for building against:
-a. If you have built Vircadia, find the **HIFI_VCPKG_BASE** subdirectory used in your build and make note of the path to and 
+a. If you have built Overte, find the **HIFI_VCPKG_BASE** subdirectory used in your build and make note of the path to and 
 including the *installed\x64-windows\include* directory (which includes an *openssl* directory).
-a. Follow https://github.com/vircadia/vcpkg to install *vcpkg* and then *openssl*. Make note of the path to and including the 
+a. Follow https://github.com/overte-org/vcpkg to install *vcpkg* and then *openssl*. Make note of the path to and including the 
 *packages\openssl-windows_x64-windows\include* directory (which includes an *openssl* directory).

 Copy the *\<path\>\openssl* directory to the following locations (i.e., add as *openssl* subdirectories):
--- a/cmake/templates/BuildInfo.h.in
+++ b/cmake/templates/BuildInfo.h.in
@ -23,7 +23,7 @@ namespace BuildInfo {
    const QString DOMAIN_SERVER_NAME = "domain-server";
    const QString AC_CLIENT_SERVER_NAME = "ac-client";
    const QString MODIFIED_ORGANIZATION = "@BUILD_ORGANIZATION@";
-    const QString ORGANIZATION_DOMAIN = "vircadia.com";
+    const QString ORGANIZATION_DOMAIN = "overte.org";
    const QString VERSION = "@BUILD_VERSION@";
    const QString RELEASE_NAME = "@RELEASE_NAME@";
    const QString BUILD_NUMBER = "@BUILD_NUMBER@";
--- a/cmake/templates/NSIS.template.in
+++ b/cmake/templates/NSIS.template.in
@ -1133,7 +1133,7 @@ Function HandlePostInstallOptions
      ClearErrors

      ; copy the data from production build to this PR build
-      CopyFiles "$APPDATA\Vircadia\*" $0
+      CopyFiles "$APPDATA\Overte\*" $0

      ; handle an error in copying files
      IfErrors 0 NoError
--- a/debian/control
+++ b/debian/control
@ -4,12 +4,12 @@ Priority: optional
 Maintainer: Seth Alves <seth.alves@gmail.com>
 Build-Depends: debhelper (>= 11), cmake
 Standards-Version: 4.1.3
-Homepage: https://www.highfidelity.com/
-Vcs-Browser: https://github.com/highfidelity/hifi
-Vcs-Git: https://github.com/highfidelity/hifi.git
+Homepage: https://www.overte.org/
+Vcs-Browser: https://github.com/overte-org/overte
+Vcs-Git: https://github.com/overte-org/overte.git

 Package: hifi-interface
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libqt5quick5, libqt5quickcontrols2-5, libqt5quickwidgets5, qml-module-qtquick-controls, qml-module-qtquick-controls2, qml-module-qtquick-dialogs, libqt5webchannel5, qml-module-qtwebchannel, qml-module-qtwebengine, qml-module-qt-labs-folderlistmodel, qml-module-qt-labs-settings
-Description: High Fidelity allows creation and sharing of VR experiences.
-  The High Fidelity metaverse provides built-in social features, including avatar interactions, spatialized audio and interactive physics. Additionally, you have the ability to import any 3D object into your virtual environment.
+Description: Overte allows creation and sharing of virtual worlds experiences.
+  Overte provides built-in social features, including avatar interactions, spatialized audio and interactive physics. Additionally, you have the ability to import any 3D object into your virtual environment.
--- a/domain-server/resources/describe-settings.json
+++ b/domain-server/resources/describe-settings.json
@ -3,25 +3,25 @@
  "settings": [
    {
      "name": "metaverse",
-      "label": "Networking / Metaverse",
+      "label": "Networking / Directory Services",
      "settings": [
        {
          "name": "access_token",
          "label": "Access Token",
-          "help": "This is your OAuth access token to connect this domain-server with your Metaverse account. <br/>It can be generated by clicking the 'Connect Account' button above.<br/>You can also go to the Security page of your account on your Metaverse Server and generate a token with the 'domains' scope and paste it here.",
+          "help": "This is your OAuth access token to connect this domain-server with your Directory Services account. <br/>It can be generated by clicking the 'Connect Account' button above.<br/>You can also go to the Security page of your account on your Directory Server and generate a token with the 'domains' scope and paste it here.",
          "advanced": true,
          "backup": false
        },
        {
          "name": "id",
          "label": "Domain ID",
-          "help": "This is your Metaverse domain ID. If you do not want your domain to be registered in the Metaverse you can leave this blank.",
+          "help": "This is your Directory Services domain ID. If you do not want your domain to be registered in the Directory Services you can leave this blank.",
          "advanced": true
        },
        {
          "name": "automatic_networking",
          "label": "Automatic Networking",
-          "help": "This defines how other nodes in the Metaverse will be able to reach your domain-server.<br/>If you don't want to deal with any network settings, use full automatic networking.",
+          "help": "This defines how other users will be able to reach your domain-server.<br/>If you don't want to deal with any network settings, use full automatic networking.",
          "default": "full",
          "type": "select",
          "options": [
@ -35,7 +35,7 @@
            },
            {
              "value": "disabled",
-              "label": "None: use the network information I have entered for this domain at in the Metaverse Server."
+              "label": "None: use the network information I have entered for this domain at the Directory Server."
            }
          ]
        },
@ -50,7 +50,7 @@
        {
          "name": "enable_packet_verification",
          "label": "Enable Packet Verification",
-          "help": "Enable secure checksums on communication that uses the Metaverse protocol. Increases security with possibly a small performance penalty.",
+          "help": "Enable secure checksums on communication that uses the Directory Services protocol. Increases security with possibly a small performance penalty.",
          "default": true,
          "type": "checkbox",
          "advanced":  true
@ -66,7 +66,7 @@
        {
          "name": "metadata_exporter_port",
          "label": "Metadata Exporter HTTP Port",
-          "help": "This is the port where the Metaverse exporter accepts connections. It listens both on IPv4 and IPv6 and can be accessed remotely, so you should make sure to restrict access with a firewall as needed.",
+          "help": "This is the port where the Metadata exporter accepts connections. It listens both on IPv4 and IPv6 and can be accessed remotely, so you should make sure to restrict access with a firewall as needed.",
          "default": "9704",
          "type": "int",
          "advanced": true
@ -88,7 +88,7 @@
        {
            "name": "enable_webrtc_websocket_ssl",
            "label": "Enable WebRTC WebSocket SSL",
-            "help": "Use secure WebSocket (wss:// protocol) for WebRTC signaling channel. If \"on\", the key, cert, and CA files are expected to be in the local Overte app directory, in a /domain-server/ subdirectory with filenames vircadia-cert.key, vircadia-cert.crt, and vircadia-crt-ca.crt.",
+            "help": "Use secure WebSocket (wss:// protocol) for WebRTC signaling channel. If \"on\", the key, cert, and CA files are expected to be in the local Overte app directory, in a /domain-server/ subdirectory with filenames overte-cert.key, overte-cert.crt, and overte-crt-ca.crt.",
            "type": "checkbox",
            "default": false,
            "advanced": true
@ -182,7 +182,7 @@
      "name": "descriptors",
      "label": "Description",
      "restart": false,
-      "help": "This data will be queryable from your server. It may be collected by the Metaverse and used to share your domain with others.",
+      "help": "This data will be queryable from your server. It may be collected by the Directory Services and used to share your domain with others.",
      "settings": [
        {
          "name": "world_name",
@ -1947,7 +1947,7 @@
          "label": "Admin Roles",
          "type": "table",
          "can_add_new_rows": true,
-          "help": "Any user with any of these metaverse roles can administer the domain.",
+          "help": "Any user with any of these roles can administer the domain.",
          "numbered": false,
          "backup": false,
          "advanced": true,
--- a/domain-server/resources/web/js/shared.js
+++ b/domain-server/resources/web/js/shared.js
@ -61,7 +61,7 @@ var Strings = {

  CHOOSE_DOMAIN_BUTTON: "Choose from my domains",
  CREATE_DOMAIN_BUTTON: "Create new domain ID",
-  CREATE_DOMAIN_SUCCESS_JUST_CONNECTED: "We connnected your Metaverse account and created a new domain ID for this machine.",
+  CREATE_DOMAIN_SUCCESS_JUST_CONNECTED: "We connected your Directory Services account and created a new domain ID for this machine.",
  CREATE_DOMAIN_SUCCESS: "We created a new domain ID for this machine.",

  // When a place modification fails, they will be brought back to the previous
@ -92,7 +92,7 @@ var Strings = {
  ADD_PLACE_LOADING_DIALOG: "Loading your places...",

  ADD_PLACE_NOT_CONNECTED_TITLE: "Access token required",
-  ADD_PLACE_NOT_CONNECTED_MESSAGE: "You must have an access token to query your Metaverse places.<br><br>Please follow the instructions on the settings page to add an access token.",
+  ADD_PLACE_NOT_CONNECTED_MESSAGE: "You must have an access token to query your Directory Services places.<br><br>Please follow the instructions on the settings page to add an access token.",
 };

 var DOMAIN_ID_TYPE_NONE = 0;
@ -428,7 +428,7 @@ function chooseFromMetaversePlaces(accessToken, forcePathTo, onSuccessfullyAdded
            loadPlaces();
          } else {
            loadingDialog.modal('hide');
-            bootbox.confirm("We were not able to load your domain information from the Metaverse. Would you like to retry?", function(response) {
+            bootbox.confirm("We were not able to load your domain information from the Directory Services. Would you like to retry?", function(response) {
              if (response) {
                chooseFromMetaversePlaces(accessToken, forcePathTo, onSuccessfullyAdded);
              }
--- a/domain-server/resources/web/settings/js/settings.js
+++ b/domain-server/resources/web/settings/js/settings.js
@ -279,7 +279,7 @@ $(document).ready(function(){
            swal({
              title: '',
              type: 'error',
-              text: "There was a problem retrieving domain information from the Metaverse API.",
+              text: "There was a problem retrieving domain information from the Directory Services API.",
              confirmButtonText: 'Try again',
              showCancelButton: true,
              closeOnConfirm: false
@ -308,7 +308,7 @@ $(document).ready(function(){

    if (hasAccessToken) {
      el = "<p>";
-      el += "<span class='account-connected-header'>Metaverse Account Connected</span>";
+      el += "<span class='account-connected-header'>Directory Services Account Connected</span>";
      el += "<button id='" + Settings.DISCONNECT_ACCOUNT_BTN_ID + "' class='btn'>Disconnect</button>";
      el += "</p>";
      el = $(el);
@ -321,7 +321,7 @@ $(document).ready(function(){
      }
      buttonSetting.help = "";
      buttonSetting.classes = "btn-primary";
-      buttonSetting.button_label = "Connect Metaverse Account";
+      buttonSetting.button_label = "Connect Directory Services Account";
      buttonSetting.html_id = Settings.CONNECT_ACCOUNT_BTN_ID;

      buttonSetting.href = METAVERSE_URL + "/user/tokens/new?for_domain_server=true";
@ -334,7 +334,7 @@ $(document).ready(function(){
      el = viewHelpers.getFormGroup('', buttonSetting, Settings.data.values);
    }

-    // add the button group to the top of the metaverse panel
+    // add the button group to the top of the Directory Services panel
    $('#metaverse .panel-body').prepend(el);
  }

@ -730,7 +730,7 @@ $(document).ready(function(){
      html_id: Settings.PLACES_TABLE_ID,
      help: "To point places to this domain, "
        + " go to the <a href='" + METAVERSE_URL + "/user/places'>Places</a> "
-        + "page in your Metaverse account.",
+        + "page in your Directory Services account.",
      read_only: true,
      can_add_new_rows: false,
      columns: [
@ -1015,7 +1015,7 @@ $(document).ready(function(){

          if (data.data.domains.length) {
            // setup a select box for the returned domains
-            modal_body = "<p>Choose the Metaverse domain you want this domain-server to represent.<br/>This will set your domain ID on the settings page.</p>";
+            modal_body = "<p>Choose the Directory Services domain you want this domain-server to represent.<br/>This will set your domain ID on the settings page.</p>";
            domain_select = $("<select id='domain-name-select' class='form-control'></select>");
            _.each(data.data.domains, function(domain){
              var domainString = "";
@ -1044,7 +1044,7 @@ $(document).ready(function(){
                window.open(METAVERSE_URL + "/user/domains", '_blank');
              }
            }
-            modal_body = "<p>You do not have any domains in your Metaverse account." +
+            modal_body = "<p>You do not have any domains in your Directory Services account." +
              "<br/><br/>Go to your domains page to create a new one. Once your domain is created re-open this dialog to select it.</p>"
          }

@ -1056,7 +1056,7 @@ $(document).ready(function(){
          })
        },
        error: function() {
-          bootbox.alert("Failed to retrieve your domains from the Metaverse");
+          bootbox.alert("Failed to retrieve your domains from the Directory Server");
        },
        complete: function() {
          // remove the spinner from the choose button
@ -1067,7 +1067,7 @@ $(document).ready(function(){

      } else {
        bootbox.alert({
-          message: "You must have an access token to query your Metaverse domains.<br><br>" +
+          message: "You must have an access token to query your Directory Services domains.<br><br>" +
          "Please follow the instructions on the settings page to add an access token.",
          title: "Access token required"
        })
--- a/domain-server/resources/web/wizard/index.shtml
+++ b/domain-server/resources/web/wizard/index.shtml
@ -3,12 +3,12 @@
  <h4 class="step-title"></h4>
  <dl class="row">
    <dd class="col-md-12">
-      <span class='step-description'>Connect your Metaverse account to be able to make your domain discoverable and add account based authentication. You can always do this later.</span>
+      <span class='step-description'>Connect your Directory Services to be able to make your domain discoverable and add account based authentication. You can always do this later.</span>
    </dd>
  </dl>
  <dl class="row">
    <dd class="col-md-12">
-      <a id="connect-account-btn" role="button" class="btn btn-primary btn-md btn-block" target="_blank">Connect your Metaverse account</a>
+      <a id="connect-account-btn" role="button" class="btn btn-primary btn-md btn-block" target="_blank">Connect your Directory Services account</a>
    </dd>
  </dl>

@ -24,7 +24,7 @@
  <div class="row">
    <div class="col-md-12">
      <span class='step-description'>
-        <a target='_blank' href='https://docs.vircadia.com/create-and-explore/start-working-in-your-sandbox/place-names'>Place names</a> are similar to web addresses. Users who want to visit your domain can
+        <a target='_blank' href='https://docs.overte.org/host/configure-settings/place-setting.html'>Place names</a> are similar to web addresses. Users who want to visit your domain can
        enter its Place Name in Overte's Interface. You can choose a Place Name for your domain.</br>
        Your domain may also be reachable by <b>IP address</b>.
      </span>
@ -60,7 +60,7 @@
  </div>
  <div id="admin-row" class="row">
    <p class="col-md-6">
-      <span class="step-info"><span id="admin-description"><b>Add your Metaverse username</b> and any other usernames</span> to grant <span class='wizard-link' data-toggle="tooltip" title="Users who will have all the permissions for this domain.">administrator privileges</span></span>
+      <span class="step-info"><span id="admin-description"><b>Add your Directory Services username</b> and any other usernames</span> to grant <span class='wizard-link' data-toggle="tooltip" title="Users who will have all the permissions for this domain.">administrator privileges</span></span>
    </p>
    <div class="col-md-6">
      <input id="admin-usernames" type="text" class="form-control">
@ -95,7 +95,7 @@
    </p>
    <p class="col-md-5">
      <label>
-        <input id="connect-logged-in" name="connect-radio" type="radio" value="logged-in"> Users logged into the Metaverse
+        <input id="connect-logged-in" name="connect-radio" type="radio" value="logged-in"> Users logged into the Directory Services
      </label>
    </p>
    <p class="col-md-2">
@ -126,7 +126,7 @@
    </p>
    <p class="col-md-5">
      <label>
-        <input id="rez-logged-in" name="rez-radio" type="radio" value="logged-in" disabled> Users logged into the Metaverse
+        <input id="rez-logged-in" name="rez-radio" type="radio" value="logged-in" disabled> Users logged into the Directory Services
      </label>
    </p>
    <p class="col-md-2">
@ -164,14 +164,14 @@
    <dt class="col-md-4 step-info">Username</dt>
    <dd class="col-md-8">
      <input id="http_username" type="text" class="form-control">
-      <span class='help-block'>This does not have to be your Metaverse username</span>
+      <span class='help-block'>This does not have to be your Directory Services username</span>
    </dd>
  </dl>
  <dl class="row">
    <dt class="col-md-4 step-info">Enter password</dt>
    <dd class="col-md-8">
      <input id="http_password" type="password" class="form-control">
-      <span class='help-block'>This should not be the same as your Metaverse password</span>
+      <span class='help-block'>This should not be the same as your Directory Services password</span>
    </dd>
  </dl>
  <dl id="verify-password-row" class="row">
--- a/domain-server/resources/web/wizard/js/wizard.js
+++ b/domain-server/resources/web/wizard/js/wizard.js
@ -20,9 +20,9 @@ $(document).ready(function(){
    $('.perms-link').on('click', function() {
      var modal_body = '<div>';
      modal_body += '<b>None</b> - No one will have permissions. Only you and the users your have given administrator privileges to will have permissions.</br></br>';
-      modal_body += '<b>Friends</b> - Users who are your Friends in the Metaverse.</br></br>';
-      modal_body += '<b>Users logged into the Metaverse</b> - Users who are currently logged into the Metaverse.</br></br>';
-      modal_body += '<b>Everyone</b> - Anyone who uses the Metaverse.';
+      modal_body += '<b>Friends</b> - Users who are your Friends in the Directory Services.</br></br>';
+      modal_body += '<b>Users logged into the Directory Services</b> - Users who are currently logged into the Directory Services.</br></br>';
+      modal_body += '<b>Everyone</b> - Any user, both logged in and not logged in.';
      modal_body += '</div>';

      dialog = bootbox.dialog({
@ -153,7 +153,7 @@ function setupWizardSteps() {
    });

    $('#permissions-description').html('You <span id="username-display"></span>have been assigned administrator privileges to this domain.');
-    $('#admin-description').html('Add more Metaverse usernames');
+    $('#admin-description').html('Add more Directory Services usernames');
  } else {
    $('.cloud-only').remove();
    $('#save-threading-settings').text("Finish");
@ -207,7 +207,7 @@ function promptToCreateDomainID() {
        if (data && data.status === "failure") {
          swal.showInputError("Error: " + data.error);
        } else {
-          swal.showInputError("Error: Failed to post to metaverse.");
+          swal.showInputError("Error: Failed to post to directory server.");
        }
        console.log("Failed to create domain ID...");
      });
@ -250,7 +250,7 @@ function updatePlaceNameDisplay() {
      console.warn('Request Failed');
    });
  } else {
-    console.warn('No metaverse domain ID!');
+    console.warn('No Directory Services domain ID!');
  }
 }

--- a/domain-server/src/DomainGatekeeper.cpp
+++ b/domain-server/src/DomainGatekeeper.cpp
@ -178,7 +178,7 @@ NodePermissions DomainGatekeeper::setPermissionsForUser(bool isLocalUser, QStrin
    }

    // If this user is a known member of a domain group, give them the implied permissions.
-    // Do before processing verifiedUsername in case user is logged into the metaverse and is a member of a blacklist group.
+    // Do before processing verifiedUsername in case user is logged into the Directory Services and is a member of a blacklist group.
    if (!verifiedDomainUserName.isEmpty()) {
        auto userGroups = _domainGroupMemberships[verifiedDomainUserName];
        foreach (QString userGroup, userGroups) {
@ -249,10 +249,10 @@ NodePermissions DomainGatekeeper::setPermissionsForUser(bool isLocalUser, QStrin
            qDebug() << "|  user-permissions: specific IP matches, so:" << userPerms;
 #endif
        } else {
-            // they are logged into metaverse, but we don't have specific permissions for them.
+            // they are logged into Directory Services, but we don't have specific permissions for them.
            userPerms |= _server->_settingsManager.getStandardPermissionsForName(NodePermissions::standardNameLoggedIn);
 #ifdef WANT_DEBUG
-            qDebug() << "|  user-permissions: user is logged-into metaverse, so:" << userPerms;
+            qDebug() << "|  user-permissions: user is logged-into Directory Services, so:" << userPerms;
 #endif

            // if this user is a friend of the domain-owner, give them friend's permissions
@ -568,7 +568,7 @@ SharedNodePointer DomainGatekeeper::processAgentConnectRequest(const NodeConnect
                nodeConnection.senderSockAddr, DomainHandler::ConnectionRefusedReason::NotAuthorizedDomain,
                    domainAuthURL + "|" + domainAuthClientID);
        } else {
-            sendConnectionDeniedPacket("You lack the required metaverse permissions to connect to this domain.",
+            sendConnectionDeniedPacket("You lack the required Directory Services permissions to connect to this domain.",
                nodeConnection.senderSockAddr, DomainHandler::ConnectionRefusedReason::NotAuthorizedMetaverse);
        }
 #ifdef WANT_DEBUG
@ -737,11 +737,11 @@ bool DomainGatekeeper::verifyUserSignature(const QString& username,
                // (a key that we hoped would work but is probably stale)

                if (!senderSockAddr.isNull() && !isOptimisticKey) {
-                    qDebug() << "Error decrypting metaverse username signature for" << username << "- denying connection.";
+                    qDebug() << "Error decrypting directory services username signature for" << username << "- denying connection.";
                    sendConnectionDeniedPacket("Error decrypting username signature.", senderSockAddr,
                        DomainHandler::ConnectionRefusedReason::LoginErrorMetaverse);
                } else if (!senderSockAddr.isNull()) {
-                    qDebug() << "Error decrypting metaverse username signature for" << username << "with optimistic key -"
+                    qDebug() << "Error decrypting directory services username signature for" << username << "with optimistic key -"
                        << "re-requesting public key and delaying connection";
                }

@ -1250,7 +1250,7 @@ void DomainGatekeeper::requestDomainUser(const QString& username, const QString&

    QNetworkRequest request;

-    request.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::VIRCADIA_USER_AGENT);
+    request.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::OVERTE_USER_AGENT);
    request.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded");
    request.setRawHeader(QByteArray("Authorization"), QString("Bearer " + accessToken).toUtf8());

@ -1291,7 +1291,7 @@ void DomainGatekeeper::requestDomainUserFinished() {
            QStringList domainUserGroups;
            auto userRoles = rootObject.value("roles").toArray();
            foreach (auto role, userRoles) {
-                // Distinguish domain groups from metaverse groups by adding a leading special character.
+                // Distinguish domain groups from directory services groups by adding a leading special character.
                domainUserGroups.append(DOMAIN_GROUP_CHAR + role.toString().toLower());
            }
            _domainGroupMemberships[username] = domainUserGroups;
--- a/domain-server/src/DomainGatekeeper.h
+++ b/domain-server/src/DomainGatekeeper.h
@ -76,7 +76,7 @@ public slots:
 private slots:
    void handlePeerPingTimeout();

-    // Login and groups for domain, separate from metaverse.
+    // Login and groups for domain, separate from directory services.
    void requestDomainUserFinished();

 private:
@ -153,7 +153,7 @@ private:
    Node::LocalID _currentLocalID;
    Node::LocalID _idIncrement;

-    // Login and groups for domain, separate from metaverse.
+    // Login and groups for domain, separate from directory services.
    bool domainHasLogin();
    void requestDomainUser(const QString& username, const QString& accessToken, const QString& refreshToken);
    
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@ -66,7 +66,7 @@ using namespace std::chrono;

 Q_LOGGING_CATEGORY(domain_server, "hifi.domain_server")
 Q_LOGGING_CATEGORY(domain_server_ice, "hifi.domain_server.ice")
-Q_LOGGING_CATEGORY(domain_server_auth, "vircadia.domain_server.auth")
+Q_LOGGING_CATEGORY(domain_server_auth, "overte.domain_server.auth")

 const QString ACCESS_TOKEN_KEY_PATH = "metaverse.access_token";
 const QString DomainServer::REPLACEMENT_FILE_EXTENSION = ".replace";
@ -86,10 +86,10 @@ bool DomainServer::_getTempName { false };
 QString DomainServer::_userConfigFilename;
 int DomainServer::_parentPID { -1 };

-/// @brief The Domain server can proxy requests to the Metaverse server, this function handles those forwarding requests.
+/// @brief The Domain server can proxy requests to the Directory Server, this function handles those forwarding requests.
 /// @param connection The HTTP connection object.
 /// @param requestUrl The full URL of the request. e.g. https://google.com/api/v1/test
-/// @param metaversePath The path on the Metaverse server to route to.
+/// @param metaversePath The path on the Directory Server to route to.
 /// @param requestSubobjectKey (Optional) The parent object key that any data will be inserted into for the forwarded request.
 /// @param requiredData (Optional) This data is required to be present for the request.
 /// @param optionalData (Optional) If provided, this optional data will be forwarded with the request.
@ -156,7 +156,7 @@ bool DomainServer::forwardMetaverseAPIRequest(HTTPConnection* connection,
    QUrl url { MetaverseAPI::getCurrentMetaverseServerURL().toString() + metaversePath };

    QNetworkRequest req(url);
-    req.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::VIRCADIA_USER_AGENT);
+    req.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::OVERTE_USER_AGENT);
    req.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");

    if (accessTokenVariant.isValid()) {
@ -180,7 +180,7 @@ bool DomainServer::forwardMetaverseAPIRequest(HTTPConnection* connection,
    connect(reply, &QNetworkReply::finished, this, [reply, connection]() {
        if (reply->error() != QNetworkReply::NoError) {
            auto data = reply->readAll();
-            qDebug() << "Got error response from metaverse server (" << reply->url() << "): " << data << reply->errorString();
+            qDebug() << "Got error response from directory server (" << reply->url() << "): " << data << reply->errorString();
            connection->respond(HTTPConnection::StatusCode400, data);
            return;
        }
@ -298,14 +298,14 @@ DomainServer::DomainServer(int argc, char* argv[]) :
 #endif

    if (_type != NonMetaverse) {
-        // if we have a metaverse domain, we'll use an access token for API calls
+        // if we have a directory services domain, we'll use an access token for API calls
        resetAccountManagerAccessToken();

        setupAutomaticNetworking();
    }

    if (!getID().isNull() && _type != NonMetaverse) {
-        // setup periodic heartbeats to metaverse API
+        // setup periodic heartbeats to directory services API
        setupHeartbeatToMetaverse();

        // send the first heartbeat immediately
@ -988,7 +988,7 @@ bool DomainServer::resetAccountManagerAccessToken() {
            if (accessTokenVariant.canConvert(QMetaType::QString)) {
                accessToken = accessTokenVariant.toString();
            } else {
-                qWarning() << "No access token is present. Some operations that use the metaverse API will fail.";
+                qWarning() << "No access token is present. Some operations that use the directory services API will fail.";
                qDebug() << "Set an access token via the web interface, in your user config"
                    << "at keypath metaverse.access_token or in your ENV at key DOMAIN_SERVER_ACCESS_TOKEN";

@ -1799,7 +1799,7 @@ void DomainServer::sendICEServerAddressToMetaverseAPI() {
    callbackParameters.errorCallbackMethod = "handleFailedICEServerAddressUpdate";
    callbackParameters.jsonCallbackMethod = "handleSuccessfulICEServerAddressUpdate";

-    qCDebug(domain_server_ice) << "Updating ice-server address in Metaverse API to"
+    qCDebug(domain_server_ice) << "Updating ice-server address in Directory Services API to"
        << (_iceServerSocket.isNull() ? "" : _iceServerSocket.getAddress().toString());

    static const QString DOMAIN_ICE_ADDRESS_UPDATE = "/api/v1/domains/%1/ice_server_address";
@ -1814,11 +1814,11 @@ void DomainServer::sendICEServerAddressToMetaverseAPI() {
 void DomainServer::handleSuccessfulICEServerAddressUpdate(QNetworkReply* requestReply) {
    _sendICEServerAddressToMetaverseAPIInProgress = false;
    if (_sendICEServerAddressToMetaverseAPIRedo) {
-        qCDebug(domain_server_ice) << "ice-server address (" << _iceServerSocket << ") updated with metaverse, but has since changed.  redoing update...";
+        qCDebug(domain_server_ice) << "ice-server address (" << _iceServerSocket << ") updated with directory server, but has since changed.  redoing update...";
        _sendICEServerAddressToMetaverseAPIRedo = false;
        sendICEServerAddressToMetaverseAPI();
    } else {
-        qCDebug(domain_server_ice) << "ice-server address (" << _iceServerSocket << ") updated with metaverse.";
+        qCDebug(domain_server_ice) << "ice-server address (" << _iceServerSocket << ") updated with directory server.";
    }
 }

@ -1832,7 +1832,7 @@ void DomainServer::handleFailedICEServerAddressUpdate(QNetworkReply* requestRepl
        const int ICE_SERVER_UPDATE_RETRY_MS = 2 * 1000;

        qCWarning(domain_server_ice) << "PAGE: Failed to update ice-server address (" << _iceServerSocket <<
-            ") with Metaverse (" << requestReply->url() << ") (critical error for auto-networking) error:" <<
+            ") with Directory Server (" << requestReply->url() << ") (critical error for auto-networking) error:" <<
            requestReply->errorString();
        qCWarning(domain_server_ice) << "\tRe-attempting in" << ICE_SERVER_UPDATE_RETRY_MS / 1000 << "seconds";

@ -2649,15 +2649,15 @@ bool DomainServer::handleHTTPRequest(HTTPConnection* connection, const QUrl& url
            url.setQuery("access_token=" + accessTokenVariant.toString());

            QNetworkRequest req(url);
-            req.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::VIRCADIA_USER_AGENT);
+            req.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::OVERTE_USER_AGENT);
            req.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
            QNetworkReply* reply = NetworkAccessManager::getInstance().put(req, doc.toJson());

            connect(reply, &QNetworkReply::finished, this, [reply, connection]() {
                if (reply->error() != QNetworkReply::NoError) {
-                    qDebug() << "Got error response from metaverse server: " << reply->readAll();
+                    qDebug() << "Got error response from Directory Server: " << reply->readAll();
                    connection->respond(HTTPConnection::StatusCode500,
-                                        "Error communicating with Metaverse");
+                                        "Error communicating with Directory Server");
                    return;
                }

@ -2750,7 +2750,7 @@ bool DomainServer::handleHTTPSRequest(HTTPSConnection* connection, const QUrl &u

            QNetworkRequest tokenRequest(tokenRequestUrl);
            tokenRequest.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
-            tokenRequest.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::VIRCADIA_USER_AGENT);
+            tokenRequest.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::OVERTE_USER_AGENT);
            tokenRequest.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded");

            QNetworkReply* tokenReply = NetworkAccessManager::getInstance().post(tokenRequest, tokenPostBody.toLocal8Bit());
@ -3095,7 +3095,7 @@ QNetworkReply* DomainServer::profileRequestGivenTokenReply(QNetworkReply* tokenR

    QNetworkRequest profileRequest(profileURL);
    profileRequest.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
-    profileRequest.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::VIRCADIA_USER_AGENT);
+    profileRequest.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::OVERTE_USER_AGENT);
    return NetworkAccessManager::getInstance().get(profileRequest);
 }

@ -3761,7 +3761,7 @@ void DomainServer::randomizeICEServerAddress(bool shouldTriggerHostLookup) {
    // immediately fire an ICE heartbeat once we've picked a candidate ice-server
    sendHeartbeatToIceServer();

-    // immediately send an update to the metaverse API when our ice-server changes
+    // immediately send an update to the directory services API when our ice-server changes
    sendICEServerAddressToMetaverseAPI();
 }

--- a/domain-server/src/DomainServerSettingsManager.cpp
+++ b/domain-server/src/DomainServerSettingsManager.cpp
@ -2016,7 +2016,7 @@ void DomainServerSettingsManager::apiRefreshGroupInformation() {
    foreach (QString groupName, groupNames) {
        QString lowerGroupName = groupName.toLower();
        if (lowerGroupName.startsWith(DOMAIN_GROUP_CHAR)) {
-            // Ignore domain groups. (Assumption: metaverse group names can't start with a "@".)
+            // Ignore domain groups. (Assumption: Directory Services group names can't start with a "@".)
            return;
        }
        if (_groupIDs.contains(lowerGroupName)) {
@ -2239,7 +2239,7 @@ QList<QUuid> DomainServerSettingsManager::getBlacklistGroupIDs() {
 }

 QStringList DomainServerSettingsManager::getDomainServerGroupNames() {
-    // All names as listed in the domain server settings; both metaverse groups and domain groups
+    // All names as listed in the domain server settings; both Directory Services groups and domain groups
    QSet<QString> result;
    foreach(NodePermissionsKey groupKey, _groupPermissions.keys()) {
        result += _groupPermissions[groupKey]->getID();
@ -2248,7 +2248,7 @@ QStringList DomainServerSettingsManager::getDomainServerGroupNames() {
 }

 QStringList DomainServerSettingsManager::getDomainServerBlacklistGroupNames() {
-    // All names as listed in the domain server settings; not necessarily mnetaverse groups.
+    // All names as listed in the domain server settings; not necessarily Directory Services groups.
    QSet<QString> result;
    foreach (NodePermissionsKey groupKey, _groupForbiddens.keys()) {
        result += _groupForbiddens[groupKey]->getID();
--- a/domain-server/src/DomainServerSettingsManager.h
+++ b/domain-server/src/DomainServerSettingsManager.h
@ -110,7 +110,7 @@ public:
    QStringList getDomainServerGroupNames();
    QStringList getDomainServerBlacklistGroupNames();

-    // these are used to locally cache the result of calling "/api/v1/groups/.../is_member/..." on metaverse's api
+    // these are used to locally cache the result of calling "/api/v1/groups/.../is_member/..." on Directory Services api
    void clearGroupMemberships(const QString& name) { _groupMembership[name.toLower()].clear(); }
    void recordGroupMembership(const QString& name, const QUuid groupID, QUuid rankID);
    QUuid isGroupMember(const QString& name, const QUuid& groupID); // returns rank or -1 if not a member
@ -177,7 +177,7 @@ private:
    // is done with the returned QVariant*
    HifiConfigVariantMap _configMap;

-    // these cause calls to metaverse's group api
+    // these cause calls to directory services group api
    void apiGetGroupID(const QString& groupName);
    void apiGetGroupRanks(const QUuid& groupID);

--- a/hifi_android.py
+++ b/hifi_android.py
@ -10,7 +10,7 @@ import zipfile

 print = functools.partial(print, flush=True)

-ANDROID_PACKAGE_URL = 'https://cdn-1.vircadia.com/eu-c-1/vircadia-public/dependencies/android/'
+ANDROID_PACKAGE_URL = 'https://build-deps.overte.org/dependencies/android/'

 ANDROID_PACKAGES = {
    'qt' : {
--- a/hifi_qt.py
+++ b/hifi_qt.py
@ -52,7 +52,7 @@ endif()
    def __init__(self, args):
        self.args = args
        self.configFilePath = os.path.join(args.build_root, 'qt.cmake')
-        self.version = os.getenv('VIRCADIA_USE_QT_VERSION', '5.15.2')
+        self.version = os.getenv('OVERTE_USE_QT_VERSION', '5.15.2')
        self.assets_url = hifi_utils.readEnviromentVariableFromFile(args.build_root, 'EXTERNAL_BUILD_ASSETS')

        # OS dependent information
@ -62,7 +62,7 @@ endif()
        system_qt = False

        # Here we handle the 3 possible cases of dealing with Qt:
-        if os.getenv('VIRCADIA_USE_SYSTEM_QT', "") != "":
+        if os.getenv('OVERTE_USE_SYSTEM_QT', "") != "":
            # 1. Using the system provided Qt. This is only recommended for Qt 5.15.0 and above,
            # as it includes a required fix on Linux.
            #
@ -78,11 +78,11 @@ endif()
            system_qt = True
            print("Using system Qt")

-        elif os.getenv('VIRCADIA_QT_PATH', "") != "":
+        elif os.getenv('OVERTE_QT_PATH', "") != "":
            # 2. Using an user-provided directory.
-            # VIRCADIA_QT_PATH must point to a directory with a Qt install in it.
+            # OVERTE_QT_PATH must point to a directory with a Qt install in it.

-            self.path = os.getenv('VIRCADIA_QT_PATH')
+            self.path = os.getenv('OVERTE_QT_PATH')
            self.fullPath = self.path
            self.cmakePath = os.path.join(self.fullPath, 'lib', 'cmake')

@ -100,7 +100,7 @@ endif()
            # For a pre-built qt, however, we have to unpack it. The archive is required to contain
            # a qt5-install directory in it.

-            self.path = os.path.expanduser("~/vircadia-files/qt")
+            self.path = os.path.expanduser("~/overte-files/qt")
            self.fullPath = os.path.join(self.path, 'qt5-install')
            self.cmakePath = os.path.join(self.fullPath, 'lib', 'cmake')

@ -195,7 +195,7 @@ endif()
        print("It's also possible to build Qt for your distribution, please see the documentation at:")
        print("https://github.com/overte-org/overte/tree/master/tools/qt-builder")
        print("")
-        print("Alternatively, you can try building against the system Qt by setting the VIRCADIA_USE_SYSTEM_QT environment variable.")
+        print("Alternatively, you can try building against the system Qt by setting the OVERTE_USE_SYSTEM_QT environment variable.")
        print("You'll need to install the development packages, and to have Qt 5.15.0 or later.")

    def writeConfig(self):
@ -238,7 +238,7 @@ endif()
        print('')
        print("If this is a recent distribution, dating from 2021 or so, you can try building")
        print("against the system Qt by running this command, and trying again:")
-        print("    export VIRCADIA_USE_SYSTEM_QT=1")
+        print("    export OVERTE_USE_SYSTEM_QT=1")
        print("")
        hifi_utils.color('clear')
        print("If you'd like to try to build Qt from source either for building Overte, or")
--- a/hifi_vcpkg.py
+++ b/hifi_vcpkg.py
@ -60,9 +60,9 @@ endif()
            self.path = args.vcpkg_root
            self.noClean = True
        else:
-            defaultBasePath = os.path.expanduser('~/vircadia-files/vcpkg')
+            defaultBasePath = os.path.expanduser('~/overte-files/vcpkg')
            if 'CI_WORKSPACE' in os.environ:
-                self.basePath = os.path.join(os.getenv('CI_WORKSPACE'), 'vircadia-files/vcpkg')
+                self.basePath = os.path.join(os.getenv('CI_WORKSPACE'), 'overte-files/vcpkg')
            else:
                self.basePath = os.getenv('HIFI_VCPKG_BASE', defaultBasePath)
            if self.args.android:
--- a/ice-server/src/IceServer.cpp
+++ b/ice-server/src/IceServer.cpp
@ -206,7 +206,7 @@ bool IceServer::isVerifiedHeartbeat(const QUuid& domainID, const QByteArray& pla
        }

        // we could not verify this heartbeat (missing public key, could not load public key, bad actor)
-        // ask the metaverse API for the right public key and return false to indicate that this is not verified
+        // ask the directory services API for the right public key and return false to indicate that this is not verified
        requestDomainPublicKey(domainID);
    }

@ -214,7 +214,7 @@ bool IceServer::isVerifiedHeartbeat(const QUuid& domainID, const QByteArray& pla
 }

 void IceServer::requestDomainPublicKey(const QUuid& domainID) {
-    // send a request to the metaverse API for the public key for this domain
+    // send a request to the directory services API for the public key for this domain
    auto& networkAccessManager = NetworkAccessManager::getInstance();

    QUrl publicKeyURL{ MetaverseAPI::getCurrentMetaverseServerURL() };
@ -281,7 +281,7 @@ void IceServer::publicKeyReplyFinished(QNetworkReply* reply) {
                qWarning() << "There was no public key present in response for domain with ID" << domainID;
            }
        } else {
-            qWarning() << "The metaverse API did not return success for public key request for domain with ID" << domainID;
+            qWarning() << "The directory services API did not return success for public key request for domain with ID" << domainID;
        }

    } else {
--- a/interface/CMakeLists.txt
+++ b/interface/CMakeLists.txt
@ -1,6 +1,6 @@
 if (APPLE)
-  # Make the OSX DMG app be Vircadia.app.
-  set(TARGET_NAME Vircadia)
+  # Make the OSX DMG app be Overte.app.
+  set(TARGET_NAME Overte)
 else()
  set(TARGET_NAME interface)
 endif()
@ -121,14 +121,14 @@ if (APPLE)
  # configure CMake to use a custom Info.plist
  set_target_properties(${this_target} PROPERTIES MACOSX_BUNDLE_INFO_PLIST MacOSXBundleInfo.plist.in)

-  set(MACOSX_BUNDLE_BUNDLE_NAME "Vircadia")
+  set(MACOSX_BUNDLE_BUNDLE_NAME "Overte")
  if (PRODUCTION_BUILD)
-    set(MACOSX_BUNDLE_GUI_IDENTIFIER com.vircadia.interface)
+    set(MACOSX_BUNDLE_GUI_IDENTIFIER org.overte.interface)
  else ()
    if (DEV_BUILD)
-      set(MACOSX_BUNDLE_GUI_IDENTIFIER com.vircadia.interface-dev)
+      set(MACOSX_BUNDLE_GUI_IDENTIFIER org.overte.interface-dev)
    elseif (PR_BUILD)
-      set(MACOSX_BUNDLE_GUI_IDENTIFIER com.vircadia.interface-pr)
+      set(MACOSX_BUNDLE_GUI_IDENTIFIER org.overte.interface-pr)
    endif ()
  endif ()

@ -159,7 +159,7 @@ elseif (WIN32)
  set(CONFIGURE_ICON_RC_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/Icon.rc")
  configure_file("${HF_CMAKE_DIR}/templates/Icon.rc.in" ${CONFIGURE_ICON_RC_OUTPUT})

-  set(APP_FULL_NAME "Vircadia")
+  set(APP_FULL_NAME "Overte")
  set(CONFIGURE_VERSION_INFO_RC_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/VersionInfo.rc")
  configure_file("${HF_CMAKE_DIR}/templates/VersionInfo.rc.in" ${CONFIGURE_VERSION_INFO_RC_OUTPUT})

@ -296,7 +296,7 @@ target_link_libraries(
  ${PLATFORM_QT_LIBRARIES}
 )

-if (UNIX AND NOT ANDROID AND NOT VIRCADIA_THREAD_DEBUGGING)
+if (UNIX AND NOT ANDROID AND NOT OVERTE_THREAD_DEBUGGING)
    if (CMAKE_SYSTEM_NAME MATCHES "Linux")
        # Linux
        target_link_libraries(${TARGET_NAME} pthread atomic)
@ -429,7 +429,7 @@ else()
  endif()
 endif()

-if ("$ENV{VIRCADIA_USE_SYSTEM_QT}" STREQUAL "")
+if ("$ENV{OVERTE_USE_SYSTEM_QT}" STREQUAL "")
  if (DEV_BUILD AND (APPLE OR UNIX))
    # create a qt.conf file to override hard-coded search paths in Qt libs
    set(QT_LIB_PATH "${QT_CMAKE_PREFIX_PATH}/../..")
--- a/interface/resources/avatar/bookmarks/avatarbookmarks.json
+++ b/interface/resources/avatar/bookmarks/avatarbookmarks.json
@ -5,7 +5,8 @@
        "avatarEntites": [
        ],
        "avatarScale": 1,
-        "avatarUrl": "https://cdn-1.vircadia.com/us-e-1/Bazaar/Avatars/Woody/mannequin.fst",
+        "avatarUrl": "https://content.overte.org/Bazaar/Avatars/Woody/mannequin.fst",
+        "avatarIcon": "https://content.overte.org/Bazaar/Avatars/Woody/img/icon.png"
        "version": 3
    },
    "Kim": {
@ -14,8 +15,8 @@
        "avatarEntites": [
        ],
        "avatarScale": 1,
-        "avatarUrl": "https://cdn-1.vircadia.com/us-e-1/Bazaar/Avatars/Kim/fbx/Kim.fst",
-        "avatarIcon": "https://cdn-1.vircadia.com/us-e-1/Bazaar/Avatars/Kim/img/icon.png",
+        "avatarUrl": "https://content.overte.org/Bazaar/Avatars/Kim/fbx/Kim.fst",
+        "avatarIcon": "https://content.overte.org/Bazaar/Avatars/Kim/img/icon.png",
        "version": 3
    },
    "Mason": {
@ -24,8 +25,8 @@
        "avatarEntites": [
        ],
        "avatarScale": 1,
-        "avatarUrl": "https://cdn-1.vircadia.com/us-e-1/Bazaar/Avatars/Mason/fbx/Mason.fst",
-        "avatarIcon": "https://cdn-1.vircadia.com/us-e-1/Bazaar/Avatars/Mason/img/icon.png",
+        "avatarUrl": "https://content.overte.org/Bazaar/Avatars/Mason/fbx/Mason.fst",
+        "avatarIcon": "https://content.overte.org/Bazaar/Avatars/Mason/img/icon.png",
        "version": 3
    },
    "Mike": {
@ -34,8 +35,8 @@
        "avatarEntites": [
        ],
        "avatarScale": 1,
-        "avatarUrl": "https://cdn-1.vircadia.com/us-e-1/Bazaar/Avatars/Mike/fbx/Mike.fst",
-        "avatarIcon": "https://cdn-1.vircadia.com/us-e-1/Bazaar/Avatars/Mike/img/icon.png",
+        "avatarUrl": "https://content.overte.org/Bazaar/Avatars/Mike/fbx/Mike.fst",
+        "avatarIcon": "https://content.overte.org/Bazaar/Avatars/Mike/img/icon.png",
        "version": 3
    },
    "Sean": {
@ -44,8 +45,8 @@
        "avatarEntites": [
        ],
        "avatarScale": 1,
-        "avatarUrl": "https://cdn-1.vircadia.com/us-e-1/Bazaar/Avatars/Sean/fbx/Sean.fst",
-        "avatarIcon": "https://cdn-1.vircadia.com/us-e-1/Bazaar/Avatars/Sean/img/icon.png",
+        "avatarUrl": "https://content.overte.org/Bazaar/Avatars/Sean/fbx/Sean.fst",
+        "avatarIcon": "https://content.overte.org/Bazaar/Avatars/Sean/img/icon.png",
        "version": 3
    },
    "Summer": {
@ -54,8 +55,8 @@
        "avatarEntites": [
        ],
        "avatarScale": 1,
-        "avatarUrl": "https://cdn-1.vircadia.com/us-e-1/Bazaar/Avatars/Summer/fbx/Summer.fst",
-        "avatarIcon": "https://cdn-1.vircadia.com/us-e-1/Bazaar/Avatars/Summer/img/icon.png",
+        "avatarUrl": "https://content.overte.org/Bazaar/Avatars/Summer/fbx/Summer.fst",
+        "avatarIcon": "https://content.overte.org/Bazaar/Avatars/Summer/img/icon.png",
        "version": 3
    },
    "Tanya": {
@ -64,8 +65,8 @@
        "avatarEntites": [
        ],
        "avatarScale": 1,
-        "avatarUrl": "https://cdn-1.vircadia.com/us-e-1/Bazaar/Avatars/Tanya/fbx/Tanya.fst",
-        "avatarIcon": "https://cdn-1.vircadia.com/us-e-1/Bazaar/Avatars/Tanya/img/icon.png",
+        "avatarUrl": "https://content.overte.org/Bazaar/Avatars/Tanya/fbx/Tanya.fst",
+        "avatarIcon": "https://content.overte.org/Bazaar/Avatars/Tanya/img/icon.png",
        "version": 3
    }
 }
--- a/interface/resources/html/commerce/backup_instructions.html
+++ b/interface/resources/html/commerce/backup_instructions.html
@ -596,7 +596,7 @@

        <h2>Want to learn more?</h2>
        <p>You can find out much more about the blockchain and about commerce in High Fidelity by visiting our Docs site:</p>
-        <p><a href="http://docs.vircadia.dev" class="btn">Visit High Fidelity's Docs</a></p>
+        <p><a href="http://docs.overte.org" class="btn">Visit High Fidelity's Docs</a></p>
        <hr>

      </div>
--- a/interface/resources/html/tabletHelp.html
+++ b/interface/resources/html/tabletHelp.html
@ -77,9 +77,9 @@
            var handControllerImageURL = null;
            var index = 0;
            var count = 3;
-            var handControllerRefURL = "https://docs.vircadia.com/explore/get-started/vr-controls.html#vr-controls";
-            var keyboardRefURL = "https://docs.vircadia.com/explore/get-started/desktop.html#movement-controls";
-            var gamepadRefURL = "https://docs.vircadia.com/explore/get-started/vr-controls.html#gamepad";
+            var handControllerRefURL = "https://docs.overte.org/explore/get-started/vr-controls.html#vr-controls";
+            var keyboardRefURL = "https://docs.overte.org/explore/get-started/desktop.html#movement-controls";
+            var gamepadRefURL = "https://docs.overte.org/explore/get-started/vr-controls.html#gamepad";

            function showKbm() {
                document.getElementById("main_image").setAttribute("src", "img/tablet-help-keyboard.jpg");
@ -189,7 +189,7 @@
            <a href="#" id="right_button" onmousedown="cycleRight()"></a>
 			<a href="#" id="image_button"></a>
        </div>
-        <a href="mailto:support@vircadia.com" id="report_problem">Report Problem</a>
+        <a href="mailto:support@overte.org" id="report_problem">Report Problem</a>
    </body>

 </html>
--- a/interface/resources/qml/LoginDialog/LinkAccountBody.qml
+++ b/interface/resources/qml/LoginDialog/LinkAccountBody.qml
@ -45,7 +45,7 @@ Item {
    property bool lostFocus: false

    readonly property bool loginDialogPoppedUp: loginDialog.getLoginDialogPoppedUp()
-    // If not logging into domain, then we must be logging into the metaverse...
+    // If not logging into domain, then we must be logging into the directory services...
    readonly property bool isLoggingInToDomain: loginDialog.getDomainLoginRequested()
    readonly property string domainLoginDomain: loginDialog.getDomainLoginDomain()

@ -74,7 +74,7 @@ Item {
    }

    function login() {
-        // make sure the metaverse server is set so we don't send your password to the wrong place!
+        // make sure the directory server is set so we don't send your password to the wrong place!
        if (!isLoggingInToDomain) {
            Settings.setValue("private/selectedMetaverseURL", metaverseServerField.text);
        }
@ -120,9 +120,9 @@ Item {
            errorContainer.height = (loginErrorMessageTextMetrics.width / displayNameField.width) * loginErrorMessageTextMetrics.height;
        }
        var domainLoginText = "Log In to Domain\n" + domainLoginDomain;
-        loginDialogText.text = (!isLoggingInToDomain) ? "Log In to Metaverse" : domainLoginText;
+        loginDialogText.text = (!isLoggingInToDomain) ? "Log In to Directory Service" : domainLoginText;
        loginButton.text = (!linkAccountBody.linkSteam && !linkAccountBody.linkOculus) ? "Log In" : "Link Account";
-        loginButton.text = (!isLoggingInToDomain) ? "Log In to Metaverse" : "Log In to Domain";
+        loginButton.text = (!isLoggingInToDomain) ? "Log In to Directory Service" : "Log In to Domain";
        loginButton.color = hifi.buttons.blue;
        displayNameField.placeholderText = "Display Name (optional)";
        var savedDisplayName = Settings.getValue("Avatar/displayName", "");
@ -133,7 +133,7 @@ Item {
            emailField.text = keepMeLoggedInCheckbox.checked ? savedUsername === "Unknown user" ? "" : savedUsername : "";

            var metaverseServer = Settings.getValue("private/selectedMetaverseURL", "");
-            console.log("Saved metaverse server:", metaverseServer);
+            console.log("Saved directory server:", metaverseServer);
            metaverseServerField.text = metaverseServer;
        } else {
            // ####### TODO
@ -388,7 +388,7 @@ Item {
                    top: passwordField.bottom
                    topMargin: 1.5 * hifi.dimensions.contentSpacing.y
                }
-                placeholderText: "Metaverse Server (optional)"
+                placeholderText: "Directory Server (optional)"
                activeFocusOnPress: true
                Keys.onPressed: {
                    switch (event.key) {
@ -405,7 +405,7 @@ Item {
                            event.accepted = true;
                            if (!isLoggingInToDomain) {
                                var url = metaverseServerField.text;
-                                console.log("Setting metaverse server to", url);
+                                console.log("Setting directory server to", url);
                                Settings.setValue("private/selectedMetaverseURL", url);
                                if(AccountServices.isLoggedIn()){
                                    AccountServices.logOut();
@ -424,7 +424,7 @@ Item {
                        var url = metaverseServerField.text;
                        if(!(url == Settings.getValue("private/selectedMetaverseURL")) && !(url == "")){
                            if (!isLoggingInToDomain) {
-                                console.log("Setting metaverse server to", url);
+                                console.log("Setting directory server to", url);
                                Settings.setValue("private/selectedMetaverseURL", url);
                                if(AccountServices.isLoggedIn()){
                                    AccountServices.logOut();
--- a/interface/resources/qml/LoginDialog/SignUpBody.qml
+++ b/interface/resources/qml/LoginDialog/SignUpBody.qml
@ -395,7 +395,7 @@ Item {
                    text: signUpBody.termsContainerText
                    Component.onCompleted: {
                        // with the link.
-                        termsText.text = qsTr("By signing up, you agree to <a href='https://overte.org/termsofservice'>Vircadia's Terms of Service</a>")
+                        termsText.text = qsTr("By signing up, you agree to <a href='https://overte.org/legal/privacy/'>Overte Terms of Service</a>")
                    }
                }

--- a/interface/resources/qml/controls/+webengine/FlickableWebViewCore.qml
+++ b/interface/resources/qml/controls/+webengine/FlickableWebViewCore.qml
@ -147,7 +147,7 @@ Item {
                webViewCore.profile.offTheRecord = false;
                webViewCore.profile.storageName = "qmlWebEngine";
            } else {
-                webViewCore.profile.httpUserAgent += " (VircadiaInterface)";
+                webViewCore.profile.httpUserAgent += " (OverteInterface)";
            }
            // Ensure the JS from the web-engine makes it to our logging
            webViewCore.javaScriptConsoleMessage.connect(function(level, message, lineNumber, sourceID) {
--- a/interface/resources/qml/hifi/avatarPackager/AvatarPackagerApp.qml
+++ b/interface/resources/qml/hifi/avatarPackager/AvatarPackagerApp.qml
@ -229,7 +229,7 @@ Item {
        }

        function openDocs() {
-            Qt.openUrlExternally("https://docs.vircadia.com/create/avatars/package-avatar.html");
+            Qt.openUrlExternally("https://docs.overte.org/create/avatars/package-avatar.html");
        }

        function openVideo() {
--- a/interface/resources/qml/hifi/avatarapp/MessageBoxes.qml
+++ b/interface/resources/qml/hifi/avatarapp/MessageBoxes.qml
@ -7,7 +7,7 @@ MessageBox {
        popup.onButton2Clicked = callback;
        popup.titleText = 'Specify Avatar URL'
        popup.bodyText = 'This will not overwrite your existing favorite if you are wearing one.<br>' +
-                '<a href="https://docs.vircadia.com/create/avatars/create-avatars.html">' +
+                '<a href="https://docs.overte.org/create/avatars/create-avatars.html">' +
                'Learn to make a custom avatar by opening this link on your desktop.' +
                '</a>'
        popup.inputText.visible = true;
--- a/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
+++ b/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
@ -779,7 +779,7 @@ Rectangle {
                    lightboxPopup.bodyText = "Rezzing this content set will replace the existing environment and all of the items in this domain. " +
                        "If you want to save the state of the content in this domain, create a backup before proceeding.<br><br>" +
                        "For more information about backing up and restoring content, " +
-                        "<a href='https://docs.vircadia.com/host/maintain-domain/backup-domain.html'>" +
+                        "<a href='https://docs.overte.org/host/maintain-domain/backup-domain.html'>" +
                        "click here to open info on your desktop browser.";
                    lightboxPopup.button1text = "CANCEL";
                    lightboxPopup.button1method = function() {
--- a/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
+++ b/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
@ -603,7 +603,7 @@ Rectangle {
                            lightboxPopup.bodyText = "Rezzing this content set will replace the existing environment and all of the items in this domain. " +
                                "If you want to save the state of the content in this domain, create a backup before proceeding.<br><br>" +
                                "For more information about backing up and restoring content, " +
-                                "<a href='https://docs.vircadia.com/host/maintain-domain/backup-domain.html'>" +
+                                "<a href='https://docs.overte.org/host/maintain-domain/backup-domain.html'>" +
                                "click here to open info on your desktop browser.";
                            lightboxPopup.button1text = "CANCEL";
                            lightboxPopup.button1method = function() {
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@ -1273,7 +1273,7 @@ Application::Application(
    // to has gone down and switched to a new content set, so when you reconnect the cached ATP assets will no longer be valid.
    connect(&domainHandler, &DomainHandler::disconnectedFromDomain, DependencyManager::get<ScriptCache>().data(), &ScriptCache::clearATPScriptsFromCache);

-    // update our location every 5 seconds in the metaverse server, assuming that we are authenticated with one
+    // update our location every 5 seconds in the directory server, assuming that we are authenticated with one
    const qint64 DATA_SERVER_LOCATION_CHANGE_UPDATE_MSECS = 5 * MSECS_PER_SECOND;

    auto discoverabilityManager = DependencyManager::get<DiscoverabilityManager>();
@ -1282,7 +1282,7 @@ Application::Application(
        DependencyManager::get<AddressManager>().data(), &AddressManager::storeCurrentAddress);
    locationUpdateTimer.start(DATA_SERVER_LOCATION_CHANGE_UPDATE_MSECS);

-    // if we get a domain change, immediately attempt update location in metaverse server
+    // if we get a domain change, immediately attempt update location in directory server
    connect(&nodeList->getDomainHandler(), &DomainHandler::connectedToDomain,
        discoverabilityManager.data(), &DiscoverabilityManager::updateLocation);

@ -2571,7 +2571,7 @@ Application::Application(
    _pendingIdleEvent = false;
    _graphicsEngine.startup();

-    qCDebug(interfaceapp) << "Metaverse session ID is" << uuidStringWithoutCurlyBraces(accountManager->getSessionID());
+    qCDebug(interfaceapp) << "Directory Service session ID is" << uuidStringWithoutCurlyBraces(accountManager->getSessionID());

 #if defined(Q_OS_ANDROID)
    connect(&AndroidHelper::instance(), &AndroidHelper::beforeEnterBackground, this, &Application::beforeEnterBackground);
@ -2645,7 +2645,7 @@ QString Application::getUserAgent() {
        return userAgent;
    }

-    QString userAgent = NetworkingConstants::VIRCADIA_USER_AGENT + "/" + BuildInfo::VERSION + "; "
+    QString userAgent = NetworkingConstants::OVERTE_USER_AGENT + "/" + BuildInfo::VERSION + "; "
        + QSysInfo::productType() + " " + QSysInfo::productVersion() + ")";

    auto formatPluginName = [](QString name) -> QString { return name.trimmed().replace(" ", "-");  };
@ -3983,7 +3983,7 @@ void Application::handleSandboxStatus(QNetworkReply* reply) {

    // when --url in command line, teleport to location
    if (!_urlParam.isEmpty()) { // Not sure if format supported by isValid().
-        if (_urlParam.scheme() == URL_SCHEME_VIRCADIAAPP) {
+        if (_urlParam.scheme() == URL_SCHEME_OVERTEAPP) {
            Setting::Handle<QVariant>("startUpApp").set(_urlParam.path());
        } else {
            addressLookupString = _urlParam.toString();
@ -3998,7 +3998,7 @@ void Application::handleSandboxStatus(QNetworkReply* reply) {
    // If this is a first run we short-circuit the address passed in
    if (_firstRun.get()) {
        if (!BuildInfo::PRELOADED_STARTUP_LOCATION.isEmpty()) {
-            DependencyManager::get<LocationBookmarks>()->setHomeLocationToAddress(NetworkingConstants::DEFAULT_VIRCADIA_ADDRESS);
+            DependencyManager::get<LocationBookmarks>()->setHomeLocationToAddress(NetworkingConstants::DEFAULT_OVERTE_ADDRESS);
            Menu::getInstance()->triggerOption(MenuOption::HomeLocation);
        }

@ -7210,9 +7210,9 @@ void Application::updateWindowTitle() const {

    QString metaverseDetails;
    if (isMetaverseLoggedIn) {
-        metaverseDetails = " (Metaverse: Connected to " + MetaverseAPI::getCurrentMetaverseServerURL().toString() + " as " + metaverseUsername + ")";
+        metaverseDetails = " (Directory Services: Connected to " + MetaverseAPI::getCurrentMetaverseServerURL().toString() + " as " + metaverseUsername + ")";
    } else {
-        metaverseDetails = " (Metaverse: Not Logged In)";
+        metaverseDetails = " (Directory Services: Not Logged In)";
    }

    QString domainDetails;
@ -7268,7 +7268,7 @@ void Application::clearDomainOctreeDetails(bool clearAll) {

 void Application::domainURLChanged(QUrl domainURL) {
    // disable physics until we have enough information about our new location to not cause craziness.
-    setIsServerlessMode(domainURL.scheme() != URL_SCHEME_VIRCADIA);
+    setIsServerlessMode(domainURL.scheme() != URL_SCHEME_OVERTE);
    if (isServerlessMode()) {
        loadServerlessDomain(domainURL);
    }
@ -7277,7 +7277,7 @@ void Application::domainURLChanged(QUrl domainURL) {

 void Application::goToErrorDomainURL(QUrl errorDomainURL) {
    // disable physics until we have enough information about our new location to not cause craziness.
-    setIsServerlessMode(errorDomainURL.scheme() != URL_SCHEME_VIRCADIA);
+    setIsServerlessMode(errorDomainURL.scheme() != URL_SCHEME_OVERTE);
    if (isServerlessMode()) {
        loadErrorDomain(errorDomainURL);
    }
@ -7641,7 +7641,7 @@ bool Application::canAcceptURL(const QString& urlString) const {
    QUrl url(urlString);
    if (url.query().contains(WEB_VIEW_TAG)) {
        return false;
-    } else if (urlString.startsWith(URL_SCHEME_VIRCADIA)) {
+    } else if (urlString.startsWith(URL_SCHEME_OVERTE)) {
        return true;
    }
    QString lowerPath = url.path().toLower();
@ -7656,7 +7656,7 @@ bool Application::canAcceptURL(const QString& urlString) const {
 bool Application::acceptURL(const QString& urlString, bool defaultUpload) {
    QUrl url(urlString);

-    if (url.scheme() == URL_SCHEME_VIRCADIA) {
+    if (url.scheme() == URL_SCHEME_OVERTE) {
        // this is a hifi URL - have the AddressManager handle it
        QMetaObject::invokeMethod(DependencyManager::get<AddressManager>().data(), "handleLookupString",
                                  Qt::AutoConnection, Q_ARG(const QString&, urlString));
@ -7787,7 +7787,7 @@ bool Application::askToWearAvatarAttachmentUrl(const QString& url) {
    QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
    QNetworkRequest networkRequest = QNetworkRequest(url);
    networkRequest.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
-    networkRequest.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::VIRCADIA_USER_AGENT);
+    networkRequest.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::OVERTE_USER_AGENT);
    QNetworkReply* reply = networkAccessManager.get(networkRequest);
    int requestNumber = ++_avatarAttachmentRequest;
    connect(reply, &QNetworkReply::finished, [this, reply, url, requestNumber]() {
@ -7884,7 +7884,7 @@ bool Application::askToReplaceDomainContent(const QString& url) {
            static const QString infoText = simpleWordWrap("Your domain's content will be replaced with a new content set. "
                "If you want to save what you have now, create a backup before proceeding. For more information about backing up "
                "and restoring content, visit the documentation page at: ", MAX_CHARACTERS_PER_LINE) +
-                "\nhttps://docs.vircadia.com/host/maintain-domain/backup-domain.html";
+                "\nhttps://docs.overte.org/host/maintain-domain/backup-domain.html";

            ModalDialogListener* dig = OffscreenUi::asyncQuestion("Are you sure you want to replace this domain's content set?",
                                                                  infoText, QMessageBox::Yes | QMessageBox::No, QMessageBox::No);
--- a/interface/src/CrashHandler_Crashpad.cpp
+++ b/interface/src/CrashHandler_Crashpad.cpp
@ -13,7 +13,7 @@

 #include "CrashHandler.h"

-Q_LOGGING_CATEGORY(crash_handler, "vircadia.crash_handler")
+Q_LOGGING_CATEGORY(crash_handler, "overte.crash_handler")

 #include <assert.h>

--- a/interface/src/CrashHandler_None.cpp
+++ b/interface/src/CrashHandler_None.cpp
@ -18,7 +18,7 @@
 #include <QDebug>


-Q_LOGGING_CATEGORY(crash_handler, "vircadia.crash_handler")
+Q_LOGGING_CATEGORY(crash_handler, "overte.crash_handler")

 bool startCrashHandler(std::string appPath) {
    qCWarning(crash_handler) << "No crash handler available.";
--- a/interface/src/DiscoverabilityManager.cpp
+++ b/interface/src/DiscoverabilityManager.cpp
@ -118,7 +118,7 @@ void DiscoverabilityManager::updateLocation() {
                                   callbackParameters, QJsonDocument(rootObject).toJson());

    } else if (UserActivityLogger::getInstance().isEnabled()) {
-        // we still send a heartbeat to the metaverse server for stats collection
+        // we still send a heartbeat to the directory server for stats collection

        JSONCallbackParameters callbackParameters;
        callbackParameters.callbackReceiver = this;
--- a/interface/src/LocationBookmarks.h
+++ b/interface/src/LocationBookmarks.h
@ -18,7 +18,7 @@

 /*@jsdoc
 * The <code>LocationBookmarks</code> API provides facilities for working with location bookmarks. A location bookmark 
- * associates a name with a metaverse address.
+ * associates a name with a directory services address.
 *
 * @namespace LocationBookmarks
 *
@ -38,11 +38,11 @@ public:
    static const QString HOME_BOOKMARK;

    /*@jsdoc
-     * Gets the metaverse address associated with a bookmark.
+     * Gets the directory services address associated with a bookmark.
     * @function LocationBookmarks.getAddress
-     * @param {string} bookmarkName - Name of the bookmark to get the metaverse address for (case sensitive).
-     * @returns {string} The metaverse address for the bookmark. If the bookmark does not exist, <code>""</code> is returned.
-     * @example <caption>Report the "Home" bookmark's metaverse address.</caption>
+     * @param {string} bookmarkName - Name of the bookmark to get the directory services address for (case sensitive).
+     * @returns {string} The directory services address for the bookmark. If the bookmark does not exist, <code>""</code> is returned.
+     * @example <caption>Report the "Home" bookmark's directory services address.</caption>
     * print("Home bookmark's address: " + LocationBookmarks.getAddress("Home"));
     */
    Q_INVOKABLE QString getAddress(const QString& bookmarkName);
@ -57,16 +57,16 @@ public slots:
    void addBookmark();

    /*@jsdoc
-     * Sets the metaverse address associated with the "Home" bookmark.
+     * Sets the directory services address associated with the "Home" bookmark.
     * @function LocationBookmarks.setHomeLocationToAddress
-     * @param {string} address - The metaverse address to set the "Home" bookmark to.
+     * @param {string} address - The directory services address to set the "Home" bookmark to.
     */
    void setHomeLocationToAddress(const QVariant& address);

    /*@jsdoc
-     * Gets the metaverse address associated with the "Home" bookmark.
+     * Gets the directory services address associated with the "Home" bookmark.
     * @function LocationBookmarks.getHomeLocationAddress
-     * @returns {string} The metaverse address for the "Home" bookmark.
+     * @returns {string} The directory services address for the "Home" bookmark.
     */
    QString getHomeLocationAddress();

--- a/interface/src/SpeechRecognizer.h
+++ b/interface/src/SpeechRecognizer.h
@ -82,7 +82,7 @@ signals:
     *     return turnRate;
     * }
     * 
-     * var MAPPING_NAME = "com.vircadia.controllers.example.speechRecognizer";
+     * var MAPPING_NAME = "org.overte.controllers.example.speechRecognizer";
     * var mapping = Controller.newMapping(MAPPING_NAME);
     * 
     * mapping.from(getTurnRate).to(Controller.Actions.Yaw);
--- a/interface/src/avatar/AvatarDoctor.cpp
+++ b/interface/src/avatar/AvatarDoctor.cpp
@ -55,7 +55,7 @@ static QStringList HAND_MAPPING_SUFFIXES = {
    "HandThumb1",
 };

-const QUrl PACKAGE_AVATAR_DOCS_BASE_URL = QUrl("https://docs.vircadia.com/create/avatars/package-avatar.html");
+const QUrl PACKAGE_AVATAR_DOCS_BASE_URL = QUrl("https://docs.overte.org/create/avatars/package-avatar.html");

 AvatarDoctor::AvatarDoctor(const QUrl& avatarFSTFileUrl) :
    _avatarFSTFileUrl(avatarFSTFileUrl) {
--- a/interface/src/avatar/MyAvatar.h
+++ b/interface/src/avatar/MyAvatar.h
@ -682,7 +682,7 @@ public:
     * <p>Note: When using pre-built animation data, it's critical that the joint orientation of the source animation and target
     * rig are equivalent, since the animation data applies absolute values onto the joints. If the orientations are different,
     * the avatar will move in unpredictable ways. For more information about avatar joint orientation standards, see
-     * <a href="https://docs.vircadia.com/create/avatars/avatar-standards.html">Avatar Standards</a>.</p>
+     * <a href="https://docs.overte.org/create/avatars/avatar-standards.html">Avatar Standards</a>.</p>
     * @function MyAvatar.overrideAnimation
     * @param {string} url - The URL to the animation file. Animation files may be in glTF or FBX format, but only need to
     *     contain the avatar skeleton and animation data. glTF models may be in JSON or binary format (".gltf" or ".glb" URLs
@ -790,7 +790,7 @@ public:
     * <p>Note: When using pre-built animation data, it's critical that the joint orientation of the source animation and target
     * rig are equivalent, since the animation data applies absolute values onto the joints. If the orientations are different,
     * the avatar will move in unpredictable ways. For more information about avatar joint orientation standards, see
-     * <a href="https://docs.vircadia.com/create/avatars/avatar-standards.html">Avatar Standards</a>.
+     * <a href="https://docs.overte.org/create/avatars/avatar-standards.html">Avatar Standards</a>.
     * @function MyAvatar.overrideRoleAnimation
     * @param {string} role - The animation role to override
     * @param {string} url - The URL to the animation file. Animation files need to be in glTF or FBX format, but only need to
@ -1954,7 +1954,7 @@ public:

    /*@jsdoc
     * Enables and disables flow simulation of physics on the avatar's hair, clothes, and body parts. See
-     * {@link https://docs.vircadia.com/create/avatars/add-flow.html|Add Flow to Your Avatar} for more
+     * {@link https://docs.overte.org/create/avatars/add-flow.html|Add Flow to Your Avatar} for more
     * information.
     * @function MyAvatar.useFlow
     * @param {boolean} isActive - <code>true</code> if flow simulation is enabled on the joint, <code>false</code> if it isn't.
@ -2317,7 +2317,7 @@ public slots:

    /*@jsdoc
     * Gets the URL of the override animation graph.
-     * <p>See {@link https://docs.vircadia.com/create/avatars/custom-animations.html|Custom Avatar Animations} for
+     * <p>See {@link https://docs.overte.org/create/avatars/custom-animations.html|Custom Avatar Animations} for
     * information on animation graphs.</p>
     * @function MyAvatar.getAnimGraphOverrideUrl
     * @returns {string} The URL of the override animation graph JSON file. <code>""</code> if there is no override animation
@ -2327,7 +2327,7 @@ public slots:

    /*@jsdoc
     * Sets the animation graph to use in preference to the default animation graph.
-     * <p>See {@link https://docs.vircadia.com/create/avatars/custom-animations.html|Custom Avatar Animations} for
+     * <p>See {@link https://docs.overte.org/create/avatars/custom-animations.html|Custom Avatar Animations} for
     * information on animation graphs.</p>
     * @function MyAvatar.setAnimGraphOverrideUrl
     * @param {string} url - The URL of the animation graph JSON file to use. Set to <code>""</code> to clear an override.
@ -2336,7 +2336,7 @@ public slots:

    /*@jsdoc
     * Gets the URL of animation graph (i.e., the avatar animation JSON) that's currently being used for avatar animations.
-     * <p>See {@link https://docs.vircadia.com/create/avatars/custom-animations.html|Custom Avatar Animations} for
+     * <p>See {@link https://docs.overte.org/create/avatars/custom-animations.html|Custom Avatar Animations} for
     * information on animation graphs.</p>
     * @function MyAvatar.getAnimGraphUrl
     * @returns {string} The URL of the current animation graph JSON file.
@ -2347,7 +2347,7 @@ public slots:

    /*@jsdoc
     * Sets the current animation graph  (i.e., the avatar animation JSON) to use for avatar animations and makes it the default.
-     * <p>See {@link https://docs.vircadia.com/create/avatars/custom-animations.html|Custom Avatar Animations} for
+     * <p>See {@link https://docs.overte.org/create/avatars/custom-animations.html|Custom Avatar Animations} for
     * information on animation graphs.</p>
     * @function MyAvatar.setAnimGraphUrl
     * @param {string} url - The URL of the animation graph JSON file to use.
--- a/interface/src/main.cpp
+++ b/interface/src/main.cpp
@ -69,7 +69,7 @@ int main(int argc, const char* argv[]) {
    LogHandler::getInstance().setShouldUseJournald(false);

    QCommandLineParser parser;
-    parser.setApplicationDescription("Overte -- A free/libre and open-source metaverse client");
+    parser.setApplicationDescription("Overte -- A free/libre and open-source virtual worlds client");
    QCommandLineOption helpOption = parser.addHelpOption();
    QCommandLineOption versionOption = parser.addVersionOption();

@ -466,7 +466,7 @@ int main(int argc, const char* argv[]) {
        if (socket.waitForConnected(LOCAL_SERVER_TIMEOUT_MS)) {
            if (parser.isSet(urlOption)) {
                QUrl url = QUrl(parser.value(urlOption));
-                if (url.isValid() && (url.scheme() == URL_SCHEME_VIRCADIA || url.scheme() == URL_SCHEME_VIRCADIAAPP
+                if (url.isValid() && (url.scheme() == URL_SCHEME_OVERTE || url.scheme() == URL_SCHEME_OVERTEAPP
                        || url.scheme() == HIFI_URL_SCHEME_HTTP || url.scheme() == HIFI_URL_SCHEME_HTTPS
                        || url.scheme() == HIFI_URL_SCHEME_FILE)) {
                    qDebug() << "Writing URL to local socket";
--- a/interface/src/scripting/AccountServicesScriptingInterface.h
+++ b/interface/src/scripting/AccountServicesScriptingInterface.h
@ -85,7 +85,7 @@ class AccountServicesScriptingInterface : public QObject {
     *         <li><code>"connections"</code> &mdash; user is visible to friends and connections.</li>
     *         <li><code>"all"</code> &mdash; user is visible to everyone.</li>
     *     </ul>
-     * @property {string} metaverseServerURL - The metaverse server that the user is authenticated against when logged in
+     * @property {string} metaverseServerURL - The directory server that the user is authenticated against when logged in
     *     &mdash; typically <code>"https://metaverse.highfidelity.com"</code>. <em>Read-only.</em>
     *
     * @borrows AccountServices.getDownloadInfo as getDownloadInfo
@ -125,7 +125,7 @@ class AccountServicesScriptingInterface : public QObject {
     *         <li><code>"connections"</code> &mdash; user is visible to friends and connections.</li>
     *         <li><code>"all"</code> &mdash; user is visible to everyone.</li>
     *     </ul>
-     * @property {string} metaverseServerURL - The metaverse server that the user is authenticated against when logged in
+     * @property {string} metaverseServerURL - The directory server that the user is authenticated against when logged in
     *     &mdash; typically <code>"https://metaverse.highfidelity.com"</code>. <em>Read-only.</em>
     *
     * @borrows AccountServices.getDownloadInfo as getDownloadInfo
@ -194,7 +194,7 @@ public slots:
    void logOut();

    /*@jsdoc
-     * Updates Metaverse Server URL in AccountManager. It's called by Login window after Metaverse Server URL is changed.
+     * Updates Directory Server URL in AccountManager. It's called by Login window after Directory Server URL is changed.
     * @function AccountServices.updateAuthURLFromMetaverseServerURL
     */
    void updateAuthURLFromMetaverseServerURL();
--- a/interface/src/scripting/WindowScriptingInterface.cpp
+++ b/interface/src/scripting/WindowScriptingInterface.cpp
@ -139,9 +139,9 @@ void WindowScriptingInterface::disconnectedFromDomain() {
 void WindowScriptingInterface::openUrl(const QUrl& url) {
    if (!url.isEmpty()) {
        auto scheme = url.scheme();
-        if (scheme == URL_SCHEME_VIRCADIA) {
+        if (scheme == URL_SCHEME_OVERTE) {
            DependencyManager::get<AddressManager>()->handleLookupString(url.toString());
-        } else if (scheme == URL_SCHEME_VIRCADIAAPP) {
+        } else if (scheme == URL_SCHEME_OVERTEAPP) {
            DependencyManager::get<QmlCommerce>()->openSystemApp(url.path());
        } else {
 #if defined(Q_OS_ANDROID)
@ -413,7 +413,7 @@ QString WindowScriptingInterface::checkVersion() {
 }

 QString WindowScriptingInterface::getUserAgent() {
-    return NetworkingConstants::VIRCADIA_USER_AGENT;
+    return NetworkingConstants::OVERTE_USER_AGENT;
 }

 QString WindowScriptingInterface::protocolSignature() {
--- a/interface/src/scripting/WindowScriptingInterface.h
+++ b/interface/src/scripting/WindowScriptingInterface.h
@ -43,7 +43,7 @@
 *     <em>Read-only.</em>
 * @property {boolean} interstitialModeEnabled=false - <code>true</code> if the interstitial graphics are displayed when a 
 *     domain is loading, otherwise <code>false</code>.
- * @property {location} location - Provides facilities for working with your current metaverse location.
+ * @property {location} location - Provides facilities for working with your current directory services location.
 */

 class WindowScriptingInterface : public QObject, public Dependency {
@ -305,7 +305,7 @@ public slots:
    /*@jsdoc
     * Gets the signature for Interface's protocol version.
     * @function Window.protocolSignature
-     * @returns {string} A string uniquely identifying the version of the metaverse protocol that Interface is using.
+     * @returns {string} A string uniquely identifying the version of the directory services protocol that Interface is using.
     */
    QString protocolSignature();

@ -429,7 +429,7 @@ public slots:
     * has been prepared.
     * @function Window.shareSnapshot
     * @param {string} path - The path and name of the image file to share.
-     * @param {string} [href=""] - The metaverse location where the snapshot was taken.
+     * @param {string} [href=""] - The directory services location where the snapshot was taken.
     */
    void shareSnapshot(const QString& path, const QUrl& href = QUrl(""));

--- a/interface/src/ui/LoginDialog.cpp
+++ b/interface/src/ui/LoginDialog.cpp
@ -99,11 +99,11 @@ void LoginDialog::toggleAction() {

    if (accountManager->isLoggedIn()) {
        // change the menu item to logout
-        loginAction->setText("Metaverse: Logout " + accountManager->getAccountInfo().getUsername());
+        loginAction->setText("Directory Service: Logout " + accountManager->getAccountInfo().getUsername());
        connection = connect(loginAction, &QAction::triggered, accountManager.data(), &AccountManager::logout);
    } else {
        // change the menu item to login
-        loginAction->setText("Metaverse: Log In / Sign Up");
+        loginAction->setText("Directory Service: Log In / Sign Up");
        connection = connect(loginAction, &QAction::triggered, [] {
            // if not in login state, show.
            if (!qApp->getLoginDialogPoppedUp()) {
--- a/interface/src/ui/ModelsBrowser.cpp
+++ b/interface/src/ui/ModelsBrowser.cpp
@ -34,7 +34,7 @@
 const char* MODEL_TYPE_NAMES[] = { "entities", "heads", "skeletons", "skeletons", "attachments" };

 static const QString S3_URL = NetworkingConstants::HF_PUBLIC_CDN_URL;
-static const QString PUBLIC_URL = "http://public.vircadia.com"; // Changed to Vircadia but not entirely sure what to do with this yet.
+static const QString PUBLIC_URL = "http://public.overte.org"; // Changed to Overte but not entirely sure what to do with this yet.
 static const QString MODELS_LOCATION = "models/";

 static const QString PREFIX_PARAMETER_NAME = "prefix";
@ -227,7 +227,7 @@ void ModelHandler::update() {
        QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
        QNetworkRequest request(url);
        request.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
-        request.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::VIRCADIA_USER_AGENT);
+        request.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::OVERTE_USER_AGENT);
        QNetworkReply* reply = networkAccessManager.head(request);
        connect(reply, SIGNAL(finished()), SLOT(downloadFinished()));
    }
@ -280,7 +280,7 @@ void ModelHandler::queryNewFiles(QString marker) {
    QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
    QNetworkRequest request(url);
    request.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
-    request.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::VIRCADIA_USER_AGENT);
+    request.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::OVERTE_USER_AGENT);
    QNetworkReply* reply = networkAccessManager.get(request);
    connect(reply, SIGNAL(finished()), SLOT(downloadFinished()));
            
--- a/launchers/darwin/CMakeLists.txt
+++ b/launchers/darwin/CMakeLists.txt
@ -149,7 +149,7 @@ set(CPACK_PACKAGE_FILE_NAME "HQ Launcher")

 set(CPACK_NSIS_DISPLAY_NAME ${_DISPLAY_NAME})

-set(DMG_SUBFOLDER_NAME "Vircadia")
+set(DMG_SUBFOLDER_NAME "Overte")
 set(ESCAPED_DMG_SUBFOLDER_NAME "")
 set(DMG_SUBFOLDER_ICON "${CMAKE_SOURCE_DIR}/cmake/installer/install-folder.rsrc")

--- a/libraries/auto-updater/src/AutoUpdater.cpp
+++ b/libraries/auto-updater/src/AutoUpdater.cpp
@ -51,7 +51,7 @@ void AutoUpdater::getLatestVersionData() {
    QNetworkRequest latestVersionRequest(buildsURL);

    latestVersionRequest.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
-    latestVersionRequest.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::VIRCADIA_USER_AGENT);
+    latestVersionRequest.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::OVERTE_USER_AGENT);
    QNetworkReply* reply = networkAccessManager.get(latestVersionRequest);
    connect(reply, &QNetworkReply::finished, this, &AutoUpdater::parseLatestVersionData);
 }
--- a/libraries/avatars-renderer/src/avatars-renderer/Avatar.h
+++ b/libraries/avatars-renderer/src/avatars-renderer/Avatar.h
@ -208,7 +208,7 @@ public:
    /*@jsdoc
     * Gets the default rotation of a joint (in the current avatar) relative to its parent.
     * <p>For information on the joint hierarchy used, see
-     * <a href="https://docs.vircadia.com/create/avatars/avatar-standards.html">Avatar Standards</a>.</p>
+     * <a href="https://docs.overte.org/create/avatars/avatar-standards.html">Avatar Standards</a>.</p>
     * @function MyAvatar.getDefaultJointRotation
     * @param {number} index - The joint index.
     * @returns {Quat} The default rotation of the joint if the joint index is valid, otherwise {@link Quat(0)|Quat.IDENTITY}.
@ -219,7 +219,7 @@ public:
     * Gets the default translation of a joint (in the current avatar) relative to its parent, in model coordinates.
     * <p><strong>Warning:</strong> These coordinates are not necessarily in meters.</p>
     * <p>For information on the joint hierarchy used, see
-     * <a href="https://docs.vircadia.com/create/avatars/avatar-standards.html">Avatar Standards</a>.</p>
+     * <a href="https://docs.overte.org/create/avatars/avatar-standards.html">Avatar Standards</a>.</p>
     * @function MyAvatar.getDefaultJointTranslation
     * @param {number} index - The joint index.
     * @returns {Vec3} The default translation of the joint (in model coordinates) if the joint index is valid, otherwise
--- a/libraries/avatars-renderer/src/avatars-renderer/ScriptAvatar.h
+++ b/libraries/avatars-renderer/src/avatars-renderer/ScriptAvatar.h
@ -88,7 +88,7 @@ public slots:
    /*@jsdoc
     * Gets the default rotation of a joint in the avatar relative to its parent.
     * <p>For information on the joint hierarchy used, see
-     * <a href="https://docs.vircadia.com/create/avatars/avatar-standards.html">Avatar Standards</a>.</p>
+     * <a href="https://docs.overte.org/create/avatars/avatar-standards.html">Avatar Standards</a>.</p>
     * @function ScriptAvatar.getDefaultJointRotation
     * @param {number} index - The joint index.
     * @returns {Quat} The default rotation of the joint if avatar data are available and the joint index is valid, otherwise
@ -100,7 +100,7 @@ public slots:
     * Gets the default translation of a joint in the avatar relative to its parent, in model coordinates.
     * <p><strong>Warning:</strong> These coordinates are not necessarily in meters.</p>
     * <p>For information on the joint hierarchy used, see
-     * <a href="https://docs.vircadia.com/create/avatars/avatar-standards.html">Avatar Standards</a>.</p>
+     * <a href="https://docs.overte.org/create/avatars/avatar-standards.html">Avatar Standards</a>.</p>
     * @function ScriptAvatar.getDefaultJointTranslation
     * @param {number} index - The joint index.
     * @returns {Vec3} The default translation of the joint (in model coordinates) if avatar data are available and the joint
--- a/libraries/avatars/src/AvatarData.h
+++ b/libraries/avatars/src/AvatarData.h
@ -862,7 +862,7 @@ public:

    /*@jsdoc
     * Gets the rotation of a joint relative to its parent. For information on the joint hierarchy used, see
-     * <a href="https://docs.vircadia.com/create/avatars/avatar-standards.html">Avatar Standards</a>.
+     * <a href="https://docs.overte.org/create/avatars/avatar-standards.html">Avatar Standards</a>.
     * @function Avatar.getJointRotation
     * @param {number} index - The index of the joint.
     * @returns {Quat} The rotation of the joint relative to its parent.
@ -873,7 +873,7 @@ public:
     * Gets the translation of a joint relative to its parent, in model coordinates.
     * <p><strong>Warning:</strong> These coordinates are not necessarily in meters.</p>
     * <p>For information on the joint hierarchy used, see
-     * <a href="https://docs.vircadia.com/create/avatars/avatar-standards.html">Avatar Standards</a>.</p>
+     * <a href="https://docs.overte.org/create/avatars/avatar-standards.html">Avatar Standards</a>.</p>
     * @function Avatar.getJointTranslation
     * @param {number} index - The index of the joint.
     * @returns {Vec3} The translation of the joint relative to its parent, in model coordinates.
@ -983,7 +983,7 @@ public:

    /*@jsdoc
     * Gets the rotation of a joint relative to its parent. For information on the joint hierarchy used, see
-     * <a href="https://docs.vircadia.com/create/avatars/avatar-standards.html">Avatar Standards</a>.
+     * <a href="https://docs.overte.org/create/avatars/avatar-standards.html">Avatar Standards</a>.
     * @function Avatar.getJointRotation
     * @param {string} name - The name of the joint.
     * @returns {Quat} The rotation of the joint relative to its parent.
@ -998,7 +998,7 @@ public:
     * Gets the translation of a joint relative to its parent, in model coordinates.
     * <p><strong>Warning:</strong> These coordinates are not necessarily in meters.</p>
     * <p>For information on the joint hierarchy used, see
-     * <a href="https://docs.vircadia.com/create/avatars/avatar-standards.html">Avatar Standards</a>.</p>
+     * <a href="https://docs.overte.org/create/avatars/avatar-standards.html">Avatar Standards</a>.</p>
     * @function Avatar.getJointTranslation
     * @param {number} name - The name of the joint.
     * @returns {Vec3} The translation of the joint relative to its parent, in model coordinates.
@ -1140,7 +1140,7 @@ public:
     * set <code>hasScriptedBlendshapes</code> back to <code>false</code> when the animation is complete.
     * @function Avatar.setBlendshape
     * @param {string} name - The name of the blendshape, per the
-     *     {@link https://docs.vircadia.com/create/avatars/avatar-standards.html#blendshapes Avatar Standards}.
+     *     {@link https://docs.overte.org/create/avatars/avatar-standards.html#blendshapes Avatar Standards}.
     * @param {number} value - A value between <code>0.0</code> and <code>1.0</code>.
     * @example <caption>Open your avatar's mouth wide.</caption>
     * MyAvatar.hasScriptedBlendshapes = true;
--- a/libraries/avatars/src/ScriptAvatarData.h
+++ b/libraries/avatars/src/ScriptAvatarData.h
@ -118,7 +118,7 @@ public:

    /*@jsdoc
     * Gets the rotation of a joint relative to its parent. For information on the joint hierarchy used, see
-     * <a href="https://docs.vircadia.com/create/avatars/avatar-standards.html">Avatar Standards</a>.
+     * <a href="https://docs.overte.org/create/avatars/avatar-standards.html">Avatar Standards</a>.
     * @function ScriptAvatar.getJointRotation
     * @param {number} index - The index of the joint.
     * @returns {Quat} The rotation of the joint relative to its parent, or {@link Quat(0)|Quat.IDENTITY} if the avatar data
@ -130,7 +130,7 @@ public:
     * Gets the translation of a joint relative to its parent, in model coordinates.
     * <p><strong>Warning:</strong> These coordinates are not necessarily in meters.</p>
     * <p>For information on the joint hierarchy used, see
-     * <a href="https://docs.vircadia.com/create/avatars/avatar-standards.html">Avatar Standards</a>.</p>
+     * <a href="https://docs.overte.org/create/avatars/avatar-standards.html">Avatar Standards</a>.</p>
     * @function ScriptAvatar.getJointTranslation
     * @param {number} index - The index of the joint.
     * @returns {Vec3} The translation of the joint relative to its parent, in model coordinates, or {@link Vec3(0)|Vec3.ZERO}
@ -140,7 +140,7 @@ public:

    /*@jsdoc
     * Gets the rotation of a joint relative to its parent. For information on the joint hierarchy used, see
-     * <a href="https://docs.vircadia.com/create/avatars/avatar-standards.html">Avatar Standards</a>.
+     * <a href="https://docs.overte.org/create/avatars/avatar-standards.html">Avatar Standards</a>.
     * @function ScriptAvatar.getJointRotation
     * @param {string} name - The name of the joint.
     * @returns {Quat} The rotation of the joint relative to its parent, or {@link Quat(0)|Quat.IDENTITY} if the avatar data
@ -152,7 +152,7 @@ public:
     * Gets the translation of a joint relative to its parent, in model coordinates.
     * <p><strong>Warning:</strong> These coordinates are not necessarily in meters.</p>
     * <p>For information on the joint hierarchy used, see
-     * <a href="https://docs.vircadia.com/create/avatars/avatar-standards.html">Avatar Standards</a>.</p>
+     * <a href="https://docs.overte.org/create/avatars/avatar-standards.html">Avatar Standards</a>.</p>
     * @function ScriptAvatar.getJointTranslation
     * @param {number} name - The name of the joint.
     * @returns {Vec3} The translation of the joint relative to its parent, in model coordinates, or {@link Vec3(0)|Vec3.ZERO}
--- a/libraries/baking/src/JSBaker.cpp
+++ b/libraries/baking/src/JSBaker.cpp
@ -63,7 +63,7 @@ void JSBaker::loadScript() {
        // setup the request to follow re-directs and always hit the network
        networkRequest.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
        networkRequest.setAttribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::AlwaysNetwork);
-        networkRequest.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::VIRCADIA_USER_AGENT);
+        networkRequest.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::OVERTE_USER_AGENT);

        networkRequest.setUrl(_jsURL);

--- a/libraries/baking/src/ModelBaker.cpp
+++ b/libraries/baking/src/ModelBaker.cpp
@ -160,7 +160,7 @@ void ModelBaker::saveSourceModel() {
        // setup the request to follow re-directs and always hit the network
        networkRequest.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
        networkRequest.setAttribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::AlwaysNetwork);
-        networkRequest.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::VIRCADIA_USER_AGENT);
+        networkRequest.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::OVERTE_USER_AGENT);

        networkRequest.setUrl(_modelURL);

--- a/libraries/baking/src/TextureBaker.cpp
+++ b/libraries/baking/src/TextureBaker.cpp
@ -100,7 +100,7 @@ void TextureBaker::loadTexture() {
        // setup the request to follow re-directs and always hit the network
        networkRequest.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
        networkRequest.setAttribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::AlwaysNetwork);
-        networkRequest.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::VIRCADIA_USER_AGENT);
+        networkRequest.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::OVERTE_USER_AGENT);

        networkRequest.setUrl(_textureURL);

--- a/libraries/controllers/src/controllers/ScriptingInterface.h
+++ b/libraries/controllers/src/controllers/ScriptingInterface.h
@ -276,7 +276,7 @@ namespace controller {
         *     by {@link Uuid(0).generate|Uuid.generate} is used.
         * @returns {MappingObject} A controller mapping object.
         * @example <caption>Create a simple mapping that makes the right trigger move your avatar up.</caption>
-         * var MAPPING_NAME = "com.vircadia.controllers.example.newMapping";
+         * var MAPPING_NAME = "org.overte.controllers.example.newMapping";
         * var mapping = Controller.newMapping(MAPPING_NAME);
         *
         * mapping.from(Controller.Standard.RT).to(Controller.Actions.TranslateY);
@ -311,7 +311,7 @@ namespace controller {
         * @returns {MappingObject} A controller mapping object.
         * @example <caption>Create a simple mapping that makes the right trigger move your avatar up.</caption>
         * var mappingJSON = {
-         *     "name": "com.vircadia.controllers.example.jsonMapping",
+         *     "name": "org.overte.controllers.example.jsonMapping",
         *     "channels": [
         *         { "from": "Standard.RT", "to": "Actions.TranslateY" }
         *     ]
@ -463,7 +463,7 @@ namespace controller {
         * {@link Controller.Hardware|Controller.Hardware.Keyboard} outputs.
         * @function Controller.captureMouseEvents
         * @example <caption>Disable Controller.Hardware.Keyboard mouse events for a short period.</caption>
-         * var MAPPING_NAME = "com.vircadia.controllers.example.newMapping";
+         * var MAPPING_NAME = "org.overte.controllers.example.newMapping";
         * var mapping = Controller.newMapping(MAPPING_NAME);
         * mapping.from(Controller.Hardware.Keyboard.MouseX).to(function (x) {
         *     print("Mouse x = " + x);
--- a/libraries/controllers/src/controllers/impl/MappingBuilderProxy.h
+++ b/libraries/controllers/src/controllers/impl/MappingBuilderProxy.h
@ -71,7 +71,7 @@ class UserInputMapper;
 * @property {Controller.MappingJSONRoute[]} channels - An array of routes.
 * @example <caption>A simple mapping JSON that makes the right trigger move your avatar up after a dead zone.</caption>
 * {
- *     "name": "com.vircadia.controllers.example.jsonMapping",
+ *     "name": "org.overte.controllers.example.jsonMapping",
 *     "channels": [
 *         { 
 *             "from": "Standard.RT", 
@ -176,7 +176,7 @@ public:
     * @returns {RouteObject} A route ready for mapping to an action or function using {@link RouteObject} methods. The data
     *     value passed to the route is the combined value of <code>source2 - source1</code>. 
     * @example <caption>Make the Oculus Touch triggers move your avatar up and down.</caption>
-     * var MAPPING_NAME = "com.vircadia.controllers.example.newMapping";
+     * var MAPPING_NAME = "org.overte.controllers.example.newMapping";
     * var mapping = Controller.newMapping(MAPPING_NAME);
     * mapping
     *     .makeAxis(Controller.Hardware.OculusTouch.LT, Controller.Hardware.OculusTouch.RT)
--- a/libraries/controllers/src/controllers/impl/RouteBuilderProxy.h
+++ b/libraries/controllers/src/controllers/impl/RouteBuilderProxy.h
@ -90,7 +90,7 @@ class RouteBuilderProxy : public QObject {
         * an in-line function definition.
         *
         * @example <caption>Make the right trigger move your avatar up.</caption>
-         * var MAPPING_NAME = "com.vircadia.controllers.example.newMapping";
+         * var MAPPING_NAME = "org.overte.controllers.example.newMapping";
         * var mapping = Controller.newMapping(MAPPING_NAME);
         *
         * mapping.from(Controller.Standard.RT).to(Controller.Actions.TranslateY);
@ -105,7 +105,7 @@ class RouteBuilderProxy : public QObject {
         *     print("Trigger value: " + value);
         * }
         *
-         * var MAPPING_NAME = "com.vircadia.controllers.example.newMapping";
+         * var MAPPING_NAME = "org.overte.controllers.example.newMapping";
         * var mapping = Controller.newMapping(MAPPING_NAME);
         *
         * mapping.from(Controller.Standard.RT).to(onRightTrigger);
@ -124,7 +124,7 @@ class RouteBuilderProxy : public QObject {
         *     otherwise it is disabled.
         * @returns {RouteObject} The <code>RouteObject</code> with debug output enabled or disabled.
         * @example <caption>Write debug information to the program log for a right trigger mapping.</caption>
-         * var MAPPING_NAME = "com.vircadia.controllers.example.newMapping";
+         * var MAPPING_NAME = "org.overte.controllers.example.newMapping";
         * var mapping = Controller.newMapping(MAPPING_NAME);
         *
         * mapping.from(Controller.Standard.RT).debug().to(function (value) {
@ -175,7 +175,7 @@ class RouteBuilderProxy : public QObject {
         * calls.</p>
         * @returns {RouteObject} The <code>RouteObject</code> with the condition added.
         * @example <caption>Process the right trigger differently in HMD and desktop modes.</caption>
-         * var MAPPING_NAME = "com.vircadia.controllers.example.newMapping";
+         * var MAPPING_NAME = "org.overte.controllers.example.newMapping";
         * var mapping = Controller.newMapping(MAPPING_NAME);
         *
         * // Processed only if in HMD mode.
@ -203,7 +203,7 @@ class RouteBuilderProxy : public QObject {
         * @param {number} max - The maximum value to pass through.
         * @returns {RouteObject} The route object with the clamp filter added.
         * @example <caption>Clamp right trigger values to between 0.3 and 0.7.</caption>
-         * var MAPPING_NAME = "com.vircadia.controllers.example.newMapping";
+         * var MAPPING_NAME = "org.overte.controllers.example.newMapping";
         * var mapping = Controller.newMapping(MAPPING_NAME);
         * mapping.from(Controller.Standard.RT).clamp(0.3, 0.7).to(function (value) {
         *     print("Value: " + value);
@ -225,7 +225,7 @@ class RouteBuilderProxy : public QObject {
         * @param {number} max - When the input value rises above this value the output value changes to <code>1</code>.
         * @returns {RouteObject} The <code>RouteObject</code> with the filter applied.
         * @example <caption>Round the right joystick forward/back values to 0 or 1 with hysteresis.</caption>
-         * var MAPPING_NAME = "com.vircadia.controllers.example.newMapping";
+         * var MAPPING_NAME = "org.overte.controllers.example.newMapping";
         * var mapping = Controller.newMapping(MAPPING_NAME);
         * mapping.from(Controller.Standard.RY).peek().to(function (value) {
         *     print("Raw value: " + value);  // 0.0 - 1.0.
@ -247,7 +247,7 @@ class RouteBuilderProxy : public QObject {
         * @param {number} interval - The interval between sending values, in seconds.
         * @returns {RouteObject} The <code>RouteObject</code> with the filter applied.
         * @example <caption>Send right trigger values every half second.</caption>
-         * var MAPPING_NAME = "com.vircadia.controllers.example.newMapping";
+         * var MAPPING_NAME = "org.overte.controllers.example.newMapping";
         * var mapping = Controller.newMapping(MAPPING_NAME);
         * mapping.from(Controller.Standard.RT).pulse(0.5).to(function (value) {
         *     print("Value: " + value);
@ -266,7 +266,7 @@ class RouteBuilderProxy : public QObject {
         * @param {number} multiplier - The scale to multiply the value by.
         * @returns {RouteObject} The <code>RouteObject</code> with the filter applied.
         * @example <caption>Scale the value of the right joystick forward/back values by 10.</caption>
-         * var MAPPING_NAME = "com.vircadia.controllers.example.newMapping";
+         * var MAPPING_NAME = "org.overte.controllers.example.newMapping";
         * var mapping = Controller.newMapping(MAPPING_NAME);
         * mapping.from(Controller.Standard.LY).to(function (value) {
         *     print("L value: " + value);  // -1.0 to 1.0 values.
@ -288,7 +288,7 @@ class RouteBuilderProxy : public QObject {
         * @function RouteObject#invert
         * @returns {RouteObject} The <code>RouteObject</code> with the filter applied.
         * @example <caption>Invert the value of the right joystick forward/back values.</caption>
-         * var MAPPING_NAME = "com.vircadia.controllers.example.newMapping";
+         * var MAPPING_NAME = "org.overte.controllers.example.newMapping";
         * var mapping = Controller.newMapping(MAPPING_NAME);
         * mapping.from(Controller.Standard.LY).to(function (value) {
         *     print("L value: " + value);  // -1.0 to 1.0 values, forward to back.
@ -313,7 +313,7 @@ class RouteBuilderProxy : public QObject {
         *    negative of this value is used.
         * @returns {RouteObject} The <code>RouteObject</code> with the filter applied.
         * @example <caption>Apply a dead-zone to the right joystick forward/back values.</caption>
-         * var MAPPING_NAME = "com.vircadia.controllers.example.newMapping";
+         * var MAPPING_NAME = "org.overte.controllers.example.newMapping";
         * var mapping = Controller.newMapping(MAPPING_NAME);
         * mapping.from(Controller.Standard.RY).deadZone(0.2).to(function (value) {
         *     print("Value: " + value);  // 0.0 - 1.0 values once outside the dead-zone.
@ -334,7 +334,7 @@ class RouteBuilderProxy : public QObject {
         * @returns {RouteObject} The <code>RouteObject</code> with the filter applied.
         * @example <caption>Round the right joystick forward/back values to <code>-1</code>, <code>0</code>, or 
         *     <code>1</code>.</caption>
-         * var MAPPING_NAME = "com.vircadia.controllers.example.newMapping";
+         * var MAPPING_NAME = "org.overte.controllers.example.newMapping";
         * var mapping = Controller.newMapping(MAPPING_NAME);
         * mapping.from(Controller.Standard.RY).constrainToInteger().to(function (value) {
         *     print("Value: " + value);  // -1, 0, or 1
@ -353,7 +353,7 @@ class RouteBuilderProxy : public QObject {
         * @function RouteObject#constrainToPositiveInteger
         * @returns {RouteObject} The <code>RouteObject</code> with the filter applied.
         * @example <caption>Round the right joystick forward/back values to <code>0</code> or <code>1</code>.</caption>
-         * var MAPPING_NAME = "com.vircadia.controllers.example.newMapping";
+         * var MAPPING_NAME = "org.overte.controllers.example.newMapping";
         * var mapping = Controller.newMapping(MAPPING_NAME);
         * mapping.from(Controller.Standard.RY).constrainToPositiveInteger().to(function (value) {
         *     print("Value: " + value);  // 0, or 1
@ -436,7 +436,7 @@ class RouteBuilderProxy : public QObject {
         * @function RouteObject#logicalNot
         * @returns {RouteObject} The <code>RouteObject</code> with the filter applied.
         * @example <caption>Logical NOT of LSTouch value.</caption>
-         * var MAPPING_NAME = "com.vircadia.controllers.example.newMapping";
+         * var MAPPING_NAME = "org.overte.controllers.example.newMapping";
         * var mapping = Controller.newMapping(MAPPING_NAME);
         * 
         * mapping.from(Controller.Standard.RSTouch).peek().to(function (value) {
--- a/libraries/entities/src/EntityItemProperties.cpp
+++ b/libraries/entities/src/EntityItemProperties.cpp
@ -768,7 +768,7 @@ EntityPropertyFlags EntityItemProperties::getChangedProperties() const {
 *     if it isn't.
 * @property {boolean} collisionsWillMove - A synonym for <code>dynamic</code>.
 *
- * @property {string} href="" - A "hifi://" metaverse address that a user is teleported to when they click on the entity.
+ * @property {string} href="" - A "hifi://" directory services address that a user is teleported to when they click on the entity.
 * @property {string} description="" - A description of the <code>href</code> property value.
 *
 * @property {string} userData="" - Used to store extra data about the entity in JSON format.
@ -1241,7 +1241,7 @@ EntityPropertyFlags EntityItemProperties::getChangedProperties() const {
 *     ],
 *     strokeWidths: [ 0.1, 0.1, 0.1 ],
 *     color: { red: 255, green: 0, blue: 0 },  // Use just the red channel from the image.
- *     textures: "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/flowArts/trails.png",
+ *     textures: "https://hifi-content/DomainContent/Toybox/flowArts/trails.png",
 *     isUVModeStretch: true,
 *     lifetime: 300  // Delete after 5 minutes.
 * });
--- a/libraries/gpu-gl/CMakeLists.txt
+++ b/libraries/gpu-gl/CMakeLists.txt
@ -1,9 +1,9 @@
 set(TARGET_NAME gpu-gl)
 setup_hifi_library(Concurrent)
 link_hifi_libraries(shared gl gpu gpu-gl-common shaders)
-if (UNIX AND NOT VIRCADIA_THREAD_DEBUGGING)
+if (UNIX AND NOT OVERTE_THREAD_DEBUGGING)
    target_link_libraries(${TARGET_NAME} pthread)
-endif(UNIX AND NOT VIRCADIA_THREAD_DEBUGGING)
+endif(UNIX AND NOT OVERTE_THREAD_DEBUGGING)
 GroupSources("src")

 set(OpenGL_GL_PREFERENCE "GLVND")
--- a/libraries/image/src/image/TextureProcessing.h
+++ b/libraries/image/src/image/TextureProcessing.h
@ -34,7 +34,7 @@ namespace TextureUsage {
 /*@jsdoc
 * <p>Describes the type of texture.</p>
 * <p>See also: {@link Material} and
- * {@link https://docs.vircadia.com/create/3d-models/pbr-materials-guide.html|PBR Materials Guide}.</p>
+ * {@link https://docs.overte.org/create/3d-models/pbr-materials-guide.html|PBR Materials Guide}.</p>
 * <table>
 *   <thead>
 *     <tr><th>Value</th><th>Name</th><th>Description</th></tr>
--- a/libraries/midi/src/Midi.h
+++ b/libraries/midi/src/Midi.h
@ -24,7 +24,7 @@
 /*@jsdoc
 * The <code>Midi</code> API provides the ability to connect Interface with musical instruments and other external or virtual
 * devices via the MIDI protocol. For further information and examples, see the tutorial:
- * <a href="https://docs.vircadia.com/script/midi-tutorial.html">Use MIDI to Control Your Environment</a>.
+ * <a href="https://docs.overte.org/script/midi-tutorial.html">Use MIDI to Control Your Environment</a>.
 *
 * <p><strong>Note:</strong> Only works on Windows.</p>
 *
--- a/libraries/model-serializers/src/FSTReader.cpp
+++ b/libraries/model-serializers/src/FSTReader.cpp
@ -254,7 +254,7 @@ hifi::VariantMultiHash FSTReader::downloadMapping(const QString& url) {
    QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
    QNetworkRequest networkRequest = QNetworkRequest(url);
    networkRequest.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
-    networkRequest.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::VIRCADIA_USER_AGENT);
+    networkRequest.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::OVERTE_USER_AGENT);
    QNetworkReply* reply = networkAccessManager.get(networkRequest);
    QEventLoop loop;
    QObject::connect(reply, &QNetworkReply::finished, &loop, &QEventLoop::quit);
--- a/libraries/networking/src/AccountManager.cpp
+++ b/libraries/networking/src/AccountManager.cpp
@ -181,7 +181,7 @@ void AccountManager::setAuthURL(const QUrl& authURL) {
            // pull out the stored account info and store it in memory
            _accountInfo = accountsMap[_authURL.toString()].value<DataServerAccountInfo>();

-            qCDebug(networking) << "Found metaverse API account information for" << qPrintable(_authURL.toString());
+            qCDebug(networking) << "Found directory services API account information for" << qPrintable(_authURL.toString());
        } else {
            qCWarning(networking) << "Unable to load account file. No existing account settings will be loaded.";
        }
@ -211,7 +211,7 @@ void AccountManager::updateAuthURLFromMetaverseServerURL() {

 void AccountManager::setSessionID(const QUuid& sessionID) {
    if (_sessionID != sessionID) {
-        qCDebug(networking) << "Metaverse session ID changed to" << uuidStringWithoutCurlyBraces(sessionID);
+        qCDebug(networking) << "Directory Services session ID changed to" << uuidStringWithoutCurlyBraces(sessionID);
        _sessionID = sessionID;
    }
 }
@ -381,7 +381,7 @@ void AccountManager::sendRequest(const QString& path,
                        }
                    } else {
                        if (VERBOSE_HTTP_REQUEST_DEBUGGING) {
-                            qCDebug(networking) << "Received JSON response from metaverse API that has no matching callback.";
+                            qCDebug(networking) << "Received JSON response from directory services API that has no matching callback.";
                            qCDebug(networking) << QJsonDocument::fromJson(networkReply->readAll());
                        }
                    }
@ -409,7 +409,7 @@ void AccountManager::sendRequest(const QString& path,

                    } else {
                        if (VERBOSE_HTTP_REQUEST_DEBUGGING) {
-                            qCDebug(networking) << "Received error response from metaverse API that has no matching callback.";
+                            qCDebug(networking) << "Received error response from directory services API that has no matching callback.";
                            qCDebug(networking) << "Error" << networkReply->error() << "-" << networkReply->errorString();
                            qCDebug(networking) << networkReply->readAll();
                        }
@ -840,7 +840,7 @@ void AccountManager::requestAccountSettings() {
        return;
    }

-    qCDebug(networking) << "Requesting the Account Settings from the Metaverse API";
+    qCDebug(networking) << "Requesting the Account Settings from the Directory Services API";

    QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();

@ -870,7 +870,7 @@ void AccountManager::requestAccountSettingsFinished() {
            _settings.unpack(rootObject["data"].toObject());
            _lastSuccessfulSyncTimestamp = _settings.lastChangeTimestamp();

-            qCDebug(networking) << "Received the Account Settings from the Metaverse API";
+            qCDebug(networking) << "Received the Account Settings from the Directory Services API";

            emit accountSettingsLoaded();
        } else {
@ -911,7 +911,7 @@ void AccountManager::postAccountSettings() {
        return;
    }

-    qCDebug(networking) << "Account Settings have changed, pushing them to the Metaverse API";
+    qCDebug(networking) << "Account Settings have changed, pushing them to the Directory Services API";

    QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();

@ -1000,7 +1000,7 @@ void AccountManager::processGeneratedKeypair(QByteArray publicKey, QByteArray pr

    qCDebug(networking) << "Generated 2048-bit RSA keypair.";

-    // hold the private key to later set our metaverse API account info if upload succeeds
+    // hold the private key to later set our directory services API account info if upload succeeds
    _pendingPublicKey = publicKey;
    _pendingPrivateKey = privateKey;
    uploadPublicKey();
@ -1058,7 +1058,7 @@ void AccountManager::uploadPublicKey() {
 }

 void AccountManager::publicKeyUploadSucceeded(QNetworkReply* reply) {
-    qCDebug(networking) << "Uploaded public key to Metaverse API. RSA keypair generation is completed.";
+    qCDebug(networking) << "Uploaded public key to Directory Services API. RSA keypair generation is completed.";

    // public key upload complete - store the matching private key and persist the account to settings
    _accountInfo.setPrivateKey(_pendingPrivateKey);
--- a/libraries/networking/src/AccountManager.h
+++ b/libraries/networking/src/AccountManager.h
@ -58,7 +58,7 @@ const auto METAVERSE_SESSION_ID_HEADER = QString("HFM-SessionID").toLocal8Bit();

 using UserAgentGetter = std::function<QString()>;

-const auto DEFAULT_USER_AGENT_GETTER = []() -> QString { return NetworkingConstants::VIRCADIA_USER_AGENT; };
+const auto DEFAULT_USER_AGENT_GETTER = []() -> QString { return NetworkingConstants::OVERTE_USER_AGENT; };

 class AccountManager : public QObject, public Dependency {
    Q_OBJECT
--- a/libraries/networking/src/AddressManager.cpp
+++ b/libraries/networking/src/AddressManager.cpp
@ -36,14 +36,14 @@ 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::PRELOADED_STARTUP_LOCATION.isEmpty())
+const QString DEFAULT_OVERTE_ADDRESS = (!BuildInfo::PRELOADED_STARTUP_LOCATION.isEmpty())
                                       ? BuildInfo::PRELOADED_STARTUP_LOCATION
-                                       : NetworkingConstants::DEFAULT_VIRCADIA_ADDRESS;
+                                       : NetworkingConstants::DEFAULT_OVERTE_ADDRESS;
 const QString DEFAULT_HOME_ADDRESS = (!BuildInfo::PRELOADED_STARTUP_LOCATION.isEmpty())
                                       ? BuildInfo::PRELOADED_STARTUP_LOCATION
-                                       : NetworkingConstants::DEFAULT_VIRCADIA_ADDRESS;
+                                       : NetworkingConstants::DEFAULT_OVERTE_ADDRESS;

-Setting::Handle<QUrl> currentAddressHandle(QStringList() << ADDRESS_MANAGER_SETTINGS_GROUP << "address", DEFAULT_VIRCADIA_ADDRESS);
+Setting::Handle<QUrl> currentAddressHandle(QStringList() << ADDRESS_MANAGER_SETTINGS_GROUP << "address", DEFAULT_OVERTE_ADDRESS);

 bool AddressManager::isConnected() {
    return DependencyManager::get<NodeList>()->getDomainHandler().isConnected();
@ -56,7 +56,7 @@ QString AddressManager::getProtocol() const {
 QUrl AddressManager::currentAddress(bool domainOnly) const {
    QUrl hifiURL = _domainURL;

-    if (!domainOnly && hifiURL.scheme() == URL_SCHEME_VIRCADIA) {
+    if (!domainOnly && hifiURL.scheme() == URL_SCHEME_OVERTE) {
        hifiURL.setPath(currentPath());
    }

@ -65,7 +65,7 @@ QUrl AddressManager::currentAddress(bool domainOnly) const {

 QUrl AddressManager::currentFacingAddress() const {
    auto hifiURL = currentAddress();
-    if (hifiURL.scheme() == URL_SCHEME_VIRCADIA) {
+    if (hifiURL.scheme() == URL_SCHEME_OVERTE) {
        hifiURL.setPath(currentFacingPath());
    }

@ -77,7 +77,7 @@ QUrl AddressManager::currentShareableAddress(bool domainOnly) const {
        // if we have a shareable place name use that instead of whatever the current host is
        QUrl hifiURL;

-        hifiURL.setScheme(URL_SCHEME_VIRCADIA);
+        hifiURL.setScheme(URL_SCHEME_OVERTE);
        hifiURL.setHost(_shareablePlaceName);

        if (!domainOnly) {
@ -94,7 +94,7 @@ QUrl AddressManager::currentPublicAddress(bool domainOnly) const {
    // return an address that can be used by others to visit this client's current location.  If
    // in a serverless domain (which can't be visited) return an empty URL.
    QUrl shareableAddress = currentShareableAddress(domainOnly);
-    if (shareableAddress.scheme() != URL_SCHEME_VIRCADIA) {
+    if (shareableAddress.scheme() != URL_SCHEME_OVERTE) {
        return QUrl(); // file: urls aren't public
    }
    return shareableAddress;
@ -103,7 +103,7 @@ QUrl AddressManager::currentPublicAddress(bool domainOnly) const {

 QUrl AddressManager::currentFacingShareableAddress() const {
    auto hifiURL = currentShareableAddress();
-    if (hifiURL.scheme() == URL_SCHEME_VIRCADIA) {
+    if (hifiURL.scheme() == URL_SCHEME_OVERTE) {
        hifiURL.setPath(currentFacingPath());
    }

@ -114,7 +114,7 @@ QUrl AddressManager::currentFacingPublicAddress() const {
    // return an address that can be used by others to visit this client's current location.  If
    // in a serverless domain (which can't be visited) return an empty URL.
    QUrl shareableAddress = currentFacingShareableAddress();
-    if (shareableAddress.scheme() != URL_SCHEME_VIRCADIA) {
+    if (shareableAddress.scheme() != URL_SCHEME_OVERTE) {
        return QUrl(); // file: urls aren't public
    }
    return shareableAddress;
@ -165,7 +165,7 @@ void AddressManager::storeCurrentAddress() {

    if (url.scheme() == HIFI_URL_SCHEME_FILE ||
        url.scheme() == HIFI_URL_SCHEME_HTTP || url.scheme() == HIFI_URL_SCHEME_HTTPS ||
-        (url.scheme() == URL_SCHEME_VIRCADIA && !url.host().isEmpty())) {
+        (url.scheme() == URL_SCHEME_OVERTE && !url.host().isEmpty())) {
        // TODO -- once Octree::readFromURL no-longer takes over the main event-loop, serverless-domain urls can
        // be loaded over http(s)
        // url.scheme() == HIFI_URL_SCHEME_HTTP ||
@ -258,23 +258,23 @@ bool AddressManager::handleUrl(const QUrl& lookupUrlIn, LookupTrigger trigger, c
    if (lookupUrl.scheme().isEmpty() && !lookupUrl.path().startsWith("/")) {
        // 'urls' without schemes are taken as domain names, as opposed to
        // simply a path portion of a url, so we need to set the scheme
-        lookupUrl.setScheme(URL_SCHEME_VIRCADIA);
+        lookupUrl.setScheme(URL_SCHEME_OVERTE);
    }

    static const QRegExp PORT_REGEX = QRegExp("\\d{1,5}(\\/.*)?");
    if(!lookupUrl.scheme().isEmpty() && lookupUrl.host().isEmpty() && PORT_REGEX.exactMatch(lookupUrl.path())) {
        // this is in the form somewhere:<port>, convert it to hifi://somewhere:<port>
-        lookupUrl = QUrl(URL_SCHEME_VIRCADIA + "://" + lookupUrl.toString());
+        lookupUrl = QUrl(URL_SCHEME_OVERTE + "://" + lookupUrl.toString());
    }
    // it should be noted that url's in the form
    // somewhere:<port> are not valid, as that
    // would indicate that the scheme is 'somewhere'
    // use hifi://somewhere:<port> instead

-    if (lookupUrl.scheme() == URL_SCHEME_VIRCADIA || lookupUrlInString.startsWith(URL_SCHEME_VIRCADIA + "://")) {
+    if (lookupUrl.scheme() == URL_SCHEME_OVERTE || lookupUrlInString.startsWith(URL_SCHEME_OVERTE + "://")) {
        QString lookupUrlString;

-        if (lookupUrlInString.startsWith(URL_SCHEME_VIRCADIA + "://")) {
+        if (lookupUrlInString.startsWith(URL_SCHEME_OVERTE + "://")) {
            lookupUrlString = lookupUrlInString;
        } else {
            lookupUrlString = lookupUrl.toString(QUrl::FullyEncoded);
@ -282,8 +282,8 @@ bool AddressManager::handleUrl(const QUrl& lookupUrlIn, LookupTrigger trigger, c

        if (lookupUrl.host().isEmpty()) {
            // this was in the form hifi:/somewhere or hifi:somewhere.  Fix it by making it hifi://somewhere
-            static const QRegExp HIFI_SCHEME_REGEX = QRegExp(URL_SCHEME_VIRCADIA + ":\\/{0,2}", Qt::CaseInsensitive);
-            lookupUrl = QUrl(lookupUrl.toString().replace(HIFI_SCHEME_REGEX, URL_SCHEME_VIRCADIA + "://"));
+            static const QRegExp HIFI_SCHEME_REGEX = QRegExp(URL_SCHEME_OVERTE + ":\\/{0,2}", Qt::CaseInsensitive);
+            lookupUrl = QUrl(lookupUrl.toString().replace(HIFI_SCHEME_REGEX, URL_SCHEME_OVERTE + "://"));
        }

        DependencyManager::get<NodeList>()->flagTimeForConnectionStep(LimitedNodeList::ConnectionStep::LookupAddress);
@ -359,12 +359,12 @@ bool AddressManager::handleUrl(const QUrl& lookupUrlIn, LookupTrigger trigger, c
                _previousAPILookup = lookupUrl;

                // Let's convert this to a QString for processing in case there are spaces in it.
-                if (lookupUrlString.contains(URL_SCHEME_VIRCADIA + "://", Qt::CaseInsensitive)) {
-                    lookupUrlString = lookupUrlString.replace((URL_SCHEME_VIRCADIA + "://"), "");
-                } else if (lookupUrlString.contains(URL_SCHEME_VIRCADIA + ":/", Qt::CaseInsensitive)) {
-                    lookupUrlString = lookupUrlString.replace((URL_SCHEME_VIRCADIA + ":/"), "");
-                } else if (lookupUrlString.contains(URL_SCHEME_VIRCADIA + ":", Qt::CaseInsensitive)) {
-                    lookupUrlString = lookupUrlString.replace((URL_SCHEME_VIRCADIA + ":"), "");
+                if (lookupUrlString.contains(URL_SCHEME_OVERTE + "://", Qt::CaseInsensitive)) {
+                    lookupUrlString = lookupUrlString.replace((URL_SCHEME_OVERTE + "://"), "");
+                } else if (lookupUrlString.contains(URL_SCHEME_OVERTE + ":/", Qt::CaseInsensitive)) {
+                    lookupUrlString = lookupUrlString.replace((URL_SCHEME_OVERTE + ":/"), "");
+                } else if (lookupUrlString.contains(URL_SCHEME_OVERTE + ":", Qt::CaseInsensitive)) {
+                    lookupUrlString = lookupUrlString.replace((URL_SCHEME_OVERTE + ":"), "");
                }

                // Get the path and then strip it out.
@ -520,7 +520,7 @@ void AddressManager::goToAddressFromObject(const QVariantMap& dataObject, const
                    qCDebug(networking) << "Possible domain change required to connect to" << domainHostname
                        << "on" << domainPort;
                    QUrl domainURL;
-                    domainURL.setScheme(URL_SCHEME_VIRCADIA);
+                    domainURL.setScheme(URL_SCHEME_OVERTE);
                    domainURL.setHost(domainHostname);
                    if (domainPort > 0) {
                        domainURL.setPort(domainPort);
@ -691,7 +691,7 @@ bool AddressManager::handleNetworkAddress(const QString& lookupString, LookupTri

        emit lookupResultsFinished();
        QUrl domainURL;
-        domainURL.setScheme(URL_SCHEME_VIRCADIA);
+        domainURL.setScheme(URL_SCHEME_OVERTE);
        domainURL.setHost(domainIPString);
        if (domainPort > 0) {
            domainURL.setPort(domainPort);
@ -714,7 +714,7 @@ bool AddressManager::handleNetworkAddress(const QString& lookupString, LookupTri

        emit lookupResultsFinished();
        QUrl domainURL;
-        domainURL.setScheme(URL_SCHEME_VIRCADIA);
+        domainURL.setScheme(URL_SCHEME_OVERTE);
        domainURL.setHost(domainHostname);
        if (domainPort > 0) {
            domainURL.setPort(domainPort);
@ -847,7 +847,7 @@ bool AddressManager::setHost(const QString& host, LookupTrigger trigger, quint16
        addCurrentAddressToHistory(trigger);

        _domainURL = QUrl();
-        _domainURL.setScheme(URL_SCHEME_VIRCADIA);
+        _domainURL.setScheme(URL_SCHEME_OVERTE);
        _domainURL.setHost(host);
        if (port > 0) {
            _domainURL.setPort(port);
@ -884,7 +884,7 @@ bool AddressManager::setDomainInfo(const QUrl& domainURL, LookupTrigger trigger)
    // clear any current place information
    _rootPlaceID = QUuid();

-    if (_domainURL.scheme() == URL_SCHEME_VIRCADIA) {
+    if (_domainURL.scheme() == URL_SCHEME_OVERTE) {
        qCDebug(networking) << "Possible domain change required to connect to domain at" << hostname << "on" << port;
    } else {
        qCDebug(networking) << "Possible domain change required to serverless domain: " << domainURL.toString();
@ -902,7 +902,7 @@ bool AddressManager::setDomainInfo(const QUrl& domainURL, LookupTrigger trigger)

 void AddressManager::goToEntry(LookupTrigger trigger) {
    resetConfirmConnectWithoutAvatarEntities();
-    handleUrl(DEFAULT_VIRCADIA_ADDRESS, trigger);
+    handleUrl(DEFAULT_OVERTE_ADDRESS, trigger);
 }

 void AddressManager::goToUser(const QString& username, bool shouldMatchOrientation) {
--- a/libraries/networking/src/AddressManager.h
+++ b/libraries/networking/src/AddressManager.h
@ -24,7 +24,7 @@
 #include "AccountManager.h"

 extern const QString REDIRECT_HIFI_ADDRESS;
-extern const QString DEFAULT_VIRCADIA_ADDRESS;
+extern const QString DEFAULT_OVERTE_ADDRESS;
 extern const QString DEFAULT_HOME_ADDRESS;

 const QString SANDBOX_HIFI_ADDRESS = "hifi://localhost";
@ -33,10 +33,10 @@ const QString INDEX_PATH = "/";
 const QString GET_PLACE = "/api/v1/places/%1";

 /*@jsdoc
- * The <code>location</code> API provides facilities related to your current location in the metaverse.
+ * The <code>location</code> API provides facilities related to your current location in the directory services.
 *
 * <h3>Getter/Setter</h3>
- * <p>You can get and set your current metaverse address by directly reading a string value from and writing a string value to
+ * <p>You can get and set your current directory services address by directly reading a string value from and writing a string value to
 * the <code>location</code> object. This is an alternative to using the <code>location.href</code> property or other object
 * functions.</p>
 *
@ -50,27 +50,27 @@ const QString GET_PLACE = "/api/v1/places/%1";
 * @property {Uuid} domainID - A UUID uniquely identifying the domain you're visiting. Is {@link Uuid(0)|Uuid.NULL} if you're not
 *     connected to the domain or are in a serverless domain.
 *     <em>Read-only.</em>
- * @property {string} hostname - The name of the domain for your current metaverse address (e.g., <code>"DomainName"</code>,
+ * @property {string} hostname - The name of the domain for your current directory services address (e.g., <code>"DomainName"</code>,
 *     <code>localhost</code>, or an IP address). Is blank if you're in a serverless domain.
 *     <em>Read-only.</em>
- * @property {string} href - Your current metaverse address (e.g., <code>"hifi://domainname/15,-10,26/0,0,0,1"</code>)
+ * @property {string} href - Your current directory services address (e.g., <code>"hifi://domainname/15,-10,26/0,0,0,1"</code>)
 *     regardless of whether or not you're connected to the domain. Starts with <code>"file:///"</code> if you're in a
 *     serverless domain.
 *     <em>Read-only.</em>
 * @property {boolean} isConnected - <code>true</code> if you're connected to the domain in your current <code>href</code>
- *     metaverse address, otherwise <code>false</code>.
- * @property {string} pathname - The location and orientation in your current <code>href</code> metaverse address
+ *     directory services address, otherwise <code>false</code>.
+ * @property {string} pathname - The location and orientation in your current <code>href</code> directory services address
 *     (e.g., <code>"/15,-10,26/0,0,0,1"</code>).
 *     <em>Read-only.</em>
- * @property {string} placename - The place name in your current <code>href</code> metaverse address
+ * @property {string} placename - The place name in your current <code>href</code> directory services address
 *     (e.g., <code>"DomainName"</code>). Is blank if your <code>hostname</code> is an IP address.
 *     <em>Read-only.</em>
- * @property {string} protocol - The protocol of your current <code>href</code> metaverse address (e.g., <code>"hifi"</code>).
+ * @property {string} protocol - The protocol of your current <code>href</code> directory services address (e.g., <code>"hifi"</code>).
 *     <em>Read-only.</em>
 */

 /*@jsdoc
- * The <code>AddressManager</code> API provides facilities related to your current location in the metaverse.
+ * The <code>AddressManager</code> API provides facilities related to your current location in the directory services.
 *
 * @namespace AddressManager
 *
@ -84,22 +84,22 @@ const QString GET_PLACE = "/api/v1/places/%1";
 * @property {Uuid} domainID - A UUID uniquely identifying the domain you're visiting. Is {@link Uuid(0)|Uuid.NULL} if you're not
 *     connected to the domain or are in a serverless domain.
 *     <em>Read-only.</em>
- * @property {string} hostname - The name of the domain for your current metaverse address (e.g., <code>"DomainName"</code>,
+ * @property {string} hostname - The name of the domain for your current directory services address (e.g., <code>"DomainName"</code>,
 *     <code>localhost</code>, or an IP address). Is blank if you're in a serverless domain.
 *     <em>Read-only.</em>
- * @property {string} href - Your current metaverse address (e.g., <code>"hifi://domainname/15,-10,26/0,0,0,1"</code>)
+ * @property {string} href - Your current directory services address (e.g., <code>"hifi://domainname/15,-10,26/0,0,0,1"</code>)
 *     regardless of whether or not you're connected to the domain. Starts with <code>"file:///"</code> if you're in a
 *     serverless domain.
 *     <em>Read-only.</em>
 * @property {boolean} isConnected - <code>true</code> if you're connected to the domain in your current <code>href</code>
- *     metaverse address, otherwise <code>false</code>.
- * @property {string} pathname - The location and orientation in your current <code>href</code> metaverse address
+ *     directory services address, otherwise <code>false</code>.
+ * @property {string} pathname - The location and orientation in your current <code>href</code> directory services address
 *     (e.g., <code>"/15,-10,26/0,0,0,1"</code>).
 *     <em>Read-only.</em>
- * @property {string} placename - The place name in your current <code>href</code> metaverse address
+ * @property {string} placename - The place name in your current <code>href</code> directory services address
 *     (e.g., <code>"DomainName"</code>). Is blank if your <code>hostname</code> is an IP address.
 *     <em>Read-only.</em>
- * @property {string} protocol - The protocol of your current <code>href</code> metaverse address (e.g., <code>"hifi"</code>).
+ * @property {string} protocol - The protocol of your current <code>href</code> directory services address (e.g., <code>"hifi"</code>).
 *     <em>Read-only.</em>
 *
 * @borrows location.handleLookupString as handleLookupString
@ -144,7 +144,7 @@ public:
    using OrientationGetter = std::function<glm::quat()>;

    /*@jsdoc
-     * <p>The reasons for an address lookup via the metaverse API are defined by numeric values:</p>
+     * <p>The reasons for an address lookup via the Directory Services API are defined by numeric values:</p>
     * <table>
     *   <thead>
     *     <tr>
@ -247,7 +247,7 @@ public:

 public slots:
    /*@jsdoc
-     * Takes you to a specified metaverse address.
+     * Takes you to a specified directory services address.
     * @function location.handleLookupString
     * @param {string} address - The address to go to: a <code>"hifi://"</code> address, an IP address (e.g.,
     *     <code>"127.0.0.1"</code> or <code>"localhost"</code>), a <code>file:///</code> address, a domain name, a named path
@ -297,7 +297,7 @@ public slots:
    }

    /*@jsdoc
-     * Takes you to the default "welcome" metaverse address.
+     * Takes you to the default "welcome" directory services address.
     * @function location.goToEntry
     * @param {location.LookupTrigger} trigger=StartupFromSettings - The reason for the function call. Helps ensure that user's
     *     location history is correctly maintained.
@ -336,20 +336,20 @@ public slots:
    void refreshPreviousLookup();

    /*@jsdoc
-     * Updates your current metaverse location in Interface's {@link Settings} file as your last-known address. This can be used
+     * Updates your current directory services location in Interface's {@link Settings} file as your last-known address. This can be used
     * to ensure that you start up at that address if you exit Interface without a later address automatically being saved.
     * @function location.storeCurrentAddress
     */
    void storeCurrentAddress();

    /*@jsdoc
-     * Copies your current metaverse address (i.e., <code>location.href</code> property value) to the OS clipboard.
+     * Copies your current directory services address (i.e., <code>location.href</code> property value) to the OS clipboard.
     * @function location.copyAddress
     */
    void copyAddress();

    /*@jsdoc
-     * Copies your current metaverse location and orientation (i.e., <code>location.pathname</code> property value) to the OS
+     * Copies your current directory services location and orientation (i.e., <code>location.pathname</code> property value) to the OS
     * clipboard.
     * @function location.copyPath
     */
@ -367,7 +367,7 @@ public slots:

 signals:
    /*@jsdoc
-     * Triggered when looking up the details of a metaverse user or location to go to has completed (successfully or
+     * Triggered when looking up the details of a directory services user or location to go to has completed (successfully or
     * unsuccessfully).
     * @function location.lookupResultsFinished
     * @returns {Signal}
@ -375,7 +375,7 @@ signals:
    void lookupResultsFinished();

    /*@jsdoc
-     * Triggered when looking up the details of a metaverse user or location to go to has completed and the domain or user is
+     * Triggered when looking up the details of a directory services user or location to go to has completed and the domain or user is
     * offline.
     * @function location.lookupResultIsOffline
     * @returns {Signal}
@ -383,7 +383,7 @@ signals:
    void lookupResultIsOffline();

    /*@jsdoc
-     * Triggered when looking up the details of a metaverse user or location to go to has completed and the domain or user could
+     * Triggered when looking up the details of a directory services user or location to go to has completed and the domain or user could
     * not be found.
     * @function location.lookupResultIsNotFound
     * @returns {Signal}
--- a/libraries/networking/src/DomainAccountManager.cpp
+++ b/libraries/networking/src/DomainAccountManager.cpp
@ -82,7 +82,7 @@ void DomainAccountManager::requestAccessToken(const QString& username, const QSt

    QNetworkRequest request;

-    request.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::VIRCADIA_USER_AGENT);
+    request.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::OVERTE_USER_AGENT);
    request.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded");

    // miniOrange WordPress API Authentication plugin:
--- a/libraries/networking/src/DomainHandler.cpp
+++ b/libraries/networking/src/DomainHandler.cpp
@ -184,7 +184,7 @@ void DomainHandler::setSockAddr(const SockAddr& sockAddr, const QString& hostnam

    // some callers may pass a hostname, this is not to be used for lookup but for DTLS certificate verification
    _domainURL = QUrl();
-    _domainURL.setScheme(URL_SCHEME_VIRCADIA);
+    _domainURL.setScheme(URL_SCHEME_OVERTE);
    _domainURL.setHost(hostname);
    _domainURL.setPort(_sockAddr.getPort());
 }
@ -199,7 +199,7 @@ void DomainHandler::setUUID(const QUuid& uuid) {
 void DomainHandler::setURLAndID(QUrl domainURL, QUuid domainID) {
    _pendingDomainID = domainID;

-    if (domainURL.scheme() != URL_SCHEME_VIRCADIA) {
+    if (domainURL.scheme() != URL_SCHEME_OVERTE) {
        _sockAddr.clear();

        // if this is a file URL we need to see if it has a ~ for us to expand
@ -215,7 +215,7 @@ void DomainHandler::setURLAndID(QUrl domainURL, QUuid domainID) {

    // if it's in the error state, reset and try again.
    if (_domainURL != domainURL 
-        || (_sockAddr.getPort() != domainPort && domainURL.scheme() == URL_SCHEME_VIRCADIA)
+        || (_sockAddr.getPort() != domainPort && domainURL.scheme() == URL_SCHEME_OVERTE)
        || isServerless() // For reloading content in serverless domain.
        || _isInErrorState) {
        // re-set the domain info so that auth information is reloaded
@ -230,7 +230,7 @@ void DomainHandler::setURLAndID(QUrl domainURL, QUuid domainID) {
            qCDebug(networking) << "Updated domain hostname to" << domainURL.host();

            if (!domainURL.host().isEmpty()) {
-                if (domainURL.scheme() == URL_SCHEME_VIRCADIA) {
+                if (domainURL.scheme() == URL_SCHEME_OVERTE) {
                    // re-set the sock addr to null and fire off a lookup of the IP address for this domain-server's hostname
                    qCDebug(networking, "Looking up DS hostname %s.", domainURL.host().toLocal8Bit().constData());
                    QHostInfo::lookupHost(domainURL.host(), this, SLOT(completedHostnameLookup(const QHostInfo&)));
@ -303,7 +303,7 @@ void DomainHandler::setIceServerHostnameAndID(const QString& iceServerHostname,
 void DomainHandler::activateICELocalSocket() {
    DependencyManager::get<NodeList>()->flagTimeForConnectionStep(LimitedNodeList::ConnectionStep::SetDomainSocket);
    _sockAddr = _icePeer.getLocalSocket();
-    _domainURL.setScheme(URL_SCHEME_VIRCADIA);
+    _domainURL.setScheme(URL_SCHEME_OVERTE);
    _domainURL.setHost(_sockAddr.getAddress().toString());
    emit domainURLChanged(_domainURL);
    emit completedSocketDiscovery();
@ -312,7 +312,7 @@ void DomainHandler::activateICELocalSocket() {
 void DomainHandler::activateICEPublicSocket() {
    DependencyManager::get<NodeList>()->flagTimeForConnectionStep(LimitedNodeList::ConnectionStep::SetDomainSocket);
    _sockAddr = _icePeer.getPublicSocket();
-    _domainURL.setScheme(URL_SCHEME_VIRCADIA);
+    _domainURL.setScheme(URL_SCHEME_OVERTE);
    _domainURL.setHost(_sockAddr.getAddress().toString());
    emit domainURLChanged(_domainURL);
    emit completedSocketDiscovery();
@ -369,7 +369,7 @@ void DomainHandler::setIsConnected(bool isConnected) {
            // FIXME: Reinstate the requestDomainSettings() call here in version 2021.2.0 instead of having it in 
            // NodeList::processDomainList().
            /*
-            if (_domainURL.scheme() == URL_SCHEME_VIRCADIA && !_domainURL.host().isEmpty()) {
+            if (_domainURL.scheme() == URL_SCHEME_OVERTE && !_domainURL.host().isEmpty()) {
                // we've connected to new domain - time to ask it for global settings
                requestDomainSettings();
            }
@ -600,7 +600,7 @@ void DomainHandler::processDomainServerConnectionDeniedPacket(QSharedPointer<Rec

    // Some connection refusal reasons imply that a login is required. If so, suggest a new login.
    if (reasonSuggestsMetaverseLogin(reasonCode)) {
-        qCWarning(networking) << "Make sure you are logged in to the metaverse.";
+        qCWarning(networking) << "Make sure you are logged in to the directory server.";

        auto accountManager = DependencyManager::get<AccountManager>();

@ -617,7 +617,7 @@ void DomainHandler::processDomainServerConnectionDeniedPacket(QSharedPointer<Rec
            _connectionDenialsSinceKeypairRegen = 0;
        }

-        // Server with domain login will prompt for domain login, not metaverse, so reset domain values if asked for metaverse.
+        // Server with domain login will prompt for domain login, not directory server, so reset domain values if asked for directory server.
        auto domainAccountManager = DependencyManager::get<DomainAccountManager>();
        domainAccountManager->setAuthURL(QUrl());
        domainAccountManager->setClientID(QString());
@ -641,7 +641,7 @@ void DomainHandler::processDomainServerConnectionDeniedPacket(QSharedPointer<Rec
            _hasCheckedForDomainAccessToken = true;
        }

-        // ####### TODO: regenerate key-pair after several failed connection attempts, similar to metaverse login code?
+        // ####### TODO: regenerate key-pair after several failed connection attempts, similar to Directory Services login code?

    }
 }
--- a/libraries/networking/src/DomainHandler.h
+++ b/libraries/networking/src/DomainHandler.h
@ -45,9 +45,9 @@ const unsigned short DEFAULT_DOMAIN_SERVER_PORT =

 const unsigned short DEFAULT_DOMAIN_SERVER_WS_PORT =
    QProcessEnvironment::systemEnvironment()
-    .contains("VIRCADIA_DOMAIN_SERVER_WS_PORT")
+    .contains("OVERTE_DOMAIN_SERVER_WS_PORT")
        ? QProcessEnvironment::systemEnvironment()
-            .value("VIRCADIA_DOMAIN_SERVER_WS_PORT")
+            .value("OVERTE_DOMAIN_SERVER_WS_PORT")
            .toUShort()
        : 40102;  // TCP

@ -77,17 +77,17 @@ const quint16 DOMAIN_SERVER_HTTPS_PORT =

 const quint16 DOMAIN_SERVER_EXPORTER_PORT =
    QProcessEnvironment::systemEnvironment()
-    .contains("VIRCADIA_DOMAIN_SERVER_EXPORTER_PORT")
+    .contains("OVERTE_DOMAIN_SERVER_EXPORTER_PORT")
        ? QProcessEnvironment::systemEnvironment()
-            .value("VIRCADIA_DOMAIN_SERVER_EXPORTER_PORT")
+            .value("OVERTE_DOMAIN_SERVER_EXPORTER_PORT")
            .toUInt()
        : 9703;
        
 const quint16 DOMAIN_SERVER_METADATA_EXPORTER_PORT =
    QProcessEnvironment::systemEnvironment()
-    .contains("VIRCADIA_DOMAIN_SERVER_METADATA_EXPORTER_PORT")
+    .contains("OVERTE_DOMAIN_SERVER_METADATA_EXPORTER_PORT")
        ? QProcessEnvironment::systemEnvironment()
-            .value("VIRCADIA_DOMAIN_SERVER_METADATA_EXPORTER_PORT")
+            .value("OVERTE_DOMAIN_SERVER_METADATA_EXPORTER_PORT")
            .toUInt()
        : 9704;

@ -146,7 +146,7 @@ public:
    void setCanConnectWithoutAvatarEntities(bool canConnect);
    bool canConnectWithoutAvatarEntities();

-    bool isServerless() const { return _domainURL.scheme() != URL_SCHEME_VIRCADIA; }
+    bool isServerless() const { return _domainURL.scheme() != URL_SCHEME_OVERTE; }
    bool getInterstitialModeEnabled() const;
    void setInterstitialModeEnabled(bool enableInterstitialMode);

@ -200,12 +200,12 @@ public:
     *     <tr>
     *       <td><strong>LoginErrorMetaverse</strong></td>
     *       <td><code>2</code></td>
-     *       <td>You could not be logged into the domain per your metaverse login.</td>
+     *       <td>You could not be logged into the domain per your Directory Services login.</td>
     *     </tr>
     *     <tr>
     *       <td><strong>NotAuthorizedMetaverse</strong></td>
     *       <td><code>3</code></td>
-     *       <td>You are not authorized to connect to the domain per your metaverse login.</td>
+     *       <td>You are not authorized to connect to the domain per your Directory Services login.</td>
     *     </tr>
     *     <tr>
     *       <td><strong>TooManyUsers</strong></td>
--- a/libraries/networking/src/ExternalResource.cpp
+++ b/libraries/networking/src/ExternalResource.cpp
@ -13,7 +13,7 @@
 #include <QDebug>
 #include <QLoggingCategory>

-Q_LOGGING_CATEGORY(external_resource, "vircadia.networking.external_resource")
+Q_LOGGING_CATEGORY(external_resource, "overte.networking.external_resource")

 ExternalResource::ExternalResource(QObject* parent) : QObject(parent) {
 }
--- a/libraries/networking/src/ExternalResource.h
+++ b/libraries/networking/src/ExternalResource.h
@ -9,8 +9,8 @@
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html

-#ifndef vircadia_ExternalResource_h
-#define vircadia_ExternalResource_h
+#ifndef overte_ExternalResource_h
+#define overte_ExternalResource_h

 #include <QObject>
 #include <QUrl>
@ -133,7 +133,7 @@ private:
        { Bucket::HF_Public, QUrl(NetworkingConstants::HF_PUBLIC_CDN_URL) },
        { Bucket::HF_Content, QUrl(NetworkingConstants::HF_CONTENT_CDN_URL) },
        { Bucket::HF_Marketplace, QUrl(NetworkingConstants::HF_MPASSETS_CDN_URL) },
-        { Bucket::Assets, QUrl(NetworkingConstants::VIRCADIA_CONTENT_CDN_URL) }
+        { Bucket::Assets, QUrl(NetworkingConstants::OVERTE_CONTENT_CDN_URL) }
    };
 };

--- a/libraries/networking/src/HTTPResourceRequest.cpp
+++ b/libraries/networking/src/HTTPResourceRequest.cpp
@ -55,7 +55,7 @@ void HTTPResourceRequest::doSend() {

    QNetworkRequest networkRequest(_url);
    networkRequest.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
-    networkRequest.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::VIRCADIA_USER_AGENT);
+    networkRequest.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::OVERTE_USER_AGENT);

    if (_cacheEnabled) {
        networkRequest.setAttribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::PreferCache);
--- a/libraries/networking/src/MessagesClient.h
+++ b/libraries/networking/src/MessagesClient.h
@ -64,7 +64,7 @@ public:
     *     from an assignment client script it is received only by that same assignment client script.</p>
     * @example <caption>Send and receive a message.</caption>
     * // Receiving script.
-     * var channelName = "com.vircadia.example.messages-example";
+     * var channelName = "org.overte.example.messages-example";
     *
     * function onMessageReceived(channel, message, sender, localOnly) {
     *     print("Message received:");
@ -84,7 +84,7 @@ public:
     *
     *
     * // Sending script.
-     * var channelName = "com.vircadia.example.messages-example";
+     * var channelName = "org.overte.example.messages-example";
     * var message = "Hello";
     * Messages.sendMessage(channelName, message);
     */
@ -112,7 +112,7 @@ public:
     *     from an assignment client script it is received only by that same assignment client script.</p>
     * @example <caption>Send and receive data.</caption>
     * // Receiving script.
-     * var channelName = "com.vircadia.example.messages-example";
+     * var channelName = "org.overte.example.messages-example";
     *
     * function onDataReceived(channel, data, sender, localOnly) {
     *     var int8data = new Int8Array(data);
@ -140,7 +140,7 @@ public:
     *
     *
     * // Sending script.
-     * var channelName = "com.vircadia.example.messages-example";
+     * var channelName = "org.overte.example.messages-example";
     * var int8data = new Int8Array([1, 1, 2, 3, 5, 8, 13]);
     * Messages.sendData(channelName, int8data.buffer);
     */
--- a/libraries/networking/src/MetaverseAPI.cpp
+++ b/libraries/networking/src/MetaverseAPI.cpp
@ -18,7 +18,7 @@


 namespace MetaverseAPI {
-    // You can change the return of this function if you want to use a custom metaverse URL at compile time
+    // You can change the return of this function if you want to use a custom directory services URL at compile time
    // or you can pass a custom URL via the env variable
    QUrl getCurrentMetaverseServerURL() {
        QUrl selectedMetaverseURL;
--- a/libraries/networking/src/NetworkingConstants.h
+++ b/libraries/networking/src/NetworkingConstants.h
@ -19,7 +19,7 @@
 namespace NetworkingConstants {
    // If you want to use STAGING instead of STABLE,
    // links from the Domain Server web interface (like the connect account token generation)
-    // will still point at stable unless you ALSO change the Domain Server Metaverse Server URL inside of:
+    // will still point at stable unless you ALSO change the Domain Server Directory Services URL inside of:
    // <Overte repo>\domain-server\resources\web\js\shared.js

    // You can avoid changing that and still effectively use a connected domain on staging
@ -28,7 +28,7 @@ namespace NetworkingConstants {

    const QString WEB_ENGINE_VERSION = "Chrome/83.0.4103.122";

-    // For now we only have one Metaverse server.
+    // For now we only have one directory server.
    const QUrl METAVERSE_SERVER_URL_STABLE { "https://mv.overte.org/server" };
    const QUrl METAVERSE_SERVER_URL_STAGING { "https://mv.overte.org/server" };

@ -37,7 +37,7 @@ namespace NetworkingConstants {
    const QStringList IS_AUTHABLE_HOSTNAME = { "overte.org" };

    // Use a custom User-Agent to avoid ModSecurity filtering, e.g. by hosting providers.
-    const QByteArray VIRCADIA_USER_AGENT = "Mozilla/5.0 (VircadiaInterface)";
+    const QByteArray OVERTE_USER_AGENT = "Mozilla/5.0 (OverteInterface)";

    const QString WEB_ENGINE_USER_AGENT = "Mozilla/5.0 (Linux; Android 6.0; Nexus 5 Build/MRA58N) AppleWebKit/537.36 (KHTML, like Gecko) " + WEB_ENGINE_VERSION + " Mobile Safari/537.36";
    const QString MOBILE_USER_AGENT = "Mozilla/5.0 (Linux; Android 6.0; Nexus 5 Build/MRA58N) AppleWebKit/537.36 (KHTML, like Gecko) " + WEB_ENGINE_VERSION + " Mobile Safari/537.36";
@ -47,17 +47,17 @@ namespace NetworkingConstants {
    const QString WEB_ENTITY_DEFAULT_USER_AGENT = WEB_ENGINE_USER_AGENT;

    // Builds URLs
-    const QUrl BUILDS_XML_URL("https://highfidelity.com/builds.xml");
-    const QUrl MASTER_BUILDS_XML_URL("https://highfidelity.com/dev-builds.xml");
+    const QUrl BUILDS_XML_URL("");
+    const QUrl MASTER_BUILDS_XML_URL("");

    const QString DEFAULT_AVATAR_COLLISION_SOUND_URL = "https://hifi-public.s3.amazonaws.com/sounds/Collisions-otherorganic/Body_Hits_Impact.wav";

    // CDN URLs
-    const QString HF_CONTENT_CDN_URL = "https://cdn-1.vircadia.com/eu-c-1/vircadia-content/";
-    const QString HF_MPASSETS_CDN_URL = "https://cdn-1.vircadia.com/eu-c-1/vircadia-mpassets/";
-    const QString HF_PUBLIC_CDN_URL = "https://cdn-1.vircadia.com/eu-c-1/vircadia-public/";
-    const QString HF_MARKETPLACE_CDN_HOSTNAME = "mpassets.highfidelity.com";
-    const QString VIRCADIA_CONTENT_CDN_URL = "https://cdn-1.vircadia.com/us-e-1/";
+    const QString HF_CONTENT_CDN_URL = "";
+    const QString HF_MPASSETS_CDN_URL = "";
+    const QString HF_PUBLIC_CDN_URL = "";
+    const QString HF_MARKETPLACE_CDN_HOSTNAME = "";
+    const QString OVERTE_CONTENT_CDN_URL = "https://content.overte.org/";

 #if USE_STABLE_GLOBAL_SERVICES
    const QString ICE_SERVER_DEFAULT_HOSTNAME = "ice.overte.org";
@ -75,17 +75,17 @@ namespace NetworkingConstants {
    const QUrl HELP_DOCS_URL{ "https://docs.overte.org" };
    const QUrl HELP_FORUM_URL{ "https://overte.org" };
    const QUrl HELP_SCRIPTING_REFERENCE_URL{ "https://apidocs.overte.org/" };
-    const QUrl HELP_RELEASE_NOTES_URL{ "https://docs.overte.org/en/latest/release-notes.html" };
+    const QUrl HELP_RELEASE_NOTES_URL{ "https://docs.overte.org/release-notes.html" };
    const QUrl HELP_BUG_REPORT_URL{ "https://github.com/overte-org/overte/issues" };

-    const QString DEFAULT_VIRCADIA_ADDRESS = "file:///~/serverless/tutorial.json";
+    const QString DEFAULT_OVERTE_ADDRESS = "file:///~/serverless/tutorial.json";
    const QString DEFAULT_HOME_ADDRESS = "file:///~/serverless/tutorial.json";
    const QString REDIRECT_HIFI_ADDRESS = "file:///~/serverless/redirect.json";
 }

 const QString HIFI_URL_SCHEME_ABOUT = "about";
-const QString URL_SCHEME_VIRCADIA = "hifi";
-const QString URL_SCHEME_VIRCADIAAPP = "hifiapp";
+const QString URL_SCHEME_OVERTE = "hifi";
+const QString URL_SCHEME_OVERTEAPP = "hifiapp";
 const QString URL_SCHEME_DATA = "data";
 const QString URL_SCHEME_QRC = "qrc";
 const QString HIFI_URL_SCHEME_FILE = "file";
--- a/libraries/networking/src/NodeList.cpp
+++ b/libraries/networking/src/NodeList.cpp
@ -507,7 +507,7 @@ void NodeList::sendDomainServerCheckIn() {

        if (!domainIsConnected) {

-            // Metaverse account.
+            // Directory services account.
            DataServerAccountInfo& accountInfo = accountManager->getAccountInfo();
            packetStream << accountInfo.getUsername();
            // if this is a connect request, and we can present a username signature, send it along
@ -834,7 +834,7 @@ void NodeList::processDomainList(QSharedPointer<ReceivedMessage> message) {
    // FIXME: Remove this call to requestDomainSettings() and reinstate the one in DomainHandler::setIsConnected(), in version
    // 2021.2.0. (New protocol version implies a domain server upgrade.)
    if (!_domainHandler.isConnected()
-            && _domainHandler.getScheme() == URL_SCHEME_VIRCADIA && !_domainHandler.getHostname().isEmpty()) {
+            && _domainHandler.getScheme() == URL_SCHEME_OVERTE && !_domainHandler.getHostname().isEmpty()) {
        // We're about to connect but we need the domain settings (in particular, the node permissions) in order to adjust the
        // canRezAvatarEntities permission above before using the permissions in determining whether or not to connect without
        // avatar entities rezzing below.
--- a/Show more
+++ b/Show more