diff --git a/scene/3d/camera.cpp b/scene/3d/camera.cpp
index 80155a6d3..cbfa5b2a1 100644
--- a/scene/3d/camera.cpp
+++ b/scene/3d/camera.cpp
@@ -53,7 +53,7 @@ void Camera::_request_camera_update() {
 void Camera::fti_update_servers() {
 	if (camera.is_valid()) {
 		Transform tr = _get_adjusted_camera_transform(_get_cached_global_transform_interpolated());
-		VisualServer::get_singleton()->camera_set_transform(camera, tr);
+		RenderingServer::get_singleton()->camera_set_transform(camera, tr);
 	}
 }
 
diff --git a/scene/3d/visual_instance.cpp b/scene/3d/visual_instance.cpp
index 937b8874c..0bd2dc0cb 100644
--- a/scene/3d/visual_instance.cpp
+++ b/scene/3d/visual_instance.cpp
@@ -87,7 +87,7 @@ void VisualInstance::set_instance_use_identity_transform(bool p_enable) {
 
 void VisualInstance::fti_update_servers() {
 	if (!_is_using_identity_transform()) {
-		VisualServer::get_singleton()->instance_set_transform(get_instance(), _get_cached_global_transform_interpolated());
+		RenderingServer::get_singleton()->instance_set_transform(get_instance(), _get_cached_global_transform_interpolated());
 	}
 }
 
diff --git a/servers/rendering_server.cpp b/servers/rendering_server.cpp
index e327a18a0..b5472eaa5 100644
--- a/servers/rendering_server.cpp
+++ b/servers/rendering_server.cpp
@@ -1248,7 +1248,7 @@ bool RenderingServer::_mesh_find_format(RS::PrimitiveType p_primitive, const Arr
 }
 
 uint32_t RenderingServer::mesh_find_format_from_arrays(PrimitiveType p_primitive, const Array &p_arrays, const Array &p_blend_shapes, uint32_t p_compress_format) {
-	bool use_split_stream = GLOBAL_GET_CACHED(bool, "rendering/misc/mesh_storage/split_stream") && !(p_compress_format & rS::ARRAY_FLAG_USE_DYNAMIC_UPDATE);
+	bool use_split_stream = GLOBAL_GET_CACHED(bool, "rendering/misc/mesh_storage/split_stream") && !(p_compress_format & RS::ARRAY_FLAG_USE_DYNAMIC_UPDATE);
 
 	uint32_t offsets[RS::ARRAY_MAX];
 
@@ -1338,7 +1338,7 @@ void RenderingServer::mesh_add_surface_from_arrays(RID p_mesh, PrimitiveType p_p
 }
 
 Array RenderingServer::_get_array_from_surface(uint32_t p_format, PoolVector<uint8_t> p_vertex_data, int p_vertex_len, PoolVector<uint8_t> p_index_data, int p_index_len) const {
-	bool use_split_stream = GLOBAL_GET_CACHED(bool, "rendering/misc/mesh_storage/split_stream") && !(p_format & rS::ARRAY_FLAG_USE_DYNAMIC_UPDATE);
+	bool use_split_stream = GLOBAL_GET_CACHED(bool, "rendering/misc/mesh_storage/split_stream") && !(p_format & RS::ARRAY_FLAG_USE_DYNAMIC_UPDATE);
 
 	uint32_t offsets[ARRAY_MAX];
 	uint32_t strides[RS::ARRAY_MAX];