diff --git a/.gitignore b/.gitignore
index c0b0a2dd1..446505efa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -126,8 +126,6 @@ xcuserdata/
 
 # Ignore linux/mingw build artifacts.
 /build*
-/minecraftcpp
-/minecraftcpp.exe
 
 # Ignore wasm build artifacts.
 /wasm
diff --git a/.gitmodules b/.gitmodules
index d243d02d7..dd3457567 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -3,7 +3,7 @@
 	url = https://github.com/gzuidhof/coi-serviceworker.git
 [submodule "thirdparty/SDL-src"]
 	path = thirdparty/SDL2/src
-	url = https://github.com/ReMinecraftPE/SDL.git
+	url = https://github.com/nbcraft-org/SDL.git
 [submodule "thirdparty/stb_image/include"]
 	path = thirdparty/stb_image/include
 	url = https://github.com/nothings/stb.git
diff --git a/game/readme.txt b/game/readme.txt
index b3b565db9..a698e0cbf 100644
--- a/game/readme.txt
+++ b/game/readme.txt
@@ -1,12 +1,12 @@
 NOTE: This is only used as the working directory if you
 are running from Visual Studio on MS Windows! If not, the
-working directory will be the one you ran minecraftcpp from.
+working directory will be the one you ran nbcraft from.
 
 So for instance, if I ran it in a situation like
 
-/home/pi/mcpe/game $ ../minecraftcpp
+/home/pi/nbcraft/game $ ../nbcraft
 
-the working directory will be /home/pi/mcpe/game.
+the working directory will be /home/pi/nbcraft/game.
 
 If you run it from the shell on windows, the working directory
 will be the very one the executable is in.
diff --git a/platforms/android/main.cpp b/platforms/android/main.cpp
index e99776c09..802697829 100644
--- a/platforms/android/main.cpp
+++ b/platforms/android/main.cpp
@@ -237,7 +237,7 @@ static std::string getExternalStorageDir(struct engine* engine)
     // This returns a directory path that looks something like the following, which is still
     // exposed to the user, therefore we get the benefits of having it exposed, aside from the
     // fact that removing the app will delete all your worlds.
-    // /.../Android/data/com.minecraftcpp/files
+    // /.../Android/data/org.nbcraft/files
 #ifndef USE_EXTERNAL_STORAGE
 
     return std::string(engine->androidApp->activity->externalDataPath);
diff --git a/source/client/gui/components/TextBox.cpp b/source/client/gui/components/TextBox.cpp
index f18371498..895de827f 100644
--- a/source/client/gui/components/TextBox.cpp
+++ b/source/client/gui/components/TextBox.cpp
@@ -12,7 +12,7 @@
 #ifndef ORIGINAL_CODE
 
 #ifdef USE_NATIVE_ANDROID
-#define HANDLE_CHARS_SEPARATELY // faked though, see platforms/android/minecraftcpp/minecraftcpp.NativeActivity/main.cpp
+#define HANDLE_CHARS_SEPARATELY // faked though, see platforms/android/main.cpp
 #endif
 
 static bool IsInvalidCharacter(char c)