diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6d3596430..231df4893 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,7 +30,7 @@ endif()
 include(cmake/util.cmake)
 
 # Specify Variant Name
-set(MCPI_VARIANT_NAME "minecraft-pi-reborn")
+set(MCPI_VARIANT_NAME "minecraft-pi-reborn-legacy")
 if(MCPI_SERVER_MODE)
     set(MCPI_VARIANT_NAME "${MCPI_VARIANT_NAME}-server")
 else()
diff --git a/Dockerfile b/Dockerfile
index 9a0be1969..fa3f5819a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,7 +9,7 @@ RUN \
 
 # Copy AppImage
 RUN mkdir /app
-ADD ./out/minecraft-pi-reborn-server-*-amd64.AppImage /app
+ADD ./out/minecraft-pi-reborn-legacy-server-*-amd64.AppImage /app
 
 # Extract AppImage
 WORKDIR /app
diff --git a/Jenkinsfile b/Jenkinsfile
index c4f9ade69..9d19bfda1 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -22,11 +22,11 @@ pipeline {
                 stage('Publish') {
                     steps {
                         sh 'apt-get update && apt-get install -y docker.io'
-                        sh 'docker build --no-cache --tag thebrokenrail/minecraft-pi-reborn-server .'
+                        sh 'docker build --no-cache --tag thebrokenrail/minecraft-pi-reborn-legacy-server .'
                         withCredentials([usernamePassword(credentialsId: 'docker_hub_login', usernameVariable: 'DOCKER_HUB_USERNAME', passwordVariable: 'DOCKER_HUB_PASSWORD')]) {
                             sh 'docker login -u "${DOCKER_HUB_USERNAME}" -p "${DOCKER_HUB_PASSWORD}"'
                         }
-                        sh 'docker push thebrokenrail/minecraft-pi-reborn-server'
+                        sh 'docker push thebrokenrail/minecraft-pi-reborn-legacy-server'
                     }
                 }
             }
diff --git a/README.md b/README.md
index c5b0efebb..39c4ac4d6 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
     <img alt="Start Screen" src="images/start.png">
 </p>
 
-# Minecraft: Pi Edition: Reborn
+# Minecraft: Pi Edition: Reborn Legacy
 Minecraft: Pi Edition Modding Project
 
 ## Documentation
diff --git a/docs/DEDICATED_SERVER.md b/docs/DEDICATED_SERVER.md
index 0720e6d30..ba1564a20 100644
--- a/docs/DEDICATED_SERVER.md
+++ b/docs/DEDICATED_SERVER.md
@@ -1,15 +1,15 @@
 # Dedicated Server
 The dedicated server is a version of Minecraft: Pi Edition modified to run in a headless environment. It loads settings from a ``server.properties`` file.
 
-This server is also compatible with MCPE Alpha v0.6.1.
+This server is also compatible with MCPE Alpha v0.5.0.
 
 ## Setup
 
 ### Debian Package
-To use, install and run ``minecraft-pi-reborn-server``. It will generate the world and ``server.properties`` in the current directory.
+To use, install and run ``minecraft-pi-reborn-legacy-server``. It will generate the world and ``server.properties`` in the current directory.
 
 ### Docker Image
-An official Docker image is also provided: [thebrokenrail/minecraft-pi-reborn-server](https://hub.docker.com/r/thebrokenrail/minecraft-pi-reborn-server).
+An official Docker image is also provided: [thebrokenrail/minecraft-pi-reborn-legacy-server](https://hub.docker.com/r/thebrokenrail/minecraft-pi-reborn-legacy-server).
 
 ## Server Limitations
 * Player data is not saved because of limitations with MCPE LAN worlds
diff --git a/docs/INSTALL.md b/docs/INSTALL.md
index 2b2582c3a..1daf7becc 100644
--- a/docs/INSTALL.md
+++ b/docs/INSTALL.md
@@ -1,11 +1,11 @@
 # Manual Installation
-[Download Packages Here](https://jenkins.thebrokenrail.com/job/minecraft-pi-reborn/job/master/lastSuccessfulBuild/artifact/out/)
+[Download Packages Here](https://jenkins.thebrokenrail.com/job/minecraft-pi-reborn/job/legacy/lastSuccessfulBuild/artifact/out/)
 
 ## Picking A Package
 
 ### Name Format
 ```
-minecraft-pi-reborn-<Variant>_X.Y.Z_<Architecture>
+minecraft-pi-reborn-legacy-<Variant>_X.Y.Z_<Architecture>
 ```
 
 ### Picking A Variant
diff --git a/docs/SOUND.md b/docs/SOUND.md
index f438a1d80..4d5b020f0 100644
--- a/docs/SOUND.md
+++ b/docs/SOUND.md
@@ -1,7 +1,7 @@
 # Sound
 One of MCPI-Reborn's main modifications is a sound-engine since MCPI doesn't include one by default[^1]. However, it can't be used out-of-box because MCPI doesn't contain any sound data and MCPI-Reborn can't include it because of copyright.
 
-MCPE's sound data can be extracted from any MCPE v0.6.1[^2] APK file, just place its `libminecraftpe.so` into `~/.minecraft-pi/overrides` and you should have sound!
+MCPE's sound data can be extracted from any MCPE v0.5.0[^2] APK file, just place its `libminecraftpe.so` into `~/.minecraft-pi/overrides` and you should have sound!
 
 [^1]: The mute button is just leftover code from MCPE, it doesn't actually do anything in un-modded MCPI, however it is connected to MCPI-Reborn's sound-engine.
 [^2]: This isn't a hard limit, an MCPE v0.8.1 APK would probably work, but don't rely on it.
diff --git a/launcher/CMakeLists.txt b/launcher/CMakeLists.txt
index f1779fb9e..ae80ad640 100644
--- a/launcher/CMakeLists.txt
+++ b/launcher/CMakeLists.txt
@@ -12,21 +12,21 @@ if(BUILD_NATIVE_COMPONENTS)
     # Install
     install(TARGETS launcher DESTINATION "${MCPI_INSTALL_DIR}")
     install_symlink("../${MCPI_INSTALL_DIR}/launcher" "bin/${MCPI_VARIANT_NAME}")
-    set(ICON_PATH "data/com.thebrokenrail.MCPIReborn.png")
+    set(ICON_PATH "data/com.thebrokenrail.MCPIRebornLegacy.png")
     set(ICON_TARGET_PATH "share/icons/hicolor/scalable/apps")
     if(NOT MCPI_SERVER_MODE)
         install(DIRECTORY "data/client/" DESTINATION ".")
         install(
             FILES "${ICON_PATH}"
             DESTINATION "${ICON_TARGET_PATH}"
-            RENAME "com.thebrokenrail.MCPIRebornClient.png"
+            RENAME "com.thebrokenrail.MCPIRebornLegacyClient.png"
         )
     else()
         install(DIRECTORY "data/server/" DESTINATION ".")
         install(
             FILES "${ICON_PATH}"
             DESTINATION "${ICON_TARGET_PATH}"
-            RENAME "com.thebrokenrail.MCPIRebornServer.png"
+            RENAME "com.thebrokenrail.MCPIRebornLegacyServer.png"
         )
     endif()
 endif()
diff --git a/launcher/data/client/lib/minecraft-pi-reborn-client/available-feature-flags b/launcher/data/client/lib/minecraft-pi-reborn-legacy-client/available-feature-flags
similarity index 100%
rename from launcher/data/client/lib/minecraft-pi-reborn-client/available-feature-flags
rename to launcher/data/client/lib/minecraft-pi-reborn-legacy-client/available-feature-flags
diff --git a/launcher/data/client/share/applications/com.thebrokenrail.MCPIRebornClient.desktop b/launcher/data/client/share/applications/com.thebrokenrail.MCPIRebornClient.desktop
deleted file mode 100755
index 3ad70d114..000000000
--- a/launcher/data/client/share/applications/com.thebrokenrail.MCPIRebornClient.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=Minecraft: Pi Edition: Reborn (Client)
-Comment=Fun with Blocks
-Icon=com.thebrokenrail.MCPIRebornClient
-StartupNotify=false
-StartupWMClass=Minecraft: Pi Edition: Reborn
-Exec=minecraft-pi-reborn-client
-Terminal=false
-Type=Application
-Categories=Game;
diff --git a/launcher/data/client/share/applications/com.thebrokenrail.MCPIRebornLegacyClient.desktop b/launcher/data/client/share/applications/com.thebrokenrail.MCPIRebornLegacyClient.desktop
new file mode 100755
index 000000000..e3f887a8a
--- /dev/null
+++ b/launcher/data/client/share/applications/com.thebrokenrail.MCPIRebornLegacyClient.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=Minecraft: Pi Edition: Reborn Legacy (Client)
+Comment=Fun with Blocks
+Icon=com.thebrokenrail.MCPIRebornLegacyClient
+StartupNotify=false
+StartupWMClass=Minecraft: Pi Edition: Reborn Legacy
+Exec=minecraft-pi-reborn-legacy-client
+Terminal=false
+Type=Application
+Categories=Game;
diff --git a/launcher/data/client/share/metainfo/com.thebrokenrail.MCPIRebornClient.appdata.xml b/launcher/data/client/share/metainfo/com.thebrokenrail.MCPIRebornLegacyClient.appdata.xml
similarity index 85%
rename from launcher/data/client/share/metainfo/com.thebrokenrail.MCPIRebornClient.appdata.xml
rename to launcher/data/client/share/metainfo/com.thebrokenrail.MCPIRebornLegacyClient.appdata.xml
index aa153ebe2..4770b34bd 100644
--- a/launcher/data/client/share/metainfo/com.thebrokenrail.MCPIRebornClient.appdata.xml
+++ b/launcher/data/client/share/metainfo/com.thebrokenrail.MCPIRebornLegacyClient.appdata.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="desktop">
-    <id>com.thebrokenrail.MCPIRebornClient</id>
-    <name>Minecraft: Pi Edition: Reborn (Client)</name>
+    <id>com.thebrokenrail.MCPIRebornLegacyClient</id>
+    <name>Minecraft: Pi Edition: Reborn Legacy (Client)</name>
     <metadata_license>CC0-1.0</metadata_license>
     <summary>Fun with Blocks</summary>
     <description><p>Minecraft: Pi Edition Modding Project.</p><p>NOTE: This is not verified by, affiliated with, or supported by Mojang or Microsoft.</p></description>
-    <url type="homepage">https://gitea.thebrokenrail.com/TheBrokenRail/minecraft-pi-reborn</url>
+    <url type="homepage">https://gitea.thebrokenrail.com/TheBrokenRail/minecraft-pi-reborn/src/branch/legacy</url>
     <screenshots>
         <screenshot type="default">
-            <image>https://gitea.thebrokenrail.com/TheBrokenRail/minecraft-pi-reborn/raw/branch/master/images/start.png</image>
+            <image>https://gitea.thebrokenrail.com/TheBrokenRail/minecraft-pi-reborn/raw/branch/legacy/images/start.png</image>
         </screenshot>
     </screenshots>
-    <launchable type="desktop-id">com.thebrokenrail.MCPIRebornClient.desktop</launchable>
+    <launchable type="desktop-id">com.thebrokenrail.MCPIRebornLegacyClient.desktop</launchable>
     <provides>
-        <id>com.thebrokenrail.MCPIRebornClient.desktop</id>
+        <id>com.thebrokenrail.MCPIRebornLegacyClient.desktop</id>
     </provides>
     <project_license>LicenseRef-proprietary</project_license>
     <developer_name>TheBrokenRail &amp; Mojang AB</developer_name>
diff --git a/launcher/data/com.thebrokenrail.MCPIReborn.png b/launcher/data/com.thebrokenrail.MCPIRebornLegacy.png
similarity index 100%
rename from launcher/data/com.thebrokenrail.MCPIReborn.png
rename to launcher/data/com.thebrokenrail.MCPIRebornLegacy.png
diff --git a/launcher/data/server/share/applications/com.thebrokenrail.MCPIRebornLegacyServer.desktop b/launcher/data/server/share/applications/com.thebrokenrail.MCPIRebornLegacyServer.desktop
new file mode 100755
index 000000000..dc57cac7c
--- /dev/null
+++ b/launcher/data/server/share/applications/com.thebrokenrail.MCPIRebornLegacyServer.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Minecraft: Pi Edition: Reborn Legacy (Server)
+Comment=Fun with Blocks
+Icon=com.thebrokenrail.MCPIRebornLegacyServer
+Exec=minecraft-pi-reborn-legacy-server
+Terminal=true
+Type=Application
+Categories=Game;
+NoDisplay=true
diff --git a/launcher/data/server/share/applications/com.thebrokenrail.MCPIRebornServer.desktop b/launcher/data/server/share/applications/com.thebrokenrail.MCPIRebornServer.desktop
deleted file mode 100755
index 2da04fdad..000000000
--- a/launcher/data/server/share/applications/com.thebrokenrail.MCPIRebornServer.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Minecraft: Pi Edition: Reborn (Server)
-Comment=Fun with Blocks
-Icon=com.thebrokenrail.MCPIRebornServer
-Exec=minecraft-pi-reborn-server
-Terminal=true
-Type=Application
-Categories=Game;
-NoDisplay=true
diff --git a/launcher/data/server/share/metainfo/com.thebrokenrail.MCPIRebornServer.appdata.xml b/launcher/data/server/share/metainfo/com.thebrokenrail.MCPIRebornLegacyServer.appdata.xml
similarity index 86%
rename from launcher/data/server/share/metainfo/com.thebrokenrail.MCPIRebornServer.appdata.xml
rename to launcher/data/server/share/metainfo/com.thebrokenrail.MCPIRebornLegacyServer.appdata.xml
index 4efe8e8e3..9fcf6d138 100644
--- a/launcher/data/server/share/metainfo/com.thebrokenrail.MCPIRebornServer.appdata.xml
+++ b/launcher/data/server/share/metainfo/com.thebrokenrail.MCPIRebornLegacyServer.appdata.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="desktop">
-    <id>com.thebrokenrail.MCPIRebornServer</id>
-    <name>Minecraft: Pi Edition: Reborn (Server)</name>
+    <id>com.thebrokenrail.MCPIRebornLegacyServer</id>
+    <name>Minecraft: Pi Edition: Reborn Legacy (Server)</name>
     <metadata_license>CC0-1.0</metadata_license>
     <summary>Fun with Blocks</summary>
     <description><p>Minecraft: Pi Edition Modding Project.</p><p>NOTE: This is not verified by, affiliated with, or supported by Mojang or Microsoft.</p></description>
-    <url type="homepage">https://gitea.thebrokenrail.com/TheBrokenRail/minecraft-pi-reborn</url>
-    <launchable type="desktop-id">com.thebrokenrail.MCPIRebornServer.desktop</launchable>
+    <url type="homepage">https://gitea.thebrokenrail.com/TheBrokenRail/minecraft-pi-reborn/src/branch/legacy</url>
+    <launchable type="desktop-id">com.thebrokenrail.MCPIRebornLegacyServer.desktop</launchable>
     <provides>
-        <id>com.thebrokenrail.MCPIRebornServer.desktop</id>
+        <id>com.thebrokenrail.MCPIRebornLegacyServer.desktop</id>
     </provides>
     <project_license>LicenseRef-proprietary</project_license>
     <developer_name>TheBrokenRail &amp; Mojang AB</developer_name>
diff --git a/libreborn/include/libreborn/config.h b/libreborn/include/libreborn/config.h
index 596d4fdba..8152851c9 100644
--- a/libreborn/include/libreborn/config.h
+++ b/libreborn/include/libreborn/config.h
@@ -1,3 +1,3 @@
 #pragma once
 
-#define GUI_TITLE "Minecraft: Pi Edition: Reborn"
+#define GUI_TITLE "Minecraft: Pi Edition: Reborn Legacy"
diff --git a/scripts/generate-appimage-builder-yaml.js b/scripts/generate-appimage-builder-yaml.js
index 2b92f0a90..55d8d55f1 100755
--- a/scripts/generate-appimage-builder-yaml.js
+++ b/scripts/generate-appimage-builder-yaml.js
@@ -8,9 +8,9 @@ const mode = process.argv[2];
 const arch = process.argv[3];
 
 // Data
-const id = `com.thebrokenrail.MCPIReborn${mode === 'server' ? 'Server' : 'Client'}`;
-const name = `minecraft-pi-reborn-${mode}`;
-const updateURL = `https://jenkins.thebrokenrail.com/job/minecraft-pi-reborn/job/master/lastSuccessfulBuild/artifact/out/${name}-latest-${arch}.AppImage.zsync`;
+const id = `com.thebrokenrail.MCPIRebornLegacy${mode === 'server' ? 'Server' : 'Client'}`;
+const name = `minecraft-pi-reborn-legacy-${mode}`;
+const updateURL = `https://jenkins.thebrokenrail.com/job/minecraft-pi-reborn/job/legacy/lastSuccessfulBuild/artifact/out/${name}-latest-${arch}.AppImage.zsync`;
 
 // APT Data
 const apt_distribution = 'bullseye';
diff --git a/scripts/package.sh b/scripts/package.sh
index 15ebbb2dd..4419fa237 100755
--- a/scripts/package.sh
+++ b/scripts/package.sh
@@ -9,4 +9,4 @@ set -e
 appimage-builder --recipe AppImageBuilder.yml
 
 # Move ZSync
-mv "./minecraft-pi-reborn-$1-$(cat VERSION)-$2.AppImage.zsync" "./out/minecraft-pi-reborn-$1-latest-$2.AppImage.zsync"
+mv "./minecraft-pi-reborn-legacy-$1-$(cat VERSION)-$2.AppImage.zsync" "./out/minecraft-pi-reborn-legacy-$1-latest-$2.AppImage.zsync"
diff --git a/scripts/test.sh b/scripts/test.sh
index 7dfb5fb11..60931a8a2 100755
--- a/scripts/test.sh
+++ b/scripts/test.sh
@@ -15,4 +15,4 @@ mkdir -p build/test
 
 # Run Test
 cd build/test
-minecraft-pi-reborn-server --only-generate
+minecraft-pi-reborn-legacy-server --only-generate