diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp
index 188a9f157..0b654d2df 100644
--- a/editor/editor_node.cpp
+++ b/editor/editor_node.cpp
@@ -184,9 +184,9 @@
 #include "scene/main/scene_tree.h"
 #include "scene/main/timer.h"
 #include "scene/main/viewport.h"
-#include "scene/resources/environment.h"
+#include "scene/resources/environment_3d.h"
 #include "scene/resources/packed_scene.h"
-#include "scene/resources/world.h"
+#include "scene/resources/world_3d.h"
 #include "servers/navigation_server.h"
 #include "servers/physics_2d_server.h"
 #include "servers/physics_server.h"
diff --git a/editor/plugins/material_editor_plugin.cpp b/editor/plugins/material_editor_plugin.cpp
index 6c14e76c0..4f32c774a 100644
--- a/editor/plugins/material_editor_plugin.cpp
+++ b/editor/plugins/material_editor_plugin.cpp
@@ -34,10 +34,10 @@
 #include "scene/gui/texture_button.h"
 #include "scene/gui/viewport_container.h"
 #include "scene/main/viewport.h"
-#include "scene/resources/environment.h"
+#include "scene/resources/environment_3d.h"
 #include "scene/resources/particles_material.h"
 #include "scene/resources/sky.h"
-#include "scene/resources/world.h"
+#include "scene/resources/world_3d.h"
 #include "core/object/class_db.h"
 #include "core/math/color.h"
 #include "core/error/error_macros.h"
diff --git a/editor/plugins/material_editor_plugin.h b/editor/plugins/material_editor_plugin.h
index 0b270243b..9821e1ac7 100644
--- a/editor/plugins/material_editor_plugin.h
+++ b/editor/plugins/material_editor_plugin.h
@@ -42,7 +42,7 @@
 #include "core/object/reference.h"
 #include "core/string/ustring.h"
 
-#include "scene/resources/environment.h"
+#include "scene/resources/environment_3d.h"
 
 class ViewportContainer;
 class Camera;
diff --git a/editor/plugins/mesh_editor_plugin.cpp b/editor/plugins/mesh_editor_plugin.cpp
index 1cb8461e2..f0a186b74 100644
--- a/editor/plugins/mesh_editor_plugin.cpp
+++ b/editor/plugins/mesh_editor_plugin.cpp
@@ -33,7 +33,7 @@
 #include "editor/editor_scale.h"
 #include "scene/gui/texture_button.h"
 #include "scene/main/viewport.h"
-#include "scene/resources/world.h"
+#include "scene/resources/world_3d.h"
 #include "scene/resources/mesh.h"
 #include "core/object/class_db.h"
 #include "core/math/color.h"
diff --git a/editor/plugins/spatial_editor_plugin.cpp b/editor/plugins/spatial_editor_plugin.cpp
index c703306fc..1be7fb8bc 100644
--- a/editor/plugins/spatial_editor_plugin.cpp
+++ b/editor/plugins/spatial_editor_plugin.cpp
@@ -89,7 +89,7 @@
 #include "scene/gui/viewport_container.h"
 #include "scene/main/scene_tree.h"
 #include "scene/main/viewport.h"
-#include "scene/resources/environment.h"
+#include "scene/resources/environment_3d.h"
 #include "scene/resources/font.h"
 #include "scene/resources/gradient.h"
 #include "scene/resources/packed_scene.h"
@@ -97,7 +97,7 @@
 #include "scene/resources/shape.h"
 #include "scene/resources/style_box.h"
 #include "scene/resources/surface_tool.h"
-#include "scene/resources/world.h"
+#include "scene/resources/world_3d.h"
 #include "servers/physics_server.h"
 
 #define DISTANCE_DEFAULT 4
diff --git a/editor/spatial_editor_gizmos.cpp b/editor/spatial_editor_gizmos.cpp
index 1fa9c2eef..3b74c281d 100644
--- a/editor/spatial_editor_gizmos.cpp
+++ b/editor/spatial_editor_gizmos.cpp
@@ -101,7 +101,7 @@
 #include "scene/resources/shape.h"
 #include "scene/resources/sphere_shape.h"
 #include "scene/resources/surface_tool.h"
-#include "scene/resources/world.h"
+#include "scene/resources/world_3d.h"
 #include "servers/rendering_server.h"
 
 #ifdef MODULE_SKELETON_3D_ENABLED
diff --git a/modules/props/prop_instance_merger.cpp b/modules/props/prop_instance_merger.cpp
index 7b2d4897a..ca1d8342c 100644
--- a/modules/props/prop_instance_merger.cpp
+++ b/modules/props/prop_instance_merger.cpp
@@ -4,7 +4,7 @@
 
 //#include "../thread_pool/thread_pool.h"
 
-#include "scene/resources/world.h"
+#include "scene/resources/world_3d.h"
 #include "servers/rendering_server.h"
 
 #include "core/config/engine.h"
diff --git a/modules/props/prop_instance_prop_job.cpp b/modules/props/prop_instance_prop_job.cpp
index 491d4f18e..c27145031 100644
--- a/modules/props/prop_instance_prop_job.cpp
+++ b/modules/props/prop_instance_prop_job.cpp
@@ -29,7 +29,7 @@ SOFTWARE.
 #include "prop_instance_merger.h"
 #include "prop_mesher.h"
 #include "scene/resources/shape.h"
-#include "scene/resources/world.h"
+#include "scene/resources/world_3d.h"
 #include "servers/physics_server.h"
 #include "singleton/prop_cache.h"
 
diff --git a/modules/props/tiled_wall/tiled_wall.cpp b/modules/props/tiled_wall/tiled_wall.cpp
index fa0ed9899..22cefb44c 100644
--- a/modules/props/tiled_wall/tiled_wall.cpp
+++ b/modules/props/tiled_wall/tiled_wall.cpp
@@ -13,7 +13,7 @@
 #include "../singleton/prop_cache.h"
 
 #include "core/core_string_names.h"
-#include "scene/resources/world.h"
+#include "scene/resources/world_3d.h"
 #include "servers/physics_server.h"
 #include "tiled_wall_data.h"
 
diff --git a/modules/skeleton_3d/resources/skeleton_modification_3d_jiggle.cpp b/modules/skeleton_3d/resources/skeleton_modification_3d_jiggle.cpp
index b01d8c780..04b05bbb4 100644
--- a/modules/skeleton_3d/resources/skeleton_modification_3d_jiggle.cpp
+++ b/modules/skeleton_3d/resources/skeleton_modification_3d_jiggle.cpp
@@ -32,7 +32,7 @@
 #include "../nodes/skeleton.h"
 #include "skeleton_modification_stack_3d.h"
 #include "servers/physics_server.h"
-#include "scene/resources/world.h"
+#include "scene/resources/world_3d.h"
 
 bool SkeletonModification3DJiggle::_set(const StringName &p_path, const Variant &p_value) {
 	String path = p_path;
diff --git a/modules/terraman/world/default/terrain_chunk_default.cpp b/modules/terraman/world/default/terrain_chunk_default.cpp
index 550102bd5..85c141081 100644
--- a/modules/terraman/world/default/terrain_chunk_default.cpp
+++ b/modules/terraman/world/default/terrain_chunk_default.cpp
@@ -38,7 +38,7 @@ SOFTWARE.
 #include "../jobs/terrain_light_job.h"
 #include "../jobs/terrain_prop_job.h"
 #include "../jobs/terrain_terrain_job.h"
-#include "scene/resources/world.h"
+#include "scene/resources/world_3d.h"
 
 const String TerrainChunkDefault::BINDING_STRING_BUILD_FLAGS = "Use Isolevel,Use Lighting,Use AO,Use RAO,Generate AO,Generate RAO,Bake Lights,Create Collider,Create Lods";
 
diff --git a/modules/terraman/world/jobs/terrain_prop_job.cpp b/modules/terraman/world/jobs/terrain_prop_job.cpp
index 69bd81425..a915d722d 100644
--- a/modules/terraman/world/jobs/terrain_prop_job.cpp
+++ b/modules/terraman/world/jobs/terrain_prop_job.cpp
@@ -31,7 +31,7 @@ SOFTWARE.
 #include "../../meshers/default/terrain_mesher_default.h"
 #include "../../meshers/terrain_mesher.h"
 #include "../default/terrain_chunk_default.h"
-#include "scene/resources/world.h"
+#include "scene/resources/world_3d.h"
 #include "servers/physics_server.h"
 
 #ifdef MESH_DATA_RESOURCE_PRESENT
diff --git a/modules/terraman/world/terrain_environment_data.cpp b/modules/terraman/world/terrain_environment_data.cpp
index 1c3aadc56..804604a05 100644
--- a/modules/terraman/world/terrain_environment_data.cpp
+++ b/modules/terraman/world/terrain_environment_data.cpp
@@ -22,7 +22,7 @@ SOFTWARE.
 
 #include "terrain_environment_data.h"
 
-#include "scene/resources/environment.h"
+#include "scene/resources/environment_3d.h"
 
 Ref<Environment3D> TerrainEnvironmentData::get_environment() {
 	return _environment;
diff --git a/modules/terraman/world/terrain_environment_data.h b/modules/terraman/world/terrain_environment_data.h
index 408bd7462..4daa929c3 100644
--- a/modules/terraman/world/terrain_environment_data.h
+++ b/modules/terraman/world/terrain_environment_data.h
@@ -29,7 +29,7 @@ SOFTWARE.
 
 #include "scene/3d/light.h"
 
-#include "scene/3d/world_environment.h"
+#include "scene/3d/world_environment_3d.h"
 #include "scene/main/node.h"
 
 class TerrainEnvironmentData : public Resource {
diff --git a/modules/terraman/world/terrain_world_editor.cpp b/modules/terraman/world/terrain_world_editor.cpp
index 9e029adef..056f688bf 100644
--- a/modules/terraman/world/terrain_world_editor.cpp
+++ b/modules/terraman/world/terrain_world_editor.cpp
@@ -33,7 +33,7 @@ SOFTWARE.
 
 #include "../library/terrain_library.h"
 #include "../library/terrain_surface.h"
-#include "scene/resources/world.h"
+#include "scene/resources/world_3d.h"
 #include "servers/physics_server.h"
 
 #include "../defines.h"
diff --git a/modules/terraman_2d/world/default/terrain_2d_chunk_default.cpp b/modules/terraman_2d/world/default/terrain_2d_chunk_default.cpp
index 1a2da5a62..e7f6780b6 100644
--- a/modules/terraman_2d/world/default/terrain_2d_chunk_default.cpp
+++ b/modules/terraman_2d/world/default/terrain_2d_chunk_default.cpp
@@ -38,7 +38,7 @@ SOFTWARE.
 #include "../jobs/terrain_2d_light_job.h"
 #include "../jobs/terrain_2d_prop_job.h"
 #include "../jobs/terrain_2d_terrain_job.h"
-#include "scene/resources/world.h"
+#include "scene/resources/world_3d.h"
 #include "scene/resources/world_2d.h"
 #include "servers/physics_2d_server.h"
 
diff --git a/modules/terraman_2d/world/terrain_2d_environment_data.cpp b/modules/terraman_2d/world/terrain_2d_environment_data.cpp
index 1543c0816..b2a3c5fc4 100644
--- a/modules/terraman_2d/world/terrain_2d_environment_data.cpp
+++ b/modules/terraman_2d/world/terrain_2d_environment_data.cpp
@@ -22,7 +22,7 @@ SOFTWARE.
 
 #include "terrain_2d_environment_data.h"
 
-#include "scene/resources/environment.h"
+#include "scene/resources/environment_3d.h"
 
 Ref<Environment3D> Terrain2DEnvironmentData::get_environment() {
 	return _environment;
diff --git a/modules/terraman_2d/world/terrain_2d_environment_data.h b/modules/terraman_2d/world/terrain_2d_environment_data.h
index e0ed44bc4..436e38bef 100644
--- a/modules/terraman_2d/world/terrain_2d_environment_data.h
+++ b/modules/terraman_2d/world/terrain_2d_environment_data.h
@@ -29,7 +29,7 @@ SOFTWARE.
 
 #include "scene/3d/light.h"
 
-#include "scene/3d/world_environment.h"
+#include "scene/3d/world_environment_3d.h"
 #include "scene/main/node.h"
 
 class Terrain2DEnvironmentData : public Resource {
diff --git a/modules/voxelman/world/default/voxel_chunk_default.cpp b/modules/voxelman/world/default/voxel_chunk_default.cpp
index 374ed9b03..d47ec5d65 100644
--- a/modules/voxelman/world/default/voxel_chunk_default.cpp
+++ b/modules/voxelman/world/default/voxel_chunk_default.cpp
@@ -38,7 +38,7 @@ SOFTWARE.
 #include "../jobs/voxel_light_job.h"
 #include "../jobs/voxel_prop_job.h"
 #include "../jobs/voxel_terrain_job.h"
-#include "scene/resources/world.h"
+#include "scene/resources/world_3d.h"
 
 const String VoxelChunkDefault::BINDING_STRING_BUILD_FLAGS = "Use Isolevel,Use Lighting,Use AO,Use RAO,Generate AO,Generate RAO,Bake Lights,Create Collider,Create Lods";
 
diff --git a/modules/voxelman/world/environment_data.cpp b/modules/voxelman/world/environment_data.cpp
index 2d38891da..0ac1fbdcd 100644
--- a/modules/voxelman/world/environment_data.cpp
+++ b/modules/voxelman/world/environment_data.cpp
@@ -22,7 +22,7 @@ SOFTWARE.
 
 #include "environment_data.h"
 
-#include "scene/resources/environment.h"
+#include "scene/resources/environment_3d.h"
 
 Ref<Environment3D> EnvironmentData::get_environment() {
 	return _environment;
diff --git a/modules/voxelman/world/environment_data.h b/modules/voxelman/world/environment_data.h
index 206f6c738..18a141087 100644
--- a/modules/voxelman/world/environment_data.h
+++ b/modules/voxelman/world/environment_data.h
@@ -31,7 +31,7 @@ SOFTWARE.
 
 #include "core/object/reference.h"
 
-#include "scene/3d/world_environment.h"
+#include "scene/3d/world_environment_3d.h"
 #include "scene/main/node.h"
 
 class Environment;
diff --git a/modules/voxelman/world/jobs/voxel_prop_job.cpp b/modules/voxelman/world/jobs/voxel_prop_job.cpp
index c9ad1cadd..cac44a5a7 100644
--- a/modules/voxelman/world/jobs/voxel_prop_job.cpp
+++ b/modules/voxelman/world/jobs/voxel_prop_job.cpp
@@ -32,7 +32,7 @@ SOFTWARE.
 
 #include "../../library/voxel_material_cache.h"
 #include "../default/voxel_chunk_default.h"
-#include "scene/resources/world.h"
+#include "scene/resources/world_3d.h"
 #include "servers/physics_server.h"
 
 #ifdef MESH_DATA_RESOURCE_PRESENT
diff --git a/modules/voxelman/world/voxel_world_editor.cpp b/modules/voxelman/world/voxel_world_editor.cpp
index 90b8798c6..5c88c5317 100644
--- a/modules/voxelman/world/voxel_world_editor.cpp
+++ b/modules/voxelman/world/voxel_world_editor.cpp
@@ -33,7 +33,7 @@ SOFTWARE.
 
 #include "../library/voxel_library.h"
 #include "../library/voxel_surface.h"
-#include "scene/resources/world.h"
+#include "scene/resources/world_3d.h"
 #include "servers/physics_server.h"
 
 #include "../defines.h"
diff --git a/scene/2d/area_2d.cpp b/scene/2d/area_2d.cpp
index 52a3036f7..74df018c7 100644
--- a/scene/2d/area_2d.cpp
+++ b/scene/2d/area_2d.cpp
@@ -29,7 +29,7 @@
 /*************************************************************************/
 
 #include "area_2d.h"
-#include "scene/resources/world.h"
+#include "scene/resources/world_3d.h"
 #include "scene/scene_string_names.h"
 #include "servers/audio_server.h"
 #include "servers/physics_2d_server.h"
diff --git a/scene/2d/canvas_item.cpp b/scene/2d/canvas_item.cpp
index 901481583..f2fac5402 100644
--- a/scene/2d/canvas_item.cpp
+++ b/scene/2d/canvas_item.cpp
@@ -38,7 +38,7 @@
 #include "scene/resources/font.h"
 #include "scene/resources/style_box.h"
 #include "scene/resources/texture.h"
-#include "scene/resources/world.h"
+#include "scene/resources/world_3d.h"
 #include "scene/resources/world_2d.h"
 #include "scene/scene_string_names.h"
 #include "servers/rendering/rendering_server_raster.h"
diff --git a/scene/3d/audio_stream_player_3d.cpp b/scene/3d/audio_stream_player_3d.cpp
index 92410b269..747ef6af2 100644
--- a/scene/3d/audio_stream_player_3d.cpp
+++ b/scene/3d/audio_stream_player_3d.cpp
@@ -36,7 +36,7 @@
 #include "scene/3d/spatial_velocity_tracker.h"
 #include "scene/main/viewport.h"
 #include "scene/resources/shape.h"
-#include "scene/resources/world.h"
+#include "scene/resources/world_3d.h"
 #include "servers/audio/audio_stream.h"
 #include "servers/physics_server.h"
 
diff --git a/scene/3d/camera.cpp b/scene/3d/camera.cpp
index 30c8e4d3b..f3bf18d8f 100644
--- a/scene/3d/camera.cpp
+++ b/scene/3d/camera.cpp
@@ -35,10 +35,10 @@
 #include "core/math/projection.h"
 #include "scene/3d/spatial_velocity_tracker.h"
 #include "scene/main/viewport.h"
-#include "scene/resources/environment.h"
+#include "scene/resources/environment_3d.h"
 #include "scene/resources/material.h"
 #include "scene/resources/surface_tool.h"
-#include "scene/resources/world.h"
+#include "scene/resources/world_3d.h"
 
 void Camera::_update_audio_listener_state() {
 }
diff --git a/scene/3d/collision_object.cpp b/scene/3d/collision_object.cpp
index c4d11272a..58d73409c 100644
--- a/scene/3d/collision_object.cpp
+++ b/scene/3d/collision_object.cpp
@@ -33,7 +33,7 @@
 #include "core/config/engine.h"
 #include "mesh_instance.h"
 #include "scene/resources/mesh.h"
-#include "scene/resources/world.h"
+#include "scene/resources/world_3d.h"
 #include "scene/scene_string_names.h"
 #include "servers/physics_server.h"
 
diff --git a/scene/3d/navigation_agent.cpp b/scene/3d/navigation_agent.cpp
index f7a79aa31..5146822db 100644
--- a/scene/3d/navigation_agent.cpp
+++ b/scene/3d/navigation_agent.cpp
@@ -33,7 +33,7 @@
 #include "core/config/engine.h"
 #include "core/math/geometry.h"
 #include "scene/3d/navigation.h"
-#include "scene/resources/world.h"
+#include "scene/resources/world_3d.h"
 #include "servers/navigation_server.h"
 
 void NavigationAgent::_bind_methods() {
diff --git a/scene/3d/navigation_mesh_instance.cpp b/scene/3d/navigation_mesh_instance.cpp
index 0cc9e782a..8ab2e654b 100644
--- a/scene/3d/navigation_mesh_instance.cpp
+++ b/scene/3d/navigation_mesh_instance.cpp
@@ -36,7 +36,7 @@
 #include "scene/resources/mesh.h"
 #include "scene/resources/navigation_mesh.h"
 #include "servers/navigation_server.h"
-#include "scene/resources/world.h"
+#include "scene/resources/world_3d.h"
 
 void NavigationMeshInstance::set_enabled(bool p_enabled) {
 	if (enabled == p_enabled) {
diff --git a/scene/3d/occluder.cpp b/scene/3d/occluder.cpp
index d8896e55c..273f14040 100644
--- a/scene/3d/occluder.cpp
+++ b/scene/3d/occluder.cpp
@@ -32,7 +32,7 @@
 
 #include "core/config/engine.h"
 #include "scene/resources/occluder_shape.h"
-#include "scene/resources/world.h"
+#include "scene/resources/world_3d.h"
 #include "servers/rendering/portals/portal_occlusion_culler.h"
 #include "servers/rendering_server.h"
 
diff --git a/scene/3d/portal.cpp b/scene/3d/portal.cpp
index 25f5d0aa0..f447c894c 100644
--- a/scene/3d/portal.cpp
+++ b/scene/3d/portal.cpp
@@ -37,7 +37,7 @@
 #include "room_manager.h"
 #include "scene/main/viewport.h"
 #include "scene/resources/mesh.h"
-#include "scene/resources/world.h"
+#include "scene/resources/world_3d.h"
 #include "servers/rendering_server.h"
 
 bool Portal::_portal_plane_convention = false;
diff --git a/scene/3d/ray_cast.cpp b/scene/3d/ray_cast.cpp
index 4f6e086fd..0f5f6b920 100644
--- a/scene/3d/ray_cast.cpp
+++ b/scene/3d/ray_cast.cpp
@@ -35,7 +35,7 @@
 #include "mesh_instance.h"
 #include "scene/resources/material.h"
 #include "scene/resources/mesh.h"
-#include "scene/resources/world.h"
+#include "scene/resources/world_3d.h"
 #include "servers/physics_server.h"
 
 void RayCast::set_cast_to(const Vector3 &p_point) {
diff --git a/scene/3d/room.cpp b/scene/3d/room.cpp
index 2e7ff73bb..934769d98 100644
--- a/scene/3d/room.cpp
+++ b/scene/3d/room.cpp
@@ -33,7 +33,7 @@
 #include "portal.h"
 #include "room_group.h"
 #include "room_manager.h"
-#include "scene/resources/world.h"
+#include "scene/resources/world_3d.h"
 #include "servers/rendering_server.h"
 
 void Room::SimplifyInfo::set_simplify(real_t p_value, real_t p_room_size) {
diff --git a/scene/3d/room_group.cpp b/scene/3d/room_group.cpp
index 4c290cf57..e5f7c5373 100644
--- a/scene/3d/room_group.cpp
+++ b/scene/3d/room_group.cpp
@@ -34,7 +34,7 @@
 #include "room.h"
 #include "room_manager.h"
 #include "scene/resources/mesh.h"
-#include "scene/resources/world.h"
+#include "scene/resources/world_3d.h"
 #include "servers/rendering_server.h"
 
 void RoomGroup::_bind_methods() {
diff --git a/scene/3d/room_manager.cpp b/scene/3d/room_manager.cpp
index 60702bbc6..9bc0ad077 100644
--- a/scene/3d/room_manager.cpp
+++ b/scene/3d/room_manager.cpp
@@ -45,7 +45,7 @@
 #include "scene/3d/light.h"
 #include "scene/3d/sprite_3d.h"
 #include "scene/resources/multimesh.h"
-#include "scene/resources/world.h"
+#include "scene/resources/world_3d.h"
 #include "visibility_notifier.h"
 
 #ifdef TOOLS_ENABLED
diff --git a/scene/3d/shape_cast.cpp b/scene/3d/shape_cast.cpp
index 8e181fc0d..a0bdb1070 100644
--- a/scene/3d/shape_cast.cpp
+++ b/scene/3d/shape_cast.cpp
@@ -36,7 +36,7 @@
 #include "scene/resources/concave_polygon_shape.h"
 #include "scene/resources/material.h"
 #include "scene/resources/mesh.h"
-#include "scene/resources/world.h"
+#include "scene/resources/world_3d.h"
 
 void ShapeCast::_notification(int p_what) {
 	switch (p_what) {
diff --git a/scene/3d/soft_body.cpp b/scene/3d/soft_body.cpp
index a13333361..d4b6ba264 100644
--- a/scene/3d/soft_body.cpp
+++ b/scene/3d/soft_body.cpp
@@ -36,7 +36,7 @@
 #include "scene/3d/collision_object.h"
 #include "scene/3d/physics_body.h"
 #include "scene/resources/mesh.h"
-#include "scene/resources/world.h"
+#include "scene/resources/world_3d.h"
 #include "servers/physics_server.h"
 
 SoftBodyRenderingServerHandler::SoftBodyRenderingServerHandler() {}
diff --git a/scene/3d/spatial.cpp b/scene/3d/spatial.cpp
index d3a75a8d3..f5020206f 100644
--- a/scene/3d/spatial.cpp
+++ b/scene/3d/spatial.cpp
@@ -35,7 +35,7 @@
 #include "core/object/message_queue.h"
 #include "scene/main/scene_tree.h"
 #include "scene/main/viewport.h"
-#include "scene/resources/world.h"
+#include "scene/resources/world_3d.h"
 #include "scene/scene_string_names.h"
 #include "servers/rendering_server_callbacks.h"
 
diff --git a/scene/3d/spring_arm.cpp b/scene/3d/spring_arm.cpp
index f334b1ba1..2549c18d4 100644
--- a/scene/3d/spring_arm.cpp
+++ b/scene/3d/spring_arm.cpp
@@ -33,7 +33,7 @@
 #include "scene/3d/collision_object.h"
 #include "scene/resources/shape.h"
 #include "scene/resources/sphere_shape.h"
-#include "scene/resources/world.h"
+#include "scene/resources/world_3d.h"
 #include "servers/physics_server.h"
 
 SpringArm::SpringArm() :
diff --git a/scene/3d/visibility_notifier.cpp b/scene/3d/visibility_notifier.cpp
index 1a9598f75..dbec00ef9 100644
--- a/scene/3d/visibility_notifier.cpp
+++ b/scene/3d/visibility_notifier.cpp
@@ -36,7 +36,7 @@
 #include "scene/animation/animation_player.h"
 #include "scene/animation/animation_tree.h"
 #include "scene/resources/shape.h"
-#include "scene/resources/world.h"
+#include "scene/resources/world_3d.h"
 #include "scene/scene_string_names.h"
 
 void VisibilityNotifier::_enter_camera(Camera *p_camera) {
diff --git a/scene/3d/visual_instance.cpp b/scene/3d/visual_instance.cpp
index 767324a70..1373557c7 100644
--- a/scene/3d/visual_instance.cpp
+++ b/scene/3d/visual_instance.cpp
@@ -31,7 +31,7 @@
 #include "visual_instance.h"
 
 #include "scene/resources/material.h"
-#include "scene/resources/world.h"
+#include "scene/resources/world_3d.h"
 #include "scene/scene_string_names.h"
 #include "servers/rendering_server.h"
 //#include "skeleton.h"
diff --git a/scene/3d/world_environment.cpp b/scene/3d/world_environment_3d.cpp
similarity index 98%
rename from scene/3d/world_environment.cpp
rename to scene/3d/world_environment_3d.cpp
index 2cd5e76ba..54de820d4 100644
--- a/scene/3d/world_environment.cpp
+++ b/scene/3d/world_environment_3d.cpp
@@ -28,12 +28,12 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "world_environment.h"
+#include "world_environment_3d.h"
 #include "scene/3d/spatial.h"
 #include "scene/main/viewport.h"
 
-#include "scene/resources/environment.h"
-#include "scene/resources/world.h"
+#include "scene/resources/environment_3d.h"
+#include "scene/resources/world_3d.h"
 
 void WorldEnvironment3D::_notification(int p_what) {
 	if (p_what == Spatial::NOTIFICATION_ENTER_WORLD || p_what == Spatial::NOTIFICATION_ENTER_TREE) {
diff --git a/scene/3d/world_environment.h b/scene/3d/world_environment_3d.h
similarity index 100%
rename from scene/3d/world_environment.h
rename to scene/3d/world_environment_3d.h
diff --git a/scene/main/scene_tree.cpp b/scene/main/scene_tree.cpp
index ada2e9707..ede9783ea 100644
--- a/scene/main/scene_tree.cpp
+++ b/scene/main/scene_tree.cpp
@@ -55,7 +55,7 @@
 
 #include "modules/modules_enabled.gen.h" // For freetype.
 #include "scene/resources/mesh.h"
-#include "scene/resources/world.h"
+#include "scene/resources/world_3d.h"
 #include "scene/resources/world_2d.h"
 
 #include <stdio.h>
diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp
index 7246aff72..c80ac80a2 100644
--- a/scene/main/viewport.cpp
+++ b/scene/main/viewport.cpp
@@ -41,7 +41,7 @@
 #include "scene/3d/collision_object.h"
 #include "scene/3d/listener.h"
 #include "scene/3d/spatial.h"
-#include "scene/3d/world_environment.h"
+#include "scene/3d/world_environment_3d.h"
 #include "scene/gui/control.h"
 #include "scene/gui/label.h"
 #include "scene/gui/menu_button.h"
@@ -53,7 +53,7 @@
 #include "scene/main/canvas_layer.h"
 #include "scene/main/timer.h"
 #include "scene/resources/mesh.h"
-#include "scene/resources/world.h"
+#include "scene/resources/world_3d.h"
 #include "scene/resources/world_2d.h"
 #include "scene/scene_string_names.h"
 #include "servers/physics_2d_server.h"
diff --git a/scene/register_scene_types.cpp b/scene/register_scene_types.cpp
index 1e69bddab..27bc2a655 100644
--- a/scene/register_scene_types.cpp
+++ b/scene/register_scene_types.cpp
@@ -70,7 +70,7 @@
 #include "scene/2d/y_sort.h"
 #include "scene/3d/label_3d.h"
 #include "scene/3d/spatial.h"
-#include "scene/3d/world_environment.h"
+#include "scene/3d/world_environment_3d.h"
 #include "scene/animation/animation_blend_space_1d.h"
 #include "scene/animation/animation_blend_space_2d.h"
 #include "scene/animation/animation_blend_tree.h"
@@ -172,7 +172,7 @@
 #include "scene/resources/text_file.h"
 #include "scene/resources/texture.h"
 #include "scene/resources/video_stream.h"
-#include "scene/resources/world.h"
+#include "scene/resources/world_3d.h"
 #include "scene/resources/world_2d.h"
 #include "scene/scene_string_names.h"
 
@@ -214,7 +214,7 @@
 #include "scene/3d/sprite_3d.h"
 #include "scene/3d/vehicle_body.h"
 #include "scene/3d/visibility_notifier.h"
-#include "scene/resources/environment.h"
+#include "scene/resources/environment_3d.h"
 #include "scene/resources/multimesh.h"
 #include "scene/resources/occluder_shape.h"
 #include "scene/resources/occluder_shape_polygon.h"
diff --git a/scene/resources/environment.cpp b/scene/resources/environment_3d.cpp
similarity index 99%
rename from scene/resources/environment.cpp
rename to scene/resources/environment_3d.cpp
index 1ed02c160..2abccdb87 100644
--- a/scene/resources/environment.cpp
+++ b/scene/resources/environment_3d.cpp
@@ -28,7 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "environment.h"
+#include "environment_3d.h"
 
 #include "core/config/project_settings.h"
 #include "scene/resources/sky.h"
diff --git a/scene/resources/environment.h b/scene/resources/environment_3d.h
similarity index 100%
rename from scene/resources/environment.h
rename to scene/resources/environment_3d.h
diff --git a/scene/resources/world.cpp b/scene/resources/world_3d.cpp
similarity index 99%
rename from scene/resources/world.cpp
rename to scene/resources/world_3d.cpp
index 6c01f8a79..37d643480 100644
--- a/scene/resources/world.cpp
+++ b/scene/resources/world_3d.cpp
@@ -28,7 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "world.h"
+#include "world_3d.h"
 
 #include "core/math/projection.h"
 #include "core/math/octree.h"
diff --git a/scene/resources/world.h b/scene/resources/world_3d.h
similarity index 98%
rename from scene/resources/world.h
rename to scene/resources/world_3d.h
index 939768150..716e42134 100644
--- a/scene/resources/world.h
+++ b/scene/resources/world_3d.h
@@ -32,7 +32,7 @@
 /*************************************************************************/
 
 #include "core/object/resource.h"
-#include "scene/resources/environment.h"
+#include "scene/resources/environment_3d.h"
 #include "servers/physics_server.h"
 #include "servers/rendering_server.h"