217 files changed, 1123 insertions, 1146 deletions

diff --git a/SConstruct b/SConstruct
index 693137f77f..373fd098af 100644
--- a/SConstruct
+++ b/SConstruct
@@ -126,7 +126,7 @@ opts.Add(BoolVariable("xaudio2", "Enable the XAudio2 audio driver", False))
 opts.Add(BoolVariable("verbose", "Enable verbose output for the compilation", False))
 opts.Add(BoolVariable("progress", "Show a progress indicator during compilation", True))
 opts.Add(EnumVariable("warnings", "Level of compilation warnings", "all", ("extra", "all", "moderate", "no")))
-opts.Add(BoolVariable("werror", "Treat compiler warnings as errors", False))
+opts.Add(BoolVariable("werror", "Treat compiler warnings as errors", True))
 opts.Add(BoolVariable("dev", "If yes, alias for verbose=yes warnings=extra werror=yes", False))
 opts.Add("extra_suffix", "Custom extra suffix added to the base filename of all generated binary files", "")
 opts.Add(BoolVariable("vsproj", "Generate a Visual Studio solution", False))
@@ -448,6 +448,8 @@ if selected_platform in platform_list:
             # FIXME: Temporary workaround after the Vulkan merge, remove once warnings are fixed.
             if methods.using_gcc(env):
                 env.Append(CXXFLAGS=["-Wno-error=cpp"])
+                if cc_version_major == 7:  # Bogus warning fixed in 8+.
+                    env.Append(CCFLAGS=["-Wno-error=strict-overflow"])
             else:
                 env.Append(CXXFLAGS=["-Wno-error=#warnings"])
         else:  # always enable those errors
diff --git a/doc/classes/@GlobalScope.xml b/doc/classes/@GlobalScope.xml
index 74c364bad5..8c6821eaac 100644
--- a/doc/classes/@GlobalScope.xml
+++ b/doc/classes/@GlobalScope.xml
@@ -36,8 +36,8 @@
 		<member name="IP" type="IP" setter="" getter="">
 			The [IP] singleton.
 		</member>
-		<member name="Input" type="Input" setter="" getter="">
-			The [Input] singleton.
+		<member name="Input" type="InputFilter" setter="" getter="">
+			The [InputFilter] singleton.
 		</member>
 		<member name="InputMap" type="InputMap" setter="" getter="">
 			The [InputMap] singleton.
@@ -56,14 +56,14 @@
 		<member name="Marshalls" type="Marshalls" setter="" getter="">
 			The [Marshalls] singleton.
 		</member>
-		<member name="Navigation2DServer" type="Navigation2DServer" setter="" getter="">
-			The [Navigation2DServer] singleton.
-		</member>
 		<member name="NavigationMeshGenerator" type="NavigationMeshGenerator" setter="" getter="">
 			The [NavigationMeshGenerator] singleton.
 		</member>
-		<member name="NavigationServer" type="NavigationServer" setter="" getter="">
-			The [NavigationServer] singleton.
+		<member name="NavigationServer2D" type="NavigationServer2D" setter="" getter="">
+			The [NavigationServer2D] singleton.
+		</member>
+		<member name="NavigationServer3D" type="NavigationServer3D" setter="" getter="">
+			The [NavigationServer2D] singleton.
 		</member>
 		<member name="OS" type="OS" setter="" getter="">
 			The [OS] singleton.
@@ -71,15 +71,18 @@
 		<member name="Performance" type="Performance" setter="" getter="">
 			The [Performance] singleton.
 		</member>
-		<member name="Physics2DServer" type="Physics2DServer" setter="" getter="">
-			The [Physics2DServer] singleton.
+		<member name="PhysicsServer2D" type="PhysicsServer2D" setter="" getter="">
+			The [PhysicsServer2D] singleton.
 		</member>
-		<member name="PhysicsServer" type="PhysicsServer" setter="" getter="">
-			The [PhysicsServer] singleton.
+		<member name="PhysicsServer3D" type="PhysicsServer3D" setter="" getter="">
+			The [PhysicsServer3D] singleton.
 		</member>
 		<member name="ProjectSettings" type="ProjectSettings" setter="" getter="">
 			The [ProjectSettings] singleton.
 		</member>
+		<member name="RenderingServer" type="RenderingServer" setter="" getter="">
+			The [RenderingServer] singleton.
+		</member>
 		<member name="ResourceLoader" type="ResourceLoader" setter="" getter="">
 			The [ResourceLoader] singleton.
 		</member>
@@ -92,9 +95,6 @@
 		<member name="VisualScriptEditor" type="VisualScriptEditor" setter="" getter="">
 			The [VisualScriptEditor] singleton.
 		</member>
-		<member name="VisualServer" type="VisualServer" setter="" getter="">
-			The [VisualServer] singleton.
-		</member>
 	</members>
 	<constants>
 		<constant name="MARGIN_LEFT" value="0" enum="Margin">
diff --git a/doc/classes/ARVRAnchor.xml b/doc/classes/ARVRAnchor.xml
index 87181f572d..82575ce7cb 100644
--- a/doc/classes/ARVRAnchor.xml
+++ b/doc/classes/ARVRAnchor.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ARVRAnchor" inherits="Spatial" version="4.0">
+<class name="ARVRAnchor" inherits="Node3D" version="4.0">
 	<brief_description>
 		An anchor point in AR space.
 	</brief_description>
diff --git a/doc/classes/ARVRCamera.xml b/doc/classes/ARVRCamera.xml
index a571d26c83..c97d5cf1d8 100644
--- a/doc/classes/ARVRCamera.xml
+++ b/doc/classes/ARVRCamera.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ARVRCamera" inherits="Camera" version="4.0">
+<class name="ARVRCamera" inherits="Camera3D" version="4.0">
 	<brief_description>
 		A camera node with a few overrules for AR/VR applied, such as location tracking.
 	</brief_description>
diff --git a/doc/classes/ARVRController.xml b/doc/classes/ARVRController.xml
index ebae25feb7..572b47ce6d 100644
--- a/doc/classes/ARVRController.xml
+++ b/doc/classes/ARVRController.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ARVRController" inherits="Spatial" version="4.0">
+<class name="ARVRController" inherits="Node3D" version="4.0">
 	<brief_description>
 		A spatial node representing a spatially-tracked controller.
 	</brief_description>
diff --git a/doc/classes/ARVROrigin.xml b/doc/classes/ARVROrigin.xml
index 9a386fd154..a88a89c927 100644
--- a/doc/classes/ARVROrigin.xml
+++ b/doc/classes/ARVROrigin.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ARVROrigin" inherits="Spatial" version="4.0">
+<class name="ARVROrigin" inherits="Node3D" version="4.0">
 	<brief_description>
 		The origin point in AR/VR.
 	</brief_description>
diff --git a/doc/classes/ARVRServer.xml b/doc/classes/ARVRServer.xml
index 6db7121858..d8d069c048 100644
--- a/doc/classes/ARVRServer.xml
+++ b/doc/classes/ARVRServer.xml
@@ -69,7 +69,7 @@
 			<return type="int">
 			</return>
 			<description>
-				Returns the absolute timestamp (in μs) of the last [ARVRServer] commit of the AR/VR eyes to [VisualServer]. The value comes from an internal call to [method OS.get_ticks_usec].
+				Returns the absolute timestamp (in μs) of the last [ARVRServer] commit of the AR/VR eyes to [RenderingServer]. The value comes from an internal call to [method OS.get_ticks_usec].
 			</description>
 		</method>
 		<method name="get_last_frame_usec">
diff --git a/doc/classes/AnimatedSprite.xml b/doc/classes/AnimatedSprite2D.xml
index b5c1d38ff9..8d0534ccd2 100644
--- a/doc/classes/AnimatedSprite.xml
+++ b/doc/classes/AnimatedSprite2D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AnimatedSprite" inherits="Node2D" version="4.0">
+<class name="AnimatedSprite2D" inherits="Node2D" version="4.0">
 	<brief_description>
 		Sprite node that can use multiple textures for animation.
 	</brief_description>
@@ -61,7 +61,7 @@
 			If [code]true[/code], the [member animation] is currently playing.
 		</member>
 		<member name="shininess" type="float" setter="set_shininess" getter="get_shininess" default="1.0">
-			Strength of the specular light effect of this [AnimatedSprite].
+			Strength of the specular light effect of this [AnimatedSprite2D].
 		</member>
 		<member name="specular_color" type="Color" setter="set_specular_color" getter="get_specular_color" default="Color( 1, 1, 1, 1 )">
 			The color of the specular light effect.
diff --git a/doc/classes/AnimatedTexture.xml b/doc/classes/AnimatedTexture.xml
index b851c76e59..80b910aaa7 100644
--- a/doc/classes/AnimatedTexture.xml
+++ b/doc/classes/AnimatedTexture.xml
@@ -4,7 +4,7 @@
 		Proxy texture for simple frame-based animations.
 	</brief_description>
 	<description>
-		[AnimatedTexture] is a resource format for frame-based animations, where multiple textures can be chained automatically with a predefined delay for each frame. Unlike [AnimationPlayer] or [AnimatedSprite], it isn't a [Node], but has the advantage of being usable anywhere a [Texture2D] resource can be used, e.g. in a [TileSet].
+		[AnimatedTexture] is a resource format for frame-based animations, where multiple textures can be chained automatically with a predefined delay for each frame. Unlike [AnimationPlayer] or [AnimatedSprite2D], it isn't a [Node], but has the advantage of being usable anywhere a [Texture2D] resource can be used, e.g. in a [TileSet].
 		The playback of the animation is controlled by the [member fps] property as well as each frame's optional delay (see [method set_frame_delay]). The animation loops, i.e. it will restart at frame 0 automatically after playing the last frame.
 		[AnimatedTexture] currently requires all frame textures to have the same size, otherwise the bigger ones will be cropped to match the smallest one. Also, it doesn't support [AtlasTexture]. Each frame needs to be separate image.
 	</description>
@@ -71,7 +71,7 @@
 	</members>
 	<constants>
 		<constant name="MAX_FRAMES" value="256">
-			The maximum number of frames supported by [AnimatedTexture]. If you need more frames in your animation, use [AnimationPlayer] or [AnimatedSprite].
+			The maximum number of frames supported by [AnimatedTexture]. If you need more frames in your animation, use [AnimationPlayer] or [AnimatedSprite2D].
 		</constant>
 	</constants>
 </class>
diff --git a/doc/classes/Area.xml b/doc/classes/Area3D.xml
index b273a7a9d9..1adfc878e2 100644
--- a/doc/classes/Area.xml
+++ b/doc/classes/Area3D.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Area" inherits="CollisionObject" version="4.0">
+<class name="Area3D" inherits="CollisionObject3D" version="4.0">
 	<brief_description>
 		General-purpose area node for detection and 3D physics influence.
 	</brief_description>
 	<description>
-		3D area that detects [CollisionObject] nodes overlapping, entering, or exiting. Can also alter or override local physics parameters (gravity, damping).
+		3D area that detects [CollisionObject3D] nodes overlapping, entering, or exiting. Can also alter or override local physics parameters (gravity, damping).
 	</description>
 	<tutorials>
 	</tutorials>
@@ -31,14 +31,14 @@
 			<return type="Array">
 			</return>
 			<description>
-				Returns a list of intersecting [Area]s. For performance reasons (collisions are all processed at the same time) this list is modified once during the physics step, not immediately after objects are moved. Consider using signals instead.
+				Returns a list of intersecting [Area3D]s. For performance reasons (collisions are all processed at the same time) this list is modified once during the physics step, not immediately after objects are moved. Consider using signals instead.
 			</description>
 		</method>
 		<method name="get_overlapping_bodies" qualifiers="const">
 			<return type="Array">
 			</return>
 			<description>
-				Returns a list of intersecting [PhysicsBody]s. For performance reasons (collisions are all processed at the same time) this list is modified once during the physics step, not immediately after objects are moved. Consider using signals instead.
+				Returns a list of intersecting [PhysicsBody3D]s. For performance reasons (collisions are all processed at the same time) this list is modified once during the physics step, not immediately after objects are moved. Consider using signals instead.
 			</description>
 		</method>
 		<method name="overlaps_area" qualifiers="const">
@@ -47,7 +47,7 @@
 			<argument index="0" name="area" type="Node">
 			</argument>
 			<description>
-				If [code]true[/code], the given area overlaps the Area.
+				If [code]true[/code], the given area overlaps the Area3D.
 				[b]Note:[/b] The result of this test is not immediate after moving objects. For performance, list of overlaps is updated once per frame and before the physics step. Consider using signals instead.
 			</description>
 		</method>
@@ -57,9 +57,9 @@
 			<argument index="0" name="body" type="Node">
 			</argument>
 			<description>
-				If [code]true[/code], the given physics body overlaps the Area.
+				If [code]true[/code], the given physics body overlaps the Area3D.
 				[b]Note:[/b] The result of this test is not immediate after moving objects. For performance, list of overlaps is updated once per frame and before the physics step. Consider using signals instead.
-				The [code]body[/code] argument can either be a [PhysicsBody] or a [GridMap] instance (while GridMaps are not physics body themselves, they register their tiles with collision shapes as a virtual physics body).
+				The [code]body[/code] argument can either be a [PhysicsBody3D] or a [GridMap] instance (while GridMaps are not physics body themselves, they register their tiles with collision shapes as a virtual physics body).
 			</description>
 		</method>
 		<method name="set_collision_layer_bit">
@@ -70,7 +70,7 @@
 			<argument index="1" name="value" type="bool">
 			</argument>
 			<description>
-				Set/clear individual bits on the layer mask. This simplifies editing this [Area]'s layers.
+				Set/clear individual bits on the layer mask. This simplifies editing this [Area3D]'s layers.
 			</description>
 		</method>
 		<method name="set_collision_mask_bit">
@@ -81,7 +81,7 @@
 			<argument index="1" name="value" type="bool">
 			</argument>
 			<description>
-				Set/clear individual bits on the collision mask. This simplifies editing which [Area] layers this [Area] scans.
+				Set/clear individual bits on the collision mask. This simplifies editing which [Area3D] layers this [Area3D] scans.
 			</description>
 		</method>
 	</methods>
@@ -137,20 +137,20 @@
 		<member name="reverb_bus_uniformity" type="float" setter="set_reverb_uniformity" getter="get_reverb_uniformity" default="0.0">
 			The degree to which this area's reverb is a uniform effect. Ranges from [code]0[/code] to [code]1[/code] with [code]0.1[/code] precision.
 		</member>
-		<member name="space_override" type="int" setter="set_space_override_mode" getter="get_space_override_mode" enum="Area.SpaceOverride" default="0">
+		<member name="space_override" type="int" setter="set_space_override_mode" getter="get_space_override_mode" enum="Area3D.SpaceOverride" default="0">
 			Override mode for gravity and damping calculations within this area. See [enum SpaceOverride] for possible values.
 		</member>
 	</members>
 	<signals>
 		<signal name="area_entered">
-			<argument index="0" name="area" type="Area">
+			<argument index="0" name="area" type="Area3D">
 			</argument>
 			<description>
 				Emitted when another area enters.
 			</description>
 		</signal>
 		<signal name="area_exited">
-			<argument index="0" name="area" type="Area">
+			<argument index="0" name="area" type="Area3D">
 			</argument>
 			<description>
 				Emitted when another area exits.
@@ -159,7 +159,7 @@
 		<signal name="area_shape_entered">
 			<argument index="0" name="area_id" type="int">
 			</argument>
-			<argument index="1" name="area" type="Area">
+			<argument index="1" name="area" type="Area3D">
 			</argument>
 			<argument index="2" name="area_shape" type="int">
 			</argument>
@@ -172,7 +172,7 @@
 		<signal name="area_shape_exited">
 			<argument index="0" name="area_id" type="int">
 			</argument>
-			<argument index="1" name="area" type="Area">
+			<argument index="1" name="area" type="Area3D">
 			</argument>
 			<argument index="2" name="area_shape" type="int">
 			</argument>
@@ -187,7 +187,7 @@
 			</argument>
 			<description>
 				Emitted when a physics body enters.
-				The [code]body[/code] argument can either be a [PhysicsBody] or a [GridMap] instance (while GridMaps are not physics body themselves, they register their tiles with collision shapes as a virtual physics body).
+				The [code]body[/code] argument can either be a [PhysicsBody3D] or a [GridMap] instance (while GridMaps are not physics body themselves, they register their tiles with collision shapes as a virtual physics body).
 			</description>
 		</signal>
 		<signal name="body_exited">
@@ -195,7 +195,7 @@
 			</argument>
 			<description>
 				Emitted when a physics body exits.
-				The [code]body[/code] argument can either be a [PhysicsBody] or a [GridMap] instance (while GridMaps are not physics body themselves, they register their tiles with collision shapes as a virtual physics body).
+				The [code]body[/code] argument can either be a [PhysicsBody3D] or a [GridMap] instance (while GridMaps are not physics body themselves, they register their tiles with collision shapes as a virtual physics body).
 			</description>
 		</signal>
 		<signal name="body_shape_entered">
@@ -209,7 +209,7 @@
 			</argument>
 			<description>
 				Emitted when a physics body enters, reporting which shapes overlapped.
-				The [code]body[/code] argument can either be a [PhysicsBody] or a [GridMap] instance (while GridMaps are not physics body themselves, they register their tiles with collision shapes as a virtual physics body).
+				The [code]body[/code] argument can either be a [PhysicsBody3D] or a [GridMap] instance (while GridMaps are not physics body themselves, they register their tiles with collision shapes as a virtual physics body).
 			</description>
 		</signal>
 		<signal name="body_shape_exited">
@@ -223,7 +223,7 @@
 			</argument>
 			<description>
 				Emitted when a physics body exits, reporting which shapes were overlapping.
-				The [code]body[/code] argument can either be a [PhysicsBody] or a [GridMap] instance (while GridMaps are not physics body themselves, they register their tiles with collision shapes as a virtual physics body).
+				The [code]body[/code] argument can either be a [PhysicsBody3D] or a [GridMap] instance (while GridMaps are not physics body themselves, they register their tiles with collision shapes as a virtual physics body).
 			</description>
 		</signal>
 	</signals>
diff --git a/doc/classes/ArrayMesh.xml b/doc/classes/ArrayMesh.xml
index 47abd2e996..9e742ea581 100644
--- a/doc/classes/ArrayMesh.xml
+++ b/doc/classes/ArrayMesh.xml
@@ -18,10 +18,10 @@
 		arrays[ArrayMesh.ARRAY_VERTEX] = vertices
 		# Create the Mesh.
 		arr_mesh.add_surface_from_arrays(Mesh.PRIMITIVE_TRIANGLES, arrays)
-		var m = MeshInstance.new()
+		var m = MeshInstance3D.new()
 		m.mesh = arr_mesh
 		[/codeblock]
-		The [MeshInstance] is ready to be added to the [SceneTree] to be shown.
+		The [MeshInstance3D] is ready to be added to the [SceneTree] to be shown.
 	</description>
 	<tutorials>
 		<link>https://docs.godotengine.org/en/latest/tutorials/content/procedural_geometry/arraymesh.html</link>
diff --git a/doc/classes/AudioStreamPlayer3D.xml b/doc/classes/AudioStreamPlayer3D.xml
index 4ec8dba2c6..3eeb524e9c 100644
--- a/doc/classes/AudioStreamPlayer3D.xml
+++ b/doc/classes/AudioStreamPlayer3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AudioStreamPlayer3D" inherits="Spatial" version="4.0">
+<class name="AudioStreamPlayer3D" inherits="Node3D" version="4.0">
 	<brief_description>
 		Plays 3D sound in 3D space.
 	</brief_description>
diff --git a/doc/classes/BaseMaterial3D.xml b/doc/classes/BaseMaterial3D.xml
index 380e739f46..bffaf91e1d 100644
--- a/doc/classes/BaseMaterial3D.xml
+++ b/doc/classes/BaseMaterial3D.xml
@@ -634,8 +634,8 @@
 			The object's X axis will always face the camera.
 		</constant>
 		<constant name="BILLBOARD_PARTICLES" value="3" enum="BillboardMode">
-			Used for particle systems when assigned to [Particles] and [CPUParticles] nodes. Enables [code]particles_anim_*[/code] properties.
-			The [member ParticlesMaterial.anim_speed] or [member CPUParticles.anim_speed] should also be set to a positive value for the animation to play.
+			Used for particle systems when assigned to [GPUParticles3D] and [CPUParticles3D] nodes. Enables [code]particles_anim_*[/code] properties.
+			The [member ParticlesMaterial.anim_speed] or [member CPUParticles3D.anim_speed] should also be set to a positive value for the animation to play.
 		</constant>
 		<constant name="TEXTURE_CHANNEL_RED" value="0" enum="TextureChannel">
 			Used to read from the red channel of a texture.
diff --git a/doc/classes/BoneAttachment.xml b/doc/classes/BoneAttachment3D.xml
index d15322254b..ab1e5b17d9 100644
--- a/doc/classes/BoneAttachment.xml
+++ b/doc/classes/BoneAttachment3D.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="BoneAttachment" inherits="Spatial" version="4.0">
+<class name="BoneAttachment3D" inherits="Node3D" version="4.0">
 	<brief_description>
 		A node that will attach to a bone.
 	</brief_description>
 	<description>
-		This node must be the child of a [Skeleton] node. You can then select a bone for this node to attach to. The BoneAttachment node will copy the transform of the selected bone.
+		This node must be the child of a [Skeleton3D] node. You can then select a bone for this node to attach to. The BoneAttachment3D node will copy the transform of the selected bone.
 	</description>
 	<tutorials>
 	</tutorials>
diff --git a/doc/classes/BoxShape.xml b/doc/classes/BoxShape3D.xml
index 3a5f05ef79..fd08da148d 100644
--- a/doc/classes/BoxShape.xml
+++ b/doc/classes/BoxShape3D.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="BoxShape" inherits="Shape" version="4.0">
+<class name="BoxShape3D" inherits="Shape3D" version="4.0">
 	<brief_description>
 		Box shape resource.
 	</brief_description>
 	<description>
-		3D box shape that can be a child of a [PhysicsBody] or [Area].
+		3D box shape that can be a child of a [PhysicsBody3D] or [Area3D].
 	</description>
 	<tutorials>
 	</tutorials>
diff --git a/doc/classes/CPUParticles2D.xml b/doc/classes/CPUParticles2D.xml
index 799ba32075..c2b821699d 100644
--- a/doc/classes/CPUParticles2D.xml
+++ b/doc/classes/CPUParticles2D.xml
@@ -5,7 +5,7 @@
 	</brief_description>
 	<description>
 		CPU-based 2D particle node used to create a variety of particle systems and effects.
-		See also [Particles2D], which provides the same functionality with hardware acceleration, but may not run on older devices.
+		See also [GPUParticles2D], which provides the same functionality with hardware acceleration, but may not run on older devices.
 	</description>
 	<tutorials>
 		<link>https://docs.godotengine.org/en/latest/tutorials/2d/particle_systems_2d.html</link>
@@ -17,7 +17,7 @@
 			<argument index="0" name="particles" type="Node">
 			</argument>
 			<description>
-				Sets this node's properties to match a given [Particles2D] node with an assigned [ParticlesMaterial].
+				Sets this node's properties to match a given [GPUParticles2D] node with an assigned [ParticlesMaterial].
 			</description>
 		</method>
 		<method name="get_param" qualifiers="const">
diff --git a/doc/classes/CPUParticles.xml b/doc/classes/CPUParticles3D.xml
index 6a6525e99a..07da066bd9 100644
--- a/doc/classes/CPUParticles.xml
+++ b/doc/classes/CPUParticles3D.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="CPUParticles" inherits="GeometryInstance" version="4.0">
+<class name="CPUParticles3D" inherits="GeometryInstance3D" version="4.0">
 	<brief_description>
 		CPU-based 3D particle emitter.
 	</brief_description>
 	<description>
 		CPU-based 3D particle node used to create a variety of particle systems and effects.
-		See also [Particles], which provides the same functionality with hardware acceleration, but may not run on older devices.
+		See also [GPUParticles3D], which provides the same functionality with hardware acceleration, but may not run on older devices.
 	</description>
 	<tutorials>
 	</tutorials>
@@ -16,13 +16,13 @@
 			<argument index="0" name="particles" type="Node">
 			</argument>
 			<description>
-				Sets this node's properties to match a given [Particles] node with an assigned [ParticlesMaterial].
+				Sets this node's properties to match a given [GPUParticles3D] node with an assigned [ParticlesMaterial].
 			</description>
 		</method>
 		<method name="get_param" qualifiers="const">
 			<return type="float">
 			</return>
-			<argument index="0" name="param" type="int" enum="CPUParticles.Parameter">
+			<argument index="0" name="param" type="int" enum="CPUParticles3D.Parameter">
 			</argument>
 			<description>
 				Returns the base value of the parameter specified by [enum Parameter].
@@ -31,7 +31,7 @@
 		<method name="get_param_curve" qualifiers="const">
 			<return type="Curve">
 			</return>
-			<argument index="0" name="param" type="int" enum="CPUParticles.Parameter">
+			<argument index="0" name="param" type="int" enum="CPUParticles3D.Parameter">
 			</argument>
 			<description>
 				Returns the [Curve] of the parameter specified by [enum Parameter].
@@ -40,7 +40,7 @@
 		<method name="get_param_randomness" qualifiers="const">
 			<return type="float">
 			</return>
-			<argument index="0" name="param" type="int" enum="CPUParticles.Parameter">
+			<argument index="0" name="param" type="int" enum="CPUParticles3D.Parameter">
 			</argument>
 			<description>
 				Returns the randomness factor of the parameter specified by [enum Parameter].
@@ -49,7 +49,7 @@
 		<method name="get_particle_flag" qualifiers="const">
 			<return type="bool">
 			</return>
-			<argument index="0" name="flag" type="int" enum="CPUParticles.Flags">
+			<argument index="0" name="flag" type="int" enum="CPUParticles3D.Flags">
 			</argument>
 			<description>
 				Returns the enabled state of the given flag (see [enum Flags] for options).
@@ -65,7 +65,7 @@
 		<method name="set_param">
 			<return type="void">
 			</return>
-			<argument index="0" name="param" type="int" enum="CPUParticles.Parameter">
+			<argument index="0" name="param" type="int" enum="CPUParticles3D.Parameter">
 			</argument>
 			<argument index="1" name="value" type="float">
 			</argument>
@@ -76,7 +76,7 @@
 		<method name="set_param_curve">
 			<return type="void">
 			</return>
-			<argument index="0" name="param" type="int" enum="CPUParticles.Parameter">
+			<argument index="0" name="param" type="int" enum="CPUParticles3D.Parameter">
 			</argument>
 			<argument index="1" name="curve" type="Curve">
 			</argument>
@@ -87,7 +87,7 @@
 		<method name="set_param_randomness">
 			<return type="void">
 			</return>
-			<argument index="0" name="param" type="int" enum="CPUParticles.Parameter">
+			<argument index="0" name="param" type="int" enum="CPUParticles3D.Parameter">
 			</argument>
 			<argument index="1" name="randomness" type="float">
 			</argument>
@@ -98,7 +98,7 @@
 		<method name="set_particle_flag">
 			<return type="void">
 			</return>
-			<argument index="0" name="flag" type="int" enum="CPUParticles.Flags">
+			<argument index="0" name="flag" type="int" enum="CPUParticles3D.Flags">
 			</argument>
 			<argument index="1" name="enable" type="bool">
 			</argument>
@@ -165,7 +165,7 @@
 		<member name="direction" type="Vector3" setter="set_direction" getter="get_direction" default="Vector3( 1, 0, 0 )">
 			Unit vector specifying the particles' emission direction.
 		</member>
-		<member name="draw_order" type="int" setter="set_draw_order" getter="get_draw_order" enum="CPUParticles.DrawOrder" default="0">
+		<member name="draw_order" type="int" setter="set_draw_order" getter="get_draw_order" enum="CPUParticles3D.DrawOrder" default="0">
 			Particle draw order. Uses [enum DrawOrder] values.
 		</member>
 		<member name="emission_box_extents" type="Vector3" setter="set_emission_box_extents" getter="get_emission_box_extents">
@@ -180,7 +180,7 @@
 		<member name="emission_points" type="PackedVector3Array" setter="set_emission_points" getter="get_emission_points" default="PackedVector3Array(  )">
 			Sets the initial positions to spawn particles when using [constant EMISSION_SHAPE_POINTS] or [constant EMISSION_SHAPE_DIRECTED_POINTS].
 		</member>
-		<member name="emission_shape" type="int" setter="set_emission_shape" getter="get_emission_shape" enum="CPUParticles.EmissionShape" default="0">
+		<member name="emission_shape" type="int" setter="set_emission_shape" getter="get_emission_shape" enum="CPUParticles3D.EmissionShape" default="0">
 			Particles will be emitted inside this region. See [enum EmissionShape] for possible values.
 		</member>
 		<member name="emission_sphere_radius" type="float" setter="set_emission_sphere_radius" getter="get_emission_sphere_radius">
diff --git a/doc/classes/Camera.xml b/doc/classes/Camera3D.xml
index 6097721cbd..bfba23c7ee 100644
--- a/doc/classes/Camera.xml
+++ b/doc/classes/Camera3D.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Camera" inherits="Spatial" version="4.0">
+<class name="Camera3D" inherits="Node3D" version="4.0">
 	<brief_description>
 		Camera node, displays from a point of view.
 	</brief_description>
 	<description>
-		Camera is a special node that displays what is visible from its current location. Cameras register themselves in the nearest [Viewport] node (when ascending the tree). Only one camera can be active per viewport. If no viewport is available ascending the tree, the camera will register in the global viewport. In other words, a camera just provides 3D display capabilities to a [Viewport], and, without one, a scene registered in that [Viewport] (or higher viewports) can't be displayed.
+		[Camera3D] is a special node that displays what is visible from its current location. Cameras register themselves in the nearest [Viewport] node (when ascending the tree). Only one camera can be active per viewport. If no viewport is available ascending the tree, the camera will register in the global viewport. In other words, a camera just provides 3D display capabilities to a [Viewport], and, without one, a scene registered in that [Viewport] (or higher viewports) can't be displayed.
 	</description>
 	<tutorials>
 	</tutorials>
@@ -22,14 +22,14 @@
 			<return type="RID">
 			</return>
 			<description>
-				Returns the camera's RID from the [VisualServer].
+				Returns the camera's RID from the [RenderingServer].
 			</description>
 		</method>
 		<method name="get_camera_transform" qualifiers="const">
 			<return type="Transform">
 			</return>
 			<description>
-				Gets the camera transform. Subclassed cameras such as [InterpolatedCamera] may provide different transforms than the [Node] transform.
+				Gets the camera transform. Subclassed cameras such as [ClippedCamera3D] may provide different transforms than the [Node] transform.
 			</description>
 		</method>
 		<method name="get_cull_mask_bit" qualifiers="const">
@@ -172,7 +172,7 @@
 		<member name="current" type="bool" setter="set_current" getter="is_current" default="false">
 			If [code]true[/code], the ancestor [Viewport] is currently using this camera.
 		</member>
-		<member name="doppler_tracking" type="int" setter="set_doppler_tracking" getter="get_doppler_tracking" enum="Camera.DopplerTracking" default="0">
+		<member name="doppler_tracking" type="int" setter="set_doppler_tracking" getter="get_doppler_tracking" enum="Camera3D.DopplerTracking" default="0">
 			If not [constant DOPPLER_TRACKING_DISABLED], this camera will simulate the [url=https://en.wikipedia.org/wiki/Doppler_effect]Doppler effect[/url] for objects changed in particular [code]_process[/code] methods. See [enum DopplerTracking] for possible values.
 		</member>
 		<member name="effects" type="CameraEffects" setter="set_effects" getter="get_effects">
@@ -192,13 +192,13 @@
 		<member name="h_offset" type="float" setter="set_h_offset" getter="get_h_offset" default="0.0">
 			The horizontal (X) offset of the camera viewport.
 		</member>
-		<member name="keep_aspect" type="int" setter="set_keep_aspect_mode" getter="get_keep_aspect_mode" enum="Camera.KeepAspect" default="1">
+		<member name="keep_aspect" type="int" setter="set_keep_aspect_mode" getter="get_keep_aspect_mode" enum="Camera3D.KeepAspect" default="1">
 			The axis to lock during [member fov]/[member size] adjustments. Can be either [constant KEEP_WIDTH] or [constant KEEP_HEIGHT].
 		</member>
 		<member name="near" type="float" setter="set_znear" getter="get_znear" default="0.05">
 			The distance to the near culling boundary for this camera relative to its local Z axis.
 		</member>
-		<member name="projection" type="int" setter="set_projection" getter="get_projection" enum="Camera.Projection" default="0">
+		<member name="projection" type="int" setter="set_projection" getter="get_projection" enum="Camera3D.Projection" default="0">
 			The camera's projection mode. In [constant PROJECTION_PERSPECTIVE] mode, objects' Z distance from the camera's local space scales their perceived size.
 		</member>
 		<member name="size" type="float" setter="set_size" getter="get_size" default="1.0">
diff --git a/doc/classes/CanvasItem.xml b/doc/classes/CanvasItem.xml
index 73ba8b392f..f2ce2a6fb9 100644
--- a/doc/classes/CanvasItem.xml
+++ b/doc/classes/CanvasItem.xml
@@ -426,7 +426,7 @@
 			<return type="RID">
 			</return>
 			<description>
-				Returns the canvas item RID used by [VisualServer] for this item.
+				Returns the canvas item RID used by [RenderingServer] for this item.
 			</description>
 		</method>
 		<method name="get_canvas_transform" qualifiers="const">
diff --git a/doc/classes/CanvasItemMaterial.xml b/doc/classes/CanvasItemMaterial.xml
index ffe2272260..c2d44c1d17 100644
--- a/doc/classes/CanvasItemMaterial.xml
+++ b/doc/classes/CanvasItemMaterial.xml
@@ -18,7 +18,7 @@
 			The manner in which material reacts to lighting.
 		</member>
 		<member name="particles_anim_h_frames" type="int" setter="set_particles_anim_h_frames" getter="get_particles_anim_h_frames">
-			The number of columns in the spritesheet assigned as [Texture2D] for a [Particles2D] or [CPUParticles2D].
+			The number of columns in the spritesheet assigned as [Texture2D] for a [GPUParticles2D] or [CPUParticles2D].
 			[b]Note:[/b] This property is only used and visible in the editor if [member particles_animation] is [code]true[/code].
 		</member>
 		<member name="particles_anim_loop" type="bool" setter="set_particles_anim_loop" getter="get_particles_anim_loop">
@@ -26,11 +26,11 @@
 			[b]Note:[/b] This property is only used and visible in the editor if [member particles_animation] is [code]true[/code].
 		</member>
 		<member name="particles_anim_v_frames" type="int" setter="set_particles_anim_v_frames" getter="get_particles_anim_v_frames">
-			The number of rows in the spritesheet assigned as [Texture2D] for a [Particles2D] or [CPUParticles2D].
+			The number of rows in the spritesheet assigned as [Texture2D] for a [GPUParticles2D] or [CPUParticles2D].
 			[b]Note:[/b] This property is only used and visible in the editor if [member particles_animation] is [code]true[/code].
 		</member>
 		<member name="particles_animation" type="bool" setter="set_particles_animation" getter="get_particles_animation" default="false">
-			If [code]true[/code], enable spritesheet-based animation features when assigned to [Particles2D] and [CPUParticles2D] nodes. The [member ParticlesMaterial.anim_speed] or [member CPUParticles2D.anim_speed] should also be set to a positive value for the animation to play.
+			If [code]true[/code], enable spritesheet-based animation features when assigned to [GPUParticles2D] and [CPUParticles2D] nodes. The [member ParticlesMaterial.anim_speed] or [member CPUParticles2D.anim_speed] should also be set to a positive value for the animation to play.
 			This property (and other [code]particles_anim_*[/code] properties that depend on it) has no effect on other types of nodes.
 		</member>
 	</members>
diff --git a/doc/classes/CapsuleShape.xml b/doc/classes/CapsuleShape3D.xml
index c83e832281..f56d94dc63 100644
--- a/doc/classes/CapsuleShape.xml
+++ b/doc/classes/CapsuleShape3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="CapsuleShape" inherits="Shape" version="4.0">
+<class name="CapsuleShape3D" inherits="Shape3D" version="4.0">
 	<brief_description>
 		Capsule shape for collisions.
 	</brief_description>
diff --git a/doc/classes/ClippedCamera.xml b/doc/classes/ClippedCamera3D.xml
index 4cdc098c2f..58ecec828d 100644
--- a/doc/classes/ClippedCamera.xml
+++ b/doc/classes/ClippedCamera3D.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ClippedCamera" inherits="Camera" version="4.0">
+<class name="ClippedCamera3D" inherits="Camera3D" version="4.0">
 	<brief_description>
-		A [Camera] that includes collision.
+		A [Camera3D] that includes collision.
 	</brief_description>
 	<description>
-		This node extends [Camera] to add collisions with [Area] and/or [PhysicsBody] nodes. The camera cannot move through colliding objects.
+		This node extends [Camera3D] to add collisions with [Area3D] and/or [PhysicsBody3D] nodes. The camera cannot move through colliding objects.
 	</description>
 	<tutorials>
 	</tutorials>
@@ -84,10 +84,10 @@
 	</methods>
 	<members>
 		<member name="clip_to_areas" type="bool" setter="set_clip_to_areas" getter="is_clip_to_areas_enabled" default="false">
-			If [code]true[/code], the camera stops on contact with [Area]s.
+			If [code]true[/code], the camera stops on contact with [Area3D]s.
 		</member>
 		<member name="clip_to_bodies" type="bool" setter="set_clip_to_bodies" getter="is_clip_to_bodies_enabled" default="true">
-			If [code]true[/code], the camera stops on contact with [PhysicsBody]s.
+			If [code]true[/code], the camera stops on contact with [PhysicsBody3D]s.
 		</member>
 		<member name="collision_mask" type="int" setter="set_collision_mask" getter="get_collision_mask" default="1">
 			The camera's collision mask. Only objects in at least one collision layer matching the mask will be detected.
@@ -95,7 +95,7 @@
 		<member name="margin" type="float" setter="set_margin" getter="get_margin" default="0.0">
 			The camera's collision margin. The camera can't get closer than this distance to a colliding object.
 		</member>
-		<member name="process_mode" type="int" setter="set_process_mode" getter="get_process_mode" enum="ClippedCamera.ProcessMode" default="0">
+		<member name="process_mode" type="int" setter="set_process_mode" getter="get_process_mode" enum="ClippedCamera3D.ProcessMode" default="0">
 			The camera's process callback. See [enum ProcessMode].
 		</member>
 	</members>
diff --git a/doc/classes/CollisionObject.xml b/doc/classes/CollisionObject3D.xml
index 34758d71b2..f8e897653d 100644
--- a/doc/classes/CollisionObject.xml
+++ b/doc/classes/CollisionObject3D.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="CollisionObject" inherits="Spatial" version="4.0">
+<class name="CollisionObject3D" inherits="Node3D" version="4.0">
 	<brief_description>
 		Base node for collision objects.
 	</brief_description>
 	<description>
-		CollisionObject is the base class for physics objects. It can hold any number of collision [Shape]s. Each shape must be assigned to a [i]shape owner[/i]. The CollisionObject can have any number of shape owners. Shape owners are not nodes and do not appear in the editor, but are accessible through code using the [code]shape_owner_*[/code] methods.
+		CollisionObject3D is the base class for physics objects. It can hold any number of collision [Shape3D]s. Each shape must be assigned to a [i]shape owner[/i]. The CollisionObject3D can have any number of shape owners. Shape owners are not nodes and do not appear in the editor, but are accessible through code using the [code]shape_owner_*[/code] methods.
 	</description>
 	<tutorials>
 	</tutorials>
@@ -23,7 +23,7 @@
 			<argument index="4" name="shape_idx" type="int">
 			</argument>
 			<description>
-				Accepts unhandled [InputEvent]s. [code]click_position[/code] is the clicked location in world space and [code]click_normal[/code] is the normal vector extending from the clicked surface of the [Shape] at [code]shape_idx[/code]. Connect to the [code]input_event[/code] signal to easily pick up these events.
+				Accepts unhandled [InputEvent]s. [code]click_position[/code] is the clicked location in world space and [code]click_normal[/code] is the normal vector extending from the clicked surface of the [Shape3D] at [code]shape_idx[/code]. Connect to the [code]input_event[/code] signal to easily pick up these events.
 			</description>
 		</method>
 		<method name="create_shape_owner">
@@ -81,10 +81,10 @@
 			</return>
 			<argument index="0" name="owner_id" type="int">
 			</argument>
-			<argument index="1" name="shape" type="Shape">
+			<argument index="1" name="shape" type="Shape3D">
 			</argument>
 			<description>
-				Adds a [Shape] to the shape owner.
+				Adds a [Shape3D] to the shape owner.
 			</description>
 		</method>
 		<method name="shape_owner_clear_shapes">
@@ -106,14 +106,14 @@
 			</description>
 		</method>
 		<method name="shape_owner_get_shape" qualifiers="const">
-			<return type="Shape">
+			<return type="Shape3D">
 			</return>
 			<argument index="0" name="owner_id" type="int">
 			</argument>
 			<argument index="1" name="shape_id" type="int">
 			</argument>
 			<description>
-				Returns the [Shape] with the given id from the given shape owner.
+				Returns the [Shape3D] with the given id from the given shape owner.
 			</description>
 		</method>
 		<method name="shape_owner_get_shape_count" qualifiers="const">
@@ -133,7 +133,7 @@
 			<argument index="1" name="shape_id" type="int">
 			</argument>
 			<description>
-				Returns the child index of the [Shape] with the given id from the given shape owner.
+				Returns the child index of the [Shape3D] with the given id from the given shape owner.
 			</description>
 		</method>
 		<method name="shape_owner_get_transform" qualifiers="const">
@@ -181,10 +181,10 @@
 	</methods>
 	<members>
 		<member name="input_capture_on_drag" type="bool" setter="set_capture_input_on_drag" getter="get_capture_input_on_drag" default="false">
-			If [code]true[/code], the [CollisionObject] will continue to receive input events as the mouse is dragged across its shapes.
+			If [code]true[/code], the [CollisionObject3D] will continue to receive input events as the mouse is dragged across its shapes.
 		</member>
 		<member name="input_ray_pickable" type="bool" setter="set_ray_pickable" getter="is_ray_pickable" default="true">
-			If [code]true[/code], the [CollisionObject]'s shapes will respond to [RayCast]s.
+			If [code]true[/code], the [CollisionObject3D]'s shapes will respond to [RayCast3D]s.
 		</member>
 	</members>
 	<signals>
diff --git a/doc/classes/CollisionPolygon.xml b/doc/classes/CollisionPolygon3D.xml
index 8aceec17a8..dd3c57d1d0 100644
--- a/doc/classes/CollisionPolygon.xml
+++ b/doc/classes/CollisionPolygon3D.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="CollisionPolygon" inherits="Spatial" version="4.0">
+<class name="CollisionPolygon3D" inherits="Node3D" version="4.0">
 	<brief_description>
 		Editor-only class for defining a collision polygon in 3D space.
 	</brief_description>
 	<description>
-		Allows editing a collision polygon's vertices on a selected plane. Can also set a depth perpendicular to that plane. This class is only available in the editor. It will not appear in the scene tree at run-time. Creates a [Shape] for gameplay. Properties modified during gameplay will have no effect.
+		Allows editing a collision polygon's vertices on a selected plane. Can also set a depth perpendicular to that plane. This class is only available in the editor. It will not appear in the scene tree at run-time. Creates a [Shape3D] for gameplay. Properties modified during gameplay will have no effect.
 	</description>
 	<tutorials>
 	</tutorials>
diff --git a/doc/classes/CollisionShape.xml b/doc/classes/CollisionShape3D.xml
index 7787bf957d..76515a65a7 100644
--- a/doc/classes/CollisionShape.xml
+++ b/doc/classes/CollisionShape3D.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="CollisionShape" inherits="Spatial" version="4.0">
+<class name="CollisionShape3D" inherits="Node3D" version="4.0">
 	<brief_description>
 		Node that represents collision shape data in 3D space.
 	</brief_description>
 	<description>
-		Editor facility for creating and editing collision shapes in 3D space. You can use this node to represent all sorts of collision shapes, for example, add this to an [Area] to give it a detection shape, or add it to a [PhysicsBody] to create a solid object. [b]IMPORTANT[/b]: this is an Editor-only helper to create shapes, use [method CollisionObject.shape_owner_get_shape] to get the actual shape.
+		Editor facility for creating and editing collision shapes in 3D space. You can use this node to represent all sorts of collision shapes, for example, add this to an [Area3D] to give it a detection shape, or add it to a [PhysicsBody3D] to create a solid object. [b]IMPORTANT[/b]: this is an Editor-only helper to create shapes, use [method CollisionObject3D.shape_owner_get_shape] to get the actual shape.
 	</description>
 	<tutorials>
 		<link>https://docs.godotengine.org/en/latest/tutorials/physics/physics_introduction.html</link>
@@ -14,7 +14,7 @@
 			<return type="void">
 			</return>
 			<description>
-				Sets the collision shape's shape to the addition of all its convexed [MeshInstance] siblings geometry.
+				Sets the collision shape's shape to the addition of all its convexed [MeshInstance3D] siblings geometry.
 			</description>
 		</method>
 		<method name="resource_changed">
@@ -31,7 +31,7 @@
 		<member name="disabled" type="bool" setter="set_disabled" getter="is_disabled" default="false">
 			A disabled collision shape has no effect in the world.
 		</member>
-		<member name="shape" type="Shape" setter="set_shape" getter="get_shape">
+		<member name="shape" type="Shape3D" setter="set_shape" getter="get_shape">
 			The actual shape owned by this collision shape.
 		</member>
 	</members>
diff --git a/doc/classes/ConcavePolygonShape.xml b/doc/classes/ConcavePolygonShape3D.xml
index 47f2276c63..20402d350a 100644
--- a/doc/classes/ConcavePolygonShape.xml
+++ b/doc/classes/ConcavePolygonShape3D.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ConcavePolygonShape" inherits="Shape" version="4.0">
+<class name="ConcavePolygonShape3D" inherits="Shape3D" version="4.0">
 	<brief_description>
 		Concave polygon shape.
 	</brief_description>
 	<description>
-		Concave polygon shape resource, which can be set into a [PhysicsBody] or area. This shape is created by feeding a list of triangles.
-		Note: when used for collision, [ConcavePolygonShape] is intended to work with static [PhysicsBody] nodes like [StaticBody] and will not work with [KinematicBody] or [RigidBody] with a mode other than Static.
+		Concave polygon shape resource, which can be set into a [PhysicsBody3D] or area. This shape is created by feeding a list of triangles.
+		Note: when used for collision, [ConcavePolygonShape3D] is intended to work with static [PhysicsBody3D] nodes like [StaticBody3D] and will not work with [KinematicBody3D] or [RigidBody3D] with a mode other than Static.
 	</description>
 	<tutorials>
 	</tutorials>
diff --git a/doc/classes/ConeTwistJoint.xml b/doc/classes/ConeTwistJoint3D.xml
index 8682391a73..e86e95bec3 100644
--- a/doc/classes/ConeTwistJoint.xml
+++ b/doc/classes/ConeTwistJoint3D.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ConeTwistJoint" inherits="Joint" version="4.0">
+<class name="ConeTwistJoint3D" inherits="Joint3D" version="4.0">
 	<brief_description>
 		A twist joint between two 3D bodies.
 	</brief_description>
 	<description>
-		The joint can rotate the bodies across an axis defined by the local x-axes of the [Joint].
-		The twist axis is initiated as the X axis of the [Joint].
-		Once the Bodies swing, the twist axis is calculated as the middle of the x-axes of the Joint in the local space of the two Bodies.
+		The joint can rotate the bodies across an axis defined by the local x-axes of the [Joint3D].
+		The twist axis is initiated as the X axis of the [Joint3D].
+		Once the Bodies swing, the twist axis is calculated as the middle of the x-axes of the Joint3D in the local space of the two Bodies.
 	</description>
 	<tutorials>
 	</tutorials>
@@ -14,7 +14,7 @@
 		<method name="get_param" qualifiers="const">
 			<return type="float">
 			</return>
-			<argument index="0" name="param" type="int" enum="ConeTwistJoint.Param">
+			<argument index="0" name="param" type="int" enum="ConeTwistJoint3D.Param">
 			</argument>
 			<description>
 			</description>
@@ -22,7 +22,7 @@
 		<method name="set_param">
 			<return type="void">
 			</return>
-			<argument index="0" name="param" type="int" enum="ConeTwistJoint.Param">
+			<argument index="0" name="param" type="int" enum="ConeTwistJoint3D.Param">
 			</argument>
 			<argument index="1" name="value" type="float">
 			</argument>
@@ -44,7 +44,7 @@
 		<member name="swing_span" type="float" setter="_set_swing_span" getter="_get_swing_span" default="45.0">
 			Swing is rotation from side to side, around the axis perpendicular to the twist axis.
 			The swing span defines, how much rotation will not get corrected along the swing axis.
-			Could be defined as looseness in the [ConeTwistJoint].
+			Could be defined as looseness in the [ConeTwistJoint3D].
 			If below 0.05, this behavior is locked.
 		</member>
 		<member name="twist_span" type="float" setter="_set_twist_span" getter="_get_twist_span" default="180.0">
@@ -56,7 +56,7 @@
 		<constant name="PARAM_SWING_SPAN" value="0" enum="Param">
 			Swing is rotation from side to side, around the axis perpendicular to the twist axis.
 			The swing span defines, how much rotation will not get corrected along the swing axis.
-			Could be defined as looseness in the [ConeTwistJoint].
+			Could be defined as looseness in the [ConeTwistJoint3D].
 			If below 0.05, this behavior is locked.
 		</constant>
 		<constant name="PARAM_TWIST_SPAN" value="1" enum="Param">
diff --git a/doc/classes/ConfigFile.xml b/doc/classes/ConfigFile.xml
index a16326d55a..522d484131 100644
--- a/doc/classes/ConfigFile.xml
+++ b/doc/classes/ConfigFile.xml
@@ -8,7 +8,7 @@
 		[codeblock]
 		[section]
 		some_key=42
-		string_example="Hello World!"
+		string_example="Hello World3D!"
 		a_vector=Vector3( 1, 0, 2 )
 		[/codeblock]
 		The stored data can be saved to or parsed from a file, though ConfigFile objects can also be used directly without accessing the filesystem.
diff --git a/doc/classes/ConvexPolygonShape.xml b/doc/classes/ConvexPolygonShape3D.xml
index 077bb57a03..c036f80e2d 100644
--- a/doc/classes/ConvexPolygonShape.xml
+++ b/doc/classes/ConvexPolygonShape3D.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ConvexPolygonShape" inherits="Shape" version="4.0">
+<class name="ConvexPolygonShape3D" inherits="Shape3D" version="4.0">
 	<brief_description>
 		Convex polygon shape for 3D physics.
 	</brief_description>
 	<description>
-		Convex polygon shape resource, which can be added to a [PhysicsBody] or area.
+		Convex polygon shape resource, which can be added to a [PhysicsBody3D] or area.
 	</description>
 	<tutorials>
 	</tutorials>
diff --git a/doc/classes/Curve3D.xml b/doc/classes/Curve3D.xml
index 5024cdefbd..fe454d90cc 100644
--- a/doc/classes/Curve3D.xml
+++ b/doc/classes/Curve3D.xml
@@ -4,7 +4,7 @@
 		Describes a Bézier curve in 3D space.
 	</brief_description>
 	<description>
-		This class describes a Bézier curve in 3D space. It is mainly used to give a shape to a [Path], but can be manually sampled for other purposes.
+		This class describes a Bézier curve in 3D space. It is mainly used to give a shape to a [Path3D], but can be manually sampled for other purposes.
 		It keeps a cache of precalculated points along the curve, to speed up further calculations.
 	</description>
 	<tutorials>
@@ -223,7 +223,7 @@
 			</argument>
 			<description>
 				Sets the tilt angle in radians for the point [code]idx[/code]. If the index is out of bounds, the function sends an error to the console.
-				The tilt controls the rotation along the look-at axis an object traveling the path would have. In the case of a curve controlling a [PathFollow], this tilt is an offset over the natural tilt the [PathFollow] calculates.
+				The tilt controls the rotation along the look-at axis an object traveling the path would have. In the case of a curve controlling a [PathFollow3D], this tilt is an offset over the natural tilt the [PathFollow3D] calculates.
 			</description>
 		</method>
 		<method name="tessellate" qualifiers="const">
@@ -246,7 +246,7 @@
 			The distance in meters between two adjacent cached points. Changing it forces the cache to be recomputed the next time the [method get_baked_points] or [method get_baked_length] function is called. The smaller the distance, the more points in the cache and the more memory it will consume, so use with care.
 		</member>
 		<member name="up_vector_enabled" type="bool" setter="set_up_vector_enabled" getter="is_up_vector_enabled" default="true">
-			If [code]true[/code], the curve will bake up vectors used for orientation. This is used when [member PathFollow.rotation_mode] is set to [constant PathFollow.ROTATION_ORIENTED]. Changing it forces the cache to be recomputed.
+			If [code]true[/code], the curve will bake up vectors used for orientation. This is used when [member PathFollow3D.rotation_mode] is set to [constant PathFollow3D.ROTATION_ORIENTED]. Changing it forces the cache to be recomputed.
 		</member>
 	</members>
 	<constants>
diff --git a/doc/classes/CylinderShape.xml b/doc/classes/CylinderShape3D.xml
index 54adbd3b04..eb12568e71 100644
--- a/doc/classes/CylinderShape.xml
+++ b/doc/classes/CylinderShape3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="CylinderShape" inherits="Shape" version="4.0">
+<class name="CylinderShape3D" inherits="Shape3D" version="4.0">
 	<brief_description>
 		Cylinder shape for collisions.
 	</brief_description>
diff --git a/doc/classes/DirectionalLight.xml b/doc/classes/DirectionalLight3D.xml
index a3ef830d5d..a5d476f5c8 100644
--- a/doc/classes/DirectionalLight.xml
+++ b/doc/classes/DirectionalLight3D.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="DirectionalLight" inherits="Light" version="4.0">
+<class name="DirectionalLight3D" inherits="Light3D" version="4.0">
 	<brief_description>
 		Directional light from a distance, as from the Sun.
 	</brief_description>
 	<description>
-		A directional light is a type of [Light] node that models an infinite number of parallel rays covering the entire scene. It is used for lights with strong intensity that are located far away from the scene to model sunlight or moonlight. The worldspace location of the DirectionalLight transform (origin) is ignored. Only the basis is used to determine light direction.
+		A directional light is a type of [Light3D] node that models an infinite number of parallel rays covering the entire scene. It is used for lights with strong intensity that are located far away from the scene to model sunlight or moonlight. The worldspace location of the DirectionalLight3D transform (origin) is ignored. Only the basis is used to determine light direction.
 	</description>
 	<tutorials>
 		<link>https://docs.godotengine.org/en/latest/tutorials/3d/lights_and_shadows.html</link>
@@ -18,7 +18,7 @@
 		<member name="directional_shadow_blend_splits" type="bool" setter="set_blend_splits" getter="is_blend_splits_enabled" default="false">
 			If [code]true[/code], shadow detail is sacrificed in exchange for smoother transitions between splits.
 		</member>
-		<member name="directional_shadow_depth_range" type="int" setter="set_shadow_depth_range" getter="get_shadow_depth_range" enum="DirectionalLight.ShadowDepthRange" default="0">
+		<member name="directional_shadow_depth_range" type="int" setter="set_shadow_depth_range" getter="get_shadow_depth_range" enum="DirectionalLight3D.ShadowDepthRange" default="0">
 			Optimizes shadow rendering for detail versus movement. See [enum ShadowDepthRange].
 		</member>
 		<member name="directional_shadow_fade_start" type="float" setter="set_param" getter="get_param" default="0.8">
@@ -26,7 +26,7 @@
 		<member name="directional_shadow_max_distance" type="float" setter="set_param" getter="get_param" default="100.0">
 			The maximum distance for shadow splits.
 		</member>
-		<member name="directional_shadow_mode" type="int" setter="set_shadow_mode" getter="get_shadow_mode" enum="DirectionalLight.ShadowMode" default="2">
+		<member name="directional_shadow_mode" type="int" setter="set_shadow_mode" getter="get_shadow_mode" enum="DirectionalLight3D.ShadowMode" default="2">
 			The light's shadow rendering algorithm. See [enum ShadowMode].
 		</member>
 		<member name="directional_shadow_normal_bias" type="float" setter="set_param" getter="get_param" default="0.8">
diff --git a/doc/classes/EditorFeatureProfile.xml b/doc/classes/EditorFeatureProfile.xml
index 75b906d6d2..53db8dd293 100644
--- a/doc/classes/EditorFeatureProfile.xml
+++ b/doc/classes/EditorFeatureProfile.xml
@@ -5,7 +5,7 @@
 	</brief_description>
 	<description>
 		An editor feature profile can be used to disable specific features of the Godot editor. When disabled, the features won't appear in the editor, which makes the editor less cluttered. This is useful in education settings to reduce confusion or when working in a team. For example, artists and level designers could use a feature profile that disables the script editor to avoid accidentally making changes to files they aren't supposed to edit.
-		To manage editor feature profiles visually, use [b]Editor > Manage Feature Profiles...[/b] at the top of the editor window.
+		To manage editor feature profiles visually, use [b]Editor &gt; Manage Feature Profiles...[/b] at the top of the editor window.
 	</description>
 	<tutorials>
 	</tutorials>
diff --git a/doc/classes/EditorSpatialGizmo.xml b/doc/classes/EditorNode3DGizmo.xml
index b8c4daab07..6d695ddeea 100644
--- a/doc/classes/EditorSpatialGizmo.xml
+++ b/doc/classes/EditorNode3DGizmo.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="EditorSpatialGizmo" inherits="SpatialGizmo" version="4.0">
+<class name="EditorNode3DGizmo" inherits="Node3DGizmo" version="4.0">
 	<brief_description>
-		Custom gizmo for editing Spatial objects.
+		Custom gizmo for editing Node3D objects.
 	</brief_description>
 	<description>
-		Custom gizmo that is used for providing custom visualization and editing (handles) for 3D Spatial objects. See [EditorSpatialGizmoPlugin] for more information.
+		Custom gizmo that is used for providing custom visualization and editing (handles) for Node3D objects. See [EditorNode3DGizmoPlugin] for more information.
 	</description>
 	<tutorials>
 	</tutorials>
@@ -124,17 +124,17 @@
 			</description>
 		</method>
 		<method name="get_plugin" qualifiers="const">
-			<return type="EditorSpatialGizmoPlugin">
+			<return type="EditorNode3DGizmoPlugin">
 			</return>
 			<description>
-				Returns the [EditorSpatialGizmoPlugin] that owns this gizmo. It's useful to retrieve materials using [method EditorSpatialGizmoPlugin.get_material].
+				Returns the [EditorNode3DGizmoPlugin] that owns this gizmo. It's useful to retrieve materials using [method EditorNode3DGizmoPlugin.get_material].
 			</description>
 		</method>
 		<method name="get_spatial_node" qualifiers="const">
-			<return type="Spatial">
+			<return type="Node3D">
 			</return>
 			<description>
-				Returns the Spatial node associated with this gizmo.
+				Returns the Node3D node associated with this gizmo.
 			</description>
 		</method>
 		<method name="is_handle_highlighted" qualifiers="virtual">
@@ -150,7 +150,7 @@
 			<return type="void">
 			</return>
 			<description>
-				This function is called when the Spatial this gizmo refers to changes (the [method Spatial.update_gizmo] is called).
+				This function is called when the Node3D this gizmo refers to changes (the [method Node3D.update_gizmo] is called).
 			</description>
 		</method>
 		<method name="set_handle" qualifiers="virtual">
@@ -158,13 +158,13 @@
 			</return>
 			<argument index="0" name="index" type="int">
 			</argument>
-			<argument index="1" name="camera" type="Camera">
+			<argument index="1" name="camera" type="Camera3D">
 			</argument>
 			<argument index="2" name="point" type="Vector2">
 			</argument>
 			<description>
 				This function is used when the user drags a gizmo handle (previously added with [method add_handles]) in screen coordinates.
-				The [Camera] is also provided so screen coordinates can be converted to raycasts.
+				The [Camera3D] is also provided so screen coordinates can be converted to raycasts.
 			</description>
 		</method>
 		<method name="set_hidden">
diff --git a/doc/classes/EditorSpatialGizmoPlugin.xml b/doc/classes/EditorNode3DGizmoPlugin.xml
index b1a4a25a5f..ca75b47fbf 100644
--- a/doc/classes/EditorSpatialGizmoPlugin.xml
+++ b/doc/classes/EditorNode3DGizmoPlugin.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="EditorSpatialGizmoPlugin" inherits="Resource" version="4.0">
+<class name="EditorNode3DGizmoPlugin" inherits="Resource" version="4.0">
 	<brief_description>
-		Used by the editor to define Spatial gizmo types.
+		Used by the editor to define Node3D gizmo types.
 	</brief_description>
 	<description>
-		EditorSpatialGizmoPlugin allows you to define a new type of Gizmo. There are two main ways to do so: extending [EditorSpatialGizmoPlugin] for the simpler gizmos, or creating a new [EditorSpatialGizmo] type. See the tutorial in the documentation for more info.
+		EditorNode3DGizmoPlugin allows you to define a new type of Gizmo. There are two main ways to do so: extending [EditorNode3DGizmoPlugin] for the simpler gizmos, or creating a new [EditorNode3DGizmo] type. See the tutorial in the documentation for more info.
 	</description>
 	<tutorials>
 		<link>https://docs.godotengine.org/en/latest/tutorials/plugins/editor/spatial_gizmos.html</link>
@@ -31,7 +31,7 @@
 		<method name="commit_handle" qualifiers="virtual">
 			<return type="void">
 			</return>
-			<argument index="0" name="gizmo" type="EditorSpatialGizmo">
+			<argument index="0" name="gizmo" type="EditorNode3DGizmo">
 			</argument>
 			<argument index="1" name="index" type="int">
 			</argument>
@@ -44,12 +44,12 @@
 			</description>
 		</method>
 		<method name="create_gizmo" qualifiers="virtual">
-			<return type="EditorSpatialGizmo">
+			<return type="EditorNode3DGizmo">
 			</return>
-			<argument index="0" name="spatial" type="Spatial">
+			<argument index="0" name="spatial" type="Node3D">
 			</argument>
 			<description>
-				Override this method to return a custom [EditorSpatialGizmo] for the spatial nodes of your choice, return [code]null[/code] for the rest of nodes. See also [method has_gizmo].
+				Override this method to return a custom [EditorNode3DGizmo] for the spatial nodes of your choice, return [code]null[/code] for the rest of nodes. See also [method has_gizmo].
 			</description>
 		</method>
 		<method name="create_handle_material">
@@ -60,7 +60,7 @@
 			<argument index="1" name="billboard" type="bool" default="false">
 			</argument>
 			<description>
-				Creates a handle material with its variants (selected and/or editable) and adds them to the internal material list. They can then be accessed with [method get_material] and used in [method EditorSpatialGizmo.add_handles]. Should not be overridden.
+				Creates a handle material with its variants (selected and/or editable) and adds them to the internal material list. They can then be accessed with [method get_material] and used in [method EditorNode3DGizmo.add_handles]. Should not be overridden.
 			</description>
 		</method>
 		<method name="create_icon_material">
@@ -75,7 +75,7 @@
 			<argument index="3" name="color" type="Color" default="Color( 1, 1, 1, 1 )">
 			</argument>
 			<description>
-				Creates an icon material with its variants (selected and/or editable) and adds them to the internal material list. They can then be accessed with [method get_material] and used in [method EditorSpatialGizmo.add_unscaled_billboard]. Should not be overridden.
+				Creates an icon material with its variants (selected and/or editable) and adds them to the internal material list. They can then be accessed with [method get_material] and used in [method EditorNode3DGizmo.add_unscaled_billboard]. Should not be overridden.
 			</description>
 		</method>
 		<method name="create_material">
@@ -92,13 +92,13 @@
 			<argument index="4" name="use_vertex_color" type="bool" default="false">
 			</argument>
 			<description>
-				Creates an unshaded material with its variants (selected and/or editable) and adds them to the internal material list. They can then be accessed with [method get_material] and used in [method EditorSpatialGizmo.add_mesh] and [method EditorSpatialGizmo.add_lines]. Should not be overridden.
+				Creates an unshaded material with its variants (selected and/or editable) and adds them to the internal material list. They can then be accessed with [method get_material] and used in [method EditorNode3DGizmo.add_mesh] and [method EditorNode3DGizmo.add_lines]. Should not be overridden.
 			</description>
 		</method>
 		<method name="get_handle_name" qualifiers="virtual">
 			<return type="String">
 			</return>
-			<argument index="0" name="gizmo" type="EditorSpatialGizmo">
+			<argument index="0" name="gizmo" type="EditorNode3DGizmo">
 			</argument>
 			<argument index="1" name="index" type="int">
 			</argument>
@@ -109,7 +109,7 @@
 		<method name="get_handle_value" qualifiers="virtual">
 			<return type="Variant">
 			</return>
-			<argument index="0" name="gizmo" type="EditorSpatialGizmo">
+			<argument index="0" name="gizmo" type="EditorNode3DGizmo">
 			</argument>
 			<argument index="1" name="index" type="int">
 			</argument>
@@ -122,10 +122,10 @@
 			</return>
 			<argument index="0" name="name" type="String">
 			</argument>
-			<argument index="1" name="gizmo" type="EditorSpatialGizmo">
+			<argument index="1" name="gizmo" type="EditorNode3DGizmo">
 			</argument>
 			<description>
-				Gets material from the internal list of materials. If an [EditorSpatialGizmo] is provided, it will try to get the corresponding variant (selected and/or editable).
+				Gets material from the internal list of materials. If an [EditorNode3DGizmo] is provided, it will try to get the corresponding variant (selected and/or editable).
 			</description>
 		</method>
 		<method name="get_name" qualifiers="virtual">
@@ -144,16 +144,16 @@
 		<method name="has_gizmo" qualifiers="virtual">
 			<return type="bool">
 			</return>
-			<argument index="0" name="spatial" type="Spatial">
+			<argument index="0" name="spatial" type="Node3D">
 			</argument>
 			<description>
-				Override this method to define which Spatial nodes have a gizmo from this plugin. Whenever a [Spatial] node is added to a scene this method is called, if it returns [code]true[/code] the node gets a generic [EditorSpatialGizmo] assigned and is added to this plugin's list of active gizmos.
+				Override this method to define which Node3D nodes have a gizmo from this plugin. Whenever a [Node3D] node is added to a scene this method is called, if it returns [code]true[/code] the node gets a generic [EditorNode3DGizmo] assigned and is added to this plugin's list of active gizmos.
 			</description>
 		</method>
 		<method name="is_handle_highlighted" qualifiers="virtual">
 			<return type="bool">
 			</return>
-			<argument index="0" name="gizmo" type="EditorSpatialGizmo">
+			<argument index="0" name="gizmo" type="EditorNode3DGizmo">
 			</argument>
 			<argument index="1" name="index" type="int">
 			</argument>
@@ -165,13 +165,13 @@
 			<return type="bool">
 			</return>
 			<description>
-				Override this method to define whether Spatial with this gizmo should be selecteble even when the gizmo is hidden.
+				Override this method to define whether Node3D with this gizmo should be selecteble even when the gizmo is hidden.
 			</description>
 		</method>
 		<method name="redraw" qualifiers="virtual">
 			<return type="void">
 			</return>
-			<argument index="0" name="gizmo" type="EditorSpatialGizmo">
+			<argument index="0" name="gizmo" type="EditorNode3DGizmo">
 			</argument>
 			<description>
 				Callback to redraw the provided gizmo. Called for this plugin's active gizmos.
@@ -180,11 +180,11 @@
 		<method name="set_handle" qualifiers="virtual">
 			<return type="void">
 			</return>
-			<argument index="0" name="gizmo" type="EditorSpatialGizmo">
+			<argument index="0" name="gizmo" type="EditorNode3DGizmo">
 			</argument>
 			<argument index="1" name="index" type="int">
 			</argument>
-			<argument index="2" name="camera" type="Camera">
+			<argument index="2" name="camera" type="Camera3D">
 			</argument>
 			<argument index="3" name="point" type="Vector2">
 			</argument>
diff --git a/doc/classes/EditorPlugin.xml b/doc/classes/EditorPlugin.xml
index 587fd51f1e..19583fca28 100644
--- a/doc/classes/EditorPlugin.xml
+++ b/doc/classes/EditorPlugin.xml
@@ -71,7 +71,7 @@
 			</argument>
 			<description>
 				Adds a custom type, which will appear in the list of nodes or resources. An icon can be optionally passed.
-				When given node or resource is selected, the base type will be instanced (e.g. "Spatial", "Control", "Resource"), then the script will be loaded and set to this object.
+				When given node or resource is selected, the base type will be instanced (e.g. "Node3D", "Control", "Resource"), then the script will be loaded and set to this object.
 				You can use the virtual method [method handles] to check if your custom object is being edited by checking the script or using the [code]is[/code] keyword.
 				During run-time, this will be a simple object with a script so this function does not need to be called then.
 			</description>
@@ -111,7 +111,7 @@
 		<method name="add_spatial_gizmo_plugin">
 			<return type="void">
 			</return>
-			<argument index="0" name="plugin" type="EditorSpatialGizmoPlugin">
+			<argument index="0" name="plugin" type="EditorNode3DGizmoPlugin">
 			</argument>
 			<description>
 			</description>
@@ -229,7 +229,7 @@
 		<method name="forward_spatial_gui_input" qualifiers="virtual">
 			<return type="bool">
 			</return>
-			<argument index="0" name="camera" type="Camera">
+			<argument index="0" name="camera" type="Camera3D">
 			</argument>
 			<argument index="1" name="event" type="InputEvent">
 			</argument>
@@ -450,7 +450,7 @@
 		<method name="remove_spatial_gizmo_plugin">
 			<return type="void">
 			</return>
-			<argument index="0" name="plugin" type="EditorSpatialGizmoPlugin">
+			<argument index="0" name="plugin" type="EditorNode3DGizmoPlugin">
 			</argument>
 			<description>
 			</description>
diff --git a/doc/classes/Environment.xml b/doc/classes/Environment.xml
index f5c04b3947..c2e250d491 100644
--- a/doc/classes/Environment.xml
+++ b/doc/classes/Environment.xml
@@ -108,7 +108,7 @@
 			If [code]true[/code], the depth fog effect is enabled. When enabled, fog will appear in the distance (relative to the camera).
 		</member>
 		<member name="fog_depth_end" type="float" setter="set_fog_depth_end" getter="get_fog_depth_end" default="100.0">
-			The fog's depth end distance from the camera. If this value is set to 0, it will be equal to the current camera's [member Camera.far] value.
+			The fog's depth end distance from the camera. If this value is set to 0, it will be equal to the current camera's [member Camera3D.far] value.
 		</member>
 		<member name="fog_enabled" type="bool" setter="set_fog_enabled" getter="is_fog_enabled" default="false">
 			If [code]true[/code], fog effects are enabled. [member fog_height_enabled] and/or [member fog_depth_enabled] must be set to [code]true[/code] to actually display fog.
@@ -126,7 +126,7 @@
 			The Y coordinate where the height fog will be the least intense. If this value is greater than [member fog_height_max], fog will be displayed from top to bottom. Otherwise, it will be displayed from bottom to top.
 		</member>
 		<member name="fog_sun_amount" type="float" setter="set_fog_sun_amount" getter="get_fog_sun_amount" default="0.0">
-			The intensity of the depth fog color transition when looking towards the sun. The sun's direction is determined automatically using the DirectionalLight node in the scene.
+			The intensity of the depth fog color transition when looking towards the sun. The sun's direction is determined automatically using the DirectionalLight3D node in the scene.
 		</member>
 		<member name="fog_sun_color" type="Color" setter="set_fog_sun_color" getter="get_fog_sun_color" default="Color( 1, 0.9, 0.7, 1 )">
 			The depth fog's [Color] when looking towards the sun.
diff --git a/doc/classes/GIProbe.xml b/doc/classes/GIProbe.xml
index 322143ea9e..df50244c77 100644
--- a/doc/classes/GIProbe.xml
+++ b/doc/classes/GIProbe.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="GIProbe" inherits="VisualInstance" version="4.0">
+<class name="GIProbe" inherits="VisualInstance3D" version="4.0">
 	<brief_description>
 		Real-time global illumination (GI) probe.
 	</brief_description>
@@ -19,7 +19,7 @@
 			<argument index="1" name="create_visual_debug" type="bool" default="false">
 			</argument>
 			<description>
-				Bakes the effect from all [GeometryInstance]s marked with [member GeometryInstance.use_in_baked_light] and [Light]s marked with either [constant Light.BAKE_INDIRECT] or [constant Light.BAKE_ALL]. If [code]create_visual_debug[/code] is [code]true[/code], after baking the light, this will generate a [MultiMesh] that has a cube representing each solid cell with each cube colored to the cell's albedo color. This can be used to visualize the [GIProbe]'s data and debug any issues that may be occurring.
+				Bakes the effect from all [GeometryInstance3D]s marked with [member GeometryInstance3D.use_in_baked_light] and [Light3D]s marked with either [constant Light3D.BAKE_INDIRECT] or [constant Light3D.BAKE_ALL]. If [code]create_visual_debug[/code] is [code]true[/code], after baking the light, this will generate a [MultiMesh] that has a cube representing each solid cell with each cube colored to the cell's albedo color. This can be used to visualize the [GIProbe]'s data and debug any issues that may be occurring.
 			</description>
 		</method>
 		<method name="debug_bake">
diff --git a/doc/classes/Particles2D.xml b/doc/classes/GPUParticles2D.xml
index 50fc3680bc..64a2522f2f 100644
--- a/doc/classes/Particles2D.xml
+++ b/doc/classes/GPUParticles2D.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Particles2D" inherits="Node2D" version="4.0">
+<class name="GPUParticles2D" inherits="Node2D" version="4.0">
 	<brief_description>
 		2D particle emitter.
 	</brief_description>
 	<description>
-		2D particle node used to create a variety of particle systems and effects. [Particles2D] features an emitter that generates some number of particles at a given rate.
+		2D particle node used to create a variety of particle systems and effects. [GPUParticles2D] features an emitter that generates some number of particles at a given rate.
 		Use the [code]process_material[/code] property to add a [ParticlesMaterial] to configure particle appearance and behavior. Alternatively, you can add a [ShaderMaterial] which will be applied to all particles.
 	</description>
 	<tutorials>
@@ -30,7 +30,7 @@
 		<member name="amount" type="int" setter="set_amount" getter="get_amount" default="8">
 			Number of particles emitted in one emission cycle.
 		</member>
-		<member name="draw_order" type="int" setter="set_draw_order" getter="get_draw_order" enum="Particles2D.DrawOrder" default="0">
+		<member name="draw_order" type="int" setter="set_draw_order" getter="get_draw_order" enum="GPUParticles2D.DrawOrder" default="0">
 			Particle draw order. Uses [enum DrawOrder] values.
 		</member>
 		<member name="emitting" type="bool" setter="set_emitting" getter="is_emitting" default="false">
diff --git a/doc/classes/Particles.xml b/doc/classes/GPUParticles3D.xml
index 74651ddd2f..add8f28bf8 100644
--- a/doc/classes/Particles.xml
+++ b/doc/classes/GPUParticles3D.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Particles" inherits="GeometryInstance" version="4.0">
+<class name="GPUParticles3D" inherits="GeometryInstance3D" version="4.0">
 	<brief_description>
 		3D particle emitter.
 	</brief_description>
 	<description>
-		3D particle node used to create a variety of particle systems and effects. [Particles] features an emitter that generates some number of particles at a given rate.
+		3D particle node used to create a variety of particle systems and effects. [GPUParticles3D] features an emitter that generates some number of particles at a given rate.
 		Use the [code]process_material[/code] property to add a [ParticlesMaterial] to configure particle appearance and behavior. Alternatively, you can add a [ShaderMaterial] which will be applied to all particles.
 	</description>
 	<tutorials>
@@ -50,7 +50,7 @@
 		<member name="amount" type="int" setter="set_amount" getter="get_amount" default="8">
 			Number of particles to emit.
 		</member>
-		<member name="draw_order" type="int" setter="set_draw_order" getter="get_draw_order" enum="Particles.DrawOrder" default="0">
+		<member name="draw_order" type="int" setter="set_draw_order" getter="get_draw_order" enum="GPUParticles3D.DrawOrder" default="0">
 			Particle draw order. Uses [enum DrawOrder] values.
 		</member>
 		<member name="draw_pass_1" type="Mesh" setter="set_draw_pass_mesh" getter="get_draw_pass_mesh">
diff --git a/doc/classes/Generic6DOFJoint.xml b/doc/classes/Generic6DOFJoint3D.xml
index 29ebf9f5d6..fae567dc58 100644
--- a/doc/classes/Generic6DOFJoint.xml
+++ b/doc/classes/Generic6DOFJoint3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Generic6DOFJoint" inherits="Joint" version="4.0">
+<class name="Generic6DOFJoint3D" inherits="Joint3D" version="4.0">
 	<brief_description>
 		The generic 6-degrees-of-freedom joint can implement a variety of joint types by locking certain axes' rotation or translation.
 	</brief_description>
@@ -12,7 +12,7 @@
 		<method name="get_flag_x" qualifiers="const">
 			<return type="bool">
 			</return>
-			<argument index="0" name="flag" type="int" enum="Generic6DOFJoint.Flag">
+			<argument index="0" name="flag" type="int" enum="Generic6DOFJoint3D.Flag">
 			</argument>
 			<description>
 			</description>
@@ -20,7 +20,7 @@
 		<method name="get_flag_y" qualifiers="const">
 			<return type="bool">
 			</return>
-			<argument index="0" name="flag" type="int" enum="Generic6DOFJoint.Flag">
+			<argument index="0" name="flag" type="int" enum="Generic6DOFJoint3D.Flag">
 			</argument>
 			<description>
 			</description>
@@ -28,7 +28,7 @@
 		<method name="get_flag_z" qualifiers="const">
 			<return type="bool">
 			</return>
-			<argument index="0" name="flag" type="int" enum="Generic6DOFJoint.Flag">
+			<argument index="0" name="flag" type="int" enum="Generic6DOFJoint3D.Flag">
 			</argument>
 			<description>
 			</description>
@@ -36,7 +36,7 @@
 		<method name="get_param_x" qualifiers="const">
 			<return type="float">
 			</return>
-			<argument index="0" name="param" type="int" enum="Generic6DOFJoint.Param">
+			<argument index="0" name="param" type="int" enum="Generic6DOFJoint3D.Param">
 			</argument>
 			<description>
 			</description>
@@ -44,7 +44,7 @@
 		<method name="get_param_y" qualifiers="const">
 			<return type="float">
 			</return>
-			<argument index="0" name="param" type="int" enum="Generic6DOFJoint.Param">
+			<argument index="0" name="param" type="int" enum="Generic6DOFJoint3D.Param">
 			</argument>
 			<description>
 			</description>
@@ -52,7 +52,7 @@
 		<method name="get_param_z" qualifiers="const">
 			<return type="float">
 			</return>
-			<argument index="0" name="param" type="int" enum="Generic6DOFJoint.Param">
+			<argument index="0" name="param" type="int" enum="Generic6DOFJoint3D.Param">
 			</argument>
 			<description>
 			</description>
@@ -60,7 +60,7 @@
 		<method name="set_flag_x">
 			<return type="void">
 			</return>
-			<argument index="0" name="flag" type="int" enum="Generic6DOFJoint.Flag">
+			<argument index="0" name="flag" type="int" enum="Generic6DOFJoint3D.Flag">
 			</argument>
 			<argument index="1" name="value" type="bool">
 			</argument>
@@ -70,7 +70,7 @@
 		<method name="set_flag_y">
 			<return type="void">
 			</return>
-			<argument index="0" name="flag" type="int" enum="Generic6DOFJoint.Flag">
+			<argument index="0" name="flag" type="int" enum="Generic6DOFJoint3D.Flag">
 			</argument>
 			<argument index="1" name="value" type="bool">
 			</argument>
@@ -80,7 +80,7 @@
 		<method name="set_flag_z">
 			<return type="void">
 			</return>
-			<argument index="0" name="flag" type="int" enum="Generic6DOFJoint.Flag">
+			<argument index="0" name="flag" type="int" enum="Generic6DOFJoint3D.Flag">
 			</argument>
 			<argument index="1" name="value" type="bool">
 			</argument>
@@ -90,7 +90,7 @@
 		<method name="set_param_x">
 			<return type="void">
 			</return>
-			<argument index="0" name="param" type="int" enum="Generic6DOFJoint.Param">
+			<argument index="0" name="param" type="int" enum="Generic6DOFJoint3D.Param">
 			</argument>
 			<argument index="1" name="value" type="float">
 			</argument>
@@ -100,7 +100,7 @@
 		<method name="set_param_y">
 			<return type="void">
 			</return>
-			<argument index="0" name="param" type="int" enum="Generic6DOFJoint.Param">
+			<argument index="0" name="param" type="int" enum="Generic6DOFJoint3D.Param">
 			</argument>
 			<argument index="1" name="value" type="float">
 			</argument>
@@ -110,7 +110,7 @@
 		<method name="set_param_z">
 			<return type="void">
 			</return>
-			<argument index="0" name="param" type="int" enum="Generic6DOFJoint.Param">
+			<argument index="0" name="param" type="int" enum="Generic6DOFJoint3D.Param">
 			</argument>
 			<argument index="1" name="value" type="float">
 			</argument>
diff --git a/doc/classes/GeometryInstance.xml b/doc/classes/GeometryInstance3D.xml
index 8259462531..7df5f0ea50 100644
--- a/doc/classes/GeometryInstance.xml
+++ b/doc/classes/GeometryInstance3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="GeometryInstance" inherits="VisualInstance" version="4.0">
+<class name="GeometryInstance3D" inherits="VisualInstance3D" version="4.0">
 	<brief_description>
 		Base node for geometry-based visual instances.
 	</brief_description>
@@ -12,10 +12,10 @@
 		<method name="get_flag" qualifiers="const">
 			<return type="bool">
 			</return>
-			<argument index="0" name="flag" type="int" enum="GeometryInstance.Flags">
+			<argument index="0" name="flag" type="int" enum="GeometryInstance3D.Flags">
 			</argument>
 			<description>
-				Returns the [enum GeometryInstance.Flags] that have been set for this object.
+				Returns the [enum GeometryInstance3D.Flags] that have been set for this object.
 			</description>
 		</method>
 		<method name="set_custom_aabb">
@@ -30,36 +30,36 @@
 		<method name="set_flag">
 			<return type="void">
 			</return>
-			<argument index="0" name="flag" type="int" enum="GeometryInstance.Flags">
+			<argument index="0" name="flag" type="int" enum="GeometryInstance3D.Flags">
 			</argument>
 			<argument index="1" name="value" type="bool">
 			</argument>
 			<description>
-				Sets the [enum GeometryInstance.Flags] specified. See [enum GeometryInstance.Flags] for options.
+				Sets the [enum GeometryInstance3D.Flags] specified. See [enum GeometryInstance3D.Flags] for options.
 			</description>
 		</method>
 	</methods>
 	<members>
-		<member name="cast_shadow" type="int" setter="set_cast_shadows_setting" getter="get_cast_shadows_setting" enum="GeometryInstance.ShadowCastingSetting" default="1">
+		<member name="cast_shadow" type="int" setter="set_cast_shadows_setting" getter="get_cast_shadows_setting" enum="GeometryInstance3D.ShadowCastingSetting" default="1">
 			The selected shadow casting flag. See [enum ShadowCastingSetting] for possible values.
 		</member>
 		<member name="extra_cull_margin" type="float" setter="set_extra_cull_margin" getter="get_extra_cull_margin" default="0.0">
-			The extra distance added to the GeometryInstance's bounding box ([AABB]) to increase its cull box.
+			The extra distance added to the GeometryInstance3D's bounding box ([AABB]) to increase its cull box.
 		</member>
 		<member name="lod_max_distance" type="float" setter="set_lod_max_distance" getter="get_lod_max_distance" default="0.0">
-			The GeometryInstance's max LOD distance.
+			The GeometryInstance3D's max LOD distance.
 			[b]Note:[/b] This property currently has no effect.
 		</member>
 		<member name="lod_max_hysteresis" type="float" setter="set_lod_max_hysteresis" getter="get_lod_max_hysteresis" default="0.0">
-			The GeometryInstance's max LOD margin.
+			The GeometryInstance3D's max LOD margin.
 			[b]Note:[/b] This property currently has no effect.
 		</member>
 		<member name="lod_min_distance" type="float" setter="set_lod_min_distance" getter="get_lod_min_distance" default="0.0">
-			The GeometryInstance's min LOD distance.
+			The GeometryInstance3D's min LOD distance.
 			[b]Note:[/b] This property currently has no effect.
 		</member>
 		<member name="lod_min_hysteresis" type="float" setter="set_lod_min_hysteresis" getter="get_lod_min_hysteresis" default="0.0">
-			The GeometryInstance's min LOD margin.
+			The GeometryInstance3D's min LOD margin.
 			[b]Note:[/b] This property currently has no effect.
 		</member>
 		<member name="material_override" type="Material" setter="set_material_override" getter="get_material_override">
@@ -69,7 +69,7 @@
 		<member name="use_dynamic_gi" type="bool" setter="set_flag" getter="get_flag" default="false">
 		</member>
 		<member name="use_in_baked_light" type="bool" setter="set_flag" getter="get_flag" default="false">
-			If [code]true[/code], this GeometryInstance will be used when baking lights using a [GIProbe].
+			If [code]true[/code], this GeometryInstance3D will be used when baking lights using a [GIProbe].
 		</member>
 	</members>
 	<constants>
@@ -77,11 +77,11 @@
 			Will not cast any shadows.
 		</constant>
 		<constant name="SHADOW_CASTING_SETTING_ON" value="1" enum="ShadowCastingSetting">
-			Will cast shadows from all visible faces in the GeometryInstance.
+			Will cast shadows from all visible faces in the GeometryInstance3D.
 			Will take culling into account, so faces not being rendered will not be taken into account when shadow casting.
 		</constant>
 		<constant name="SHADOW_CASTING_SETTING_DOUBLE_SIDED" value="2" enum="ShadowCastingSetting">
-			Will cast shadows from all visible faces in the GeometryInstance.
+			Will cast shadows from all visible faces in the GeometryInstance3D.
 			Will not take culling into account, so all faces will be taken into account when shadow casting.
 		</constant>
 		<constant name="SHADOW_CASTING_SETTING_SHADOWS_ONLY" value="3" enum="ShadowCastingSetting">
@@ -89,12 +89,12 @@
 			In other words, the actual mesh will not be visible, only the shadows casted from the mesh will be.
 		</constant>
 		<constant name="FLAG_USE_BAKED_LIGHT" value="0" enum="Flags">
-			Will allow the GeometryInstance to be used when baking lights using a [GIProbe].
+			Will allow the GeometryInstance3D to be used when baking lights using a [GIProbe].
 		</constant>
 		<constant name="FLAG_USE_DYNAMIC_GI" value="1" enum="Flags">
 		</constant>
 		<constant name="FLAG_DRAW_NEXT_FRAME_IF_VISIBLE" value="2" enum="Flags">
-			Unused in this class, exposed for consistency with [enum VisualServer.InstanceFlags].
+			Unused in this class, exposed for consistency with [enum RenderingServer.InstanceFlags].
 		</constant>
 		<constant name="FLAG_MAX" value="3" enum="Flags">
 			Represents the size of the [enum Flags] enum.
diff --git a/doc/classes/HeightMapShape.xml b/doc/classes/HeightMapShape3D.xml
index 029f3642d2..6d230bdab8 100644
--- a/doc/classes/HeightMapShape.xml
+++ b/doc/classes/HeightMapShape3D.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="HeightMapShape" inherits="Shape" version="4.0">
+<class name="HeightMapShape3D" inherits="Shape3D" version="4.0">
 	<brief_description>
 		Height map shape for 3D physics (Bullet only).
 	</brief_description>
 	<description>
-		Height map shape resource, which can be added to a [PhysicsBody] or [Area].
+		Height map shape resource, which can be added to a [PhysicsBody3D] or [Area3D].
 	</description>
 	<tutorials>
 	</tutorials>
diff --git a/doc/classes/HingeJoint.xml b/doc/classes/HingeJoint3D.xml
index 0d1b6ff0e0..2d4480cb20 100644
--- a/doc/classes/HingeJoint.xml
+++ b/doc/classes/HingeJoint3D.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="HingeJoint" inherits="Joint" version="4.0">
+<class name="HingeJoint3D" inherits="Joint3D" version="4.0">
 	<brief_description>
 		A hinge between two 3D bodies.
 	</brief_description>
 	<description>
-		A HingeJoint normally uses the Z axis of body A as the hinge axis, another axis can be specified when adding it manually though.
+		A HingeJoint3D normally uses the Z axis of body A as the hinge axis, another axis can be specified when adding it manually though.
 	</description>
 	<tutorials>
 	</tutorials>
@@ -12,7 +12,7 @@
 		<method name="get_flag" qualifiers="const">
 			<return type="bool">
 			</return>
-			<argument index="0" name="flag" type="int" enum="HingeJoint.Flag">
+			<argument index="0" name="flag" type="int" enum="HingeJoint3D.Flag">
 			</argument>
 			<description>
 				Returns the value of the specified flag.
@@ -21,7 +21,7 @@
 		<method name="get_param" qualifiers="const">
 			<return type="float">
 			</return>
-			<argument index="0" name="param" type="int" enum="HingeJoint.Param">
+			<argument index="0" name="param" type="int" enum="HingeJoint3D.Param">
 			</argument>
 			<description>
 				Returns the value of the specified parameter.
@@ -30,7 +30,7 @@
 		<method name="set_flag">
 			<return type="void">
 			</return>
-			<argument index="0" name="flag" type="int" enum="HingeJoint.Flag">
+			<argument index="0" name="flag" type="int" enum="HingeJoint3D.Flag">
 			</argument>
 			<argument index="1" name="enabled" type="bool">
 			</argument>
@@ -41,7 +41,7 @@
 		<method name="set_param">
 			<return type="void">
 			</return>
-			<argument index="0" name="param" type="int" enum="HingeJoint.Param">
+			<argument index="0" name="param" type="int" enum="HingeJoint3D.Param">
 			</argument>
 			<argument index="1" name="value" type="float">
 			</argument>
diff --git a/doc/classes/ImmediateGeometry.xml b/doc/classes/ImmediateGeometry3D.xml
index 710e929d1a..1c0831c922 100644
--- a/doc/classes/ImmediateGeometry.xml
+++ b/doc/classes/ImmediateGeometry3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ImmediateGeometry" inherits="GeometryInstance" version="4.0">
+<class name="ImmediateGeometry3D" inherits="GeometryInstance3D" version="4.0">
 	<brief_description>
 		Draws simple geometry from code.
 	</brief_description>
diff --git a/doc/classes/InputDefault.xml b/doc/classes/InputDefault.xml
deleted file mode 100644
index ea4d08c628..0000000000
--- a/doc/classes/InputDefault.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<class name="InputDefault" inherits="Input" version="4.0">
-	<brief_description>
-		Default implementation of the [Input] class.
-	</brief_description>
-	<description>
-		Default implementation of the [Input] class, used internally by the editor and games for default input management.
-	</description>
-	<tutorials>
-	</tutorials>
-	<methods>
-	</methods>
-	<constants>
-	</constants>
-</class>
diff --git a/doc/classes/InputEventFromWindow.xml b/doc/classes/InputEventFromWindow.xml
new file mode 100644
index 0000000000..7cd5b7d179
--- /dev/null
+++ b/doc/classes/InputEventFromWindow.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class name="InputEventFromWindow" inherits="InputEvent" version="4.0">
+	<brief_description>
+	</brief_description>
+	<description>
+	</description>
+	<tutorials>
+	</tutorials>
+	<methods>
+	</methods>
+	<members>
+		<member name="window_id" type="int" setter="set_window_id" getter="get_window_id" default="0">
+		</member>
+	</members>
+	<constants>
+	</constants>
+</class>
diff --git a/doc/classes/InputEventScreenDrag.xml b/doc/classes/InputEventScreenDrag.xml
index d7e0c2454c..a315e4ddfb 100644
--- a/doc/classes/InputEventScreenDrag.xml
+++ b/doc/classes/InputEventScreenDrag.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="InputEventScreenDrag" inherits="InputEvent" version="4.0">
+<class name="InputEventScreenDrag" inherits="InputEventFromWindow" version="4.0">
 	<brief_description>
 		Input event type for screen drag events. Only available on mobile devices.
 	</brief_description>
diff --git a/doc/classes/InputEventScreenTouch.xml b/doc/classes/InputEventScreenTouch.xml
index 4a5cd36423..16a3cf8353 100644
--- a/doc/classes/InputEventScreenTouch.xml
+++ b/doc/classes/InputEventScreenTouch.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="InputEventScreenTouch" inherits="InputEvent" version="4.0">
+<class name="InputEventScreenTouch" inherits="InputEventFromWindow" version="4.0">
 	<brief_description>
 		Input event type for screen touch events.
 		(only available on mobile devices)
diff --git a/doc/classes/InputEventWithModifiers.xml b/doc/classes/InputEventWithModifiers.xml
index 63465ad28c..34faf18e24 100644
--- a/doc/classes/InputEventWithModifiers.xml
+++ b/doc/classes/InputEventWithModifiers.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="InputEventWithModifiers" inherits="InputEvent" version="4.0">
+<class name="InputEventWithModifiers" inherits="InputEventFromWindow" version="4.0">
 	<brief_description>
 		Base class for keys events with modifiers.
 	</brief_description>
diff --git a/doc/classes/Input.xml b/doc/classes/InputFilter.xml
index 0f212e7498..54184ae8a3 100644
--- a/doc/classes/Input.xml
+++ b/doc/classes/InputFilter.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Input" inherits="Object" version="4.0">
+<class name="InputFilter" inherits="Object" version="4.0">
 	<brief_description>
 		A singleton that deals with inputs.
 	</brief_description>
@@ -68,7 +68,7 @@
 			</description>
 		</method>
 		<method name="get_current_cursor_shape" qualifiers="const">
-			<return type="int" enum="Input.CursorShape">
+			<return type="int" enum="InputFilter.CursorShape">
 			</return>
 			<description>
 				Returns the currently assigned cursor shape (see [enum CursorShape]).
@@ -193,7 +193,7 @@
 			</description>
 		</method>
 		<method name="get_mouse_mode" qualifiers="const">
-			<return type="int" enum="Input.MouseMode">
+			<return type="int" enum="InputFilter.MouseMode">
 			</return>
 			<description>
 				Returns the mouse mode. See the constants for more information.
@@ -277,7 +277,7 @@
 			<argument index="3" name="guid" type="String">
 			</argument>
 			<description>
-				Notifies the [Input] singleton that a connection has changed, to update the state for the [code]device[/code] index.
+				Notifies the [InputFilter] singleton that a connection has changed, to update the state for the [code]device[/code] index.
 				This is used internally and should not have to be called from user scripts. See [signal joy_connection_changed] for the signal emitted when this is triggered internally.
 			</description>
 		</method>
@@ -293,7 +293,7 @@
 				var a = InputEventAction.new()
 				a.action = "ui_cancel"
 				a.pressed = true
-				Input.parse_input_event(a)
+				InputFilter.parse_input_event(a)
 				[/codeblock]
 			</description>
 		</method>
@@ -311,7 +311,7 @@
 			</return>
 			<argument index="0" name="image" type="Resource">
 			</argument>
-			<argument index="1" name="shape" type="int" enum="Input.CursorShape" default="0">
+			<argument index="1" name="shape" type="int" enum="InputFilter.CursorShape" default="0">
 			</argument>
 			<argument index="2" name="hotspot" type="Vector2" default="Vector2( 0, 0 )">
 			</argument>
@@ -326,7 +326,7 @@
 		<method name="set_default_cursor_shape">
 			<return type="void">
 			</return>
-			<argument index="0" name="shape" type="int" enum="Input.CursorShape" default="0">
+			<argument index="0" name="shape" type="int" enum="InputFilter.CursorShape" default="0">
 			</argument>
 			<description>
 				Sets the default cursor shape to be used in the viewport instead of [constant CURSOR_ARROW].
@@ -337,7 +337,7 @@
 		<method name="set_mouse_mode">
 			<return type="void">
 			</return>
-			<argument index="0" name="mode" type="int" enum="Input.MouseMode">
+			<argument index="0" name="mode" type="int" enum="InputFilter.MouseMode">
 			</argument>
 			<description>
 				Sets the mouse mode. See the constants for more information.
diff --git a/doc/classes/InterpolatedCamera.xml b/doc/classes/InterpolatedCamera.xml
deleted file mode 100644
index 66df7e9531..0000000000
--- a/doc/classes/InterpolatedCamera.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<class name="InterpolatedCamera" inherits="Camera" version="4.0">
-	<brief_description>
-		Camera which moves toward another node.
-	</brief_description>
-	<description>
-		InterpolatedCamera is a [Camera] which smoothly moves to match a target node's position and rotation.
-		If it is not [member enabled] or does not have a valid target set, InterpolatedCamera acts like a normal Camera.
-	</description>
-	<tutorials>
-	</tutorials>
-	<methods>
-		<method name="set_target">
-			<return type="void">
-			</return>
-			<argument index="0" name="target" type="Object">
-			</argument>
-			<description>
-				Sets the node to move toward and orient with.
-			</description>
-		</method>
-	</methods>
-	<members>
-		<member name="enabled" type="bool" setter="set_interpolation_enabled" getter="is_interpolation_enabled" default="false">
-			If [code]true[/code], and a target is set, the camera will move automatically.
-		</member>
-		<member name="speed" type="float" setter="set_speed" getter="get_speed" default="1.0">
-			How quickly the camera moves toward its target. Higher values will result in tighter camera motion.
-		</member>
-		<member name="target" type="NodePath" setter="set_target_path" getter="get_target_path" default="NodePath(&quot;&quot;)">
-			The target's [NodePath].
-		</member>
-	</members>
-	<constants>
-	</constants>
-</class>
diff --git a/doc/classes/Joint.xml b/doc/classes/Joint3D.xml
index 34da997292..15bef960f6 100644
--- a/doc/classes/Joint.xml
+++ b/doc/classes/Joint3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Joint" inherits="Spatial" version="4.0">
+<class name="Joint3D" inherits="Node3D" version="4.0">
 	<brief_description>
 		Base class for all 3D joints.
 	</brief_description>
diff --git a/doc/classes/KinematicBody.xml b/doc/classes/KinematicBody3D.xml
index 4ccbc679bf..5f9b36f97d 100644
--- a/doc/classes/KinematicBody.xml
+++ b/doc/classes/KinematicBody3D.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="KinematicBody" inherits="PhysicsBody" version="4.0">
+<class name="KinematicBody3D" inherits="PhysicsBody3D" version="4.0">
 	<brief_description>
 		Kinematic body 3D node.
 	</brief_description>
 	<description>
 		Kinematic bodies are special types of bodies that are meant to be user-controlled. They are not affected by physics at all; to other types of bodies, such as a character or a rigid body, these are the same as a static body. However, they have two main uses:
 		[b]Simulated motion:[/b] When these bodies are moved manually, either from code or from an [AnimationPlayer] (with [member AnimationPlayer.playback_process_mode] set to "physics"), the physics will automatically compute an estimate of their linear and angular velocity. This makes them very useful for moving platforms or other AnimationPlayer-controlled objects (like a door, a bridge that opens, etc).
-		[b]Kinematic characters:[/b] KinematicBody also has an API for moving objects (the [method move_and_collide] and [method move_and_slide] methods) while performing collision tests. This makes them really useful to implement characters that collide against a world, but that don't require advanced physics.
+		[b]Kinematic characters:[/b] KinematicBody3D also has an API for moving objects (the [method move_and_collide] and [method move_and_slide] methods) while performing collision tests. This makes them really useful to implement characters that collide against a world, but that don't require advanced physics.
 	</description>
 	<tutorials>
 		<link>https://docs.godotengine.org/en/latest/tutorials/physics/kinematic_character_2d.html</link>
@@ -15,7 +15,7 @@
 		<method name="get_axis_lock" qualifiers="const">
 			<return type="bool">
 			</return>
-			<argument index="0" name="axis" type="int" enum="PhysicsServer.BodyAxis">
+			<argument index="0" name="axis" type="int" enum="PhysicsServer3D.BodyAxis">
 			</argument>
 			<description>
 				Returns [code]true[/code] if the specified [code]axis[/code] is locked. See also [member move_lock_x], [member move_lock_y] and [member move_lock_z].
@@ -36,12 +36,12 @@
 			</description>
 		</method>
 		<method name="get_slide_collision">
-			<return type="KinematicCollision">
+			<return type="KinematicCollision3D">
 			</return>
 			<argument index="0" name="slide_idx" type="int">
 			</argument>
 			<description>
-				Returns a [KinematicCollision], which contains information about a collision that occurred during the last [method move_and_slide] call. Since the body can collide several times in a single call to [method move_and_slide], you must specify the index of the collision in the range 0 to ([method get_slide_count] - 1).
+				Returns a [KinematicCollision3D], which contains information about a collision that occurred during the last [method move_and_slide] call. Since the body can collide several times in a single call to [method move_and_slide], you must specify the index of the collision in the range 0 to ([method get_slide_count] - 1).
 			</description>
 		</method>
 		<method name="get_slide_count" qualifiers="const">
@@ -73,7 +73,7 @@
 			</description>
 		</method>
 		<method name="move_and_collide">
-			<return type="KinematicCollision">
+			<return type="KinematicCollision3D">
 			</return>
 			<argument index="0" name="rel_vec" type="Vector3">
 			</argument>
@@ -84,7 +84,7 @@
 			<argument index="3" name="test_only" type="bool" default="false">
 			</argument>
 			<description>
-				Moves the body along the vector [code]rel_vec[/code]. The body will stop if it collides. Returns a [KinematicCollision], which contains information about the collision.
+				Moves the body along the vector [code]rel_vec[/code]. The body will stop if it collides. Returns a [KinematicCollision3D], which contains information about the collision.
 				If [code]test_only[/code] is [code]true[/code], the body does not move but the would-be collision information is given.
 			</description>
 		</method>
@@ -104,14 +104,14 @@
 			<argument index="5" name="infinite_inertia" type="bool" default="true">
 			</argument>
 			<description>
-				Moves the body along a vector. If the body collides with another, it will slide along the other body rather than stop immediately. If the other body is a [KinematicBody] or [RigidBody], it will also be affected by the motion of the other body. You can use this to make moving or rotating platforms, or to make nodes push other nodes.
+				Moves the body along a vector. If the body collides with another, it will slide along the other body rather than stop immediately. If the other body is a [KinematicBody3D] or [RigidBody3D], it will also be affected by the motion of the other body. You can use this to make moving or rotating platforms, or to make nodes push other nodes.
 				This method should be used in [method Node._physics_process] (or in a method called by [method Node._physics_process]), as it uses the physics step's [code]delta[/code] value automatically in calculations. Otherwise, the simulation will run at an incorrect speed.
 				[code]linear_velocity[/code] is the velocity vector (typically meters per second). Unlike in [method move_and_collide], you should [i]not[/i] multiply it by [code]delta[/code] — the physics engine handles applying the velocity. 
 				[code]up_direction[/code] is the up direction, used to determine what is a wall and what is a floor or a ceiling. If set to the default value of [code]Vector3(0, 0, 0)[/code], everything is considered a wall.
 				If [code]stop_on_slope[/code] is [code]true[/code], body will not slide on slopes if you include gravity in [code]linear_velocity[/code].
 				If the body collides, it will change direction a maximum of [code]max_slides[/code] times before it stops.
 				[code]floor_max_angle[/code] is the maximum angle (in radians) where a slope is still considered a floor (or a ceiling), rather than a wall. The default value equals 45 degrees.
-				If [code]infinite_inertia[/code] is [code]true[/code], body will be able to push [RigidBody] nodes, but it won't also detect any collisions with them. If [code]false[/code], it will interact with [RigidBody] nodes like with [StaticBody].
+				If [code]infinite_inertia[/code] is [code]true[/code], body will be able to push [RigidBody3D] nodes, but it won't also detect any collisions with them. If [code]false[/code], it will interact with [RigidBody3D] nodes like with [StaticBody3D].
 				Returns the [code]linear_velocity[/code] vector, rotated and/or scaled if a slide collision occurred. To get detailed information about collisions that occurred, use [method get_slide_collision].
 			</description>
 		</method>
@@ -140,7 +140,7 @@
 		<method name="set_axis_lock">
 			<return type="void">
 			</return>
-			<argument index="0" name="axis" type="int" enum="PhysicsServer.BodyAxis">
+			<argument index="0" name="axis" type="int" enum="PhysicsServer3D.BodyAxis">
 			</argument>
 			<argument index="1" name="lock" type="bool">
 			</argument>
diff --git a/doc/classes/KinematicCollision.xml b/doc/classes/KinematicCollision3D.xml
index 858a1e69c0..f3248a9ca1 100644
--- a/doc/classes/KinematicCollision.xml
+++ b/doc/classes/KinematicCollision3D.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="KinematicCollision" inherits="Reference" version="4.0">
+<class name="KinematicCollision3D" inherits="Reference" version="4.0">
 	<brief_description>
-		Collision data for [KinematicBody] collisions.
+		Collision data for [KinematicBody3D] collisions.
 	</brief_description>
 	<description>
-		Contains collision data for [KinematicBody] collisions. When a [KinematicBody] is moved using [method KinematicBody.move_and_collide], it stops if it detects a collision with another body. If a collision is detected, a KinematicCollision object is returned.
+		Contains collision data for [KinematicBody3D] collisions. When a [KinematicBody3D] is moved using [method KinematicBody3D.move_and_collide], it stops if it detects a collision with another body. If a collision is detected, a KinematicCollision3D object is returned.
 		This object contains information about the collision, including the colliding object, the remaining motion, and the collision position. This information can be used to calculate a collision response.
 	</description>
 	<tutorials>
@@ -25,7 +25,7 @@
 			The colliding body's shape.
 		</member>
 		<member name="collider_shape_index" type="int" setter="" getter="get_collider_shape_index" default="0">
-			The colliding shape's index. See [CollisionObject].
+			The colliding shape's index. See [CollisionObject3D].
 		</member>
 		<member name="collider_velocity" type="Vector3" setter="" getter="get_collider_velocity" default="Vector3( 0, 0, 0 )">
 			The colliding object's velocity.
diff --git a/doc/classes/Light.xml b/doc/classes/Light3D.xml
index a2867a50d2..4e48a24951 100644
--- a/doc/classes/Light.xml
+++ b/doc/classes/Light3D.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Light" inherits="VisualInstance" version="4.0">
+<class name="Light3D" inherits="VisualInstance3D" version="4.0">
 	<brief_description>
 		Provides a base class for different kinds of light nodes.
 	</brief_description>
 	<description>
-		Light is the abstract base class for light nodes, so it shouldn't be used directly (it can't be instanced). Other types of light nodes inherit from it. Light contains the common variables and parameters used for lighting.
+		Light3D is the abstract base class for light nodes, so it shouldn't be used directly (it can't be instanced). Other types of light nodes inherit from it. Light3D contains the common variables and parameters used for lighting.
 	</description>
 	<tutorials>
 		<link>https://docs.godotengine.org/en/latest/tutorials/3d/lights_and_shadows.html</link>
@@ -13,21 +13,21 @@
 		<method name="get_param" qualifiers="const">
 			<return type="float">
 			</return>
-			<argument index="0" name="param" type="int" enum="Light.Param">
+			<argument index="0" name="param" type="int" enum="Light3D.Param">
 			</argument>
 			<description>
-				Returns the value of the specified [enum Light.Param] parameter.
+				Returns the value of the specified [enum Light3D.Param] parameter.
 			</description>
 		</method>
 		<method name="set_param">
 			<return type="void">
 			</return>
-			<argument index="0" name="param" type="int" enum="Light.Param">
+			<argument index="0" name="param" type="int" enum="Light3D.Param">
 			</argument>
 			<argument index="1" name="value" type="float">
 			</argument>
 			<description>
-				Sets the value of the specified [enum Light.Param] parameter.
+				Sets the value of the specified [enum Light3D.Param] parameter.
 			</description>
 		</method>
 	</methods>
@@ -35,7 +35,7 @@
 		<member name="editor_only" type="bool" setter="set_editor_only" getter="is_editor_only" default="false">
 			If [code]true[/code], the light only appears in the editor and will not be visible at runtime.
 		</member>
-		<member name="light_bake_mode" type="int" setter="set_bake_mode" getter="get_bake_mode" enum="Light.BakeMode" default="1">
+		<member name="light_bake_mode" type="int" setter="set_bake_mode" getter="get_bake_mode" enum="Light3D.BakeMode" default="1">
 			The light's bake mode. See [enum BakeMode].
 		</member>
 		<member name="light_color" type="Color" setter="set_color" getter="get_color" default="Color( 1, 1, 1, 1 )">
@@ -69,7 +69,7 @@
 			If [code]true[/code], the light will cast shadows.
 		</member>
 		<member name="shadow_reverse_cull_face" type="bool" setter="set_shadow_reverse_cull_face" getter="get_shadow_reverse_cull_face" default="false">
-			If [code]true[/code], reverses the backface culling of the mesh. This can be useful when you have a flat mesh that has a light behind it. If you need to cast a shadow on both sides of the mesh, set the mesh to use double-sided shadows with [constant GeometryInstance.SHADOW_CASTING_SETTING_DOUBLE_SIDED].
+			If [code]true[/code], reverses the backface culling of the mesh. This can be useful when you have a flat mesh that has a light behind it. If you need to cast a shadow on both sides of the mesh, set the mesh to use double-sided shadows with [constant GeometryInstance3D.SHADOW_CASTING_SETTING_DOUBLE_SIDED].
 		</member>
 	</members>
 	<constants>
@@ -83,42 +83,42 @@
 			Constant for accessing [member light_specular].
 		</constant>
 		<constant name="PARAM_RANGE" value="3" enum="Param">
-			Constant for accessing [member OmniLight.omni_range] or [member SpotLight.spot_range].
+			Constant for accessing [member OmniLight3D.omni_range] or [member SpotLight3D.spot_range].
 		</constant>
 		<constant name="PARAM_ATTENUATION" value="4" enum="Param">
-			Constant for accessing [member OmniLight.omni_attenuation] or [member SpotLight.spot_attenuation].
+			Constant for accessing [member OmniLight3D.omni_attenuation] or [member SpotLight3D.spot_attenuation].
 		</constant>
 		<constant name="PARAM_SPOT_ANGLE" value="5" enum="Param">
-			Constant for accessing [member SpotLight.spot_angle].
+			Constant for accessing [member SpotLight3D.spot_angle].
 		</constant>
 		<constant name="PARAM_SPOT_ATTENUATION" value="6" enum="Param">
-			Constant for accessing [member SpotLight.spot_angle_attenuation].
+			Constant for accessing [member SpotLight3D.spot_angle_attenuation].
 		</constant>
 		<constant name="PARAM_CONTACT_SHADOW_SIZE" value="7" enum="Param">
 			Constant for accessing [member shadow_contact].
 		</constant>
 		<constant name="PARAM_SHADOW_MAX_DISTANCE" value="8" enum="Param">
-			Constant for accessing [member DirectionalLight.directional_shadow_max_distance].
+			Constant for accessing [member DirectionalLight3D.directional_shadow_max_distance].
 		</constant>
 		<constant name="PARAM_SHADOW_SPLIT_1_OFFSET" value="9" enum="Param">
-			Constant for accessing [member DirectionalLight.directional_shadow_split_1].
+			Constant for accessing [member DirectionalLight3D.directional_shadow_split_1].
 		</constant>
 		<constant name="PARAM_SHADOW_SPLIT_2_OFFSET" value="10" enum="Param">
-			Constant for accessing [member DirectionalLight.directional_shadow_split_2].
+			Constant for accessing [member DirectionalLight3D.directional_shadow_split_2].
 		</constant>
 		<constant name="PARAM_SHADOW_SPLIT_3_OFFSET" value="11" enum="Param">
-			Constant for accessing [member DirectionalLight.directional_shadow_split_3].
+			Constant for accessing [member DirectionalLight3D.directional_shadow_split_3].
 		</constant>
 		<constant name="PARAM_SHADOW_FADE_START" value="12" enum="Param">
 		</constant>
 		<constant name="PARAM_SHADOW_NORMAL_BIAS" value="13" enum="Param">
-			Constant for accessing [member DirectionalLight.directional_shadow_normal_bias].
+			Constant for accessing [member DirectionalLight3D.directional_shadow_normal_bias].
 		</constant>
 		<constant name="PARAM_SHADOW_BIAS" value="14" enum="Param">
 			Constant for accessing [member shadow_bias].
 		</constant>
 		<constant name="PARAM_SHADOW_BIAS_SPLIT_SCALE" value="15" enum="Param">
-			Constant for accessing [member DirectionalLight.directional_shadow_bias_split_scale].
+			Constant for accessing [member DirectionalLight3D.directional_shadow_bias_split_scale].
 		</constant>
 		<constant name="PARAM_MAX" value="16" enum="Param">
 			Represents the size of the [enum Param] enum.
diff --git a/doc/classes/Listener.xml b/doc/classes/Listener3D.xml
index 72bbfa29d4..998ea757ff 100644
--- a/doc/classes/Listener.xml
+++ b/doc/classes/Listener3D.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Listener" inherits="Spatial" version="4.0">
+<class name="Listener3D" inherits="Node3D" version="4.0">
 	<brief_description>
 		Overrides the location sounds are heard from.
 	</brief_description>
 	<description>
-		Once added to the scene tree and enabled using [method make_current], this node will override the location sounds are heard from. This can be used to listen from a location different from the [Camera].
+		Once added to the scene tree and enabled using [method make_current], this node will override the location sounds are heard from. This can be used to listen from a location different from the [Camera3D].
 		[b]Note:[/b] There is no 2D equivalent for this node yet.
 	</description>
 	<tutorials>
@@ -29,7 +29,7 @@
 			</return>
 			<description>
 				Returns [code]true[/code] if the listener was made current using [method make_current], [code]false[/code] otherwise.
-				[b]Note:[/b] There may be more than one Listener marked as "current" in the scene tree, but only the one that was made current last will be used.
+				[b]Note:[/b] There may be more than one Listener3D marked as "current" in the scene tree, but only the one that was made current last will be used.
 			</description>
 		</method>
 		<method name="make_current">
diff --git a/doc/classes/Material.xml b/doc/classes/Material.xml
index a0c1979646..a37c8127f0 100644
--- a/doc/classes/Material.xml
+++ b/doc/classes/Material.xml
@@ -4,7 +4,7 @@
 		Abstract base [Resource] for coloring and shading geometry.
 	</brief_description>
 	<description>
-		Material is a base [Resource] used for coloring and shading geometry. All materials inherit from it and almost all [VisualInstance] derived nodes carry a Material. A few flags and parameters are shared between all material types and are configured here.
+		Material is a base [Resource] used for coloring and shading geometry. All materials inherit from it and almost all [VisualInstance3D] derived nodes carry a Material. A few flags and parameters are shared between all material types and are configured here.
 	</description>
 	<tutorials>
 	</tutorials>
diff --git a/doc/classes/Mesh.xml b/doc/classes/Mesh.xml
index dc7ffc8934..6958c815a6 100644
--- a/doc/classes/Mesh.xml
+++ b/doc/classes/Mesh.xml
@@ -10,10 +10,10 @@
 	</tutorials>
 	<methods>
 		<method name="create_convex_shape" qualifiers="const">
-			<return type="Shape">
+			<return type="Shape3D">
 			</return>
 			<description>
-				Calculate a [ConvexPolygonShape] from the mesh.
+				Calculate a [ConvexPolygonShape3D] from the mesh.
 			</description>
 		</method>
 		<method name="create_outline" qualifiers="const">
@@ -27,10 +27,10 @@
 			</description>
 		</method>
 		<method name="create_trimesh_shape" qualifiers="const">
-			<return type="Shape">
+			<return type="Shape3D">
 			</return>
 			<description>
-				Calculate a [ConcavePolygonShape] from the mesh.
+				Calculate a [ConcavePolygonShape3D] from the mesh.
 			</description>
 		</method>
 		<method name="generate_triangle_mesh" qualifiers="const">
diff --git a/doc/classes/MeshInstance2D.xml b/doc/classes/MeshInstance2D.xml
index 2781dd4626..0cfc8deb0a 100644
--- a/doc/classes/MeshInstance2D.xml
+++ b/doc/classes/MeshInstance2D.xml
@@ -4,7 +4,7 @@
 		Node used for displaying a [Mesh] in 2D.
 	</brief_description>
 	<description>
-		Node used for displaying a [Mesh] in 2D. Can be constructed from an existing [Sprite] via a tool in the editor toolbar. Select "Sprite" then "Convert to Mesh2D", select settings in popup and press "Create Mesh2D".
+		Node used for displaying a [Mesh] in 2D. Can be constructed from an existing [Sprite2D] via a tool in the editor toolbar. Select "Sprite2D" then "Convert to Mesh2D", select settings in popup and press "Create Mesh2D".
 	</description>
 	<tutorials>
 		<link>https://docs.godotengine.org/en/latest/tutorials/2d/2d_meshes.html</link>
diff --git a/doc/classes/MeshInstance.xml b/doc/classes/MeshInstance3D.xml
index 6123dfa37a..9276c5dc65 100644
--- a/doc/classes/MeshInstance.xml
+++ b/doc/classes/MeshInstance3D.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="MeshInstance" inherits="GeometryInstance" version="4.0">
+<class name="MeshInstance3D" inherits="GeometryInstance3D" version="4.0">
 	<brief_description>
 		Node that instances meshes into a scenario.
 	</brief_description>
 	<description>
-		MeshInstance is a node that takes a [Mesh] resource and adds it to the current scenario by creating an instance of it. This is the class most often used to get 3D geometry rendered and can be used to instance a single [Mesh] in many places. This allows to reuse geometry and save on resources. When a [Mesh] has to be instanced more than thousands of times at close proximity, consider using a [MultiMesh] in a [MultiMeshInstance] instead.
+		MeshInstance3D is a node that takes a [Mesh] resource and adds it to the current scenario by creating an instance of it. This is the class most often used to get 3D geometry rendered and can be used to instance a single [Mesh] in many places. This allows to reuse geometry and save on resources. When a [Mesh] has to be instanced more than thousands of times at close proximity, consider using a [MultiMesh] in a [MultiMeshInstance3D] instead.
 	</description>
 	<tutorials>
 	</tutorials>
@@ -13,21 +13,21 @@
 			<return type="void">
 			</return>
 			<description>
-				This helper creates a [StaticBody] child node with a [ConvexPolygonShape] collision shape calculated from the mesh geometry. It's mainly used for testing.
+				This helper creates a [StaticBody3D] child node with a [ConvexPolygonShape3D] collision shape calculated from the mesh geometry. It's mainly used for testing.
 			</description>
 		</method>
 		<method name="create_debug_tangents">
 			<return type="void">
 			</return>
 			<description>
-				This helper creates a [MeshInstance] child node with gizmos at every vertex calculated from the mesh geometry. It's mainly used for testing.
+				This helper creates a [MeshInstance3D] child node with gizmos at every vertex calculated from the mesh geometry. It's mainly used for testing.
 			</description>
 		</method>
 		<method name="create_trimesh_collision">
 			<return type="void">
 			</return>
 			<description>
-				This helper creates a [StaticBody] child node with a [ConcavePolygonShape] collision shape calculated from the mesh geometry. It's mainly used for testing.
+				This helper creates a [StaticBody3D] child node with a [ConcavePolygonShape3D] collision shape calculated from the mesh geometry. It's mainly used for testing.
 			</description>
 		</method>
 		<method name="get_surface_material" qualifiers="const">
@@ -63,7 +63,7 @@
 			The [Mesh] resource for the instance.
 		</member>
 		<member name="skeleton" type="NodePath" setter="set_skeleton_path" getter="get_skeleton_path" default="NodePath(&quot;..&quot;)">
-			[NodePath] to the [Skeleton] associated with the instance.
+			[NodePath] to the [Skeleton3D] associated with the instance.
 		</member>
 		<member name="skin" type="Skin" setter="set_skin" getter="get_skin">
 			Sets the skin to be used by this instance.
diff --git a/doc/classes/MeshLibrary.xml b/doc/classes/MeshLibrary.xml
index a96f6d7231..ccf6172017 100644
--- a/doc/classes/MeshLibrary.xml
+++ b/doc/classes/MeshLibrary.xml
@@ -94,7 +94,7 @@
 			</argument>
 			<description>
 				Returns an item's collision shapes.
-				The array consists of each [Shape] followed by its [Transform].
+				The array consists of each [Shape3D] followed by its [Transform].
 			</description>
 		</method>
 		<method name="get_last_unused_item_id" qualifiers="const">
@@ -178,7 +178,7 @@
 			</argument>
 			<description>
 				Sets an item's collision shapes.
-				The array should consist of [Shape] objects, each followed by a [Transform] that will be applied to it. For shapes that should not have a transform, use [constant Transform.IDENTITY].
+				The array should consist of [Shape3D] objects, each followed by a [Transform] that will be applied to it. For shapes that should not have a transform, use [constant Transform.IDENTITY].
 			</description>
 		</method>
 	</methods>
diff --git a/doc/classes/MultiMesh.xml b/doc/classes/MultiMesh.xml
index 2a1d270990..0f56ab4b95 100644
--- a/doc/classes/MultiMesh.xml
+++ b/doc/classes/MultiMesh.xml
@@ -4,7 +4,7 @@
 		Provides high-performance mesh instancing.
 	</brief_description>
 	<description>
-		MultiMesh provides low-level mesh instancing. Drawing thousands of [MeshInstance] nodes can be slow, since each object is submitted to the GPU then drawn individually.
+		MultiMesh provides low-level mesh instancing. Drawing thousands of [MeshInstance3D] nodes can be slow, since each object is submitted to the GPU then drawn individually.
 		MultiMesh is much faster as it can draw thousands of instances with a single draw call, resulting in less API overhead.
 		As a drawback, if the instances are too far away of each other, performance may be reduced as every single instance will always rendered (they are spatially indexed as one, for the whole object).
 		Since instances may have any behavior, the AABB used for visibility must be provided by the user.
diff --git a/doc/classes/MultiMeshInstance2D.xml b/doc/classes/MultiMeshInstance2D.xml
index 2fe5447a27..07f21514ef 100644
--- a/doc/classes/MultiMeshInstance2D.xml
+++ b/doc/classes/MultiMeshInstance2D.xml
@@ -5,7 +5,7 @@
 	</brief_description>
 	<description>
 		[MultiMeshInstance2D] is a specialized node to instance a [MultiMesh] resource in 2D.
-		Usage is the same as [MultiMeshInstance].
+		Usage is the same as [MultiMeshInstance3D].
 	</description>
 	<tutorials>
 	</tutorials>
diff --git a/doc/classes/MultiMeshInstance.xml b/doc/classes/MultiMeshInstance3D.xml
index 6cbc0a8e04..cab17c952e 100644
--- a/doc/classes/MultiMeshInstance.xml
+++ b/doc/classes/MultiMeshInstance3D.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="MultiMeshInstance" inherits="GeometryInstance" version="4.0">
+<class name="MultiMeshInstance3D" inherits="GeometryInstance3D" version="4.0">
 	<brief_description>
 		Node that instances a [MultiMesh].
 	</brief_description>
 	<description>
-		[MultiMeshInstance] is a specialized node to instance [GeometryInstance]s based on a [MultiMesh] resource.
+		[MultiMeshInstance3D] is a specialized node to instance [GeometryInstance3D]s based on a [MultiMesh] resource.
 		This is useful to optimize the rendering of a high amount of instances of a given mesh (for example trees in a forest or grass strands).
 	</description>
 	<tutorials>
@@ -16,7 +16,7 @@
 	</methods>
 	<members>
 		<member name="multimesh" type="MultiMesh" setter="set_multimesh" getter="get_multimesh">
-			The [MultiMesh] resource that will be used and shared among all instances of the [MultiMeshInstance].
+			The [MultiMesh] resource that will be used and shared among all instances of the [MultiMeshInstance3D].
 		</member>
 	</members>
 	<constants>
diff --git a/doc/classes/Navigation.xml b/doc/classes/Navigation3D.xml
index 93170bca4a..807f0ad309 100644
--- a/doc/classes/Navigation.xml
+++ b/doc/classes/Navigation3D.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Navigation" inherits="Spatial" version="4.0">
+<class name="Navigation3D" inherits="Node3D" version="4.0">
 	<brief_description>
 		Mesh-based navigation and pathfinding node.
 	</brief_description>
 	<description>
-		Provides navigation and pathfinding within a collection of [NavigationMesh]es. These will be automatically collected from child [NavigationRegion] nodes. In addition to basic pathfinding, this class also assists with aligning navigation agents with the meshes they are navigating on.
+		Provides navigation and pathfinding within a collection of [NavigationMesh]es. These will be automatically collected from child [NavigationRegion3D] nodes. In addition to basic pathfinding, this class also assists with aligning navigation agents with the meshes they are navigating on.
 	</description>
 	<tutorials>
 	</tutorials>
diff --git a/doc/classes/NavigationAgent.xml b/doc/classes/NavigationAgent3D.xml
index c6c9abec13..f9df1d390b 100644
--- a/doc/classes/NavigationAgent.xml
+++ b/doc/classes/NavigationAgent3D.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="NavigationAgent" inherits="Node" version="4.0">
+<class name="NavigationAgent3D" inherits="Node" version="4.0">
 	<brief_description>
 		3D Agent used in navigation for collision avoidance.
 	</brief_description>
 	<description>
-		3D Agent that is used in navigation to reach a location while avoiding static and dynamic obstacles. The dynamic obstacles are avoided using RVO collision avoidance. The agent needs navigation data to work correctly. This can be done by having the agent as a child of a [Navigation] node, or using [method set_navigation]. [NavigationAgent] is physics safe.
+		3D Agent that is used in navigation to reach a location while avoiding static and dynamic obstacles. The dynamic obstacles are avoided using RVO collision avoidance. The agent needs navigation data to work correctly. This can be done by having the agent as a child of a [Navigation3D] node, or using [method set_navigation]. [NavigationAgent3D] is physics safe.
 	</description>
 	<tutorials>
 	</tutorials>
@@ -41,7 +41,7 @@
 			<return type="Node">
 			</return>
 			<description>
-				Returns the [Navigation] node that the agent is using for its navigation system.
+				Returns the [Navigation3D] node that the agent is using for its navigation system.
 			</description>
 		</method>
 		<method name="get_next_location">
@@ -85,7 +85,7 @@
 			<argument index="0" name="navigation" type="Node">
 			</argument>
 			<description>
-				Sets the [Navigation] node used by the agent. Useful when you don't want to make the agent a child of a [Navigation] node.
+				Sets the [Navigation3D] node used by the agent. Useful when you don't want to make the agent a child of a [Navigation3D] node.
 			</description>
 		</method>
 		<method name="set_target_location">
diff --git a/doc/classes/NavigationObstacle2D.xml b/doc/classes/NavigationObstacle2D.xml
index 4d12b985e0..ddd96975f1 100644
--- a/doc/classes/NavigationObstacle2D.xml
+++ b/doc/classes/NavigationObstacle2D.xml
@@ -4,7 +4,7 @@
 		2D Obstacle used in navigation for collision avoidance.
 	</brief_description>
 	<description>
-		2D Obstacle used in navigation for collision avoidance. The obstacle needs navigation data to work correctly. This can be done by having the obstacle as a child of a [Navigation2D] node, or using [method set_navigation]. [NavigationObstacle] is physics safe.
+		2D Obstacle used in navigation for collision avoidance. The obstacle needs navigation data to work correctly. This can be done by having the obstacle as a child of a [Navigation2D] node, or using [method set_navigation]. [NavigationObstacle2D] is physics safe.
 	</description>
 	<tutorials>
 	</tutorials>
diff --git a/doc/classes/NavigationObstacle.xml b/doc/classes/NavigationObstacle3D.xml
index 31cf01793a..e01a40ed73 100644
--- a/doc/classes/NavigationObstacle.xml
+++ b/doc/classes/NavigationObstacle3D.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="NavigationObstacle" inherits="Node" version="4.0">
+<class name="NavigationObstacle3D" inherits="Node" version="4.0">
 	<brief_description>
 		3D Obstacle used in navigation for collision avoidance.
 	</brief_description>
 	<description>
-		3D Obstacle used in navigation for collision avoidance. The obstacle needs navigation data to work correctly. This can be done by having the obstacle as a child of a [Navigation] node, or using [method set_navigation]. [NavigationObstacle] is physics safe.
+		3D Obstacle used in navigation for collision avoidance. The obstacle needs navigation data to work correctly. This can be done by having the obstacle as a child of a [Navigation3D] node, or using [method set_navigation]. [NavigationObstacle3D] is physics safe.
 	</description>
 	<tutorials>
 	</tutorials>
@@ -13,7 +13,7 @@
 			<return type="Node">
 			</return>
 			<description>
-				Returns the [Navigation] node that the obstacle is using for its navigation system.
+				Returns the [Navigation3D] node that the obstacle is using for its navigation system.
 			</description>
 		</method>
 		<method name="set_navigation">
@@ -22,7 +22,7 @@
 			<argument index="0" name="navigation" type="Node">
 			</argument>
 			<description>
-				Sets the [Navigation] node used by the obstacle. Useful when you don't want to make the obstacle a child of a [Navigation] node.
+				Sets the [Navigation3D] node used by the obstacle. Useful when you don't want to make the obstacle a child of a [Navigation3D] node.
 			</description>
 		</method>
 	</methods>
diff --git a/doc/classes/NavigationRegion.xml b/doc/classes/NavigationRegion3D.xml
index a32ded2878..b70bfb6596 100644
--- a/doc/classes/NavigationRegion.xml
+++ b/doc/classes/NavigationRegion3D.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="NavigationRegion" inherits="Spatial" version="4.0">
+<class name="NavigationRegion3D" inherits="Node3D" version="4.0">
 	<brief_description>
 		A region of the navigation map.
 	</brief_description>
 	<description>
-		A region of the navigation map. It tells the [Navigation] node what can be navigated and what cannot, based on the [NavigationMesh] resource. This should be a child of a [Navigation] node (even not a direct child).
+		A region of the navigation map. It tells the [Navigation3D] node what can be navigated and what cannot, based on the [NavigationMesh] resource. This should be a child of a [Navigation3D] node (even not a direct child).
 	</description>
 	<tutorials>
 	</tutorials>
@@ -19,7 +19,7 @@
 	</methods>
 	<members>
 		<member name="enabled" type="bool" setter="set_enabled" getter="is_enabled" default="true">
-			Determines if the [NavigationRegion] is enabled or disabled.
+			Determines if the [NavigationRegion3D] is enabled or disabled.
 		</member>
 		<member name="navmesh" type="NavigationMesh" setter="set_navigation_mesh" getter="get_navigation_mesh">
 			The [NavigationMesh] resource to use.
diff --git a/doc/classes/Navigation2DServer.xml b/doc/classes/NavigationServer2D.xml
index 110844c492..1b9099336c 100644
--- a/doc/classes/Navigation2DServer.xml
+++ b/doc/classes/NavigationServer2D.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Navigation2DServer" inherits="Object" version="4.0">
+<class name="NavigationServer2D" inherits="Object" version="4.0">
 	<brief_description>
 		Server interface for low-level 2D navigation access
 	</brief_description>
 	<description>
-		Navigation2DServer is the server responsible for all 2D navigation. It creates the agents, maps, and regions for navigation to work as expected. This keeps tracks of any call and executes them during the sync phase. This means that you can request any change to the map, using any thread, without worrying.
+		NavigationServer2D is the server responsible for all 2D navigation. It creates the agents, maps, and regions for navigation to work as expected. This keeps tracks of any call and executes them during the sync phase. This means that you can request any change to the map, using any thread, without worrying.
 	</description>
 	<tutorials>
 	</tutorials>
diff --git a/doc/classes/NavigationServer.xml b/doc/classes/NavigationServer3D.xml
index 1b534b8458..1f621c3c81 100644
--- a/doc/classes/NavigationServer.xml
+++ b/doc/classes/NavigationServer3D.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="NavigationServer" inherits="Object" version="4.0">
+<class name="NavigationServer3D" inherits="Object" version="4.0">
 	<brief_description>
 		Server interface for low-level 3D navigation access
 	</brief_description>
 	<description>
-		NavigationServer is the server responsible for all 3D navigation. It creates the agents, maps, and regions for navigation to work as expected. This keeps tracks of any call and executes them during the sync phase. This means that you can request any change to the map, using any thread, without worrying.
+		NavigationServer3D is the server responsible for all 3D navigation. It creates the agents, maps, and regions for navigation to work as expected. This keeps tracks of any call and executes them during the sync phase. This means that you can request any change to the map, using any thread, without worrying.
 	</description>
 	<tutorials>
 	</tutorials>
diff --git a/doc/classes/Spatial.xml b/doc/classes/Node3D.xml
index d057db8519..ef24f638fb 100644
--- a/doc/classes/Spatial.xml
+++ b/doc/classes/Node3D.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Spatial" inherits="Node" version="4.0">
+<class name="Node3D" inherits="Node" version="4.0">
 	<brief_description>
 		Most basic 3D game object, parent of all 3D-related nodes.
 	</brief_description>
 	<description>
-		Most basic 3D game object, with a 3D [Transform] and visibility settings. All other 3D game objects inherit from Spatial. Use [Spatial] as a parent node to move, scale, rotate and show/hide children in a 3D project.
-		Affine operations (rotate, scale, translate) happen in parent's local coordinate system, unless the [Spatial] object is set as top-level. Affine operations in this coordinate system correspond to direct affine operations on the [Spatial]'s transform. The word local below refers to this coordinate system. The coordinate system that is attached to the [Spatial] object itself is referred to as object-local coordinate system.
+		Most basic 3D game object, with a 3D [Transform] and visibility settings. All other 3D game objects inherit from Node3D. Use [Node3D] as a parent node to move, scale, rotate and show/hide children in a 3D project.
+		Affine operations (rotate, scale, translate) happen in parent's local coordinate system, unless the [Node3D] object is set as top-level. Affine operations in this coordinate system correspond to direct affine operations on the [Node3D]'s transform. The word local below refers to this coordinate system. The coordinate system that is attached to the [Node3D] object itself is referred to as object-local coordinate system.
 	</description>
 	<tutorials>
 		<link>https://docs.godotengine.org/en/latest/tutorials/3d/introduction_to_3d.html</link>
@@ -19,17 +19,17 @@
 			</description>
 		</method>
 		<method name="get_parent_spatial" qualifiers="const">
-			<return type="Spatial">
+			<return type="Node3D">
 			</return>
 			<description>
-				Returns the parent [Spatial], or an empty [Object] if no parent exists or parent is not of type [Spatial].
+				Returns the parent [Node3D], or an empty [Object] if no parent exists or parent is not of type [Node3D].
 			</description>
 		</method>
 		<method name="get_world" qualifiers="const">
-			<return type="World">
+			<return type="World3D">
 			</return>
 			<description>
-				Returns the current [World] resource this [Spatial] node is registered to.
+				Returns the current [World3D] resource this [Node3D] node is registered to.
 			</description>
 		</method>
 		<method name="global_rotate">
@@ -72,7 +72,7 @@
 			<return type="bool">
 			</return>
 			<description>
-				Returns whether node notifies about its local transformation changes. [Spatial] will not propagate this by default.
+				Returns whether node notifies about its local transformation changes. [Node3D] will not propagate this by default.
 			</description>
 		</method>
 		<method name="is_scale_disabled" qualifiers="const">
@@ -93,7 +93,7 @@
 			<return type="bool">
 			</return>
 			<description>
-				Returns whether the node notifies about its global and local transformation changes. [Spatial] will not propagate this by default.
+				Returns whether the node notifies about its global and local transformation changes. [Node3D] will not propagate this by default.
 			</description>
 		</method>
 		<method name="is_visible_in_tree" qualifiers="const">
@@ -234,7 +234,7 @@
 			<argument index="0" name="enable" type="bool">
 			</argument>
 			<description>
-				Sets whether the node notifies about its local transformation changes. [Spatial] will not propagate this by default.
+				Sets whether the node notifies about its local transformation changes. [Node3D] will not propagate this by default.
 			</description>
 		</method>
 		<method name="set_notify_transform">
@@ -243,7 +243,7 @@
 			<argument index="0" name="enable" type="bool">
 			</argument>
 			<description>
-				Sets whether the node notifies about its global and local transformation changes. [Spatial] will not propagate this by default.
+				Sets whether the node notifies about its global and local transformation changes. [Node3D] will not propagate this by default.
 			</description>
 		</method>
 		<method name="show">
@@ -294,16 +294,16 @@
 			<return type="void">
 			</return>
 			<description>
-				Updates the [SpatialGizmo] of this node.
+				Updates the [Node3DGizmo] of this node.
 			</description>
 		</method>
 	</methods>
 	<members>
-		<member name="gizmo" type="SpatialGizmo" setter="set_gizmo" getter="get_gizmo">
-			The [SpatialGizmo] for this node. Used for example in [EditorSpatialGizmo] as custom visualization and editing handles in Editor.
+		<member name="gizmo" type="Node3DGizmo" setter="set_gizmo" getter="get_gizmo">
+			The [Node3DGizmo] for this node. Used for example in [EditorNode3DGizmo] as custom visualization and editing handles in Editor.
 		</member>
 		<member name="global_transform" type="Transform" setter="set_global_transform" getter="get_global_transform">
-			World space (global) [Transform] of this node.
+			World3D space (global) [Transform] of this node.
 		</member>
 		<member name="rotation" type="Vector3" setter="set_rotation" getter="get_rotation">
 			Rotation part of the local transformation in radians, specified in terms of YXZ-Euler angles in the format (X angle, Y angle, Z angle).
@@ -334,17 +334,17 @@
 	</signals>
 	<constants>
 		<constant name="NOTIFICATION_TRANSFORM_CHANGED" value="2000">
-			Spatial nodes receives this notification when their global transform changes. This means that either the current or a parent node changed its transform.
+			Node3D nodes receives this notification when their global transform changes. This means that either the current or a parent node changed its transform.
 			In order for [constant NOTIFICATION_TRANSFORM_CHANGED] to work, users first need to ask for it, with [method set_notify_transform].
 		</constant>
 		<constant name="NOTIFICATION_ENTER_WORLD" value="41">
-			Spatial nodes receives this notification when they are registered to new [World] resource.
+			Node3D nodes receives this notification when they are registered to new [World3D] resource.
 		</constant>
 		<constant name="NOTIFICATION_EXIT_WORLD" value="42">
-			Spatial nodes receives this notification when they are unregistered from current [World] resource.
+			Node3D nodes receives this notification when they are unregistered from current [World3D] resource.
 		</constant>
 		<constant name="NOTIFICATION_VISIBILITY_CHANGED" value="43">
-			Spatial nodes receives this notification when their visibility changes.
+			Node3D nodes receives this notification when their visibility changes.
 		</constant>
 	</constants>
 </class>
diff --git a/doc/classes/SpatialGizmo.xml b/doc/classes/Node3DGizmo.xml
index 5260eaa8a3..55080614fc 100644
--- a/doc/classes/SpatialGizmo.xml
+++ b/doc/classes/Node3DGizmo.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="SpatialGizmo" inherits="Reference" version="4.0">
+<class name="Node3DGizmo" inherits="Reference" version="4.0">
 	<brief_description>
 	</brief_description>
 	<description>
diff --git a/doc/classes/NodePath.xml b/doc/classes/NodePath.xml
index e8ab3e536e..dc7fd1be3f 100644
--- a/doc/classes/NodePath.xml
+++ b/doc/classes/NodePath.xml
@@ -4,7 +4,7 @@
 		Pre-parsed scene tree path.
 	</brief_description>
 	<description>
-		A pre-parsed relative or absolute path in a scene tree, for use with [method Node.get_node] and similar functions. It can reference a node, a resource within a node, or a property of a node or resource. For instance, [code]"Path2D/PathFollow2D/Sprite:texture:size"[/code] would refer to the [code]size[/code] property of the [code]texture[/code] resource on the node named [code]"Sprite"[/code] which is a child of the other named nodes in the path.
+		A pre-parsed relative or absolute path in a scene tree, for use with [method Node.get_node] and similar functions. It can reference a node, a resource within a node, or a property of a node or resource. For instance, [code]"Path2D/PathFollow2D/Sprite2D:texture:size"[/code] would refer to the [code]size[/code] property of the [code]texture[/code] resource on the node named [code]"Sprite2D"[/code] which is a child of the other named nodes in the path.
 		You will usually just pass a string to [method Node.get_node] and it will be automatically converted, but you may occasionally want to parse a path ahead of time with [NodePath] or the literal syntax [code]@"path"[/code]. Exporting a [NodePath] variable will give you a node selection widget in the properties panel of the editor, which can often be useful.
 		A [NodePath] is composed of a list of slash-separated node names (like a filesystem path) and an optional colon-separated list of "subnames" which can be resources or properties.
 		Some examples of NodePaths include the following:
@@ -30,20 +30,20 @@
 			<argument index="0" name="from" type="String">
 			</argument>
 			<description>
-				Creates a NodePath from a string, e.g. [code]"Path2D/PathFollow2D/Sprite:texture:size"[/code]. A path is absolute if it starts with a slash. Absolute paths are only valid in the global scene tree, not within individual scenes. In a relative path, [code]"."[/code] and [code]".."[/code] indicate the current node and its parent.
+				Creates a NodePath from a string, e.g. [code]"Path2D/PathFollow2D/Sprite2D:texture:size"[/code]. A path is absolute if it starts with a slash. Absolute paths are only valid in the global scene tree, not within individual scenes. In a relative path, [code]"."[/code] and [code]".."[/code] indicate the current node and its parent.
 				The "subnames" optionally included after the path to the target node can point to resources or properties, and can also be nested.
 				Examples of valid NodePaths (assuming that those nodes exist and have the referenced resources or properties):
 				[codeblock]
-				# Points to the Sprite node
-				"Path2D/PathFollow2D/Sprite"
-				# Points to the Sprite node and its "texture" resource.
-				# get_node() would retrieve "Sprite", while get_node_and_resource()
-				# would retrieve both the Sprite node and the "texture" resource.
-				"Path2D/PathFollow2D/Sprite:texture"
-				# Points to the Sprite node and its "position" property.
-				"Path2D/PathFollow2D/Sprite:position"
-				# Points to the Sprite node and the "x" component of its "position" property.
-				"Path2D/PathFollow2D/Sprite:position:x"
+				# Points to the Sprite2D node
+				"Path2D/PathFollow2D/Sprite2D"
+				# Points to the Sprite2D node and its "texture" resource.
+				# get_node() would retrieve "Sprite2D", while get_node_and_resource()
+				# would retrieve both the Sprite2D node and the "texture" resource.
+				"Path2D/PathFollow2D/Sprite2D:texture"
+				# Points to the Sprite2D node and its "position" property.
+				"Path2D/PathFollow2D/Sprite2D:position"
+				# Points to the Sprite2D node and the "x" component of its "position" property.
+				"Path2D/PathFollow2D/Sprite2D:position:x"
 				# Absolute path (from "root")
 				"/root/Level/Path2D"
 				[/codeblock]
@@ -69,7 +69,7 @@
 			<description>
 				Returns all subnames concatenated with a colon character ([code]:[/code]) as separator, i.e. the right side of the first colon in a node path.
 				[codeblock]
-				var nodepath = NodePath("Path2D/PathFollow2D/Sprite:texture:load_path")
+				var nodepath = NodePath("Path2D/PathFollow2D/Sprite2D:texture:load_path")
 				print(nodepath.get_concatenated_subnames()) # texture:load_path
 				[/codeblock]
 			</description>
@@ -82,7 +82,7 @@
 			<description>
 				Gets the node name indicated by [code]idx[/code] (0 to [method get_name_count]).
 				[codeblock]
-				var node_path = NodePath("Path2D/PathFollow2D/Sprite")
+				var node_path = NodePath("Path2D/PathFollow2D/Sprite2D")
 				print(node_path.get_name(0)) # Path2D
 				print(node_path.get_name(1)) # PathFollow2D
 				print(node_path.get_name(2)) # Sprite
@@ -94,7 +94,7 @@
 			</return>
 			<description>
 				Gets the number of node names which make up the path. Subnames (see [method get_subname_count]) are not included.
-				For example, [code]"Path2D/PathFollow2D/Sprite"[/code] has 3 names.
+				For example, [code]"Path2D/PathFollow2D/Sprite2D"[/code] has 3 names.
 			</description>
 		</method>
 		<method name="get_subname">
@@ -105,7 +105,7 @@
 			<description>
 				Gets the resource or property name indicated by [code]idx[/code] (0 to [method get_subname_count]).
 				[codeblock]
-				var node_path = NodePath("Path2D/PathFollow2D/Sprite:texture:load_path")
+				var node_path = NodePath("Path2D/PathFollow2D/Sprite2D:texture:load_path")
 				print(node_path.get_subname(0)) # texture
 				print(node_path.get_subname(1)) # load_path
 				[/codeblock]
@@ -116,7 +116,7 @@
 			</return>
 			<description>
 				Gets the number of resource or property names ("subnames") in the path. Each subname is listed after a colon character ([code]:[/code]) in the node path.
-				For example, [code]"Path2D/PathFollow2D/Sprite:texture:load_path"[/code] has 2 subnames.
+				For example, [code]"Path2D/PathFollow2D/Sprite2D:texture:load_path"[/code] has 2 subnames.
 			</description>
 		</method>
 		<method name="is_absolute">
diff --git a/doc/classes/Object.xml b/doc/classes/Object.xml
index 33f5fc0f35..35e87d1a2a 100644
--- a/doc/classes/Object.xml
+++ b/doc/classes/Object.xml
@@ -314,7 +314,7 @@
 		<method name="has_signal" qualifiers="const">
 			<return type="bool">
 			</return>
-			<argument index="0" name="signal" type="String">
+			<argument index="0" name="signal" type="StringName">
 			</argument>
 			<description>
 				Returns [code]true[/code] if the given [code]signal[/code] exists.
diff --git a/doc/classes/OmniLight.xml b/doc/classes/OmniLight3D.xml
index dc57efd3f9..0bbc987156 100644
--- a/doc/classes/OmniLight.xml
+++ b/doc/classes/OmniLight3D.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="OmniLight" inherits="Light" version="4.0">
+<class name="OmniLight3D" inherits="Light3D" version="4.0">
 	<brief_description>
 		Omnidirectional light, such as a light bulb or a candle.
 	</brief_description>
 	<description>
-		An Omnidirectional light is a type of [Light] that emits light in all directions. The light is attenuated by distance and this attenuation can be configured by changing its energy, radius, and attenuation parameters.
+		An Omnidirectional light is a type of [Light3D] that emits light in all directions. The light is attenuated by distance and this attenuation can be configured by changing its energy, radius, and attenuation parameters.
 	</description>
 	<tutorials>
 		<link>https://docs.godotengine.org/en/latest/tutorials/3d/lights_and_shadows.html</link>
@@ -18,7 +18,7 @@
 		<member name="omni_range" type="float" setter="set_param" getter="get_param" default="5.0">
 			The light's radius.
 		</member>
-		<member name="omni_shadow_mode" type="int" setter="set_shadow_mode" getter="get_shadow_mode" enum="OmniLight.ShadowMode" default="1">
+		<member name="omni_shadow_mode" type="int" setter="set_shadow_mode" getter="get_shadow_mode" enum="OmniLight3D.ShadowMode" default="1">
 			See [enum ShadowMode].
 		</member>
 	</members>
diff --git a/doc/classes/ParticlesMaterial.xml b/doc/classes/ParticlesMaterial.xml
index 1e90214e47..d04ac5bdce 100644
--- a/doc/classes/ParticlesMaterial.xml
+++ b/doc/classes/ParticlesMaterial.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <class name="ParticlesMaterial" inherits="Material" version="4.0">
 	<brief_description>
-		Particle properties for [Particles] and [Particles2D] nodes.
+		Particle properties for [GPUParticles3D] and [GPUParticles2D] nodes.
 	</brief_description>
 	<description>
-		ParticlesMaterial defines particle properties and behavior. It is used in the [code]process_material[/code] of [Particles] and [Particles2D] emitter nodes.
+		ParticlesMaterial defines particle properties and behavior. It is used in the [code]process_material[/code] of [GPUParticles3D] and [GPUParticles2D] emitter nodes.
 		Some of this material's properties are applied to each particle when emitted, while others can have a [CurveTexture] applied to vary values over the lifetime of the particle.
 		When a randomness ratio is applied to a property it is used to scale that property by a random amount. The random ratio is used to interpolate between [code]1.0[/code] and a random number less than one, the result is multiplied by the property to obtain the randomized property. For example a random ratio of [code]0.4[/code] would scale the original property between [code]0.4-1.0[/code] of its original value.
 	</description>
@@ -132,7 +132,7 @@
 			Animation speed randomness ratio.
 		</member>
 		<member name="color" type="Color" setter="set_color" getter="get_color" default="Color( 1, 1, 1, 1 )">
-			Each particle's initial color. If the [Particles2D]'s [code]texture[/code] is defined, it will be multiplied by this color. To have particle display color in a [BaseMaterial3D] make sure to set [member BaseMaterial3D.vertex_color_use_as_albedo] to [code]true[/code].
+			Each particle's initial color. If the [GPUParticles2D]'s [code]texture[/code] is defined, it will be multiplied by this color. To have particle display color in a [BaseMaterial3D] make sure to set [member BaseMaterial3D.vertex_color_use_as_albedo] to [code]true[/code].
 		</member>
 		<member name="color_ramp" type="Texture2D" setter="set_color_ramp" getter="get_color_ramp">
 			Each particle's color will vary along this [GradientTexture].
diff --git a/doc/classes/Path.xml b/doc/classes/Path3D.xml
index 801e86ff9e..b97e7efd5d 100644
--- a/doc/classes/Path.xml
+++ b/doc/classes/Path3D.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Path" inherits="Spatial" version="4.0">
+<class name="Path3D" inherits="Node3D" version="4.0">
 	<brief_description>
-		Contains a [Curve3D] path for [PathFollow] nodes to follow.
+		Contains a [Curve3D] path for [PathFollow3D] nodes to follow.
 	</brief_description>
 	<description>
-		Can have [PathFollow] child nodes moving along the [Curve3D]. See [PathFollow] for more information on the usage.
-		Note that the path is considered as relative to the moved nodes (children of [PathFollow]). As such, the curve should usually start with a zero vector [code](0, 0, 0)[/code].
+		Can have [PathFollow3D] child nodes moving along the [Curve3D]. See [PathFollow3D] for more information on the usage.
+		Note that the path is considered as relative to the moved nodes (children of [PathFollow3D]). As such, the curve should usually start with a zero vector [code](0, 0, 0)[/code].
 	</description>
 	<tutorials>
 	</tutorials>
diff --git a/doc/classes/PathFollow.xml b/doc/classes/PathFollow3D.xml
index 85ca5b787f..f405bdedfc 100644
--- a/doc/classes/PathFollow.xml
+++ b/doc/classes/PathFollow3D.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="PathFollow" inherits="Spatial" version="4.0">
+<class name="PathFollow3D" inherits="Node3D" version="4.0">
 	<brief_description>
-		Point sampler for a [Path].
+		Point sampler for a [Path3D].
 	</brief_description>
 	<description>
-		This node takes its parent [Path], and returns the coordinates of a point within it, given a distance from the first vertex.
+		This node takes its parent [Path3D], and returns the coordinates of a point within it, given a distance from the first vertex.
 		It is useful for making other nodes follow a path, without coding the movement pattern. For that, the nodes must be children of this node. The descendant nodes will then move accordingly when setting an offset in this node.
 	</description>
 	<tutorials>
@@ -14,7 +14,7 @@
 	<members>
 		<member name="cubic_interp" type="bool" setter="set_cubic_interpolation" getter="get_cubic_interpolation" default="true">
 			If [code]true[/code], the position between two cached points is interpolated cubically, and linearly otherwise.
-			The points along the [Curve3D] of the [Path] are precomputed before use, for faster calculations. The point at the requested offset is then calculated interpolating between two adjacent cached points. This may present a problem if the curve makes sharp turns, as the cached points may not follow the curve closely enough.
+			The points along the [Curve3D] of the [Path3D] are precomputed before use, for faster calculations. The point at the requested offset is then calculated interpolating between two adjacent cached points. This may present a problem if the curve makes sharp turns, as the cached points may not follow the curve closely enough.
 			There are two answers to this problem: either increase the number of cached points and increase memory consumption, or make a cubic interpolation between two points at the cost of (slightly) slower calculations.
 		</member>
 		<member name="h_offset" type="float" setter="set_h_offset" getter="get_h_offset" default="0.0">
@@ -26,7 +26,7 @@
 		<member name="offset" type="float" setter="set_offset" getter="get_offset" default="0.0">
 			The distance from the first vertex, measured in 3D units along the path. This sets this node's position to a point within the path.
 		</member>
-		<member name="rotation_mode" type="int" setter="set_rotation_mode" getter="get_rotation_mode" enum="PathFollow.RotationMode" default="3">
+		<member name="rotation_mode" type="int" setter="set_rotation_mode" getter="get_rotation_mode" enum="PathFollow3D.RotationMode" default="3">
 			Allows or forbids rotation on one or more axes, depending on the [enum RotationMode] constants being used.
 		</member>
 		<member name="unit_offset" type="float" setter="set_unit_offset" getter="get_unit_offset" default="0.0">
@@ -38,19 +38,19 @@
 	</members>
 	<constants>
 		<constant name="ROTATION_NONE" value="0" enum="RotationMode">
-			Forbids the PathFollow to rotate.
+			Forbids the PathFollow3D to rotate.
 		</constant>
 		<constant name="ROTATION_Y" value="1" enum="RotationMode">
-			Allows the PathFollow to rotate in the Y axis only.
+			Allows the PathFollow3D to rotate in the Y axis only.
 		</constant>
 		<constant name="ROTATION_XY" value="2" enum="RotationMode">
-			Allows the PathFollow to rotate in both the X, and Y axes.
+			Allows the PathFollow3D to rotate in both the X, and Y axes.
 		</constant>
 		<constant name="ROTATION_XYZ" value="3" enum="RotationMode">
-			Allows the PathFollow to rotate in any axis.
+			Allows the PathFollow3D to rotate in any axis.
 		</constant>
 		<constant name="ROTATION_ORIENTED" value="4" enum="RotationMode">
-			Uses the up vector information in a [Curve3D] to enforce orientation. This rotation mode requires the [Path]'s [member Curve3D.up_vector_enabled] property to be set to [code]true[/code].
+			Uses the up vector information in a [Curve3D] to enforce orientation. This rotation mode requires the [Path3D]'s [member Curve3D.up_vector_enabled] property to be set to [code]true[/code].
 		</constant>
 	</constants>
 </class>
diff --git a/doc/classes/Performance.xml b/doc/classes/Performance.xml
index 378b165644..2a0c153267 100644
--- a/doc/classes/Performance.xml
+++ b/doc/classes/Performance.xml
@@ -95,7 +95,7 @@
 			Number of islands in the 2D physics engine.
 		</constant>
 		<constant name="PHYSICS_3D_ACTIVE_OBJECTS" value="23" enum="Monitor">
-			Number of active [RigidBody] and [VehicleBody] nodes in the game.
+			Number of active [RigidBody3D] and [VehicleBody3D] nodes in the game.
 		</constant>
 		<constant name="PHYSICS_3D_COLLISION_PAIRS" value="24" enum="Monitor">
 			Number of collision pairs in the 3D physics engine.
diff --git a/doc/classes/PhysicalBone.xml b/doc/classes/PhysicalBone3D.xml
index bb31f03c18..d45c72ee87 100644
--- a/doc/classes/PhysicalBone.xml
+++ b/doc/classes/PhysicalBone3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="PhysicalBone" inherits="PhysicsBody" version="4.0">
+<class name="PhysicalBone3D" inherits="PhysicsBody3D" version="4.0">
 	<brief_description>
 	</brief_description>
 	<description>
@@ -55,7 +55,7 @@
 		</member>
 		<member name="joint_offset" type="Transform" setter="set_joint_offset" getter="get_joint_offset" default="Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0 )">
 		</member>
-		<member name="joint_type" type="int" setter="set_joint_type" getter="get_joint_type" enum="PhysicalBone.JointType" default="0">
+		<member name="joint_type" type="int" setter="set_joint_type" getter="get_joint_type" enum="PhysicalBone3D.JointType" default="0">
 		</member>
 		<member name="mass" type="float" setter="set_mass" getter="get_mass" default="1.0">
 		</member>
diff --git a/doc/classes/PhysicalSkyMaterial.xml b/doc/classes/PhysicalSkyMaterial.xml
index 705c063257..89b43158dc 100644
--- a/doc/classes/PhysicalSkyMaterial.xml
+++ b/doc/classes/PhysicalSkyMaterial.xml
@@ -5,7 +5,7 @@
 	</brief_description>
 	<description>
 		The [PhysicalSkyMaterial] uses the Preetham analytic daylight model to draw a sky based on physical properties. This results in a substantially more realistic sky than the [ProceduralSkyMaterial], but it is slightly slower and less flexible.
-		The [PhysicalSkyMaterial] only supports one sun. The color, energy, and direction of the sun are taken from the first [DirectionalLight] in the scene tree.
+		The [PhysicalSkyMaterial] only supports one sun. The color, energy, and direction of the sun are taken from the first [DirectionalLight3D] in the scene tree.
 		As it is based on a daylight model, the sky fades to black as the sunset ends. If you want a full day/night cycle, you will have to add a night sky by converting this to a [ShaderMaterial] and adding a night sky directly into the resulting shader.
 	</description>
 	<tutorials>
diff --git a/doc/classes/Physics2DDirectBodyStateSW.xml b/doc/classes/Physics2DDirectBodyStateSW.xml
deleted file mode 100644
index 11f1140ca8..0000000000
--- a/doc/classes/Physics2DDirectBodyStateSW.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<class name="Physics2DDirectBodyStateSW" inherits="Physics2DDirectBodyState" version="4.0">
-	<brief_description>
-		Software implementation of [Physics2DDirectBodyState].
-	</brief_description>
-	<description>
-		Software implementation of [Physics2DDirectBodyState]. This object exposes no new methods or properties and should not be used, as [Physics2DDirectBodyState] selects the best implementation available.
-	</description>
-	<tutorials>
-	</tutorials>
-	<methods>
-	</methods>
-	<constants>
-	</constants>
-</class>
diff --git a/doc/classes/PhysicsBody.xml b/doc/classes/PhysicsBody3D.xml
index c0927a5b53..f0ba2a7f5f 100644
--- a/doc/classes/PhysicsBody.xml
+++ b/doc/classes/PhysicsBody3D.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="PhysicsBody" inherits="CollisionObject" version="4.0">
+<class name="PhysicsBody3D" inherits="CollisionObject3D" version="4.0">
 	<brief_description>
 		Base class for all objects affected by physics in 3D space.
 	</brief_description>
 	<description>
-		PhysicsBody is an abstract base class for implementing a physics body. All *Body types inherit from it.
+		PhysicsBody3D is an abstract base class for implementing a physics body. All *Body types inherit from it.
 	</description>
 	<tutorials>
 		<link>https://docs.godotengine.org/en/latest/tutorials/physics/physics_introduction.html</link>
diff --git a/doc/classes/Physics2DDirectBodyState.xml b/doc/classes/PhysicsDirectBodyState2D.xml
index d9d402ac9a..46205fecd1 100644
--- a/doc/classes/Physics2DDirectBodyState.xml
+++ b/doc/classes/PhysicsDirectBodyState2D.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Physics2DDirectBodyState" inherits="Object" version="4.0">
+<class name="PhysicsDirectBodyState2D" inherits="Object" version="4.0">
 	<brief_description>
-		Direct access object to a physics body in the [Physics2DServer].
+		Direct access object to a physics body in the [PhysicsServer2D].
 	</brief_description>
 	<description>
-		Provides direct access to a physics body in the [Physics2DServer], allowing safe changes to physics properties. This object is passed via the direct state callback of rigid/character bodies, and is intended for changing the direct state of that body. See [method RigidBody2D._integrate_forces].
+		Provides direct access to a physics body in the [PhysicsServer2D], allowing safe changes to physics properties. This object is passed via the direct state callback of rigid/character bodies, and is intended for changing the direct state of that body. See [method RigidBody2D._integrate_forces].
 	</description>
 	<tutorials>
 		<link>https://docs.godotengine.org/en/latest/tutorials/physics/ray-casting.html</link>
@@ -119,7 +119,7 @@
 			<argument index="0" name="contact_idx" type="int">
 			</argument>
 			<description>
-				Returns the collided shape's metadata. This metadata is different from [method Object.get_meta], and is set with [method Physics2DServer.shape_set_data].
+				Returns the collided shape's metadata. This metadata is different from [method Object.get_meta], and is set with [method PhysicsServer2D.shape_set_data].
 			</description>
 		</method>
 		<method name="get_contact_collider_velocity_at_position" qualifiers="const">
@@ -167,7 +167,7 @@
 			</description>
 		</method>
 		<method name="get_space_state">
-			<return type="Physics2DDirectSpaceState">
+			<return type="PhysicsDirectSpaceState2D">
 			</return>
 			<description>
 				Returns the current state of the space, useful for queries.
diff --git a/doc/classes/PhysicsDirectBodyState2DSW.xml b/doc/classes/PhysicsDirectBodyState2DSW.xml
new file mode 100644
index 0000000000..94fc4213b7
--- /dev/null
+++ b/doc/classes/PhysicsDirectBodyState2DSW.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class name="PhysicsDirectBodyState2DSW" inherits="PhysicsDirectBodyState2D" version="4.0">
+	<brief_description>
+		Software implementation of [PhysicsDirectBodyState2D].
+	</brief_description>
+	<description>
+		Software implementation of [PhysicsDirectBodyState2D]. This object exposes no new methods or properties and should not be used, as [PhysicsDirectBodyState2D] selects the best implementation available.
+	</description>
+	<tutorials>
+	</tutorials>
+	<methods>
+	</methods>
+	<constants>
+	</constants>
+</class>
diff --git a/doc/classes/PhysicsDirectBodyState.xml b/doc/classes/PhysicsDirectBodyState3D.xml
index 24cf4961be..1ee520fe5f 100644
--- a/doc/classes/PhysicsDirectBodyState.xml
+++ b/doc/classes/PhysicsDirectBodyState3D.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="PhysicsDirectBodyState" inherits="Object" version="4.0">
+<class name="PhysicsDirectBodyState3D" inherits="Object" version="4.0">
 	<brief_description>
-		Direct access object to a physics body in the [PhysicsServer].
+		Direct access object to a physics body in the [PhysicsServer3D].
 	</brief_description>
 	<description>
-		Provides direct access to a physics body in the [PhysicsServer], allowing safe changes to physics properties. This object is passed via the direct state callback of rigid/character bodies, and is intended for changing the direct state of that body. See [method RigidBody._integrate_forces].
+		Provides direct access to a physics body in the [PhysicsServer3D], allowing safe changes to physics properties. This object is passed via the direct state callback of rigid/character bodies, and is intended for changing the direct state of that body. See [method RigidBody3D._integrate_forces].
 	</description>
 	<tutorials>
 	</tutorials>
@@ -128,7 +128,7 @@
 			</return>
 			<description>
 				Returns the number of contacts this body has with other bodies.
-				[b]Note:[/b] By default, this returns 0 unless bodies are configured to monitor contacts. See [member RigidBody.contact_monitor].
+				[b]Note:[/b] By default, this returns 0 unless bodies are configured to monitor contacts. See [member RigidBody3D.contact_monitor].
 			</description>
 		</method>
 		<method name="get_contact_impulse" qualifiers="const">
@@ -168,7 +168,7 @@
 			</description>
 		</method>
 		<method name="get_space_state">
-			<return type="PhysicsDirectSpaceState">
+			<return type="PhysicsDirectSpaceState3D">
 			</return>
 			<description>
 				Returns the current state of the space, useful for queries.
diff --git a/doc/classes/Physics2DDirectSpaceState.xml b/doc/classes/PhysicsDirectSpaceState2D.xml
index 662a823d84..d85d7794dd 100644
--- a/doc/classes/Physics2DDirectSpaceState.xml
+++ b/doc/classes/PhysicsDirectSpaceState2D.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Physics2DDirectSpaceState" inherits="Object" version="4.0">
+<class name="PhysicsDirectSpaceState2D" inherits="Object" version="4.0">
 	<brief_description>
-		Direct access object to a space in the [Physics2DServer].
+		Direct access object to a space in the [PhysicsServer2D].
 	</brief_description>
 	<description>
-		Direct access object to a space in the [Physics2DServer]. It's used mainly to do queries against objects and areas residing in a given space.
+		Direct access object to a space in the [PhysicsServer2D]. It's used mainly to do queries against objects and areas residing in a given space.
 	</description>
 	<tutorials>
 		<link>https://docs.godotengine.org/en/latest/tutorials/physics/ray-casting.html</link>
@@ -13,35 +13,35 @@
 		<method name="cast_motion">
 			<return type="Array">
 			</return>
-			<argument index="0" name="shape" type="Physics2DShapeQueryParameters">
+			<argument index="0" name="shape" type="PhysicsShapeQueryParameters2D">
 			</argument>
 			<description>
 				Checks how far the shape can travel toward a point. If the shape can not move, the array will be empty.
-				[b]Note:[/b] Both the shape and the motion are supplied through a [Physics2DShapeQueryParameters] object. The method will return an array with two floats between 0 and 1, both representing a fraction of [code]motion[/code]. The first is how far the shape can move without triggering a collision, and the second is the point at which a collision will occur. If no collision is detected, the returned array will be [code][1, 1][/code].
+				[b]Note:[/b] Both the shape and the motion are supplied through a [PhysicsShapeQueryParameters2D] object. The method will return an array with two floats between 0 and 1, both representing a fraction of [code]motion[/code]. The first is how far the shape can move without triggering a collision, and the second is the point at which a collision will occur. If no collision is detected, the returned array will be [code][1, 1][/code].
 			</description>
 		</method>
 		<method name="collide_shape">
 			<return type="Array">
 			</return>
-			<argument index="0" name="shape" type="Physics2DShapeQueryParameters">
+			<argument index="0" name="shape" type="PhysicsShapeQueryParameters2D">
 			</argument>
 			<argument index="1" name="max_results" type="int" default="32">
 			</argument>
 			<description>
-				Checks the intersections of a shape, given through a [Physics2DShapeQueryParameters] object, against the space. The resulting array contains a list of points where the shape intersects another. Like with [method intersect_shape], the number of returned results can be limited to save processing time.
+				Checks the intersections of a shape, given through a [PhysicsShapeQueryParameters2D] object, against the space. The resulting array contains a list of points where the shape intersects another. Like with [method intersect_shape], the number of returned results can be limited to save processing time.
 			</description>
 		</method>
 		<method name="get_rest_info">
 			<return type="Dictionary">
 			</return>
-			<argument index="0" name="shape" type="Physics2DShapeQueryParameters">
+			<argument index="0" name="shape" type="PhysicsShapeQueryParameters2D">
 			</argument>
 			<description>
-				Checks the intersections of a shape, given through a [Physics2DShapeQueryParameters] object, against the space. If it collides with more than one shape, the nearest one is selected. If the shape did not intersect anything, then an empty dictionary is returned instead.
+				Checks the intersections of a shape, given through a [PhysicsShapeQueryParameters2D] object, against the space. If it collides with more than one shape, the nearest one is selected. If the shape did not intersect anything, then an empty dictionary is returned instead.
 				[b]Note:[/b] This method does not take into account the [code]motion[/code] property of the object. The returned object is a dictionary containing the following fields:
 				[code]collider_id[/code]: The colliding object's ID.
 				[code]linear_velocity[/code]: The colliding object's velocity [Vector2]. If the object is an [Area2D], the result is [code](0, 0)[/code].
-				[code]metadata[/code]: The intersecting shape's metadata. This metadata is different from [method Object.get_meta], and is set with [method Physics2DServer.shape_set_data].
+				[code]metadata[/code]: The intersecting shape's metadata. This metadata is different from [method Object.get_meta], and is set with [method PhysicsServer2D.shape_set_data].
 				[code]normal[/code]: The object's surface normal at the intersection point.
 				[code]point[/code]: The intersection point.
 				[code]rid[/code]: The intersecting object's [RID].
@@ -67,10 +67,10 @@
 				Checks whether a point is inside any shape. The shapes the point is inside of are returned in an array containing dictionaries with the following fields:
 				[code]collider[/code]: The colliding object.
 				[code]collider_id[/code]: The colliding object's ID.
-				[code]metadata[/code]: The intersecting shape's metadata. This metadata is different from [method Object.get_meta], and is set with [method Physics2DServer.shape_set_data].
+				[code]metadata[/code]: The intersecting shape's metadata. This metadata is different from [method Object.get_meta], and is set with [method PhysicsServer2D.shape_set_data].
 				[code]rid[/code]: The intersecting object's [RID].
 				[code]shape[/code]: The shape index of the colliding shape.
-				Additionally, the method can take an [code]exclude[/code] array of objects or [RID]s that are to be excluded from collisions, a [code]collision_mask[/code] bitmask representing the physics layers to check in, or booleans to determine if the ray should collide with [PhysicsBody]s or [Area]s, respectively.
+				Additionally, the method can take an [code]exclude[/code] array of objects or [RID]s that are to be excluded from collisions, a [code]collision_mask[/code] bitmask representing the physics layers to check in, or booleans to determine if the ray should collide with [PhysicsBody2D]s or [Area2D]s, respectively.
 			</description>
 		</method>
 		<method name="intersect_point_on_canvas">
@@ -112,28 +112,28 @@
 				Intersects a ray in a given space. The returned object is a dictionary with the following fields:
 				[code]collider[/code]: The colliding object.
 				[code]collider_id[/code]: The colliding object's ID.
-				[code]metadata[/code]: The intersecting shape's metadata. This metadata is different from [method Object.get_meta], and is set with [method Physics2DServer.shape_set_data].
+				[code]metadata[/code]: The intersecting shape's metadata. This metadata is different from [method Object.get_meta], and is set with [method PhysicsServer2D.shape_set_data].
 				[code]normal[/code]: The object's surface normal at the intersection point.
 				[code]position[/code]: The intersection point.
 				[code]rid[/code]: The intersecting object's [RID].
 				[code]shape[/code]: The shape index of the colliding shape.
 				If the ray did not intersect anything, then an empty dictionary is returned instead.
-				Additionally, the method can take an [code]exclude[/code] array of objects or [RID]s that are to be excluded from collisions, a [code]collision_mask[/code] bitmask representing the physics layers to check in, or booleans to determine if the ray should collide with [PhysicsBody]s or [Area]s, respectively.
+				Additionally, the method can take an [code]exclude[/code] array of objects or [RID]s that are to be excluded from collisions, a [code]collision_mask[/code] bitmask representing the physics layers to check in, or booleans to determine if the ray should collide with [PhysicsBody2D]s or [Area2D]s, respectively.
 			</description>
 		</method>
 		<method name="intersect_shape">
 			<return type="Array">
 			</return>
-			<argument index="0" name="shape" type="Physics2DShapeQueryParameters">
+			<argument index="0" name="shape" type="PhysicsShapeQueryParameters2D">
 			</argument>
 			<argument index="1" name="max_results" type="int" default="32">
 			</argument>
 			<description>
-				Checks the intersections of a shape, given through a [Physics2DShapeQueryParameters] object, against the space.
+				Checks the intersections of a shape, given through a [PhysicsShapeQueryParameters2D] object, against the space.
 				[b]Note:[/b] This method does not take into account the [code]motion[/code] property of the object. The intersected shapes are returned in an array containing dictionaries with the following fields:
 				[code]collider[/code]: The colliding object.
 				[code]collider_id[/code]: The colliding object's ID.
-				[code]metadata[/code]: The intersecting shape's metadata. This metadata is different from [method Object.get_meta], and is set with [method Physics2DServer.shape_set_data].
+				[code]metadata[/code]: The intersecting shape's metadata. This metadata is different from [method Object.get_meta], and is set with [method PhysicsServer2D.shape_set_data].
 				[code]rid[/code]: The intersecting object's [RID].
 				[code]shape[/code]: The shape index of the colliding shape.
 				The number of intersections can be limited with the [code]max_results[/code] parameter, to reduce the processing time.
diff --git a/doc/classes/PhysicsDirectSpaceState.xml b/doc/classes/PhysicsDirectSpaceState3D.xml
index a6172805e9..09ee93732d 100644
--- a/doc/classes/PhysicsDirectSpaceState.xml
+++ b/doc/classes/PhysicsDirectSpaceState3D.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="PhysicsDirectSpaceState" inherits="Object" version="4.0">
+<class name="PhysicsDirectSpaceState3D" inherits="Object" version="4.0">
 	<brief_description>
-		Direct access object to a space in the [PhysicsServer].
+		Direct access object to a space in the [PhysicsServer3D].
 	</brief_description>
 	<description>
-		Direct access object to a space in the [PhysicsServer]. It's used mainly to do queries against objects and areas residing in a given space.
+		Direct access object to a space in the [PhysicsServer3D]. It's used mainly to do queries against objects and areas residing in a given space.
 	</description>
 	<tutorials>
 		<link>https://docs.godotengine.org/en/latest/tutorials/physics/ray-casting.html</link>
@@ -13,7 +13,7 @@
 		<method name="cast_motion">
 			<return type="Array">
 			</return>
-			<argument index="0" name="shape" type="PhysicsShapeQueryParameters">
+			<argument index="0" name="shape" type="PhysicsShapeQueryParameters3D">
 			</argument>
 			<argument index="1" name="motion" type="Vector3">
 			</argument>
@@ -25,23 +25,23 @@
 		<method name="collide_shape">
 			<return type="Array">
 			</return>
-			<argument index="0" name="shape" type="PhysicsShapeQueryParameters">
+			<argument index="0" name="shape" type="PhysicsShapeQueryParameters3D">
 			</argument>
 			<argument index="1" name="max_results" type="int" default="32">
 			</argument>
 			<description>
-				Checks the intersections of a shape, given through a [PhysicsShapeQueryParameters] object, against the space. The resulting array contains a list of points where the shape intersects another. Like with [method intersect_shape], the number of returned results can be limited to save processing time.
+				Checks the intersections of a shape, given through a [PhysicsShapeQueryParameters3D] object, against the space. The resulting array contains a list of points where the shape intersects another. Like with [method intersect_shape], the number of returned results can be limited to save processing time.
 			</description>
 		</method>
 		<method name="get_rest_info">
 			<return type="Dictionary">
 			</return>
-			<argument index="0" name="shape" type="PhysicsShapeQueryParameters">
+			<argument index="0" name="shape" type="PhysicsShapeQueryParameters3D">
 			</argument>
 			<description>
-				Checks the intersections of a shape, given through a [PhysicsShapeQueryParameters] object, against the space. If it collides with more than one shape, the nearest one is selected. The returned object is a dictionary containing the following fields:
+				Checks the intersections of a shape, given through a [PhysicsShapeQueryParameters3D] object, against the space. If it collides with more than one shape, the nearest one is selected. The returned object is a dictionary containing the following fields:
 				[code]collider_id[/code]: The colliding object's ID.
-				[code]linear_velocity[/code]: The colliding object's velocity [Vector3]. If the object is an [Area], the result is [code](0, 0, 0)[/code].
+				[code]linear_velocity[/code]: The colliding object's velocity [Vector3]. If the object is an [Area3D], the result is [code](0, 0, 0)[/code].
 				[code]normal[/code]: The object's surface normal at the intersection point.
 				[code]point[/code]: The intersection point.
 				[code]rid[/code]: The intersecting object's [RID].
@@ -73,18 +73,18 @@
 				[code]rid[/code]: The intersecting object's [RID].
 				[code]shape[/code]: The shape index of the colliding shape.
 				If the ray did not intersect anything, then an empty dictionary is returned instead.
-				Additionally, the method can take an [code]exclude[/code] array of objects or [RID]s that are to be excluded from collisions, a [code]collision_mask[/code] bitmask representing the physics layers to check in, or booleans to determine if the ray should collide with [PhysicsBody]s or [Area]s, respectively.
+				Additionally, the method can take an [code]exclude[/code] array of objects or [RID]s that are to be excluded from collisions, a [code]collision_mask[/code] bitmask representing the physics layers to check in, or booleans to determine if the ray should collide with [PhysicsBody3D]s or [Area3D]s, respectively.
 			</description>
 		</method>
 		<method name="intersect_shape">
 			<return type="Array">
 			</return>
-			<argument index="0" name="shape" type="PhysicsShapeQueryParameters">
+			<argument index="0" name="shape" type="PhysicsShapeQueryParameters3D">
 			</argument>
 			<argument index="1" name="max_results" type="int" default="32">
 			</argument>
 			<description>
-				Checks the intersections of a shape, given through a [PhysicsShapeQueryParameters] object, against the space. The intersected shapes are returned in an array containing dictionaries with the following fields:
+				Checks the intersections of a shape, given through a [PhysicsShapeQueryParameters3D] object, against the space. The intersected shapes are returned in an array containing dictionaries with the following fields:
 				[code]collider[/code]: The colliding object.
 				[code]collider_id[/code]: The colliding object's ID.
 				[code]rid[/code]: The intersecting object's [RID].
diff --git a/doc/classes/PhysicsMaterial.xml b/doc/classes/PhysicsMaterial.xml
index 84e7f2b275..6410626496 100644
--- a/doc/classes/PhysicsMaterial.xml
+++ b/doc/classes/PhysicsMaterial.xml
@@ -4,7 +4,7 @@
 		A material for physics properties.
 	</brief_description>
 	<description>
-		Provides a means of modifying the collision properties of a [PhysicsBody].
+		Provides a means of modifying the collision properties of a [PhysicsBody3D].
 	</description>
 	<tutorials>
 	</tutorials>
diff --git a/doc/classes/Physics2DServer.xml b/doc/classes/PhysicsServer2D.xml
index 45215253be..9da739e57a 100644
--- a/doc/classes/Physics2DServer.xml
+++ b/doc/classes/PhysicsServer2D.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Physics2DServer" inherits="Object" version="4.0">
+<class name="PhysicsServer2D" inherits="Object" version="4.0">
 	<brief_description>
 		Server interface for low-level 2D physics access.
 	</brief_description>
 	<description>
-		Physics2DServer is the server responsible for all 2D physics. It can create many kinds of physics objects, but does not insert them on the node tree.
+		PhysicsServer2D is the server responsible for all 2D physics. It can create many kinds of physics objects, but does not insert them on the node tree.
 	</description>
 	<tutorials>
 	</tutorials>
@@ -83,7 +83,7 @@
 			</return>
 			<argument index="0" name="area" type="RID">
 			</argument>
-			<argument index="1" name="param" type="int" enum="Physics2DServer.AreaParameter">
+			<argument index="1" name="param" type="int" enum="PhysicsServer2D.AreaParameter">
 			</argument>
 			<description>
 				Returns an area parameter value. See [enum AreaParameter] for a list of available parameters.
@@ -130,7 +130,7 @@
 			</description>
 		</method>
 		<method name="area_get_space_override_mode" qualifiers="const">
-			<return type="int" enum="Physics2DServer.AreaSpaceOverrideMode">
+			<return type="int" enum="PhysicsServer2D.AreaSpaceOverrideMode">
 			</return>
 			<argument index="0" name="area" type="RID">
 			</argument>
@@ -225,7 +225,7 @@
 			</return>
 			<argument index="0" name="area" type="RID">
 			</argument>
-			<argument index="1" name="param" type="int" enum="Physics2DServer.AreaParameter">
+			<argument index="1" name="param" type="int" enum="PhysicsServer2D.AreaParameter">
 			</argument>
 			<argument index="2" name="value" type="Variant">
 			</argument>
@@ -288,7 +288,7 @@
 			</return>
 			<argument index="0" name="area" type="RID">
 			</argument>
-			<argument index="1" name="mode" type="int" enum="Physics2DServer.AreaSpaceOverrideMode">
+			<argument index="1" name="mode" type="int" enum="PhysicsServer2D.AreaSpaceOverrideMode">
 			</argument>
 			<description>
 				Sets the space override mode for the area. See [enum AreaSpaceOverrideMode] for a list of available modes.
@@ -461,7 +461,7 @@
 			</description>
 		</method>
 		<method name="body_get_continuous_collision_detection_mode" qualifiers="const">
-			<return type="int" enum="Physics2DServer.CCDMode">
+			<return type="int" enum="PhysicsServer2D.CCDMode">
 			</return>
 			<argument index="0" name="body" type="RID">
 			</argument>
@@ -470,12 +470,12 @@
 			</description>
 		</method>
 		<method name="body_get_direct_state">
-			<return type="Physics2DDirectBodyState">
+			<return type="PhysicsDirectBodyState2D">
 			</return>
 			<argument index="0" name="body" type="RID">
 			</argument>
 			<description>
-				Returns the [Physics2DDirectBodyState] of the body.
+				Returns the [PhysicsDirectBodyState2D] of the body.
 			</description>
 		</method>
 		<method name="body_get_max_contacts_reported" qualifiers="const">
@@ -488,7 +488,7 @@
 			</description>
 		</method>
 		<method name="body_get_mode" qualifiers="const">
-			<return type="int" enum="Physics2DServer.BodyMode">
+			<return type="int" enum="PhysicsServer2D.BodyMode">
 			</return>
 			<argument index="0" name="body" type="RID">
 			</argument>
@@ -510,7 +510,7 @@
 			</return>
 			<argument index="0" name="body" type="RID">
 			</argument>
-			<argument index="1" name="param" type="int" enum="Physics2DServer.BodyParameter">
+			<argument index="1" name="param" type="int" enum="PhysicsServer2D.BodyParameter">
 			</argument>
 			<description>
 				Returns the value of a body parameter. See [enum BodyParameter] for a list of available parameters.
@@ -572,7 +572,7 @@
 			</return>
 			<argument index="0" name="body" type="RID">
 			</argument>
-			<argument index="1" name="state" type="int" enum="Physics2DServer.BodyState">
+			<argument index="1" name="state" type="int" enum="PhysicsServer2D.BodyState">
 			</argument>
 			<description>
 				Returns a body state.
@@ -647,7 +647,7 @@
 			</return>
 			<argument index="0" name="body" type="RID">
 			</argument>
-			<argument index="1" name="mode" type="int" enum="Physics2DServer.CCDMode">
+			<argument index="1" name="mode" type="int" enum="PhysicsServer2D.CCDMode">
 			</argument>
 			<description>
 				Sets the continuous collision detection mode using one of the [enum CCDMode] constants.
@@ -685,7 +685,7 @@
 			</return>
 			<argument index="0" name="body" type="RID">
 			</argument>
-			<argument index="1" name="mode" type="int" enum="Physics2DServer.BodyMode">
+			<argument index="1" name="mode" type="int" enum="PhysicsServer2D.BodyMode">
 			</argument>
 			<description>
 				Sets the body mode using one of the [enum BodyMode] constants.
@@ -707,7 +707,7 @@
 			</return>
 			<argument index="0" name="body" type="RID">
 			</argument>
-			<argument index="1" name="param" type="int" enum="Physics2DServer.BodyParameter">
+			<argument index="1" name="param" type="int" enum="PhysicsServer2D.BodyParameter">
 			</argument>
 			<argument index="2" name="value" type="float">
 			</argument>
@@ -798,7 +798,7 @@
 			</return>
 			<argument index="0" name="body" type="RID">
 			</argument>
-			<argument index="1" name="state" type="int" enum="Physics2DServer.BodyState">
+			<argument index="1" name="state" type="int" enum="PhysicsServer2D.BodyState">
 			</argument>
 			<argument index="2" name="value" type="Variant">
 			</argument>
@@ -819,10 +819,10 @@
 			</argument>
 			<argument index="4" name="margin" type="float" default="0.08">
 			</argument>
-			<argument index="5" name="result" type="Physics2DTestMotionResult" default="null">
+			<argument index="5" name="result" type="PhysicsTestMotionResult2D" default="null">
 			</argument>
 			<description>
-				Returns [code]true[/code] if a collision would result from moving in the given direction from a given point in space. Margin increases the size of the shapes involved in the collision detection. [Physics2DTestMotionResult] can be passed to return additional information in.
+				Returns [code]true[/code] if a collision would result from moving in the given direction from a given point in space. Margin increases the size of the shapes involved in the collision detection. [PhysicsTestMotionResult2D] can be passed to return additional information in.
 			</description>
 		</method>
 		<method name="capsule_shape_create">
@@ -869,7 +869,7 @@
 			</return>
 			<argument index="0" name="joint" type="RID">
 			</argument>
-			<argument index="1" name="param" type="int" enum="Physics2DServer.DampedStringParam">
+			<argument index="1" name="param" type="int" enum="PhysicsServer2D.DampedStringParam">
 			</argument>
 			<description>
 				Returns the value of a damped spring joint parameter.
@@ -880,7 +880,7 @@
 			</return>
 			<argument index="0" name="joint" type="RID">
 			</argument>
-			<argument index="1" name="param" type="int" enum="Physics2DServer.DampedStringParam">
+			<argument index="1" name="param" type="int" enum="PhysicsServer2D.DampedStringParam">
 			</argument>
 			<argument index="2" name="value" type="float">
 			</argument>
@@ -894,13 +894,13 @@
 			<argument index="0" name="rid" type="RID">
 			</argument>
 			<description>
-				Destroys any of the objects created by Physics2DServer. If the [RID] passed is not one of the objects that can be created by Physics2DServer, an error will be sent to the console.
+				Destroys any of the objects created by PhysicsServer2D. If the [RID] passed is not one of the objects that can be created by PhysicsServer2D, an error will be sent to the console.
 			</description>
 		</method>
 		<method name="get_process_info">
 			<return type="int">
 			</return>
-			<argument index="0" name="process_info" type="int" enum="Physics2DServer.ProcessInfo">
+			<argument index="0" name="process_info" type="int" enum="PhysicsServer2D.ProcessInfo">
 			</argument>
 			<description>
 				Returns information about the current state of the 2D physics engine. See [enum ProcessInfo] for a list of available states.
@@ -928,14 +928,14 @@
 			</return>
 			<argument index="0" name="joint" type="RID">
 			</argument>
-			<argument index="1" name="param" type="int" enum="Physics2DServer.JointParam">
+			<argument index="1" name="param" type="int" enum="PhysicsServer2D.JointParam">
 			</argument>
 			<description>
 				Returns the value of a joint parameter.
 			</description>
 		</method>
 		<method name="joint_get_type" qualifiers="const">
-			<return type="int" enum="Physics2DServer.JointType">
+			<return type="int" enum="PhysicsServer2D.JointType">
 			</return>
 			<argument index="0" name="joint" type="RID">
 			</argument>
@@ -948,7 +948,7 @@
 			</return>
 			<argument index="0" name="joint" type="RID">
 			</argument>
-			<argument index="1" name="param" type="int" enum="Physics2DServer.JointParam">
+			<argument index="1" name="param" type="int" enum="PhysicsServer2D.JointParam">
 			</argument>
 			<argument index="2" name="value" type="float">
 			</argument>
@@ -1012,7 +1012,7 @@
 			</description>
 		</method>
 		<method name="shape_get_type" qualifiers="const">
-			<return type="int" enum="Physics2DServer.ShapeType">
+			<return type="int" enum="PhysicsServer2D.ShapeType">
 			</return>
 			<argument index="0" name="shape" type="RID">
 			</argument>
@@ -1039,12 +1039,12 @@
 			</description>
 		</method>
 		<method name="space_get_direct_state">
-			<return type="Physics2DDirectSpaceState">
+			<return type="PhysicsDirectSpaceState2D">
 			</return>
 			<argument index="0" name="space" type="RID">
 			</argument>
 			<description>
-				Returns the state of a space, a [Physics2DDirectSpaceState]. This object can be used to make collision/intersection queries.
+				Returns the state of a space, a [PhysicsDirectSpaceState2D]. This object can be used to make collision/intersection queries.
 			</description>
 		</method>
 		<method name="space_get_param" qualifiers="const">
@@ -1052,7 +1052,7 @@
 			</return>
 			<argument index="0" name="space" type="RID">
 			</argument>
-			<argument index="1" name="param" type="int" enum="Physics2DServer.SpaceParameter">
+			<argument index="1" name="param" type="int" enum="PhysicsServer2D.SpaceParameter">
 			</argument>
 			<description>
 				Returns the value of a space parameter.
@@ -1083,7 +1083,7 @@
 			</return>
 			<argument index="0" name="space" type="RID">
 			</argument>
-			<argument index="1" name="param" type="int" enum="Physics2DServer.SpaceParameter">
+			<argument index="1" name="param" type="int" enum="PhysicsServer2D.SpaceParameter">
 			</argument>
 			<argument index="2" name="value" type="float">
 			</argument>
diff --git a/doc/classes/Physics2DServerSW.xml b/doc/classes/PhysicsServer2DSW.xml
index 1e4531ed66..dac5e360f0 100644
--- a/doc/classes/Physics2DServerSW.xml
+++ b/doc/classes/PhysicsServer2DSW.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Physics2DServerSW" inherits="Physics2DServer" version="4.0">
+<class name="PhysicsServer2DSW" inherits="PhysicsServer2D" version="4.0">
 	<brief_description>
-		Software implementation of [Physics2DServer].
+		Software implementation of [PhysicsServer2D].
 	</brief_description>
 	<description>
-		This class exposes no new methods or properties and should not be used, as [Physics2DServer] automatically selects the best implementation available.
+		This class exposes no new methods or properties and should not be used, as [PhysicsServer2D] automatically selects the best implementation available.
 	</description>
 	<tutorials>
 	</tutorials>
diff --git a/doc/classes/PhysicsServer.xml b/doc/classes/PhysicsServer3D.xml
index 1b9ce80a1b..e9e1552c92 100644
--- a/doc/classes/PhysicsServer.xml
+++ b/doc/classes/PhysicsServer3D.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="PhysicsServer" inherits="Object" version="4.0">
+<class name="PhysicsServer3D" inherits="Object" version="4.0">
 	<brief_description>
 		Server interface for low-level physics access.
 	</brief_description>
 	<description>
-		PhysicsServer is the server responsible for all 3D physics. It can create many kinds of physics objects, but does not insert them on the node tree.
+		PhysicsServer3D is the server responsible for all 3D physics. It can create many kinds of physics objects, but does not insert them on the node tree.
 	</description>
 	<tutorials>
 	</tutorials>
@@ -48,7 +48,7 @@
 			<return type="RID">
 			</return>
 			<description>
-				Creates an [Area].
+				Creates an [Area3D].
 			</description>
 		</method>
 		<method name="area_get_object_instance_id" qualifiers="const">
@@ -65,7 +65,7 @@
 			</return>
 			<argument index="0" name="area" type="RID">
 			</argument>
-			<argument index="1" name="param" type="int" enum="PhysicsServer.AreaParameter">
+			<argument index="1" name="param" type="int" enum="PhysicsServer3D.AreaParameter">
 			</argument>
 			<description>
 				Returns an area parameter value. A list of available parameters is on the [enum AreaParameter] constants.
@@ -112,7 +112,7 @@
 			</description>
 		</method>
 		<method name="area_get_space_override_mode" qualifiers="const">
-			<return type="int" enum="PhysicsServer.AreaSpaceOverrideMode">
+			<return type="int" enum="PhysicsServer3D.AreaSpaceOverrideMode">
 			</return>
 			<argument index="0" name="area" type="RID">
 			</argument>
@@ -216,7 +216,7 @@
 			</return>
 			<argument index="0" name="area" type="RID">
 			</argument>
-			<argument index="1" name="param" type="int" enum="PhysicsServer.AreaParameter">
+			<argument index="1" name="param" type="int" enum="PhysicsServer3D.AreaParameter">
 			</argument>
 			<argument index="2" name="value" type="Variant">
 			</argument>
@@ -289,7 +289,7 @@
 			</return>
 			<argument index="0" name="area" type="RID">
 			</argument>
-			<argument index="1" name="mode" type="int" enum="PhysicsServer.AreaSpaceOverrideMode">
+			<argument index="1" name="mode" type="int" enum="PhysicsServer3D.AreaSpaceOverrideMode">
 			</argument>
 			<description>
 				Sets the space override mode for the area. The modes are described in the [enum AreaSpaceOverrideMode] constants.
@@ -421,7 +421,7 @@
 		<method name="body_create">
 			<return type="RID">
 			</return>
-			<argument index="0" name="mode" type="int" enum="PhysicsServer.BodyMode" default="2">
+			<argument index="0" name="mode" type="int" enum="PhysicsServer3D.BodyMode" default="2">
 			</argument>
 			<argument index="1" name="init_sleeping" type="bool" default="false">
 			</argument>
@@ -449,12 +449,12 @@
 			</description>
 		</method>
 		<method name="body_get_direct_state">
-			<return type="PhysicsDirectBodyState">
+			<return type="PhysicsDirectBodyState3D">
 			</return>
 			<argument index="0" name="body" type="RID">
 			</argument>
 			<description>
-				Returns the [PhysicsDirectBodyState] of the body.
+				Returns the [PhysicsDirectBodyState3D] of the body.
 			</description>
 		</method>
 		<method name="body_get_kinematic_safe_margin" qualifiers="const">
@@ -475,7 +475,7 @@
 			</description>
 		</method>
 		<method name="body_get_mode" qualifiers="const">
-			<return type="int" enum="PhysicsServer.BodyMode">
+			<return type="int" enum="PhysicsServer3D.BodyMode">
 			</return>
 			<argument index="0" name="body" type="RID">
 			</argument>
@@ -497,7 +497,7 @@
 			</return>
 			<argument index="0" name="body" type="RID">
 			</argument>
-			<argument index="1" name="param" type="int" enum="PhysicsServer.BodyParameter">
+			<argument index="1" name="param" type="int" enum="PhysicsServer3D.BodyParameter">
 			</argument>
 			<description>
 				Returns the value of a body parameter. A list of available parameters is on the [enum BodyParameter] constants.
@@ -548,7 +548,7 @@
 			</return>
 			<argument index="0" name="body" type="RID">
 			</argument>
-			<argument index="1" name="state" type="int" enum="PhysicsServer.BodyState">
+			<argument index="1" name="state" type="int" enum="PhysicsServer3D.BodyState">
 			</argument>
 			<description>
 				Returns a body state.
@@ -559,7 +559,7 @@
 			</return>
 			<argument index="0" name="body" type="RID">
 			</argument>
-			<argument index="1" name="axis" type="int" enum="PhysicsServer.BodyAxis">
+			<argument index="1" name="axis" type="int" enum="PhysicsServer3D.BodyAxis">
 			</argument>
 			<description>
 			</description>
@@ -619,7 +619,7 @@
 			</return>
 			<argument index="0" name="body" type="RID">
 			</argument>
-			<argument index="1" name="axis" type="int" enum="PhysicsServer.BodyAxis">
+			<argument index="1" name="axis" type="int" enum="PhysicsServer3D.BodyAxis">
 			</argument>
 			<argument index="2" name="lock" type="bool">
 			</argument>
@@ -712,7 +712,7 @@
 			</return>
 			<argument index="0" name="body" type="RID">
 			</argument>
-			<argument index="1" name="mode" type="int" enum="PhysicsServer.BodyMode">
+			<argument index="1" name="mode" type="int" enum="PhysicsServer3D.BodyMode">
 			</argument>
 			<description>
 				Sets the body mode, from one of the [enum BodyMode] constants.
@@ -734,7 +734,7 @@
 			</return>
 			<argument index="0" name="body" type="RID">
 			</argument>
-			<argument index="1" name="param" type="int" enum="PhysicsServer.BodyParameter">
+			<argument index="1" name="param" type="int" enum="PhysicsServer3D.BodyParameter">
 			</argument>
 			<argument index="2" name="value" type="float">
 			</argument>
@@ -807,7 +807,7 @@
 			</return>
 			<argument index="0" name="body" type="RID">
 			</argument>
-			<argument index="1" name="state" type="int" enum="PhysicsServer.BodyState">
+			<argument index="1" name="state" type="int" enum="PhysicsServer3D.BodyState">
 			</argument>
 			<argument index="2" name="value" type="Variant">
 			</argument>
@@ -820,7 +820,7 @@
 			</return>
 			<argument index="0" name="joint" type="RID">
 			</argument>
-			<argument index="1" name="param" type="int" enum="PhysicsServer.ConeTwistJointParam">
+			<argument index="1" name="param" type="int" enum="PhysicsServer3D.ConeTwistJointParam">
 			</argument>
 			<description>
 				Gets a cone_twist_joint parameter (see [enum ConeTwistJointParam] constants).
@@ -831,7 +831,7 @@
 			</return>
 			<argument index="0" name="joint" type="RID">
 			</argument>
-			<argument index="1" name="param" type="int" enum="PhysicsServer.ConeTwistJointParam">
+			<argument index="1" name="param" type="int" enum="PhysicsServer3D.ConeTwistJointParam">
 			</argument>
 			<argument index="2" name="value" type="float">
 			</argument>
@@ -845,7 +845,7 @@
 			<argument index="0" name="rid" type="RID">
 			</argument>
 			<description>
-				Destroys any of the objects created by PhysicsServer. If the [RID] passed is not one of the objects that can be created by PhysicsServer, an error will be sent to the console.
+				Destroys any of the objects created by PhysicsServer3D. If the [RID] passed is not one of the objects that can be created by PhysicsServer3D, an error will be sent to the console.
 			</description>
 		</method>
 		<method name="generic_6dof_joint_get_flag">
@@ -855,7 +855,7 @@
 			</argument>
 			<argument index="1" name="axis" type="int" enum="Vector3.Axis">
 			</argument>
-			<argument index="2" name="flag" type="int" enum="PhysicsServer.G6DOFJointAxisFlag">
+			<argument index="2" name="flag" type="int" enum="PhysicsServer3D.G6DOFJointAxisFlag">
 			</argument>
 			<description>
 				Gets a generic_6_DOF_joint flag (see [enum G6DOFJointAxisFlag] constants).
@@ -868,7 +868,7 @@
 			</argument>
 			<argument index="1" name="axis" type="int" enum="Vector3.Axis">
 			</argument>
-			<argument index="2" name="param" type="int" enum="PhysicsServer.G6DOFJointAxisParam">
+			<argument index="2" name="param" type="int" enum="PhysicsServer3D.G6DOFJointAxisParam">
 			</argument>
 			<description>
 				Gets a generic_6_DOF_joint parameter (see [enum G6DOFJointAxisParam] constants).
@@ -881,7 +881,7 @@
 			</argument>
 			<argument index="1" name="axis" type="int" enum="Vector3.Axis">
 			</argument>
-			<argument index="2" name="flag" type="int" enum="PhysicsServer.G6DOFJointAxisFlag">
+			<argument index="2" name="flag" type="int" enum="PhysicsServer3D.G6DOFJointAxisFlag">
 			</argument>
 			<argument index="3" name="enable" type="bool">
 			</argument>
@@ -896,7 +896,7 @@
 			</argument>
 			<argument index="1" name="axis" type="int" enum="Vector3.Axis">
 			</argument>
-			<argument index="2" name="param" type="int" enum="PhysicsServer.G6DOFJointAxisParam">
+			<argument index="2" name="param" type="int" enum="PhysicsServer3D.G6DOFJointAxisParam">
 			</argument>
 			<argument index="3" name="value" type="float">
 			</argument>
@@ -907,7 +907,7 @@
 		<method name="get_process_info">
 			<return type="int">
 			</return>
-			<argument index="0" name="process_info" type="int" enum="PhysicsServer.ProcessInfo">
+			<argument index="0" name="process_info" type="int" enum="PhysicsServer3D.ProcessInfo">
 			</argument>
 			<description>
 				Returns an Info defined by the [enum ProcessInfo] input given.
@@ -918,7 +918,7 @@
 			</return>
 			<argument index="0" name="joint" type="RID">
 			</argument>
-			<argument index="1" name="flag" type="int" enum="PhysicsServer.HingeJointFlag">
+			<argument index="1" name="flag" type="int" enum="PhysicsServer3D.HingeJointFlag">
 			</argument>
 			<description>
 				Gets a hinge_joint flag (see [enum HingeJointFlag] constants).
@@ -929,7 +929,7 @@
 			</return>
 			<argument index="0" name="joint" type="RID">
 			</argument>
-			<argument index="1" name="param" type="int" enum="PhysicsServer.HingeJointParam">
+			<argument index="1" name="param" type="int" enum="PhysicsServer3D.HingeJointParam">
 			</argument>
 			<description>
 				Gets a hinge_joint parameter (see [enum HingeJointParam]).
@@ -940,7 +940,7 @@
 			</return>
 			<argument index="0" name="joint" type="RID">
 			</argument>
-			<argument index="1" name="flag" type="int" enum="PhysicsServer.HingeJointFlag">
+			<argument index="1" name="flag" type="int" enum="PhysicsServer3D.HingeJointFlag">
 			</argument>
 			<argument index="2" name="enabled" type="bool">
 			</argument>
@@ -953,7 +953,7 @@
 			</return>
 			<argument index="0" name="joint" type="RID">
 			</argument>
-			<argument index="1" name="param" type="int" enum="PhysicsServer.HingeJointParam">
+			<argument index="1" name="param" type="int" enum="PhysicsServer3D.HingeJointParam">
 			</argument>
 			<argument index="2" name="value" type="float">
 			</argument>
@@ -973,7 +973,7 @@
 			<argument index="3" name="local_ref_B" type="Transform">
 			</argument>
 			<description>
-				Creates a [ConeTwistJoint].
+				Creates a [ConeTwistJoint3D].
 			</description>
 		</method>
 		<method name="joint_create_generic_6dof">
@@ -988,7 +988,7 @@
 			<argument index="3" name="local_ref_B" type="Transform">
 			</argument>
 			<description>
-				Creates a [Generic6DOFJoint].
+				Creates a [Generic6DOFJoint3D].
 			</description>
 		</method>
 		<method name="joint_create_hinge">
@@ -1003,7 +1003,7 @@
 			<argument index="3" name="hinge_B" type="Transform">
 			</argument>
 			<description>
-				Creates a [HingeJoint].
+				Creates a [HingeJoint3D].
 			</description>
 		</method>
 		<method name="joint_create_pin">
@@ -1018,7 +1018,7 @@
 			<argument index="3" name="local_B" type="Vector3">
 			</argument>
 			<description>
-				Creates a [PinJoint].
+				Creates a [PinJoint3D].
 			</description>
 		</method>
 		<method name="joint_create_slider">
@@ -1033,7 +1033,7 @@
 			<argument index="3" name="local_ref_B" type="Transform">
 			</argument>
 			<description>
-				Creates a [SliderJoint].
+				Creates a [SliderJoint3D].
 			</description>
 		</method>
 		<method name="joint_get_solver_priority" qualifiers="const">
@@ -1042,16 +1042,16 @@
 			<argument index="0" name="joint" type="RID">
 			</argument>
 			<description>
-				Gets the priority value of the Joint.
+				Gets the priority value of the Joint3D.
 			</description>
 		</method>
 		<method name="joint_get_type" qualifiers="const">
-			<return type="int" enum="PhysicsServer.JointType">
+			<return type="int" enum="PhysicsServer3D.JointType">
 			</return>
 			<argument index="0" name="joint" type="RID">
 			</argument>
 			<description>
-				Returns the type of the Joint.
+				Returns the type of the Joint3D.
 			</description>
 		</method>
 		<method name="joint_set_solver_priority">
@@ -1062,7 +1062,7 @@
 			<argument index="1" name="priority" type="int">
 			</argument>
 			<description>
-				Sets the priority value of the Joint.
+				Sets the priority value of the Joint3D.
 			</description>
 		</method>
 		<method name="pin_joint_get_local_a" qualifiers="const">
@@ -1088,7 +1088,7 @@
 			</return>
 			<argument index="0" name="joint" type="RID">
 			</argument>
-			<argument index="1" name="param" type="int" enum="PhysicsServer.PinJointParam">
+			<argument index="1" name="param" type="int" enum="PhysicsServer3D.PinJointParam">
 			</argument>
 			<description>
 				Gets a pin_joint parameter (see [enum PinJointParam] constants).
@@ -1121,7 +1121,7 @@
 			</return>
 			<argument index="0" name="joint" type="RID">
 			</argument>
-			<argument index="1" name="param" type="int" enum="PhysicsServer.PinJointParam">
+			<argument index="1" name="param" type="int" enum="PhysicsServer3D.PinJointParam">
 			</argument>
 			<argument index="2" name="value" type="float">
 			</argument>
@@ -1141,7 +1141,7 @@
 		<method name="shape_create">
 			<return type="RID">
 			</return>
-			<argument index="0" name="type" type="int" enum="PhysicsServer.ShapeType">
+			<argument index="0" name="type" type="int" enum="PhysicsServer3D.ShapeType">
 			</argument>
 			<description>
 				Creates a shape of a type from [enum ShapeType]. Does not assign it to a body or an area. To do so, you must use [method area_set_shape] or [method body_set_shape].
@@ -1157,7 +1157,7 @@
 			</description>
 		</method>
 		<method name="shape_get_type" qualifiers="const">
-			<return type="int" enum="PhysicsServer.ShapeType">
+			<return type="int" enum="PhysicsServer3D.ShapeType">
 			</return>
 			<argument index="0" name="shape" type="RID">
 			</argument>
@@ -1181,7 +1181,7 @@
 			</return>
 			<argument index="0" name="joint" type="RID">
 			</argument>
-			<argument index="1" name="param" type="int" enum="PhysicsServer.SliderJointParam">
+			<argument index="1" name="param" type="int" enum="PhysicsServer3D.SliderJointParam">
 			</argument>
 			<description>
 				Gets a slider_joint parameter (see [enum SliderJointParam] constants).
@@ -1192,7 +1192,7 @@
 			</return>
 			<argument index="0" name="joint" type="RID">
 			</argument>
-			<argument index="1" name="param" type="int" enum="PhysicsServer.SliderJointParam">
+			<argument index="1" name="param" type="int" enum="PhysicsServer3D.SliderJointParam">
 			</argument>
 			<argument index="2" name="value" type="float">
 			</argument>
@@ -1208,12 +1208,12 @@
 			</description>
 		</method>
 		<method name="space_get_direct_state">
-			<return type="PhysicsDirectSpaceState">
+			<return type="PhysicsDirectSpaceState3D">
 			</return>
 			<argument index="0" name="space" type="RID">
 			</argument>
 			<description>
-				Returns the state of a space, a [PhysicsDirectSpaceState]. This object can be used to make collision/intersection queries.
+				Returns the state of a space, a [PhysicsDirectSpaceState3D]. This object can be used to make collision/intersection queries.
 			</description>
 		</method>
 		<method name="space_get_param" qualifiers="const">
@@ -1221,7 +1221,7 @@
 			</return>
 			<argument index="0" name="space" type="RID">
 			</argument>
-			<argument index="1" name="param" type="int" enum="PhysicsServer.SpaceParameter">
+			<argument index="1" name="param" type="int" enum="PhysicsServer3D.SpaceParameter">
 			</argument>
 			<description>
 				Returns the value of a space parameter.
@@ -1252,7 +1252,7 @@
 			</return>
 			<argument index="0" name="space" type="RID">
 			</argument>
-			<argument index="1" name="param" type="int" enum="PhysicsServer.SpaceParameter">
+			<argument index="1" name="param" type="int" enum="PhysicsServer3D.SpaceParameter">
 			</argument>
 			<argument index="2" name="value" type="float">
 			</argument>
@@ -1263,19 +1263,19 @@
 	</methods>
 	<constants>
 		<constant name="JOINT_PIN" value="0" enum="JointType">
-			The [Joint] is a [PinJoint].
+			The [Joint3D] is a [PinJoint3D].
 		</constant>
 		<constant name="JOINT_HINGE" value="1" enum="JointType">
-			The [Joint] is a [HingeJoint].
+			The [Joint3D] is a [HingeJoint3D].
 		</constant>
 		<constant name="JOINT_SLIDER" value="2" enum="JointType">
-			The [Joint] is a [SliderJoint].
+			The [Joint3D] is a [SliderJoint3D].
 		</constant>
 		<constant name="JOINT_CONE_TWIST" value="3" enum="JointType">
-			The [Joint] is a [ConeTwistJoint].
+			The [Joint3D] is a [ConeTwistJoint3D].
 		</constant>
 		<constant name="JOINT_6DOF" value="4" enum="JointType">
-			The [Joint] is a [Generic6DOFJoint].
+			The [Joint3D] is a [Generic6DOFJoint3D].
 		</constant>
 		<constant name="PIN_JOINT_BIAS" value="0" enum="PinJointParam">
 			The strength with which the pinned objects try to stay in positional relation to each other.
@@ -1286,7 +1286,7 @@
 			The higher, the stronger.
 		</constant>
 		<constant name="PIN_JOINT_IMPULSE_CLAMP" value="2" enum="PinJointParam">
-			If above 0, this value is the maximum value for an impulse that this Joint puts on its ends.
+			If above 0, this value is the maximum value for an impulse that this Joint3D puts on its ends.
 		</constant>
 		<constant name="HINGE_JOINT_BIAS" value="0" enum="HingeJointParam">
 			The speed with which the two bodies get pulled together when they move in different directions.
@@ -1389,7 +1389,7 @@
 		<constant name="CONE_TWIST_JOINT_SWING_SPAN" value="0" enum="ConeTwistJointParam">
 			Swing is rotation from side to side, around the axis perpendicular to the twist axis.
 			The swing span defines, how much rotation will not get corrected along the swing axis.
-			Could be defined as looseness in the [ConeTwistJoint].
+			Could be defined as looseness in the [ConeTwistJoint3D].
 			If below 0.05, this behavior is locked.
 		</constant>
 		<constant name="CONE_TWIST_JOINT_TWIST_SPAN" value="1" enum="ConeTwistJointParam">
@@ -1401,7 +1401,7 @@
 			The higher, the faster.
 		</constant>
 		<constant name="CONE_TWIST_JOINT_SOFTNESS" value="3" enum="ConeTwistJointParam">
-			The ease with which the Joint twists, if it's too low, it takes more force to twist the joint.
+			The ease with which the Joint3D twists, if it's too low, it takes more force to twist the joint.
 		</constant>
 		<constant name="CONE_TWIST_JOINT_RELAXATION" value="4" enum="ConeTwistJointParam">
 			Defines, how fast the swing- and twist-speed-difference on both sides gets synced.
@@ -1467,31 +1467,31 @@
 			If [code]set[/code] there is a linear motor on this axis that targets a specific velocity.
 		</constant>
 		<constant name="SHAPE_PLANE" value="0" enum="ShapeType">
-			The [Shape] is a [WorldMarginShape].
+			The [Shape3D] is a [WorldMarginShape3D].
 		</constant>
 		<constant name="SHAPE_RAY" value="1" enum="ShapeType">
-			The [Shape] is a [RayShape].
+			The [Shape3D] is a [RayShape3D].
 		</constant>
 		<constant name="SHAPE_SPHERE" value="2" enum="ShapeType">
-			The [Shape] is a [SphereShape].
+			The [Shape3D] is a [SphereShape3D].
 		</constant>
 		<constant name="SHAPE_BOX" value="3" enum="ShapeType">
-			The [Shape] is a [BoxShape].
+			The [Shape3D] is a [BoxShape3D].
 		</constant>
 		<constant name="SHAPE_CAPSULE" value="4" enum="ShapeType">
-			The [Shape] is a [CapsuleShape].
+			The [Shape3D] is a [CapsuleShape3D].
 		</constant>
 		<constant name="SHAPE_CYLINDER" value="5" enum="ShapeType">
-			The [Shape] is a [CylinderShape].
+			The [Shape3D] is a [CylinderShape3D].
 		</constant>
 		<constant name="SHAPE_CONVEX_POLYGON" value="6" enum="ShapeType">
-			The [Shape] is a [ConvexPolygonShape].
+			The [Shape3D] is a [ConvexPolygonShape3D].
 		</constant>
 		<constant name="SHAPE_CONCAVE_POLYGON" value="7" enum="ShapeType">
-			The [Shape] is a [ConcavePolygonShape].
+			The [Shape3D] is a [ConcavePolygonShape3D].
 		</constant>
 		<constant name="SHAPE_HEIGHTMAP" value="8" enum="ShapeType">
-			The [Shape] is a [HeightMapShape].
+			The [Shape3D] is a [HeightMapShape3D].
 		</constant>
 		<constant name="SHAPE_CUSTOM" value="9" enum="ShapeType">
 			This constant is used internally by the engine. Any attempt to create this kind of shape results in an error.
diff --git a/doc/classes/Physics2DShapeQueryParameters.xml b/doc/classes/PhysicsShapeQueryParameters2D.xml
index 392ccbd10a..9a162dabbb 100644
--- a/doc/classes/Physics2DShapeQueryParameters.xml
+++ b/doc/classes/PhysicsShapeQueryParameters2D.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Physics2DShapeQueryParameters" inherits="Reference" version="4.0">
+<class name="PhysicsShapeQueryParameters2D" inherits="Reference" version="4.0">
 	<brief_description>
 		Parameters to be sent to a 2D shape physics query.
 	</brief_description>
 	<description>
-		This class contains the shape and other parameters for 2D intersection/collision queries. See also [Physics2DShapeQueryResult].
+		This class contains the shape and other parameters for 2D intersection/collision queries. See also [PhysicsShapeQueryResult2D].
 	</description>
 	<tutorials>
 	</tutorials>
diff --git a/doc/classes/PhysicsShapeQueryParameters.xml b/doc/classes/PhysicsShapeQueryParameters3D.xml
index 829a1d1bf0..6606cfbc59 100644
--- a/doc/classes/PhysicsShapeQueryParameters.xml
+++ b/doc/classes/PhysicsShapeQueryParameters3D.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="PhysicsShapeQueryParameters" inherits="Reference" version="4.0">
+<class name="PhysicsShapeQueryParameters3D" inherits="Reference" version="4.0">
 	<brief_description>
 		Parameters to be sent to a 3D shape physics query.
 	</brief_description>
 	<description>
-		This class contains the shape and other parameters for 3D intersection/collision queries. See also [PhysicsShapeQueryResult].
+		This class contains the shape and other parameters for 3D intersection/collision queries. See also [PhysicsShapeQueryResult3D].
 	</description>
 	<tutorials>
 	</tutorials>
@@ -15,16 +15,16 @@
 			<argument index="0" name="shape" type="Resource">
 			</argument>
 			<description>
-				Sets the [Shape] that will be used for collision/intersection queries.
+				Sets the [Shape3D] that will be used for collision/intersection queries.
 			</description>
 		</method>
 	</methods>
 	<members>
 		<member name="collide_with_areas" type="bool" setter="set_collide_with_areas" getter="is_collide_with_areas_enabled" default="false">
-			If [code]true[/code], the query will take [Area]s into account.
+			If [code]true[/code], the query will take [Area3D]s into account.
 		</member>
 		<member name="collide_with_bodies" type="bool" setter="set_collide_with_bodies" getter="is_collide_with_bodies_enabled" default="true">
-			If [code]true[/code], the query will take [PhysicsBody]s into account.
+			If [code]true[/code], the query will take [PhysicsBody3D]s into account.
 		</member>
 		<member name="collision_mask" type="int" setter="set_collision_mask" getter="get_collision_mask" default="2147483647">
 			The physics layer(s) the query will take into account (as a bitmask).
diff --git a/doc/classes/Physics2DShapeQueryResult.xml b/doc/classes/PhysicsShapeQueryResult2D.xml
index 359a716bee..227683cc33 100644
--- a/doc/classes/Physics2DShapeQueryResult.xml
+++ b/doc/classes/PhysicsShapeQueryResult2D.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Physics2DShapeQueryResult" inherits="Reference" version="4.0">
+<class name="PhysicsShapeQueryResult2D" inherits="Reference" version="4.0">
 	<brief_description>
-		Result of a 2D shape query in [Physics2DServer].
+		Result of a 2D shape query in [PhysicsServer2D].
 	</brief_description>
 	<description>
-		The result of a 2D shape query in [Physics2DServer]. See also [Physics2DShapeQueryParameters].
+		The result of a 2D shape query in [PhysicsServer2D]. See also [PhysicsShapeQueryParameters2D].
 	</description>
 	<tutorials>
 	</tutorials>
@@ -40,7 +40,7 @@
 			<argument index="0" name="idx" type="int">
 			</argument>
 			<description>
-				Returns the child index of the object's [Shape] that intersected with the shape at index [code]idx[/code].
+				Returns the child index of the object's [Shape2D] that intersected with the shape at index [code]idx[/code].
 			</description>
 		</method>
 		<method name="get_result_rid" qualifiers="const">
diff --git a/doc/classes/PhysicsShapeQueryResult.xml b/doc/classes/PhysicsShapeQueryResult3D.xml
index ea6dc2c39e..4555c4e242 100644
--- a/doc/classes/PhysicsShapeQueryResult.xml
+++ b/doc/classes/PhysicsShapeQueryResult3D.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="PhysicsShapeQueryResult" inherits="Reference" version="4.0">
+<class name="PhysicsShapeQueryResult3D" inherits="Reference" version="4.0">
 	<brief_description>
-		Result of a 3D shape query in [PhysicsServer].
+		Result of a 3D shape query in [PhysicsServer3D].
 	</brief_description>
 	<description>
-		The result of a 3D shape query in [PhysicsServer]. See also [PhysicsShapeQueryParameters].
+		The result of a 3D shape query in [PhysicsServer3D]. See also [PhysicsShapeQueryParameters3D].
 	</description>
 	<tutorials>
 	</tutorials>
@@ -40,7 +40,7 @@
 			<argument index="0" name="idx" type="int">
 			</argument>
 			<description>
-				Returns the child index of the object's [Shape] that intersected with the shape at index [code]idx[/code].
+				Returns the child index of the object's [Shape3D] that intersected with the shape at index [code]idx[/code].
 			</description>
 		</method>
 		<method name="get_result_rid" qualifiers="const">
diff --git a/doc/classes/Physics2DTestMotionResult.xml b/doc/classes/PhysicsTestMotionResult2D.xml
index 9e8c03580f..301cff2885 100644
--- a/doc/classes/Physics2DTestMotionResult.xml
+++ b/doc/classes/PhysicsTestMotionResult2D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Physics2DTestMotionResult" inherits="Reference" version="4.0">
+<class name="PhysicsTestMotionResult2D" inherits="Reference" version="4.0">
 	<brief_description>
 	</brief_description>
 	<description>
diff --git a/doc/classes/PinJoint2D.xml b/doc/classes/PinJoint2D.xml
index 020babdf40..42155a7f25 100644
--- a/doc/classes/PinJoint2D.xml
+++ b/doc/classes/PinJoint2D.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <class name="PinJoint2D" inherits="Joint2D" version="4.0">
 	<brief_description>
-		Pin Joint for 2D shapes.
+		Pin joint for 2D shapes.
 	</brief_description>
 	<description>
-		Pin Joint for 2D rigid bodies. It pins two bodies (rigid or static) together.
+		Pin joint for 2D rigid bodies. It pins two bodies (rigid or static) together.
 	</description>
 	<tutorials>
 	</tutorials>
diff --git a/doc/classes/PinJoint.xml b/doc/classes/PinJoint3D.xml
index 78cab4805e..0af1e60839 100644
--- a/doc/classes/PinJoint.xml
+++ b/doc/classes/PinJoint3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="PinJoint" inherits="Joint" version="4.0">
+<class name="PinJoint3D" inherits="Joint3D" version="4.0">
 	<brief_description>
 		Pin joint for 3D shapes.
 	</brief_description>
@@ -12,7 +12,7 @@
 		<method name="get_param" qualifiers="const">
 			<return type="float">
 			</return>
-			<argument index="0" name="param" type="int" enum="PinJoint.Param">
+			<argument index="0" name="param" type="int" enum="PinJoint3D.Param">
 			</argument>
 			<description>
 				Returns the value of the specified parameter.
@@ -21,7 +21,7 @@
 		<method name="set_param">
 			<return type="void">
 			</return>
-			<argument index="0" name="param" type="int" enum="PinJoint.Param">
+			<argument index="0" name="param" type="int" enum="PinJoint3D.Param">
 			</argument>
 			<argument index="1" name="value" type="float">
 			</argument>
@@ -38,7 +38,7 @@
 			The force with which the pinned objects stay in velocity relation to each other. The higher, the stronger.
 		</member>
 		<member name="params/impulse_clamp" type="float" setter="set_param" getter="get_param" default="0.0">
-			If above 0, this value is the maximum value for an impulse that this Joint produces.
+			If above 0, this value is the maximum value for an impulse that this Joint3D produces.
 		</member>
 	</members>
 	<constants>
@@ -49,7 +49,7 @@
 			The force with which the pinned objects stay in velocity relation to each other. The higher, the stronger.
 		</constant>
 		<constant name="PARAM_IMPULSE_CLAMP" value="2" enum="Param">
-			If above 0, this value is the maximum value for an impulse that this Joint produces.
+			If above 0, this value is the maximum value for an impulse that this Joint3D produces.
 		</constant>
 	</constants>
 </class>
diff --git a/doc/classes/Position3D.xml b/doc/classes/Position3D.xml
index 6dce8a91c6..ca61a57483 100644
--- a/doc/classes/Position3D.xml
+++ b/doc/classes/Position3D.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Position3D" inherits="Spatial" version="4.0">
+<class name="Position3D" inherits="Node3D" version="4.0">
 	<brief_description>
 		Generic 3D position hint for editing.
 	</brief_description>
 	<description>
-		Generic 3D position hint for editing. It's just like a plain [Spatial], but it displays as a cross in the 3D editor at all times.
+		Generic 3D position hint for editing. It's just like a plain [Node3D], but it displays as a cross in the 3D editor at all times.
 	</description>
 	<tutorials>
 	</tutorials>
diff --git a/doc/classes/ProceduralSkyMaterial.xml b/doc/classes/ProceduralSkyMaterial.xml
index dec0cbc120..70e82d248c 100644
--- a/doc/classes/ProceduralSkyMaterial.xml
+++ b/doc/classes/ProceduralSkyMaterial.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <class name="ProceduralSkyMaterial" inherits="Material" version="4.0">
 	<brief_description>
-	A [Material] used with [Sky] to generate a background based on user input parameters.
+		A [Material] used with [Sky] to generate a background based on user input parameters.
 	</brief_description>
 	<description>
 		ProceduralSkyMaterial provides a way to create an effective background quickly by defining procedural parameters for the sun, the sky and the ground. The sky and ground are very similar, they are defined by a color at the horizon, another color, and finally an easing curve to interpolate between these two colors. Similarly, the sun is described by a position in the sky, a color, and an easing curve. However, the sun also defines a minimum and maximum angle, these two values define at what distance the easing curve begins and ends from the sun, and thus end up defining the size of the sun in the sky.
 		The [ProceduralSkyMaterial] uses a lightweight shader to draw the sky and is thus suited for real time updates. When you do not need a quick sky that is not realistic, this is a good option.
-		The [ProceduralSkyMaterial] supports up to 4 suns. Each sun takes its color, energy, and direction from the corresponding [DirectionalLight] in the scene.
+		The [ProceduralSkyMaterial] supports up to 4 suns. Each sun takes its color, energy, and direction from the corresponding [DirectionalLight3D] in the scene.
 	</description>
 	<tutorials>
 	</tutorials>
diff --git a/doc/classes/ProjectSettings.xml b/doc/classes/ProjectSettings.xml
index 79d5ffa2e7..121e55c87e 100644
--- a/doc/classes/ProjectSettings.xml
+++ b/doc/classes/ProjectSettings.xml
@@ -898,7 +898,7 @@
 			[b]Note:[/b] This property is only read when the project starts. To change the default gravity at runtime, use the following code sample:
 			[codeblock]
 			# Set the default gravity strength to 98.
-			Physics2DServer.area_set_param(get_viewport().find_world_2d().get_space(), Physics2DServer.AREA_PARAM_GRAVITY, 98)
+			PhysicsServer2D.area_set_param(get_viewport().find_world_2d().get_space(), PhysicsServer2D.AREA_PARAM_GRAVITY, 98)
 			[/codeblock]
 		</member>
 		<member name="physics/2d/default_gravity_vector" type="Vector2" setter="" getter="" default="Vector2( 0, 1 )">
@@ -906,7 +906,7 @@
 			[b]Note:[/b] This property is only read when the project starts. To change the default gravity vector at runtime, use the following code sample:
 			[codeblock]
 			# Set the default gravity direction to `Vector2(0, 1)`.
-			Physics2DServer.area_set_param(get_viewport().find_world_2d().get_space(), Physics2DServer.AREA_PARAM_GRAVITY_VECTOR, Vector2(0, 1))
+			PhysicsServer2D.area_set_param(get_viewport().find_world_2d().get_space(), PhysicsServer2D.AREA_PARAM_GRAVITY_VECTOR, Vector2(0, 1))
 			[/codeblock]
 		</member>
 		<member name="physics/2d/default_linear_damp" type="float" setter="" getter="" default="0.1">
@@ -920,20 +920,20 @@
 			"DEFAULT" and "GodotPhysics" are the same, as there is currently no alternative 2D physics server implemented.
 		</member>
 		<member name="physics/2d/sleep_threshold_angular" type="float" setter="" getter="" default="0.139626">
-			Threshold angular velocity under which a 2D physics body will be considered inactive. See [constant Physics2DServer.SPACE_PARAM_BODY_ANGULAR_VELOCITY_SLEEP_THRESHOLD].
+			Threshold angular velocity under which a 2D physics body will be considered inactive. See [constant PhysicsServer2D.SPACE_PARAM_BODY_ANGULAR_VELOCITY_SLEEP_THRESHOLD].
 		</member>
 		<member name="physics/2d/sleep_threshold_linear" type="float" setter="" getter="" default="2.0">
-			Threshold linear velocity under which a 2D physics body will be considered inactive. See [constant Physics2DServer.SPACE_PARAM_BODY_LINEAR_VELOCITY_SLEEP_THRESHOLD].
+			Threshold linear velocity under which a 2D physics body will be considered inactive. See [constant PhysicsServer2D.SPACE_PARAM_BODY_LINEAR_VELOCITY_SLEEP_THRESHOLD].
 		</member>
 		<member name="physics/2d/thread_model" type="int" setter="" getter="" default="1">
 			Sets whether physics is run on the main thread or a separate one. Running the server on a thread increases performance, but restricts API access to only physics process.
 			[b]Warning:[/b] As of Godot 3.2, there are mixed reports about the use of a Multi-Threaded thread model for physics. Be sure to assess whether it does give you extra performance and no regressions when using it.
 		</member>
 		<member name="physics/2d/time_before_sleep" type="float" setter="" getter="" default="0.5">
-			Time (in seconds) of inactivity before which a 2D physics body will put to sleep. See [constant Physics2DServer.SPACE_PARAM_BODY_TIME_TO_SLEEP].
+			Time (in seconds) of inactivity before which a 2D physics body will put to sleep. See [constant PhysicsServer2D.SPACE_PARAM_BODY_TIME_TO_SLEEP].
 		</member>
 		<member name="physics/3d/active_soft_world" type="bool" setter="" getter="" default="true">
-			Sets whether the 3D physics world will be created with support for [SoftBody] physics. Only applies to the Bullet physics engine.
+			Sets whether the 3D physics world will be created with support for [SoftBody3D] physics. Only applies to the Bullet physics engine.
 		</member>
 		<member name="physics/3d/default_angular_damp" type="float" setter="" getter="" default="0.1">
 			The default angular damp in 3D.
@@ -943,7 +943,7 @@
 			[b]Note:[/b] This property is only read when the project starts. To change the default gravity at runtime, use the following code sample:
 			[codeblock]
 			# Set the default gravity strength to 9.8.
-			PhysicsServer.area_set_param(get_viewport().find_world().get_space(), PhysicsServer.AREA_PARAM_GRAVITY, 9.8)
+			PhysicsServer3D.area_set_param(get_viewport().find_world().get_space(), PhysicsServer3D.AREA_PARAM_GRAVITY, 9.8)
 			[/codeblock]
 		</member>
 		<member name="physics/3d/default_gravity_vector" type="Vector3" setter="" getter="" default="Vector3( 0, -1, 0 )">
@@ -951,7 +951,7 @@
 			[b]Note:[/b] This property is only read when the project starts. To change the default gravity vector at runtime, use the following code sample:
 			[codeblock]
 			# Set the default gravity direction to `Vector3(0, -1, 0)`.
-			PhysicsServer.area_set_param(get_viewport().find_world().get_space(), PhysicsServer.AREA_PARAM_GRAVITY_VECTOR, Vector3(0, -1, 0))
+			PhysicsServer3D.area_set_param(get_viewport().find_world().get_space(), PhysicsServer3D.AREA_PARAM_GRAVITY_VECTOR, Vector3(0, -1, 0))
 			[/codeblock]
 		</member>
 		<member name="physics/3d/default_linear_damp" type="float" setter="" getter="" default="0.1">
@@ -973,7 +973,7 @@
 			[b]Note:[/b] This property is only read when the project starts. To change the physics FPS at runtime, set [member Engine.physics_jitter_fix] instead.
 		</member>
 		<member name="rendering/environment/default_clear_color" type="Color" setter="" getter="" default="Color( 0.3, 0.3, 0.3, 1 )">
-			Default background clear color. Overridable per [Viewport] using its [Environment]. See [member Environment.background_mode] and [member Environment.background_color] in particular. To change this default color programmatically, use [method VisualServer.set_default_clear_color].
+			Default background clear color. Overridable per [Viewport] using its [Environment]. See [member Environment.background_mode] and [member Environment.background_color] in particular. To change this default color programmatically, use [method RenderingServer.set_default_clear_color].
 		</member>
 		<member name="rendering/environment/default_environment" type="String" setter="" getter="" default="&quot;&quot;">
 			[Environment] that will be used as a fallback environment in case a scene does not specify its own environment. The default environment is loaded in at scene load time regardless of whether you have set an environment or not. If you do not rely on the fallback environment, it is best to delete [code]default_env.tres[/code], or to specify a different default environment here.
diff --git a/doc/classes/ProximityGroup.xml b/doc/classes/ProximityGroup3D.xml
index dee1a3daf0..1714c1ec8d 100644
--- a/doc/classes/ProximityGroup.xml
+++ b/doc/classes/ProximityGroup3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ProximityGroup" inherits="Spatial" version="4.0">
+<class name="ProximityGroup3D" inherits="Node3D" version="4.0">
 	<brief_description>
 		General-purpose proximity detection node.
 	</brief_description>
@@ -21,7 +21,7 @@
 		</method>
 	</methods>
 	<members>
-		<member name="dispatch_mode" type="int" setter="set_dispatch_mode" getter="get_dispatch_mode" enum="ProximityGroup.DispatchMode" default="0">
+		<member name="dispatch_mode" type="int" setter="set_dispatch_mode" getter="get_dispatch_mode" enum="ProximityGroup3D.DispatchMode" default="0">
 		</member>
 		<member name="grid_radius" type="Vector3" setter="set_grid_radius" getter="get_grid_radius" default="Vector3( 1, 1, 1 )">
 		</member>
diff --git a/doc/classes/RID.xml b/doc/classes/RID.xml
index 77c608fccb..644c427120 100644
--- a/doc/classes/RID.xml
+++ b/doc/classes/RID.xml
@@ -4,7 +4,7 @@
 		Handle for a [Resource]'s unique ID.
 	</brief_description>
 	<description>
-		The RID type is used to access the unique integer ID of a resource. They are opaque, which means they do not grant access to the associated resource by themselves. They are used by and with the low-level Server classes such as [VisualServer].
+		The RID type is used to access the unique integer ID of a resource. They are opaque, which means they do not grant access to the associated resource by themselves. They are used by and with the low-level Server classes such as [RenderingServer].
 	</description>
 	<tutorials>
 	</tutorials>
diff --git a/doc/classes/RayCast.xml b/doc/classes/RayCast3D.xml
index 65f632ba74..08c6d6f40c 100644
--- a/doc/classes/RayCast.xml
+++ b/doc/classes/RayCast3D.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="RayCast" inherits="Spatial" version="4.0">
+<class name="RayCast3D" inherits="Node3D" version="4.0">
 	<brief_description>
 		Query the closest object intersecting a ray.
 	</brief_description>
 	<description>
 		A RayCast represents a line from its origin to its destination position, [code]cast_to[/code]. It is used to query the 3D space in order to find the closest object along the path of the ray.
-		RayCast can ignore some objects by adding them to the exception list via [code]add_exception[/code] or by setting proper filtering with collision layers and masks.
-		RayCast can be configured to report collisions with [Area]s ([member collide_with_areas]) and/or [PhysicsBody]s ([member collide_with_bodies]).
+		RayCast3D can ignore some objects by adding them to the exception list via [code]add_exception[/code] or by setting proper filtering with collision layers and masks.
+		RayCast3D can be configured to report collisions with [Area3D]s ([member collide_with_areas]) and/or [PhysicsBody3D]s ([member collide_with_bodies]).
 		Only enabled raycasts will be able to query the space and report collisions.
-		RayCast calculates intersection every physics frame (see [Node]), and the result is cached so it can be used later until the next frame. If multiple queries are required between physics frames (or during the same frame), use [method force_raycast_update] after adjusting the raycast.
+		RayCast3D calculates intersection every physics frame (see [Node]), and the result is cached so it can be used later until the next frame. If multiple queries are required between physics frames (or during the same frame), use [method force_raycast_update] after adjusting the raycast.
 	</description>
 	<tutorials>
 		<link>https://docs.godotengine.org/en/latest/tutorials/physics/ray-casting.html</link>
@@ -130,10 +130,10 @@
 			The ray's destination point, relative to the RayCast's [code]position[/code].
 		</member>
 		<member name="collide_with_areas" type="bool" setter="set_collide_with_areas" getter="is_collide_with_areas_enabled" default="false">
-			If [code]true[/code], collision with [Area]s will be reported.
+			If [code]true[/code], collision with [Area3D]s will be reported.
 		</member>
 		<member name="collide_with_bodies" type="bool" setter="set_collide_with_bodies" getter="is_collide_with_bodies_enabled" default="true">
-			If [code]true[/code], collision with [PhysicsBody]s will be reported.
+			If [code]true[/code], collision with [PhysicsBody3D]s will be reported.
 		</member>
 		<member name="collision_mask" type="int" setter="set_collision_mask" getter="get_collision_mask" default="1">
 			The ray's collision mask. Only objects in at least one collision layer enabled in the mask will be detected.
@@ -142,7 +142,7 @@
 			If [code]true[/code], collisions will be reported.
 		</member>
 		<member name="exclude_parent" type="bool" setter="set_exclude_parent_body" getter="get_exclude_parent_body" default="true">
-			If [code]true[/code], collisions will be ignored for this RayCast's immediate parent.
+			If [code]true[/code], collisions will be ignored for this RayCast3D's immediate parent.
 		</member>
 	</members>
 	<constants>
diff --git a/doc/classes/RayShape.xml b/doc/classes/RayShape3D.xml
index 87a642f779..9839044c30 100644
--- a/doc/classes/RayShape.xml
+++ b/doc/classes/RayShape3D.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="RayShape" inherits="Shape" version="4.0">
+<class name="RayShape3D" inherits="Shape3D" version="4.0">
 	<brief_description>
 		Ray shape for 3D collisions.
 	</brief_description>
 	<description>
-		Ray shape for 3D collisions, which can be set into a [PhysicsBody] or [Area]. A ray is not really a collision body; instead, it tries to separate itself from whatever is touching its far endpoint. It's often useful for characters.
+		Ray shape for 3D collisions, which can be set into a [PhysicsBody3D] or [Area3D]. A ray is not really a collision body; instead, it tries to separate itself from whatever is touching its far endpoint. It's often useful for characters.
 	</description>
 	<tutorials>
 	</tutorials>
diff --git a/doc/classes/ReflectionProbe.xml b/doc/classes/ReflectionProbe.xml
index e138af6841..84f87c3e71 100644
--- a/doc/classes/ReflectionProbe.xml
+++ b/doc/classes/ReflectionProbe.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ReflectionProbe" inherits="VisualInstance" version="4.0">
+<class name="ReflectionProbe" inherits="VisualInstance3D" version="4.0">
 	<brief_description>
 		Captures its surroundings to create reflections.
 	</brief_description>
@@ -17,7 +17,7 @@
 			If [code]true[/code], enables box projection. This makes reflections look more correct in rectangle-shaped rooms by offsetting the reflection center depending on the camera's location.
 		</member>
 		<member name="cull_mask" type="int" setter="set_cull_mask" getter="get_cull_mask" default="1048575">
-			Sets the cull mask which determines what objects are drawn by this probe. Every [VisualInstance] with a layer included in this cull mask will be rendered by the probe. It is best to only include large objects which are likely to take up a lot of space in the reflection in order to save on rendering cost.
+			Sets the cull mask which determines what objects are drawn by this probe. Every [VisualInstance3D] with a layer included in this cull mask will be rendered by the probe. It is best to only include large objects which are likely to take up a lot of space in the reflection in order to save on rendering cost.
 		</member>
 		<member name="enable_shadows" type="bool" setter="set_enable_shadows" getter="are_shadows_enabled" default="false">
 			If [code]true[/code], computes shadows in the reflection probe. This makes the reflection probe slower to render; you may want to disable this if using the [constant UPDATE_ALWAYS] [member update_mode].
diff --git a/doc/classes/RemoteTransform.xml b/doc/classes/RemoteTransform3D.xml
index feb6ac1841..bd3da2aea9 100644
--- a/doc/classes/RemoteTransform.xml
+++ b/doc/classes/RemoteTransform3D.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="RemoteTransform" inherits="Spatial" version="4.0">
+<class name="RemoteTransform3D" inherits="Node3D" version="4.0">
 	<brief_description>
-		RemoteTransform pushes its own [Transform] to another [Spatial] derived Node in the scene.
+		RemoteTransform3D pushes its own [Transform] to another [Node3D] derived Node in the scene.
 	</brief_description>
 	<description>
-		RemoteTransform pushes its own [Transform] to another [Spatial] derived Node (called the remote node) in the scene.
+		RemoteTransform3D pushes its own [Transform] to another [Node3D] derived Node (called the remote node) in the scene.
 		It can be set to update another Node's position, rotation and/or scale. It can use either global or local coordinates.
 	</description>
 	<tutorials>
@@ -14,13 +14,13 @@
 			<return type="void">
 			</return>
 			<description>
-				[RemoteTransform] caches the remote node. It may not notice if the remote node disappears; [method force_update_cache] forces it to update the cache again.
+				[RemoteTransform3D] caches the remote node. It may not notice if the remote node disappears; [method force_update_cache] forces it to update the cache again.
 			</description>
 		</method>
 	</methods>
 	<members>
 		<member name="remote_path" type="NodePath" setter="set_remote_node" getter="get_remote_node" default="NodePath(&quot;&quot;)">
-			The [NodePath] to the remote node, relative to the RemoteTransform's position in the scene.
+			The [NodePath] to the remote node, relative to the RemoteTransform3D's position in the scene.
 		</member>
 		<member name="update_position" type="bool" setter="set_update_position" getter="get_update_position" default="true">
 			If [code]true[/code], the remote node's position is updated.
diff --git a/doc/classes/VisualServer.xml b/doc/classes/RenderingServer.xml
index 00e0b7cdc9..7127ba8b71 100644
--- a/doc/classes/VisualServer.xml
+++ b/doc/classes/RenderingServer.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualServer" inherits="Object" version="4.0">
+<class name="RenderingServer" inherits="Object" version="4.0">
 	<brief_description>
 		Server for anything visible.
 	</brief_description>
@@ -9,7 +9,7 @@
 		The visual server can be used to bypass the scene system entirely.
 		Resources are created using the [code]*_create[/code] functions.
 		All objects are drawn to a viewport. You can use the [Viewport] attached to the [SceneTree] or you can create one yourself with [method viewport_create]. When using a custom scenario or canvas, the scenario or canvas needs to be attached to the viewport using [method viewport_set_scenario] or [method viewport_attach_canvas].
-		In 3D, all visual objects must be associated with a scenario. The scenario is a visual representation of the world. If accessing the visual server from a running game, the scenario can be accessed from the scene tree from any [Spatial] node with [method Spatial.get_world]. Otherwise, a scenario can be created with [method scenario_create].
+		In 3D, all visual objects must be associated with a scenario. The scenario is a visual representation of the world. If accessing the visual server from a running game, the scenario can be accessed from the scene tree from any [Node3D] node with [method Node3D.get_world]. Otherwise, a scenario can be created with [method scenario_create].
 		Similarly in 2D, a canvas is needed to draw all canvas items.
 		In 3D, all visible objects are comprised of a resource and an instance. A resource can be a mesh, a particle system, a light, or any other 3D object. In order to be visible resources must be attached to an instance using [method instance_set_base]. The instance must also be attached to the scenario using [method instance_set_scenario] in order to be visible.
 		In 2D, all visible objects are some form of canvas item. In order to be visible, a canvas item needs to be the child of a canvas attached to a viewport, or it needs to be the child of another canvas item that is eventually attached to the canvas.
@@ -52,8 +52,8 @@
 			<return type="RID">
 			</return>
 			<description>
-				Creates a camera and adds it to the VisualServer. It can be accessed with the RID that is returned. This RID will be used in all [code]camera_*[/code] VisualServer functions.
-				Once finished with your RID, you will want to free the RID using the VisualServer's [method free_rid] static method.
+				Creates a camera and adds it to the RenderingServer. It can be accessed with the RID that is returned. This RID will be used in all [code]camera_*[/code] RenderingServer functions.
+				Once finished with your RID, you will want to free the RID using the RenderingServer's [method free_rid] static method.
 			</description>
 		</method>
 		<method name="camera_set_cull_mask">
@@ -64,7 +64,7 @@
 			<argument index="1" name="layers" type="int">
 			</argument>
 			<description>
-				Sets the cull mask associated with this camera. The cull mask describes which 3D layers are rendered by this camera. Equivalent to [member Camera.cull_mask].
+				Sets the cull mask associated with this camera. The cull mask describes which 3D layers are rendered by this camera. Equivalent to [member Camera3D.cull_mask].
 			</description>
 		</method>
 		<method name="camera_set_environment">
@@ -75,7 +75,7 @@
 			<argument index="1" name="env" type="RID">
 			</argument>
 			<description>
-				Sets the environment used by this camera. Equivalent to [member Camera.environment].
+				Sets the environment used by this camera. Equivalent to [member Camera3D.environment].
 			</description>
 		</method>
 		<method name="camera_set_frustum">
@@ -144,15 +144,15 @@
 			<argument index="1" name="enable" type="bool">
 			</argument>
 			<description>
-				If [code]true[/code], preserves the horizontal aspect ratio which is equivalent to [constant Camera.KEEP_WIDTH]. If [code]false[/code], preserves the vertical aspect ratio which is equivalent to [constant Camera.KEEP_HEIGHT].
+				If [code]true[/code], preserves the horizontal aspect ratio which is equivalent to [constant Camera3D.KEEP_WIDTH]. If [code]false[/code], preserves the vertical aspect ratio which is equivalent to [constant Camera3D.KEEP_HEIGHT].
 			</description>
 		</method>
 		<method name="canvas_create">
 			<return type="RID">
 			</return>
 			<description>
-				Creates a canvas and returns the assigned [RID]. It can be accessed with the RID that is returned. This RID will be used in all [code]canvas_*[/code] VisualServer functions.
-				Once finished with your RID, you will want to free the RID using the VisualServer's [method free_rid] static method.
+				Creates a canvas and returns the assigned [RID]. It can be accessed with the RID that is returned. This RID will be used in all [code]canvas_*[/code] RenderingServer functions.
+				Once finished with your RID, you will want to free the RID using the RenderingServer's [method free_rid] static method.
 			</description>
 		</method>
 		<method name="canvas_item_clear">
@@ -247,8 +247,8 @@
 			<return type="RID">
 			</return>
 			<description>
-				Creates a canvas light and adds it to the VisualServer. It can be accessed with the RID that is returned. This RID will be used in all [code]canvas_light_*[/code] VisualServer functions.
-				Once finished with your RID, you will want to free the RID using the VisualServer's [method free_rid] static method.
+				Creates a canvas light and adds it to the RenderingServer. It can be accessed with the RID that is returned. This RID will be used in all [code]canvas_light_*[/code] RenderingServer functions.
+				Once finished with your RID, you will want to free the RID using the RenderingServer's [method free_rid] static method.
 			</description>
 		</method>
 		<method name="canvas_light_occluder_attach_to_canvas">
@@ -266,8 +266,8 @@
 			<return type="RID">
 			</return>
 			<description>
-				Creates a light occluder and adds it to the VisualServer. It can be accessed with the RID that is returned. This RID will be used in all [code]canvas_light_ocluder_*[/code] VisualServer functions.
-				Once finished with your RID, you will want to free the RID using the VisualServer's [method free_rid] static method.
+				Creates a light occluder and adds it to the RenderingServer. It can be accessed with the RID that is returned. This RID will be used in all [code]canvas_light_ocluder_*[/code] RenderingServer functions.
+				Once finished with your RID, you will want to free the RID using the RenderingServer's [method free_rid] static method.
 			</description>
 		</method>
 		<method name="canvas_light_occluder_set_enabled">
@@ -398,7 +398,7 @@
 			</return>
 			<argument index="0" name="light" type="RID">
 			</argument>
-			<argument index="1" name="mode" type="int" enum="VisualServer.CanvasLightMode">
+			<argument index="1" name="mode" type="int" enum="RenderingServer.CanvasLightMode">
 			</argument>
 			<description>
 				The mode of the light, see [enum CanvasLightMode] constants.
@@ -453,7 +453,7 @@
 			</return>
 			<argument index="0" name="light" type="RID">
 			</argument>
-			<argument index="1" name="filter" type="int" enum="VisualServer.CanvasLightShadowFilter">
+			<argument index="1" name="filter" type="int" enum="RenderingServer.CanvasLightShadowFilter">
 			</argument>
 			<description>
 				Sets the canvas light's shadow's filter, see [enum CanvasLightShadowFilter] constants.
@@ -520,8 +520,8 @@
 			<return type="RID">
 			</return>
 			<description>
-				Creates a new light occluder polygon and adds it to the VisualServer. It can be accessed with the RID that is returned. This RID will be used in all [code]canvas_occluder_polygon_*[/code] VisualServer functions.
-				Once finished with your RID, you will want to free the RID using the VisualServer's [method free_rid] static method.
+				Creates a new light occluder polygon and adds it to the RenderingServer. It can be accessed with the RID that is returned. This RID will be used in all [code]canvas_occluder_polygon_*[/code] RenderingServer functions.
+				Once finished with your RID, you will want to free the RID using the RenderingServer's [method free_rid] static method.
 			</description>
 		</method>
 		<method name="canvas_occluder_polygon_set_cull_mode">
@@ -529,7 +529,7 @@
 			</return>
 			<argument index="0" name="occluder_polygon" type="RID">
 			</argument>
-			<argument index="1" name="mode" type="int" enum="VisualServer.CanvasOccluderPolygonCullMode">
+			<argument index="1" name="mode" type="int" enum="RenderingServer.CanvasOccluderPolygonCullMode">
 			</argument>
 			<description>
 				Sets an occluder polygons cull mode. See [enum CanvasOccluderPolygonCullMode] constants.
@@ -587,8 +587,8 @@
 			<return type="RID">
 			</return>
 			<description>
-				Creates a directional light and adds it to the VisualServer. It can be accessed with the RID that is returned. This RID can be used in most [code]light_*[/code] VisualServer functions.
-				Once finished with your RID, you will want to free the RID using the VisualServer's [method free_rid] static method.
+				Creates a directional light and adds it to the RenderingServer. It can be accessed with the RID that is returned. This RID can be used in most [code]light_*[/code] RenderingServer functions.
+				Once finished with your RID, you will want to free the RID using the RenderingServer's [method free_rid] static method.
 				To place in a scene, attach this directional light to an instance using [method instance_set_base] using the returned RID.
 			</description>
 		</method>
@@ -596,8 +596,8 @@
 			<return type="RID">
 			</return>
 			<description>
-				Creates an environment and adds it to the VisualServer. It can be accessed with the RID that is returned. This RID will be used in all [code]environment_*[/code] VisualServer functions.
-				Once finished with your RID, you will want to free the RID using the VisualServer's [method free_rid] static method.
+				Creates an environment and adds it to the RenderingServer. It can be accessed with the RID that is returned. This RID will be used in all [code]environment_*[/code] RenderingServer functions.
+				Once finished with your RID, you will want to free the RID using the RenderingServer's [method free_rid] static method.
 			</description>
 		</method>
 		<method name="environment_set_adjustment">
@@ -626,13 +626,13 @@
 			</argument>
 			<argument index="1" name="color" type="Color">
 			</argument>
-			<argument index="2" name="ambient" type="int" enum="VisualServer.EnvironmentAmbientSource" default="0">
+			<argument index="2" name="ambient" type="int" enum="RenderingServer.EnvironmentAmbientSource" default="0">
 			</argument>
 			<argument index="3" name="energy" type="float" default="1.0">
 			</argument>
 			<argument index="4" name="sky_contibution" type="float" default="0.0">
 			</argument>
-			<argument index="5" name="reflection_source" type="int" enum="VisualServer.EnvironmentReflectionSource" default="0">
+			<argument index="5" name="reflection_source" type="int" enum="RenderingServer.EnvironmentReflectionSource" default="0">
 			</argument>
 			<argument index="6" name="ao_color" type="Color" default="Color( 0, 0, 0, 1 )">
 			</argument>
@@ -644,7 +644,7 @@
 			</return>
 			<argument index="0" name="env" type="RID">
 			</argument>
-			<argument index="1" name="bg" type="int" enum="VisualServer.EnvironmentBG">
+			<argument index="1" name="bg" type="int" enum="RenderingServer.EnvironmentBG">
 			</argument>
 			<description>
 				Sets the [i]BGMode[/i] of the environment. Equivalent to [member Environment.background_mode].
@@ -755,7 +755,7 @@
 			</argument>
 			<argument index="6" name="bloom_threshold" type="float">
 			</argument>
-			<argument index="7" name="blend_mode" type="int" enum="VisualServer.EnvironmentGlowBlendMode">
+			<argument index="7" name="blend_mode" type="int" enum="RenderingServer.EnvironmentGlowBlendMode">
 			</argument>
 			<argument index="8" name="hdr_bleed_threshold" type="float">
 			</argument>
@@ -818,7 +818,7 @@
 			</argument>
 			<argument index="6" name="ao_channel_affect" type="float">
 			</argument>
-			<argument index="7" name="blur" type="int" enum="VisualServer.EnvironmentSSAOBlur">
+			<argument index="7" name="blur" type="int" enum="RenderingServer.EnvironmentSSAOBlur">
 			</argument>
 			<argument index="8" name="bilateral_sharpness" type="float">
 			</argument>
@@ -851,7 +851,7 @@
 			</return>
 			<argument index="0" name="env" type="RID">
 			</argument>
-			<argument index="1" name="tone_mapper" type="int" enum="VisualServer.EnvironmentToneMapper">
+			<argument index="1" name="tone_mapper" type="int" enum="RenderingServer.EnvironmentToneMapper">
 			</argument>
 			<argument index="2" name="exposure" type="float">
 			</argument>
@@ -902,13 +902,13 @@
 			<argument index="0" name="rid" type="RID">
 			</argument>
 			<description>
-				Tries to free an object in the VisualServer.
+				Tries to free an object in the RenderingServer.
 			</description>
 		</method>
 		<method name="get_render_info">
 			<return type="int">
 			</return>
-			<argument index="0" name="info" type="int" enum="VisualServer.RenderInfo">
+			<argument index="0" name="info" type="int" enum="RenderingServer.RenderInfo">
 			</argument>
 			<description>
 				Returns a certain information, see [enum RenderInfo] for options.
@@ -955,13 +955,13 @@
 			<return type="bool">
 			</return>
 			<description>
-				Returns [code]true[/code] if changes have been made to the VisualServer's data. [method force_draw] is usually called if this happens.
+				Returns [code]true[/code] if changes have been made to the RenderingServer's data. [method force_draw] is usually called if this happens.
 			</description>
 		</method>
 		<method name="has_feature" qualifiers="const">
 			<return type="bool">
 			</return>
-			<argument index="0" name="feature" type="int" enum="VisualServer.Features">
+			<argument index="0" name="feature" type="int" enum="RenderingServer.Features">
 			</argument>
 			<description>
 				Not yet implemented. Always returns [code]false[/code].
@@ -981,12 +981,12 @@
 			</return>
 			<argument index="0" name="immediate" type="RID">
 			</argument>
-			<argument index="1" name="primitive" type="int" enum="VisualServer.PrimitiveType">
+			<argument index="1" name="primitive" type="int" enum="RenderingServer.PrimitiveType">
 			</argument>
 			<argument index="2" name="texture" type="RID">
 			</argument>
 			<description>
-				Sets up [ImmediateGeometry] internals to prepare for drawing. Equivalent to [method ImmediateGeometry.begin].
+				Sets up [ImmediateGeometry3D] internals to prepare for drawing. Equivalent to [method ImmediateGeometry3D.begin].
 			</description>
 		</method>
 		<method name="immediate_clear">
@@ -995,7 +995,7 @@
 			<argument index="0" name="immediate" type="RID">
 			</argument>
 			<description>
-				Clears everything that was set up between [method immediate_begin] and [method immediate_end]. Equivalent to [method ImmediateGeometry.clear].
+				Clears everything that was set up between [method immediate_begin] and [method immediate_end]. Equivalent to [method ImmediateGeometry3D.clear].
 			</description>
 		</method>
 		<method name="immediate_color">
@@ -1006,15 +1006,15 @@
 			<argument index="1" name="color" type="Color">
 			</argument>
 			<description>
-				Sets the color to be used with next vertex. Equivalent to [method ImmediateGeometry.set_color].
+				Sets the color to be used with next vertex. Equivalent to [method ImmediateGeometry3D.set_color].
 			</description>
 		</method>
 		<method name="immediate_create">
 			<return type="RID">
 			</return>
 			<description>
-				Creates an immediate geometry and adds it to the VisualServer. It can be accessed with the RID that is returned. This RID will be used in all [code]immediate_*[/code] VisualServer functions.
-				Once finished with your RID, you will want to free the RID using the VisualServer's [method free_rid] static method.
+				Creates an immediate geometry and adds it to the RenderingServer. It can be accessed with the RID that is returned. This RID will be used in all [code]immediate_*[/code] RenderingServer functions.
+				Once finished with your RID, you will want to free the RID using the RenderingServer's [method free_rid] static method.
 				To place in a scene, attach this immediate geometry to an instance using [method instance_set_base] using the returned RID.
 			</description>
 		</method>
@@ -1024,7 +1024,7 @@
 			<argument index="0" name="immediate" type="RID">
 			</argument>
 			<description>
-				Ends drawing the [ImmediateGeometry] and displays it. Equivalent to [method ImmediateGeometry.end].
+				Ends drawing the [ImmediateGeometry3D] and displays it. Equivalent to [method ImmediateGeometry3D.end].
 			</description>
 		</method>
 		<method name="immediate_get_material" qualifiers="const">
@@ -1033,7 +1033,7 @@
 			<argument index="0" name="immediate" type="RID">
 			</argument>
 			<description>
-				Returns the material assigned to the [ImmediateGeometry].
+				Returns the material assigned to the [ImmediateGeometry3D].
 			</description>
 		</method>
 		<method name="immediate_normal">
@@ -1044,7 +1044,7 @@
 			<argument index="1" name="normal" type="Vector3">
 			</argument>
 			<description>
-				Sets the normal to be used with next vertex. Equivalent to [method ImmediateGeometry.set_normal].
+				Sets the normal to be used with next vertex. Equivalent to [method ImmediateGeometry3D.set_normal].
 			</description>
 		</method>
 		<method name="immediate_set_material">
@@ -1055,7 +1055,7 @@
 			<argument index="1" name="material" type="RID">
 			</argument>
 			<description>
-				Sets the material to be used to draw the [ImmediateGeometry].
+				Sets the material to be used to draw the [ImmediateGeometry3D].
 			</description>
 		</method>
 		<method name="immediate_tangent">
@@ -1066,7 +1066,7 @@
 			<argument index="1" name="tangent" type="Plane">
 			</argument>
 			<description>
-				Sets the tangent to be used with next vertex. Equivalent to [method ImmediateGeometry.set_tangent].
+				Sets the tangent to be used with next vertex. Equivalent to [method ImmediateGeometry3D.set_tangent].
 			</description>
 		</method>
 		<method name="immediate_uv">
@@ -1077,7 +1077,7 @@
 			<argument index="1" name="tex_uv" type="Vector2">
 			</argument>
 			<description>
-				Sets the UV to be used with next vertex. Equivalent to [method ImmediateGeometry.set_uv].
+				Sets the UV to be used with next vertex. Equivalent to [method ImmediateGeometry3D.set_uv].
 			</description>
 		</method>
 		<method name="immediate_uv2">
@@ -1088,7 +1088,7 @@
 			<argument index="1" name="tex_uv" type="Vector2">
 			</argument>
 			<description>
-				Sets the UV2 to be used with next vertex. Equivalent to [method ImmediateGeometry.set_uv2].
+				Sets the UV2 to be used with next vertex. Equivalent to [method ImmediateGeometry3D.set_uv2].
 			</description>
 		</method>
 		<method name="immediate_vertex">
@@ -1099,7 +1099,7 @@
 			<argument index="1" name="vertex" type="Vector3">
 			</argument>
 			<description>
-				Adds the next vertex using the information provided in advance. Equivalent to [method ImmediateGeometry.add_vertex].
+				Adds the next vertex using the information provided in advance. Equivalent to [method ImmediateGeometry3D.add_vertex].
 			</description>
 		</method>
 		<method name="immediate_vertex_2d">
@@ -1110,7 +1110,7 @@
 			<argument index="1" name="vertex" type="Vector2">
 			</argument>
 			<description>
-				Adds the next vertex using the information provided in advance. This is a helper class that calls [method immediate_vertex] under the hood. Equivalent to [method ImmediateGeometry.add_vertex].
+				Adds the next vertex using the information provided in advance. This is a helper class that calls [method immediate_vertex] under the hood. Equivalent to [method ImmediateGeometry3D.add_vertex].
 			</description>
 		</method>
 		<method name="init">
@@ -1146,8 +1146,8 @@
 			<return type="RID">
 			</return>
 			<description>
-				Creates a visual instance and adds it to the VisualServer. It can be accessed with the RID that is returned. This RID will be used in all [code]instance_*[/code] VisualServer functions.
-				Once finished with your RID, you will want to free the RID using the VisualServer's [method free_rid] static method.
+				Creates a visual instance and adds it to the RenderingServer. It can be accessed with the RID that is returned. This RID will be used in all [code]instance_*[/code] RenderingServer functions.
+				Once finished with your RID, you will want to free the RID using the RenderingServer's [method free_rid] static method.
 				An instance is a way of placing a 3D object in the scenario. Objects like particles, meshes, and reflection probes need to be associated with an instance to be visible in the scenario using [method instance_set_base].
 			</description>
 		</method>
@@ -1159,8 +1159,8 @@
 			<argument index="1" name="scenario" type="RID">
 			</argument>
 			<description>
-				Creates a visual instance, adds it to the VisualServer, and sets both base and scenario. It can be accessed with the RID that is returned. This RID will be used in all [code]instance_*[/code] VisualServer functions.
-				Once finished with your RID, you will want to free the RID using the VisualServer's [method free_rid] static method.
+				Creates a visual instance, adds it to the RenderingServer, and sets both base and scenario. It can be accessed with the RID that is returned. This RID will be used in all [code]instance_*[/code] RenderingServer functions.
+				Once finished with your RID, you will want to free the RID using the RenderingServer's [method free_rid] static method.
 			</description>
 		</method>
 		<method name="instance_geometry_set_as_instance_lod">
@@ -1179,10 +1179,10 @@
 			</return>
 			<argument index="0" name="instance" type="RID">
 			</argument>
-			<argument index="1" name="shadow_casting_setting" type="int" enum="VisualServer.ShadowCastingSetting">
+			<argument index="1" name="shadow_casting_setting" type="int" enum="RenderingServer.ShadowCastingSetting">
 			</argument>
 			<description>
-				Sets the shadow casting setting to one of [enum ShadowCastingSetting]. Equivalent to [member GeometryInstance.cast_shadow].
+				Sets the shadow casting setting to one of [enum ShadowCastingSetting]. Equivalent to [member GeometryInstance3D.cast_shadow].
 			</description>
 		</method>
 		<method name="instance_geometry_set_draw_range">
@@ -1207,7 +1207,7 @@
 			</return>
 			<argument index="0" name="instance" type="RID">
 			</argument>
-			<argument index="1" name="flag" type="int" enum="VisualServer.InstanceFlags">
+			<argument index="1" name="flag" type="int" enum="RenderingServer.InstanceFlags">
 			</argument>
 			<argument index="2" name="enabled" type="bool">
 			</argument>
@@ -1223,7 +1223,7 @@
 			<argument index="1" name="material" type="RID">
 			</argument>
 			<description>
-				Sets a material that will override the material for all surfaces on the mesh associated with this instance. Equivalent to [member GeometryInstance.material_override].
+				Sets a material that will override the material for all surfaces on the mesh associated with this instance. Equivalent to [member GeometryInstance3D.material_override].
 			</description>
 		</method>
 		<method name="instance_set_base">
@@ -1234,7 +1234,7 @@
 			<argument index="1" name="base" type="RID">
 			</argument>
 			<description>
-				Sets the base of the instance. A base can be any of the 3D objects that are created in the VisualServer that can be displayed. For example, any of the light types, mesh, multimesh, immediate geometry, particle system, reflection probe, lightmap capture, and the GI probe are all types that can be set as the base of an instance in order to be displayed in the scenario.
+				Sets the base of the instance. A base can be any of the 3D objects that are created in the RenderingServer that can be displayed. For example, any of the light types, mesh, multimesh, immediate geometry, particle system, reflection probe, lightmap capture, and the GI probe are all types that can be set as the base of an instance in order to be displayed in the scenario.
 			</description>
 		</method>
 		<method name="instance_set_blend_shape_weight">
@@ -1258,7 +1258,7 @@
 			<argument index="1" name="aabb" type="AABB">
 			</argument>
 			<description>
-				Sets a custom AABB to use when culling objects from the view frustum. Equivalent to [method GeometryInstance.set_custom_aabb].
+				Sets a custom AABB to use when culling objects from the view frustum. Equivalent to [method GeometryInstance3D.set_custom_aabb].
 			</description>
 		</method>
 		<method name="instance_set_exterior">
@@ -1280,7 +1280,7 @@
 			<argument index="1" name="margin" type="float">
 			</argument>
 			<description>
-				Sets a margin to increase the size of the AABB when culling objects from the view frustum. This allows you avoid culling objects that fall outside the view frustum. Equivalent to [member GeometryInstance.extra_cull_margin].
+				Sets a margin to increase the size of the AABB when culling objects from the view frustum. This allows you avoid culling objects that fall outside the view frustum. Equivalent to [member GeometryInstance3D.extra_cull_margin].
 			</description>
 		</method>
 		<method name="instance_set_layer_mask">
@@ -1291,7 +1291,7 @@
 			<argument index="1" name="mask" type="int">
 			</argument>
 			<description>
-				Sets the render layers that this instance will be drawn to. Equivalent to [member VisualInstance.layers].
+				Sets the render layers that this instance will be drawn to. Equivalent to [member VisualInstance3D.layers].
 			</description>
 		</method>
 		<method name="instance_set_scenario">
@@ -1315,7 +1315,7 @@
 			<argument index="2" name="material" type="RID">
 			</argument>
 			<description>
-				Sets the material of a specific surface. Equivalent to [method MeshInstance.set_surface_material].
+				Sets the material of a specific surface. Equivalent to [method MeshInstance3D.set_surface_material].
 			</description>
 		</method>
 		<method name="instance_set_transform">
@@ -1326,7 +1326,7 @@
 			<argument index="1" name="transform" type="Transform">
 			</argument>
 			<description>
-				Sets the world space transform of the instance. Equivalent to [member Spatial.transform].
+				Sets the world space transform of the instance. Equivalent to [member Node3D.transform].
 			</description>
 		</method>
 		<method name="instance_set_use_lightmap">
@@ -1350,7 +1350,7 @@
 			<argument index="1" name="visible" type="bool">
 			</argument>
 			<description>
-				Sets whether an instance is drawn or not. Equivalent to [member Spatial.visible].
+				Sets whether an instance is drawn or not. Equivalent to [member Node3D.visible].
 			</description>
 		</method>
 		<method name="instances_cull_aabb" qualifiers="const">
@@ -1361,7 +1361,7 @@
 			<argument index="1" name="scenario" type="RID">
 			</argument>
 			<description>
-				Returns an array of object IDs intersecting with the provided AABB. Only visual 3D nodes are considered, such as [MeshInstance] or [DirectionalLight]. Use [method @GDScript.instance_from_id] to obtain the actual nodes. A scenario RID must be provided, which is available in the [World] you want to query. This forces an update for all resources queued to update.
+				Returns an array of object IDs intersecting with the provided AABB. Only visual 3D nodes are considered, such as [MeshInstance3D] or [DirectionalLight3D]. Use [method @GDScript.instance_from_id] to obtain the actual nodes. A scenario RID must be provided, which is available in the [World3D] you want to query. This forces an update for all resources queued to update.
 				[b]Warning:[/b] This function is primarily intended for editor usage. For in-game use cases, prefer physics collision.
 			</description>
 		</method>
@@ -1373,7 +1373,7 @@
 			<argument index="1" name="scenario" type="RID">
 			</argument>
 			<description>
-				Returns an array of object IDs intersecting with the provided convex shape. Only visual 3D nodes are considered, such as [MeshInstance] or [DirectionalLight]. Use [method @GDScript.instance_from_id] to obtain the actual nodes. A scenario RID must be provided, which is available in the [World] you want to query. This forces an update for all resources queued to update.
+				Returns an array of object IDs intersecting with the provided convex shape. Only visual 3D nodes are considered, such as [MeshInstance3D] or [DirectionalLight3D]. Use [method @GDScript.instance_from_id] to obtain the actual nodes. A scenario RID must be provided, which is available in the [World3D] you want to query. This forces an update for all resources queued to update.
 				[b]Warning:[/b] This function is primarily intended for editor usage. For in-game use cases, prefer physics collision.
 			</description>
 		</method>
@@ -1387,7 +1387,7 @@
 			<argument index="2" name="scenario" type="RID">
 			</argument>
 			<description>
-				Returns an array of object IDs intersecting with the provided 3D ray. Only visual 3D nodes are considered, such as [MeshInstance] or [DirectionalLight]. Use [method @GDScript.instance_from_id] to obtain the actual nodes. A scenario RID must be provided, which is available in the [World] you want to query. This forces an update for all resources queued to update.
+				Returns an array of object IDs intersecting with the provided 3D ray. Only visual 3D nodes are considered, such as [MeshInstance3D] or [DirectionalLight3D]. Use [method @GDScript.instance_from_id] to obtain the actual nodes. A scenario RID must be provided, which is available in the [World3D] you want to query. This forces an update for all resources queued to update.
 				[b]Warning:[/b] This function is primarily intended for editor usage. For in-game use cases, prefer physics collision.
 			</description>
 		</method>
@@ -1399,7 +1399,7 @@
 			<argument index="1" name="enable" type="bool">
 			</argument>
 			<description>
-				If [code]true[/code], this directional light will blend between shadow map splits resulting in a smoother transition between them. Equivalent to [member DirectionalLight.directional_shadow_blend_splits].
+				If [code]true[/code], this directional light will blend between shadow map splits resulting in a smoother transition between them. Equivalent to [member DirectionalLight3D.directional_shadow_blend_splits].
 			</description>
 		</method>
 		<method name="light_directional_set_shadow_depth_range_mode">
@@ -1407,10 +1407,10 @@
 			</return>
 			<argument index="0" name="light" type="RID">
 			</argument>
-			<argument index="1" name="range_mode" type="int" enum="VisualServer.LightDirectionalShadowDepthRangeMode">
+			<argument index="1" name="range_mode" type="int" enum="RenderingServer.LightDirectionalShadowDepthRangeMode">
 			</argument>
 			<description>
-				Sets the shadow depth range mode for this directional light. Equivalent to [member DirectionalLight.directional_shadow_depth_range]. See [enum LightDirectionalShadowDepthRangeMode] for options.
+				Sets the shadow depth range mode for this directional light. Equivalent to [member DirectionalLight3D.directional_shadow_depth_range]. See [enum LightDirectionalShadowDepthRangeMode] for options.
 			</description>
 		</method>
 		<method name="light_directional_set_shadow_mode">
@@ -1418,10 +1418,10 @@
 			</return>
 			<argument index="0" name="light" type="RID">
 			</argument>
-			<argument index="1" name="mode" type="int" enum="VisualServer.LightDirectionalShadowMode">
+			<argument index="1" name="mode" type="int" enum="RenderingServer.LightDirectionalShadowMode">
 			</argument>
 			<description>
-				Sets the shadow mode for this directional light. Equivalent to [member DirectionalLight.directional_shadow_mode]. See [enum LightDirectionalShadowMode] for options.
+				Sets the shadow mode for this directional light. Equivalent to [member DirectionalLight3D.directional_shadow_mode]. See [enum LightDirectionalShadowMode] for options.
 			</description>
 		</method>
 		<method name="light_omni_set_shadow_mode">
@@ -1429,10 +1429,10 @@
 			</return>
 			<argument index="0" name="light" type="RID">
 			</argument>
-			<argument index="1" name="mode" type="int" enum="VisualServer.LightOmniShadowMode">
+			<argument index="1" name="mode" type="int" enum="RenderingServer.LightOmniShadowMode">
 			</argument>
 			<description>
-				Sets whether to use a dual paraboloid or a cubemap for the shadow map. Dual paraboloid is faster but may suffer from artifacts. Equivalent to [member OmniLight.omni_shadow_mode].
+				Sets whether to use a dual paraboloid or a cubemap for the shadow map. Dual paraboloid is faster but may suffer from artifacts. Equivalent to [member OmniLight3D.omni_shadow_mode].
 			</description>
 		</method>
 		<method name="light_set_color">
@@ -1443,7 +1443,7 @@
 			<argument index="1" name="color" type="Color">
 			</argument>
 			<description>
-				Sets the color of the light. Equivalent to [member Light.light_color].
+				Sets the color of the light. Equivalent to [member Light3D.light_color].
 			</description>
 		</method>
 		<method name="light_set_cull_mask">
@@ -1454,7 +1454,7 @@
 			<argument index="1" name="mask" type="int">
 			</argument>
 			<description>
-				Sets the cull mask for this Light. Lights only affect objects in the selected layers. Equivalent to [member Light.light_cull_mask].
+				Sets the cull mask for this Light3D. Lights only affect objects in the selected layers. Equivalent to [member Light3D.light_cull_mask].
 			</description>
 		</method>
 		<method name="light_set_negative">
@@ -1465,7 +1465,7 @@
 			<argument index="1" name="enable" type="bool">
 			</argument>
 			<description>
-				If [code]true[/code], light will subtract light instead of adding light. Equivalent to [member Light.light_negative].
+				If [code]true[/code], light will subtract light instead of adding light. Equivalent to [member Light3D.light_negative].
 			</description>
 		</method>
 		<method name="light_set_param">
@@ -1473,12 +1473,12 @@
 			</return>
 			<argument index="0" name="light" type="RID">
 			</argument>
-			<argument index="1" name="param" type="int" enum="VisualServer.LightParam">
+			<argument index="1" name="param" type="int" enum="RenderingServer.LightParam">
 			</argument>
 			<argument index="2" name="value" type="float">
 			</argument>
 			<description>
-				Sets the specified light parameter. See [enum LightParam] for options. Equivalent to [method Light.set_param].
+				Sets the specified light parameter. See [enum LightParam] for options. Equivalent to [method Light3D.set_param].
 			</description>
 		</method>
 		<method name="light_set_projector">
@@ -1500,7 +1500,7 @@
 			<argument index="1" name="enabled" type="bool">
 			</argument>
 			<description>
-				If [code]true[/code], reverses the backface culling of the mesh. This can be useful when you have a flat mesh that has a light behind it. If you need to cast a shadow on both sides of the mesh, set the mesh to use double sided shadows with [method instance_geometry_set_cast_shadows_setting]. Equivalent to [member Light.shadow_reverse_cull_face].
+				If [code]true[/code], reverses the backface culling of the mesh. This can be useful when you have a flat mesh that has a light behind it. If you need to cast a shadow on both sides of the mesh, set the mesh to use double sided shadows with [method instance_geometry_set_cast_shadows_setting]. Equivalent to [member Light3D.shadow_reverse_cull_face].
 			</description>
 		</method>
 		<method name="light_set_shadow">
@@ -1511,7 +1511,7 @@
 			<argument index="1" name="enabled" type="bool">
 			</argument>
 			<description>
-				If [code]true[/code], light will cast shadows. Equivalent to [member Light.shadow_enabled].
+				If [code]true[/code], light will cast shadows. Equivalent to [member Light3D.shadow_enabled].
 			</description>
 		</method>
 		<method name="light_set_shadow_color">
@@ -1522,7 +1522,7 @@
 			<argument index="1" name="color" type="Color">
 			</argument>
 			<description>
-				Sets the color of the shadow cast by the light. Equivalent to [member Light.shadow_color].
+				Sets the color of the shadow cast by the light. Equivalent to [member Light3D.shadow_color].
 			</description>
 		</method>
 		<method name="light_set_use_gi">
@@ -1540,8 +1540,8 @@
 			<return type="RID">
 			</return>
 			<description>
-				Creates a lightmap capture and adds it to the VisualServer. It can be accessed with the RID that is returned. This RID will be used in all [code]lightmap_capture_*[/code] VisualServer functions.
-				Once finished with your RID, you will want to free the RID using the VisualServer's [method free_rid] static method.
+				Creates a lightmap capture and adds it to the RenderingServer. It can be accessed with the RID that is returned. This RID will be used in all [code]lightmap_capture_*[/code] RenderingServer functions.
+				Once finished with your RID, you will want to free the RID using the RenderingServer's [method free_rid] static method.
 				To place in a scene, attach this lightmap capture to an instance using [method instance_set_base] using the returned RID.
 			</description>
 		</method>
@@ -1662,8 +1662,8 @@
 			<return type="RID">
 			</return>
 			<description>
-				Creates an empty material and adds it to the VisualServer. It can be accessed with the RID that is returned. This RID will be used in all [code]material_*[/code] VisualServer functions.
-				Once finished with your RID, you will want to free the RID using the VisualServer's [method free_rid] static method.
+				Creates an empty material and adds it to the RenderingServer. It can be accessed with the RID that is returned. This RID will be used in all [code]material_*[/code] RenderingServer functions.
+				Once finished with your RID, you will want to free the RID using the RenderingServer's [method free_rid] static method.
 			</description>
 		</method>
 		<method name="material_get_param" qualifiers="const">
@@ -1728,7 +1728,7 @@
 			</return>
 			<argument index="0" name="mesh" type="RID">
 			</argument>
-			<argument index="1" name="primitive" type="int" enum="VisualServer.PrimitiveType">
+			<argument index="1" name="primitive" type="int" enum="RenderingServer.PrimitiveType">
 			</argument>
 			<argument index="2" name="arrays" type="Array">
 			</argument>
@@ -1756,8 +1756,8 @@
 			<return type="RID">
 			</return>
 			<description>
-				Creates a new mesh and adds it to the VisualServer. It can be accessed with the RID that is returned. This RID will be used in all [code]mesh_*[/code] VisualServer functions.
-				Once finished with your RID, you will want to free the RID using the VisualServer's [method free_rid] static method.
+				Creates a new mesh and adds it to the RenderingServer. It can be accessed with the RID that is returned. This RID will be used in all [code]mesh_*[/code] RenderingServer functions.
+				Once finished with your RID, you will want to free the RID using the RenderingServer's [method free_rid] static method.
 				To place in a scene, attach this mesh to an instance using [method instance_set_base] using the returned RID.
 			</description>
 		</method>
@@ -1771,7 +1771,7 @@
 			</description>
 		</method>
 		<method name="mesh_get_blend_shape_mode" qualifiers="const">
-			<return type="int" enum="VisualServer.BlendShapeMode">
+			<return type="int" enum="RenderingServer.BlendShapeMode">
 			</return>
 			<argument index="0" name="mesh" type="RID">
 			</argument>
@@ -1802,7 +1802,7 @@
 			</return>
 			<argument index="0" name="mesh" type="RID">
 			</argument>
-			<argument index="1" name="mode" type="int" enum="VisualServer.BlendShapeMode">
+			<argument index="1" name="mode" type="int" enum="RenderingServer.BlendShapeMode">
 			</argument>
 			<description>
 				Sets a mesh's blend shape mode.
@@ -1915,7 +1915,7 @@
 			</argument>
 			<argument index="1" name="instances" type="int">
 			</argument>
-			<argument index="2" name="transform_format" type="int" enum="VisualServer.MultimeshTransformFormat">
+			<argument index="2" name="transform_format" type="int" enum="RenderingServer.MultimeshTransformFormat">
 			</argument>
 			<argument index="3" name="color_format" type="bool" default="false">
 			</argument>
@@ -1928,8 +1928,8 @@
 			<return type="RID">
 			</return>
 			<description>
-				Creates a new multimesh on the VisualServer and returns an [RID] handle. This RID will be used in all [code]multimesh_*[/code] VisualServer functions.
-				Once finished with your RID, you will want to free the RID using the VisualServer's [method free_rid] static method.
+				Creates a new multimesh on the RenderingServer and returns an [RID] handle. This RID will be used in all [code]multimesh_*[/code] RenderingServer functions.
+				Once finished with your RID, you will want to free the RID using the RenderingServer's [method free_rid] static method.
 				To place in a scene, attach this multimesh to an instance using [method instance_set_base] using the returned RID.
 			</description>
 		</method>
@@ -2109,8 +2109,8 @@
 			<return type="RID">
 			</return>
 			<description>
-				Creates a new omni light and adds it to the VisualServer. It can be accessed with the RID that is returned. This RID can be used in most [code]light_*[/code] VisualServer functions.
-				Once finished with your RID, you will want to free the RID using the VisualServer's [method free_rid] static method.
+				Creates a new omni light and adds it to the RenderingServer. It can be accessed with the RID that is returned. This RID can be used in most [code]light_*[/code] RenderingServer functions.
+				Once finished with your RID, you will want to free the RID using the RenderingServer's [method free_rid] static method.
 				To place in a scene, attach this omni light to an instance using [method instance_set_base] using the returned RID.
 			</description>
 		</method>
@@ -2118,8 +2118,8 @@
 			<return type="RID">
 			</return>
 			<description>
-				Creates a particle system and adds it to the VisualServer. It can be accessed with the RID that is returned. This RID will be used in all [code]particles_*[/code] VisualServer functions.
-				Once finished with your RID, you will want to free the RID using the VisualServer's [method free_rid] static method.
+				Creates a particle system and adds it to the RenderingServer. It can be accessed with the RID that is returned. This RID will be used in all [code]particles_*[/code] RenderingServer functions.
+				Once finished with your RID, you will want to free the RID using the RenderingServer's [method free_rid] static method.
 				To place in a scene, attach these particles to an instance using [method instance_set_base] using the returned RID.
 			</description>
 		</method>
@@ -2129,7 +2129,7 @@
 			<argument index="0" name="particles" type="RID">
 			</argument>
 			<description>
-				Calculates and returns the axis-aligned bounding box that contains all the particles. Equivalent to [method Particles.capture_aabb].
+				Calculates and returns the axis-aligned bounding box that contains all the particles. Equivalent to [method GPUParticles3D.capture_aabb].
 			</description>
 		</method>
 		<method name="particles_get_emitting">
@@ -2165,7 +2165,7 @@
 			<argument index="0" name="particles" type="RID">
 			</argument>
 			<description>
-				Reset the particles on the next update. Equivalent to [method Particles.restart].
+				Reset the particles on the next update. Equivalent to [method GPUParticles3D.restart].
 			</description>
 		</method>
 		<method name="particles_set_amount">
@@ -2176,7 +2176,7 @@
 			<argument index="1" name="amount" type="int">
 			</argument>
 			<description>
-				Sets the number of particles to be drawn and allocates the memory for them. Equivalent to [member Particles.amount].
+				Sets the number of particles to be drawn and allocates the memory for them. Equivalent to [member GPUParticles3D.amount].
 			</description>
 		</method>
 		<method name="particles_set_custom_aabb">
@@ -2187,7 +2187,7 @@
 			<argument index="1" name="aabb" type="AABB">
 			</argument>
 			<description>
-				Sets a custom axis-aligned bounding box for the particle system. Equivalent to [member Particles.visibility_aabb].
+				Sets a custom axis-aligned bounding box for the particle system. Equivalent to [member GPUParticles3D.visibility_aabb].
 			</description>
 		</method>
 		<method name="particles_set_draw_order">
@@ -2195,10 +2195,10 @@
 			</return>
 			<argument index="0" name="particles" type="RID">
 			</argument>
-			<argument index="1" name="order" type="int" enum="VisualServer.ParticlesDrawOrder">
+			<argument index="1" name="order" type="int" enum="RenderingServer.ParticlesDrawOrder">
 			</argument>
 			<description>
-				Sets the draw order of the particles to one of the named enums from [enum ParticlesDrawOrder]. See [enum ParticlesDrawOrder] for options. Equivalent to [member Particles.draw_order].
+				Sets the draw order of the particles to one of the named enums from [enum ParticlesDrawOrder]. See [enum ParticlesDrawOrder] for options. Equivalent to [member GPUParticles3D.draw_order].
 			</description>
 		</method>
 		<method name="particles_set_draw_pass_mesh">
@@ -2211,7 +2211,7 @@
 			<argument index="2" name="mesh" type="RID">
 			</argument>
 			<description>
-				Sets the mesh to be used for the specified draw pass. Equivalent to [member Particles.draw_pass_1], [member Particles.draw_pass_2], [member Particles.draw_pass_3], and [member Particles.draw_pass_4].
+				Sets the mesh to be used for the specified draw pass. Equivalent to [member GPUParticles3D.draw_pass_1], [member GPUParticles3D.draw_pass_2], [member GPUParticles3D.draw_pass_3], and [member GPUParticles3D.draw_pass_4].
 			</description>
 		</method>
 		<method name="particles_set_draw_passes">
@@ -2222,7 +2222,7 @@
 			<argument index="1" name="count" type="int">
 			</argument>
 			<description>
-				Sets the number of draw passes to use. Equivalent to [member Particles.draw_passes].
+				Sets the number of draw passes to use. Equivalent to [member GPUParticles3D.draw_passes].
 			</description>
 		</method>
 		<method name="particles_set_emission_transform">
@@ -2244,7 +2244,7 @@
 			<argument index="1" name="emitting" type="bool">
 			</argument>
 			<description>
-				If [code]true[/code], particles will emit over time. Setting to false does not reset the particles, but only stops their emission. Equivalent to [member Particles.emitting].
+				If [code]true[/code], particles will emit over time. Setting to false does not reset the particles, but only stops their emission. Equivalent to [member GPUParticles3D.emitting].
 			</description>
 		</method>
 		<method name="particles_set_explosiveness_ratio">
@@ -2255,7 +2255,7 @@
 			<argument index="1" name="ratio" type="float">
 			</argument>
 			<description>
-				Sets the explosiveness ratio. Equivalent to [member Particles.explosiveness].
+				Sets the explosiveness ratio. Equivalent to [member GPUParticles3D.explosiveness].
 			</description>
 		</method>
 		<method name="particles_set_fixed_fps">
@@ -2266,7 +2266,7 @@
 			<argument index="1" name="fps" type="int">
 			</argument>
 			<description>
-				Sets the frame rate that the particle system rendering will be fixed to. Equivalent to [member Particles.fixed_fps].
+				Sets the frame rate that the particle system rendering will be fixed to. Equivalent to [member GPUParticles3D.fixed_fps].
 			</description>
 		</method>
 		<method name="particles_set_fractional_delta">
@@ -2277,7 +2277,7 @@
 			<argument index="1" name="enable" type="bool">
 			</argument>
 			<description>
-				If [code]true[/code], uses fractional delta which smooths the movement of the particles. Equivalent to [member Particles.fract_delta].
+				If [code]true[/code], uses fractional delta which smooths the movement of the particles. Equivalent to [member GPUParticles3D.fract_delta].
 			</description>
 		</method>
 		<method name="particles_set_lifetime">
@@ -2288,7 +2288,7 @@
 			<argument index="1" name="lifetime" type="float">
 			</argument>
 			<description>
-				Sets the lifetime of each particle in the system. Equivalent to [member Particles.lifetime].
+				Sets the lifetime of each particle in the system. Equivalent to [member GPUParticles3D.lifetime].
 			</description>
 		</method>
 		<method name="particles_set_one_shot">
@@ -2299,7 +2299,7 @@
 			<argument index="1" name="one_shot" type="bool">
 			</argument>
 			<description>
-				If [code]true[/code], particles will emit once and then stop. Equivalent to [member Particles.one_shot].
+				If [code]true[/code], particles will emit once and then stop. Equivalent to [member GPUParticles3D.one_shot].
 			</description>
 		</method>
 		<method name="particles_set_pre_process_time">
@@ -2310,7 +2310,7 @@
 			<argument index="1" name="time" type="float">
 			</argument>
 			<description>
-				Sets the preprocess time for the particles animation. This lets you delay starting an animation until after the particles have begun emitting. Equivalent to [member Particles.preprocess].
+				Sets the preprocess time for the particles animation. This lets you delay starting an animation until after the particles have begun emitting. Equivalent to [member GPUParticles3D.preprocess].
 			</description>
 		</method>
 		<method name="particles_set_process_material">
@@ -2321,7 +2321,7 @@
 			<argument index="1" name="material" type="RID">
 			</argument>
 			<description>
-				Sets the material for processing the particles. Note: this is not the material used to draw the materials. Equivalent to [member Particles.process_material].
+				Sets the material for processing the particles. Note: this is not the material used to draw the materials. Equivalent to [member GPUParticles3D.process_material].
 			</description>
 		</method>
 		<method name="particles_set_randomness_ratio">
@@ -2332,7 +2332,7 @@
 			<argument index="1" name="ratio" type="float">
 			</argument>
 			<description>
-				Sets the emission randomness ratio. This randomizes the emission of particles within their phase. Equivalent to [member Particles.randomness].
+				Sets the emission randomness ratio. This randomizes the emission of particles within their phase. Equivalent to [member GPUParticles3D.randomness].
 			</description>
 		</method>
 		<method name="particles_set_speed_scale">
@@ -2343,7 +2343,7 @@
 			<argument index="1" name="scale" type="float">
 			</argument>
 			<description>
-				Sets the speed scale of the particle system. Equivalent to [member Particles.speed_scale].
+				Sets the speed scale of the particle system. Equivalent to [member GPUParticles3D.speed_scale].
 			</description>
 		</method>
 		<method name="particles_set_use_local_coordinates">
@@ -2354,15 +2354,15 @@
 			<argument index="1" name="enable" type="bool">
 			</argument>
 			<description>
-				If [code]true[/code], particles use local coordinates. If [code]false[/code] they use global coordinates. Equivalent to [member Particles.local_coords].
+				If [code]true[/code], particles use local coordinates. If [code]false[/code] they use global coordinates. Equivalent to [member GPUParticles3D.local_coords].
 			</description>
 		</method>
 		<method name="reflection_probe_create">
 			<return type="RID">
 			</return>
 			<description>
-				Creates a reflection probe and adds it to the VisualServer. It can be accessed with the RID that is returned. This RID will be used in all [code]reflection_probe_*[/code] VisualServer functions.
-				Once finished with your RID, you will want to free the RID using the VisualServer's [method free_rid] static method.
+				Creates a reflection probe and adds it to the RenderingServer. It can be accessed with the RID that is returned. This RID will be used in all [code]reflection_probe_*[/code] RenderingServer functions.
+				Once finished with your RID, you will want to free the RID using the RenderingServer's [method free_rid] static method.
 				To place in a scene, attach this reflection probe to an instance using [method instance_set_base] using the returned RID.
 			</description>
 		</method>
@@ -2492,7 +2492,7 @@
 			</return>
 			<argument index="0" name="probe" type="RID">
 			</argument>
-			<argument index="1" name="mode" type="int" enum="VisualServer.ReflectionProbeUpdateMode">
+			<argument index="1" name="mode" type="int" enum="RenderingServer.ReflectionProbeUpdateMode">
 			</argument>
 			<description>
 				Sets how often the reflection probe updates. Can either be once or every frame. See [enum ReflectionProbeUpdateMode] for options.
@@ -2516,8 +2516,8 @@
 			<return type="RID">
 			</return>
 			<description>
-				Creates a scenario and adds it to the VisualServer. It can be accessed with the RID that is returned. This RID will be used in all [code]scenario_*[/code] VisualServer functions.
-				Once finished with your RID, you will want to free the RID using the VisualServer's [method free_rid] static method.
+				Creates a scenario and adds it to the RenderingServer. It can be accessed with the RID that is returned. This RID will be used in all [code]scenario_*[/code] RenderingServer functions.
+				Once finished with your RID, you will want to free the RID using the RenderingServer's [method free_rid] static method.
 				The scenario is the 3D world that all the visual instances exist in.
 			</description>
 		</method>
@@ -2526,7 +2526,7 @@
 			</return>
 			<argument index="0" name="scenario" type="RID">
 			</argument>
-			<argument index="1" name="debug_mode" type="int" enum="VisualServer.ScenarioDebugMode">
+			<argument index="1" name="debug_mode" type="int" enum="RenderingServer.ScenarioDebugMode">
 			</argument>
 			<description>
 				Sets the [enum ScenarioDebugMode] for this scenario. See [enum ScenarioDebugMode] for options.
@@ -2591,8 +2591,8 @@
 			<return type="RID">
 			</return>
 			<description>
-				Creates an empty shader and adds it to the VisualServer. It can be accessed with the RID that is returned. This RID will be used in all [code]shader_*[/code] VisualServer functions.
-				Once finished with your RID, you will want to free the RID using the VisualServer's [method free_rid] static method.
+				Creates an empty shader and adds it to the RenderingServer. It can be accessed with the RID that is returned. This RID will be used in all [code]shader_*[/code] RenderingServer functions.
+				Once finished with your RID, you will want to free the RID using the RenderingServer's [method free_rid] static method.
 			</description>
 		</method>
 		<method name="shader_get_code" qualifiers="const">
@@ -2723,8 +2723,8 @@
 			<return type="RID">
 			</return>
 			<description>
-				Creates a skeleton and adds it to the VisualServer. It can be accessed with the RID that is returned. This RID will be used in all [code]skeleton_*[/code] VisualServer functions.
-				Once finished with your RID, you will want to free the RID using the VisualServer's [method free_rid] static method.
+				Creates a skeleton and adds it to the RenderingServer. It can be accessed with the RID that is returned. This RID will be used in all [code]skeleton_*[/code] RenderingServer functions.
+				Once finished with your RID, you will want to free the RID using the RenderingServer's [method free_rid] static method.
 			</description>
 		</method>
 		<method name="skeleton_get_bone_count" qualifiers="const">
@@ -2740,8 +2740,8 @@
 			<return type="RID">
 			</return>
 			<description>
-				Creates an empty sky and adds it to the VisualServer. It can be accessed with the RID that is returned. This RID will be used in all [code]sky_*[/code] VisualServer functions.
-				Once finished with your RID, you will want to free the RID using the VisualServer's [method free_rid] static method.
+				Creates an empty sky and adds it to the RenderingServer. It can be accessed with the RID that is returned. This RID will be used in all [code]sky_*[/code] RenderingServer functions.
+				Once finished with your RID, you will want to free the RID using the RenderingServer's [method free_rid] static method.
 			</description>
 		</method>
 		<method name="sky_set_material">
@@ -2759,8 +2759,8 @@
 			<return type="RID">
 			</return>
 			<description>
-				Creates a spot light and adds it to the VisualServer. It can be accessed with the RID that is returned. This RID can be used in most [code]light_*[/code] VisualServer functions.
-				Once finished with your RID, you will want to free the RID using the VisualServer's [method free_rid] static method.
+				Creates a spot light and adds it to the RenderingServer. It can be accessed with the RID that is returned. This RID can be used in most [code]light_*[/code] RenderingServer functions.
+				Once finished with your RID, you will want to free the RID using the RenderingServer's [method free_rid] static method.
 				To place in a scene, attach this spot light to an instance using [method instance_set_base] using the returned RID.
 			</description>
 		</method>
@@ -2826,8 +2826,8 @@
 			<return type="RID">
 			</return>
 			<description>
-				Creates an empty viewport and adds it to the VisualServer. It can be accessed with the RID that is returned. This RID will be used in all [code]viewport_*[/code] VisualServer functions.
-				Once finished with your RID, you will want to free the RID using the VisualServer's [method free_rid] static method.
+				Creates an empty viewport and adds it to the RenderingServer. It can be accessed with the RID that is returned. This RID will be used in all [code]viewport_*[/code] RenderingServer functions.
+				Once finished with your RID, you will want to free the RID using the RenderingServer's [method free_rid] static method.
 			</description>
 		</method>
 		<method name="viewport_detach">
@@ -2844,7 +2844,7 @@
 			</return>
 			<argument index="0" name="viewport" type="RID">
 			</argument>
-			<argument index="1" name="info" type="int" enum="VisualServer.ViewportRenderInfo">
+			<argument index="1" name="info" type="int" enum="RenderingServer.ViewportRenderInfo">
 			</argument>
 			<description>
 				Returns a viewport's render information. For options, see the [enum ViewportRenderInfo] constants.
@@ -2915,7 +2915,7 @@
 			</return>
 			<argument index="0" name="viewport" type="RID">
 			</argument>
-			<argument index="1" name="clear_mode" type="int" enum="VisualServer.ViewportClearMode">
+			<argument index="1" name="clear_mode" type="int" enum="RenderingServer.ViewportClearMode">
 			</argument>
 			<description>
 				Sets the clear mode of a viewport. See [enum ViewportClearMode] for options.
@@ -2926,7 +2926,7 @@
 			</return>
 			<argument index="0" name="viewport" type="RID">
 			</argument>
-			<argument index="1" name="draw" type="int" enum="VisualServer.ViewportDebugDraw">
+			<argument index="1" name="draw" type="int" enum="RenderingServer.ViewportDebugDraw">
 			</argument>
 			<description>
 				Sets the debug draw mode of a viewport. See [enum ViewportDebugDraw] for options.
@@ -2981,7 +2981,7 @@
 			</return>
 			<argument index="0" name="viewport" type="RID">
 			</argument>
-			<argument index="1" name="msaa" type="int" enum="VisualServer.ViewportMSAA">
+			<argument index="1" name="msaa" type="int" enum="RenderingServer.ViewportMSAA">
 			</argument>
 			<description>
 				Sets the anti-aliasing mode. See [enum ViewportMSAA] for options.
@@ -3074,7 +3074,7 @@
 			</return>
 			<argument index="0" name="viewport" type="RID">
 			</argument>
-			<argument index="1" name="update_mode" type="int" enum="VisualServer.ViewportUpdateMode">
+			<argument index="1" name="update_mode" type="int" enum="RenderingServer.ViewportUpdateMode">
 			</argument>
 			<description>
 				Sets when the viewport should be updated. See [enum ViewportUpdateMode] constants for options.
@@ -3095,12 +3095,12 @@
 	<signals>
 		<signal name="frame_post_draw">
 			<description>
-				Emitted at the end of the frame, after the VisualServer has finished updating all the Viewports.
+				Emitted at the end of the frame, after the RenderingServer has finished updating all the Viewports.
 			</description>
 		</signal>
 		<signal name="frame_pre_draw">
 			<description>
-				Emitted at the beginning of the frame, before the VisualServer updates all the Viewports.
+				Emitted at the beginning of the frame, before the RenderingServer updates all the Viewports.
 			</description>
 		</signal>
 	</signals>
diff --git a/doc/classes/RigidBody2D.xml b/doc/classes/RigidBody2D.xml
index 79c4205f59..e746d7fc96 100644
--- a/doc/classes/RigidBody2D.xml
+++ b/doc/classes/RigidBody2D.xml
@@ -16,7 +16,7 @@
 		<method name="_integrate_forces" qualifiers="virtual">
 			<return type="void">
 			</return>
-			<argument index="0" name="state" type="Physics2DDirectBodyState">
+			<argument index="0" name="state" type="PhysicsDirectBodyState2D">
 			</argument>
 			<description>
 				Allows you to read and safely modify the simulation state for the object. Use this instead of [method Node._physics_process] if you need to directly change the body's [code]position[/code] or other physics properties. By default, it works in addition to the usual physics behavior, but [member custom_integrator] allows you to disable the default behavior and write custom force integration for a body.
@@ -106,10 +106,10 @@
 			</argument>
 			<argument index="2" name="margin" type="float" default="0.08">
 			</argument>
-			<argument index="3" name="result" type="Physics2DTestMotionResult" default="null">
+			<argument index="3" name="result" type="PhysicsTestMotionResult2D" default="null">
 			</argument>
 			<description>
-				Returns [code]true[/code] if a collision would result from moving in the given vector. [code]margin[/code] increases the size of the shapes involved in the collision detection, and [code]result[/code] is an object of type [Physics2DTestMotionResult], which contains additional information about the collision (should there be one).
+				Returns [code]true[/code] if a collision would result from moving in the given vector. [code]margin[/code] increases the size of the shapes involved in the collision detection, and [code]result[/code] is an object of type [PhysicsTestMotionResult2D], which contains additional information about the collision (should there be one).
 			</description>
 		</method>
 	</methods>
diff --git a/doc/classes/RigidBody.xml b/doc/classes/RigidBody3D.xml
index e2b7813361..829589f650 100644
--- a/doc/classes/RigidBody.xml
+++ b/doc/classes/RigidBody3D.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="RigidBody" inherits="PhysicsBody" version="4.0">
+<class name="RigidBody3D" inherits="PhysicsBody3D" version="4.0">
 	<brief_description>
 		Physics Body whose position is determined through physics simulation in 3D space.
 	</brief_description>
 	<description>
-		This is the node that implements full 3D physics. This means that you do not control a RigidBody directly. Instead, you can apply forces to it (gravity, impulses, etc.), and the physics simulation will calculate the resulting movement, collision, bouncing, rotating, etc.
-		A RigidBody has 4 behavior [member mode]s: Rigid, Static, Character, and Kinematic.
-		[b]Note:[/b] Don't change a RigidBody's position every frame or very often. Sporadic changes work fine, but physics runs at a different granularity (fixed Hz) than usual rendering (process callback) and maybe even in a separate thread, so changing this from a process loop may result in strange behavior. If you need to directly affect the body's state, use [method _integrate_forces], which allows you to directly access the physics state.
+		This is the node that implements full 3D physics. This means that you do not control a RigidBody3D directly. Instead, you can apply forces to it (gravity, impulses, etc.), and the physics simulation will calculate the resulting movement, collision, bouncing, rotating, etc.
+		A RigidBody3D has 4 behavior [member mode]s: Rigid, Static, Character, and Kinematic.
+		[b]Note:[/b] Don't change a RigidBody3D's position every frame or very often. Sporadic changes work fine, but physics runs at a different granularity (fixed Hz) than usual rendering (process callback) and maybe even in a separate thread, so changing this from a process loop may result in strange behavior. If you need to directly affect the body's state, use [method _integrate_forces], which allows you to directly access the physics state.
 		If you need to override the default physics behavior, you can write a custom force integration function. See [member custom_integrator].
 	</description>
 	<tutorials>
@@ -16,7 +16,7 @@
 		<method name="_integrate_forces" qualifiers="virtual">
 			<return type="void">
 			</return>
-			<argument index="0" name="state" type="PhysicsDirectBodyState">
+			<argument index="0" name="state" type="PhysicsDirectBodyState3D">
 			</argument>
 			<description>
 				Called during physics processing, allowing you to read and safely modify the simulation state for the object. By default, it works in addition to the usual physics behavior, but the [member custom_integrator] property allows you to disable the default behavior and do fully custom force integration for a body.
@@ -85,7 +85,7 @@
 		<method name="get_axis_lock" qualifiers="const">
 			<return type="bool">
 			</return>
-			<argument index="0" name="axis" type="int" enum="PhysicsServer.BodyAxis">
+			<argument index="0" name="axis" type="int" enum="PhysicsServer3D.BodyAxis">
 			</argument>
 			<description>
 				Returns [code]true[/code] if the specified linear or rotational axis is locked.
@@ -102,7 +102,7 @@
 		<method name="set_axis_lock">
 			<return type="void">
 			</return>
-			<argument index="0" name="axis" type="int" enum="PhysicsServer.BodyAxis">
+			<argument index="0" name="axis" type="int" enum="PhysicsServer3D.BodyAxis">
 			</argument>
 			<argument index="1" name="lock" type="bool">
 			</argument>
@@ -122,10 +122,10 @@
 	</methods>
 	<members>
 		<member name="angular_damp" type="float" setter="set_angular_damp" getter="get_angular_damp" default="-1.0">
-			Damps RigidBody's rotational forces.
+			Damps RigidBody3D's rotational forces.
 		</member>
 		<member name="angular_velocity" type="Vector3" setter="set_angular_velocity" getter="get_angular_velocity" default="Vector3( 0, 0, 0 )">
-			RigidBody's rotational velocity.
+			RigidBody3D's rotational velocity.
 		</member>
 		<member name="axis_lock_angular_x" type="bool" setter="set_axis_lock" getter="get_axis_lock" default="false">
 			Lock the body's rotation in the X axis.
@@ -146,10 +146,10 @@
 			Lock the body's movement in the Z axis.
 		</member>
 		<member name="can_sleep" type="bool" setter="set_can_sleep" getter="is_able_to_sleep" default="true">
-			If [code]true[/code], the RigidBody will not calculate forces and will act as a static body while there is no movement. It will wake up when forces are applied through other collisions or when the [code]apply_impulse[/code] method is used.
+			If [code]true[/code], the RigidBody3D will not calculate forces and will act as a static body while there is no movement. It will wake up when forces are applied through other collisions or when the [code]apply_impulse[/code] method is used.
 		</member>
 		<member name="contact_monitor" type="bool" setter="set_contact_monitor" getter="is_contact_monitor_enabled" default="false">
-			If [code]true[/code], the RigidBody will emit signals when it collides with another RigidBody.
+			If [code]true[/code], the RigidBody3D will emit signals when it collides with another RigidBody3D.
 		</member>
 		<member name="contacts_reported" type="int" setter="set_max_contacts_reported" getter="get_max_contacts_reported" default="0">
 			The maximum contacts to report. Bodies can keep a log of the contacts with other bodies, this is enabled by setting the maximum amount of contacts reported to a number greater than 0.
@@ -162,7 +162,7 @@
 			If [code]true[/code], internal force integration will be disabled (like gravity or air friction) for this body. Other than collision response, the body will only move as determined by the [method _integrate_forces] function, if defined.
 		</member>
 		<member name="gravity_scale" type="float" setter="set_gravity_scale" getter="get_gravity_scale" default="1.0">
-			This is multiplied by the global 3D gravity setting found in [b]Project &gt; Project Settings &gt; Physics &gt; 3d[/b] to produce RigidBody's gravity. For example, a value of 1 will be normal gravity, 2 will apply double gravity, and 0.5 will apply half gravity to this object.
+			This is multiplied by the global 3D gravity setting found in [b]Project &gt; Project Settings &gt; Physics &gt; 3d[/b] to produce RigidBody3D's gravity. For example, a value of 1 will be normal gravity, 2 will apply double gravity, and 0.5 will apply half gravity to this object.
 		</member>
 		<member name="linear_damp" type="float" setter="set_linear_damp" getter="get_linear_damp" default="-1.0">
 			The body's linear damp. Cannot be less than -1.0. If this value is different from -1.0, any linear damp derived from the world or areas will be overridden.
@@ -173,7 +173,7 @@
 		<member name="mass" type="float" setter="set_mass" getter="get_mass" default="1.0">
 			The body's mass.
 		</member>
-		<member name="mode" type="int" setter="set_mode" getter="get_mode" enum="RigidBody.Mode" default="0">
+		<member name="mode" type="int" setter="set_mode" getter="get_mode" enum="RigidBody3D.Mode" default="0">
 			The body mode. See [enum Mode] for possible values.
 		</member>
 		<member name="physics_material_override" type="PhysicsMaterial" setter="set_physics_material_override" getter="get_physics_material_override">
@@ -241,13 +241,13 @@
 			Rigid body mode. This is the "natural" state of a rigid body. It is affected by forces, and can move, rotate, and be affected by user code.
 		</constant>
 		<constant name="MODE_STATIC" value="1" enum="Mode">
-			Static mode. The body behaves like a [StaticBody], and can only move by user code.
+			Static mode. The body behaves like a [StaticBody3D], and can only move by user code.
 		</constant>
 		<constant name="MODE_CHARACTER" value="2" enum="Mode">
 			Character body mode. This behaves like a rigid body, but can not rotate.
 		</constant>
 		<constant name="MODE_KINEMATIC" value="3" enum="Mode">
-			Kinematic body mode. The body behaves like a [KinematicBody], and can only move by user code.
+			Kinematic body mode. The body behaves like a [KinematicBody3D], and can only move by user code.
 		</constant>
 	</constants>
 </class>
diff --git a/doc/classes/RootMotionView.xml b/doc/classes/RootMotionView.xml
index 654e42a3c6..be8d8d0078 100644
--- a/doc/classes/RootMotionView.xml
+++ b/doc/classes/RootMotionView.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="RootMotionView" inherits="VisualInstance" version="4.0">
+<class name="RootMotionView" inherits="VisualInstance3D" version="4.0">
 	<brief_description>
 	</brief_description>
 	<description>
diff --git a/doc/classes/Shape.xml b/doc/classes/Shape3D.xml
index d70d2c09b3..1af6550dc5 100644
--- a/doc/classes/Shape.xml
+++ b/doc/classes/Shape3D.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Shape" inherits="Resource" version="4.0">
+<class name="Shape3D" inherits="Resource" version="4.0">
 	<brief_description>
 		Base class for all 3D shape resources.
 	</brief_description>
 	<description>
-		Base class for all 3D shape resources. Nodes that inherit from this can be used as shapes for a [PhysicsBody] or [Area] objects.
+		Base class for all 3D shape resources. Nodes that inherit from this can be used as shapes for a [PhysicsBody3D] or [Area3D] objects.
 	</description>
 	<tutorials>
 		<link>https://docs.godotengine.org/en/latest/tutorials/physics/physics_introduction.html</link>
diff --git a/doc/classes/Skeleton.xml b/doc/classes/Skeleton3D.xml
index eaab4063b8..08404fb467 100644
--- a/doc/classes/Skeleton.xml
+++ b/doc/classes/Skeleton3D.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Skeleton" inherits="Spatial" version="4.0">
+<class name="Skeleton3D" inherits="Node3D" version="4.0">
 	<brief_description>
 		Skeleton for characters and animated objects.
 	</brief_description>
 	<description>
-		Skeleton provides a hierarchical interface for managing bones, including pose, rest and animation (see [Animation]). It can also use ragdoll physics.
+		Skeleton3D provides a hierarchical interface for managing bones, including pose, rest and animation (see [Animation]). It can also use ragdoll physics.
 		The overall transform of a bone with respect to the skeleton is determined by the following hierarchical order: rest pose, custom pose and pose.
 		Note that "global pose" below refers to the overall transform of the bone with respect to skeleton, so it not the actual global/world transform of the bone.
 	</description>
@@ -38,6 +38,12 @@
 				Clear all the bones in this skeleton.
 			</description>
 		</method>
+		<method name="clear_bones_global_pose_override">
+			<return type="void">
+			</return>
+			<description>
+			</description>
+		</method>
 		<method name="find_bone" qualifiers="const">
 			<return type="int">
 			</return>
diff --git a/doc/classes/SkeletonIK.xml b/doc/classes/SkeletonIK3D.xml
index 1db78314d2..de83847403 100644
--- a/doc/classes/SkeletonIK.xml
+++ b/doc/classes/SkeletonIK3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="SkeletonIK" inherits="Node" version="4.0">
+<class name="SkeletonIK3D" inherits="Node" version="4.0">
 	<brief_description>
 	</brief_description>
 	<description>
@@ -8,7 +8,7 @@
 	</tutorials>
 	<methods>
 		<method name="get_parent_skeleton" qualifiers="const">
-			<return type="Skeleton">
+			<return type="Skeleton3D">
 			</return>
 			<description>
 			</description>
diff --git a/doc/classes/SliderJoint.xml b/doc/classes/SliderJoint3D.xml
index dc0cf96eb4..efd6353e3c 100644
--- a/doc/classes/SliderJoint.xml
+++ b/doc/classes/SliderJoint3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="SliderJoint" inherits="Joint" version="4.0">
+<class name="SliderJoint3D" inherits="Joint3D" version="4.0">
 	<brief_description>
 		Piston kind of slider between two bodies in 3D.
 	</brief_description>
@@ -12,7 +12,7 @@
 		<method name="get_param" qualifiers="const">
 			<return type="float">
 			</return>
-			<argument index="0" name="param" type="int" enum="SliderJoint.Param">
+			<argument index="0" name="param" type="int" enum="SliderJoint3D.Param">
 			</argument>
 			<description>
 			</description>
@@ -20,7 +20,7 @@
 		<method name="set_param">
 			<return type="void">
 			</return>
-			<argument index="0" name="param" type="int" enum="SliderJoint.Param">
+			<argument index="0" name="param" type="int" enum="SliderJoint3D.Param">
 			</argument>
 			<argument index="1" name="value" type="float">
 			</argument>
diff --git a/doc/classes/SoftBody.xml b/doc/classes/SoftBody3D.xml
index 46a00fbd67..24d6609900 100644
--- a/doc/classes/SoftBody.xml
+++ b/doc/classes/SoftBody3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="SoftBody" inherits="MeshInstance" version="4.0">
+<class name="SoftBody3D" inherits="MeshInstance3D" version="4.0">
 	<brief_description>
 		A soft mesh physics body.
 	</brief_description>
@@ -80,12 +80,12 @@
 		<member name="areaAngular_stiffness" type="float" setter="set_areaAngular_stiffness" getter="get_areaAngular_stiffness" default="0.5">
 		</member>
 		<member name="collision_layer" type="int" setter="set_collision_layer" getter="get_collision_layer" default="1">
-			The physics layers this SoftBody is in.
+			The physics layers this SoftBody3D is in.
 			Collidable objects can exist in any of 32 different layers. These layers work like a tagging system, and are not visual. A collidable can use these layers to select with which objects it can collide, using the collision_mask property.
 			A contact is detected if object A is in any of the layers that object B scans, or object B is in any layer scanned by object A.
 		</member>
 		<member name="collision_mask" type="int" setter="set_collision_mask" getter="get_collision_mask" default="1">
-			The physics layers this SoftBody scans for collisions.
+			The physics layers this SoftBody3D scans for collisions.
 		</member>
 		<member name="damping_coefficient" type="float" setter="set_damping_coefficient" getter="get_damping_coefficient" default="0.01">
 		</member>
@@ -94,20 +94,20 @@
 		<member name="linear_stiffness" type="float" setter="set_linear_stiffness" getter="get_linear_stiffness" default="0.5">
 		</member>
 		<member name="parent_collision_ignore" type="NodePath" setter="set_parent_collision_ignore" getter="get_parent_collision_ignore" default="NodePath(&quot;&quot;)">
-			[NodePath] to a [CollisionObject] this SoftBody should avoid clipping.
+			[NodePath] to a [CollisionObject3D] this SoftBody3D should avoid clipping.
 		</member>
 		<member name="pose_matching_coefficient" type="float" setter="set_pose_matching_coefficient" getter="get_pose_matching_coefficient" default="0.0">
 		</member>
 		<member name="pressure_coefficient" type="float" setter="set_pressure_coefficient" getter="get_pressure_coefficient" default="0.0">
 		</member>
 		<member name="ray_pickable" type="bool" setter="set_ray_pickable" getter="is_ray_pickable" default="true">
-			If [code]true[/code], the [SoftBody] will respond to [RayCast]s.
+			If [code]true[/code], the [SoftBody3D] will respond to [RayCast3D]s.
 		</member>
 		<member name="simulation_precision" type="int" setter="set_simulation_precision" getter="get_simulation_precision" default="5">
 			Increasing this value will improve the resulting simulation, but can affect performance. Use with care.
 		</member>
 		<member name="total_mass" type="float" setter="set_total_mass" getter="get_total_mass" default="1.0">
-			The SoftBody's mass.
+			The SoftBody3D's mass.
 		</member>
 		<member name="volume_stiffness" type="float" setter="set_volume_stiffness" getter="get_volume_stiffness" default="0.5">
 		</member>
diff --git a/doc/classes/SphereShape.xml b/doc/classes/SphereShape3D.xml
index 75dab58c38..1eaf890639 100644
--- a/doc/classes/SphereShape.xml
+++ b/doc/classes/SphereShape3D.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="SphereShape" inherits="Shape" version="4.0">
+<class name="SphereShape3D" inherits="Shape3D" version="4.0">
 	<brief_description>
 		Sphere shape for 3D collisions.
 	</brief_description>
 	<description>
-		Sphere shape for 3D collisions, which can be set into a [PhysicsBody] or [Area]. This shape is useful for modeling sphere-like 3D objects.
+		Sphere shape for 3D collisions, which can be set into a [PhysicsBody3D] or [Area3D]. This shape is useful for modeling sphere-like 3D objects.
 	</description>
 	<tutorials>
 	</tutorials>
diff --git a/doc/classes/SpotLight.xml b/doc/classes/SpotLight3D.xml
index 351d4f8aff..f094818c21 100644
--- a/doc/classes/SpotLight.xml
+++ b/doc/classes/SpotLight3D.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="SpotLight" inherits="Light" version="4.0">
+<class name="SpotLight3D" inherits="Light3D" version="4.0">
 	<brief_description>
 		A spotlight, such as a reflector spotlight or a lantern.
 	</brief_description>
 	<description>
-		A Spotlight is a type of [Light] node that emits lights in a specific direction, in the shape of a cone. The light is attenuated through the distance. This attenuation can be configured by changing the energy, radius and attenuation parameters of [Light].
+		A Spotlight is a type of [Light3D] node that emits lights in a specific direction, in the shape of a cone. The light is attenuated through the distance. This attenuation can be configured by changing the energy, radius and attenuation parameters of [Light3D].
 	</description>
 	<tutorials>
 		<link>https://docs.godotengine.org/en/latest/tutorials/3d/lights_and_shadows.html</link>
diff --git a/doc/classes/SpringArm.xml b/doc/classes/SpringArm3D.xml
index 780ed5077d..8305494c2b 100644
--- a/doc/classes/SpringArm.xml
+++ b/doc/classes/SpringArm3D.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="SpringArm" inherits="Spatial" version="4.0">
+<class name="SpringArm3D" inherits="Node3D" version="4.0">
 	<brief_description>
 		A helper node, mostly used in 3rd person cameras.
 	</brief_description>
 	<description>
-		The SpringArm node is a node that casts a ray (or collision shape) along its z axis and moves all its direct children to the collision point, minus a margin.
+		The SpringArm3D node is a node that casts a ray (or collision shape) along its z axis and moves all its direct children to the collision point, minus a margin.
 		The most common use case for this is to make a 3rd person camera that reacts to collisions in the environment.
-		The SpringArm will either cast a ray, or if a shape is given, it will cast the shape in the direction of its z axis.
-		If you use the SpringArm as a camera controller for your player, you might need to exclude the player's collider from the SpringArm's collision check.
+		The SpringArm3D will either cast a ray, or if a shape is given, it will cast the shape in the direction of its z axis.
+		If you use the SpringArm3D as a camera controller for your player, you might need to exclude the player's collider from the SpringArm3D's collision check.
 	</description>
 	<tutorials>
 	</tutorials>
@@ -18,14 +18,14 @@
 			<argument index="0" name="RID" type="RID">
 			</argument>
 			<description>
-				Adds the [PhysicsBody] object with the given [RID] to the list of [PhysicsBody] objects excluded from the collision check.
+				Adds the [PhysicsBody3D] object with the given [RID] to the list of [PhysicsBody3D] objects excluded from the collision check.
 			</description>
 		</method>
 		<method name="clear_excluded_objects">
 			<return type="void">
 			</return>
 			<description>
-				Clears the list of [PhysicsBody] objects excluded from the collision check.
+				Clears the list of [PhysicsBody3D] objects excluded from the collision check.
 			</description>
 		</method>
 		<method name="get_hit_length">
@@ -41,7 +41,7 @@
 			<argument index="0" name="RID" type="RID">
 			</argument>
 			<description>
-				Removes the given [RID] from the list of [PhysicsBody] objects excluded from the collision check.
+				Removes the given [RID] from the list of [PhysicsBody3D] objects excluded from the collision check.
 			</description>
 		</method>
 	</methods>
@@ -50,17 +50,17 @@
 			The layers against which the collision check shall be done.
 		</member>
 		<member name="margin" type="float" setter="set_margin" getter="get_margin" default="0.01">
-			When the collision check is made, a candidate length for the SpringArm is given.
-			The margin is then subtracted to this length and the translation is applied to the child objects of the SpringArm.
-			This margin is useful for when the SpringArm has a [Camera] as a child node: without the margin, the [Camera] would be placed on the exact point of collision, while with the margin the [Camera] would be placed close to the point of collision.
+			When the collision check is made, a candidate length for the SpringArm3D is given.
+			The margin is then subtracted to this length and the translation is applied to the child objects of the SpringArm3D.
+			This margin is useful for when the SpringArm3D has a [Camera3D] as a child node: without the margin, the [Camera3D] would be placed on the exact point of collision, while with the margin the [Camera3D] would be placed close to the point of collision.
 		</member>
-		<member name="shape" type="Shape" setter="set_shape" getter="get_shape">
-			The [Shape] to use for the SpringArm.
-			When the shape is set, the SpringArm will cast the [Shape] on its z axis instead of performing a ray cast.
+		<member name="shape" type="Shape3D" setter="set_shape" getter="get_shape">
+			The [Shape3D] to use for the SpringArm3D.
+			When the shape is set, the SpringArm3D will cast the [Shape3D] on its z axis instead of performing a ray cast.
 		</member>
 		<member name="spring_length" type="float" setter="set_length" getter="get_length" default="1.0">
-			The maximum extent of the SpringArm. This is used as a length for both the ray and the shape cast used internally to calculate the desired position of the SpringArm's child nodes.
-			To know more about how to perform a shape cast or a ray cast, please consult the [PhysicsDirectSpaceState] documentation.
+			The maximum extent of the SpringArm3D. This is used as a length for both the ray and the shape cast used internally to calculate the desired position of the SpringArm3D's child nodes.
+			To know more about how to perform a shape cast or a ray cast, please consult the [PhysicsDirectSpaceState3D] documentation.
 		</member>
 	</members>
 	<constants>
diff --git a/doc/classes/Sprite.xml b/doc/classes/Sprite2D.xml
index 6c21881535..950fda4e20 100644
--- a/doc/classes/Sprite.xml
+++ b/doc/classes/Sprite2D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Sprite" inherits="Node2D" version="4.0">
+<class name="Sprite2D" inherits="Node2D" version="4.0">
 	<brief_description>
 		General-purpose sprite node.
 	</brief_description>
@@ -13,7 +13,7 @@
 			<return type="Rect2">
 			</return>
 			<description>
-				Returns a [Rect2] representing the Sprite's boundary in local coordinates. Can be used to detect if the Sprite was clicked. Example:
+				Returns a [Rect2] representing the Sprite2D's boundary in local coordinates. Can be used to detect if the Sprite2D was clicked. Example:
 				[codeblock]
 				func _input(event):
 				    if event is InputEventMouseButton and event.pressed and event.button_index == BUTTON_LEFT:
@@ -53,7 +53,7 @@
 			The number of columns in the sprite sheet.
 		</member>
 		<member name="normal_map" type="Texture2D" setter="set_normal_map" getter="get_normal_map">
-			The normal map gives depth to the Sprite.
+			The normal map gives depth to the Sprite2D.
 		</member>
 		<member name="offset" type="Vector2" setter="set_offset" getter="get_offset" default="Vector2( 0, 0 )">
 			The texture's drawing offset.
@@ -68,7 +68,7 @@
 			The region of the atlas texture to display. [member region_enabled] must be [code]true[/code].
 		</member>
 		<member name="shininess" type="float" setter="set_shininess" getter="get_shininess" default="1.0">
-			Strength of the specular light effect of this [Sprite].
+			Strength of the specular light effect of this [Sprite2D].
 		</member>
 		<member name="specular_color" type="Color" setter="set_specular_color" getter="get_specular_color" default="Color( 1, 1, 1, 1 )">
 			The color of the specular light effect.
diff --git a/doc/classes/Sprite3D.xml b/doc/classes/Sprite3D.xml
index 63958eeb7b..f59d5130c9 100644
--- a/doc/classes/Sprite3D.xml
+++ b/doc/classes/Sprite3D.xml
@@ -5,7 +5,7 @@
 	</brief_description>
 	<description>
 		A node that displays a 2D texture in a 3D environment. The texture displayed can be a region from a larger atlas texture, or a frame from a sprite sheet animation.
-		[b]Note:[/b] There are [url=https://github.com/godotengine/godot/issues/20855]known performance issues[/url] when using [Sprite3D]. Consider using a [MeshInstance] with a [QuadMesh] as the mesh instead. You can still have billboarding by enabling billboard properties in the QuadMesh's [StandardMaterial3D].
+		[b]Note:[/b] There are [url=https://github.com/godotengine/godot/issues/20855]known performance issues[/url] when using [Sprite3D]. Consider using a [MeshInstance3D] with a [QuadMesh] as the mesh instead. You can still have billboarding by enabling billboard properties in the QuadMesh's [StandardMaterial3D].
 	</description>
 	<tutorials>
 	</tutorials>
diff --git a/doc/classes/SpriteBase3D.xml b/doc/classes/SpriteBase3D.xml
index 563a17e8f6..479dc5f94c 100644
--- a/doc/classes/SpriteBase3D.xml
+++ b/doc/classes/SpriteBase3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="SpriteBase3D" inherits="GeometryInstance" version="4.0">
+<class name="SpriteBase3D" inherits="GeometryInstance3D" version="4.0">
 	<brief_description>
 		2D sprite node in 3D environment.
 	</brief_description>
@@ -76,7 +76,7 @@
 			The size of one pixel's width on the sprite to scale it in 3D.
 		</member>
 		<member name="shaded" type="bool" setter="set_draw_flag" getter="get_draw_flag" default="false">
-			If [code]true[/code], the [Light] in the [Environment] has effects on the sprite.
+			If [code]true[/code], the [Light3D] in the [Environment] has effects on the sprite.
 		</member>
 		<member name="transparent" type="bool" setter="set_draw_flag" getter="get_draw_flag" default="true">
 			If [code]true[/code], the texture's transparency and the opacity are used to make those parts of the sprite invisible.
diff --git a/doc/classes/SpriteFrames.xml b/doc/classes/SpriteFrames.xml
index 9facdde681..6e1e1688f4 100644
--- a/doc/classes/SpriteFrames.xml
+++ b/doc/classes/SpriteFrames.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <class name="SpriteFrames" inherits="Resource" version="4.0">
 	<brief_description>
-		Sprite frame library for AnimatedSprite.
+		Sprite frame library for AnimatedSprite2D.
 	</brief_description>
 	<description>
-		Sprite frame library for [AnimatedSprite]. Contains frames and animation data for playback.
+		Sprite frame library for [AnimatedSprite2D]. Contains frames and animation data for playback.
 	</description>
 	<tutorials>
 	</tutorials>
diff --git a/doc/classes/StaticBody.xml b/doc/classes/StaticBody3D.xml
index 280b95d182..c896efc314 100644
--- a/doc/classes/StaticBody.xml
+++ b/doc/classes/StaticBody3D.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="StaticBody" inherits="PhysicsBody" version="4.0">
+<class name="StaticBody3D" inherits="PhysicsBody3D" version="4.0">
 	<brief_description>
 		Static body for 3D physics.
 	</brief_description>
 	<description>
-		Static body for 3D physics. A static body is a simple body that is not intended to move. In contrast to [RigidBody], they don't consume any CPU resources as long as they don't move.
+		Static body for 3D physics. A static body is a simple body that is not intended to move. In contrast to [RigidBody3D], they don't consume any CPU resources as long as they don't move.
 		Additionally, a constant linear or angular velocity can be set for the static body, so even if it doesn't move, it affects other bodies as if it was moving (this is useful for simulating conveyor belts or conveyor wheels).
 	</description>
 	<tutorials>
diff --git a/doc/classes/Texture2D.xml b/doc/classes/Texture2D.xml
index 63cdb0d90a..ffe806cef7 100644
--- a/doc/classes/Texture2D.xml
+++ b/doc/classes/Texture2D.xml
@@ -4,7 +4,7 @@
 		Texture for 2D and 3D.
 	</brief_description>
 	<description>
-		A texture works by registering an image in the video hardware, which then can be used in 3D models or 2D [Sprite] or GUI [Control].
+		A texture works by registering an image in the video hardware, which then can be used in 3D models or 2D [Sprite2D] or GUI [Control].
 		Textures are often created by loading them from a file. See [method @GDScript.load].
 		[Texture2D] is a base for other resources. It cannot be used directly.
 	</description>
@@ -28,12 +28,12 @@
 			</argument>
 			<argument index="6" name="specular_color_shininess" type="Color" default="Color( 1, 1, 1, 1 )">
 			</argument>
-			<argument index="7" name="texture_filter" type="int" enum="VisualServer.CanvasItemTextureFilter" default="0">
+			<argument index="7" name="texture_filter" type="int" enum="RenderingServer.CanvasItemTextureFilter" default="0">
 			</argument>
-			<argument index="8" name="texture_repeat" type="int" enum="VisualServer.CanvasItemTextureRepeat" default="0">
+			<argument index="8" name="texture_repeat" type="int" enum="RenderingServer.CanvasItemTextureRepeat" default="0">
 			</argument>
 			<description>
-				Draws the texture using a [CanvasItem] with the [VisualServer] API at the specified [code]position[/code].
+				Draws the texture using a [CanvasItem] with the [RenderingServer] API at the specified [code]position[/code].
 			</description>
 		</method>
 		<method name="draw_rect" qualifiers="const">
@@ -55,12 +55,12 @@
 			</argument>
 			<argument index="7" name="specular_color_shininess" type="Color" default="Color( 1, 1, 1, 1 )">
 			</argument>
-			<argument index="8" name="texture_filter" type="int" enum="VisualServer.CanvasItemTextureFilter" default="0">
+			<argument index="8" name="texture_filter" type="int" enum="RenderingServer.CanvasItemTextureFilter" default="0">
 			</argument>
-			<argument index="9" name="texture_repeat" type="int" enum="VisualServer.CanvasItemTextureRepeat" default="0">
+			<argument index="9" name="texture_repeat" type="int" enum="RenderingServer.CanvasItemTextureRepeat" default="0">
 			</argument>
 			<description>
-				Draws the texture using a [CanvasItem] with the [VisualServer] API.
+				Draws the texture using a [CanvasItem] with the [RenderingServer] API.
 			</description>
 		</method>
 		<method name="draw_rect_region" qualifiers="const">
@@ -82,14 +82,14 @@
 			</argument>
 			<argument index="7" name="specular_color_shininess" type="Color" default="Color( 1, 1, 1, 1 )">
 			</argument>
-			<argument index="8" name="texture_filter" type="int" enum="VisualServer.CanvasItemTextureFilter" default="0">
+			<argument index="8" name="texture_filter" type="int" enum="RenderingServer.CanvasItemTextureFilter" default="0">
 			</argument>
-			<argument index="9" name="texture_repeat" type="int" enum="VisualServer.CanvasItemTextureRepeat" default="0">
+			<argument index="9" name="texture_repeat" type="int" enum="RenderingServer.CanvasItemTextureRepeat" default="0">
 			</argument>
 			<argument index="10" name="clip_uv" type="bool" default="true">
 			</argument>
 			<description>
-				Draws a part of the texture using a [CanvasItem] with the [VisualServer] API.
+				Draws a part of the texture using a [CanvasItem] with the [RenderingServer] API.
 			</description>
 		</method>
 		<method name="get_data" qualifiers="const">
diff --git a/doc/classes/VehicleBody.xml b/doc/classes/VehicleBody3D.xml
index 74879419a1..b8b85ff605 100644
--- a/doc/classes/VehicleBody.xml
+++ b/doc/classes/VehicleBody3D.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VehicleBody" inherits="RigidBody" version="4.0">
+<class name="VehicleBody3D" inherits="RigidBody3D" version="4.0">
 	<brief_description>
 		Physics body that simulates the behavior of a car.
 	</brief_description>
 	<description>
-		This node implements all the physics logic needed to simulate a car. It is based on the raycast vehicle system commonly found in physics engines. You will need to add a [CollisionShape] for the main body of your vehicle and add [VehicleWheel] nodes for the wheels. You should also add a [MeshInstance] to this node for the 3D model of your car but this model should not include meshes for the wheels. You should control the vehicle by using the [member brake], [member engine_force], and [member steering] properties and not change the position or orientation of this node directly.
-		[b]Note:[/b] The origin point of your VehicleBody will determine the center of gravity of your vehicle so it is better to keep this low and move the [CollisionShape] and [MeshInstance] upwards.
+		This node implements all the physics logic needed to simulate a car. It is based on the raycast vehicle system commonly found in physics engines. You will need to add a [CollisionShape3D] for the main body of your vehicle and add [VehicleWheel3D] nodes for the wheels. You should also add a [MeshInstance3D] to this node for the 3D model of your car but this model should not include meshes for the wheels. You should control the vehicle by using the [member brake], [member engine_force], and [member steering] properties and not change the position or orientation of this node directly.
+		[b]Note:[/b] The origin point of your VehicleBody3D will determine the center of gravity of your vehicle so it is better to keep this low and move the [CollisionShape3D] and [MeshInstance3D] upwards.
 	</description>
 	<tutorials>
 	</tutorials>
@@ -13,16 +13,16 @@
 	</methods>
 	<members>
 		<member name="brake" type="float" setter="set_brake" getter="get_brake" default="0.0">
-			Slows down the vehicle by applying a braking force. The vehicle is only slowed down if the wheels are in contact with a surface. The force you need to apply to adequately slow down your vehicle depends on the [member RigidBody.mass] of the vehicle. For a vehicle with a mass set to 1000, try a value in the 25 - 30 range for hard braking.
+			Slows down the vehicle by applying a braking force. The vehicle is only slowed down if the wheels are in contact with a surface. The force you need to apply to adequately slow down your vehicle depends on the [member RigidBody3D.mass] of the vehicle. For a vehicle with a mass set to 1000, try a value in the 25 - 30 range for hard braking.
 		</member>
 		<member name="engine_force" type="float" setter="set_engine_force" getter="get_engine_force" default="0.0">
-			Accelerates the vehicle by applying an engine force. The vehicle is only speed up if the wheels that have [member VehicleWheel.use_as_traction] set to [code]true[/code] and are in contact with a surface. The [member RigidBody.mass] of the vehicle has an effect on the acceleration of the vehicle. For a vehicle with a mass set to 1000, try a value in the 25 - 50 range for acceleration.
+			Accelerates the vehicle by applying an engine force. The vehicle is only speed up if the wheels that have [member VehicleWheel3D.use_as_traction] set to [code]true[/code] and are in contact with a surface. The [member RigidBody3D.mass] of the vehicle has an effect on the acceleration of the vehicle. For a vehicle with a mass set to 1000, try a value in the 25 - 50 range for acceleration.
 			[b]Note:[/b] The simulation does not take the effect of gears into account, you will need to add logic for this if you wish to simulate gears.
 			A negative value will result in the vehicle reversing.
 		</member>
 		<member name="mass" type="float" setter="set_mass" getter="get_mass" override="true" default="40.0" />
 		<member name="steering" type="float" setter="set_steering" getter="get_steering" default="0.0">
-			The steering angle for the vehicle. Setting this to a non-zero value will result in the vehicle turning when it's moving. Wheels that have [member VehicleWheel.use_as_steering] set to [code]true[/code] will automatically be rotated.
+			The steering angle for the vehicle. Setting this to a non-zero value will result in the vehicle turning when it's moving. Wheels that have [member VehicleWheel3D.use_as_steering] set to [code]true[/code] will automatically be rotated.
 		</member>
 		<member name="weight" type="float" setter="set_weight" getter="get_weight" override="true" default="392.0" />
 	</members>
diff --git a/doc/classes/VehicleWheel.xml b/doc/classes/VehicleWheel3D.xml
index 1a6a226fd1..c71d797eff 100644
--- a/doc/classes/VehicleWheel.xml
+++ b/doc/classes/VehicleWheel3D.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VehicleWheel" inherits="Spatial" version="4.0">
+<class name="VehicleWheel3D" inherits="Node3D" version="4.0">
 	<brief_description>
 		Physics object that simulates the behavior of a wheel.
 	</brief_description>
 	<description>
-		This node needs to be used as a child node of [VehicleBody] and simulates the behavior of one of its wheels. This node also acts as a collider to detect if the wheel is touching a surface.
+		This node needs to be used as a child node of [VehicleBody3D] and simulates the behavior of one of its wheels. This node also acts as a collider to detect if the wheel is touching a surface.
 	</description>
 	<tutorials>
 	</tutorials>
@@ -33,7 +33,7 @@
 	</methods>
 	<members>
 		<member name="brake" type="float" setter="set_brake" getter="get_brake" default="0.0">
-			Slows down the wheel by applying a braking force. The wheel is only slowed down if it is in contact with a surface. The force you need to apply to adequately slow down your vehicle depends on the [member RigidBody.mass] of the vehicle. For a vehicle with a mass set to 1000, try a value in the 25 - 30 range for hard braking.
+			Slows down the wheel by applying a braking force. The wheel is only slowed down if it is in contact with a surface. The force you need to apply to adequately slow down your vehicle depends on the [member RigidBody3D.mass] of the vehicle. For a vehicle with a mass set to 1000, try a value in the 25 - 30 range for hard braking.
 		</member>
 		<member name="damping_compression" type="float" setter="set_damping_compression" getter="get_damping_compression" default="0.83">
 			The damping applied to the spring when the spring is being compressed. This value should be between 0.0 (no damping) and 1.0. A value of 0.0 means the car will keep bouncing as the spring keeps its energy. A good value for this is around 0.3 for a normal car, 0.5 for a race car.
@@ -42,7 +42,7 @@
 			The damping applied to the spring when relaxing. This value should be between 0.0 (no damping) and 1.0. This value should always be slightly higher than the [member damping_compression] property. For a [member damping_compression] value of 0.3, try a relaxation value of 0.5.
 		</member>
 		<member name="engine_force" type="float" setter="set_engine_force" getter="get_engine_force" default="0.0">
-			Accelerates the wheel by applying an engine force. The wheel is only speed up if it is in contact with a surface. The [member RigidBody.mass] of the vehicle has an effect on the acceleration of the vehicle. For a vehicle with a mass set to 1000, try a value in the 25 - 50 range for acceleration.
+			Accelerates the wheel by applying an engine force. The wheel is only speed up if it is in contact with a surface. The [member RigidBody3D.mass] of the vehicle has an effect on the acceleration of the vehicle. For a vehicle with a mass set to 1000, try a value in the 25 - 50 range for acceleration.
 			[b]Note:[/b] The simulation does not take the effect of gears into account, you will need to add logic for this if you wish to simulate gears.
 			A negative value will result in the wheel reversing.
 		</member>
@@ -50,7 +50,7 @@
 			The steering angle for the wheel. Setting this to a non-zero value will result in the vehicle turning when it's moving.
 		</member>
 		<member name="suspension_max_force" type="float" setter="set_suspension_max_force" getter="get_suspension_max_force" default="6000.0">
-			The maximum force the spring can resist. This value should be higher than a quarter of the [member RigidBody.mass] of the [VehicleBody] or the spring will not carry the weight of the vehicle. Good results are often obtained by a value that is about 3× to 4× this number.
+			The maximum force the spring can resist. This value should be higher than a quarter of the [member RigidBody3D.mass] of the [VehicleBody3D] or the spring will not carry the weight of the vehicle. Good results are often obtained by a value that is about 3× to 4× this number.
 		</member>
 		<member name="suspension_stiffness" type="float" setter="set_suspension_stiffness" getter="get_suspension_stiffness" default="5.88">
 			This value defines the stiffness of the suspension. Use a value lower than 50 for an off-road car, a value between 50 and 100 for a race car and try something around 200 for something like a Formula 1 car.
@@ -59,10 +59,10 @@
 			This is the distance the suspension can travel. As Godot units are equivalent to meters, keep this setting relatively low. Try a value between 0.1 and 0.3 depending on the type of car.
 		</member>
 		<member name="use_as_steering" type="bool" setter="set_use_as_steering" getter="is_used_as_steering" default="false">
-			If [code]true[/code], this wheel will be turned when the car steers. This value is used in conjunction with [member VehicleBody.steering] and ignored if you are using the per-wheel [member steering] value instead.
+			If [code]true[/code], this wheel will be turned when the car steers. This value is used in conjunction with [member VehicleBody3D.steering] and ignored if you are using the per-wheel [member steering] value instead.
 		</member>
 		<member name="use_as_traction" type="bool" setter="set_use_as_traction" getter="is_used_as_traction" default="false">
-			If [code]true[/code], this wheel transfers engine force to the ground to propel the vehicle forward. This value is used in conjunction with [member VehicleBody.engine_force] and ignored if you are using the per-wheel [member engine_force] value instead.
+			If [code]true[/code], this wheel transfers engine force to the ground to propel the vehicle forward. This value is used in conjunction with [member VehicleBody3D.engine_force] and ignored if you are using the per-wheel [member engine_force] value instead.
 		</member>
 		<member name="wheel_friction_slip" type="float" setter="set_friction_slip" getter="get_friction_slip" default="10.5">
 			This determines how much grip this wheel has. It is combined with the friction setting of the surface the wheel is in contact with. 0.0 means no grip, 1.0 is normal grip. For a drift car setup, try setting the grip of the rear wheels slightly lower than the front wheels, or use a lower value to simulate tire wear.
diff --git a/doc/classes/SpatialVelocityTracker.xml b/doc/classes/VelocityTracker3D.xml
index 7a4e0c054a..98f7533c76 100644
--- a/doc/classes/SpatialVelocityTracker.xml
+++ b/doc/classes/VelocityTracker3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="SpatialVelocityTracker" inherits="Reference" version="4.0">
+<class name="VelocityTracker3D" inherits="Reference" version="4.0">
 	<brief_description>
 	</brief_description>
 	<description>
diff --git a/doc/classes/Viewport.xml b/doc/classes/Viewport.xml
index 0632be28e1..dd0b17d084 100644
--- a/doc/classes/Viewport.xml
+++ b/doc/classes/Viewport.xml
@@ -4,7 +4,7 @@
 		Creates a sub-view into the screen.
 	</brief_description>
 	<description>
-		A Viewport creates a different view into the screen, or a sub-view inside another viewport. Children 2D Nodes will display on it, and children Camera 3D nodes will render on it too.
+		A Viewport creates a different view into the screen, or a sub-view inside another viewport. Children 2D Nodes will display on it, and children Camera3D 3D nodes will render on it too.
 		Optionally, a viewport can have its own 2D or 3D world, so they don't share what they draw with other viewports.
 		If a viewport is a child of a [ViewportContainer], it will automatically take up its size, otherwise it must be set manually.
 		Viewports can also choose to be audio listeners, so they generate positional audio depending on a 2D or 3D camera child of it.
@@ -17,7 +17,7 @@
 	</tutorials>
 	<methods>
 		<method name="find_world" qualifiers="const">
-			<return type="World">
+			<return type="World3D">
 			</return>
 			<description>
 				Returns the 3D world of the viewport, or if none the world of the parent viewport.
@@ -31,7 +31,7 @@
 			</description>
 		</method>
 		<method name="get_camera" qualifiers="const">
-			<return type="Camera">
+			<return type="Camera3D">
 			</return>
 			<description>
 				Returns the active 3D camera.
@@ -99,7 +99,7 @@
 			<return type="RID">
 			</return>
 			<description>
-				Returns the viewport's RID from the [VisualServer].
+				Returns the viewport's RID from the [RenderingServer].
 			</description>
 		</method>
 		<method name="get_visible_rect" qualifiers="const">
@@ -251,13 +251,13 @@
 			The multisample anti-aliasing mode. A higher number results in smoother edges at the cost of significantly worse performance. A value of 4 is best unless targeting very high-end systems.
 		</member>
 		<member name="own_world" type="bool" setter="set_use_own_world" getter="is_using_own_world" default="false">
-			If [code]true[/code], the viewport will use [World] defined in [code]world[/code] property.
+			If [code]true[/code], the viewport will use [World3D] defined in [code]world[/code] property.
 		</member>
 		<member name="physics_object_picking" type="bool" setter="set_physics_object_picking" getter="get_physics_object_picking" default="false">
 			If [code]true[/code], the objects rendered by viewport become subjects of mouse picking process.
 		</member>
 		<member name="render_direct_to_screen" type="bool" setter="set_use_render_direct_to_screen" getter="is_using_render_direct_to_screen" default="false">
-			If [code]true[/code], renders the Viewport directly to the screen instead of to the root viewport. Only available in GLES2. This is a low-level optimization and should not be used in most cases. If used, reading from the Viewport or from [code]SCREEN_TEXTURE[/code] becomes unavailable. For more information see [method VisualServer.viewport_set_render_direct_to_screen].
+			If [code]true[/code], renders the Viewport directly to the screen instead of to the root viewport. Only available in GLES2. This is a low-level optimization and should not be used in most cases. If used, reading from the Viewport or from [code]SCREEN_TEXTURE[/code] becomes unavailable. For more information see [method RenderingServer.viewport_set_render_direct_to_screen].
 		</member>
 		<member name="render_target_clear_mode" type="int" setter="set_clear_mode" getter="get_clear_mode" enum="Viewport.ClearMode" default="0">
 			The clear mode when viewport used as a render target.
@@ -290,8 +290,8 @@
 		<member name="transparent_bg" type="bool" setter="set_transparent_background" getter="has_transparent_background" default="false">
 			If [code]true[/code], the viewport should render its background as transparent.
 		</member>
-		<member name="world" type="World" setter="set_world" getter="get_world">
-			The custom [World] which can be used as 3D environment source.
+		<member name="world" type="World3D" setter="set_world" getter="get_world">
+			The custom [World3D] which can be used as 3D environment source.
 		</member>
 		<member name="world_2d" type="World2D" setter="set_world_2d" getter="get_world_2d">
 			The custom [World2D] which can be used as 2D environment source.
diff --git a/doc/classes/VisibilityEnabler2D.xml b/doc/classes/VisibilityEnabler2D.xml
index 3f9bf6887a..0bdecafbfa 100644
--- a/doc/classes/VisibilityEnabler2D.xml
+++ b/doc/classes/VisibilityEnabler2D.xml
@@ -36,13 +36,13 @@
 			If [code]true[/code], [RigidBody2D] nodes will be paused.
 		</member>
 		<member name="pause_animated_sprites" type="bool" setter="set_enabler" getter="is_enabler_enabled" default="true">
-			If [code]true[/code], [AnimatedSprite] nodes will be paused.
+			If [code]true[/code], [AnimatedSprite2D] nodes will be paused.
 		</member>
 		<member name="pause_animations" type="bool" setter="set_enabler" getter="is_enabler_enabled" default="true">
 			If [code]true[/code], [AnimationPlayer] nodes will be paused.
 		</member>
 		<member name="pause_particles" type="bool" setter="set_enabler" getter="is_enabler_enabled" default="true">
-			If [code]true[/code], [Particles2D] nodes will be paused.
+			If [code]true[/code], [GPUParticles2D] nodes will be paused.
 		</member>
 		<member name="physics_process_parent" type="bool" setter="set_enabler" getter="is_enabler_enabled" default="false">
 			If [code]true[/code], the parent's [method Node._physics_process] will be stopped.
@@ -59,7 +59,7 @@
 			This enabler will freeze [RigidBody2D] nodes.
 		</constant>
 		<constant name="ENABLER_PAUSE_PARTICLES" value="2" enum="Enabler">
-			This enabler will stop [Particles2D] nodes.
+			This enabler will stop [GPUParticles2D] nodes.
 		</constant>
 		<constant name="ENABLER_PARENT_PROCESS" value="3" enum="Enabler">
 			This enabler will stop the parent's _process function.
@@ -68,7 +68,7 @@
 			This enabler will stop the parent's _physics_process function.
 		</constant>
 		<constant name="ENABLER_PAUSE_ANIMATED_SPRITES" value="5" enum="Enabler">
-			This enabler will stop [AnimatedSprite] nodes animations.
+			This enabler will stop [AnimatedSprite2D] nodes animations.
 		</constant>
 		<constant name="ENABLER_MAX" value="6" enum="Enabler">
 			Represents the size of the [enum Enabler] enum.
diff --git a/doc/classes/VisibilityEnabler.xml b/doc/classes/VisibilityEnabler3D.xml
index 7ab6c52e6c..9c25c6c7c8 100644
--- a/doc/classes/VisibilityEnabler.xml
+++ b/doc/classes/VisibilityEnabler3D.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisibilityEnabler" inherits="VisibilityNotifier" version="4.0">
+<class name="VisibilityEnabler3D" inherits="VisibilityNotifier3D" version="4.0">
 	<brief_description>
 		Enables certain nodes only when visible.
 	</brief_description>
 	<description>
-		The VisibilityEnabler will disable [RigidBody] and [AnimationPlayer] nodes when they are not visible. It will only affect other nodes within the same scene as the VisibilityEnabler itself.
-		Note that VisibilityEnabler will not affect nodes added after scene initialization.
+		The VisibilityEnabler3D will disable [RigidBody3D] and [AnimationPlayer] nodes when they are not visible. It will only affect other nodes within the same scene as the VisibilityEnabler3D itself.
+		Note that VisibilityEnabler3D will not affect nodes added after scene initialization.
 	</description>
 	<tutorials>
 	</tutorials>
@@ -13,7 +13,7 @@
 		<method name="is_enabler_enabled" qualifiers="const">
 			<return type="bool">
 			</return>
-			<argument index="0" name="enabler" type="int" enum="VisibilityEnabler.Enabler">
+			<argument index="0" name="enabler" type="int" enum="VisibilityEnabler3D.Enabler">
 			</argument>
 			<description>
 				Returns whether the enabler identified by given [enum Enabler] constant is active.
@@ -22,7 +22,7 @@
 		<method name="set_enabler">
 			<return type="void">
 			</return>
-			<argument index="0" name="enabler" type="int" enum="VisibilityEnabler.Enabler">
+			<argument index="0" name="enabler" type="int" enum="VisibilityEnabler3D.Enabler">
 			</argument>
 			<argument index="1" name="enabled" type="bool">
 			</argument>
@@ -33,7 +33,7 @@
 	</methods>
 	<members>
 		<member name="freeze_bodies" type="bool" setter="set_enabler" getter="is_enabler_enabled" default="true">
-			If [code]true[/code], [RigidBody] nodes will be paused.
+			If [code]true[/code], [RigidBody3D] nodes will be paused.
 		</member>
 		<member name="pause_animations" type="bool" setter="set_enabler" getter="is_enabler_enabled" default="true">
 			If [code]true[/code], [AnimationPlayer] nodes will be paused.
@@ -44,7 +44,7 @@
 			This enabler will pause [AnimationPlayer] nodes.
 		</constant>
 		<constant name="ENABLER_FREEZE_BODIES" value="1" enum="Enabler">
-			This enabler will freeze [RigidBody] nodes.
+			This enabler will freeze [RigidBody3D] nodes.
 		</constant>
 		<constant name="ENABLER_MAX" value="2" enum="Enabler">
 			Represents the size of the [enum Enabler] enum.
diff --git a/doc/classes/VisibilityNotifier.xml b/doc/classes/VisibilityNotifier3D.xml
index 6161017884..d8a605c69c 100644
--- a/doc/classes/VisibilityNotifier.xml
+++ b/doc/classes/VisibilityNotifier3D.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisibilityNotifier" inherits="Spatial" version="4.0">
+<class name="VisibilityNotifier3D" inherits="Node3D" version="4.0">
 	<brief_description>
 		Detects when the node is visible on screen.
 	</brief_description>
 	<description>
-		The VisibilityNotifier detects when it is visible on the screen. It also notifies when its bounding rectangle enters or exits the screen or a [Camera]'s view.
+		The VisibilityNotifier3D detects when it is visible on the screen. It also notifies when its bounding rectangle enters or exits the screen or a [Camera3D]'s view.
 	</description>
 	<tutorials>
 	</tutorials>
@@ -20,32 +20,32 @@
 	</methods>
 	<members>
 		<member name="aabb" type="AABB" setter="set_aabb" getter="get_aabb" default="AABB( -1, -1, -1, 2, 2, 2 )">
-			The VisibilityNotifier's bounding box.
+			The VisibilityNotifier3D's bounding box.
 		</member>
 	</members>
 	<signals>
 		<signal name="camera_entered">
-			<argument index="0" name="camera" type="Camera">
+			<argument index="0" name="camera" type="Camera3D">
 			</argument>
 			<description>
-				Emitted when the VisibilityNotifier enters a [Camera]'s view.
+				Emitted when the VisibilityNotifier3D enters a [Camera3D]'s view.
 			</description>
 		</signal>
 		<signal name="camera_exited">
-			<argument index="0" name="camera" type="Camera">
+			<argument index="0" name="camera" type="Camera3D">
 			</argument>
 			<description>
-				Emitted when the VisibilityNotifier exits a [Camera]'s view.
+				Emitted when the VisibilityNotifier3D exits a [Camera3D]'s view.
 			</description>
 		</signal>
 		<signal name="screen_entered">
 			<description>
-				Emitted when the VisibilityNotifier enters the screen.
+				Emitted when the VisibilityNotifier3D enters the screen.
 			</description>
 		</signal>
 		<signal name="screen_exited">
 			<description>
-				Emitted when the VisibilityNotifier exits the screen.
+				Emitted when the VisibilityNotifier3D exits the screen.
 			</description>
 		</signal>
 	</signals>
diff --git a/doc/classes/VisualInstance.xml b/doc/classes/VisualInstance3D.xml
index 1bbd5cb64d..6451b3f330 100644
--- a/doc/classes/VisualInstance.xml
+++ b/doc/classes/VisualInstance3D.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualInstance" inherits="Spatial" version="4.0">
+<class name="VisualInstance3D" inherits="Node3D" version="4.0">
 	<brief_description>
 		Parent of all visual 3D nodes.
 	</brief_description>
 	<description>
-		The [VisualInstance] is used to connect a resource to a visual representation. All visual 3D nodes inherit from the [VisualInstance]. In general, you should not access the [VisualInstance] properties directly as they are accessed and managed by the nodes that inherit from [VisualInstance]. [VisualInstance] is the node representation of the [VisualServer] instance.
+		The [VisualInstance3D] is used to connect a resource to a visual representation. All visual 3D nodes inherit from the [VisualInstance3D]. In general, you should not access the [VisualInstance3D] properties directly as they are accessed and managed by the nodes that inherit from [VisualInstance3D]. [VisualInstance3D] is the node representation of the [RenderingServer] instance.
 	</description>
 	<tutorials>
 	</tutorials>
@@ -13,21 +13,21 @@
 			<return type="AABB">
 			</return>
 			<description>
-				Returns the [AABB] (also known as the bounding box) for this [VisualInstance].
+				Returns the [AABB] (also known as the bounding box) for this [VisualInstance3D].
 			</description>
 		</method>
 		<method name="get_base" qualifiers="const">
 			<return type="RID">
 			</return>
 			<description>
-				Returns the RID of the resource associated with this [VisualInstance]. For example, if the Node is a [MeshInstance], this will return the RID of the associated [Mesh].
+				Returns the RID of the resource associated with this [VisualInstance3D]. For example, if the Node is a [MeshInstance3D], this will return the RID of the associated [Mesh].
 			</description>
 		</method>
 		<method name="get_instance" qualifiers="const">
 			<return type="RID">
 			</return>
 			<description>
-				Returns the RID of this instance. This RID is the same as the RID returned by [method VisualServer.instance_create]. This RID is needed if you want to call [VisualServer] functions directly on this [VisualInstance].
+				Returns the RID of this instance. This RID is the same as the RID returned by [method RenderingServer.instance_create]. This RID is needed if you want to call [RenderingServer] functions directly on this [VisualInstance3D].
 			</description>
 		</method>
 		<method name="get_layer_mask_bit" qualifiers="const">
@@ -43,8 +43,8 @@
 			<return type="AABB">
 			</return>
 			<description>
-				Returns the transformed [AABB] (also known as the bounding box) for this [VisualInstance].
-				Transformed in this case means the [AABB] plus the position, rotation, and scale of the [Spatial]'s [Transform].
+				Returns the transformed [AABB] (also known as the bounding box) for this [VisualInstance3D].
+				Transformed in this case means the [AABB] plus the position, rotation, and scale of the [Node3D]'s [Transform].
 			</description>
 		</method>
 		<method name="set_base">
@@ -53,7 +53,7 @@
 			<argument index="0" name="base" type="RID">
 			</argument>
 			<description>
-				Sets the resource that is instantiated by this [VisualInstance], which changes how the engine handles the [VisualInstance] under the hood. Equivalent to [method VisualServer.instance_set_base].
+				Sets the resource that is instantiated by this [VisualInstance3D], which changes how the engine handles the [VisualInstance3D] under the hood. Equivalent to [method RenderingServer.instance_set_base].
 			</description>
 		</method>
 		<method name="set_layer_mask_bit">
@@ -70,8 +70,8 @@
 	</methods>
 	<members>
 		<member name="layers" type="int" setter="set_layer_mask" getter="get_layer_mask" default="1">
-			The render layer(s) this [VisualInstance] is drawn on.
-			This object will only be visible for [Camera]s whose cull mask includes the render object this [VisualInstance] is set to.
+			The render layer(s) this [VisualInstance3D] is drawn on.
+			This object will only be visible for [Camera3D]s whose cull mask includes the render object this [VisualInstance3D] is set to.
 		</member>
 	</members>
 	<constants>
diff --git a/doc/classes/World2D.xml b/doc/classes/World2D.xml
index 9e2d4cfde3..2d8382b7e3 100644
--- a/doc/classes/World2D.xml
+++ b/doc/classes/World2D.xml
@@ -13,13 +13,13 @@
 	</methods>
 	<members>
 		<member name="canvas" type="RID" setter="" getter="get_canvas">
-			The [RID] of this world's canvas resource. Used by the [VisualServer] for 2D drawing.
+			The [RID] of this world's canvas resource. Used by the [RenderingServer] for 2D drawing.
 		</member>
-		<member name="direct_space_state" type="Physics2DDirectSpaceState" setter="" getter="get_direct_space_state">
+		<member name="direct_space_state" type="PhysicsDirectSpaceState2D" setter="" getter="get_direct_space_state">
 			The state of this world's physics space. This allows arbitrary querying for collision.
 		</member>
 		<member name="space" type="RID" setter="" getter="get_space">
-			The [RID] of this world's physics space resource. Used by the [Physics2DServer] for 2D physics, treating it as both a space and an area.
+			The [RID] of this world's physics space resource. Used by the [PhysicsServer2D] for 2D physics, treating it as both a space and an area.
 		</member>
 	</members>
 	<constants>
diff --git a/doc/classes/World.xml b/doc/classes/World3D.xml
index 48596c87d0..4224a2a2c3 100644
--- a/doc/classes/World.xml
+++ b/doc/classes/World3D.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="World" inherits="Resource" version="4.0">
+<class name="World3D" inherits="Resource" version="4.0">
 	<brief_description>
 		Class that has everything pertaining to a world.
 	</brief_description>
 	<description>
-		Class that has everything pertaining to a world. A physics space, a visual scenario and a sound space. Spatial nodes register their resources into the current world.
+		Class that has everything pertaining to a world. A physics space, a visual scenario and a sound space. Node3D nodes register their resources into the current world.
 	</description>
 	<tutorials>
 		<link>https://docs.godotengine.org/en/latest/tutorials/physics/ray-casting.html</link>
@@ -14,20 +14,20 @@
 	<members>
 		<member name="camera_effects" type="CameraEffects" setter="set_camera_effects" getter="get_camera_effects">
 		</member>
-		<member name="direct_space_state" type="PhysicsDirectSpaceState" setter="" getter="get_direct_space_state">
-			The World's physics direct space state, used for making various queries. Might be used only during [code]_physics_process[/code].
+		<member name="direct_space_state" type="PhysicsDirectSpaceState3D" setter="" getter="get_direct_space_state">
+			The World3D's physics direct space state, used for making various queries. Might be used only during [code]_physics_process[/code].
 		</member>
 		<member name="environment" type="Environment" setter="set_environment" getter="get_environment">
-			The World's [Environment].
+			The World3D's [Environment].
 		</member>
 		<member name="fallback_environment" type="Environment" setter="set_fallback_environment" getter="get_fallback_environment">
-			The World's fallback_environment will be used if the World's [Environment] fails or is missing.
+			The World3D's fallback_environment will be used if the World3D's [Environment] fails or is missing.
 		</member>
 		<member name="scenario" type="RID" setter="" getter="get_scenario">
-			The World's visual scenario.
+			The World3D's visual scenario.
 		</member>
 		<member name="space" type="RID" setter="" getter="get_space">
-			The World's physics space.
+			The World3D's physics space.
 		</member>
 	</members>
 	<constants>
diff --git a/doc/classes/WorldEnvironment.xml b/doc/classes/WorldEnvironment.xml
index 73500868a8..92b75621c2 100644
--- a/doc/classes/WorldEnvironment.xml
+++ b/doc/classes/WorldEnvironment.xml
@@ -5,7 +5,7 @@
 	</brief_description>
 	<description>
 		The [WorldEnvironment] node is used to configure the default [Environment] for the scene.
-		The parameters defined in the [WorldEnvironment] can be overridden by an [Environment] node set on the current [Camera]. Additionally, only one [WorldEnvironment] may be instanced in a given scene at a time.
+		The parameters defined in the [WorldEnvironment] can be overridden by an [Environment] node set on the current [Camera3D]. Additionally, only one [WorldEnvironment] may be instanced in a given scene at a time.
 		The [WorldEnvironment] allows the user to specify default lighting parameters (e.g. ambient lighting), various post-processing effects (e.g. SSAO, DOF, Tonemapping), and how to draw the background (e.g. solid color, skybox). Usually, these are added in order to improve the realism/color balance of the scene.
 	</description>
 	<tutorials>
diff --git a/doc/classes/WorldMarginShape.xml b/doc/classes/WorldMarginShape3D.xml
index 54f76a066b..a91447056b 100644
--- a/doc/classes/WorldMarginShape.xml
+++ b/doc/classes/WorldMarginShape3D.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="WorldMarginShape" inherits="Shape" version="4.0">
+<class name="WorldMarginShape3D" inherits="Shape3D" version="4.0">
 	<brief_description>
 		Infinite plane shape for 3D collisions.
 	</brief_description>
 	<description>
-		An infinite plane shape for 3D collisions. Note that the [Plane]'s normal matters; anything "below" the plane will collide with it. If the [WorldMarginShape] is used in a [PhysicsBody], it will cause colliding objects placed "below" it to teleport "above" the plane.
+		An infinite plane shape for 3D collisions. Note that the [Plane]'s normal matters; anything "below" the plane will collide with it. If the [WorldMarginShape3D] is used in a [PhysicsBody3D], it will cause colliding objects placed "below" it to teleport "above" the plane.
 	</description>
 	<tutorials>
 	</tutorials>
@@ -12,7 +12,7 @@
 	</methods>
 	<members>
 		<member name="plane" type="Plane" setter="set_plane" getter="get_plane" default="Plane( 0, 1, 0, 0 )">
-			The [Plane] used by the [WorldMarginShape] for collision.
+			The [Plane] used by the [WorldMarginShape3D] for collision.
 		</member>
 	</members>
 	<constants>
diff --git a/editor/doc_data.cpp b/editor/doc_data.cpp
index 66134b4428..845e7725f3 100644
--- a/editor/doc_data.cpp
+++ b/editor/doc_data.cpp
@@ -372,7 +372,7 @@ void DocData::generate(bool p_basic_types) {
 			if (skip_setter_getter_methods && setters_getters.has(E->get().name)) {
 				// Don't skip parametric setters and getters, i.e. method which require
 				// one or more parameters to define what property should be set or retrieved.
-				// E.g. CPUParticles::set_param(Parameter param, float value).
+				// E.g. CPUParticles3D::set_param(Parameter param, float value).
 				if (E->get().arguments.size() == 0 /* getter */ || (E->get().arguments.size() == 1 && E->get().return_val.type == Variant::NIL /* setter */)) {
 					continue;
 				}
diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp
index 2ba67ae879..37f78434df 100644
--- a/editor/editor_node.cpp
+++ b/editor/editor_node.cpp
@@ -365,6 +365,9 @@ void EditorNode::_notification(int p_what) {
 				RS::get_singleton()->camera_effects_set_dof_blur_quality(dof_quality, dof_jitter);
 				RS::get_singleton()->environment_set_ssao_quality(RS::EnvironmentSSAOQuality(int(GLOBAL_GET("rendering/quality/ssao/quality"))), GLOBAL_GET("rendering/quality/ssao/half_size"));
 				RS::get_singleton()->screen_space_roughness_limiter_set_active(GLOBAL_GET("rendering/quality/filters/screen_space_roughness_limiter"), GLOBAL_GET("rendering/quality/filters/screen_space_roughness_limiter_curve"));
+
+				bool glow_bicubic = int(GLOBAL_GET("rendering/quality/glow/upscale_mode")) > 0;
+				RS::get_singleton()->environment_glow_set_use_bicubic_upscale(glow_bicubic);
 			}
 
 			ResourceImporterTexture::get_singleton()->update_imports();
diff --git a/editor/icons/GizmoCPUParticles.svg b/editor/icons/GizmoCPUParticles3D.svg
index d4e86d9c42..d4e86d9c42 100644
--- a/editor/icons/GizmoCPUParticles.svg
+++ b/editor/icons/GizmoCPUParticles3D.svg
diff --git a/editor/icons/GizmoParticles.svg b/editor/icons/GizmoGPUParticles3D.svg
index 1c5d8c5f2d..1c5d8c5f2d 100644
--- a/editor/icons/GizmoParticles.svg
+++ b/editor/icons/GizmoGPUParticles3D.svg
diff --git a/editor/import/editor_import_collada.cpp b/editor/import/editor_import_collada.cpp
index 6c089d7020..f16c3a9e68 100644
--- a/editor/import/editor_import_collada.cpp
+++ b/editor/import/editor_import_collada.cpp
@@ -318,7 +318,7 @@ Error ColladaImport::_create_scene(Collada::Node *p_node, Node3D *p_parent) {
 			} else {
 				//mesh since nothing else
 				node = memnew(MeshInstance3D);
-				//Object::cast_to<MeshInstance>(node)->set_flag(GeometryInstance::FLAG_USE_BAKED_LIGHT, true);
+				//Object::cast_to<MeshInstance3D>(node)->set_flag(GeometryInstance3D::FLAG_USE_BAKED_LIGHT, true);
 			}
 		} break;
 		case Collada::Node::TYPE_SKELETON: {
diff --git a/editor/import/resource_importer_scene.cpp b/editor/import/resource_importer_scene.cpp
index fb57773b18..7a1de78001 100644
--- a/editor/import/resource_importer_scene.cpp
+++ b/editor/import/resource_importer_scene.cpp
@@ -448,7 +448,7 @@ Node *ResourceImporterScene::_fix_node(Node *p_node, Node *p_root, Map<Ref<Mesh>
 			} else if (empty_draw_type == "IMAGE") {
 				WorldMarginShape3D *world_margin_shape = memnew(WorldMarginShape3D);
 				colshape->set_shape(world_margin_shape);
-				colshape->set_name("WorldMarginShape");
+				colshape->set_name("WorldMarginShape3D");
 			} else {
 				SphereShape3D *sphereShape = memnew(SphereShape3D);
 				sphereShape->set_radius(1);
diff --git a/editor/node_3d_editor_gizmos.cpp b/editor/node_3d_editor_gizmos.cpp
index 40c17a9fc3..b0f7d2e460 100644
--- a/editor/node_3d_editor_gizmos.cpp
+++ b/editor/node_3d_editor_gizmos.cpp
@@ -1971,7 +1971,7 @@ bool RayCastNode3DGizmoPlugin::has_gizmo(Node3D *p_spatial) {
 }
 
 String RayCastNode3DGizmoPlugin::get_name() const {
-	return "RayCast";
+	return "RayCast3D";
 }
 
 int RayCastNode3DGizmoPlugin::get_priority() const {
@@ -2025,7 +2025,7 @@ bool SpringArmNode3DGizmoPlugin::has_gizmo(Node3D *p_spatial) {
 }
 
 String SpringArmNode3DGizmoPlugin::get_name() const {
-	return "SpringArm";
+	return "SpringArm3D";
 }
 
 int SpringArmNode3DGizmoPlugin::get_priority() const {
@@ -2045,7 +2045,7 @@ bool VehicleWheelNode3DGizmoPlugin::has_gizmo(Node3D *p_spatial) {
 }
 
 String VehicleWheelNode3DGizmoPlugin::get_name() const {
-	return "VehicleWheel";
+	return "VehicleWheel3D";
 }
 
 int VehicleWheelNode3DGizmoPlugin::get_priority() const {
@@ -2119,7 +2119,7 @@ bool SoftBodyNode3DGizmoPlugin::has_gizmo(Node3D *p_spatial) {
 }
 
 String SoftBodyNode3DGizmoPlugin::get_name() const {
-	return "SoftBody";
+	return "SoftBody3D";
 }
 
 int SoftBodyNode3DGizmoPlugin::get_priority() const {
@@ -2162,7 +2162,7 @@ void SoftBodyNode3DGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
 }
 
 String SoftBodyNode3DGizmoPlugin::get_handle_name(const EditorNode3DGizmo *p_gizmo, int p_idx) const {
-	return "SoftBody pin point";
+	return "SoftBody3D pin point";
 }
 
 Variant SoftBodyNode3DGizmoPlugin::get_handle_value(EditorNode3DGizmo *p_gizmo, int p_idx) const {
@@ -2195,7 +2195,7 @@ bool VisibilityNotifierGizmoPlugin::has_gizmo(Node3D *p_spatial) {
 }
 
 String VisibilityNotifierGizmoPlugin::get_name() const {
-	return "VisibilityNotifier";
+	return "VisibilityNotifier3D";
 }
 
 int VisibilityNotifierGizmoPlugin::get_priority() const {
@@ -2342,59 +2342,59 @@ void VisibilityNotifierGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
 
 ////
 
-CPUParticlesGizmoPlugin::CPUParticlesGizmoPlugin() {
-	create_icon_material("particles_icon", Node3DEditor::get_singleton()->get_theme_icon("GizmoCPUParticles", "EditorIcons"));
+CPUParticles3DGizmoPlugin::CPUParticles3DGizmoPlugin() {
+	create_icon_material("particles_icon", Node3DEditor::get_singleton()->get_theme_icon("GizmoCPUParticles3D", "EditorIcons"));
 }
 
-bool CPUParticlesGizmoPlugin::has_gizmo(Node3D *p_spatial) {
+bool CPUParticles3DGizmoPlugin::has_gizmo(Node3D *p_spatial) {
 	return Object::cast_to<CPUParticles3D>(p_spatial) != NULL;
 }
 
-String CPUParticlesGizmoPlugin::get_name() const {
-	return "CPUParticles";
+String CPUParticles3DGizmoPlugin::get_name() const {
+	return "CPUParticles3D";
 }
 
-int CPUParticlesGizmoPlugin::get_priority() const {
+int CPUParticles3DGizmoPlugin::get_priority() const {
 	return -1;
 }
 
-bool CPUParticlesGizmoPlugin::is_selectable_when_hidden() const {
+bool CPUParticles3DGizmoPlugin::is_selectable_when_hidden() const {
 	return true;
 }
 
-void CPUParticlesGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
+void CPUParticles3DGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
 	Ref<Material> icon = get_material("particles_icon", p_gizmo);
 	p_gizmo->add_unscaled_billboard(icon, 0.05);
 }
 
 ////
 
-ParticlesGizmoPlugin::ParticlesGizmoPlugin() {
+GPUParticles3DGizmoPlugin::GPUParticles3DGizmoPlugin() {
 	Color gizmo_color = EDITOR_DEF("editors/3d_gizmos/gizmo_colors/particles", Color(0.8, 0.7, 0.4));
 	create_material("particles_material", gizmo_color);
 	gizmo_color.a = 0.1;
 	create_material("particles_solid_material", gizmo_color);
-	create_icon_material("particles_icon", Node3DEditor::get_singleton()->get_theme_icon("GizmoParticles", "EditorIcons"));
+	create_icon_material("particles_icon", Node3DEditor::get_singleton()->get_theme_icon("GizmoGPUParticles3D", "EditorIcons"));
 	create_handle_material("handles");
 }
 
-bool ParticlesGizmoPlugin::has_gizmo(Node3D *p_spatial) {
+bool GPUParticles3DGizmoPlugin::has_gizmo(Node3D *p_spatial) {
 	return Object::cast_to<GPUParticles3D>(p_spatial) != NULL;
 }
 
-String ParticlesGizmoPlugin::get_name() const {
-	return "Particles";
+String GPUParticles3DGizmoPlugin::get_name() const {
+	return "GPUParticles3D";
 }
 
-int ParticlesGizmoPlugin::get_priority() const {
+int GPUParticles3DGizmoPlugin::get_priority() const {
 	return -1;
 }
 
-bool ParticlesGizmoPlugin::is_selectable_when_hidden() const {
+bool GPUParticles3DGizmoPlugin::is_selectable_when_hidden() const {
 	return true;
 }
 
-String ParticlesGizmoPlugin::get_handle_name(const EditorNode3DGizmo *p_gizmo, int p_idx) const {
+String GPUParticles3DGizmoPlugin::get_handle_name(const EditorNode3DGizmo *p_gizmo, int p_idx) const {
 
 	switch (p_idx) {
 		case 0: return "Size X";
@@ -2407,12 +2407,12 @@ String ParticlesGizmoPlugin::get_handle_name(const EditorNode3DGizmo *p_gizmo, i
 
 	return "";
 }
-Variant ParticlesGizmoPlugin::get_handle_value(EditorNode3DGizmo *p_gizmo, int p_idx) const {
+Variant GPUParticles3DGizmoPlugin::get_handle_value(EditorNode3DGizmo *p_gizmo, int p_idx) const {
 
 	GPUParticles3D *particles = Object::cast_to<GPUParticles3D>(p_gizmo->get_spatial_node());
 	return particles->get_visibility_aabb();
 }
-void ParticlesGizmoPlugin::set_handle(EditorNode3DGizmo *p_gizmo, int p_idx, Camera3D *p_camera, const Point2 &p_point) {
+void GPUParticles3DGizmoPlugin::set_handle(EditorNode3DGizmo *p_gizmo, int p_idx, Camera3D *p_camera, const Point2 &p_point) {
 
 	GPUParticles3D *particles = Object::cast_to<GPUParticles3D>(p_gizmo->get_spatial_node());
 
@@ -2464,7 +2464,7 @@ void ParticlesGizmoPlugin::set_handle(EditorNode3DGizmo *p_gizmo, int p_idx, Cam
 	}
 }
 
-void ParticlesGizmoPlugin::commit_handle(EditorNode3DGizmo *p_gizmo, int p_idx, const Variant &p_restore, bool p_cancel) {
+void GPUParticles3DGizmoPlugin::commit_handle(EditorNode3DGizmo *p_gizmo, int p_idx, const Variant &p_restore, bool p_cancel) {
 
 	GPUParticles3D *particles = Object::cast_to<GPUParticles3D>(p_gizmo->get_spatial_node());
 
@@ -2480,7 +2480,7 @@ void ParticlesGizmoPlugin::commit_handle(EditorNode3DGizmo *p_gizmo, int p_idx,
 	ur->commit_action();
 }
 
-void ParticlesGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
+void GPUParticles3DGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
 
 	GPUParticles3D *particles = Object::cast_to<GPUParticles3D>(p_gizmo->get_spatial_node());
 
@@ -3725,7 +3725,7 @@ bool NavigationMeshNode3DGizmoPlugin::has_gizmo(Node3D *p_spatial) {
 }
 
 String NavigationMeshNode3DGizmoPlugin::get_name() const {
-	return "NavigationRegion";
+	return "NavigationRegion3D";
 }
 
 int NavigationMeshNode3DGizmoPlugin::get_priority() const {
diff --git a/editor/node_3d_editor_gizmos.h b/editor/node_3d_editor_gizmos.h
index 014b736a0d..f8339b4c6c 100644
--- a/editor/node_3d_editor_gizmos.h
+++ b/editor/node_3d_editor_gizmos.h
@@ -236,8 +236,8 @@ public:
 	VisibilityNotifierGizmoPlugin();
 };
 
-class CPUParticlesGizmoPlugin : public EditorNode3DGizmoPlugin {
-	GDCLASS(CPUParticlesGizmoPlugin, EditorNode3DGizmoPlugin);
+class CPUParticles3DGizmoPlugin : public EditorNode3DGizmoPlugin {
+	GDCLASS(CPUParticles3DGizmoPlugin, EditorNode3DGizmoPlugin);
 
 public:
 	bool has_gizmo(Node3D *p_spatial);
@@ -245,12 +245,12 @@ public:
 	int get_priority() const;
 	bool is_selectable_when_hidden() const;
 	void redraw(EditorNode3DGizmo *p_gizmo);
-	CPUParticlesGizmoPlugin();
+	CPUParticles3DGizmoPlugin();
 };
 
-class ParticlesGizmoPlugin : public EditorNode3DGizmoPlugin {
+class GPUParticles3DGizmoPlugin : public EditorNode3DGizmoPlugin {
 
-	GDCLASS(ParticlesGizmoPlugin, EditorNode3DGizmoPlugin);
+	GDCLASS(GPUParticles3DGizmoPlugin, EditorNode3DGizmoPlugin);
 
 public:
 	bool has_gizmo(Node3D *p_spatial);
@@ -264,7 +264,7 @@ public:
 	void set_handle(EditorNode3DGizmo *p_gizmo, int p_idx, Camera3D *p_camera, const Point2 &p_point);
 	void commit_handle(EditorNode3DGizmo *p_gizmo, int p_idx, const Variant &p_restore, bool p_cancel = false);
 
-	ParticlesGizmoPlugin();
+	GPUParticles3DGizmoPlugin();
 };
 
 class ReflectionProbeGizmoPlugin : public EditorNode3DGizmoPlugin {
diff --git a/editor/plugins/camera_3d_editor_plugin.cpp b/editor/plugins/camera_3d_editor_plugin.cpp
index 3d9b74c2da..759f01135e 100644
--- a/editor/plugins/camera_3d_editor_plugin.cpp
+++ b/editor/plugins/camera_3d_editor_plugin.cpp
@@ -96,7 +96,7 @@ bool Camera3DEditorPlugin::handles(Object *p_object) const {
 void Camera3DEditorPlugin::make_visible(bool p_visible) {
 
 	if (p_visible) {
-		//Node3DEditor::get_singleton()->set_can_preview(Object::cast_to<Camera>(p_object));
+		//Node3DEditor::get_singleton()->set_can_preview(Object::cast_to<Camera3D>(p_object));
 	} else {
 		Node3DEditor::get_singleton()->set_can_preview(NULL);
 	}
diff --git a/editor/plugins/cpu_particles_3d_editor_plugin.h b/editor/plugins/cpu_particles_3d_editor_plugin.h
index aac9cc9a2f..796c842e07 100644
--- a/editor/plugins/cpu_particles_3d_editor_plugin.h
+++ b/editor/plugins/cpu_particles_3d_editor_plugin.h
@@ -72,7 +72,7 @@ class CPUParticles3DEditorPlugin : public EditorPlugin {
 	EditorNode *editor;
 
 public:
-	virtual String get_name() const { return "CPUParticles"; }
+	virtual String get_name() const { return "CPUParticles3D"; }
 	bool has_main_screen() const { return false; }
 	virtual void edit(Object *p_object);
 	virtual bool handles(Object *p_object) const;
diff --git a/editor/plugins/gpu_particles_2d_editor_plugin.h b/editor/plugins/gpu_particles_2d_editor_plugin.h
index 904786ffae..008d04a211 100644
--- a/editor/plugins/gpu_particles_2d_editor_plugin.h
+++ b/editor/plugins/gpu_particles_2d_editor_plugin.h
@@ -87,7 +87,7 @@ protected:
 	static void _bind_methods();
 
 public:
-	virtual String get_name() const { return "Particles2D"; }
+	virtual String get_name() const { return "GPUParticles2D"; }
 	bool has_main_screen() const { return false; }
 	virtual void edit(Object *p_object);
 	virtual bool handles(Object *p_object) const;
diff --git a/editor/plugins/gpu_particles_3d_editor_plugin.h b/editor/plugins/gpu_particles_3d_editor_plugin.h
index d730457d01..cf1cff32c0 100644
--- a/editor/plugins/gpu_particles_3d_editor_plugin.h
+++ b/editor/plugins/gpu_particles_3d_editor_plugin.h
@@ -108,7 +108,7 @@ class GPUParticles3DEditorPlugin : public EditorPlugin {
 	EditorNode *editor;
 
 public:
-	virtual String get_name() const { return "Particles"; }
+	virtual String get_name() const { return "GPUParticles3D"; }
 	bool has_main_screen() const { return false; }
 	virtual void edit(Object *p_object);
 	virtual bool handles(Object *p_object) const;
diff --git a/editor/plugins/mesh_instance_3d_editor_plugin.cpp b/editor/plugins/mesh_instance_3d_editor_plugin.cpp
index a4e7b2df08..f7a90b8ab3 100644
--- a/editor/plugins/mesh_instance_3d_editor_plugin.cpp
+++ b/editor/plugins/mesh_instance_3d_editor_plugin.cpp
@@ -392,17 +392,17 @@ void MeshInstance3DEditor::_create_outline_mesh() {
 
 	Ref<Mesh> mesh = node->get_mesh();
 	if (mesh.is_null()) {
-		err_dialog->set_text(TTR("MeshInstance lacks a Mesh!"));
+		err_dialog->set_text(TTR("MeshInstance3D lacks a Mesh."));
 		err_dialog->popup_centered();
 		return;
 	}
 
 	if (mesh->get_surface_count() == 0) {
-		err_dialog->set_text(TTR("Mesh has not surface to create outlines from!"));
+		err_dialog->set_text(TTR("Mesh has not surface to create outlines from."));
 		err_dialog->popup_centered();
 		return;
 	} else if (mesh->get_surface_count() == 1 && mesh->surface_get_primitive_type(0) != Mesh::PRIMITIVE_TRIANGLES) {
-		err_dialog->set_text(TTR("Mesh primitive type is not PRIMITIVE_TRIANGLES!"));
+		err_dialog->set_text(TTR("Mesh primitive type is not PRIMITIVE_TRIANGLES."));
 		err_dialog->popup_centered();
 		return;
 	}
@@ -410,7 +410,7 @@ void MeshInstance3DEditor::_create_outline_mesh() {
 	Ref<Mesh> mesho = mesh->create_outline(outline_size->get_value());
 
 	if (mesho.is_null()) {
-		err_dialog->set_text(TTR("Could not create outline!"));
+		err_dialog->set_text(TTR("Could not create outline."));
 		err_dialog->popup_centered();
 		return;
 	}
@@ -447,7 +447,7 @@ MeshInstance3DEditor::MeshInstance3DEditor() {
 	options->set_icon(EditorNode::get_singleton()->get_gui_base()->get_theme_icon("MeshInstance3D", "EditorIcons"));
 
 	options->get_popup()->add_item(TTR("Create Trimesh Static Body"), MENU_OPTION_CREATE_STATIC_TRIMESH_BODY);
-	options->get_popup()->set_item_tooltip(options->get_popup()->get_item_count() - 1, TTR("Creates a StaticBody and assigns a polygon-based collision shape to it automatically.\nThis is the most accurate (but slowest) option for collision detection."));
+	options->get_popup()->set_item_tooltip(options->get_popup()->get_item_count() - 1, TTR("Creates a StaticBody3D and assigns a polygon-based collision shape to it automatically.\nThis is the most accurate (but slowest) option for collision detection."));
 	options->get_popup()->add_separator();
 	options->get_popup()->add_item(TTR("Create Trimesh Collision Sibling"), MENU_OPTION_CREATE_TRIMESH_COLLISION_SHAPE);
 	options->get_popup()->set_item_tooltip(options->get_popup()->get_item_count() - 1, TTR("Creates a polygon-based collision shape.\nThis is the most accurate (but slowest) option for collision detection."));
diff --git a/editor/plugins/multimesh_editor_plugin.cpp b/editor/plugins/multimesh_editor_plugin.cpp
index 658e3ea565..3257db8751 100644
--- a/editor/plugins/multimesh_editor_plugin.cpp
+++ b/editor/plugins/multimesh_editor_plugin.cpp
@@ -82,7 +82,7 @@ void MultiMeshEditor::_populate() {
 
 		if (!ms_instance) {
 
-			err_dialog->set_text(TTR("Mesh source is invalid (not a MeshInstance)."));
+			err_dialog->set_text(TTR("Mesh source is invalid (not a MeshInstance3D)."));
 			err_dialog->popup_centered();
 			return;
 		}
diff --git a/editor/plugins/node_3d_editor_plugin.cpp b/editor/plugins/node_3d_editor_plugin.cpp
index 6f6d06b09d..01868ba77e 100644
--- a/editor/plugins/node_3d_editor_plugin.cpp
+++ b/editor/plugins/node_3d_editor_plugin.cpp
@@ -5919,8 +5919,8 @@ void Node3DEditor::_register_all_gizmos() {
 	add_gizmo_plugin(Ref<SpringArmNode3DGizmoPlugin>(memnew(SpringArmNode3DGizmoPlugin)));
 	add_gizmo_plugin(Ref<VehicleWheelNode3DGizmoPlugin>(memnew(VehicleWheelNode3DGizmoPlugin)));
 	add_gizmo_plugin(Ref<VisibilityNotifierGizmoPlugin>(memnew(VisibilityNotifierGizmoPlugin)));
-	add_gizmo_plugin(Ref<ParticlesGizmoPlugin>(memnew(ParticlesGizmoPlugin)));
-	add_gizmo_plugin(Ref<CPUParticlesGizmoPlugin>(memnew(CPUParticlesGizmoPlugin)));
+	add_gizmo_plugin(Ref<GPUParticles3DGizmoPlugin>(memnew(GPUParticles3DGizmoPlugin)));
+	add_gizmo_plugin(Ref<CPUParticles3DGizmoPlugin>(memnew(CPUParticles3DGizmoPlugin)));
 	add_gizmo_plugin(Ref<ReflectionProbeGizmoPlugin>(memnew(ReflectionProbeGizmoPlugin)));
 	add_gizmo_plugin(Ref<GIProbeGizmoPlugin>(memnew(GIProbeGizmoPlugin)));
 	//	add_gizmo_plugin(Ref<BakedIndirectLightGizmoPlugin>(memnew(BakedIndirectLightGizmoPlugin)));
diff --git a/editor/plugins/path_3d_editor_plugin.cpp b/editor/plugins/path_3d_editor_plugin.cpp
index f3729a3e89..cf8ddb84cd 100644
--- a/editor/plugins/path_3d_editor_plugin.cpp
+++ b/editor/plugins/path_3d_editor_plugin.cpp
@@ -637,7 +637,7 @@ Ref<EditorNode3DGizmo> PathNode3DGizmoPlugin::create_gizmo(Node3D *p_spatial) {
 }
 
 String PathNode3DGizmoPlugin::get_name() const {
-	return "Path";
+	return "Path3D";
 }
 
 int PathNode3DGizmoPlugin::get_priority() const {
diff --git a/editor/plugins/path_3d_editor_plugin.h b/editor/plugins/path_3d_editor_plugin.h
index ca051295f0..15804faa47 100644
--- a/editor/plugins/path_3d_editor_plugin.h
+++ b/editor/plugins/path_3d_editor_plugin.h
@@ -103,9 +103,7 @@ public:
 	static Path3DEditorPlugin *singleton;
 	virtual bool forward_spatial_gui_input(Camera3D *p_camera, const Ref<InputEvent> &p_event);
 
-	//virtual bool forward_gui_input(const InputEvent& p_event) { return collision_polygon_editor->forward_gui_input(p_event); }
-	//virtual Ref<Node3DEditorGizmo> create_spatial_gizmo(Spatial *p_spatial);
-	virtual String get_name() const { return "Path"; }
+	virtual String get_name() const { return "Path3D"; }
 	bool has_main_screen() const { return false; }
 	virtual void edit(Object *p_object);
 	virtual bool handles(Object *p_object) const;
diff --git a/editor/plugins/skeleton_ik_3d_editor_plugin.h b/editor/plugins/skeleton_ik_3d_editor_plugin.h
index 1466d670ba..88472a2963 100644
--- a/editor/plugins/skeleton_ik_3d_editor_plugin.h
+++ b/editor/plugins/skeleton_ik_3d_editor_plugin.h
@@ -51,7 +51,7 @@ protected:
 	static void _bind_methods();
 
 public:
-	virtual String get_name() const { return "SkeletonIK"; }
+	virtual String get_name() const { return "SkeletonIK3D"; }
 	bool has_main_screen() const { return false; }
 	virtual void edit(Object *p_object);
 	virtual bool handles(Object *p_object) const;
diff --git a/editor/plugins/sprite_2d_editor_plugin.h b/editor/plugins/sprite_2d_editor_plugin.h
index d0ebf9c84e..0add77843b 100644
--- a/editor/plugins/sprite_2d_editor_plugin.h
+++ b/editor/plugins/sprite_2d_editor_plugin.h
@@ -104,7 +104,7 @@ class Sprite2DEditorPlugin : public EditorPlugin {
 	EditorNode *editor;
 
 public:
-	virtual String get_name() const { return "Sprite"; }
+	virtual String get_name() const { return "Sprite2D"; }
 	bool has_main_screen() const { return false; }
 	virtual void edit(Object *p_object);
 	virtual bool handles(Object *p_object) const;
diff --git a/modules/basis_universal/register_types.cpp b/modules/basis_universal/register_types.cpp
index bf6bc1debd..6b74b8bf4a 100644
--- a/modules/basis_universal/register_types.cpp
+++ b/modules/basis_universal/register_types.cpp
@@ -158,8 +158,8 @@ static Ref<Image> basis_universal_unpacker(const Vector<uint8_t> &p_buffer) {
 	const uint8_t *ptr = r;
 	int size = p_buffer.size();
 
-	basist::transcoder_texture_format format;
-	Image::Format imgfmt;
+	basist::transcoder_texture_format format = basist::transcoder_texture_format::cTFTotalTextureFormats;
+	Image::Format imgfmt = Image::FORMAT_MAX;
 
 	switch (*(uint32_t *)(ptr)) {
 		case BASIS_DECOMPRESS_RG: {
diff --git a/modules/bullet/bullet_physics_server.cpp b/modules/bullet/bullet_physics_server.cpp
index 5b3fe1bfac..5f7860e797 100644
--- a/modules/bullet/bullet_physics_server.cpp
+++ b/modules/bullet/bullet_physics_server.cpp
@@ -862,7 +862,7 @@ bool BulletPhysicsServer3D::body_is_ray_pickable(RID p_body) const {
 PhysicsDirectBodyState3D *BulletPhysicsServer3D::body_get_direct_state(RID p_body) {
 	RigidBodyBullet *body = rigid_body_owner.getornull(p_body);
 	ERR_FAIL_COND_V(!body, NULL);
-	return BulletPhysicsDirectBodyState::get_singleton(body);
+	return BulletPhysicsDirectBodyState3D::get_singleton(body);
 }
 
 bool BulletPhysicsServer3D::body_test_motion(RID p_body, const Transform &p_from, const Vector3 &p_motion, bool p_infinite_inertia, MotionResult *r_result, bool p_exclude_raycast_shapes) {
@@ -1553,14 +1553,14 @@ void BulletPhysicsServer3D::free(RID p_rid) {
 }
 
 void BulletPhysicsServer3D::init() {
-	BulletPhysicsDirectBodyState::initSingleton();
+	BulletPhysicsDirectBodyState3D::initSingleton();
 }
 
 void BulletPhysicsServer3D::step(float p_deltaTime) {
 	if (!active)
 		return;
 
-	BulletPhysicsDirectBodyState::singleton_setDeltaTime(p_deltaTime);
+	BulletPhysicsDirectBodyState3D::singleton_setDeltaTime(p_deltaTime);
 
 	for (int i = 0; i < active_spaces_count; ++i) {
 
@@ -1575,7 +1575,7 @@ void BulletPhysicsServer3D::flush_queries() {
 }
 
 void BulletPhysicsServer3D::finish() {
-	BulletPhysicsDirectBodyState::destroySingleton();
+	BulletPhysicsDirectBodyState3D::destroySingleton();
 }
 
 int BulletPhysicsServer3D::get_process_info(ProcessInfo p_info) {
diff --git a/modules/bullet/config.py b/modules/bullet/config.py
index f6fd0be8ba..e8ca273f61 100644
--- a/modules/bullet/config.py
+++ b/modules/bullet/config.py
@@ -8,8 +8,8 @@ def configure(env):
 
 def get_doc_classes():
     return [
-        "BulletPhysicsDirectBodyState",
-        "BulletPhysicsServer",
+        "BulletPhysicsDirectBodyState3D",
+        "BulletPhysicsServer3D",
     ]
 
 
diff --git a/modules/bullet/doc_classes/BulletPhysicsDirectBodyState.xml b/modules/bullet/doc_classes/BulletPhysicsDirectBodyState3D.xml
index 5ea1b810a1..1c0181bd9c 100644
--- a/modules/bullet/doc_classes/BulletPhysicsDirectBodyState.xml
+++ b/modules/bullet/doc_classes/BulletPhysicsDirectBodyState3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="BulletPhysicsDirectBodyState" inherits="PhysicsDirectBodyState" version="4.0">
+<class name="BulletPhysicsDirectBodyState3D" inherits="PhysicsDirectBodyState3D" version="4.0">
 	<brief_description>
 	</brief_description>
 	<description>
diff --git a/modules/bullet/doc_classes/BulletPhysicsServer.xml b/modules/bullet/doc_classes/BulletPhysicsServer3D.xml
index af8fb3c02c..b20595b4f6 100644
--- a/modules/bullet/doc_classes/BulletPhysicsServer.xml
+++ b/modules/bullet/doc_classes/BulletPhysicsServer3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="BulletPhysicsServer" inherits="PhysicsServer" version="4.0">
+<class name="BulletPhysicsServer3D" inherits="PhysicsServer3D" version="4.0">
 	<brief_description>
 	</brief_description>
 	<description>
diff --git a/modules/bullet/hinge_joint_bullet.cpp b/modules/bullet/hinge_joint_bullet.cpp
index eaac1d650d..4bea9f87c0 100644
--- a/modules/bullet/hinge_joint_bullet.cpp
+++ b/modules/bullet/hinge_joint_bullet.cpp
@@ -96,7 +96,7 @@ real_t HingeJointBullet::get_hinge_angle() {
 void HingeJointBullet::set_param(PhysicsServer3D::HingeJointParam p_param, real_t p_value) {
 	switch (p_param) {
 		case PhysicsServer3D::HINGE_JOINT_BIAS:
-			WARN_DEPRECATED_MSG("The HingeJoint parameter \"bias\" is deprecated.");
+			WARN_DEPRECATED_MSG("The HingeJoint3D parameter \"bias\" is deprecated.");
 			break;
 		case PhysicsServer3D::HINGE_JOINT_LIMIT_UPPER:
 			hingeConstraint->setLimit(hingeConstraint->getLowerLimit(), p_value, hingeConstraint->getLimitSoftness(), hingeConstraint->getLimitBiasFactor(), hingeConstraint->getLimitRelaxationFactor());
@@ -128,7 +128,7 @@ void HingeJointBullet::set_param(PhysicsServer3D::HingeJointParam p_param, real_
 real_t HingeJointBullet::get_param(PhysicsServer3D::HingeJointParam p_param) const {
 	switch (p_param) {
 		case PhysicsServer3D::HINGE_JOINT_BIAS:
-			WARN_DEPRECATED_MSG("The HingeJoint parameter \"bias\" is deprecated.");
+			WARN_DEPRECATED_MSG("The HingeJoint3D parameter \"bias\" is deprecated.");
 			return 0;
 		case PhysicsServer3D::HINGE_JOINT_LIMIT_UPPER:
 			return hingeConstraint->getUpperLimit();
diff --git a/modules/bullet/rigid_body_bullet.cpp b/modules/bullet/rigid_body_bullet.cpp
index b92166e653..6f799843de 100644
--- a/modules/bullet/rigid_body_bullet.cpp
+++ b/modules/bullet/rigid_body_bullet.cpp
@@ -48,141 +48,141 @@
 	@author AndreaCatania
 */
 
-BulletPhysicsDirectBodyState *BulletPhysicsDirectBodyState::singleton = NULL;
+BulletPhysicsDirectBodyState3D *BulletPhysicsDirectBodyState3D::singleton = NULL;
 
-Vector3 BulletPhysicsDirectBodyState::get_total_gravity() const {
+Vector3 BulletPhysicsDirectBodyState3D::get_total_gravity() const {
 	Vector3 gVec;
 	B_TO_G(body->btBody->getGravity(), gVec);
 	return gVec;
 }
 
-float BulletPhysicsDirectBodyState::get_total_angular_damp() const {
+float BulletPhysicsDirectBodyState3D::get_total_angular_damp() const {
 	return body->btBody->getAngularDamping();
 }
 
-float BulletPhysicsDirectBodyState::get_total_linear_damp() const {
+float BulletPhysicsDirectBodyState3D::get_total_linear_damp() const {
 	return body->btBody->getLinearDamping();
 }
 
-Vector3 BulletPhysicsDirectBodyState::get_center_of_mass() const {
+Vector3 BulletPhysicsDirectBodyState3D::get_center_of_mass() const {
 	Vector3 gVec;
 	B_TO_G(body->btBody->getCenterOfMassPosition(), gVec);
 	return gVec;
 }
 
-Basis BulletPhysicsDirectBodyState::get_principal_inertia_axes() const {
+Basis BulletPhysicsDirectBodyState3D::get_principal_inertia_axes() const {
 	return Basis();
 }
 
-float BulletPhysicsDirectBodyState::get_inverse_mass() const {
+float BulletPhysicsDirectBodyState3D::get_inverse_mass() const {
 	return body->btBody->getInvMass();
 }
 
-Vector3 BulletPhysicsDirectBodyState::get_inverse_inertia() const {
+Vector3 BulletPhysicsDirectBodyState3D::get_inverse_inertia() const {
 	Vector3 gVec;
 	B_TO_G(body->btBody->getInvInertiaDiagLocal(), gVec);
 	return gVec;
 }
 
-Basis BulletPhysicsDirectBodyState::get_inverse_inertia_tensor() const {
+Basis BulletPhysicsDirectBodyState3D::get_inverse_inertia_tensor() const {
 	Basis gInertia;
 	B_TO_G(body->btBody->getInvInertiaTensorWorld(), gInertia);
 	return gInertia;
 }
 
-void BulletPhysicsDirectBodyState::set_linear_velocity(const Vector3 &p_velocity) {
+void BulletPhysicsDirectBodyState3D::set_linear_velocity(const Vector3 &p_velocity) {
 	body->set_linear_velocity(p_velocity);
 }
 
-Vector3 BulletPhysicsDirectBodyState::get_linear_velocity() const {
+Vector3 BulletPhysicsDirectBodyState3D::get_linear_velocity() const {
 	return body->get_linear_velocity();
 }
 
-void BulletPhysicsDirectBodyState::set_angular_velocity(const Vector3 &p_velocity) {
+void BulletPhysicsDirectBodyState3D::set_angular_velocity(const Vector3 &p_velocity) {
 	body->set_angular_velocity(p_velocity);
 }
 
-Vector3 BulletPhysicsDirectBodyState::get_angular_velocity() const {
+Vector3 BulletPhysicsDirectBodyState3D::get_angular_velocity() const {
 	return body->get_angular_velocity();
 }
 
-void BulletPhysicsDirectBodyState::set_transform(const Transform &p_transform) {
+void BulletPhysicsDirectBodyState3D::set_transform(const Transform &p_transform) {
 	body->set_transform(p_transform);
 }
 
-Transform BulletPhysicsDirectBodyState::get_transform() const {
+Transform BulletPhysicsDirectBodyState3D::get_transform() const {
 	return body->get_transform();
 }
 
-void BulletPhysicsDirectBodyState::add_central_force(const Vector3 &p_force) {
+void BulletPhysicsDirectBodyState3D::add_central_force(const Vector3 &p_force) {
 	body->apply_central_force(p_force);
 }
 
-void BulletPhysicsDirectBodyState::add_force(const Vector3 &p_force, const Vector3 &p_pos) {
+void BulletPhysicsDirectBodyState3D::add_force(const Vector3 &p_force, const Vector3 &p_pos) {
 	body->apply_force(p_force, p_pos);
 }
 
-void BulletPhysicsDirectBodyState::add_torque(const Vector3 &p_torque) {
+void BulletPhysicsDirectBodyState3D::add_torque(const Vector3 &p_torque) {
 	body->apply_torque(p_torque);
 }
 
-void BulletPhysicsDirectBodyState::apply_central_impulse(const Vector3 &p_impulse) {
+void BulletPhysicsDirectBodyState3D::apply_central_impulse(const Vector3 &p_impulse) {
 	body->apply_central_impulse(p_impulse);
 }
 
-void BulletPhysicsDirectBodyState::apply_impulse(const Vector3 &p_pos, const Vector3 &p_impulse) {
+void BulletPhysicsDirectBodyState3D::apply_impulse(const Vector3 &p_pos, const Vector3 &p_impulse) {
 	body->apply_impulse(p_pos, p_impulse);
 }
 
-void BulletPhysicsDirectBodyState::apply_torque_impulse(const Vector3 &p_impulse) {
+void BulletPhysicsDirectBodyState3D::apply_torque_impulse(const Vector3 &p_impulse) {
 	body->apply_torque_impulse(p_impulse);
 }
 
-void BulletPhysicsDirectBodyState::set_sleep_state(bool p_enable) {
+void BulletPhysicsDirectBodyState3D::set_sleep_state(bool p_enable) {
 	body->set_activation_state(p_enable);
 }
 
-bool BulletPhysicsDirectBodyState::is_sleeping() const {
+bool BulletPhysicsDirectBodyState3D::is_sleeping() const {
 	return !body->is_active();
 }
 
-int BulletPhysicsDirectBodyState::get_contact_count() const {
+int BulletPhysicsDirectBodyState3D::get_contact_count() const {
 	return body->collisionsCount;
 }
 
-Vector3 BulletPhysicsDirectBodyState::get_contact_local_position(int p_contact_idx) const {
+Vector3 BulletPhysicsDirectBodyState3D::get_contact_local_position(int p_contact_idx) const {
 	return body->collisions[p_contact_idx].hitLocalLocation;
 }
 
-Vector3 BulletPhysicsDirectBodyState::get_contact_local_normal(int p_contact_idx) const {
+Vector3 BulletPhysicsDirectBodyState3D::get_contact_local_normal(int p_contact_idx) const {
 	return body->collisions[p_contact_idx].hitNormal;
 }
 
-float BulletPhysicsDirectBodyState::get_contact_impulse(int p_contact_idx) const {
+float BulletPhysicsDirectBodyState3D::get_contact_impulse(int p_contact_idx) const {
 	return body->collisions[p_contact_idx].appliedImpulse;
 }
 
-int BulletPhysicsDirectBodyState::get_contact_local_shape(int p_contact_idx) const {
+int BulletPhysicsDirectBodyState3D::get_contact_local_shape(int p_contact_idx) const {
 	return body->collisions[p_contact_idx].local_shape;
 }
 
-RID BulletPhysicsDirectBodyState::get_contact_collider(int p_contact_idx) const {
+RID BulletPhysicsDirectBodyState3D::get_contact_collider(int p_contact_idx) const {
 	return body->collisions[p_contact_idx].otherObject->get_self();
 }
 
-Vector3 BulletPhysicsDirectBodyState::get_contact_collider_position(int p_contact_idx) const {
+Vector3 BulletPhysicsDirectBodyState3D::get_contact_collider_position(int p_contact_idx) const {
 	return body->collisions[p_contact_idx].hitWorldLocation;
 }
 
-ObjectID BulletPhysicsDirectBodyState::get_contact_collider_id(int p_contact_idx) const {
+ObjectID BulletPhysicsDirectBodyState3D::get_contact_collider_id(int p_contact_idx) const {
 	return body->collisions[p_contact_idx].otherObject->get_instance_id();
 }
 
-int BulletPhysicsDirectBodyState::get_contact_collider_shape(int p_contact_idx) const {
+int BulletPhysicsDirectBodyState3D::get_contact_collider_shape(int p_contact_idx) const {
 	return body->collisions[p_contact_idx].other_object_shape;
 }
 
-Vector3 BulletPhysicsDirectBodyState::get_contact_collider_velocity_at_position(int p_contact_idx) const {
+Vector3 BulletPhysicsDirectBodyState3D::get_contact_collider_velocity_at_position(int p_contact_idx) const {
 	RigidBodyBullet::CollisionData &colDat = body->collisions.write[p_contact_idx];
 
 	btVector3 hitLocation;
@@ -194,7 +194,7 @@ Vector3 BulletPhysicsDirectBodyState::get_contact_collider_velocity_at_position(
 	return velocityAtPoint;
 }
 
-PhysicsDirectSpaceState3D *BulletPhysicsDirectBodyState::get_space_state() {
+PhysicsDirectSpaceState3D *BulletPhysicsDirectBodyState3D::get_space_state() {
 	return body->get_space()->get_direct_state();
 }
 
@@ -359,7 +359,7 @@ void RigidBodyBullet::dispatch_callbacks() {
 		if (omit_forces_integration)
 			btBody->clearForces();
 
-		BulletPhysicsDirectBodyState *bodyDirect = BulletPhysicsDirectBodyState::get_singleton(this);
+		BulletPhysicsDirectBodyState3D *bodyDirect = BulletPhysicsDirectBodyState3D::get_singleton(this);
 
 		Variant variantBodyDirect = bodyDirect;
 
diff --git a/modules/bullet/rigid_body_bullet.h b/modules/bullet/rigid_body_bullet.h
index bce3511282..b73e132103 100644
--- a/modules/bullet/rigid_body_bullet.h
+++ b/modules/bullet/rigid_body_bullet.h
@@ -45,7 +45,7 @@ class AreaBullet;
 class SpaceBullet;
 class btRigidBody;
 class GodotMotionState;
-class BulletPhysicsDirectBodyState;
+class BulletPhysicsDirectBodyState3D;
 
 /// This class could be used in multi thread with few changes but currently
 /// is set to be only in one single thread.
@@ -53,16 +53,16 @@ class BulletPhysicsDirectBodyState;
 /// In the system there is only one object at a time that manage all bodies and is
 /// created by BulletPhysicsServer3D and is held by the "singleton" variable of this class
 /// Each time something require it, the body must be set again.
-class BulletPhysicsDirectBodyState : public PhysicsDirectBodyState3D {
-	GDCLASS(BulletPhysicsDirectBodyState, PhysicsDirectBodyState3D);
+class BulletPhysicsDirectBodyState3D : public PhysicsDirectBodyState3D {
+	GDCLASS(BulletPhysicsDirectBodyState3D, PhysicsDirectBodyState3D);
 
-	static BulletPhysicsDirectBodyState *singleton;
+	static BulletPhysicsDirectBodyState3D *singleton;
 
 public:
 	/// This class avoid the creation of more object of this class
 	static void initSingleton() {
 		if (!singleton) {
-			singleton = memnew(BulletPhysicsDirectBodyState);
+			singleton = memnew(BulletPhysicsDirectBodyState3D);
 		}
 	}
 
@@ -75,7 +75,7 @@ public:
 		singleton->deltaTime = p_deltaTime;
 	}
 
-	static BulletPhysicsDirectBodyState *get_singleton(RigidBodyBullet *p_body) {
+	static BulletPhysicsDirectBodyState3D *get_singleton(RigidBodyBullet *p_body) {
 		singleton->body = p_body;
 		return singleton;
 	}
@@ -85,7 +85,7 @@ public:
 	real_t deltaTime;
 
 private:
-	BulletPhysicsDirectBodyState() {}
+	BulletPhysicsDirectBodyState3D() {}
 
 public:
 	virtual Vector3 get_total_gravity() const;
@@ -187,7 +187,7 @@ public:
 	};
 
 private:
-	friend class BulletPhysicsDirectBodyState;
+	friend class BulletPhysicsDirectBodyState3D;
 
 	// This is required only for Kinematic movement
 	KinematicUtilities *kinematic_utilities;
diff --git a/modules/bullet/space_bullet.cpp b/modules/bullet/space_bullet.cpp
index c40a1500f0..b1ff418748 100644
--- a/modules/bullet/space_bullet.cpp
+++ b/modules/bullet/space_bullet.cpp
@@ -885,8 +885,8 @@ void SpaceBullet::update_gravity() {
 
 #include "scene/3d/immediate_geometry.h"
 
-static ImmediateGeometry *motionVec(NULL);
-static ImmediateGeometry *normalLine(NULL);
+static ImmediateGeometry3D *motionVec(NULL);
+static ImmediateGeometry3D *normalLine(NULL);
 static Ref<StandardMaterial3D> red_mat;
 static Ref<StandardMaterial3D> blue_mat;
 #endif
@@ -897,8 +897,8 @@ bool SpaceBullet::test_body_motion(RigidBodyBullet *p_body, const Transform &p_f
 	/// Yes I know this is not good, but I've used it as fast debugging hack.
 	/// I'm leaving it here just for speedup the other eventual debugs
 	if (!normalLine) {
-		motionVec = memnew(ImmediateGeometry);
-		normalLine = memnew(ImmediateGeometry);
+		motionVec = memnew(ImmediateGeometry3D);
+		normalLine = memnew(ImmediateGeometry3D);
 		SceneTree::get_singleton()->get_current_scene()->add_child(motionVec);
 		SceneTree::get_singleton()->get_current_scene()->add_child(normalLine);
 
diff --git a/modules/csg/config.py b/modules/csg/config.py
index 0f267872d7..9106cbceca 100644
--- a/modules/csg/config.py
+++ b/modules/csg/config.py
@@ -8,15 +8,15 @@ def configure(env):
 
 def get_doc_classes():
     return [
-        "CSGBox",
-        "CSGCombiner",
-        "CSGCylinder",
-        "CSGMesh",
-        "CSGPolygon",
-        "CSGPrimitive",
-        "CSGShape",
-        "CSGSphere",
-        "CSGTorus",
+        "CSGBox3D",
+        "CSGCombiner3D",
+        "CSGCylinder3D",
+        "CSGMesh3D",
+        "CSGPolygon3D",
+        "CSGPrimitive3D",
+        "CSGShape3D",
+        "CSGSphere3D",
+        "CSGTorus3D",
     ]
 
 
diff --git a/modules/csg/csg_shape.cpp b/modules/csg/csg_shape.cpp
index 848b865efb..1ed48a573c 100644
--- a/modules/csg/csg_shape.cpp
+++ b/modules/csg/csg_shape.cpp
@@ -742,18 +742,14 @@ CSGBrush *CSGMesh3D::_build_brush() {
 
 		Vector<Vector3> anormals = arrays[Mesh::ARRAY_NORMAL];
 		const Vector3 *nr = NULL;
-		bool nr_used = false;
 		if (anormals.size()) {
 			nr = anormals.ptr();
-			nr_used = true;
 		}
 
 		Vector<Vector2> auvs = arrays[Mesh::ARRAY_TEX_UV];
 		const Vector2 *uvr = NULL;
-		bool uvr_used = false;
 		if (auvs.size()) {
 			uvr = auvs.ptr();
-			uvr_used = true;
 		}
 
 		Ref<Material> mat;
@@ -789,10 +785,10 @@ CSGBrush *CSGMesh3D::_build_brush() {
 				for (int k = 0; k < 3; k++) {
 					int idx = ir[j + k];
 					vertex[k] = vr[idx];
-					if (nr_used) {
+					if (nr) {
 						normal[k] = nr[idx];
 					}
-					if (uvr_used) {
+					if (uvr) {
 						uv[k] = uvr[idx];
 					}
 				}
@@ -832,10 +828,10 @@ CSGBrush *CSGMesh3D::_build_brush() {
 
 				for (int k = 0; k < 3; k++) {
 					vertex[k] = vr[j + k];
-					if (nr_used) {
+					if (nr) {
 						normal[k] = nr[j + k];
 					}
-					if (uvr_used) {
+					if (uvr) {
 						uv[k] = uvr[j + k];
 					}
 				}
diff --git a/modules/csg/doc_classes/CSGBox.xml b/modules/csg/doc_classes/CSGBox3D.xml
index e2f0f8488a..492bf68c44 100644
--- a/modules/csg/doc_classes/CSGBox.xml
+++ b/modules/csg/doc_classes/CSGBox3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="CSGBox" inherits="CSGPrimitive" version="4.0">
+<class name="CSGBox3D" inherits="CSGPrimitive3D" version="4.0">
 	<brief_description>
 		A CSG Box shape.
 	</brief_description>
diff --git a/modules/csg/doc_classes/CSGCombiner.xml b/modules/csg/doc_classes/CSGCombiner.xml
deleted file mode 100644
index ab95d3c3ee..0000000000
--- a/modules/csg/doc_classes/CSGCombiner.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<class name="CSGCombiner" inherits="CSGShape" version="4.0">
-	<brief_description>
-		A CSG node that allows you to combine other CSG modifiers.
-	</brief_description>
-	<description>
-		For complex arrangements of shapes, it is sometimes needed to add structure to your CSG nodes. The CSGCombiner node allows you to create this structure. The node encapsulates the result of the CSG operations of its children. In this way, it is possible to do operations on one set of shapes that are children of one CSGCombiner node, and a set of separate operations on a second set of shapes that are children of a second CSGCombiner node, and then do an operation that takes the two end results as its input to create the final shape.
-	</description>
-	<tutorials>
-	</tutorials>
-	<methods>
-	</methods>
-	<constants>
-	</constants>
-</class>
diff --git a/modules/csg/doc_classes/CSGCombiner3D.xml b/modules/csg/doc_classes/CSGCombiner3D.xml
new file mode 100644
index 0000000000..b55111eee4
--- /dev/null
+++ b/modules/csg/doc_classes/CSGCombiner3D.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class name="CSGCombiner3D" inherits="CSGShape3D" version="4.0">
+	<brief_description>
+		A CSG node that allows you to combine other CSG modifiers.
+	</brief_description>
+	<description>
+		For complex arrangements of shapes, it is sometimes needed to add structure to your CSG nodes. The CSGCombiner3D node allows you to create this structure. The node encapsulates the result of the CSG operations of its children. In this way, it is possible to do operations on one set of shapes that are children of one CSGCombiner3D node, and a set of separate operations on a second set of shapes that are children of a second CSGCombiner3D node, and then do an operation that takes the two end results as its input to create the final shape.
+	</description>
+	<tutorials>
+	</tutorials>
+	<methods>
+	</methods>
+	<constants>
+	</constants>
+</class>
diff --git a/modules/csg/doc_classes/CSGCylinder.xml b/modules/csg/doc_classes/CSGCylinder3D.xml
index 2dd8c6a8d0..bfd2a5d5f2 100644
--- a/modules/csg/doc_classes/CSGCylinder.xml
+++ b/modules/csg/doc_classes/CSGCylinder3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="CSGCylinder" inherits="CSGPrimitive" version="4.0">
+<class name="CSGCylinder3D" inherits="CSGPrimitive3D" version="4.0">
 	<brief_description>
 		A CSG Cylinder shape.
 	</brief_description>
diff --git a/modules/csg/doc_classes/CSGMesh.xml b/modules/csg/doc_classes/CSGMesh3D.xml
index f1fe2c286b..1bab8f4ee9 100644
--- a/modules/csg/doc_classes/CSGMesh.xml
+++ b/modules/csg/doc_classes/CSGMesh3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="CSGMesh" inherits="CSGPrimitive" version="4.0">
+<class name="CSGMesh3D" inherits="CSGPrimitive3D" version="4.0">
 	<brief_description>
 		A CSG Mesh shape that uses a mesh resource.
 	</brief_description>
diff --git a/modules/csg/doc_classes/CSGPolygon.xml b/modules/csg/doc_classes/CSGPolygon3D.xml
index 02b2e8b03f..c55fa0983e 100644
--- a/modules/csg/doc_classes/CSGPolygon.xml
+++ b/modules/csg/doc_classes/CSGPolygon3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="CSGPolygon" inherits="CSGPrimitive" version="4.0">
+<class name="CSGPolygon3D" inherits="CSGPrimitive3D" version="4.0">
 	<brief_description>
 		Extrudes a 2D polygon shape to create a 3D mesh.
 	</brief_description>
@@ -17,7 +17,7 @@
 		<member name="material" type="Material" setter="set_material" getter="get_material">
 			Material to use for the resulting mesh.
 		</member>
-		<member name="mode" type="int" setter="set_mode" getter="get_mode" enum="CSGPolygon.Mode" default="0">
+		<member name="mode" type="int" setter="set_mode" getter="get_mode" enum="CSGPolygon3D.Mode" default="0">
 			Extrusion mode.
 		</member>
 		<member name="path_continuous_u" type="bool" setter="set_path_continuous_u" getter="is_path_continuous_u">
@@ -30,12 +30,12 @@
 			If [code]true[/code] the start and end of our path are joined together ensuring there is no seam when [member mode] is [constant MODE_PATH].
 		</member>
 		<member name="path_local" type="bool" setter="set_path_local" getter="is_path_local">
-			If [code]false[/code] we extrude centered on our path, if [code]true[/code] we extrude in relation to the position of our CSGPolygon when [member mode] is [constant MODE_PATH].
+			If [code]false[/code] we extrude centered on our path, if [code]true[/code] we extrude in relation to the position of our CSGPolygon3D when [member mode] is [constant MODE_PATH].
 		</member>
 		<member name="path_node" type="NodePath" setter="set_path_node" getter="get_path_node">
-			The [Shape] object containing the path along which we extrude when [member mode] is [constant MODE_PATH].
+			The [Shape3D] object containing the path along which we extrude when [member mode] is [constant MODE_PATH].
 		</member>
-		<member name="path_rotation" type="int" setter="set_path_rotation" getter="get_path_rotation" enum="CSGPolygon.PathRotation">
+		<member name="path_rotation" type="int" setter="set_path_rotation" getter="get_path_rotation" enum="CSGPolygon3D.PathRotation">
 			The method by which each slice is rotated along the path when [member mode] is [constant MODE_PATH].
 		</member>
 		<member name="polygon" type="PackedVector2Array" setter="set_polygon" getter="get_polygon" default="PackedVector2Array( 0, 0, 0, 1, 1, 1, 1, 0 )">
@@ -53,13 +53,13 @@
 	</members>
 	<constants>
 		<constant name="MODE_DEPTH" value="0" enum="Mode">
-			Shape is extruded to [member depth].
+			Shape3D is extruded to [member depth].
 		</constant>
 		<constant name="MODE_SPIN" value="1" enum="Mode">
-			Shape is extruded by rotating it around an axis.
+			Shape3D is extruded by rotating it around an axis.
 		</constant>
 		<constant name="MODE_PATH" value="2" enum="Mode">
-			Shape is extruded along a path set by a [Shape] set in [member path_node].
+			Shape3D is extruded along a path set by a [Shape3D] set in [member path_node].
 		</constant>
 		<constant name="PATH_ROTATION_POLYGON" value="0" enum="PathRotation">
 			Slice is not rotated.
diff --git a/modules/csg/doc_classes/CSGPrimitive.xml b/modules/csg/doc_classes/CSGPrimitive3D.xml
index ba395b7edd..31b7360fac 100644
--- a/modules/csg/doc_classes/CSGPrimitive.xml
+++ b/modules/csg/doc_classes/CSGPrimitive3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="CSGPrimitive" inherits="CSGShape" version="4.0">
+<class name="CSGPrimitive3D" inherits="CSGShape3D" version="4.0">
 	<brief_description>
 		Base class for CSG primitives.
 	</brief_description>
diff --git a/modules/csg/doc_classes/CSGShape.xml b/modules/csg/doc_classes/CSGShape3D.xml
index 64a2fb1840..43ce988c30 100644
--- a/modules/csg/doc_classes/CSGShape.xml
+++ b/modules/csg/doc_classes/CSGShape3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="CSGShape" inherits="GeometryInstance" version="4.0">
+<class name="CSGShape3D" inherits="GeometryInstance3D" version="4.0">
 	<brief_description>
 		The CSG base class.
 	</brief_description>
@@ -76,7 +76,7 @@
 		<member name="collision_mask" type="int" setter="set_collision_mask" getter="get_collision_mask" default="1">
 			The physics layers this CSG shape scans for collisions.
 		</member>
-		<member name="operation" type="int" setter="set_operation" getter="get_operation" enum="CSGShape.Operation" default="0">
+		<member name="operation" type="int" setter="set_operation" getter="get_operation" enum="CSGShape3D.Operation" default="0">
 			The operation that is performed on this shape. This is ignored for the first CSG child node as the operation is between this node and the previous child of this nodes parent.
 		</member>
 		<member name="snap" type="float" setter="set_snap" getter="get_snap" default="0.001">
diff --git a/modules/csg/doc_classes/CSGSphere.xml b/modules/csg/doc_classes/CSGSphere3D.xml
index 847cc63586..4d5b3be099 100644
--- a/modules/csg/doc_classes/CSGSphere.xml
+++ b/modules/csg/doc_classes/CSGSphere3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="CSGSphere" inherits="CSGPrimitive" version="4.0">
+<class name="CSGSphere3D" inherits="CSGPrimitive3D" version="4.0">
 	<brief_description>
 		A CSG Sphere shape.
 	</brief_description>
diff --git a/modules/csg/doc_classes/CSGTorus.xml b/modules/csg/doc_classes/CSGTorus3D.xml
index 84a08edaf5..abe3eab913 100644
--- a/modules/csg/doc_classes/CSGTorus.xml
+++ b/modules/csg/doc_classes/CSGTorus3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="CSGTorus" inherits="CSGPrimitive" version="4.0">
+<class name="CSGTorus3D" inherits="CSGPrimitive3D" version="4.0">
 	<brief_description>
 		A CSG Torus shape.
 	</brief_description>
diff --git a/modules/csg/register_types.cpp b/modules/csg/register_types.cpp
index 1a12a6706d..40eef84b1b 100644
--- a/modules/csg/register_types.cpp
+++ b/modules/csg/register_types.cpp
@@ -47,15 +47,6 @@ void register_csg_types() {
 	ClassDB::register_class<CSGPolygon3D>();
 	ClassDB::register_class<CSGCombiner3D>();
 
-	ClassDB::add_compatibility_class("CSGShape", "CSGShape3D");
-	ClassDB::add_compatibility_class("CSGMesh", "CSGMesh3D");
-	ClassDB::add_compatibility_class("CSGSphere", "CSGSphere3D");
-	ClassDB::add_compatibility_class("CSGBox", "CSGBox3D");
-	ClassDB::add_compatibility_class("CSGCylinder", "CSGCylinder3D");
-	ClassDB::add_compatibility_class("CSGTorus", "CSGTorus3D");
-	ClassDB::add_compatibility_class("CSGPolygon", "CSGPolygon3D");
-	ClassDB::add_compatibility_class("CSGCombiner", "CSGCombiner3D");
-
 #ifdef TOOLS_ENABLED
 	EditorPlugins::add_by_type<EditorPluginCSG>();
 #endif
diff --git a/modules/gdnavigation/nav_map.cpp b/modules/gdnavigation/nav_map.cpp
index 338e49eb9f..adb59f5e51 100644
--- a/modules/gdnavigation/nav_map.cpp
+++ b/modules/gdnavigation/nav_map.cpp
@@ -657,7 +657,7 @@ void NavMap::sync() {
 					connection->get().B->edges[connection->get().B_edge].other_edge = connection->get().A_edge;
 				} else {
 					// The edge is already connected with another edge, skip.
-					ERR_PRINT("Attempted to merge a navigation mesh triangle edge with another already-merged edge. This happens when the Navigation's `cell_size` is different from the one used to generate the navigation mesh. This will cause navigation problem.");
+					ERR_PRINT("Attempted to merge a navigation mesh triangle edge with another already-merged edge. This happens when the Navigation3D's `cell_size` is different from the one used to generate the navigation mesh. This will cause navigation problem.");
 				}
 			}
 		}
diff --git a/modules/gdscript/doc_classes/@GDScript.xml b/modules/gdscript/doc_classes/@GDScript.xml
index 2f6f9f30a4..4718c864a3 100644
--- a/modules/gdscript/doc_classes/@GDScript.xml
+++ b/modules/gdscript/doc_classes/@GDScript.xml
@@ -1216,7 +1216,7 @@
 			<description>
 				Returns whether the given class exists in [ClassDB].
 				[codeblock]
-				type_exists("Sprite") # Returns true
+				type_exists("Sprite2D") # Returns true
 				type_exists("Variant") # Returns false
 				[/codeblock]
 			</description>
diff --git a/modules/gridmap/doc_classes/GridMap.xml b/modules/gridmap/doc_classes/GridMap.xml
index 37ebb3e5d5..a213069e19 100644
--- a/modules/gridmap/doc_classes/GridMap.xml
+++ b/modules/gridmap/doc_classes/GridMap.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="GridMap" inherits="Spatial" version="4.0">
+<class name="GridMap" inherits="Node3D" version="4.0">
 	<brief_description>
 		Node for 3D tile-based maps.
 	</brief_description>
diff --git a/modules/mono/glue/GodotSharp/GodotSharp/Core/DynamicObject.cs b/modules/mono/glue/GodotSharp/GodotSharp/Core/DynamicObject.cs
index a0f105d55e..c4c911b863 100644
--- a/modules/mono/glue/GodotSharp/GodotSharp/Core/DynamicObject.cs
+++ b/modules/mono/glue/GodotSharp/GodotSharp/Core/DynamicObject.cs
@@ -23,7 +23,7 @@ namespace Godot
     /// <example>
     /// This sample shows how to use <see cref="Godot.DynamicGodotObject"/> to dynamically access the engine members of a <see cref="Godot.Object"/>.
     /// <code>
-    /// dynamic sprite = GetNode("Sprite").DynamicGodotObject;
+    /// dynamic sprite = GetNode("Sprite2D").DynamicGodotObject;
     /// sprite.add_child(this);
     ///
     /// if ((sprite.hframes * sprite.vframes) &gt; 0)
diff --git a/scene/2d/cpu_particles_2d.cpp b/scene/2d/cpu_particles_2d.cpp
index ba604c086e..47465f727e 100644
--- a/scene/2d/cpu_particles_2d.cpp
+++ b/scene/2d/cpu_particles_2d.cpp
@@ -1145,7 +1145,7 @@ void CPUParticles2D::_notification(int p_what) {
 void CPUParticles2D::convert_from_particles(Node *p_particles) {
 
 	GPUParticles2D *particles = Object::cast_to<GPUParticles2D>(p_particles);
-	ERR_FAIL_COND_MSG(!particles, "Only Particles2D nodes can be converted to CPUParticles2D.");
+	ERR_FAIL_COND_MSG(!particles, "Only GPUParticles2D nodes can be converted to CPUParticles2D.");
 
 	set_emitting(particles->is_emitting());
 	set_amount(particles->get_amount());
diff --git a/scene/2d/gpu_particles_2d.cpp b/scene/2d/gpu_particles_2d.cpp
index fd9706eb2a..de3f8fa09e 100644
--- a/scene/2d/gpu_particles_2d.cpp
+++ b/scene/2d/gpu_particles_2d.cpp
@@ -229,7 +229,7 @@ bool GPUParticles2D::get_fractional_delta() const {
 String GPUParticles2D::get_configuration_warning() const {
 
 	if (RenderingServer::get_singleton()->is_low_end()) {
-		return TTR("GPU-based particles are not supported by the GLES2 video driver.\nUse the CPUParticles2D node instead. You can use the \"Convert to CPUParticles\" option for this purpose.");
+		return TTR("GPU-based particles are not supported by the GLES2 video driver.\nUse the CPUParticles2D node instead. You can use the \"Convert to CPUParticles2D\" option for this purpose.");
 	}
 
 	String warnings;
diff --git a/scene/2d/physics_body_2d.cpp b/scene/2d/physics_body_2d.cpp
index 942d2aac24..d866906ca5 100644
--- a/scene/2d/physics_body_2d.cpp
+++ b/scene/2d/physics_body_2d.cpp
@@ -157,7 +157,7 @@ void PhysicsBody2D::add_collision_exception_with(Node *p_node) {
 
 	ERR_FAIL_NULL(p_node);
 	PhysicsBody2D *physics_body = Object::cast_to<PhysicsBody2D>(p_node);
-	ERR_FAIL_COND_MSG(!physics_body, "Collision exception only works between two objects of PhysicsBody type.");
+	ERR_FAIL_COND_MSG(!physics_body, "Collision exception only works between two objects of PhysicsBody2D type.");
 	PhysicsServer2D::get_singleton()->body_add_collision_exception(get_rid(), physics_body->get_rid());
 }
 
@@ -165,7 +165,7 @@ void PhysicsBody2D::remove_collision_exception_with(Node *p_node) {
 
 	ERR_FAIL_NULL(p_node);
 	PhysicsBody2D *physics_body = Object::cast_to<PhysicsBody2D>(p_node);
-	ERR_FAIL_COND_MSG(!physics_body, "Collision exception only works between two objects of PhysicsBody type.");
+	ERR_FAIL_COND_MSG(!physics_body, "Collision exception only works between two objects of PhysicsBody2D type.");
 	PhysicsServer2D::get_singleton()->body_remove_collision_exception(get_rid(), physics_body->get_rid());
 }
 
diff --git a/scene/3d/audio_stream_player_3d.cpp b/scene/3d/audio_stream_player_3d.cpp
index bddf748be7..9f5170fa98 100644
--- a/scene/3d/audio_stream_player_3d.cpp
+++ b/scene/3d/audio_stream_player_3d.cpp
@@ -29,6 +29,7 @@
 /*************************************************************************/
 
 #include "audio_stream_player_3d.h"
+
 #include "core/engine.h"
 #include "scene/3d/area_3d.h"
 #include "scene/3d/camera_3d.h"
@@ -96,7 +97,7 @@ static const Vector3 speaker_directions[7] = {
 };
 
 void AudioStreamPlayer3D::_calc_output_vol(const Vector3 &source_dir, real_t tightness, AudioStreamPlayer3D::Output &output) {
-	unsigned int speaker_count; // only main speakers (no LFE)
+	unsigned int speaker_count = 0; // only main speakers (no LFE)
 	switch (AudioServer::get_singleton()->get_speaker_mode()) {
 		case AudioServer::SPEAKER_MODE_STEREO:
 			speaker_count = 2;
diff --git a/scene/3d/collision_object_3d.cpp b/scene/3d/collision_object_3d.cpp
index da37ca8ae2..6ee0512546 100644
--- a/scene/3d/collision_object_3d.cpp
+++ b/scene/3d/collision_object_3d.cpp
@@ -374,7 +374,7 @@ String CollisionObject3D::get_configuration_warning() const {
 		if (!warning.empty()) {
 			warning += "\n\n";
 		}
-		warning += TTR("This node has no shape, so it can't collide or interact with other objects.\nConsider adding a CollisionShape or CollisionPolygon as a child to define its shape.");
+		warning += TTR("This node has no shape, so it can't collide or interact with other objects.\nConsider adding a CollisionShape3D or CollisionPolygon3D as a child to define its shape.");
 	}
 
 	return warning;
diff --git a/scene/3d/collision_polygon_3d.cpp b/scene/3d/collision_polygon_3d.cpp
index c8b1b728bc..982205137b 100644
--- a/scene/3d/collision_polygon_3d.cpp
+++ b/scene/3d/collision_polygon_3d.cpp
@@ -165,11 +165,11 @@ bool CollisionPolygon3D::is_disabled() const {
 String CollisionPolygon3D::get_configuration_warning() const {
 
 	if (!Object::cast_to<CollisionObject3D>(get_parent())) {
-		return TTR("CollisionPolygon only serves to provide a collision shape to a CollisionObject derived node. Please only use it as a child of Area, StaticBody, RigidBody, KinematicBody, etc. to give them a shape.");
+		return TTR("CollisionPolygon3D only serves to provide a collision shape to a CollisionObject3D derived node. Please only use it as a child of Area3D, StaticBody3D, RigidBody3D, KinematicBody3D, etc. to give them a shape.");
 	}
 
 	if (polygon.empty()) {
-		return TTR("An empty CollisionPolygon has no effect on collision.");
+		return TTR("An empty CollisionPolygon3D has no effect on collision.");
 	}
 
 	return String();
diff --git a/scene/3d/collision_shape_3d.cpp b/scene/3d/collision_shape_3d.cpp
index e736f20614..6aecfd08cc 100644
--- a/scene/3d/collision_shape_3d.cpp
+++ b/scene/3d/collision_shape_3d.cpp
@@ -29,6 +29,10 @@
 /*************************************************************************/
 
 #include "collision_shape_3d.h"
+
+#include "core/math/quick_hull.h"
+#include "mesh_instance_3d.h"
+#include "physics_body_3d.h"
 #include "scene/resources/box_shape_3d.h"
 #include "scene/resources/capsule_shape_3d.h"
 #include "scene/resources/concave_polygon_shape_3d.h"
@@ -37,10 +41,8 @@
 #include "scene/resources/sphere_shape_3d.h"
 #include "scene/resources/world_margin_shape_3d.h"
 #include "servers/rendering_server.h"
+
 //TODO: Implement CylinderShape and HeightMapShape?
-#include "core/math/quick_hull.h"
-#include "mesh_instance_3d.h"
-#include "physics_body_3d.h"
 
 void CollisionShape3D::make_convex_from_brothers() {
 
@@ -116,17 +118,17 @@ void CollisionShape3D::resource_changed(RES res) {
 String CollisionShape3D::get_configuration_warning() const {
 
 	if (!Object::cast_to<CollisionObject3D>(get_parent())) {
-		return TTR("CollisionShape only serves to provide a collision shape to a CollisionObject derived node. Please only use it as a child of Area, StaticBody, RigidBody, KinematicBody, etc. to give them a shape.");
+		return TTR("CollisionShape3D only serves to provide a collision shape to a CollisionObject3D derived node. Please only use it as a child of Area3D, StaticBody3D, RigidBody3D, KinematicBody3D, etc. to give them a shape.");
 	}
 
 	if (!shape.is_valid()) {
-		return TTR("A shape must be provided for CollisionShape to function. Please create a shape resource for it.");
+		return TTR("A shape must be provided for CollisionShape3D to function. Please create a shape resource for it.");
 	}
 
 	if (Object::cast_to<RigidBody3D>(get_parent())) {
 		if (Object::cast_to<ConcavePolygonShape3D>(*shape)) {
 			if (Object::cast_to<RigidBody3D>(get_parent())->get_mode() != RigidBody3D::MODE_STATIC) {
-				return TTR("ConcavePolygonShape doesn't support RigidBody in another mode than static.");
+				return TTR("ConcavePolygonShape3D doesn't support RigidBody3D in another mode than static.");
 			}
 		}
 	}
diff --git a/scene/3d/cpu_particles_3d.cpp b/scene/3d/cpu_particles_3d.cpp
index 4350d4da25..2226b0ed83 100644
--- a/scene/3d/cpu_particles_3d.cpp
+++ b/scene/3d/cpu_particles_3d.cpp
@@ -228,7 +228,7 @@ String CPUParticles3D::get_configuration_warning() const {
 										get_param_curve(PARAM_ANIM_SPEED).is_valid() || get_param_curve(PARAM_ANIM_OFFSET).is_valid())) {
 		if (warnings != String())
 			warnings += "\n";
-		warnings += "- " + TTR("CPUParticles animation requires the usage of a StandardMaterial3D whose Billboard Mode is set to \"Particle Billboard\".");
+		warnings += "- " + TTR("CPUParticles3D animation requires the usage of a StandardMaterial3D whose Billboard Mode is set to \"Particle Billboard\".");
 	}
 
 	return warnings;
@@ -1206,7 +1206,7 @@ void CPUParticles3D::_notification(int p_what) {
 void CPUParticles3D::convert_from_particles(Node *p_particles) {
 
 	GPUParticles3D *particles = Object::cast_to<GPUParticles3D>(p_particles);
-	ERR_FAIL_COND_MSG(!particles, "Only Particles nodes can be converted to CPUParticles.");
+	ERR_FAIL_COND_MSG(!particles, "Only GPUParticles3D nodes can be converted to CPUParticles3D.");
 
 	set_emitting(particles->is_emitting());
 	set_amount(particles->get_amount());
diff --git a/scene/3d/gpu_particles_3d.cpp b/scene/3d/gpu_particles_3d.cpp
index ad45228ca8..8646d4f290 100644
--- a/scene/3d/gpu_particles_3d.cpp
+++ b/scene/3d/gpu_particles_3d.cpp
@@ -241,7 +241,7 @@ bool GPUParticles3D::get_fractional_delta() const {
 String GPUParticles3D::get_configuration_warning() const {
 
 	if (RenderingServer::get_singleton()->is_low_end()) {
-		return TTR("GPU-based particles are not supported by the GLES2 video driver.\nUse the CPUParticles node instead. You can use the \"Convert to CPUParticles\" option for this purpose.");
+		return TTR("GPU-based particles are not supported by the GLES2 video driver.\nUse the CPUParticles3D node instead. You can use the \"Convert to CPUParticles3D\" option for this purpose.");
 	}
 
 	String warnings;
diff --git a/scene/3d/light_3d.cpp b/scene/3d/light_3d.cpp
index 7fc7fe2bf5..be3b369724 100644
--- a/scene/3d/light_3d.cpp
+++ b/scene/3d/light_3d.cpp
@@ -336,7 +336,7 @@ Light3D::Light3D(RenderingServer::LightType p_type) {
 Light3D::Light3D() {
 
 	type = RenderingServer::LIGHT_DIRECTIONAL;
-	ERR_PRINT("Light should not be instanced directly; use the DirectionalLight, OmniLight or SpotLight subtypes instead.");
+	ERR_PRINT("Light3D should not be instanced directly; use the DirectionalLight3D, OmniLight3D or SpotLight3D subtypes instead.");
 }
 
 Light3D::~Light3D() {
@@ -464,7 +464,7 @@ String SpotLight3D::get_configuration_warning() const {
 			warning += "\n\n";
 		}
 
-		warning += TTR("A SpotLight with an angle wider than 90 degrees cannot cast shadows.");
+		warning += TTR("A SpotLight3D with an angle wider than 90 degrees cannot cast shadows.");
 	}
 
 	return warning;
diff --git a/scene/3d/navigation_agent_3d.cpp b/scene/3d/navigation_agent_3d.cpp
index 76f1d4688d..a131684a8a 100644
--- a/scene/3d/navigation_agent_3d.cpp
+++ b/scene/3d/navigation_agent_3d.cpp
@@ -298,7 +298,7 @@ void NavigationAgent3D::_avoidance_done(Vector3 p_new_velocity) {
 
 String NavigationAgent3D::get_configuration_warning() const {
 	if (!Object::cast_to<Node3D>(get_parent())) {
-		return TTR("The NavigationAgent can be used only under a spatial node.");
+		return TTR("The NavigationAgent3D can be used only under a spatial node.");
 	}
 
 	return String();
diff --git a/scene/3d/navigation_obstacle_3d.cpp b/scene/3d/navigation_obstacle_3d.cpp
index 63c273b4ca..fa976e5d18 100644
--- a/scene/3d/navigation_obstacle_3d.cpp
+++ b/scene/3d/navigation_obstacle_3d.cpp
@@ -118,7 +118,7 @@ Node *NavigationObstacle3D::get_navigation_node() const {
 String NavigationObstacle3D::get_configuration_warning() const {
 	if (!Object::cast_to<Node3D>(get_parent())) {
 
-		return TTR("The NavigationObstacle only serves to provide collision avoidance to a spatial object.");
+		return TTR("The NavigationObstacle3D only serves to provide collision avoidance to a spatial object.");
 	}
 
 	return String();
diff --git a/scene/3d/navigation_region_3d.cpp b/scene/3d/navigation_region_3d.cpp
index 4bb2c72172..08c0fbf4d1 100644
--- a/scene/3d/navigation_region_3d.cpp
+++ b/scene/3d/navigation_region_3d.cpp
@@ -29,6 +29,7 @@
 /*************************************************************************/
 
 #include "navigation_region_3d.h"
+
 #include "core/os/thread.h"
 #include "mesh_instance_3d.h"
 #include "navigation_3d.h"
@@ -214,7 +215,7 @@ String NavigationRegion3D::get_configuration_warning() const {
 		c = Object::cast_to<Node3D>(c->get_parent());
 	}
 
-	return TTR("NavigationRegion must be a child or grandchild to a Navigation node. It only provides navigation data.");
+	return TTR("NavigationRegion3D must be a child or grandchild to a Navigation3D node. It only provides navigation data.");
 }
 
 void NavigationRegion3D::_bind_methods() {
diff --git a/scene/3d/path_3d.cpp b/scene/3d/path_3d.cpp
index 2169f664ea..0f1f9bb8a7 100644
--- a/scene/3d/path_3d.cpp
+++ b/scene/3d/path_3d.cpp
@@ -262,11 +262,11 @@ String PathFollow3D::get_configuration_warning() const {
 		return String();
 
 	if (!Object::cast_to<Path3D>(get_parent())) {
-		return TTR("PathFollow only works when set as a child of a Path node.");
+		return TTR("PathFollow3D only works when set as a child of a Path3D node.");
 	} else {
 		Path3D *path = Object::cast_to<Path3D>(get_parent());
 		if (path->get_curve().is_valid() && !path->get_curve()->is_up_vector_enabled() && rotation_mode == ROTATION_ORIENTED) {
-			return TTR("PathFollow's ROTATION_ORIENTED requires \"Up Vector\" to be enabled in its parent Path's Curve resource.");
+			return TTR("PathFollow3D's ROTATION_ORIENTED requires \"Up Vector\" to be enabled in its parent Path3D's Curve resource.");
 		}
 	}
 
diff --git a/scene/3d/physics_body_3d.cpp b/scene/3d/physics_body_3d.cpp
index 680d6e8594..37981f914c 100644
--- a/scene/3d/physics_body_3d.cpp
+++ b/scene/3d/physics_body_3d.cpp
@@ -128,7 +128,7 @@ void PhysicsBody3D::add_collision_exception_with(Node *p_node) {
 
 	ERR_FAIL_NULL(p_node);
 	CollisionObject3D *collision_object = Object::cast_to<CollisionObject3D>(p_node);
-	ERR_FAIL_COND_MSG(!collision_object, "Collision exception only works between two CollisionObject.");
+	ERR_FAIL_COND_MSG(!collision_object, "Collision exception only works between two CollisionObject3Ds.");
 	PhysicsServer3D::get_singleton()->body_add_collision_exception(get_rid(), collision_object->get_rid());
 }
 
@@ -136,7 +136,7 @@ void PhysicsBody3D::remove_collision_exception_with(Node *p_node) {
 
 	ERR_FAIL_NULL(p_node);
 	CollisionObject3D *collision_object = Object::cast_to<CollisionObject3D>(p_node);
-	ERR_FAIL_COND_MSG(!collision_object, "Collision exception only works between two CollisionObject.");
+	ERR_FAIL_COND_MSG(!collision_object, "Collision exception only works between two CollisionObject3Ds.");
 	PhysicsServer3D::get_singleton()->body_remove_collision_exception(get_rid(), collision_object->get_rid());
 }
 
@@ -406,7 +406,7 @@ void RigidBody3D::_direct_state_changed(Object *p_state) {
 
 		_RigidBodyInOut *toadd = (_RigidBodyInOut *)alloca(state->get_contact_count() * sizeof(_RigidBodyInOut));
 		int toadd_count = 0; //state->get_contact_count();
-		RigidBody_RemoveAction *toremove = (RigidBody_RemoveAction *)alloca(rc * sizeof(RigidBody_RemoveAction));
+		RigidBody3D_RemoveAction *toremove = (RigidBody3D_RemoveAction *)alloca(rc * sizeof(RigidBody3D_RemoveAction));
 		int toremove_count = 0;
 
 		//put the ones to add
@@ -794,7 +794,7 @@ String RigidBody3D::get_configuration_warning() const {
 		if (warning != String()) {
 			warning += "\n\n";
 		}
-		warning += TTR("Size changes to RigidBody (in character or rigid modes) will be overridden by the physics engine when running.\nChange the size in children collision shapes instead.");
+		warning += TTR("Size changes to RigidBody3D (in character or rigid modes) will be overridden by the physics engine when running.\nChange the size in children collision shapes instead.");
 	}
 
 	return warning;
@@ -864,7 +864,7 @@ void RigidBody3D::_bind_methods() {
 
 	ClassDB::bind_method(D_METHOD("get_colliding_bodies"), &RigidBody3D::get_colliding_bodies);
 
-	BIND_VMETHOD(MethodInfo("_integrate_forces", PropertyInfo(Variant::OBJECT, "state", PROPERTY_HINT_RESOURCE_TYPE, "PhysicsDirectBodyState")));
+	BIND_VMETHOD(MethodInfo("_integrate_forces", PropertyInfo(Variant::OBJECT, "state", PROPERTY_HINT_RESOURCE_TYPE, "PhysicsDirectBodyState3D")));
 
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "mode", PROPERTY_HINT_ENUM, "Rigid,Static,Character,Kinematic"), "set_mode", "get_mode");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "mass", PROPERTY_HINT_EXP_RANGE, "0.01,65535,0.01"), "set_mass", "get_mass");
diff --git a/scene/3d/physics_body_3d.h b/scene/3d/physics_body_3d.h
index ed7cfa8733..bf7854b68d 100644
--- a/scene/3d/physics_body_3d.h
+++ b/scene/3d/physics_body_3d.h
@@ -156,7 +156,7 @@ protected:
 			tagged = false;
 		}
 	};
-	struct RigidBody_RemoveAction {
+	struct RigidBody3D_RemoveAction {
 
 		ObjectID body_id;
 		ShapePair pair;
diff --git a/scene/3d/soft_body_3d.cpp b/scene/3d/soft_body_3d.cpp
index ee9ce1dd71..6d2808cfce 100644
--- a/scene/3d/soft_body_3d.cpp
+++ b/scene/3d/soft_body_3d.cpp
@@ -29,6 +29,7 @@
 /*************************************************************************/
 
 #include "soft_body_3d.h"
+
 #include "core/list.h"
 #include "core/object.h"
 #include "core/os/os.h"
@@ -402,7 +403,7 @@ String SoftBody3D::get_configuration_warning() const {
 		if (!warning.empty())
 			warning += "\n\n";
 
-		warning += TTR("Size changes to SoftBody will be overridden by the physics engine when running.\nChange the size in children collision shapes instead.");
+		warning += TTR("Size changes to SoftBody3D will be overridden by the physics engine when running.\nChange the size in children collision shapes instead.");
 	}
 
 	return warning;
@@ -585,14 +586,14 @@ Array SoftBody3D::get_collision_exceptions() {
 void SoftBody3D::add_collision_exception_with(Node *p_node) {
 	ERR_FAIL_NULL(p_node);
 	CollisionObject3D *collision_object = Object::cast_to<CollisionObject3D>(p_node);
-	ERR_FAIL_COND_MSG(!collision_object, "Collision exception only works between two CollisionObject.");
+	ERR_FAIL_COND_MSG(!collision_object, "Collision exception only works between two CollisionObject3Ds.");
 	PhysicsServer3D::get_singleton()->soft_body_add_collision_exception(physics_rid, collision_object->get_rid());
 }
 
 void SoftBody3D::remove_collision_exception_with(Node *p_node) {
 	ERR_FAIL_NULL(p_node);
 	CollisionObject3D *collision_object = Object::cast_to<CollisionObject3D>(p_node);
-	ERR_FAIL_COND_MSG(!collision_object, "Collision exception only works between two CollisionObject.");
+	ERR_FAIL_COND_MSG(!collision_object, "Collision exception only works between two CollisionObject3Ds.");
 	PhysicsServer3D::get_singleton()->soft_body_remove_collision_exception(physics_rid, collision_object->get_rid());
 }
 
diff --git a/scene/3d/vehicle_body_3d.cpp b/scene/3d/vehicle_body_3d.cpp
index 5984b776b2..ac7608a3d5 100644
--- a/scene/3d/vehicle_body_3d.cpp
+++ b/scene/3d/vehicle_body_3d.cpp
@@ -105,7 +105,7 @@ void VehicleWheel3D::_notification(int p_what) {
 
 String VehicleWheel3D::get_configuration_warning() const {
 	if (!Object::cast_to<VehicleBody3D>(get_parent())) {
-		return TTR("VehicleWheel serves to provide a wheel system to a VehicleBody. Please use it as a child of a VehicleBody.");
+		return TTR("VehicleWheel3D serves to provide a wheel system to a VehicleBody3D. Please use it as a child of a VehicleBody3D.");
 	}
 
 	return String();
@@ -285,7 +285,7 @@ void VehicleWheel3D::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "engine_force", PROPERTY_HINT_RANGE, "0.00,1024.0,0.01,or_greater"), "set_engine_force", "get_engine_force");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "brake", PROPERTY_HINT_RANGE, "0.0,1.0,0.01"), "set_brake", "get_brake");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "steering", PROPERTY_HINT_RANGE, "-180,180.0,0.01"), "set_steering", "get_steering");
-	ADD_GROUP("VehicleBody Motion", "");
+	ADD_GROUP("VehicleBody3D Motion", "");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "use_as_traction"), "set_use_as_traction", "is_used_as_traction");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "use_as_steering"), "set_use_as_steering", "is_used_as_steering");
 	ADD_GROUP("Wheel", "wheel_");
diff --git a/scene/register_scene_types.cpp b/scene/register_scene_types.cpp
index 774d943efe..e73e560656 100644
--- a/scene/register_scene_types.cpp
+++ b/scene/register_scene_types.cpp
@@ -754,6 +754,8 @@ void register_scene_types() {
 	ClassDB::add_compatibility_class("Area", "Area3D");
 	ClassDB::add_compatibility_class("BoneAttachment", "BoneAttachment3D");
 	ClassDB::add_compatibility_class("BoxShape", "BoxShape3D");
+	ClassDB::add_compatibility_class("BulletPhysicsDirectBodyState", "BulletPhysicsDirectBodyState3D");
+	ClassDB::add_compatibility_class("BulletPhysicsServer", "BulletPhysicsServer3D");
 	ClassDB::add_compatibility_class("Camera", "Camera3D");
 	ClassDB::add_compatibility_class("CapsuleShape", "CapsuleShape3D");
 	ClassDB::add_compatibility_class("ClippedCamera", "ClippedCamera3D");
@@ -764,8 +766,19 @@ void register_scene_types() {
 	ClassDB::add_compatibility_class("ConeTwistJoint", "ConeTwistJoint3D");
 	ClassDB::add_compatibility_class("ConvexPolygonShape", "ConvexPolygonShape3D");
 	ClassDB::add_compatibility_class("CPUParticles", "CPUParticles3D");
+	ClassDB::add_compatibility_class("CSGBox", "CSGBox3D");
+	ClassDB::add_compatibility_class("CSGCombiner", "CSGCombiner3D");
+	ClassDB::add_compatibility_class("CSGCylinder", "CSGCylinder3D");
+	ClassDB::add_compatibility_class("CSGMesh", "CSGMesh3D");
+	ClassDB::add_compatibility_class("CSGPolygon", "CSGPolygon3D");
+	ClassDB::add_compatibility_class("CSGPrimitive", "CSGPrimitive3D");
+	ClassDB::add_compatibility_class("CSGShape", "CSGShape3D");
+	ClassDB::add_compatibility_class("CSGSphere", "CSGSphere3D");
+	ClassDB::add_compatibility_class("CSGTorus", "CSGTorus3D");
 	ClassDB::add_compatibility_class("CylinderShape", "CylinderShape3D");
 	ClassDB::add_compatibility_class("DirectionalLight", "DirectionalLight3D");
+	ClassDB::add_compatibility_class("EditorSpatialGizmo", "EditorNode3DGizmo");
+	ClassDB::add_compatibility_class("EditorSpatialGizmoPlugin", "EditorNode3DGizmoPlugin");
 	ClassDB::add_compatibility_class("Generic6DOFJoint", "Generic6DOFJoint3D");
 	ClassDB::add_compatibility_class("HeightMapShape", "HeightMapShape3D");
 	ClassDB::add_compatibility_class("HingeJoint", "HingeJoint3D");
@@ -783,6 +796,8 @@ void register_scene_types() {
 	ClassDB::add_compatibility_class("NavigationObstacle", "NavigationObstacle3D");
 	ClassDB::add_compatibility_class("NavigationPolygonInstance", "NavigationRegion2D");
 	ClassDB::add_compatibility_class("NavigationRegion", "NavigationRegion3D");
+	ClassDB::add_compatibility_class("Navigation2DServer", "NavigationServer2D");
+	ClassDB::add_compatibility_class("NavigationServer", "NavigationServer3D");
 	ClassDB::add_compatibility_class("OmniLight", "OmniLight3D");
 	ClassDB::add_compatibility_class("Particles", "GPUParticles3D");
 	ClassDB::add_compatibility_class("Particles2D", "GPUParticles2D");
@@ -816,6 +831,7 @@ void register_scene_types() {
 	ClassDB::add_compatibility_class("SliderJoint", "SliderJoint3D");
 	ClassDB::add_compatibility_class("SoftBody", "SoftBody3D");
 	ClassDB::add_compatibility_class("Spatial", "Node3D");
+	ClassDB::add_compatibility_class("SpatialGizmo", "Node3DGizmo");
 	ClassDB::add_compatibility_class("SpatialMaterial", "StandardMaterial3D");
 	ClassDB::add_compatibility_class("SpatialVelocityTracker", "VelocityTracker3D");
 	ClassDB::add_compatibility_class("SphereShape", "SphereShape3D");
diff --git a/scene/resources/environment.cpp b/scene/resources/environment.cpp
index 89937238c1..6fa52e6f05 100644
--- a/scene/resources/environment.cpp
+++ b/scene/resources/environment.cpp
@@ -546,7 +546,7 @@ float Environment::get_ssao_edge_sharpness() const {
 void Environment::set_glow_enabled(bool p_enabled) {
 
 	glow_enabled = p_enabled;
-	RS::get_singleton()->environment_set_glow(environment, glow_enabled, glow_levels, glow_intensity, glow_strength, glow_mix, glow_bloom, RS::EnvironmentGlowBlendMode(glow_blend_mode), glow_hdr_bleed_threshold, glow_hdr_bleed_threshold, glow_hdr_luminance_cap, glow_bicubic_upscale);
+	RS::get_singleton()->environment_set_glow(environment, glow_enabled, glow_levels, glow_intensity, glow_strength, glow_mix, glow_bloom, RS::EnvironmentGlowBlendMode(glow_blend_mode), glow_hdr_bleed_threshold, glow_hdr_bleed_threshold, glow_hdr_luminance_cap);
 	_change_notify();
 }
 
@@ -564,7 +564,7 @@ void Environment::set_glow_level(int p_level, bool p_enabled) {
 	else
 		glow_levels &= ~(1 << p_level);
 
-	RS::get_singleton()->environment_set_glow(environment, glow_enabled, glow_levels, glow_intensity, glow_strength, glow_mix, glow_bloom, RS::EnvironmentGlowBlendMode(glow_blend_mode), glow_hdr_bleed_threshold, glow_hdr_bleed_threshold, glow_hdr_luminance_cap, glow_bicubic_upscale);
+	RS::get_singleton()->environment_set_glow(environment, glow_enabled, glow_levels, glow_intensity, glow_strength, glow_mix, glow_bloom, RS::EnvironmentGlowBlendMode(glow_blend_mode), glow_hdr_bleed_threshold, glow_hdr_bleed_threshold, glow_hdr_luminance_cap);
 }
 bool Environment::is_glow_level_enabled(int p_level) const {
 
@@ -577,7 +577,7 @@ void Environment::set_glow_intensity(float p_intensity) {
 
 	glow_intensity = p_intensity;
 
-	RS::get_singleton()->environment_set_glow(environment, glow_enabled, glow_levels, glow_intensity, glow_strength, glow_mix, glow_bloom, RS::EnvironmentGlowBlendMode(glow_blend_mode), glow_hdr_bleed_threshold, glow_hdr_bleed_threshold, glow_hdr_luminance_cap, glow_bicubic_upscale);
+	RS::get_singleton()->environment_set_glow(environment, glow_enabled, glow_levels, glow_intensity, glow_strength, glow_mix, glow_bloom, RS::EnvironmentGlowBlendMode(glow_blend_mode), glow_hdr_bleed_threshold, glow_hdr_bleed_threshold, glow_hdr_luminance_cap);
 }
 float Environment::get_glow_intensity() const {
 
@@ -587,7 +587,7 @@ float Environment::get_glow_intensity() const {
 void Environment::set_glow_strength(float p_strength) {
 
 	glow_strength = p_strength;
-	RS::get_singleton()->environment_set_glow(environment, glow_enabled, glow_levels, glow_intensity, glow_strength, glow_mix, glow_bloom, RS::EnvironmentGlowBlendMode(glow_blend_mode), glow_hdr_bleed_threshold, glow_hdr_bleed_threshold, glow_hdr_luminance_cap, glow_bicubic_upscale);
+	RS::get_singleton()->environment_set_glow(environment, glow_enabled, glow_levels, glow_intensity, glow_strength, glow_mix, glow_bloom, RS::EnvironmentGlowBlendMode(glow_blend_mode), glow_hdr_bleed_threshold, glow_hdr_bleed_threshold, glow_hdr_luminance_cap);
 }
 float Environment::get_glow_strength() const {
 
@@ -597,7 +597,7 @@ float Environment::get_glow_strength() const {
 void Environment::set_glow_mix(float p_mix) {
 
 	glow_mix = p_mix;
-	RS::get_singleton()->environment_set_glow(environment, glow_enabled, glow_levels, glow_intensity, glow_strength, glow_mix, glow_bloom, RS::EnvironmentGlowBlendMode(glow_blend_mode), glow_hdr_bleed_threshold, glow_hdr_bleed_threshold, glow_hdr_luminance_cap, glow_bicubic_upscale);
+	RS::get_singleton()->environment_set_glow(environment, glow_enabled, glow_levels, glow_intensity, glow_strength, glow_mix, glow_bloom, RS::EnvironmentGlowBlendMode(glow_blend_mode), glow_hdr_bleed_threshold, glow_hdr_bleed_threshold, glow_hdr_luminance_cap);
 }
 float Environment::get_glow_mix() const {
 
@@ -608,7 +608,7 @@ void Environment::set_glow_bloom(float p_threshold) {
 
 	glow_bloom = p_threshold;
 
-	RS::get_singleton()->environment_set_glow(environment, glow_enabled, glow_levels, glow_intensity, glow_strength, glow_mix, glow_bloom, RS::EnvironmentGlowBlendMode(glow_blend_mode), glow_hdr_bleed_threshold, glow_hdr_bleed_threshold, glow_hdr_luminance_cap, glow_bicubic_upscale);
+	RS::get_singleton()->environment_set_glow(environment, glow_enabled, glow_levels, glow_intensity, glow_strength, glow_mix, glow_bloom, RS::EnvironmentGlowBlendMode(glow_blend_mode), glow_hdr_bleed_threshold, glow_hdr_bleed_threshold, glow_hdr_luminance_cap);
 }
 float Environment::get_glow_bloom() const {
 
@@ -619,7 +619,7 @@ void Environment::set_glow_blend_mode(GlowBlendMode p_mode) {
 
 	glow_blend_mode = p_mode;
 
-	RS::get_singleton()->environment_set_glow(environment, glow_enabled, glow_levels, glow_intensity, glow_strength, glow_mix, glow_bloom, RS::EnvironmentGlowBlendMode(glow_blend_mode), glow_hdr_bleed_threshold, glow_hdr_bleed_threshold, glow_hdr_luminance_cap, glow_bicubic_upscale);
+	RS::get_singleton()->environment_set_glow(environment, glow_enabled, glow_levels, glow_intensity, glow_strength, glow_mix, glow_bloom, RS::EnvironmentGlowBlendMode(glow_blend_mode), glow_hdr_bleed_threshold, glow_hdr_bleed_threshold, glow_hdr_luminance_cap);
 	_change_notify();
 }
 Environment::GlowBlendMode Environment::get_glow_blend_mode() const {
@@ -631,7 +631,7 @@ void Environment::set_glow_hdr_bleed_threshold(float p_threshold) {
 
 	glow_hdr_bleed_threshold = p_threshold;
 
-	RS::get_singleton()->environment_set_glow(environment, glow_enabled, glow_levels, glow_intensity, glow_strength, glow_mix, glow_bloom, RS::EnvironmentGlowBlendMode(glow_blend_mode), glow_hdr_bleed_threshold, glow_hdr_bleed_threshold, glow_hdr_luminance_cap, glow_bicubic_upscale);
+	RS::get_singleton()->environment_set_glow(environment, glow_enabled, glow_levels, glow_intensity, glow_strength, glow_mix, glow_bloom, RS::EnvironmentGlowBlendMode(glow_blend_mode), glow_hdr_bleed_threshold, glow_hdr_bleed_threshold, glow_hdr_luminance_cap);
 }
 float Environment::get_glow_hdr_bleed_threshold() const {
 
@@ -642,7 +642,7 @@ void Environment::set_glow_hdr_luminance_cap(float p_amount) {
 
 	glow_hdr_luminance_cap = p_amount;
 
-	RS::get_singleton()->environment_set_glow(environment, glow_enabled, glow_levels, glow_intensity, glow_strength, glow_mix, glow_bloom, RS::EnvironmentGlowBlendMode(glow_blend_mode), glow_hdr_bleed_threshold, glow_hdr_bleed_threshold, glow_hdr_luminance_cap, glow_bicubic_upscale);
+	RS::get_singleton()->environment_set_glow(environment, glow_enabled, glow_levels, glow_intensity, glow_strength, glow_mix, glow_bloom, RS::EnvironmentGlowBlendMode(glow_blend_mode), glow_hdr_bleed_threshold, glow_hdr_bleed_threshold, glow_hdr_luminance_cap);
 }
 float Environment::get_glow_hdr_luminance_cap() const {
 
@@ -653,24 +653,13 @@ void Environment::set_glow_hdr_bleed_scale(float p_scale) {
 
 	glow_hdr_bleed_scale = p_scale;
 
-	RS::get_singleton()->environment_set_glow(environment, glow_enabled, glow_levels, glow_intensity, glow_strength, glow_mix, glow_bloom, RS::EnvironmentGlowBlendMode(glow_blend_mode), glow_hdr_bleed_threshold, glow_hdr_bleed_threshold, glow_hdr_luminance_cap, glow_bicubic_upscale);
+	RS::get_singleton()->environment_set_glow(environment, glow_enabled, glow_levels, glow_intensity, glow_strength, glow_mix, glow_bloom, RS::EnvironmentGlowBlendMode(glow_blend_mode), glow_hdr_bleed_threshold, glow_hdr_bleed_threshold, glow_hdr_luminance_cap);
 }
 float Environment::get_glow_hdr_bleed_scale() const {
 
 	return glow_hdr_bleed_scale;
 }
 
-void Environment::set_glow_bicubic_upscale(bool p_enable) {
-
-	glow_bicubic_upscale = p_enable;
-	RS::get_singleton()->environment_set_glow(environment, glow_enabled, glow_levels, glow_intensity, glow_strength, glow_mix, glow_bloom, RS::EnvironmentGlowBlendMode(glow_blend_mode), glow_hdr_bleed_threshold, glow_hdr_bleed_threshold, glow_hdr_luminance_cap, glow_bicubic_upscale);
-}
-
-bool Environment::is_glow_bicubic_upscale_enabled() const {
-
-	return glow_bicubic_upscale;
-}
-
 void Environment::set_fog_enabled(bool p_enabled) {
 
 	fog_enabled = p_enabled;
@@ -1067,9 +1056,6 @@ void Environment::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_glow_hdr_bleed_scale", "scale"), &Environment::set_glow_hdr_bleed_scale);
 	ClassDB::bind_method(D_METHOD("get_glow_hdr_bleed_scale"), &Environment::get_glow_hdr_bleed_scale);
 
-	ClassDB::bind_method(D_METHOD("set_glow_bicubic_upscale", "enabled"), &Environment::set_glow_bicubic_upscale);
-	ClassDB::bind_method(D_METHOD("is_glow_bicubic_upscale_enabled"), &Environment::is_glow_bicubic_upscale_enabled);
-
 	ADD_GROUP("Glow", "glow_");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "glow_enabled"), "set_glow_enabled", "is_glow_enabled");
 	ADD_PROPERTYI(PropertyInfo(Variant::BOOL, "glow_levels/1"), "set_glow_level", "is_glow_level_enabled", 0);
@@ -1088,7 +1074,6 @@ void Environment::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "glow_hdr_threshold", PROPERTY_HINT_RANGE, "0.0,4.0,0.01"), "set_glow_hdr_bleed_threshold", "get_glow_hdr_bleed_threshold");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "glow_hdr_luminance_cap", PROPERTY_HINT_RANGE, "0.0,256.0,0.01"), "set_glow_hdr_luminance_cap", "get_glow_hdr_luminance_cap");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "glow_hdr_scale", PROPERTY_HINT_RANGE, "0.0,4.0,0.01"), "set_glow_hdr_bleed_scale", "get_glow_hdr_bleed_scale");
-	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "glow_bicubic_upscale"), "set_glow_bicubic_upscale", "is_glow_bicubic_upscale_enabled");
 
 	ClassDB::bind_method(D_METHOD("set_adjustment_enable", "enabled"), &Environment::set_adjustment_enable);
 	ClassDB::bind_method(D_METHOD("is_adjustment_enabled"), &Environment::is_adjustment_enabled);
@@ -1209,7 +1194,6 @@ Environment::Environment() :
 	glow_hdr_bleed_threshold = 1.0;
 	glow_hdr_luminance_cap = 12.0;
 	glow_hdr_bleed_scale = 2.0;
-	glow_bicubic_upscale = false;
 
 	fog_enabled = false;
 	fog_color = Color(0.5, 0.5, 0.5);
diff --git a/scene/resources/environment.h b/scene/resources/environment.h
index 657c7190e5..83f9a3f509 100644
--- a/scene/resources/environment.h
+++ b/scene/resources/environment.h
@@ -146,7 +146,6 @@ private:
 	float glow_hdr_bleed_threshold;
 	float glow_hdr_bleed_scale;
 	float glow_hdr_luminance_cap;
-	bool glow_bicubic_upscale;
 
 	bool fog_enabled;
 	Color fog_color;
@@ -318,9 +317,6 @@ public:
 	void set_glow_hdr_bleed_scale(float p_scale);
 	float get_glow_hdr_bleed_scale() const;
 
-	void set_glow_bicubic_upscale(bool p_enable);
-	bool is_glow_bicubic_upscale_enabled() const;
-
 	void set_fog_enabled(bool p_enabled);
 	bool is_fog_enabled() const;
 
diff --git a/scene/resources/world_3d.cpp b/scene/resources/world_3d.cpp
index 8e45b22cbf..a33f850755 100644
--- a/scene/resources/world_3d.cpp
+++ b/scene/resources/world_3d.cpp
@@ -348,7 +348,7 @@ void World3D::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "camera_effects", PROPERTY_HINT_RESOURCE_TYPE, "CameraEffects"), "set_camera_effects", "get_camera_effects");
 	ADD_PROPERTY(PropertyInfo(Variant::_RID, "space", PROPERTY_HINT_NONE, "", 0), "", "get_space");
 	ADD_PROPERTY(PropertyInfo(Variant::_RID, "scenario", PROPERTY_HINT_NONE, "", 0), "", "get_scenario");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "direct_space_state", PROPERTY_HINT_RESOURCE_TYPE, "PhysicsDirectSpaceState", 0), "", "get_direct_space_state");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "direct_space_state", PROPERTY_HINT_RESOURCE_TYPE, "PhysicsDirectSpaceState3D", 0), "", "get_direct_space_state");
 }
 
 World3D::World3D() {
diff --git a/servers/navigation_server_2d.h b/servers/navigation_server_2d.h
index af914e5ba9..d7384bae74 100644
--- a/servers/navigation_server_2d.h
+++ b/servers/navigation_server_2d.h
@@ -39,7 +39,7 @@
 #include "core/rid.h"
 #include "scene/2d/navigation_region_2d.h"
 
-// This server exposes the 3D `NavigationServer` features in the 2D world.
+// This server exposes the `NavigationServer3D` features in the 2D world.
 class NavigationServer2D : public Object {
 	GDCLASS(NavigationServer2D, Object);
 
diff --git a/servers/physics_3d/physics_server_3d_sw.cpp b/servers/physics_3d/physics_server_3d_sw.cpp
index da84630088..11a3b7bbb8 100644
--- a/servers/physics_3d/physics_server_3d_sw.cpp
+++ b/servers/physics_3d/physics_server_3d_sw.cpp
@@ -70,7 +70,7 @@ RID PhysicsServer3DSW::shape_create(ShapeType p_shape) {
 		} break;
 		case SHAPE_CYLINDER: {
 
-			ERR_FAIL_V_MSG(RID(), "CylinderShape is not supported in GodotPhysics. Please switch to Bullet in the Project Settings.");
+			ERR_FAIL_V_MSG(RID(), "CylinderShape3D is not supported in GodotPhysics. Please switch to Bullet in the Project Settings.");
 		} break;
 		case SHAPE_CONVEX_POLYGON: {
 
diff --git a/servers/register_server_types.cpp b/servers/register_server_types.cpp
index c53ffcc7b5..f96752813d 100644
--- a/servers/register_server_types.cpp
+++ b/servers/register_server_types.cpp
@@ -194,10 +194,10 @@ void register_server_singletons() {
 
 	Engine::get_singleton()->add_singleton(Engine::Singleton("RenderingServer", RenderingServer::get_singleton()));
 	Engine::get_singleton()->add_singleton(Engine::Singleton("AudioServer", AudioServer::get_singleton()));
-	Engine::get_singleton()->add_singleton(Engine::Singleton("PhysicsServer3D", PhysicsServer3D::get_singleton()));
 	Engine::get_singleton()->add_singleton(Engine::Singleton("PhysicsServer2D", PhysicsServer2D::get_singleton()));
-	Engine::get_singleton()->add_singleton(Engine::Singleton("NavigationServer", NavigationServer3D::get_singleton_mut()));
+	Engine::get_singleton()->add_singleton(Engine::Singleton("PhysicsServer3D", PhysicsServer3D::get_singleton()));
 	Engine::get_singleton()->add_singleton(Engine::Singleton("NavigationServer2D", NavigationServer2D::get_singleton_mut()));
+	Engine::get_singleton()->add_singleton(Engine::Singleton("NavigationServer3D", NavigationServer3D::get_singleton_mut()));
 	Engine::get_singleton()->add_singleton(Engine::Singleton("ARVRServer", ARVRServer::get_singleton()));
 	Engine::get_singleton()->add_singleton(Engine::Singleton("CameraServer", CameraServer::get_singleton()));
 }
diff --git a/servers/rendering/rasterizer.h b/servers/rendering/rasterizer.h
index f63d1077bb..eb33db04fc 100644
--- a/servers/rendering/rasterizer.h
+++ b/servers/rendering/rasterizer.h
@@ -75,7 +75,8 @@ public:
 	virtual void environment_set_camera_feed_id(RID p_env, int p_camera_feed_id) = 0;
 #endif
 
-	virtual void environment_set_glow(RID p_env, bool p_enable, int p_level_flags, float p_intensity, float p_strength, float p_mix, float p_bloom_threshold, RS::EnvironmentGlowBlendMode p_blend_mode, float p_hdr_bleed_threshold, float p_hdr_bleed_scale, float p_hdr_luminance_cap, bool p_bicubic_upscale) = 0;
+	virtual void environment_set_glow(RID p_env, bool p_enable, int p_level_flags, float p_intensity, float p_strength, float p_mix, float p_bloom_threshold, RS::EnvironmentGlowBlendMode p_blend_mode, float p_hdr_bleed_threshold, float p_hdr_bleed_scale, float p_hdr_luminance_cap) = 0;
+	virtual void environment_glow_set_use_bicubic_upscale(bool p_enable) = 0;
 	virtual void environment_set_fog(RID p_env, bool p_enable, float p_begin, float p_end, RID p_gradient_texture) = 0;
 
 	virtual void environment_set_ssr(RID p_env, bool p_enable, int p_max_steps, float p_fade_int, float p_fade_out, float p_depth_tolerance, bool p_roughness) = 0;
diff --git a/servers/rendering/rasterizer_rd/rasterizer_scene_rd.cpp b/servers/rendering/rasterizer_rd/rasterizer_scene_rd.cpp
index 842f7046c9..517eea12f4 100644
--- a/servers/rendering/rasterizer_rd/rasterizer_scene_rd.cpp
+++ b/servers/rendering/rasterizer_rd/rasterizer_scene_rd.cpp
@@ -1211,7 +1211,7 @@ void RasterizerSceneRD::environment_set_tonemap(RID p_env, RS::EnvironmentToneMa
 	env->auto_exp_scale = p_auto_exp_scale;
 }
 
-void RasterizerSceneRD::environment_set_glow(RID p_env, bool p_enable, int p_level_flags, float p_intensity, float p_strength, float p_mix, float p_bloom_threshold, RS::EnvironmentGlowBlendMode p_blend_mode, float p_hdr_bleed_threshold, float p_hdr_bleed_scale, float p_hdr_luminance_cap, bool p_bicubic_upscale) {
+void RasterizerSceneRD::environment_set_glow(RID p_env, bool p_enable, int p_level_flags, float p_intensity, float p_strength, float p_mix, float p_bloom_threshold, RS::EnvironmentGlowBlendMode p_blend_mode, float p_hdr_bleed_threshold, float p_hdr_bleed_scale, float p_hdr_luminance_cap) {
 
 	Environent *env = environment_owner.getornull(p_env);
 	ERR_FAIL_COND(!env);
@@ -1225,7 +1225,10 @@ void RasterizerSceneRD::environment_set_glow(RID p_env, bool p_enable, int p_lev
 	env->glow_hdr_bleed_threshold = p_hdr_bleed_threshold;
 	env->glow_hdr_bleed_scale = p_hdr_bleed_scale;
 	env->glow_hdr_luminance_cap = p_hdr_luminance_cap;
-	env->glow_bicubic_upscale = p_bicubic_upscale;
+}
+
+void RasterizerSceneRD::environment_glow_set_use_bicubic_upscale(bool p_enable) {
+	glow_bicubic_upscale = p_enable;
 }
 
 void RasterizerSceneRD::environment_set_ssao(RID p_env, bool p_enable, float p_radius, float p_intensity, float p_bias, float p_light_affect, float p_ao_channel_affect, RS::EnvironmentSSAOBlur p_blur, float p_bilateral_sharpness) {
@@ -3339,7 +3342,7 @@ void RasterizerSceneRD::_render_buffers_post_process_and_tonemap(RID p_render_bu
 			tonemap.glow_level_flags = glow_mask;
 			tonemap.glow_texture_size.x = rb->blur[1].mipmaps[0].width;
 			tonemap.glow_texture_size.y = rb->blur[1].mipmaps[0].height;
-			tonemap.glow_use_bicubic_upscale = env->glow_bicubic_upscale;
+			tonemap.glow_use_bicubic_upscale = glow_bicubic_upscale;
 			tonemap.glow_texture = rb->blur[1].texture;
 		} else {
 			tonemap.glow_texture = storage->texture_rd_get_default(RasterizerStorageRD::DEFAULT_RD_TEXTURE_BLACK);
@@ -4008,6 +4011,7 @@ RasterizerSceneRD::RasterizerSceneRD(RasterizerStorageRD *p_storage) {
 	environment_set_ssao_quality(RS::EnvironmentSSAOQuality(int(GLOBAL_GET("rendering/quality/ssao/quality"))), GLOBAL_GET("rendering/quality/ssao/half_size"));
 	screen_space_roughness_limiter = GLOBAL_GET("rendering/quality/filters/screen_space_roughness_limiter");
 	screen_space_roughness_limiter_curve = GLOBAL_GET("rendering/quality/filters/screen_space_roughness_limiter_curve");
+	glow_bicubic_upscale = int(GLOBAL_GET("rendering/quality/glow/upscale_mode")) > 0;
 }
 
 RasterizerSceneRD::~RasterizerSceneRD() {
diff --git a/servers/rendering/rasterizer_rd/rasterizer_scene_rd.h b/servers/rendering/rasterizer_rd/rasterizer_scene_rd.h
index 0a1cc8ebd7..e26607aba5 100644
--- a/servers/rendering/rasterizer_rd/rasterizer_scene_rd.h
+++ b/servers/rendering/rasterizer_rd/rasterizer_scene_rd.h
@@ -646,7 +646,6 @@ private:
 		float glow_hdr_bleed_threshold = 1.0;
 		float glow_hdr_luminance_cap = 12.0;
 		float glow_hdr_bleed_scale = 2.0;
-		bool glow_bicubic_upscale = false;
 
 		/// SSAO
 
@@ -662,6 +661,7 @@ private:
 
 	RS::EnvironmentSSAOQuality ssao_quality = RS::ENV_SSAO_QUALITY_MEDIUM;
 	bool ssao_half_size = false;
+	bool glow_bicubic_upscale = false;
 
 	static uint64_t auto_exposure_counter;
 
@@ -827,7 +827,8 @@ public:
 
 	bool is_environment(RID p_env) const;
 
-	void environment_set_glow(RID p_env, bool p_enable, int p_level_flags, float p_intensity, float p_strength, float p_mix, float p_bloom_threshold, RS::EnvironmentGlowBlendMode p_blend_mode, float p_hdr_bleed_threshold, float p_hdr_bleed_scale, float p_hdr_luminance_cap, bool p_bicubic_upscale);
+	void environment_set_glow(RID p_env, bool p_enable, int p_level_flags, float p_intensity, float p_strength, float p_mix, float p_bloom_threshold, RS::EnvironmentGlowBlendMode p_blend_mode, float p_hdr_bleed_threshold, float p_hdr_bleed_scale, float p_hdr_luminance_cap);
+	void environment_glow_set_use_bicubic_upscale(bool p_enable);
 
 	void environment_set_fog(RID p_env, bool p_enable, float p_begin, float p_end, RID p_gradient_texture) {}
 
diff --git a/servers/rendering/rendering_server_raster.h b/servers/rendering/rendering_server_raster.h
index d69968868e..7c18bf91ce 100644
--- a/servers/rendering/rendering_server_raster.h
+++ b/servers/rendering/rendering_server_raster.h
@@ -527,7 +527,8 @@ public:
 	BIND9(environment_set_ssao, RID, bool, float, float, float, float, float, EnvironmentSSAOBlur, float)
 	BIND2(environment_set_ssao_quality, EnvironmentSSAOQuality, bool)
 
-	BIND12(environment_set_glow, RID, bool, int, float, float, float, float, EnvironmentGlowBlendMode, float, float, float, bool)
+	BIND11(environment_set_glow, RID, bool, int, float, float, float, float, EnvironmentGlowBlendMode, float, float, float)
+	BIND1(environment_glow_set_use_bicubic_upscale, bool)
 
 	BIND9(environment_set_tonemap, RID, EnvironmentToneMapper, float, float, bool, float, float, float, float)
 
diff --git a/servers/rendering/rendering_server_wrap_mt.h b/servers/rendering/rendering_server_wrap_mt.h
index ee4065094b..bcd1344f44 100644
--- a/servers/rendering/rendering_server_wrap_mt.h
+++ b/servers/rendering/rendering_server_wrap_mt.h
@@ -442,7 +442,8 @@ public:
 
 	FUNC2(environment_set_ssao_quality, EnvironmentSSAOQuality, bool)
 
-	FUNC12(environment_set_glow, RID, bool, int, float, float, float, float, EnvironmentGlowBlendMode, float, float, float, bool)
+	FUNC11(environment_set_glow, RID, bool, int, float, float, float, float, EnvironmentGlowBlendMode, float, float, float)
+	FUNC1(environment_glow_set_use_bicubic_upscale, bool)
 
 	FUNC9(environment_set_tonemap, RID, EnvironmentToneMapper, float, float, bool, float, float, float, float)
 
diff --git a/servers/rendering_server.cpp b/servers/rendering_server.cpp
index 084b8f7952..a960efb272 100644
--- a/servers/rendering_server.cpp
+++ b/servers/rendering_server.cpp
@@ -2355,6 +2355,10 @@ RenderingServer::RenderingServer() {
 	ProjectSettings::get_singleton()->set_custom_property_info("rendering/quality/filters/screen_space_roughness_limiter", PropertyInfo(Variant::INT, "rendering/quality/filters/screen_space_roughness_limiter", PROPERTY_HINT_ENUM, "Disabled,Enabled (Small Cost)"));
 	GLOBAL_DEF("rendering/quality/filters/screen_space_roughness_limiter_curve", 1.0);
 	ProjectSettings::get_singleton()->set_custom_property_info("rendering/quality/filters/screen_space_roughness_limiter_curve", PropertyInfo(Variant::FLOAT, "rendering/quality/filters/screen_space_roughness_limiter_curve", PROPERTY_HINT_EXP_EASING, "0.01,8,0.01"));
+
+	GLOBAL_DEF("rendering/quality/glow/upscale_mode", 1);
+	ProjectSettings::get_singleton()->set_custom_property_info("rendering/quality/glow/upscale_mode", PropertyInfo(Variant::INT, "rendering/quality/glow/upscale_mode", PROPERTY_HINT_ENUM, "Linear (Fast),Bicubic (Slower)"));
+	GLOBAL_DEF("rendering/quality/glow/upscale_mode.mobile", 0);
 }
 
 RenderingServer::~RenderingServer() {
diff --git a/servers/rendering_server.h b/servers/rendering_server.h
index 76f16bd7f6..702a66405a 100644
--- a/servers/rendering_server.h
+++ b/servers/rendering_server.h
@@ -733,7 +733,9 @@ public:
 		ENV_GLOW_BLEND_MODE_REPLACE,
 		ENV_GLOW_BLEND_MODE_MIX,
 	};
-	virtual void environment_set_glow(RID p_env, bool p_enable, int p_level_flags, float p_intensity, float p_strength, float p_mix, float p_bloom_threshold, EnvironmentGlowBlendMode p_blend_mode, float p_hdr_bleed_threshold, float p_hdr_bleed_scale, float p_hdr_luminance_cap, bool p_bicubic_upscale) = 0;
+	virtual void environment_set_glow(RID p_env, bool p_enable, int p_level_flags, float p_intensity, float p_strength, float p_mix, float p_bloom_threshold, EnvironmentGlowBlendMode p_blend_mode, float p_hdr_bleed_threshold, float p_hdr_bleed_scale, float p_hdr_luminance_cap) = 0;
+
+	virtual void environment_glow_set_use_bicubic_upscale(bool p_enable) = 0;
 
 	enum EnvironmentToneMapper {
 		ENV_TONE_MAPPER_LINEAR,