Renaming all ARVR nodes to XR

22 files changed, 233 insertions, 244 deletions

diff --git a/modules/arkit/arkit_interface.h b/modules/arkit/arkit_interface.h
index 4f8f726816..1044f3cf6f 100644
--- a/modules/arkit/arkit_interface.h
+++ b/modules/arkit/arkit_interface.h
@@ -31,9 +31,9 @@
 #ifndef ARKIT_INTERFACE_H
 #define ARKIT_INTERFACE_H
 
-#include "servers/arvr/arvr_interface.h"
-#include "servers/arvr/arvr_positional_tracker.h"
 #include "servers/camera/camera_feed.h"
+#include "servers/xr/xr_interface.h"
+#include "servers/xr/xr_positional_tracker.h"
 
 /**
 	@author Bastiaan Olij <mux213@gmail.com>
@@ -44,8 +44,8 @@
 // forward declaration for some needed objects
 class ARKitShader;
 
-class ARKitInterface : public ARVRInterface {
-	GDCLASS(ARKitInterface, ARVRInterface);
+class ARKitInterface : public XRInterface {
+	GDCLASS(ARKitInterface, XRInterface);
 
 private:
 	bool initialized;
@@ -65,7 +65,7 @@ private:
 	Vector<uint8_t> img_data[2];
 
 	struct anchor_map {
-		ARVRPositionalTracker *tracker;
+		XRPositionalTracker *tracker;
 		unsigned char uuid[16];
 	};
 
@@ -73,7 +73,7 @@ private:
 	unsigned int num_anchors;
 	unsigned int max_anchors;
 	anchor_map *anchors;
-	ARVRPositionalTracker *get_anchor_for_uuid(const unsigned char *p_uuid);
+	XRPositionalTracker *get_anchor_for_uuid(const unsigned char *p_uuid);
 	void remove_anchor_for_uuid(const unsigned char *p_uuid);
 	void remove_all_anchors();
 
@@ -108,9 +108,9 @@ public:
 
 	virtual Size2 get_render_targetsize();
 	virtual bool is_stereo();
-	virtual Transform get_transform_for_eye(ARVRInterface::Eyes p_eye, const Transform &p_cam_transform);
-	virtual CameraMatrix get_projection_for_eye(ARVRInterface::Eyes p_eye, real_t p_aspect, real_t p_z_near, real_t p_z_far);
-	virtual void commit_for_eye(ARVRInterface::Eyes p_eye, RID p_render_target, const Rect2 &p_screen_rect);
+	virtual Transform get_transform_for_eye(XRInterface::Eyes p_eye, const Transform &p_cam_transform);
+	virtual CameraMatrix get_projection_for_eye(XRInterface::Eyes p_eye, real_t p_aspect, real_t p_z_near, real_t p_z_far);
+	virtual void commit_for_eye(XRInterface::Eyes p_eye, RID p_render_target, const Rect2 &p_screen_rect);
 
 	virtual void process();
 
diff --git a/modules/arkit/arkit_interface.mm b/modules/arkit/arkit_interface.mm
index 031e1e115e..79f09e2a7e 100644
--- a/modules/arkit/arkit_interface.mm
+++ b/modules/arkit/arkit_interface.mm
@@ -158,7 +158,7 @@ StringName ARKitInterface::get_name() const {
 }
 
 int ARKitInterface::get_capabilities() const {
-	return ARKitInterface::ARVR_MONO + ARKitInterface::ARVR_AR;
+	return ARKitInterface::XR_MONO + ARKitInterface::XR_AR;
 }
 
 Array ARKitInterface::raycast(Vector2 p_screen_coord) {
@@ -218,8 +218,8 @@ bool ARKitInterface::is_initialized() const {
 }
 
 bool ARKitInterface::initialize() {
-	ARVRServer *arvr_server = ARVRServer::get_singleton();
-	ERR_FAIL_NULL_V(arvr_server, false);
+	XRServer *xr_server = XRServer::get_singleton();
+	ERR_FAIL_NULL_V(xr_server, false);
 
 	if (!initialized) {
 		print_line("initializing ARKit");
@@ -244,7 +244,7 @@ bool ARKitInterface::initialize() {
 		transform = Transform();
 
 		// make this our primary interface
-		arvr_server->set_primary_interface(this);
+		xr_server->set_primary_interface(this);
 
 		// make sure we have our feed setup
 		if (feed.is_null()) {
@@ -270,10 +270,10 @@ bool ARKitInterface::initialize() {
 
 void ARKitInterface::uninitialize() {
 	if (initialized) {
-		ARVRServer *arvr_server = ARVRServer::get_singleton();
-		if (arvr_server != NULL) {
+		XRServer *xr_server = XRServer::get_singleton();
+		if (xr_server != NULL) {
 			// no longer our primary interface
-			arvr_server->clear_primary_interface_if(this);
+			xr_server->clear_primary_interface_if(this);
 		}
 
 		if (feed.is_valid()) {
@@ -303,22 +303,22 @@ Size2 ARKitInterface::get_render_targetsize() {
 	return target_size;
 }
 
-Transform ARKitInterface::get_transform_for_eye(ARVRInterface::Eyes p_eye, const Transform &p_cam_transform) {
+Transform ARKitInterface::get_transform_for_eye(XRInterface::Eyes p_eye, const Transform &p_cam_transform) {
 	_THREAD_SAFE_METHOD_
 
 	Transform transform_for_eye;
 
-	ARVRServer *arvr_server = ARVRServer::get_singleton();
-	ERR_FAIL_NULL_V(arvr_server, transform_for_eye);
+	XRServer *xr_server = XRServer::get_singleton();
+	ERR_FAIL_NULL_V(xr_server, transform_for_eye);
 
 	if (initialized) {
-		float world_scale = arvr_server->get_world_scale();
+		float world_scale = xr_server->get_world_scale();
 
 		// just scale our origin point of our transform, note that we really shouldn't be using world_scale in ARKit but....
 		transform_for_eye = transform;
 		transform_for_eye.origin *= world_scale;
 
-		transform_for_eye = p_cam_transform * arvr_server->get_reference_frame() * transform_for_eye;
+		transform_for_eye = p_cam_transform * xr_server->get_reference_frame() * transform_for_eye;
 	} else {
 		// huh? well just return what we got....
 		transform_for_eye = p_cam_transform;
@@ -327,7 +327,7 @@ Transform ARKitInterface::get_transform_for_eye(ARVRInterface::Eyes p_eye, const
 	return transform_for_eye;
 }
 
-CameraMatrix ARKitInterface::get_projection_for_eye(ARVRInterface::Eyes p_eye, real_t p_aspect, real_t p_z_near, real_t p_z_far) {
+CameraMatrix ARKitInterface::get_projection_for_eye(XRInterface::Eyes p_eye, real_t p_aspect, real_t p_z_near, real_t p_z_far) {
 	// Remember our near and far, it will be used in process when we obtain our projection from our ARKit session.
 	z_near = p_z_near;
 	z_far = p_z_far;
@@ -335,7 +335,7 @@ CameraMatrix ARKitInterface::get_projection_for_eye(ARVRInterface::Eyes p_eye, r
 	return projection;
 }
 
-void ARKitInterface::commit_for_eye(ARVRInterface::Eyes p_eye, RID p_render_target, const Rect2 &p_screen_rect) {
+void ARKitInterface::commit_for_eye(XRInterface::Eyes p_eye, RID p_render_target, const Rect2 &p_screen_rect) {
 	_THREAD_SAFE_METHOD_
 
 	// We must have a valid render target
@@ -356,7 +356,7 @@ void ARKitInterface::commit_for_eye(ARVRInterface::Eyes p_eye, RID p_render_targ
 	VSG::rasterizer->blit_render_target_to_screen(p_render_target, screen_rect, 0);
 }
 
-ARVRPositionalTracker *ARKitInterface::get_anchor_for_uuid(const unsigned char *p_uuid) {
+XRPositionalTracker *ARKitInterface::get_anchor_for_uuid(const unsigned char *p_uuid) {
 	if (anchors == NULL) {
 		num_anchors = 0;
 		max_anchors = 10;
@@ -377,8 +377,8 @@ ARVRPositionalTracker *ARKitInterface::get_anchor_for_uuid(const unsigned char *
 		ERR_FAIL_NULL_V(anchors, NULL);
 	}
 
-	ARVRPositionalTracker *new_tracker = memnew(ARVRPositionalTracker);
-	new_tracker->set_type(ARVRServer::TRACKER_ANCHOR);
+	XRPositionalTracker *new_tracker = memnew(XRPositionalTracker);
+	new_tracker->set_type(XRServer::TRACKER_ANCHOR);
 
 	char tracker_name[256];
 	sprintf(tracker_name, "Anchor %02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x", p_uuid[0], p_uuid[1], p_uuid[2], p_uuid[3], p_uuid[4], p_uuid[5], p_uuid[6], p_uuid[7], p_uuid[8], p_uuid[9], p_uuid[10], p_uuid[11], p_uuid[12], p_uuid[13], p_uuid[14], p_uuid[15]);
@@ -388,7 +388,7 @@ ARVRPositionalTracker *ARKitInterface::get_anchor_for_uuid(const unsigned char *
 	new_tracker->set_name(name);
 
 	// add our tracker
-	ARVRServer::get_singleton()->add_tracker(new_tracker);
+	XRServer::get_singleton()->add_tracker(new_tracker);
 	anchors[num_anchors].tracker = new_tracker;
 	memcpy(anchors[num_anchors].uuid, p_uuid, 16);
 	num_anchors++;
@@ -401,7 +401,7 @@ void ARKitInterface::remove_anchor_for_uuid(const unsigned char *p_uuid) {
 		for (unsigned int i = 0; i < num_anchors; i++) {
 			if (memcmp(anchors[i].uuid, p_uuid, 16) == 0) {
 				// remove our tracker
-				ARVRServer::get_singleton()->remove_tracker(anchors[i].tracker);
+				XRServer::get_singleton()->remove_tracker(anchors[i].tracker);
 				memdelete(anchors[i].tracker);
 
 				// bring remaining forward
@@ -421,7 +421,7 @@ void ARKitInterface::remove_all_anchors() {
 	if (anchors != NULL) {
 		for (unsigned int i = 0; i < num_anchors; i++) {
 			// remove our tracker
-			ARVRServer::get_singleton()->remove_tracker(anchors[i].tracker);
+			XRServer::get_singleton()->remove_tracker(anchors[i].tracker);
 			memdelete(anchors[i].tracker);
 		};
 
@@ -582,16 +582,16 @@ void ARKitInterface::process() {
 				// strangely enough we have to states, rolling them up into one
 				if (camera.trackingState == ARTrackingStateNotAvailable) {
 					// no tracking, would be good if we black out the screen or something...
-					tracking_state = ARVRInterface::ARVR_NOT_TRACKING;
+					tracking_state = XRInterface::XR_NOT_TRACKING;
 				} else {
 					if (camera.trackingState == ARTrackingStateNormal) {
-						tracking_state = ARVRInterface::ARVR_NORMAL_TRACKING;
+						tracking_state = XRInterface::XR_NORMAL_TRACKING;
 					} else if (camera.trackingStateReason == ARTrackingStateReasonExcessiveMotion) {
-						tracking_state = ARVRInterface::ARVR_EXCESSIVE_MOTION;
+						tracking_state = XRInterface::XR_EXCESSIVE_MOTION;
 					} else if (camera.trackingStateReason == ARTrackingStateReasonInsufficientFeatures) {
-						tracking_state = ARVRInterface::ARVR_INSUFFICIENT_FEATURES;
+						tracking_state = XRInterface::XR_INSUFFICIENT_FEATURES;
 					} else {
-						tracking_state = ARVRInterface::ARVR_UNKNOWN_TRACKING;
+						tracking_state = XRInterface::XR_UNKNOWN_TRACKING;
 					}
 
 					// copy our current frame transform
@@ -665,7 +665,7 @@ void ARKitInterface::_add_or_update_anchor(void *p_anchor) {
 	unsigned char uuid[16];
 	[anchor.identifier getUUIDBytes:uuid];
 
-	ARVRPositionalTracker *tracker = get_anchor_for_uuid(uuid);
+	XRPositionalTracker *tracker = get_anchor_for_uuid(uuid);
 	if (tracker != NULL) {
 		// lets update our mesh! (using Arjens code as is for now)
 		// we should also probably limit how often we do this...
@@ -695,7 +695,7 @@ void ARKitInterface::_add_or_update_anchor(void *p_anchor) {
 		}
 
 		// Note, this also contains a scale factor which gives us an idea of the size of the anchor
-		// We may extract that in our ARVRAnchor class
+		// We may extract that in our XRAnchor class
 		Basis b;
 		matrix_float4x4 m44 = anchor.transform;
 		b.elements[0].x = m44.columns[0][0];
diff --git a/modules/arkit/register_types.cpp b/modules/arkit/register_types.cpp
index c78b35529b..91069ab364 100644
--- a/modules/arkit/register_types.cpp
+++ b/modules/arkit/register_types.cpp
@@ -37,7 +37,7 @@ void register_arkit_types() {
 
 	Ref<ARKitInterface> arkit_interface;
 	arkit_interface.instance();
-	ARVRServer::get_singleton()->add_interface(arkit_interface);
+	XRServer::get_singleton()->add_interface(arkit_interface);
 }
 
 void unregister_arkit_types() {
diff --git a/modules/gdnative/SCsub b/modules/gdnative/SCsub
index a788175b07..cab05549d2 100644
--- a/modules/gdnative/SCsub
+++ b/modules/gdnative/SCsub
@@ -17,7 +17,7 @@ env_gdnative.Prepend(CPPPATH=["#modules/gdnative/include/"])
 Export("env_gdnative")
 
 SConscript("net/SCsub")
-SConscript("arvr/SCsub")
+SConscript("xr/SCsub")
 SConscript("pluginscript/SCsub")
 SConscript("videodecoder/SCsub")
 
diff --git a/modules/gdnative/config.py b/modules/gdnative/config.py
index 37e25a46d4..4b997e4bfe 100644
--- a/modules/gdnative/config.py
+++ b/modules/gdnative/config.py
@@ -9,7 +9,7 @@ def configure(env):
 def get_doc_classes():
     return [
         "@NativeScript",
-        "ARVRInterfaceGDNative",
+        "XRInterfaceGDNative",
         "GDNative",
         "GDNativeLibrary",
         "MultiplayerPeerGDNative",
diff --git a/modules/gdnative/doc_classes/ARVRInterfaceGDNative.xml b/modules/gdnative/doc_classes/ARVRInterfaceGDNative.xml
deleted file mode 100644
index e8405b64a3..0000000000
--- a/modules/gdnative/doc_classes/ARVRInterfaceGDNative.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<class name="ARVRInterfaceGDNative" inherits="ARVRInterface" version="4.0">
-	<brief_description>
-		GDNative wrapper for an ARVR interface.
-	</brief_description>
-	<description>
-		This is a wrapper class for GDNative implementations of the ARVR interface. To use a GDNative ARVR interface, simply instantiate this object and set your GDNative library containing the ARVR interface implementation.
-	</description>
-	<tutorials>
-	</tutorials>
-	<methods>
-	</methods>
-	<constants>
-	</constants>
-</class>
diff --git a/modules/gdnative/doc_classes/GDNativeLibrary.xml b/modules/gdnative/doc_classes/GDNativeLibrary.xml
index 601e132d42..1aab864102 100644
--- a/modules/gdnative/doc_classes/GDNativeLibrary.xml
+++ b/modules/gdnative/doc_classes/GDNativeLibrary.xml
@@ -4,7 +4,7 @@
 		An external library containing functions or script classes to use in Godot.
 	</brief_description>
 	<description>
-		A GDNative library can implement [NativeScript]s, global functions to call with the [GDNative] class, or low-level engine extensions through interfaces such as [ARVRInterfaceGDNative]. The library must be compiled for each platform and architecture that the project will run on.
+		A GDNative library can implement [NativeScript]s, global functions to call with the [GDNative] class, or low-level engine extensions through interfaces such as [XRInterfaceGDNative]. The library must be compiled for each platform and architecture that the project will run on.
 	</description>
 	<tutorials>
 		<link>https://docs.godotengine.org/en/latest/tutorials/plugins/gdnative/gdnative-c-example.html</link>
diff --git a/modules/gdnative/doc_classes/XRInterfaceGDNative.xml b/modules/gdnative/doc_classes/XRInterfaceGDNative.xml
new file mode 100644
index 0000000000..13de815793
--- /dev/null
+++ b/modules/gdnative/doc_classes/XRInterfaceGDNative.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class name="XRInterfaceGDNative" inherits="XRInterface" version="4.0">
+	<brief_description>
+		GDNative wrapper for an XR interface.
+	</brief_description>
+	<description>
+		This is a wrapper class for GDNative implementations of the XR interface. To use a GDNative XR interface, simply instantiate this object and set your GDNative library containing the XR interface implementation.
+	</description>
+	<tutorials>
+	</tutorials>
+	<methods>
+	</methods>
+	<constants>
+	</constants>
+</class>
diff --git a/modules/gdnative/gdnative_api.json b/modules/gdnative/gdnative_api.json
index e1d6c0c867..9473a3d419 100644
--- a/modules/gdnative/gdnative_api.json
+++ b/modules/gdnative/gdnative_api.json
@@ -5935,8 +5935,8 @@
       ]
     },
     {
-      "name": "arvr",
-      "type": "ARVR",
+      "name": "xr",
+      "type": "XR",
       "version": {
         "major": 1,
         "minor": 1
@@ -5944,24 +5944,24 @@
       "next": null,
       "api": [
         {
-          "name": "godot_arvr_register_interface",
+          "name": "godot_xr_register_interface",
           "return_type": "void",
           "arguments": [
-            ["const godot_arvr_interface_gdnative *", "p_interface"]
+            ["const godot_xr_interface_gdnative *", "p_interface"]
           ]
         },
         {
-          "name": "godot_arvr_get_worldscale",
+          "name": "godot_xr_get_worldscale",
           "return_type": "godot_real",
           "arguments": []
         },
         {
-          "name": "godot_arvr_get_reference_frame",
+          "name": "godot_xr_get_reference_frame",
           "return_type": "godot_transform",
           "arguments": []
         },
         {
-          "name": "godot_arvr_blit",
+          "name": "godot_xr_blit",
           "return_type": "void",
           "arguments": [
             ["godot_int", "p_eye"],
@@ -5970,14 +5970,14 @@
           ]
         },
         {
-          "name": "godot_arvr_get_texid",
+          "name": "godot_xr_get_texid",
           "return_type": "godot_int",
           "arguments": [
             ["godot_rid *", "p_render_target"]
           ]
         },
         {
-          "name": "godot_arvr_add_controller",
+          "name": "godot_xr_add_controller",
           "return_type": "godot_int",
           "arguments": [
             ["char *", "p_device_name"],
@@ -5987,14 +5987,14 @@
           ]
         },
         {
-          "name": "godot_arvr_remove_controller",
+          "name": "godot_xr_remove_controller",
           "return_type": "void",
           "arguments": [
             ["godot_int", "p_controller_id"]
           ]
         },
         {
-          "name": "godot_arvr_set_controller_transform",
+          "name": "godot_xr_set_controller_transform",
           "return_type": "void",
           "arguments": [
             ["godot_int", "p_controller_id"],
@@ -6004,7 +6004,7 @@
           ]
         },
         {
-          "name": "godot_arvr_set_controller_button",
+          "name": "godot_xr_set_controller_button",
           "return_type": "void",
           "arguments": [
             ["godot_int", "p_controller_id"],
@@ -6013,7 +6013,7 @@
           ]
         },
         {
-          "name": "godot_arvr_set_controller_axis",
+          "name": "godot_xr_set_controller_axis",
           "return_type": "void",
           "arguments": [
             ["godot_int", "p_controller_id"],
@@ -6023,7 +6023,7 @@
           ]
         },
         {
-          "name": "godot_arvr_get_controller_rumble",
+          "name": "godot_xr_get_controller_rumble",
           "return_type": "godot_real",
           "arguments": [
             ["godot_int", "p_controller_id"]
diff --git a/modules/gdnative/gdnative_builders.py b/modules/gdnative/gdnative_builders.py
index 2d84f93d87..620935795f 100644
--- a/modules/gdnative/gdnative_builders.py
+++ b/modules/gdnative/gdnative_builders.py
@@ -19,7 +19,7 @@ def _build_gdnative_api_struct_header(api):
         "",
         "#include <gdnative/gdnative.h>",
         "#include <android/godot_android.h>",
-        "#include <arvr/godot_arvr.h>",
+        "#include <xr/godot_xr.h>",
         "#include <nativescript/godot_nativescript.h>",
         "#include <net/godot_net.h>",
         "#include <pluginscript/godot_pluginscript.h>",
diff --git a/modules/gdnative/include/arvr/godot_arvr.h b/modules/gdnative/include/xr/godot_xr.h
index aaef31a855..22f7f021c4 100644
--- a/modules/gdnative/include/arvr/godot_arvr.h
+++ b/modules/gdnative/include/xr/godot_xr.h
@@ -1,5 +1,5 @@
 /*************************************************************************/
-/*  godot_arvr.h                                                         */
+/*  godot_xr.h                                                           */
 /*************************************************************************/
 /*                       This file is part of:                           */
 /*                           GODOT ENGINE                                */
@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#ifndef GODOT_NATIVEARVR_H
-#define GODOT_NATIVEARVR_H
+#ifndef GODOT_NATIVEXR_H
+#define GODOT_NATIVEXR_H
 
 #include <gdnative/gdnative.h>
 
@@ -61,32 +61,31 @@ typedef struct {
 	void (*fill_projection_for_eye)(void *, godot_real *, godot_int, godot_real, godot_real, godot_real);
 	void (*commit_for_eye)(void *, godot_int, godot_rid *, godot_rect2 *);
 	void (*process)(void *);
-	// only in 1.1 onwards
 	godot_int (*get_external_texture_for_eye)(void *, godot_int);
 	void (*notification)(void *, godot_int);
 	godot_int (*get_camera_feed_id)(void *);
-} godot_arvr_interface_gdnative;
+} godot_xr_interface_gdnative;
 
-void GDAPI godot_arvr_register_interface(const godot_arvr_interface_gdnative *p_interface);
+void GDAPI godot_xr_register_interface(const godot_xr_interface_gdnative *p_interface);
 
-// helper functions to access ARVRServer data
-godot_real GDAPI godot_arvr_get_worldscale();
-godot_transform GDAPI godot_arvr_get_reference_frame();
+// helper functions to access XRServer data
+godot_real GDAPI godot_xr_get_worldscale();
+godot_transform GDAPI godot_xr_get_reference_frame();
 
 // helper functions for rendering
-void GDAPI godot_arvr_blit(godot_int p_eye, godot_rid *p_render_target, godot_rect2 *p_rect);
-godot_int GDAPI godot_arvr_get_texid(godot_rid *p_render_target);
+void GDAPI godot_xr_blit(godot_int p_eye, godot_rid *p_render_target, godot_rect2 *p_rect);
+godot_int GDAPI godot_xr_get_texid(godot_rid *p_render_target);
 
-// helper functions for updating ARVR controllers
-godot_int GDAPI godot_arvr_add_controller(char *p_device_name, godot_int p_hand, godot_bool p_tracks_orientation, godot_bool p_tracks_position);
-void GDAPI godot_arvr_remove_controller(godot_int p_controller_id);
-void GDAPI godot_arvr_set_controller_transform(godot_int p_controller_id, godot_transform *p_transform, godot_bool p_tracks_orientation, godot_bool p_tracks_position);
-void GDAPI godot_arvr_set_controller_button(godot_int p_controller_id, godot_int p_button, godot_bool p_is_pressed);
-void GDAPI godot_arvr_set_controller_axis(godot_int p_controller_id, godot_int p_axis, godot_real p_value, godot_bool p_can_be_negative);
-godot_real GDAPI godot_arvr_get_controller_rumble(godot_int p_controller_id);
+// helper functions for updating XR controllers
+godot_int GDAPI godot_xr_add_controller(char *p_device_name, godot_int p_hand, godot_bool p_tracks_orientation, godot_bool p_tracks_position);
+void GDAPI godot_xr_remove_controller(godot_int p_controller_id);
+void GDAPI godot_xr_set_controller_transform(godot_int p_controller_id, godot_transform *p_transform, godot_bool p_tracks_orientation, godot_bool p_tracks_position);
+void GDAPI godot_xr_set_controller_button(godot_int p_controller_id, godot_int p_button, godot_bool p_is_pressed);
+void GDAPI godot_xr_set_controller_axis(godot_int p_controller_id, godot_int p_axis, godot_real p_value, godot_bool p_can_be_negative);
+godot_real GDAPI godot_xr_get_controller_rumble(godot_int p_controller_id);
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif /* !GODOT_NATIVEARVR_H */
+#endif /* !GODOT_NATIVEXR_H */
diff --git a/modules/gdnative/register_types.cpp b/modules/gdnative/register_types.cpp
index 397a020689..67a286ee2e 100644
--- a/modules/gdnative/register_types.cpp
+++ b/modules/gdnative/register_types.cpp
@@ -34,11 +34,11 @@
 
 #include "gdnative.h"
 
-#include "arvr/register_types.h"
 #include "nativescript/register_types.h"
 #include "net/register_types.h"
 #include "pluginscript/register_types.h"
 #include "videodecoder/register_types.h"
+#include "xr/register_types.h"
 
 #include "core/engine.h"
 #include "core/io/resource_loader.h"
@@ -240,7 +240,7 @@ void register_gdnative_types() {
 	GDNativeCallRegistry::singleton->register_native_call_type("standard_varcall", cb_standard_varcall);
 
 	register_net_types();
-	register_arvr_types();
+	register_xr_types();
 	register_nativescript_types();
 	register_pluginscript_types();
 	register_videodecoder_types();
@@ -305,7 +305,7 @@ void unregister_gdnative_types() {
 	unregister_videodecoder_types();
 	unregister_pluginscript_types();
 	unregister_nativescript_types();
-	unregister_arvr_types();
+	unregister_xr_types();
 	unregister_net_types();
 
 	memdelete(GDNativeCallRegistry::singleton);
diff --git a/modules/gdnative/arvr/SCsub b/modules/gdnative/xr/SCsub
index 0b2db3b504..0b2db3b504 100644
--- a/modules/gdnative/arvr/SCsub
+++ b/modules/gdnative/xr/SCsub
diff --git a/modules/gdnative/arvr/config.py b/modules/gdnative/xr/config.py
index d22f9454ed..d22f9454ed 100644
--- a/modules/gdnative/arvr/config.py
+++ b/modules/gdnative/xr/config.py
diff --git a/modules/gdnative/arvr/register_types.cpp b/modules/gdnative/xr/register_types.cpp
index 0f6e2bca1a..da3a7dc4b8 100644
--- a/modules/gdnative/arvr/register_types.cpp
+++ b/modules/gdnative/xr/register_types.cpp
@@ -29,11 +29,12 @@
 /*************************************************************************/
 
 #include "register_types.h"
-#include "arvr_interface_gdnative.h"
+#include "xr_interface_gdnative.h"
 
-void register_arvr_types() {
-	ClassDB::register_class<ARVRInterfaceGDNative>();
+void register_xr_types() {
+	ClassDB::register_class<XRInterfaceGDNative>();
+	ClassDB::add_compatibility_class("ARVRInterfaceGDNative", "XRInterfaceGDNative");
 }
 
-void unregister_arvr_types() {
+void unregister_xr_types() {
 }
diff --git a/modules/gdnative/arvr/register_types.h b/modules/gdnative/xr/register_types.h
index b0de6f7c14..2501d28651 100644
--- a/modules/gdnative/arvr/register_types.h
+++ b/modules/gdnative/xr/register_types.h
@@ -28,10 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#ifndef ARVR_REGISTER_TYPES_H
-#define ARVR_REGISTER_TYPES_H
+#ifndef XR_REGISTER_TYPES_H
+#define XR_REGISTER_TYPES_H
 
-void register_arvr_types();
-void unregister_arvr_types();
+void register_xr_types();
+void unregister_xr_types();
 
-#endif // ARVR_REGISTER_TYPES_H
+#endif // XR_REGISTER_TYPES_H
diff --git a/modules/gdnative/arvr/arvr_interface_gdnative.cpp b/modules/gdnative/xr/xr_interface_gdnative.cpp
index f14691027a..0451945139 100644
--- a/modules/gdnative/arvr/arvr_interface_gdnative.cpp
+++ b/modules/gdnative/xr/xr_interface_gdnative.cpp
@@ -1,5 +1,5 @@
 /*************************************************************************/
-/*  arvr_interface_gdnative.cpp                                          */
+/*  xr_interface_gdnative.cpp                                            */
 /*************************************************************************/
 /*                       This file is part of:                           */
 /*                           GODOT ENGINE                                */
@@ -28,17 +28,17 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "arvr_interface_gdnative.h"
+#include "xr_interface_gdnative.h"
 #include "core/input/input_filter.h"
-#include "servers/arvr/arvr_positional_tracker.h"
 #include "servers/rendering/rendering_server_globals.h"
+#include "servers/xr/xr_positional_tracker.h"
 
-void ARVRInterfaceGDNative::_bind_methods() {
+void XRInterfaceGDNative::_bind_methods() {
 	ADD_PROPERTY_DEFAULT("interface_is_initialized", false);
 	ADD_PROPERTY_DEFAULT("ar_is_anchor_detection_enabled", false);
 }
 
-ARVRInterfaceGDNative::ARVRInterfaceGDNative() {
+XRInterfaceGDNative::XRInterfaceGDNative() {
 	print_verbose("Construct gdnative interface\n");
 
 	// we won't have our data pointer until our library gets set
@@ -47,7 +47,7 @@ ARVRInterfaceGDNative::ARVRInterfaceGDNative() {
 	interface = nullptr;
 }
 
-ARVRInterfaceGDNative::~ARVRInterfaceGDNative() {
+XRInterfaceGDNative::~XRInterfaceGDNative() {
 	print_verbose("Destruct gdnative interface\n");
 
 	if (interface != nullptr && is_initialized()) {
@@ -58,7 +58,7 @@ ARVRInterfaceGDNative::~ARVRInterfaceGDNative() {
 	cleanup();
 }
 
-void ARVRInterfaceGDNative::cleanup() {
+void XRInterfaceGDNative::cleanup() {
 	if (interface != nullptr) {
 		interface->destructor(data);
 		data = nullptr;
@@ -66,7 +66,7 @@ void ARVRInterfaceGDNative::cleanup() {
 	}
 }
 
-void ARVRInterfaceGDNative::set_interface(const godot_arvr_interface_gdnative *p_interface) {
+void XRInterfaceGDNative::set_interface(const godot_xr_interface_gdnative *p_interface) {
 	// this should only be called once, just being paranoid..
 	if (interface) {
 		cleanup();
@@ -79,7 +79,7 @@ void ARVRInterfaceGDNative::set_interface(const godot_arvr_interface_gdnative *p
 	data = interface->constructor((godot_object *)this);
 }
 
-StringName ARVRInterfaceGDNative::get_name() const {
+StringName XRInterfaceGDNative::get_name() const {
 
 	ERR_FAIL_COND_V(interface == nullptr, StringName());
 
@@ -92,7 +92,7 @@ StringName ARVRInterfaceGDNative::get_name() const {
 	return name;
 }
 
-int ARVRInterfaceGDNative::get_capabilities() const {
+int XRInterfaceGDNative::get_capabilities() const {
 	int capabilities;
 
 	ERR_FAIL_COND_V(interface == nullptr, 0); // 0 = None
@@ -102,32 +102,28 @@ int ARVRInterfaceGDNative::get_capabilities() const {
 	return capabilities;
 }
 
-bool ARVRInterfaceGDNative::get_anchor_detection_is_enabled() const {
+bool XRInterfaceGDNative::get_anchor_detection_is_enabled() const {
 
 	ERR_FAIL_COND_V(interface == nullptr, false);
 
 	return interface->get_anchor_detection_is_enabled(data);
 }
 
-void ARVRInterfaceGDNative::set_anchor_detection_is_enabled(bool p_enable) {
+void XRInterfaceGDNative::set_anchor_detection_is_enabled(bool p_enable) {
 
 	ERR_FAIL_COND(interface == nullptr);
 
 	interface->set_anchor_detection_is_enabled(data, p_enable);
 }
 
-int ARVRInterfaceGDNative::get_camera_feed_id() {
+int XRInterfaceGDNative::get_camera_feed_id() {
 
 	ERR_FAIL_COND_V(interface == nullptr, 0);
 
-	if ((interface->version.major > 1) || ((interface->version.major) == 1 && (interface->version.minor >= 1))) {
-		return (unsigned int)interface->get_camera_feed_id(data);
-	} else {
-		return 0;
-	}
+	return (unsigned int)interface->get_camera_feed_id(data);
 }
 
-bool ARVRInterfaceGDNative::is_stereo() {
+bool XRInterfaceGDNative::is_stereo() {
 	bool stereo;
 
 	ERR_FAIL_COND_V(interface == nullptr, false);
@@ -137,14 +133,14 @@ bool ARVRInterfaceGDNative::is_stereo() {
 	return stereo;
 }
 
-bool ARVRInterfaceGDNative::is_initialized() const {
+bool XRInterfaceGDNative::is_initialized() const {
 
 	ERR_FAIL_COND_V(interface == nullptr, false);
 
 	return interface->is_initialized(data);
 }
 
-bool ARVRInterfaceGDNative::initialize() {
+bool XRInterfaceGDNative::initialize() {
 	ERR_FAIL_COND_V(interface == nullptr, false);
 
 	bool initialized = interface->initialize(data);
@@ -152,28 +148,28 @@ bool ARVRInterfaceGDNative::initialize() {
 	if (initialized) {
 		// if we successfully initialize our interface and we don't have a primary interface yet, this becomes our primary interface
 
-		ARVRServer *arvr_server = ARVRServer::get_singleton();
-		if ((arvr_server != nullptr) && (arvr_server->get_primary_interface() == nullptr)) {
-			arvr_server->set_primary_interface(this);
+		XRServer *xr_server = XRServer::get_singleton();
+		if ((xr_server != nullptr) && (xr_server->get_primary_interface() == nullptr)) {
+			xr_server->set_primary_interface(this);
 		};
 	};
 
 	return initialized;
 }
 
-void ARVRInterfaceGDNative::uninitialize() {
+void XRInterfaceGDNative::uninitialize() {
 	ERR_FAIL_COND(interface == nullptr);
 
-	ARVRServer *arvr_server = ARVRServer::get_singleton();
-	if (arvr_server != nullptr) {
+	XRServer *xr_server = XRServer::get_singleton();
+	if (xr_server != nullptr) {
 		// Whatever happens, make sure this is no longer our primary interface
-		arvr_server->clear_primary_interface_if(this);
+		xr_server->clear_primary_interface_if(this);
 	}
 
 	interface->uninitialize(data);
 }
 
-Size2 ARVRInterfaceGDNative::get_render_targetsize() {
+Size2 XRInterfaceGDNative::get_render_targetsize() {
 
 	ERR_FAIL_COND_V(interface == nullptr, Size2());
 
@@ -183,7 +179,7 @@ Size2 ARVRInterfaceGDNative::get_render_targetsize() {
 	return *vec;
 }
 
-Transform ARVRInterfaceGDNative::get_transform_for_eye(ARVRInterface::Eyes p_eye, const Transform &p_cam_transform) {
+Transform XRInterfaceGDNative::get_transform_for_eye(XRInterface::Eyes p_eye, const Transform &p_cam_transform) {
 	Transform *ret;
 
 	ERR_FAIL_COND_V(interface == nullptr, Transform());
@@ -195,7 +191,7 @@ Transform ARVRInterfaceGDNative::get_transform_for_eye(ARVRInterface::Eyes p_eye
 	return *ret;
 }
 
-CameraMatrix ARVRInterfaceGDNative::get_projection_for_eye(ARVRInterface::Eyes p_eye, real_t p_aspect, real_t p_z_near, real_t p_z_far) {
+CameraMatrix XRInterfaceGDNative::get_projection_for_eye(XRInterface::Eyes p_eye, real_t p_aspect, real_t p_z_near, real_t p_z_far) {
 	CameraMatrix cm;
 
 	ERR_FAIL_COND_V(interface == nullptr, CameraMatrix());
@@ -205,37 +201,30 @@ CameraMatrix ARVRInterfaceGDNative::get_projection_for_eye(ARVRInterface::Eyes p
 	return cm;
 }
 
-unsigned int ARVRInterfaceGDNative::get_external_texture_for_eye(ARVRInterface::Eyes p_eye) {
+unsigned int XRInterfaceGDNative::get_external_texture_for_eye(XRInterface::Eyes p_eye) {
 
 	ERR_FAIL_COND_V(interface == nullptr, 0);
 
-	if ((interface->version.major > 1) || ((interface->version.major) == 1 && (interface->version.minor >= 1))) {
-		return (unsigned int)interface->get_external_texture_for_eye(data, (godot_int)p_eye);
-	} else {
-		return 0;
-	}
+	return (unsigned int)interface->get_external_texture_for_eye(data, (godot_int)p_eye);
 }
 
-void ARVRInterfaceGDNative::commit_for_eye(ARVRInterface::Eyes p_eye, RID p_render_target, const Rect2 &p_screen_rect) {
+void XRInterfaceGDNative::commit_for_eye(XRInterface::Eyes p_eye, RID p_render_target, const Rect2 &p_screen_rect) {
 
 	ERR_FAIL_COND(interface == nullptr);
 
 	interface->commit_for_eye(data, (godot_int)p_eye, (godot_rid *)&p_render_target, (godot_rect2 *)&p_screen_rect);
 }
 
-void ARVRInterfaceGDNative::process() {
+void XRInterfaceGDNative::process() {
 	ERR_FAIL_COND(interface == nullptr);
 
 	interface->process(data);
 }
 
-void ARVRInterfaceGDNative::notification(int p_what) {
+void XRInterfaceGDNative::notification(int p_what) {
 	ERR_FAIL_COND(interface == nullptr);
 
-	// this is only available in interfaces that implement 1.1 or later
-	if ((interface->version.major > 1) || ((interface->version.major == 1) && (interface->version.minor > 0))) {
-		interface->notification(data, p_what);
-	}
+	interface->notification(data, p_what);
 }
 
 /////////////////////////////////////////////////////////////////////////////////////
@@ -243,30 +232,30 @@ void ARVRInterfaceGDNative::notification(int p_what) {
 
 extern "C" {
 
-void GDAPI godot_arvr_register_interface(const godot_arvr_interface_gdnative *p_interface) {
-	// If our major version is 0 or bigger then 10, we're likely looking at our constructor pointer from an older plugin
-	ERR_FAIL_COND_MSG((p_interface->version.major == 0) || (p_interface->version.major > 10), "GDNative ARVR interfaces build for Godot 3.0 are not supported.");
+void GDAPI godot_xr_register_interface(const godot_xr_interface_gdnative *p_interface) {
+	// Must be on a version 4 plugin
+	ERR_FAIL_COND_MSG(p_interface->version.major < 4, "GDNative XR interfaces build for Godot 3.x are not supported.");
 
-	Ref<ARVRInterfaceGDNative> new_interface;
+	Ref<XRInterfaceGDNative> new_interface;
 	new_interface.instance();
-	new_interface->set_interface((const godot_arvr_interface_gdnative *)p_interface);
-	ARVRServer::get_singleton()->add_interface(new_interface);
+	new_interface->set_interface((const godot_xr_interface_gdnative *)p_interface);
+	XRServer::get_singleton()->add_interface(new_interface);
 }
 
-godot_real GDAPI godot_arvr_get_worldscale() {
-	ARVRServer *arvr_server = ARVRServer::get_singleton();
-	ERR_FAIL_NULL_V(arvr_server, 1.0);
+godot_real GDAPI godot_xr_get_worldscale() {
+	XRServer *xr_server = XRServer::get_singleton();
+	ERR_FAIL_NULL_V(xr_server, 1.0);
 
-	return arvr_server->get_world_scale();
+	return xr_server->get_world_scale();
 }
 
-godot_transform GDAPI godot_arvr_get_reference_frame() {
+godot_transform GDAPI godot_xr_get_reference_frame() {
 	godot_transform reference_frame;
 	Transform *reference_frame_ptr = (Transform *)&reference_frame;
 
-	ARVRServer *arvr_server = ARVRServer::get_singleton();
-	if (arvr_server != nullptr) {
-		*reference_frame_ptr = arvr_server->get_reference_frame();
+	XRServer *xr_server = XRServer::get_singleton();
+	if (xr_server != nullptr) {
+		*reference_frame_ptr = xr_server->get_reference_frame();
 	} else {
 		godot_transform_new_identity(&reference_frame);
 	}
@@ -274,17 +263,17 @@ godot_transform GDAPI godot_arvr_get_reference_frame() {
 	return reference_frame;
 }
 
-void GDAPI godot_arvr_blit(godot_int p_eye, godot_rid *p_render_target, godot_rect2 *p_rect) {
+void GDAPI godot_xr_blit(godot_int p_eye, godot_rid *p_render_target, godot_rect2 *p_rect) {
 	// blits out our texture as is, handy for preview display of one of the eyes that is already rendered with lens distortion on an external HMD
-	ARVRInterface::Eyes eye = (ARVRInterface::Eyes)p_eye;
+	XRInterface::Eyes eye = (XRInterface::Eyes)p_eye;
 #if 0
 	RID *render_target = (RID *)p_render_target;
 #endif
 	Rect2 screen_rect = *(Rect2 *)p_rect;
 
-	if (eye == ARVRInterface::EYE_LEFT) {
+	if (eye == XRInterface::EYE_LEFT) {
 		screen_rect.size.x /= 2.0;
-	} else if (p_eye == ARVRInterface::EYE_RIGHT) {
+	} else if (p_eye == XRInterface::EYE_RIGHT) {
 		screen_rect.size.x /= 2.0;
 		screen_rect.position.x += screen_rect.size.x;
 	}
@@ -296,7 +285,7 @@ void GDAPI godot_arvr_blit(godot_int p_eye, godot_rid *p_render_target, godot_re
 #endif
 }
 
-godot_int GDAPI godot_arvr_get_texid(godot_rid *p_render_target) {
+godot_int GDAPI godot_xr_get_texid(godot_rid *p_render_target) {
 	// In order to send off our textures to display on our hardware we need the opengl texture ID instead of the render target RID
 	// This is a handy function to expose that.
 #if 0
@@ -313,20 +302,20 @@ godot_int GDAPI godot_arvr_get_texid(godot_rid *p_render_target) {
 	return texid;
 }
 
-godot_int GDAPI godot_arvr_add_controller(char *p_device_name, godot_int p_hand, godot_bool p_tracks_orientation, godot_bool p_tracks_position) {
-	ARVRServer *arvr_server = ARVRServer::get_singleton();
-	ERR_FAIL_NULL_V(arvr_server, 0);
+godot_int GDAPI godot_xr_add_controller(char *p_device_name, godot_int p_hand, godot_bool p_tracks_orientation, godot_bool p_tracks_position) {
+	XRServer *xr_server = XRServer::get_singleton();
+	ERR_FAIL_NULL_V(xr_server, 0);
 
 	InputFilter *input = InputFilter::get_singleton();
 	ERR_FAIL_NULL_V(input, 0);
 
-	ARVRPositionalTracker *new_tracker = memnew(ARVRPositionalTracker);
+	XRPositionalTracker *new_tracker = memnew(XRPositionalTracker);
 	new_tracker->set_name(p_device_name);
-	new_tracker->set_type(ARVRServer::TRACKER_CONTROLLER);
+	new_tracker->set_type(XRServer::TRACKER_CONTROLLER);
 	if (p_hand == 1) {
-		new_tracker->set_hand(ARVRPositionalTracker::TRACKER_LEFT_HAND);
+		new_tracker->set_hand(XRPositionalTracker::TRACKER_LEFT_HAND);
 	} else if (p_hand == 2) {
-		new_tracker->set_hand(ARVRPositionalTracker::TRACKER_RIGHT_HAND);
+		new_tracker->set_hand(XRPositionalTracker::TRACKER_RIGHT_HAND);
 	}
 
 	// also register as joystick...
@@ -346,20 +335,20 @@ godot_int GDAPI godot_arvr_add_controller(char *p_device_name, godot_int p_hand,
 	}
 
 	// add our tracker to our server and remember its pointer
-	arvr_server->add_tracker(new_tracker);
+	xr_server->add_tracker(new_tracker);
 
 	// note, this ID is only unique within controllers!
 	return new_tracker->get_tracker_id();
 }
 
-void GDAPI godot_arvr_remove_controller(godot_int p_controller_id) {
-	ARVRServer *arvr_server = ARVRServer::get_singleton();
-	ERR_FAIL_NULL(arvr_server);
+void GDAPI godot_xr_remove_controller(godot_int p_controller_id) {
+	XRServer *xr_server = XRServer::get_singleton();
+	ERR_FAIL_NULL(xr_server);
 
 	InputFilter *input = InputFilter::get_singleton();
 	ERR_FAIL_NULL(input);
 
-	ARVRPositionalTracker *remove_tracker = arvr_server->find_by_type_and_id(ARVRServer::TRACKER_CONTROLLER, p_controller_id);
+	XRPositionalTracker *remove_tracker = xr_server->find_by_type_and_id(XRServer::TRACKER_CONTROLLER, p_controller_id);
 	if (remove_tracker != nullptr) {
 		// unset our joystick if applicable
 		int joyid = remove_tracker->get_joy_id();
@@ -369,16 +358,16 @@ void GDAPI godot_arvr_remove_controller(godot_int p_controller_id) {
 		}
 
 		// remove our tracker from our server
-		arvr_server->remove_tracker(remove_tracker);
+		xr_server->remove_tracker(remove_tracker);
 		memdelete(remove_tracker);
 	}
 }
 
-void GDAPI godot_arvr_set_controller_transform(godot_int p_controller_id, godot_transform *p_transform, godot_bool p_tracks_orientation, godot_bool p_tracks_position) {
-	ARVRServer *arvr_server = ARVRServer::get_singleton();
-	ERR_FAIL_NULL(arvr_server);
+void GDAPI godot_xr_set_controller_transform(godot_int p_controller_id, godot_transform *p_transform, godot_bool p_tracks_orientation, godot_bool p_tracks_position) {
+	XRServer *xr_server = XRServer::get_singleton();
+	ERR_FAIL_NULL(xr_server);
 
-	ARVRPositionalTracker *tracker = arvr_server->find_by_type_and_id(ARVRServer::TRACKER_CONTROLLER, p_controller_id);
+	XRPositionalTracker *tracker = xr_server->find_by_type_and_id(XRServer::TRACKER_CONTROLLER, p_controller_id);
 	if (tracker != nullptr) {
 		Transform *transform = (Transform *)p_transform;
 		if (p_tracks_orientation) {
@@ -390,14 +379,14 @@ void GDAPI godot_arvr_set_controller_transform(godot_int p_controller_id, godot_
 	}
 }
 
-void GDAPI godot_arvr_set_controller_button(godot_int p_controller_id, godot_int p_button, godot_bool p_is_pressed) {
-	ARVRServer *arvr_server = ARVRServer::get_singleton();
-	ERR_FAIL_NULL(arvr_server);
+void GDAPI godot_xr_set_controller_button(godot_int p_controller_id, godot_int p_button, godot_bool p_is_pressed) {
+	XRServer *xr_server = XRServer::get_singleton();
+	ERR_FAIL_NULL(xr_server);
 
 	InputFilter *input = InputFilter::get_singleton();
 	ERR_FAIL_NULL(input);
 
-	ARVRPositionalTracker *tracker = arvr_server->find_by_type_and_id(ARVRServer::TRACKER_CONTROLLER, p_controller_id);
+	XRPositionalTracker *tracker = xr_server->find_by_type_and_id(XRServer::TRACKER_CONTROLLER, p_controller_id);
 	if (tracker != nullptr) {
 		int joyid = tracker->get_joy_id();
 		if (joyid != -1) {
@@ -406,14 +395,14 @@ void GDAPI godot_arvr_set_controller_button(godot_int p_controller_id, godot_int
 	}
 }
 
-void GDAPI godot_arvr_set_controller_axis(godot_int p_controller_id, godot_int p_axis, godot_real p_value, godot_bool p_can_be_negative) {
-	ARVRServer *arvr_server = ARVRServer::get_singleton();
-	ERR_FAIL_NULL(arvr_server);
+void GDAPI godot_xr_set_controller_axis(godot_int p_controller_id, godot_int p_axis, godot_real p_value, godot_bool p_can_be_negative) {
+	XRServer *xr_server = XRServer::get_singleton();
+	ERR_FAIL_NULL(xr_server);
 
 	InputFilter *input = InputFilter::get_singleton();
 	ERR_FAIL_NULL(input);
 
-	ARVRPositionalTracker *tracker = arvr_server->find_by_type_and_id(ARVRServer::TRACKER_CONTROLLER, p_controller_id);
+	XRPositionalTracker *tracker = xr_server->find_by_type_and_id(XRServer::TRACKER_CONTROLLER, p_controller_id);
 	if (tracker != nullptr) {
 		int joyid = tracker->get_joy_id();
 		if (joyid != -1) {
@@ -425,11 +414,11 @@ void GDAPI godot_arvr_set_controller_axis(godot_int p_controller_id, godot_int p
 	}
 }
 
-godot_real GDAPI godot_arvr_get_controller_rumble(godot_int p_controller_id) {
-	ARVRServer *arvr_server = ARVRServer::get_singleton();
-	ERR_FAIL_NULL_V(arvr_server, 0.0);
+godot_real GDAPI godot_xr_get_controller_rumble(godot_int p_controller_id) {
+	XRServer *xr_server = XRServer::get_singleton();
+	ERR_FAIL_NULL_V(xr_server, 0.0);
 
-	ARVRPositionalTracker *tracker = arvr_server->find_by_type_and_id(ARVRServer::TRACKER_CONTROLLER, p_controller_id);
+	XRPositionalTracker *tracker = xr_server->find_by_type_and_id(XRServer::TRACKER_CONTROLLER, p_controller_id);
 	if (tracker != nullptr) {
 		return tracker->get_rumble();
 	}
diff --git a/modules/gdnative/arvr/arvr_interface_gdnative.h b/modules/gdnative/xr/xr_interface_gdnative.h
index e38eb435c6..64f1282a7e 100644
--- a/modules/gdnative/arvr/arvr_interface_gdnative.h
+++ b/modules/gdnative/xr/xr_interface_gdnative.h
@@ -1,5 +1,5 @@
 /*************************************************************************/
-/*  arvr_interface_gdnative.h                                            */
+/*  xr_interface_gdnative.h                                              */
 /*************************************************************************/
 /*                       This file is part of:                           */
 /*                           GODOT ENGINE                                */
@@ -28,11 +28,11 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#ifndef ARVR_INTERFACE_GDNATIVE_H
-#define ARVR_INTERFACE_GDNATIVE_H
+#ifndef XR_INTERFACE_GDNATIVE_H
+#define XR_INTERFACE_GDNATIVE_H
 
 #include "modules/gdnative/gdnative.h"
-#include "servers/arvr/arvr_interface.h"
+#include "servers/xr/xr_interface.h"
 
 /**
 	@authors Hinsbart & Karroffel & Mux213
@@ -40,23 +40,23 @@
 	This subclass of our AR/VR interface forms a bridge to GDNative.
 */
 
-class ARVRInterfaceGDNative : public ARVRInterface {
-	GDCLASS(ARVRInterfaceGDNative, ARVRInterface);
+class XRInterfaceGDNative : public XRInterface {
+	GDCLASS(XRInterfaceGDNative, XRInterface);
 
 	void cleanup();
 
 protected:
-	const godot_arvr_interface_gdnative *interface;
+	const godot_xr_interface_gdnative *interface;
 	void *data;
 
 	static void _bind_methods();
 
 public:
 	/** general interface information **/
-	ARVRInterfaceGDNative();
-	~ARVRInterfaceGDNative();
+	XRInterfaceGDNative();
+	~XRInterfaceGDNative();
 
-	void set_interface(const godot_arvr_interface_gdnative *p_interface);
+	void set_interface(const godot_xr_interface_gdnative *p_interface);
 
 	virtual StringName get_name() const;
 	virtual int get_capabilities() const;
@@ -73,19 +73,19 @@ public:
 	/** rendering and internal **/
 	virtual Size2 get_render_targetsize();
 	virtual bool is_stereo();
-	virtual Transform get_transform_for_eye(ARVRInterface::Eyes p_eye, const Transform &p_cam_transform);
+	virtual Transform get_transform_for_eye(XRInterface::Eyes p_eye, const Transform &p_cam_transform);
 
 	// we expose a Vector<float> version of this function to GDNative
-	Vector<float> _get_projection_for_eye(ARVRInterface::Eyes p_eye, real_t p_aspect, real_t p_z_near, real_t p_z_far);
+	Vector<float> _get_projection_for_eye(XRInterface::Eyes p_eye, real_t p_aspect, real_t p_z_near, real_t p_z_far);
 
-	// and a CameraMatrix version to ARVRServer
-	virtual CameraMatrix get_projection_for_eye(ARVRInterface::Eyes p_eye, real_t p_aspect, real_t p_z_near, real_t p_z_far);
+	// and a CameraMatrix version to XRServer
+	virtual CameraMatrix get_projection_for_eye(XRInterface::Eyes p_eye, real_t p_aspect, real_t p_z_near, real_t p_z_far);
 
-	virtual unsigned int get_external_texture_for_eye(ARVRInterface::Eyes p_eye);
-	virtual void commit_for_eye(ARVRInterface::Eyes p_eye, RID p_render_target, const Rect2 &p_screen_rect);
+	virtual unsigned int get_external_texture_for_eye(XRInterface::Eyes p_eye);
+	virtual void commit_for_eye(XRInterface::Eyes p_eye, RID p_render_target, const Rect2 &p_screen_rect);
 
 	virtual void process();
 	virtual void notification(int p_what);
 };
 
-#endif // ARVR_INTERFACE_GDNATIVE_H
+#endif // XR_INTERFACE_GDNATIVE_H
diff --git a/modules/mobile_vr/doc_classes/MobileVRInterface.xml b/modules/mobile_vr/doc_classes/MobileVRInterface.xml
index 7552abe61d..120535bd41 100644
--- a/modules/mobile_vr/doc_classes/MobileVRInterface.xml
+++ b/modules/mobile_vr/doc_classes/MobileVRInterface.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="MobileVRInterface" inherits="ARVRInterface" version="4.0">
+<class name="MobileVRInterface" inherits="XRInterface" version="4.0">
 	<brief_description>
 		Generic mobile VR implementation.
 	</brief_description>
@@ -8,9 +8,9 @@
 		Note that even though there is no positional tracking, the camera will assume the headset is at a height of 1.85 meters. You can change this by setting [member eye_height].
 		You can initialise this interface as follows:
 		[codeblock]
-		var interface = ARVRServer.find_interface("Native mobile")
+		var interface = XRServer.find_interface("Native mobile")
 		if interface and interface.initialize():
-		    get_viewport().arvr = true
+		    get_viewport().xr = true
 		[/codeblock]
 	</description>
 	<tutorials>
@@ -25,7 +25,7 @@
 			The width of the display in centimeters.
 		</member>
 		<member name="eye_height" type="float" setter="set_eye_height" getter="get_eye_height" default="1.85">
-			The height at which the camera is placed in relation to the ground (i.e. [ARVROrigin] node).
+			The height at which the camera is placed in relation to the ground (i.e. [XROrigin3D] node).
 		</member>
 		<member name="iod" type="float" setter="set_iod" getter="get_iod" default="6.0">
 			The interocular distance, also known as the interpupillary distance. The distance between the pupils of the left and right eye.
diff --git a/modules/mobile_vr/mobile_vr_interface.cpp b/modules/mobile_vr/mobile_vr_interface.cpp
index 6b5a70435d..2f0a15f20b 100644
--- a/modules/mobile_vr/mobile_vr_interface.cpp
+++ b/modules/mobile_vr/mobile_vr_interface.cpp
@@ -39,7 +39,7 @@ StringName MobileVRInterface::get_name() const {
 };
 
 int MobileVRInterface::get_capabilities() const {
-	return ARVRInterface::ARVR_STEREO;
+	return XRInterface::XR_STEREO;
 };
 
 Vector3 MobileVRInterface::scale_magneto(const Vector3 &p_magnetometer) {
@@ -165,7 +165,7 @@ void MobileVRInterface::set_position_from_sensors() {
 		rotate.rotate(orientation.get_axis(2), gyro.z * delta_time);
 		orientation = rotate * orientation;
 
-		tracking_state = ARVRInterface::ARVR_NORMAL_TRACKING;
+		tracking_state = XRInterface::XR_NORMAL_TRACKING;
 	};
 
 	///@TODO improve this, the magnetometer is very fidgity sometimes flipping the axis for no apparent reason (probably a bug on my part)
@@ -177,7 +177,7 @@ void MobileVRInterface::set_position_from_sensors() {
 		transform_quat = transform_quat.slerp(acc_mag_quat, 0.1);
 		orientation = Basis(transform_quat);
 
-		tracking_state = ARVRInterface::ARVR_NORMAL_TRACKING;
+		tracking_state = XRInterface::XR_NORMAL_TRACKING;
 	} else if (has_grav) {
 		// use gravity vector to make sure down is down...
 		// transform gravity into our world space
@@ -297,8 +297,8 @@ bool MobileVRInterface::is_initialized() const {
 };
 
 bool MobileVRInterface::initialize() {
-	ARVRServer *arvr_server = ARVRServer::get_singleton();
-	ERR_FAIL_NULL_V(arvr_server, false);
+	XRServer *xr_server = XRServer::get_singleton();
+	ERR_FAIL_NULL_V(xr_server, false);
 
 	if (!initialized) {
 		// reset our sensor data and orientation
@@ -314,7 +314,7 @@ bool MobileVRInterface::initialize() {
 		orientation = Basis();
 
 		// make this our primary interface
-		arvr_server->set_primary_interface(this);
+		xr_server->set_primary_interface(this);
 
 		last_ticks = OS::get_singleton()->get_ticks_usec();
 
@@ -326,10 +326,10 @@ bool MobileVRInterface::initialize() {
 
 void MobileVRInterface::uninitialize() {
 	if (initialized) {
-		ARVRServer *arvr_server = ARVRServer::get_singleton();
-		if (arvr_server != nullptr) {
+		XRServer *xr_server = XRServer::get_singleton();
+		if (xr_server != nullptr) {
 			// no longer our primary interface
-			arvr_server->clear_primary_interface_if(this);
+			xr_server->clear_primary_interface_if(this);
 		}
 
 		initialized = false;
@@ -348,22 +348,22 @@ Size2 MobileVRInterface::get_render_targetsize() {
 	return target_size;
 };
 
-Transform MobileVRInterface::get_transform_for_eye(ARVRInterface::Eyes p_eye, const Transform &p_cam_transform) {
+Transform MobileVRInterface::get_transform_for_eye(XRInterface::Eyes p_eye, const Transform &p_cam_transform) {
 	_THREAD_SAFE_METHOD_
 
 	Transform transform_for_eye;
 
-	ARVRServer *arvr_server = ARVRServer::get_singleton();
-	ERR_FAIL_NULL_V(arvr_server, transform_for_eye);
+	XRServer *xr_server = XRServer::get_singleton();
+	ERR_FAIL_NULL_V(xr_server, transform_for_eye);
 
 	if (initialized) {
-		float world_scale = arvr_server->get_world_scale();
+		float world_scale = xr_server->get_world_scale();
 
 		// we don't need to check for the existence of our HMD, doesn't effect our values...
 		// note * 0.01 to convert cm to m and * 0.5 as we're moving half in each direction...
-		if (p_eye == ARVRInterface::EYE_LEFT) {
+		if (p_eye == XRInterface::EYE_LEFT) {
 			transform_for_eye.origin.x = -(intraocular_dist * 0.01 * 0.5 * world_scale);
-		} else if (p_eye == ARVRInterface::EYE_RIGHT) {
+		} else if (p_eye == XRInterface::EYE_RIGHT) {
 			transform_for_eye.origin.x = intraocular_dist * 0.01 * 0.5 * world_scale;
 		} else {
 			// for mono we don't reposition, we want our center position.
@@ -374,7 +374,7 @@ Transform MobileVRInterface::get_transform_for_eye(ARVRInterface::Eyes p_eye, co
 		hmd_transform.basis = orientation;
 		hmd_transform.origin = Vector3(0.0, eye_height * world_scale, 0.0);
 
-		transform_for_eye = p_cam_transform * (arvr_server->get_reference_frame()) * hmd_transform * transform_for_eye;
+		transform_for_eye = p_cam_transform * (xr_server->get_reference_frame()) * hmd_transform * transform_for_eye;
 	} else {
 		// huh? well just return what we got....
 		transform_for_eye = p_cam_transform;
@@ -383,12 +383,12 @@ Transform MobileVRInterface::get_transform_for_eye(ARVRInterface::Eyes p_eye, co
 	return transform_for_eye;
 };
 
-CameraMatrix MobileVRInterface::get_projection_for_eye(ARVRInterface::Eyes p_eye, real_t p_aspect, real_t p_z_near, real_t p_z_far) {
+CameraMatrix MobileVRInterface::get_projection_for_eye(XRInterface::Eyes p_eye, real_t p_aspect, real_t p_z_near, real_t p_z_far) {
 	_THREAD_SAFE_METHOD_
 
 	CameraMatrix eye;
 
-	if (p_eye == ARVRInterface::EYE_MONO) {
+	if (p_eye == XRInterface::EYE_MONO) {
 		///@TODO for now hardcode some of this, what is really needed here is that this needs to be in sync with the real cameras properties
 		// which probably means implementing a specific class for iOS and Android. For now this is purely here as an example.
 		// Note also that if you use a normal viewport with AR/VR turned off you can still use the tracker output of this interface
@@ -396,13 +396,13 @@ CameraMatrix MobileVRInterface::get_projection_for_eye(ARVRInterface::Eyes p_eye
 		// This will make more sense when we implement ARkit on iOS (probably a separate interface).
 		eye.set_perspective(60.0, p_aspect, p_z_near, p_z_far, false);
 	} else {
-		eye.set_for_hmd(p_eye == ARVRInterface::EYE_LEFT ? 1 : 2, p_aspect, intraocular_dist, display_width, display_to_lens, oversample, p_z_near, p_z_far);
+		eye.set_for_hmd(p_eye == XRInterface::EYE_LEFT ? 1 : 2, p_aspect, intraocular_dist, display_width, display_to_lens, oversample, p_z_near, p_z_far);
 	};
 
 	return eye;
 };
 
-void MobileVRInterface::commit_for_eye(ARVRInterface::Eyes p_eye, RID p_render_target, const Rect2 &p_screen_rect) {
+void MobileVRInterface::commit_for_eye(XRInterface::Eyes p_eye, RID p_render_target, const Rect2 &p_screen_rect) {
 	_THREAD_SAFE_METHOD_
 
 	// We must have a valid render target
@@ -417,9 +417,9 @@ void MobileVRInterface::commit_for_eye(ARVRInterface::Eyes p_eye, RID p_render_t
 	// we output half a screen
 	dest.size.x *= 0.5;
 
-	if (p_eye == ARVRInterface::EYE_LEFT) {
+	if (p_eye == XRInterface::EYE_LEFT) {
 		eye_center.x = ((-intraocular_dist / 2.0) + (display_width / 4.0)) / (display_width / 2.0);
-	} else if (p_eye == ARVRInterface::EYE_RIGHT) {
+	} else if (p_eye == XRInterface::EYE_RIGHT) {
 		dest.position.x = dest.size.x;
 		eye_center.x = ((intraocular_dist / 2.0) - (display_width / 4.0)) / (display_width / 2.0);
 	}
diff --git a/modules/mobile_vr/mobile_vr_interface.h b/modules/mobile_vr/mobile_vr_interface.h
index c762c9b799..3a9ed1314a 100644
--- a/modules/mobile_vr/mobile_vr_interface.h
+++ b/modules/mobile_vr/mobile_vr_interface.h
@@ -31,8 +31,8 @@
 #ifndef MOBILE_VR_INTERFACE_H
 #define MOBILE_VR_INTERFACE_H
 
-#include "servers/arvr/arvr_interface.h"
-#include "servers/arvr/arvr_positional_tracker.h"
+#include "servers/xr/xr_interface.h"
+#include "servers/xr/xr_positional_tracker.h"
 
 /**
 	@author Bastiaan Olij <mux213@gmail.com>
@@ -47,8 +47,8 @@
 	more advanced interfaces.
 */
 
-class MobileVRInterface : public ARVRInterface {
-	GDCLASS(MobileVRInterface, ARVRInterface);
+class MobileVRInterface : public XRInterface {
+	GDCLASS(MobileVRInterface, XRInterface);
 
 private:
 	bool initialized;
@@ -137,9 +137,9 @@ public:
 
 	virtual Size2 get_render_targetsize();
 	virtual bool is_stereo();
-	virtual Transform get_transform_for_eye(ARVRInterface::Eyes p_eye, const Transform &p_cam_transform);
-	virtual CameraMatrix get_projection_for_eye(ARVRInterface::Eyes p_eye, real_t p_aspect, real_t p_z_near, real_t p_z_far);
-	virtual void commit_for_eye(ARVRInterface::Eyes p_eye, RID p_render_target, const Rect2 &p_screen_rect);
+	virtual Transform get_transform_for_eye(XRInterface::Eyes p_eye, const Transform &p_cam_transform);
+	virtual CameraMatrix get_projection_for_eye(XRInterface::Eyes p_eye, real_t p_aspect, real_t p_z_near, real_t p_z_far);
+	virtual void commit_for_eye(XRInterface::Eyes p_eye, RID p_render_target, const Rect2 &p_screen_rect);
 
 	virtual void process();
 	virtual void notification(int p_what);
diff --git a/modules/mobile_vr/register_types.cpp b/modules/mobile_vr/register_types.cpp
index faf6c3b151..75638d47c4 100644
--- a/modules/mobile_vr/register_types.cpp
+++ b/modules/mobile_vr/register_types.cpp
@@ -37,7 +37,7 @@ void register_mobile_vr_types() {
 
 	Ref<MobileVRInterface> mobile_vr;
 	mobile_vr.instance();
-	ARVRServer::get_singleton()->add_interface(mobile_vr);
+	XRServer::get_singleton()->add_interface(mobile_vr);
 }
 
 void unregister_mobile_vr_types() {