diff --git a/Projects/Android/AndroidManifest.xml b/Projects/Android/AndroidManifest.xml
index ebf0092..990a5ca 100644
--- a/Projects/Android/AndroidManifest.xml
+++ b/Projects/Android/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-		package="com.drbeef.jkquest"
+		package="com.drbeef.jkxr"
 		android:versionCode="39"
 		android:versionName="0.6.2" android:installLocation="auto" >
 
@@ -18,8 +18,8 @@
 	<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
 
 	<application android:allowBackup="false" 
-		android:icon="@drawable/ic_jkquest"
-		android:label="@string/jkquest"
+		android:icon="@drawable/ic_jkxr"
+		android:label="@string/jkxr"
 		android:extractNativeLibs="true"
 		>
 		
@@ -33,7 +33,7 @@
 		<meta-data android:name="pvr.app.type" android:value="vr" />
 
 		<activity
-				android:name="com.drbeef.jkquest.GLES3JNIActivity"
+				android:name="com.drbeef.jkxr.GLES3JNIActivity"
 				android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen"
 				android:launchMode="singleTask"
 				android:screenOrientation="landscape"
diff --git a/Projects/Android/build.gradle b/Projects/Android/build.gradle
index 77e493d..2bcce9f 100644
--- a/Projects/Android/build.gradle
+++ b/Projects/Android/build.gradle
@@ -6,7 +6,7 @@ android {
   // -debug.apk or -release.apk appended to it.
   // The filename doesn't effect the Android installation process.
   // Use only letters to remain compatible with the package name.
-  project.archivesBaseName = "jkquest"
+  project.archivesBaseName = "jkxr"
 
   defaultConfig {
     // Gradle replaces the manifest package with this value, which must
diff --git a/Projects/Android/jni/JKVR/JKVR_SurfaceView.cpp b/Projects/Android/jni/JKXR/JKXR_SurfaceView.cpp
similarity index 95%
rename from Projects/Android/jni/JKVR/JKVR_SurfaceView.cpp
rename to Projects/Android/jni/JKXR/JKXR_SurfaceView.cpp
index ad3f9b1..e663a20 100644
--- a/Projects/Android/jni/JKVR/JKVR_SurfaceView.cpp
+++ b/Projects/Android/jni/JKXR/JKXR_SurfaceView.cpp
@@ -43,7 +43,7 @@ int argc=0;
 /*
 ================================================================================
 
-JKVR Stuff
+JKXR Stuff
 
 ================================================================================
 */
@@ -346,9 +346,9 @@ void * AppThreadFunction(void * parm ) {
 	TBXR_InitActions();
 
 #ifdef JK2_MODE
-		chdir("/sdcard/JKQuest/JK2");
+		chdir("/sdcard/JKXR/JK2");
 #else
-		chdir("/sdcard/JKQuest/JK3");
+		chdir("/sdcard/JKXR/JK3");
 #endif
 
 	TBXR_WaitForSessionActive();
@@ -675,7 +675,7 @@ int JNI_OnLoad(JavaVM* vm, void* reserved)
 	return JNI_VERSION_1_4;
 }
 
-JNIEXPORT jlong JNICALL Java_com_drbeef_jkquest_GLES3JNILib_onCreate( JNIEnv * env, jclass activityClass, jobject activity,
+JNIEXPORT jlong JNICALL Java_com_drbeef_jkxr_GLES3JNILib_onCreate( JNIEnv * env, jclass activityClass, jobject activity,
 																	   jstring commandLineParams)
 {
 	ALOGV( "    GLES3JNILib::onCreate()" );
@@ -740,7 +740,7 @@ JNIEXPORT jlong JNICALL Java_com_drbeef_jkquest_GLES3JNILib_onCreate( JNIEnv * e
 }
 
 
-JNIEXPORT void JNICALL Java_com_drbeef_jkquest_GLES3JNILib_onStart( JNIEnv * env, jobject obj, jlong handle, jobject obj1)
+JNIEXPORT void JNICALL Java_com_drbeef_jkxr_GLES3JNILib_onStart( JNIEnv * env, jobject obj, jlong handle, jobject obj1)
 {
 	ALOGV( "    GLES3JNILib::onStart()" );
 
@@ -762,7 +762,7 @@ JNIEXPORT void JNICALL Java_com_drbeef_jkquest_GLES3JNILib_onStart( JNIEnv * env
 	surfaceMessageQueue_PostMessage(&appThread->MessageQueue, &message);
 }
 
-JNIEXPORT void JNICALL Java_com_drbeef_jkquest_GLES3JNILib_onResume( JNIEnv * env, jobject obj, jlong handle )
+JNIEXPORT void JNICALL Java_com_drbeef_jkxr_GLES3JNILib_onResume( JNIEnv * env, jobject obj, jlong handle )
 {
 	ALOGV( "    GLES3JNILib::onResume()" );
 	ovrAppThread * appThread = (ovrAppThread *)((size_t)handle);
@@ -771,7 +771,7 @@ JNIEXPORT void JNICALL Java_com_drbeef_jkquest_GLES3JNILib_onResume( JNIEnv * en
 	surfaceMessageQueue_PostMessage(&appThread->MessageQueue, &message);
 }
 
-JNIEXPORT void JNICALL Java_com_drbeef_jkquest_GLES3JNILib_onPause( JNIEnv * env, jobject obj, jlong handle )
+JNIEXPORT void JNICALL Java_com_drbeef_jkxr_GLES3JNILib_onPause( JNIEnv * env, jobject obj, jlong handle )
 {
 	ALOGV( "    GLES3JNILib::onPause()" );
 	ovrAppThread * appThread = (ovrAppThread *)((size_t)handle);
@@ -780,7 +780,7 @@ JNIEXPORT void JNICALL Java_com_drbeef_jkquest_GLES3JNILib_onPause( JNIEnv * env
 	surfaceMessageQueue_PostMessage(&appThread->MessageQueue, &message);
 }
 
-JNIEXPORT void JNICALL Java_com_drbeef_jkquest_GLES3JNILib_onStop( JNIEnv * env, jobject obj, jlong handle )
+JNIEXPORT void JNICALL Java_com_drbeef_jkxr_GLES3JNILib_onStop( JNIEnv * env, jobject obj, jlong handle )
 {
 	ALOGV( "    GLES3JNILib::onStop()" );
 	ovrAppThread * appThread = (ovrAppThread *)((size_t)handle);
@@ -789,7 +789,7 @@ JNIEXPORT void JNICALL Java_com_drbeef_jkquest_GLES3JNILib_onStop( JNIEnv * env,
 	surfaceMessageQueue_PostMessage(&appThread->MessageQueue, &message);
 }
 
-JNIEXPORT void JNICALL Java_com_drbeef_jkquest_GLES3JNILib_onDestroy( JNIEnv * env, jobject obj, jlong handle )
+JNIEXPORT void JNICALL Java_com_drbeef_jkxr_GLES3JNILib_onDestroy( JNIEnv * env, jobject obj, jlong handle )
 {
 	ALOGV( "    GLES3JNILib::onDestroy()" );
 	ovrAppThread * appThread = (ovrAppThread *)((size_t)handle);
@@ -810,7 +810,7 @@ Surface lifecycle
 ================================================================================
 */
 
-JNIEXPORT void JNICALL Java_com_drbeef_jkquest_GLES3JNILib_onSurfaceCreated( JNIEnv * env, jobject obj, jlong handle, jobject surface )
+JNIEXPORT void JNICALL Java_com_drbeef_jkxr_GLES3JNILib_onSurfaceCreated( JNIEnv * env, jobject obj, jlong handle, jobject surface )
 {
 	ALOGV( "    GLES3JNILib::onSurfaceCreated()" );
 	ovrAppThread * appThread = (ovrAppThread *)((size_t)handle);
@@ -833,7 +833,7 @@ JNIEXPORT void JNICALL Java_com_drbeef_jkquest_GLES3JNILib_onSurfaceCreated( JNI
 	surfaceMessageQueue_PostMessage(&appThread->MessageQueue, &message);
 }
 
-JNIEXPORT void JNICALL Java_com_drbeef_jkquest_GLES3JNILib_onSurfaceChanged( JNIEnv * env, jobject obj, jlong handle, jobject surface )
+JNIEXPORT void JNICALL Java_com_drbeef_jkxr_GLES3JNILib_onSurfaceChanged( JNIEnv * env, jobject obj, jlong handle, jobject surface )
 {
 	ALOGV( "    GLES3JNILib::onSurfaceChanged()" );
 	ovrAppThread * appThread = (ovrAppThread *)((size_t)handle);
@@ -875,7 +875,7 @@ JNIEXPORT void JNICALL Java_com_drbeef_jkquest_GLES3JNILib_onSurfaceChanged( JNI
 	}
 }
 
-JNIEXPORT void JNICALL Java_com_drbeef_jkquest_GLES3JNILib_onSurfaceDestroyed( JNIEnv * env, jobject obj, jlong handle )
+JNIEXPORT void JNICALL Java_com_drbeef_jkxr_GLES3JNILib_onSurfaceDestroyed( JNIEnv * env, jobject obj, jlong handle )
 {
 	ALOGV( "    GLES3JNILib::onSurfaceDestroyed()" );
 	ovrAppThread * appThread = (ovrAppThread *)((size_t)handle);
diff --git a/Projects/Android/jni/JKVR/OpenXrInput.cpp b/Projects/Android/jni/JKXR/OpenXrInput.cpp
similarity index 100%
rename from Projects/Android/jni/JKVR/OpenXrInput.cpp
rename to Projects/Android/jni/JKXR/OpenXrInput.cpp
diff --git a/Projects/Android/jni/JKVR/TBXR_Common.cpp b/Projects/Android/jni/JKXR/TBXR_Common.cpp
similarity index 100%
rename from Projects/Android/jni/JKVR/TBXR_Common.cpp
rename to Projects/Android/jni/JKXR/TBXR_Common.cpp
diff --git a/Projects/Android/jni/JKVR/TBXR_Common.h b/Projects/Android/jni/JKXR/TBXR_Common.h
similarity index 100%
rename from Projects/Android/jni/JKVR/TBXR_Common.h
rename to Projects/Android/jni/JKXR/TBXR_Common.h
diff --git a/Projects/Android/jni/JKVR/VrClientInfo.h b/Projects/Android/jni/JKXR/VrClientInfo.h
similarity index 100%
rename from Projects/Android/jni/JKVR/VrClientInfo.h
rename to Projects/Android/jni/JKXR/VrClientInfo.h
diff --git a/Projects/Android/jni/JKVR/VrCommon.h b/Projects/Android/jni/JKXR/VrCommon.h
similarity index 100%
rename from Projects/Android/jni/JKVR/VrCommon.h
rename to Projects/Android/jni/JKXR/VrCommon.h
diff --git a/Projects/Android/jni/JKVR/VrCvars.h b/Projects/Android/jni/JKXR/VrCvars.h
similarity index 100%
rename from Projects/Android/jni/JKVR/VrCvars.h
rename to Projects/Android/jni/JKXR/VrCvars.h
diff --git a/Projects/Android/jni/JKVR/VrInput.h b/Projects/Android/jni/JKXR/VrInput.h
similarity index 100%
rename from Projects/Android/jni/JKVR/VrInput.h
rename to Projects/Android/jni/JKXR/VrInput.h
diff --git a/Projects/Android/jni/JKVR/VrInputCommon.cpp b/Projects/Android/jni/JKXR/VrInputCommon.cpp
similarity index 100%
rename from Projects/Android/jni/JKVR/VrInputCommon.cpp
rename to Projects/Android/jni/JKXR/VrInputCommon.cpp
diff --git a/Projects/Android/jni/JKVR/VrInputDefault.cpp b/Projects/Android/jni/JKXR/VrInputDefault.cpp
similarity index 100%
rename from Projects/Android/jni/JKVR/VrInputDefault.cpp
rename to Projects/Android/jni/JKXR/VrInputDefault.cpp
diff --git a/Projects/Android/jni/JKVR/VrInputWeaponAlign.cpp b/Projects/Android/jni/JKXR/VrInputWeaponAlign.cpp
similarity index 100%
rename from Projects/Android/jni/JKVR/VrInputWeaponAlign.cpp
rename to Projects/Android/jni/JKXR/VrInputWeaponAlign.cpp
diff --git a/Projects/Android/jni/JKVR/argtable3.c b/Projects/Android/jni/JKXR/argtable3.c
similarity index 100%
rename from Projects/Android/jni/JKVR/argtable3.c
rename to Projects/Android/jni/JKXR/argtable3.c
diff --git a/Projects/Android/jni/JKVR/argtable3.h b/Projects/Android/jni/JKXR/argtable3.h
similarity index 100%
rename from Projects/Android/jni/JKVR/argtable3.h
rename to Projects/Android/jni/JKXR/argtable3.h
diff --git a/Projects/Android/jni/JKVR/mathlib.c b/Projects/Android/jni/JKXR/mathlib.c
similarity index 100%
rename from Projects/Android/jni/JKVR/mathlib.c
rename to Projects/Android/jni/JKXR/mathlib.c
diff --git a/Projects/Android/jni/JKVR/mathlib.h b/Projects/Android/jni/JKXR/mathlib.h
similarity index 100%
rename from Projects/Android/jni/JKVR/mathlib.h
rename to Projects/Android/jni/JKXR/mathlib.h
diff --git a/Projects/Android/jni/JKVR/matrixlib.c b/Projects/Android/jni/JKXR/matrixlib.c
similarity index 100%
rename from Projects/Android/jni/JKVR/matrixlib.c
rename to Projects/Android/jni/JKXR/matrixlib.c
diff --git a/Projects/Android/jni/OpenJK/Android_client_ja.mk b/Projects/Android/jni/OpenJK/Android_client_ja.mk
index ff3657e..20e8377 100644
--- a/Projects/Android/jni/OpenJK/Android_client_ja.mk
+++ b/Projects/Android/jni/OpenJK/Android_client_ja.mk
@@ -23,7 +23,7 @@ LOCAL_STATIC_LIBRARIES := sigc libzip libpng libminizip
 LOCAL_SHARED_LIBRARIES := openxr_loader gl4es
 
 
-LOCAL_C_INCLUDES := $(JK3_BASE_C_INCLUDES) $(TOP_DIR) $(TOP_DIR)/JKVR $(GL4ES_PATH) $(GL4ES_PATH)/include $(JK3_CODE_PATH)/game $(SUPPORT_LIBS)/minizip/include $(JK3_CODE_PATH)/rd-gles $(JK3_CODE_PATH)/rd-common
+LOCAL_C_INCLUDES := $(JK3_BASE_C_INCLUDES) $(TOP_DIR) $(TOP_DIR)/JKXR $(GL4ES_PATH) $(GL4ES_PATH)/include $(JK3_CODE_PATH)/game $(SUPPORT_LIBS)/minizip/include $(JK3_CODE_PATH)/rd-gles $(JK3_CODE_PATH)/rd-common
 
 
 #############################################################################
@@ -123,13 +123,13 @@ JK3_SRC = \
 		${SHARED_PATH}/qcommon/safe/string.cpp \
 
 
-JKVR_SRC_FILES :=  ${TOP_DIR}/JKVR/JKVR_SurfaceView.cpp \
-                  ${TOP_DIR}/JKVR/TBXR_Common.cpp \
-                  ${TOP_DIR}/JKVR/VrInputCommon.cpp \
-                  ${TOP_DIR}/JKVR/VrInputDefault.cpp \
-                  ${TOP_DIR}/JKVR/VrInputWeaponAlign.cpp \
-                  ${TOP_DIR}/JKVR/argtable3.c \
-                  ${TOP_DIR}/JKVR/OpenXrInput.cpp
+JKVR_SRC_FILES :=  ${TOP_DIR}/JKXR/JKXR_SurfaceView.cpp \
+                  ${TOP_DIR}/JKXR/TBXR_Common.cpp \
+                  ${TOP_DIR}/JKXR/VrInputCommon.cpp \
+                  ${TOP_DIR}/JKXR/VrInputDefault.cpp \
+                  ${TOP_DIR}/JKXR/VrInputWeaponAlign.cpp \
+                  ${TOP_DIR}/JKXR/argtable3.c \
+                  ${TOP_DIR}/JKXR/OpenXrInput.cpp
 
 LOCAL_SRC_FILES += $(JK3_SRC) $(JKVR_SRC_FILES)
 
diff --git a/Projects/Android/jni/OpenJK/Android_client_jo.mk b/Projects/Android/jni/OpenJK/Android_client_jo.mk
index 4a11baa..7ee9375 100644
--- a/Projects/Android/jni/OpenJK/Android_client_jo.mk
+++ b/Projects/Android/jni/OpenJK/Android_client_jo.mk
@@ -23,7 +23,7 @@ LOCAL_STATIC_LIBRARIES := sigc libzip libpng libminizip
 LOCAL_SHARED_LIBRARIES := openxr_loader gl4es
 
 
-LOCAL_C_INCLUDES :=  $(JK3_BASE_C_INCLUDES) $(TOP_DIR) $(TOP_DIR)/JKVR $(GL4ES_PATH) $(GL4ES_PATH)/include $(JK3_CODE_PATH)/game $(SUPPORT_LIBS)/minizip/include $(JK3_CODE_PATH)/rd-gles $(JK3_CODE_PATH)/rd-common
+LOCAL_C_INCLUDES :=  $(JK3_BASE_C_INCLUDES) $(TOP_DIR) $(TOP_DIR)/JKXR $(GL4ES_PATH) $(GL4ES_PATH)/include $(JK3_CODE_PATH)/game $(SUPPORT_LIBS)/minizip/include $(JK3_CODE_PATH)/rd-gles $(JK3_CODE_PATH)/rd-common
 
 
 #############################################################################
@@ -123,13 +123,13 @@ JK3_SRC = \
 		${SHARED_PATH}/qcommon/safe/string.cpp \
 
 
-JKVR_SRC_FILES :=  ${TOP_DIR}/JKVR/JKVR_SurfaceView.cpp \
-       ${TOP_DIR}/JKVR/TBXR_Common.cpp \
-       ${TOP_DIR}/JKVR/VrInputCommon.cpp \
-       ${TOP_DIR}/JKVR/VrInputDefault.cpp \
-       ${TOP_DIR}/JKVR/VrInputWeaponAlign.cpp \
-       ${TOP_DIR}/JKVR/argtable3.c \
-       ${TOP_DIR}/JKVR/OpenXrInput.cpp
+JKVR_SRC_FILES :=  ${TOP_DIR}/JKXR/JKXR_SurfaceView.cpp \
+       ${TOP_DIR}/JKXR/TBXR_Common.cpp \
+       ${TOP_DIR}/JKXR/VrInputCommon.cpp \
+       ${TOP_DIR}/JKXR/VrInputDefault.cpp \
+       ${TOP_DIR}/JKXR/VrInputWeaponAlign.cpp \
+       ${TOP_DIR}/JKXR/argtable3.c \
+       ${TOP_DIR}/JKXR/OpenXrInput.cpp
 
 LOCAL_SRC_FILES += $(JK3_SRC) $(JKVR_SRC_FILES)
 
diff --git a/Projects/Android/jni/OpenJK/code/cgame/cg_camera.cpp b/Projects/Android/jni/OpenJK/code/cgame/cg_camera.cpp
index 91f4717..c1ae7f4 100644
--- a/Projects/Android/jni/OpenJK/code/cgame/cg_camera.cpp
+++ b/Projects/Android/jni/OpenJK/code/cgame/cg_camera.cpp
@@ -27,7 +27,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
 #include "cg_media.h"
 
 #include "../game/g_roff.h"
-#include <JKVR/VrClientInfo.h>
+#include <JKXR/VrClientInfo.h>
 
 bool		in_camera = false;
 bool		in_misccamera = false; // if we are viewing a misc_camera
diff --git a/Projects/Android/jni/OpenJK/code/cgame/cg_consolecmds.cpp b/Projects/Android/jni/OpenJK/code/cgame/cg_consolecmds.cpp
index 8549ba0..f57c57c 100644
--- a/Projects/Android/jni/OpenJK/code/cgame/cg_consolecmds.cpp
+++ b/Projects/Android/jni/OpenJK/code/cgame/cg_consolecmds.cpp
@@ -27,7 +27,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
 #include "cg_headers.h"
 
 #include "cg_media.h"	//just for cgs....
-#include <JKVR/VrClientInfo.h>
+#include <JKXR/VrClientInfo.h>
 
 void CG_TargetCommand_f( void );
 extern qboolean	player_locked;
diff --git a/Projects/Android/jni/OpenJK/code/cgame/cg_draw.cpp b/Projects/Android/jni/OpenJK/code/cgame/cg_draw.cpp
index 679d052..60839c8 100644
--- a/Projects/Android/jni/OpenJK/code/cgame/cg_draw.cpp
+++ b/Projects/Android/jni/OpenJK/code/cgame/cg_draw.cpp
@@ -29,7 +29,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
 #include "cg_media.h"
 #include "../game/objectives.h"
 #include "../game/g_vehicles.h"
-#include <JKVR/VrClientInfo.h>
+#include <JKXR/VrClientInfo.h>
 #include "bg_local.h"
 
 extern vmCvar_t	cg_debugHealthBars;
diff --git a/Projects/Android/jni/OpenJK/code/cgame/cg_drawtools.cpp b/Projects/Android/jni/OpenJK/code/cgame/cg_drawtools.cpp
index b53a772..05567ad 100644
--- a/Projects/Android/jni/OpenJK/code/cgame/cg_drawtools.cpp
+++ b/Projects/Android/jni/OpenJK/code/cgame/cg_drawtools.cpp
@@ -24,7 +24,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
 #include "cg_headers.h"
 
 #include "cg_media.h"
-#include <JKVR/VrClientInfo.h>
+#include <JKXR/VrClientInfo.h>
 
 
 void CG_AdjustFrom640( float *x, float *y, float *w, float *h ) {
diff --git a/Projects/Android/jni/OpenJK/code/cgame/cg_main.cpp b/Projects/Android/jni/OpenJK/code/cgame/cg_main.cpp
index 9b9f5fa..e0711fe 100644
--- a/Projects/Android/jni/OpenJK/code/cgame/cg_main.cpp
+++ b/Projects/Android/jni/OpenJK/code/cgame/cg_main.cpp
@@ -30,7 +30,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
 #include "../qcommon/sstring.h"
 #include "qcommon/ojk_saved_game_helper.h"
 
-#include <JKVR/VrClientInfo.h>
+#include <JKXR/VrClientInfo.h>
 
 //NOTENOTE: Be sure to change the mirrored code in g_shared.h
 typedef	std::map< sstring_t, unsigned char  >	namePrecache_m;
diff --git a/Projects/Android/jni/OpenJK/code/cgame/cg_players.cpp b/Projects/Android/jni/OpenJK/code/cgame/cg_players.cpp
index 9d9c780..946402a 100644
--- a/Projects/Android/jni/OpenJK/code/cgame/cg_players.cpp
+++ b/Projects/Android/jni/OpenJK/code/cgame/cg_players.cpp
@@ -32,7 +32,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
 #include "../game/g_vehicles.h"
 #include "../Rufl/hstring.h"
 #include "bg_local.h"
-#include <JKVR/VrClientInfo.h>
+#include <JKXR/VrClientInfo.h>
 
 #define	LOOK_SWING_SCALE	0.5f
 #define	CG_SWINGSPEED		0.3f
diff --git a/Projects/Android/jni/OpenJK/code/cgame/cg_view.cpp b/Projects/Android/jni/OpenJK/code/cgame/cg_view.cpp
index 3b127fd..17af230 100644
--- a/Projects/Android/jni/OpenJK/code/cgame/cg_view.cpp
+++ b/Projects/Android/jni/OpenJK/code/cgame/cg_view.cpp
@@ -32,7 +32,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
 #include "../game/wp_saber.h"
 #include "../game/g_vehicles.h"
 #include "bg_local.h"
-#include <JKVR/VrClientInfo.h>
+#include <JKXR/VrClientInfo.h>
 
 #define MASK_CAMERACLIP (MASK_SOLID)
 #define CAMERA_SIZE	4
diff --git a/Projects/Android/jni/OpenJK/code/cgame/cg_weapons.cpp b/Projects/Android/jni/OpenJK/code/cgame/cg_weapons.cpp
index 003a812..c410c08 100644
--- a/Projects/Android/jni/OpenJK/code/cgame/cg_weapons.cpp
+++ b/Projects/Android/jni/OpenJK/code/cgame/cg_weapons.cpp
@@ -30,7 +30,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 #include "../game/anims.h"
 #include <bg_local.h>
-#include <JKVR/VrClientInfo.h>
+#include <JKXR/VrClientInfo.h>
 
 extern void CG_LightningBolt( centity_t *cent, vec3_t origin );
 
diff --git a/Projects/Android/jni/OpenJK/code/client/cl_cgame.cpp b/Projects/Android/jni/OpenJK/code/client/cl_cgame.cpp
index 098840c..54ffe5b 100644
--- a/Projects/Android/jni/OpenJK/code/client/cl_cgame.cpp
+++ b/Projects/Android/jni/OpenJK/code/client/cl_cgame.cpp
@@ -33,7 +33,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
 #include "qcommon/stringed_ingame.h"
 #include "sys/sys_loadlib.h"
 
-#include <JKVR/VrCommon.h>
+#include <JKXR/VrCommon.h>
 
 vm_t	cgvm;
 /*
diff --git a/Projects/Android/jni/OpenJK/code/client/cl_input.cpp b/Projects/Android/jni/OpenJK/code/client/cl_input.cpp
index 5589f30..7c3a176 100644
--- a/Projects/Android/jni/OpenJK/code/client/cl_input.cpp
+++ b/Projects/Android/jni/OpenJK/code/client/cl_input.cpp
@@ -27,7 +27,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 #include "client.h"
 #include "client_ui.h"
-#include <JKVR/VrCommon.h>
+#include <JKXR/VrCommon.h>
 
 #ifndef _WIN32
 #include <cmath>
diff --git a/Projects/Android/jni/OpenJK/code/client/cl_main.cpp b/Projects/Android/jni/OpenJK/code/client/cl_main.cpp
index 4623c71..519efe5 100644
--- a/Projects/Android/jni/OpenJK/code/client/cl_main.cpp
+++ b/Projects/Android/jni/OpenJK/code/client/cl_main.cpp
@@ -34,7 +34,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
 #include "sys/sys_loadlib.h"
 #include "qcommon/ojk_saved_game.h"
 
-#include <JKVR/VrCommon.h>
+#include <JKXR/VrCommon.h>
 
 #define	RETRANSMIT_TIMEOUT	3000	// time between connection packet retransmits
 
diff --git a/Projects/Android/jni/OpenJK/code/client/cl_scrn.cpp b/Projects/Android/jni/OpenJK/code/client/cl_scrn.cpp
index 414d9b0..51c68d9 100644
--- a/Projects/Android/jni/OpenJK/code/client/cl_scrn.cpp
+++ b/Projects/Android/jni/OpenJK/code/client/cl_scrn.cpp
@@ -28,7 +28,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 #include "client.h"
 #include "client_ui.h"
-#include <JKVR/VrCommon.h>
+#include <JKXR/VrCommon.h>
 
 extern console_t con;
 
diff --git a/Projects/Android/jni/OpenJK/code/game/bg_misc.cpp b/Projects/Android/jni/OpenJK/code/game/bg_misc.cpp
index a4489af..8755b44 100644
--- a/Projects/Android/jni/OpenJK/code/game/bg_misc.cpp
+++ b/Projects/Android/jni/OpenJK/code/game/bg_misc.cpp
@@ -29,7 +29,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
 #include "bg_public.h"
 #include "g_items.h"
 #include "g_vehicles.h"
-#include <JKVR/VrClientInfo.h>
+#include <JKXR/VrClientInfo.h>
 
 
 extern weaponData_t weaponData[WP_NUM_WEAPONS];
diff --git a/Projects/Android/jni/OpenJK/code/game/g_trigger.cpp b/Projects/Android/jni/OpenJK/code/game/g_trigger.cpp
index ea3e8b4..925bf32 100644
--- a/Projects/Android/jni/OpenJK/code/game/g_trigger.cpp
+++ b/Projects/Android/jni/OpenJK/code/game/g_trigger.cpp
@@ -27,7 +27,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
 #include "anims.h"
 #include "../cgame/cg_local.h"
 #include "bg_local.h"
-#include <JKVR/VrClientInfo.h>
+#include <JKXR/VrClientInfo.h>
 
 #define ENTDIST_PLAYER	1
 #define ENTDIST_NPC		2
diff --git a/Projects/Android/jni/OpenJK/code/game/g_utils.cpp b/Projects/Android/jni/OpenJK/code/game/g_utils.cpp
index 4934804..b7f7ddb 100644
--- a/Projects/Android/jni/OpenJK/code/game/g_utils.cpp
+++ b/Projects/Android/jni/OpenJK/code/game/g_utils.cpp
@@ -31,7 +31,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
 #include "b_local.h"
 #include "g_nav.h"
 #include "bg_local.h"
-#include <JKVR/VrClientInfo.h>
+#include <JKXR/VrClientInfo.h>
 
 #define ACT_ACTIVE		qtrue
 #define ACT_INACTIVE	qfalse
diff --git a/Projects/Android/jni/OpenJK/code/game/wp_saber.cpp b/Projects/Android/jni/OpenJK/code/game/wp_saber.cpp
index 5ab76eb..3b618b2 100644
--- a/Projects/Android/jni/OpenJK/code/game/wp_saber.cpp
+++ b/Projects/Android/jni/OpenJK/code/game/wp_saber.cpp
@@ -29,7 +29,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
 #include "g_vehicles.h"
 #include "../qcommon/tri_coll_test.h"
 #include "../cgame/cg_local.h"
-#include <JKVR/VrClientInfo.h>
+#include <JKXR/VrClientInfo.h>
 
 #define JK2_RAGDOLL_GRIPNOHEALTH
 
diff --git a/Projects/Android/jni/OpenJK/code/rd-common/tr_public.h b/Projects/Android/jni/OpenJK/code/rd-common/tr_public.h
index 236ac60..f7c91e7 100644
--- a/Projects/Android/jni/OpenJK/code/rd-common/tr_public.h
+++ b/Projects/Android/jni/OpenJK/code/rd-common/tr_public.h
@@ -127,7 +127,7 @@ typedef struct {
 	qboolean			*(*gbAlreadyDoingLoad)				( void );
 	int					(*com_frameTime)					( void );
 
-	//JKVR Functions
+	//JKXR Functions
 	bool 				(*TBXR_useScreenLayer)				( void );
 	bool 				(*TBXR_GetVRProjection)				(int eye, float zNear, float zFar, float* projection);
 
diff --git a/Projects/Android/jni/OpenJK/code/rd-gles/tr_main.cpp b/Projects/Android/jni/OpenJK/code/rd-gles/tr_main.cpp
index ebacd6f..b740e59 100644
--- a/Projects/Android/jni/OpenJK/code/rd-gles/tr_main.cpp
+++ b/Projects/Android/jni/OpenJK/code/rd-gles/tr_main.cpp
@@ -27,7 +27,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
 #include "../server/exe_headers.h"
 
 #include "tr_local.h"
-#include <JKVR/VrClientInfo.h>
+#include <JKXR/VrClientInfo.h>
 
 #if !defined(G2_H_INC)
 	#include "../ghoul2/G2.h"
diff --git a/Projects/Android/jni/OpenJK/code/rd-gles/tr_model.cpp b/Projects/Android/jni/OpenJK/code/rd-gles/tr_model.cpp
index 3ec93fe..2cc2a88 100644
--- a/Projects/Android/jni/OpenJK/code/rd-gles/tr_model.cpp
+++ b/Projects/Android/jni/OpenJK/code/rd-gles/tr_model.cpp
@@ -30,7 +30,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
 #include "tr_local.h"
 #include "qcommon/matcomp.h"
 #include "../qcommon/sstring.h"
-#include <JKVR/VrClientInfo.h>
+#include <JKXR/VrClientInfo.h>
 
 #define	LL(x) x=LittleLong(x)
 #define	LS(x) x=LittleShort(x)
diff --git a/Projects/Android/jni/OpenJK/code/rd-gles/tr_scene.cpp b/Projects/Android/jni/OpenJK/code/rd-gles/tr_scene.cpp
index 0badabd..e1030c0 100644
--- a/Projects/Android/jni/OpenJK/code/rd-gles/tr_scene.cpp
+++ b/Projects/Android/jni/OpenJK/code/rd-gles/tr_scene.cpp
@@ -25,7 +25,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
 #include "../server/exe_headers.h"
 
 #include "tr_local.h"
-#include <JKVR/VrClientInfo.h>
+#include <JKXR/VrClientInfo.h>
 
 int			r_firstSceneDrawSurf;
 
diff --git a/Projects/Android/jni/OpenJK/code/ui/ui_shared.cpp b/Projects/Android/jni/OpenJK/code/ui/ui_shared.cpp
index 00bc5a2..17ad63e 100644
--- a/Projects/Android/jni/OpenJK/code/ui/ui_shared.cpp
+++ b/Projects/Android/jni/OpenJK/code/ui/ui_shared.cpp
@@ -41,7 +41,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 #include "qcommon/stringed_ingame.h"
 
-#include <JKVR/VrClientInfo.h>
+#include <JKXR/VrClientInfo.h>
 
 extern vr_client_info_t vr;
 
diff --git a/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_camera.cpp b/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_camera.cpp
index 9f640b5..9df8926 100644
--- a/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_camera.cpp
+++ b/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_camera.cpp
@@ -27,7 +27,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
 #include "cg_media.h"
 
 #include "../game/g_roff.h"
-#include <JKVR/VrClientInfo.h>
+#include <JKXR/VrClientInfo.h>
 
 bool		in_camera = false;
 bool		in_misccamera = false; // if we are viewing a misc_camera
diff --git a/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_consolecmds.cpp b/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_consolecmds.cpp
index a911b33..80c4079 100644
--- a/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_consolecmds.cpp
+++ b/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_consolecmds.cpp
@@ -26,7 +26,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 #include "cg_local.h"
 #include "cg_media.h"	//just for cgs....
-#include <JKVR/VrClientInfo.h>
+#include <JKXR/VrClientInfo.h>
 
 void CG_TargetCommand_f( void );
 extern qboolean	player_locked;
diff --git a/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_draw.cpp b/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_draw.cpp
index a60747e..5f936d8 100644
--- a/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_draw.cpp
+++ b/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_draw.cpp
@@ -29,7 +29,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
 #include "cg_media.h"
 #include "../game/objectives.h"
 #include "bg_local.h"
-#include <JKVR/VrClientInfo.h>
+#include <JKXR/VrClientInfo.h>
 
 #include "FxUtil.h"
 
diff --git a/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_drawtools.cpp b/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_drawtools.cpp
index a984bc6..798229d 100644
--- a/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_drawtools.cpp
+++ b/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_drawtools.cpp
@@ -23,7 +23,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 #include "cg_local.h"
 #include "cg_media.h"
-#include <JKVR/VrClientInfo.h>
+#include <JKXR/VrClientInfo.h>
 
 
 void CG_AdjustFrom640( float *x, float *y, float *w, float *h ) {
diff --git a/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_main.cpp b/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_main.cpp
index 7faa24c..4959784 100644
--- a/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_main.cpp
+++ b/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_main.cpp
@@ -29,7 +29,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 #include "../../code/qcommon/sstring.h"
 #include "../code/qcommon/ojk_saved_game_helper.h"
-#include <JKVR/VrClientInfo.h>
+#include <JKXR/VrClientInfo.h>
 
 //NOTENOTE: Be sure to change the mirrored code in g_shared.h
 typedef std::map< sstring_t, unsigned char, std::less<sstring_t> >	namePrecache_m;
diff --git a/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_players.cpp b/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_players.cpp
index 7312f0b..e4af048 100644
--- a/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_players.cpp
+++ b/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_players.cpp
@@ -31,7 +31,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
 #include "../game/anims.h"
 #include "../game/wp_saber.h"
 #include "bg_local.h"
-#include <JKVR/VrClientInfo.h>
+#include <JKXR/VrClientInfo.h>
 
 #define	LOOK_SWING_SCALE	0.5
 
diff --git a/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_view.cpp b/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_view.cpp
index 745e184..9f43997 100644
--- a/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_view.cpp
+++ b/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_view.cpp
@@ -31,7 +31,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
 #include "../game/anims.h"
 #include "../game/g_functions.h"
 #include "bg_local.h"
-#include <JKVR/VrClientInfo.h>
+#include <JKXR/VrClientInfo.h>
 
 #define MASK_CAMERACLIP (MASK_SOLID)
 #define CAMERA_SIZE	4
diff --git a/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_weapons.cpp b/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_weapons.cpp
index 3cc3e46..078c4fc 100644
--- a/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_weapons.cpp
+++ b/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_weapons.cpp
@@ -28,7 +28,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
 #include "../game/g_local.h"
 #include "../game/anims.h"
 #include <bg_local.h>
-#include <JKVR/VrClientInfo.h>
+#include <JKXR/VrClientInfo.h>
 
 extern void CG_LightningBolt( centity_t *cent, vec3_t origin );
 
diff --git a/Projects/Android/jni/OpenJK/codeJK2/game/bg_misc.cpp b/Projects/Android/jni/OpenJK/codeJK2/game/bg_misc.cpp
index 4de54f0..49245e2 100644
--- a/Projects/Android/jni/OpenJK/codeJK2/game/bg_misc.cpp
+++ b/Projects/Android/jni/OpenJK/codeJK2/game/bg_misc.cpp
@@ -27,7 +27,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
 #include "g_local.h"
 #include "bg_public.h"
 #include "g_items.h"
-#include <JKVR/VrClientInfo.h>
+#include <JKXR/VrClientInfo.h>
 
 
 extern weaponData_t weaponData[WP_NUM_WEAPONS];
diff --git a/Projects/Android/jni/OpenJK/codeJK2/game/bg_pmove.cpp b/Projects/Android/jni/OpenJK/codeJK2/game/bg_pmove.cpp
index 7302be9..09f9859 100644
--- a/Projects/Android/jni/OpenJK/codeJK2/game/bg_pmove.cpp
+++ b/Projects/Android/jni/OpenJK/codeJK2/game/bg_pmove.cpp
@@ -38,7 +38,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
 #include "../cgame/cg_local.h"	// yeah I know this is naughty, but we're shipping soon...
 #include "wp_saber.h"
 #include <float.h>
-#include <JKVR/VrClientInfo.h>
+#include <JKXR/VrClientInfo.h>
 
 extern qboolean G_DoDismemberment( gentity_t *self, vec3_t point, int mod, int damage, int hitLoc, qboolean force = qfalse );
 extern qboolean G_EntIsUnlockedDoor( int entityNum );
diff --git a/Projects/Android/jni/OpenJK/codeJK2/game/g_active.cpp b/Projects/Android/jni/OpenJK/codeJK2/game/g_active.cpp
index a6e4ba7..8479bb6 100644
--- a/Projects/Android/jni/OpenJK/codeJK2/game/g_active.cpp
+++ b/Projects/Android/jni/OpenJK/codeJK2/game/g_active.cpp
@@ -29,7 +29,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
 #include "Q3_Interface.h"
 #include "wp_saber.h"
 #include "g_icarus.h"
-#include <JKVR/VrClientInfo.h>
+#include <JKXR/VrClientInfo.h>
 
 #ifdef _DEBUG
 	#include <float.h>
diff --git a/Projects/Android/jni/OpenJK/codeJK2/game/g_trigger.cpp b/Projects/Android/jni/OpenJK/codeJK2/game/g_trigger.cpp
index 161d284..e977fff 100644
--- a/Projects/Android/jni/OpenJK/codeJK2/game/g_trigger.cpp
+++ b/Projects/Android/jni/OpenJK/codeJK2/game/g_trigger.cpp
@@ -26,7 +26,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
 #include "b_local.h"
 #include "anims.h"
 #include "bg_local.h"
-#include <JKVR/VrClientInfo.h>
+#include <JKXR/VrClientInfo.h>
 
 #define ENTDIST_PLAYER	1
 #define ENTDIST_NPC		2
diff --git a/Projects/Android/jni/OpenJK/codeJK2/game/g_utils.cpp b/Projects/Android/jni/OpenJK/codeJK2/game/g_utils.cpp
index 5f00593..5fcf2b6 100644
--- a/Projects/Android/jni/OpenJK/codeJK2/game/g_utils.cpp
+++ b/Projects/Android/jni/OpenJK/codeJK2/game/g_utils.cpp
@@ -32,7 +32,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
 #include "b_local.h"
 #include "anims.h"
 #include "../../code/rd-common/mdx_format.h"
-#include <JKVR/VrClientInfo.h>
+#include <JKXR/VrClientInfo.h>
 
 #define ACT_ACTIVE		qtrue
 #define ACT_INACTIVE	qfalse
diff --git a/Projects/Android/jni/OpenJK/codeJK2/game/wp_atst.cpp b/Projects/Android/jni/OpenJK/codeJK2/game/wp_atst.cpp
index 40f0778..3f88db5 100644
--- a/Projects/Android/jni/OpenJK/codeJK2/game/wp_atst.cpp
+++ b/Projects/Android/jni/OpenJK/codeJK2/game/wp_atst.cpp
@@ -28,7 +28,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
 #include "w_local.h"
 #include "g_functions.h"
 #include "bg_local.h"
-#include <JKVR/VrClientInfo.h>
+#include <JKXR/VrClientInfo.h>
 
 // ATST Main
 //---------------------------------------------------------
diff --git a/Projects/Android/jni/OpenJK/codeJK2/game/wp_blaster_rifle.cpp b/Projects/Android/jni/OpenJK/codeJK2/game/wp_blaster_rifle.cpp
index 030616d..88f0ff7 100644
--- a/Projects/Android/jni/OpenJK/codeJK2/game/wp_blaster_rifle.cpp
+++ b/Projects/Android/jni/OpenJK/codeJK2/game/wp_blaster_rifle.cpp
@@ -28,7 +28,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
 #include "w_local.h"
 #include "g_functions.h"
 #include "bg_local.h"
-#include <JKVR/VrClientInfo.h>
+#include <JKXR/VrClientInfo.h>
 
 //---------------
 //	Blaster
diff --git a/Projects/Android/jni/OpenJK/codeJK2/game/wp_bowcaster.cpp b/Projects/Android/jni/OpenJK/codeJK2/game/wp_bowcaster.cpp
index f0b9695..a129422 100644
--- a/Projects/Android/jni/OpenJK/codeJK2/game/wp_bowcaster.cpp
+++ b/Projects/Android/jni/OpenJK/codeJK2/game/wp_bowcaster.cpp
@@ -28,7 +28,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
 #include "g_functions.h"
 #include "bg_local.h"
 
-#include <JKVR/VrClientInfo.h>
+#include <JKXR/VrClientInfo.h>
 
 //-------------------
 //	Wookiee Bowcaster
diff --git a/Projects/Android/jni/OpenJK/codeJK2/game/wp_saber.cpp b/Projects/Android/jni/OpenJK/codeJK2/game/wp_saber.cpp
index db1bf9f..bf82029 100644
--- a/Projects/Android/jni/OpenJK/codeJK2/game/wp_saber.cpp
+++ b/Projects/Android/jni/OpenJK/codeJK2/game/wp_saber.cpp
@@ -30,7 +30,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
 #include "wp_saber.h"
 #include "../../code/qcommon/tri_coll_test.h"
 #include "../cgame/FxScheduler.h"
-#include <JKVR/VrClientInfo.h>
+#include <JKXR/VrClientInfo.h>
 
 #define MAX_SABER_VICTIMS 16
 static int		victimEntityNum[MAX_SABER_VICTIMS];
diff --git a/Projects/Android/jni/OpenJK/codeJK2/game/wp_thermal.cpp b/Projects/Android/jni/OpenJK/codeJK2/game/wp_thermal.cpp
index 00ef764..cd92297 100644
--- a/Projects/Android/jni/OpenJK/codeJK2/game/wp_thermal.cpp
+++ b/Projects/Android/jni/OpenJK/codeJK2/game/wp_thermal.cpp
@@ -28,8 +28,8 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
 #include "w_local.h"
 #include "g_functions.h"
 #include "bg_local.h"
-#include <JKVR/VrClientInfo.h>
-#include <JKVR/mathlib.h>
+#include <JKXR/VrClientInfo.h>
+#include <JKXR/mathlib.h>
 
 //---------------------
 //	Thermal Detonator
diff --git a/Projects/Android/settings.gradle b/Projects/Android/settings.gradle
index 9f4aedf..0f468eb 100644
--- a/Projects/Android/settings.gradle
+++ b/Projects/Android/settings.gradle
@@ -1,4 +1,4 @@
 rootProject.projectDir = new File(settingsDir, '../..')
-rootProject.name = "JKQuest"
+rootProject.name = "JKXR"
 
 include ':', 'Projects:Android'
diff --git a/assets/z_vr_assets.pk3 b/assets/z_vr_assets.pk3
index 0e361eb..384b5ef 100644
Binary files a/assets/z_vr_assets.pk3 and b/assets/z_vr_assets.pk3 differ
diff --git a/assets/z_vr_assets_jka.pk3 b/assets/z_vr_assets_jka.pk3
index efb9759..99aa884 100644
Binary files a/assets/z_vr_assets_jka.pk3 and b/assets/z_vr_assets_jka.pk3 differ
diff --git a/java/com/drbeef/jkquest/GLES3JNIActivity.java b/java/com/drbeef/jkxr/GLES3JNIActivity.java
similarity index 93%
rename from java/com/drbeef/jkquest/GLES3JNIActivity.java
rename to java/com/drbeef/jkxr/GLES3JNIActivity.java
index 348022b..82d1356 100644
--- a/java/com/drbeef/jkquest/GLES3JNIActivity.java
+++ b/java/com/drbeef/jkxr/GLES3JNIActivity.java
@@ -1,5 +1,5 @@
 
-package com.drbeef.jkquest;
+package com.drbeef.jkxr;
 
 
 import static android.system.Os.setenv;
@@ -49,7 +49,7 @@ import java.util.Vector;
 
 		BufferedReader br;
 		try {
-			br = new BufferedReader(new FileReader("/sdcard/JKQuest/commandline.txt"));
+			br = new BufferedReader(new FileReader("/sdcard/JKXR/commandline.txt"));
 			String s;
 			StringBuilder sb = new StringBuilder(0);
 			while ((s = br.readLine()) != null)
@@ -85,8 +85,8 @@ import java.util.Vector;
 		System.loadLibrary( "openjk_" + game );
 	}
 
-	private static final String TAG = "JKQuest";
-	private static final String APPLICATION = "JKQuest";
+	private static final String TAG = "JKXR";
+	private static final String APPLICATION = "JKXR";
 
 
 	private int permissionCount = 0;
@@ -213,38 +213,38 @@ import java.util.Vector;
 
 	public void create() {
 		//Make the directories
-		new File("/sdcard/JKQuest/JK2/base").mkdirs();
-		new File("/sdcard/JKQuest/JK3/base").mkdirs();
+		new File("/sdcard/JKXR/JK2/base").mkdirs();
+		new File("/sdcard/JKXR/JK3/base").mkdirs();
 
 		//Copy the command line params file
-		copy_asset("/sdcard/JKQuest", "commandline.txt", false);
+		copy_asset("/sdcard/JKXR", "commandline.txt", false);
 
 		//Copy the weapon adjustment config - should we force overwrite?
-		copy_asset("/sdcard/JKQuest/JK2/base", "weapons_vr_jo.cfg", true);
-		copy_asset("/sdcard/JKQuest/JK3/base", "weapons_vr_ja.cfg", true);
+		copy_asset("/sdcard/JKXR/JK2/base", "weapons_vr_jo.cfg", true);
+		copy_asset("/sdcard/JKXR/JK3/base", "weapons_vr_ja.cfg", true);
 
 		//Our assets
-		copy_asset("/sdcard/JKQuest/JK2/base", "z_vr_assets.pk3", true);
-		copy_asset("/sdcard/JKQuest/JK3/base", "z_vr_assets_jka.pk3", true);
+		copy_asset("/sdcard/JKXR/JK2/base", "z_vr_assets.pk3", true);
+		copy_asset("/sdcard/JKXR/JK3/base", "z_vr_assets_jka.pk3", true);
 
 		//Bummser's default configuration
 		if (manufacturer.contains("meta")) {
 			//Meta Quest
-			copy_asset_with_rename("/sdcard/JKQuest/JK2/base", "openjo_sp_quest.cfg", "openjo_sp.cfg", false);
+			copy_asset_with_rename("/sdcard/JKXR/JK2/base", "openjo_sp_quest.cfg", "openjo_sp.cfg", false);
 		} else {
 			//Pico XR
-			copy_asset_with_rename("/sdcard/JKQuest/JK2/base", "openjo_sp_pico.cfg", "openjo_sp.cfg", false);
+			copy_asset_with_rename("/sdcard/JKXR/JK2/base", "openjo_sp_pico.cfg", "openjo_sp.cfg", false);
 		}
 
 		//Read these from a file and pass through
 		commandLineParams = new String("jo");
 
 		//See if user is trying to use command line params
-		if (new File("/sdcard/JKQuest/commandline.txt").exists()) // should exist!
+		if (new File("/sdcard/JKXR/commandline.txt").exists()) // should exist!
 		{
 			BufferedReader br;
 			try {
-				br = new BufferedReader(new FileReader("/sdcard/JKQuest/commandline.txt"));
+				br = new BufferedReader(new FileReader("/sdcard/JKXR/commandline.txt"));
 				String s;
 				StringBuilder sb = new StringBuilder(0);
 				while ((s = br.readLine()) != null)
diff --git a/java/com/drbeef/jkquest/GLES3JNILib.java b/java/com/drbeef/jkxr/GLES3JNILib.java
similarity index 96%
rename from java/com/drbeef/jkquest/GLES3JNILib.java
rename to java/com/drbeef/jkxr/GLES3JNILib.java
index 143b95a..92d624f 100644
--- a/java/com/drbeef/jkquest/GLES3JNILib.java
+++ b/java/com/drbeef/jkxr/GLES3JNILib.java
@@ -1,5 +1,5 @@
 
-package com.drbeef.jkquest;
+package com.drbeef.jkxr;
 
 import android.app.Activity;
 import android.view.Surface;
diff --git a/res/drawable-hdpi/ic_jkquest.png b/res/drawable-hdpi/ic_jkxr.png
similarity index 100%
rename from res/drawable-hdpi/ic_jkquest.png
rename to res/drawable-hdpi/ic_jkxr.png
diff --git a/res/drawable-mdpi/ic_jkquest.png b/res/drawable-mdpi/ic_jkxr.png
similarity index 100%
rename from res/drawable-mdpi/ic_jkquest.png
rename to res/drawable-mdpi/ic_jkxr.png
diff --git a/res/drawable-xhdpi/ic_jkquest.png b/res/drawable-xhdpi/ic_jkxr.png
similarity index 100%
rename from res/drawable-xhdpi/ic_jkquest.png
rename to res/drawable-xhdpi/ic_jkxr.png
diff --git a/res/drawable-xxhdpi/ic_jkquest.png b/res/drawable-xxhdpi/ic_jkxr.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_jkquest.png
rename to res/drawable-xxhdpi/ic_jkxr.png
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 18a3bc6..9aa6ca8 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -5,6 +5,6 @@
 
 <resources>
     <!-- Simple strings. -->
-    <string name="jkquest">JKQuest</string>
+    <string name="jkxr">JKXR</string>
 
 </resources>
diff --git a/z_vr_assets/ui/credits.menu b/z_vr_assets/ui/credits.menu
index 7147890..ca53eec 100644
--- a/z_vr_assets/ui/credits.menu
+++ b/z_vr_assets/ui/credits.menu
@@ -36,7 +36,7 @@
 			name				none
 			type				ITEM_TYPE_TEXT
 			rect				0 10 640 40
-			text				"JKQuest by Team Beef"
+			text				"JKXR by Team Beef"
 			font				2
 			forecolor			1 0 0 1
 			textscale			1.2
@@ -171,7 +171,7 @@
 			name				none
 			type				ITEM_TYPE_TEXT
 			rect				0 400 640 40
-			text				"JKQuest: https://www.jkquest.com/"
+			text				"JKXR: https://www.quakevr.com/jkxr"
 			font				2
 			forecolor			1 0 0 1
 			textscale			1.2
diff --git a/z_vr_assets_jka/ui/credits.menu b/z_vr_assets_jka/ui/credits.menu
index 7147890..ca53eec 100644
--- a/z_vr_assets_jka/ui/credits.menu
+++ b/z_vr_assets_jka/ui/credits.menu
@@ -36,7 +36,7 @@
 			name				none
 			type				ITEM_TYPE_TEXT
 			rect				0 10 640 40
-			text				"JKQuest by Team Beef"
+			text				"JKXR by Team Beef"
 			font				2
 			forecolor			1 0 0 1
 			textscale			1.2
@@ -171,7 +171,7 @@
 			name				none
 			type				ITEM_TYPE_TEXT
 			rect				0 400 640 40
-			text				"JKQuest: https://www.jkquest.com/"
+			text				"JKXR: https://www.quakevr.com/jkxr"
 			font				2
 			forecolor			1 0 0 1
 			textscale			1.2