From 496a3749d7fd855a5e7240bc2266a7f735107091 Mon Sep 17 00:00:00 2001
From: Aras Pranckevicius <aras@nesnausk.org>
Date: Tue, 17 Dec 2024 11:39:04 +0100
Subject: [PATCH] Cleanup: rename namespace realtime_compositor->compositor

Pull Request: https://projects.blender.org/blender/blender/pulls/132008
---
 source/blender/blenkernel/BKE_node.hh         | 11 +--
 .../blender/compositor/COM_compile_state.hh   |  4 +-
 source/blender/compositor/COM_compositor.hh   |  8 +-
 source/blender/compositor/COM_context.hh      |  4 +-
 .../compositor/COM_conversion_operation.hh    |  4 +-
 source/blender/compositor/COM_domain.hh       |  4 +-
 source/blender/compositor/COM_evaluator.hh    |  4 +-
 .../compositor/COM_input_descriptor.hh        |  4 +-
 .../COM_input_single_value_operation.hh       |  4 +-
 source/blender/compositor/COM_meta_data.hh    |  4 +-
 .../COM_multi_function_procedure_operation.hh |  4 +-
 .../blender/compositor/COM_node_operation.hh  |  4 +-
 source/blender/compositor/COM_operation.hh    |  4 +-
 .../blender/compositor/COM_pixel_operation.hh |  4 +-
 source/blender/compositor/COM_profiler.hh     |  4 +-
 .../COM_realize_on_domain_operation.hh        |  4 +-
 .../COM_reduce_to_single_value_operation.hh   |  4 +-
 .../blender/compositor/COM_render_context.hh  |  4 +-
 source/blender/compositor/COM_result.hh       |  4 +-
 source/blender/compositor/COM_scheduler.hh    |  4 +-
 source/blender/compositor/COM_shader_node.hh  |  4 +-
 .../compositor/COM_shader_operation.hh        |  4 +-
 .../compositor/COM_simple_operation.hh        |  4 +-
 .../compositor/COM_static_cache_manager.hh    |  4 +-
 source/blender/compositor/COM_texture_pool.hh |  4 +-
 source/blender/compositor/COM_utilities.hh    |  4 +-
 .../COM_algorithm_compute_preview.hh          |  4 +-
 .../COM_algorithm_deriche_gaussian_blur.hh    |  4 +-
 .../algorithms/COM_algorithm_extract_alpha.hh |  4 +-
 .../algorithms/COM_algorithm_gamma_correct.hh |  4 +-
 .../algorithms/COM_algorithm_jump_flooding.hh |  4 +-
 .../COM_algorithm_morphological_blur.hh       |  4 +-
 .../COM_algorithm_morphological_distance.hh   |  4 +-
 ...lgorithm_morphological_distance_feather.hh |  4 +-
 .../COM_algorithm_parallel_reduction.hh       |  4 +-
 .../COM_algorithm_realize_on_domain.hh        |  4 +-
 .../COM_algorithm_recursive_gaussian_blur.hh  |  4 +-
 .../algorithms/COM_algorithm_smaa.hh          |  4 +-
 .../COM_algorithm_summed_area_table.hh        |  4 +-
 .../COM_algorithm_symmetric_separable_blur.hh |  4 +-
 ..._symmetric_separable_blur_variable_size.hh |  4 +-
 .../algorithms/COM_algorithm_transform.hh     |  4 +-
 .../COM_algorithm_van_vliet_gaussian_blur.hh  |  4 +-
 .../algorithms/intern/compute_preview.cc      |  4 +-
 .../intern/deriche_gaussian_blur.cc           |  4 +-
 .../algorithms/intern/extract_alpha.cc        |  4 +-
 .../algorithms/intern/gamma_correct.cc        |  4 +-
 .../algorithms/intern/jump_flooding.cc        |  4 +-
 .../algorithms/intern/morphological_blur.cc   |  4 +-
 .../intern/morphological_distance.cc          |  4 +-
 .../intern/morphological_distance_feather.cc  |  4 +-
 .../algorithms/intern/parallel_reduction.cc   |  4 +-
 .../algorithms/intern/realize_on_domain.cc    |  4 +-
 .../intern/recursive_gaussian_blur.cc         |  4 +-
 .../compositor/algorithms/intern/smaa.cc      |  4 +-
 .../algorithms/intern/summed_area_table.cc    |  4 +-
 .../intern/symmetric_separable_blur.cc        |  4 +-
 .../symmetric_separable_blur_variable_size.cc |  4 +-
 .../compositor/algorithms/intern/transform.cc |  4 +-
 .../intern/van_vliet_gaussian_blur.cc         |  4 +-
 .../cached_resources/COM_bokeh_kernel.hh      |  4 +-
 .../cached_resources/COM_cached_image.hh      |  4 +-
 .../cached_resources/COM_cached_mask.hh       |  4 +-
 .../cached_resources/COM_cached_resource.hh   |  4 +-
 .../cached_resources/COM_cached_shader.hh     |  4 +-
 .../cached_resources/COM_cached_texture.hh    |  4 +-
 .../COM_deriche_gaussian_coefficients.hh      |  4 +-
 .../cached_resources/COM_distortion_grid.hh   |  4 +-
 .../cached_resources/COM_fog_glow_kernel.hh   |  4 +-
 .../cached_resources/COM_keying_screen.hh     |  4 +-
 ..._morphological_distance_feather_weights.hh |  4 +-
 .../COM_ocio_color_space_conversion_shader.hh |  4 +-
 .../COM_smaa_precomputed_textures.hh          |  4 +-
 .../COM_symmetric_blur_weights.hh             |  4 +-
 .../COM_symmetric_separable_blur_weights.hh   |  4 +-
 .../COM_van_vliet_gaussian_coefficients.hh    |  4 +-
 .../cached_resources/intern/bokeh_kernel.cc   |  4 +-
 .../cached_resources/intern/cached_image.cc   |  4 +-
 .../cached_resources/intern/cached_mask.cc    |  4 +-
 .../cached_resources/intern/cached_shader.cc  |  4 +-
 .../cached_resources/intern/cached_texture.cc |  4 +-
 .../intern/deriche_gaussian_coefficients.cc   |  4 +-
 .../intern/distortion_grid.cc                 |  4 +-
 .../intern/fog_glow_kernel.cc                 |  4 +-
 .../cached_resources/intern/keying_screen.cc  |  4 +-
 .../morphological_distance_feather_weights.cc |  4 +-
 .../ocio_color_space_conversion_shader.cc     |  4 +-
 .../intern/smaa_precomputed_textures.cc       |  4 +-
 .../intern/symmetric_blur_weights.cc          |  4 +-
 .../symmetric_separable_blur_weights.cc       |  4 +-
 .../intern/van_vliet_gaussian_coefficients.cc |  4 +-
 .../compositor/intern/COM_compositor.cc       |  4 +-
 .../compositor/intern/compile_state.cc        |  4 +-
 source/blender/compositor/intern/context.cc   |  4 +-
 .../compositor/intern/conversion_operation.cc |  4 +-
 source/blender/compositor/intern/domain.cc    |  4 +-
 source/blender/compositor/intern/evaluator.cc |  4 +-
 .../intern/input_single_value_operation.cc    |  4 +-
 source/blender/compositor/intern/meta_data.cc |  4 +-
 .../multi_function_procedure_operation.cc     |  4 +-
 .../compositor/intern/node_operation.cc       |  6 +-
 source/blender/compositor/intern/operation.cc |  4 +-
 .../compositor/intern/pixel_operation.cc      |  6 +-
 source/blender/compositor/intern/profiler.cc  |  4 +-
 .../intern/realize_on_domain_operation.cc     |  4 +-
 .../reduce_to_single_value_operation.cc       |  4 +-
 .../compositor/intern/render_context.cc       |  4 +-
 source/blender/compositor/intern/result.cc    |  4 +-
 source/blender/compositor/intern/scheduler.cc |  4 +-
 .../blender/compositor/intern/shader_node.cc  |  4 +-
 .../compositor/intern/shader_operation.cc     |  4 +-
 .../compositor/intern/simple_operation.cc     |  4 +-
 .../compositor/intern/static_cache_manager.cc |  4 +-
 .../blender/compositor/intern/texture_pool.cc |  4 +-
 source/blender/compositor/intern/utilities.cc |  4 +-
 .../utilities/COM_utilities_diagonals.hh      |  4 +-
 .../engines/compositor/compositor_engine.cc   | 57 ++++++------
 .../blender/editors/space_node/node_edit.cc   |  2 +-
 source/blender/nodes/NOD_composite.hh         |  8 +-
 source/blender/nodes/NOD_node_declaration.hh  | 10 +--
 .../nodes/composite/node_composite_tree.cc    |  4 +-
 .../nodes/node_composite_alpha_over.cc        |  2 +-
 .../nodes/node_composite_antialiasing.cc      |  2 +-
 .../nodes/node_composite_bilateralblur.cc     |  2 +-
 .../composite/nodes/node_composite_blur.cc    |  2 +-
 .../nodes/node_composite_bokehblur.cc         |  2 +-
 .../nodes/node_composite_bokehimage.cc        |  2 +-
 .../composite/nodes/node_composite_boxmask.cc |  2 +-
 .../nodes/node_composite_brightness.cc        |  2 +-
 .../nodes/node_composite_channel_matte.cc     |  2 +-
 .../nodes/node_composite_chroma_matte.cc      |  2 +-
 .../nodes/node_composite_color_matte.cc       |  2 +-
 .../nodes/node_composite_color_spill.cc       |  2 +-
 .../nodes/node_composite_colorbalance.cc      |  2 +-
 .../nodes/node_composite_colorcorrection.cc   |  2 +-
 .../nodes/node_composite_composite.cc         |  2 +-
 .../node_composite_convert_color_space.cc     |  2 +-
 .../nodes/node_composite_cornerpin.cc         |  2 +-
 .../composite/nodes/node_composite_crop.cc    |  2 +-
 .../nodes/node_composite_cryptomatte.cc       |  6 +-
 .../composite/nodes/node_composite_curves.cc  |  6 +-
 .../composite/nodes/node_composite_defocus.cc |  2 +-
 .../composite/nodes/node_composite_denoise.cc |  2 +-
 .../nodes/node_composite_despeckle.cc         |  2 +-
 .../nodes/node_composite_diff_matte.cc        |  2 +-
 .../composite/nodes/node_composite_dilate.cc  |  2 +-
 .../nodes/node_composite_directionalblur.cc   |  2 +-
 .../nodes/node_composite_displace.cc          |  2 +-
 .../nodes/node_composite_distance_matte.cc    |  2 +-
 .../nodes/node_composite_double_edge_mask.cc  |  2 +-
 .../nodes/node_composite_ellipsemask.cc       |  2 +-
 .../nodes/node_composite_exposure.cc          |  2 +-
 .../nodes/node_composite_file_output.cc       |  2 +-
 .../composite/nodes/node_composite_filter.cc  |  2 +-
 .../composite/nodes/node_composite_flip.cc    |  2 +-
 .../composite/nodes/node_composite_gamma.cc   |  2 +-
 .../composite/nodes/node_composite_glare.cc   |  2 +-
 .../nodes/node_composite_hue_sat_val.cc       |  2 +-
 .../nodes/node_composite_huecorrect.cc        |  2 +-
 .../composite/nodes/node_composite_id_mask.cc |  2 +-
 .../composite/nodes/node_composite_image.cc   |  4 +-
 .../composite/nodes/node_composite_inpaint.cc |  2 +-
 .../composite/nodes/node_composite_invert.cc  |  2 +-
 .../composite/nodes/node_composite_keying.cc  |  2 +-
 .../nodes/node_composite_keyingscreen.cc      |  2 +-
 .../nodes/node_composite_kuwahara.cc          |  2 +-
 .../nodes/node_composite_lensdist.cc          |  2 +-
 .../composite/nodes/node_composite_levels.cc  |  2 +-
 .../nodes/node_composite_luma_matte.cc        |  2 +-
 .../nodes/node_composite_map_range.cc         |  2 +-
 .../composite/nodes/node_composite_map_uv.cc  |  2 +-
 .../nodes/node_composite_map_value.cc         |  2 +-
 .../composite/nodes/node_composite_mask.cc    |  2 +-
 .../composite/nodes/node_composite_math.cc    |  2 +-
 .../composite/nodes/node_composite_mixrgb.cc  |  2 +-
 .../nodes/node_composite_movieclip.cc         |  2 +-
 .../nodes/node_composite_moviedistortion.cc   |  2 +-
 .../composite/nodes/node_composite_normal.cc  |  2 +-
 .../nodes/node_composite_normalize.cc         |  2 +-
 .../nodes/node_composite_pixelate.cc          |  2 +-
 .../nodes/node_composite_planetrackdeform.cc  |  2 +-
 .../nodes/node_composite_posterize.cc         |  2 +-
 .../nodes/node_composite_premulkey.cc         |  2 +-
 .../composite/nodes/node_composite_rgb.cc     |  2 +-
 .../composite/nodes/node_composite_rotate.cc  |  2 +-
 .../composite/nodes/node_composite_scale.cc   |  2 +-
 .../nodes/node_composite_scene_time.cc        |  2 +-
 .../nodes/node_composite_sepcomb_color.cc     |  4 +-
 .../nodes/node_composite_sepcomb_hsva.cc      |  4 +-
 .../nodes/node_composite_sepcomb_rgba.cc      |  4 +-
 .../nodes/node_composite_sepcomb_xyz.cc       |  4 +-
 .../nodes/node_composite_sepcomb_ycca.cc      |  4 +-
 .../nodes/node_composite_sepcomb_yuva.cc      |  4 +-
 .../nodes/node_composite_setalpha.cc          |  2 +-
 .../composite/nodes/node_composite_split.cc   |  2 +-
 .../nodes/node_composite_stabilize2d.cc       |  2 +-
 .../nodes/node_composite_sunbeams.cc          |  2 +-
 .../composite/nodes/node_composite_switch.cc  |  2 +-
 .../nodes/node_composite_switchview.cc        |  2 +-
 .../composite/nodes/node_composite_texture.cc |  2 +-
 .../composite/nodes/node_composite_tonemap.cc |  2 +-
 .../nodes/node_composite_trackpos.cc          |  2 +-
 .../nodes/node_composite_transform.cc         |  2 +-
 .../nodes/node_composite_translate.cc         |  2 +-
 .../nodes/node_composite_val_to_rgb.cc        |  4 +-
 .../composite/nodes/node_composite_value.cc   |  2 +-
 .../nodes/node_composite_vec_blur.cc          |  2 +-
 .../composite/nodes/node_composite_viewer.cc  |  2 +-
 .../nodes/node_composite_zcombine.cc          |  2 +-
 source/blender/render/RE_compositor.hh        |  8 +-
 source/blender/render/intern/compositor.cc    | 89 +++++++++----------
 source/blender/render/intern/pipeline.cc      |  2 +-
 source/blender/render/intern/render_types.h   | 16 ++--
 213 files changed, 435 insertions(+), 440 deletions(-)

diff --git a/source/blender/blenkernel/BKE_node.hh b/source/blender/blenkernel/BKE_node.hh
index 415fa24ffa8..b48acc88ca5 100644
--- a/source/blender/blenkernel/BKE_node.hh
+++ b/source/blender/blenkernel/BKE_node.hh
@@ -77,11 +77,11 @@ namespace inverse_eval {
 class InverseEvalParams;
 }  // namespace inverse_eval
 }  // namespace nodes
-namespace realtime_compositor {
+namespace compositor {
 class Context;
 class NodeOperation;
 class ShaderNode;
-}  // namespace realtime_compositor
+}  // namespace compositor
 }  // namespace blender
 
 namespace blender::bke {
@@ -133,10 +133,11 @@ using NodeGatherSocketLinkOperationsFunction =
 using NodeGatherAddOperationsFunction =
     void (*)(blender::nodes::GatherAddNodeSearchParams &params);
 
-using NodeGetCompositorOperationFunction = blender::realtime_compositor::NodeOperation
-    *(*)(blender::realtime_compositor::Context &context, blender::nodes::DNode node);
+using NodeGetCompositorOperationFunction =
+    blender::compositor::NodeOperation *(*)(blender::compositor::Context &context,
+                                            blender::nodes::DNode node);
 using NodeGetCompositorShaderNodeFunction =
-    blender::realtime_compositor::ShaderNode *(*)(blender::nodes::DNode node);
+    blender::compositor::ShaderNode *(*)(blender::nodes::DNode node);
 using NodeExtraInfoFunction = void (*)(blender::nodes::NodeExtraInfoParams &params);
 using NodeInverseElemEvalFunction =
     void (*)(blender::nodes::value_elem::InverseElemEvalParams &params);
diff --git a/source/blender/compositor/COM_compile_state.hh b/source/blender/compositor/COM_compile_state.hh
index 9ce58c02d43..b5ae04b7959 100644
--- a/source/blender/compositor/COM_compile_state.hh
+++ b/source/blender/compositor/COM_compile_state.hh
@@ -13,7 +13,7 @@
 #include "COM_pixel_operation.hh"
 #include "COM_scheduler.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 using namespace nodes::derived_node_tree_types;
 
@@ -174,4 +174,4 @@ class CompileState {
   Domain compute_pixel_node_domain(DNode node);
 };
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/COM_compositor.hh b/source/blender/compositor/COM_compositor.hh
index 8da06d95e52..cd644a6a78e 100644
--- a/source/blender/compositor/COM_compositor.hh
+++ b/source/blender/compositor/COM_compositor.hh
@@ -7,10 +7,10 @@
 #include "DNA_color_types.h"
 #include "DNA_node_types.h"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 class RenderContext;
 class Profiler;
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
 
 struct Render;
 
@@ -52,8 +52,8 @@ void COM_execute(Render *render,
                  Scene *scene,
                  bNodeTree *node_tree,
                  const char *view_name,
-                 blender::realtime_compositor::RenderContext *render_context,
-                 blender::realtime_compositor::Profiler *profiler);
+                 blender::compositor::RenderContext *render_context,
+                 blender::compositor::Profiler *profiler);
 
 /**
  * \brief Deinitialize the compositor caches and allocated memory.
diff --git a/source/blender/compositor/COM_context.hh b/source/blender/compositor/COM_context.hh
index 1aee853008a..bcefe4e9f1f 100644
--- a/source/blender/compositor/COM_context.hh
+++ b/source/blender/compositor/COM_context.hh
@@ -22,7 +22,7 @@
 #include "COM_static_cache_manager.hh"
 #include "COM_texture_pool.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 /* ------------------------------------------------------------------------------------------------
  * Context
@@ -177,4 +177,4 @@ class Context {
   StaticCacheManager &cache_manager();
 };
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/COM_conversion_operation.hh b/source/blender/compositor/COM_conversion_operation.hh
index 0b432928674..f50daf13834 100644
--- a/source/blender/compositor/COM_conversion_operation.hh
+++ b/source/blender/compositor/COM_conversion_operation.hh
@@ -11,7 +11,7 @@
 #include "COM_result.hh"
 #include "COM_simple_operation.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 /* --------------------------------------------------------------------
  * Conversion Operation
@@ -141,4 +141,4 @@ class ConvertVectorToColorOperation : public ConversionOperation {
   GPUShader *get_conversion_shader() const override;
 };
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/COM_domain.hh b/source/blender/compositor/COM_domain.hh
index 474815e3e8d..c09edf6c1ad 100644
--- a/source/blender/compositor/COM_domain.hh
+++ b/source/blender/compositor/COM_domain.hh
@@ -9,7 +9,7 @@
 #include "BLI_math_matrix_types.hh"
 #include "BLI_math_vector_types.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 /* Possible interpolations to use when realizing an input result of some domain on another domain.
  * See the RealizationOptions struct for more information. */
@@ -165,4 +165,4 @@ bool operator==(const Domain &a, const Domain &b);
 /* Inverse of the above equality operator. */
 bool operator!=(const Domain &a, const Domain &b);
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/COM_evaluator.hh b/source/blender/compositor/COM_evaluator.hh
index 9cef96c0bc3..40c922f1f6b 100644
--- a/source/blender/compositor/COM_evaluator.hh
+++ b/source/blender/compositor/COM_evaluator.hh
@@ -18,7 +18,7 @@
 #include "COM_operation.hh"
 #include "COM_shader_operation.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 using namespace nodes::derived_node_tree_types;
 
@@ -176,4 +176,4 @@ class Evaluator {
   void cancel_evaluation();
 };
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/COM_input_descriptor.hh b/source/blender/compositor/COM_input_descriptor.hh
index e0b2d9a938d..c6ae8ef7f45 100644
--- a/source/blender/compositor/COM_input_descriptor.hh
+++ b/source/blender/compositor/COM_input_descriptor.hh
@@ -6,7 +6,7 @@
 
 #include "COM_result.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 /* ------------------------------------------------------------------------------------------------
  * Input Realization Options
@@ -42,4 +42,4 @@ class InputDescriptor {
   bool expects_single_value = false;
 };
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/COM_input_single_value_operation.hh b/source/blender/compositor/COM_input_single_value_operation.hh
index 1625b4514b1..8225f615814 100644
--- a/source/blender/compositor/COM_input_single_value_operation.hh
+++ b/source/blender/compositor/COM_input_single_value_operation.hh
@@ -12,7 +12,7 @@
 #include "COM_operation.hh"
 #include "COM_result.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 using namespace nodes::derived_node_tree_types;
 
@@ -45,4 +45,4 @@ class InputSingleValueOperation : public Operation {
   void populate_result(Result result);
 };
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/COM_meta_data.hh b/source/blender/compositor/COM_meta_data.hh
index a7dc75aabbb..3731f61dbef 100644
--- a/source/blender/compositor/COM_meta_data.hh
+++ b/source/blender/compositor/COM_meta_data.hh
@@ -6,7 +6,7 @@
 
 #pragma once
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 /* ------------------------------------------------------------------------------------------------
  * Cryptomatte Meta Data
@@ -41,4 +41,4 @@ struct MetaData {
   bool is_cryptomatte_layer() const;
 };
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/COM_multi_function_procedure_operation.hh b/source/blender/compositor/COM_multi_function_procedure_operation.hh
index 0f5a7a52d4b..73ac06d9375 100644
--- a/source/blender/compositor/COM_multi_function_procedure_operation.hh
+++ b/source/blender/compositor/COM_multi_function_procedure_operation.hh
@@ -23,7 +23,7 @@
 #include "COM_pixel_operation.hh"
 #include "COM_scheduler.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 using namespace nodes::derived_node_tree_types;
 
@@ -107,4 +107,4 @@ class MultiFunctionProcedureOperation : public PixelOperation {
   void populate_operation_result(DOutputSocket output_socket, mf::Variable *variable);
 };
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/COM_node_operation.hh b/source/blender/compositor/COM_node_operation.hh
index a68c15128f0..06b26385612 100644
--- a/source/blender/compositor/COM_node_operation.hh
+++ b/source/blender/compositor/COM_node_operation.hh
@@ -15,7 +15,7 @@
 #include "COM_result.hh"
 #include "COM_scheduler.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 using namespace nodes::derived_node_tree_types;
 
@@ -70,4 +70,4 @@ class NodeOperation : public Operation {
   Result *get_preview_result();
 };
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/COM_operation.hh b/source/blender/compositor/COM_operation.hh
index 976a08c9b51..93556bbb405 100644
--- a/source/blender/compositor/COM_operation.hh
+++ b/source/blender/compositor/COM_operation.hh
@@ -17,7 +17,7 @@
 #include "COM_result.hh"
 #include "COM_texture_pool.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 class SimpleOperation;
 
@@ -186,4 +186,4 @@ class Operation {
   void release_unneeded_results();
 };
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/COM_pixel_operation.hh b/source/blender/compositor/COM_pixel_operation.hh
index 0bdbabe6345..977cb2f193b 100644
--- a/source/blender/compositor/COM_pixel_operation.hh
+++ b/source/blender/compositor/COM_pixel_operation.hh
@@ -14,7 +14,7 @@
 #include "COM_operation.hh"
 #include "COM_scheduler.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 using namespace nodes::derived_node_tree_types;
 
@@ -142,4 +142,4 @@ class PixelOperation : public Operation {
   void release_inputs() override;
 };
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/COM_profiler.hh b/source/blender/compositor/COM_profiler.hh
index 3de221ccdea..1ae05d5708c 100644
--- a/source/blender/compositor/COM_profiler.hh
+++ b/source/blender/compositor/COM_profiler.hh
@@ -11,7 +11,7 @@
 
 #include "NOD_derived_node_tree.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 class Context;
 
@@ -46,4 +46,4 @@ class Profiler {
                                                   bNodeInstanceKey instance_key);
 };
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/COM_realize_on_domain_operation.hh b/source/blender/compositor/COM_realize_on_domain_operation.hh
index 001437a86b4..dc6c7624578 100644
--- a/source/blender/compositor/COM_realize_on_domain_operation.hh
+++ b/source/blender/compositor/COM_realize_on_domain_operation.hh
@@ -12,7 +12,7 @@
 #include "COM_result.hh"
 #include "COM_simple_operation.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 /* ------------------------------------------------------------------------------------------------
  * Realize On Domain Operation
@@ -44,4 +44,4 @@ class RealizeOnDomainOperation : public SimpleOperation {
   Domain compute_domain() override;
 };
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/COM_reduce_to_single_value_operation.hh b/source/blender/compositor/COM_reduce_to_single_value_operation.hh
index 79c363efc3b..dd26a32246e 100644
--- a/source/blender/compositor/COM_reduce_to_single_value_operation.hh
+++ b/source/blender/compositor/COM_reduce_to_single_value_operation.hh
@@ -8,7 +8,7 @@
 #include "COM_result.hh"
 #include "COM_simple_operation.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 /* ------------------------------------------------------------------------------------------------
  * Reduce To Single Value Operation
@@ -30,4 +30,4 @@ class ReduceToSingleValueOperation : public SimpleOperation {
   static SimpleOperation *construct_if_needed(Context &context, const Result &input_result);
 };
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/COM_render_context.hh b/source/blender/compositor/COM_render_context.hh
index 206c022883f..62fe09acc19 100644
--- a/source/blender/compositor/COM_render_context.hh
+++ b/source/blender/compositor/COM_render_context.hh
@@ -14,7 +14,7 @@
 
 struct RenderResult;
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 /* ------------------------------------------------------------------------------------------------
  * File Output
@@ -119,4 +119,4 @@ class RenderContext {
   void save_file_outputs(Scene *scene);
 };
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/COM_result.hh b/source/blender/compositor/COM_result.hh
index 59e7a80001f..b093c6a521f 100644
--- a/source/blender/compositor/COM_result.hh
+++ b/source/blender/compositor/COM_result.hh
@@ -20,7 +20,7 @@
 #include "COM_domain.hh"
 #include "COM_meta_data.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 class Context;
 
@@ -1024,4 +1024,4 @@ inline void Result::copy_pixel(float *target, const float *source) const
   }
 }
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/COM_scheduler.hh b/source/blender/compositor/COM_scheduler.hh
index d37bbd21a2c..c18a91982b7 100644
--- a/source/blender/compositor/COM_scheduler.hh
+++ b/source/blender/compositor/COM_scheduler.hh
@@ -10,7 +10,7 @@
 
 #include "COM_context.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 using namespace nodes::derived_node_tree_types;
 
@@ -22,4 +22,4 @@ using Schedule = VectorSet<DNode>;
  * traversal of dependencies based on a heuristic estimation of the number of needed buffers. */
 Schedule compute_schedule(const Context &context, const DerivedNodeTree &tree);
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/COM_shader_node.hh b/source/blender/compositor/COM_shader_node.hh
index fd3f49d32d1..94bb7dccbe6 100644
--- a/source/blender/compositor/COM_shader_node.hh
+++ b/source/blender/compositor/COM_shader_node.hh
@@ -13,7 +13,7 @@
 
 #include "NOD_derived_node_tree.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 using namespace nodes::derived_node_tree_types;
 
@@ -86,4 +86,4 @@ class ShaderNode {
   void populate_outputs();
 };
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/COM_shader_operation.hh b/source/blender/compositor/COM_shader_operation.hh
index 9e269cbfee3..6d06591ee10 100644
--- a/source/blender/compositor/COM_shader_operation.hh
+++ b/source/blender/compositor/COM_shader_operation.hh
@@ -22,7 +22,7 @@
 #include "COM_pixel_operation.hh"
 #include "COM_scheduler.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 using namespace nodes::derived_node_tree_types;
 
@@ -174,4 +174,4 @@ class ShaderOperation : public PixelOperation {
                                 gpu::shader::ShaderCreateInfo &shader_create_info);
 };
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/COM_simple_operation.hh b/source/blender/compositor/COM_simple_operation.hh
index a1d648ff395..35c65f78e88 100644
--- a/source/blender/compositor/COM_simple_operation.hh
+++ b/source/blender/compositor/COM_simple_operation.hh
@@ -9,7 +9,7 @@
 #include "COM_operation.hh"
 #include "COM_result.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 /* ------------------------------------------------------------------------------------------------
  * Simple Operation
@@ -63,4 +63,4 @@ class SimpleOperation : public Operation {
   InputDescriptor &get_input_descriptor();
 };
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/COM_static_cache_manager.hh b/source/blender/compositor/COM_static_cache_manager.hh
index 2d6768f3586..a42c0ce11ac 100644
--- a/source/blender/compositor/COM_static_cache_manager.hh
+++ b/source/blender/compositor/COM_static_cache_manager.hh
@@ -20,7 +20,7 @@
 #include "COM_symmetric_separable_blur_weights.hh"
 #include "COM_van_vliet_gaussian_coefficients.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 /* -------------------------------------------------------------------------------------------------
  * Static Cache Manager
@@ -84,4 +84,4 @@ class StaticCacheManager {
   void skip_next_reset();
 };
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/COM_texture_pool.hh b/source/blender/compositor/COM_texture_pool.hh
index 1c54ecd9c8d..388e1c03966 100644
--- a/source/blender/compositor/COM_texture_pool.hh
+++ b/source/blender/compositor/COM_texture_pool.hh
@@ -12,7 +12,7 @@
 
 #include "GPU_texture.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 /* ------------------------------------------------------------------------------------------------
  * Texture Pool Key
@@ -75,4 +75,4 @@ class TexturePool {
   virtual GPUTexture *allocate_texture(int2 size, eGPUTextureFormat format) = 0;
 };
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/COM_utilities.hh b/source/blender/compositor/COM_utilities.hh
index aa06417650b..dae1e77de5b 100644
--- a/source/blender/compositor/COM_utilities.hh
+++ b/source/blender/compositor/COM_utilities.hh
@@ -15,7 +15,7 @@
 #include "COM_input_descriptor.hh"
 #include "COM_result.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 using namespace nodes::derived_node_tree_types;
 
@@ -88,4 +88,4 @@ template<typename Function> inline void parallel_for(const int2 range, const Fun
   });
 }
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/algorithms/COM_algorithm_compute_preview.hh b/source/blender/compositor/algorithms/COM_algorithm_compute_preview.hh
index 6a087b3f9ad..cad6a3dd568 100644
--- a/source/blender/compositor/algorithms/COM_algorithm_compute_preview.hh
+++ b/source/blender/compositor/algorithms/COM_algorithm_compute_preview.hh
@@ -9,10 +9,10 @@
 #include "COM_context.hh"
 #include "COM_result.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 /* Computes a lower resolution version of the given result and sets it as a preview for the given
  * node after applying the appropriate color management specified in the given context. */
 void compute_preview(Context &context, const nodes::DNode &node, const Result &input_result);
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/algorithms/COM_algorithm_deriche_gaussian_blur.hh b/source/blender/compositor/algorithms/COM_algorithm_deriche_gaussian_blur.hh
index adca4e9959e..bb9d9287335 100644
--- a/source/blender/compositor/algorithms/COM_algorithm_deriche_gaussian_blur.hh
+++ b/source/blender/compositor/algorithms/COM_algorithm_deriche_gaussian_blur.hh
@@ -9,7 +9,7 @@
 #include "COM_context.hh"
 #include "COM_result.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 /* Blur the input using a fourth order IIR filter approximating a Gaussian filter of the given
  * sigma computed using Deriche's design method. This is based on the following paper:
@@ -28,4 +28,4 @@ namespace blender::realtime_compositor {
  * expected not to be previously allocated. */
 void deriche_gaussian_blur(Context &context, Result &input, Result &output, float2 sigma);
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/algorithms/COM_algorithm_extract_alpha.hh b/source/blender/compositor/algorithms/COM_algorithm_extract_alpha.hh
index 2d7b47b9d38..351f6792d96 100644
--- a/source/blender/compositor/algorithms/COM_algorithm_extract_alpha.hh
+++ b/source/blender/compositor/algorithms/COM_algorithm_extract_alpha.hh
@@ -7,10 +7,10 @@
 #include "COM_context.hh"
 #include "COM_result.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 /* Extracts the alpha channel from the given input and write it to the given output. The output
  * will be allocated internally and is thus expected not to be previously allocated. */
 void extract_alpha(Context &context, Result &input, Result &output);
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/algorithms/COM_algorithm_gamma_correct.hh b/source/blender/compositor/algorithms/COM_algorithm_gamma_correct.hh
index ebe7b48d97c..2b7ccf385d4 100644
--- a/source/blender/compositor/algorithms/COM_algorithm_gamma_correct.hh
+++ b/source/blender/compositor/algorithms/COM_algorithm_gamma_correct.hh
@@ -7,7 +7,7 @@
 #include "COM_context.hh"
 #include "COM_result.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 /**
  * Gamma corrects the inputs in its straight alpha form and writes the result to the output. The
@@ -23,4 +23,4 @@ void gamma_correct(Context &context, const Result &input, Result &output);
  */
 void gamma_uncorrect(Context &context, const Result &input, Result &output);
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/algorithms/COM_algorithm_jump_flooding.hh b/source/blender/compositor/algorithms/COM_algorithm_jump_flooding.hh
index 21d57a1120f..241a0e81faf 100644
--- a/source/blender/compositor/algorithms/COM_algorithm_jump_flooding.hh
+++ b/source/blender/compositor/algorithms/COM_algorithm_jump_flooding.hh
@@ -7,7 +7,7 @@
 #include "COM_context.hh"
 #include "COM_result.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 /* Computes a jump flooding table from the given input and writes the result to the output. A jump
  * flooding table computes for each pixel the texel location of the closest "seed pixel". A seed
@@ -63,4 +63,4 @@ inline int2 initialize_jump_flooding_value(const int2 &texel, const bool is_seed
   return encode_jump_flooding_value(texel, is_seed);
 }
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/algorithms/COM_algorithm_morphological_blur.hh b/source/blender/compositor/algorithms/COM_algorithm_morphological_blur.hh
index 45e189699f1..7dc3177bd86 100644
--- a/source/blender/compositor/algorithms/COM_algorithm_morphological_blur.hh
+++ b/source/blender/compositor/algorithms/COM_algorithm_morphological_blur.hh
@@ -13,7 +13,7 @@
 #include "COM_context.hh"
 #include "COM_result.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 /* Possible morphological operations to apply. */
 enum class MorphologicalBlurOperation : uint8_t {
@@ -38,4 +38,4 @@ void morphological_blur(
     const MorphologicalBlurOperation operation = MorphologicalBlurOperation::Erode,
     const int filter_type = R_FILTER_GAUSS);
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/algorithms/COM_algorithm_morphological_distance.hh b/source/blender/compositor/algorithms/COM_algorithm_morphological_distance.hh
index efb357dd977..f465017903f 100644
--- a/source/blender/compositor/algorithms/COM_algorithm_morphological_distance.hh
+++ b/source/blender/compositor/algorithms/COM_algorithm_morphological_distance.hh
@@ -7,7 +7,7 @@
 #include "COM_context.hh"
 #include "COM_result.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 /* Dilate or erode the given input using a morphological operator with a circular structuring
  * element of radius equivalent to the absolute value of the given distance parameter. A positive
@@ -18,4 +18,4 @@ void morphological_distance(Context &context,
                             Result &output,
                             const int distance);
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/algorithms/COM_algorithm_morphological_distance_feather.hh b/source/blender/compositor/algorithms/COM_algorithm_morphological_distance_feather.hh
index c3ac8def22c..81cdd45f8c8 100644
--- a/source/blender/compositor/algorithms/COM_algorithm_morphological_distance_feather.hh
+++ b/source/blender/compositor/algorithms/COM_algorithm_morphological_distance_feather.hh
@@ -9,7 +9,7 @@
 #include "COM_context.hh"
 #include "COM_result.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 /* Dilate or erode the given input using a morphological inverse distance operation evaluated at
  * the given falloff. The radius of the structuring element is equivalent to the absolute value of
@@ -22,4 +22,4 @@ void morphological_distance_feather(Context &context,
                                     const int distance,
                                     const int falloff_type = PROP_SMOOTH);
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/algorithms/COM_algorithm_parallel_reduction.hh b/source/blender/compositor/algorithms/COM_algorithm_parallel_reduction.hh
index 953854d9205..63824e721b4 100644
--- a/source/blender/compositor/algorithms/COM_algorithm_parallel_reduction.hh
+++ b/source/blender/compositor/algorithms/COM_algorithm_parallel_reduction.hh
@@ -9,7 +9,7 @@
 #include "COM_context.hh"
 #include "COM_result.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 /* --------------------------------------------------------------------
  * Sum Reductions.
@@ -113,4 +113,4 @@ float minimum_float_in_range(Context &context,
                              const float lower_bound,
                              const float upper_bound);
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/algorithms/COM_algorithm_realize_on_domain.hh b/source/blender/compositor/algorithms/COM_algorithm_realize_on_domain.hh
index 29567ce03a2..6a047095554 100644
--- a/source/blender/compositor/algorithms/COM_algorithm_realize_on_domain.hh
+++ b/source/blender/compositor/algorithms/COM_algorithm_realize_on_domain.hh
@@ -10,7 +10,7 @@
 #include "COM_domain.hh"
 #include "COM_result.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 /* Projects the input on a target domain, copies the area of the input that intersects the target
  * domain, and fill the rest with zeros or repetitions of the input depending on the realization
@@ -25,4 +25,4 @@ void realize_on_domain(Context &context,
                        const float3x3 &input_transformation,
                        const RealizationOptions &realization_options);
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/algorithms/COM_algorithm_recursive_gaussian_blur.hh b/source/blender/compositor/algorithms/COM_algorithm_recursive_gaussian_blur.hh
index c7c7514903f..b1641023c45 100644
--- a/source/blender/compositor/algorithms/COM_algorithm_recursive_gaussian_blur.hh
+++ b/source/blender/compositor/algorithms/COM_algorithm_recursive_gaussian_blur.hh
@@ -9,7 +9,7 @@
 #include "COM_context.hh"
 #include "COM_result.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 /* Blur the input using a recursive Gaussian blur algorithm given a certain radius. This differs
  * from the standard symmetric separable blur algorithm in that it is orders of magnitude faster
@@ -21,4 +21,4 @@ namespace blender::realtime_compositor {
  * expected not to be previously allocated. */
 void recursive_gaussian_blur(Context &context, Result &input, Result &output, float2 radius);
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/algorithms/COM_algorithm_smaa.hh b/source/blender/compositor/algorithms/COM_algorithm_smaa.hh
index b7d359c0c65..a2831e67233 100644
--- a/source/blender/compositor/algorithms/COM_algorithm_smaa.hh
+++ b/source/blender/compositor/algorithms/COM_algorithm_smaa.hh
@@ -7,7 +7,7 @@
 #include "COM_context.hh"
 #include "COM_result.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 /* Anti-alias the given input using the SMAA algorithm and write the result into the given output.
  * See the SMAA_THRESHOLD, SMAA_LOCAL_CONTRAST_ADAPTATION_FACTOR, and SMAA_CORNER_ROUNDING defines
@@ -19,4 +19,4 @@ void smaa(Context &context,
           const float local_contrast_adaptation_factor = 2.0f,
           const int corner_rounding = 25);
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/algorithms/COM_algorithm_summed_area_table.hh b/source/blender/compositor/algorithms/COM_algorithm_summed_area_table.hh
index f2b1133fbda..8f8a6a988bf 100644
--- a/source/blender/compositor/algorithms/COM_algorithm_summed_area_table.hh
+++ b/source/blender/compositor/algorithms/COM_algorithm_summed_area_table.hh
@@ -10,7 +10,7 @@
 #include "COM_context.hh"
 #include "COM_result.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 /* Possible operations to apply on pixels before computing the summed area table. The Square
  * operation, for instance, can be useful to compute image variance from sum of squares. */
@@ -76,4 +76,4 @@ inline float4 summed_area_table_sum(const Result &table,
   return addend - subtrahend;
 }
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/algorithms/COM_algorithm_symmetric_separable_blur.hh b/source/blender/compositor/algorithms/COM_algorithm_symmetric_separable_blur.hh
index 4f3ef8333e9..ddace868f59 100644
--- a/source/blender/compositor/algorithms/COM_algorithm_symmetric_separable_blur.hh
+++ b/source/blender/compositor/algorithms/COM_algorithm_symmetric_separable_blur.hh
@@ -11,7 +11,7 @@
 #include "COM_context.hh"
 #include "COM_result.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 /* Blur the input using a horizontal and a vertical separable blur passes given a certain radius
  * and filter type using SymmetricSeparableBlurWeights. The output is written to the given output
@@ -25,4 +25,4 @@ void symmetric_separable_blur(Context &context,
                               const int filter_type = R_FILTER_GAUSS,
                               const bool extend_bounds = false);
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/algorithms/COM_algorithm_symmetric_separable_blur_variable_size.hh b/source/blender/compositor/algorithms/COM_algorithm_symmetric_separable_blur_variable_size.hh
index c226d80aaad..a79ddfbd764 100644
--- a/source/blender/compositor/algorithms/COM_algorithm_symmetric_separable_blur_variable_size.hh
+++ b/source/blender/compositor/algorithms/COM_algorithm_symmetric_separable_blur_variable_size.hh
@@ -9,7 +9,7 @@
 #include "COM_context.hh"
 #include "COM_result.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 /* Blur the input using a horizontal and a vertical separable blur passes given the filter type
  * using SymmetricSeparableBlurWeights, where the number of weights is equal to weights_resolution.
@@ -30,4 +30,4 @@ void symmetric_separable_blur_variable_size(Context &context,
                                             const int weights_resolution = 128,
                                             const int filter_type = R_FILTER_GAUSS);
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/algorithms/COM_algorithm_transform.hh b/source/blender/compositor/algorithms/COM_algorithm_transform.hh
index 8b027dc333e..984e7046131 100644
--- a/source/blender/compositor/algorithms/COM_algorithm_transform.hh
+++ b/source/blender/compositor/algorithms/COM_algorithm_transform.hh
@@ -10,7 +10,7 @@
 #include "COM_domain.hh"
 #include "COM_result.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 /* Transforms the given result based on the given transformation and realization options, writing
  * the transformed result to the given output.
@@ -35,4 +35,4 @@ void transform(Context &context,
                const float3x3 &transformation,
                RealizationOptions realization_options);
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/algorithms/COM_algorithm_van_vliet_gaussian_blur.hh b/source/blender/compositor/algorithms/COM_algorithm_van_vliet_gaussian_blur.hh
index 2e2aa2cf2f6..a5df6264ee9 100644
--- a/source/blender/compositor/algorithms/COM_algorithm_van_vliet_gaussian_blur.hh
+++ b/source/blender/compositor/algorithms/COM_algorithm_van_vliet_gaussian_blur.hh
@@ -9,7 +9,7 @@
 #include "COM_context.hh"
 #include "COM_result.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 /* Blur the input using a fourth order IIR filter approximating a Gaussian filter of the given
  * sigma computed using Van Vliet's design method. This is based on the following paper:
@@ -33,4 +33,4 @@ namespace blender::realtime_compositor {
  * expected not to be previously allocated. */
 void van_vliet_gaussian_blur(Context &context, Result &input, Result &output, float2 sigma);
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/algorithms/intern/compute_preview.cc b/source/blender/compositor/algorithms/intern/compute_preview.cc
index e4c7f1700b9..82bb7433e86 100644
--- a/source/blender/compositor/algorithms/intern/compute_preview.cc
+++ b/source/blender/compositor/algorithms/intern/compute_preview.cc
@@ -24,7 +24,7 @@
 
 #include "COM_algorithm_compute_preview.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 static void compute_preview_cpu(Context &context,
                                 const Result &input_result,
@@ -143,4 +143,4 @@ void compute_preview(Context &context, const DNode &node, const Result &input_re
   }
 }
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/algorithms/intern/deriche_gaussian_blur.cc b/source/blender/compositor/algorithms/intern/deriche_gaussian_blur.cc
index c0b9ecf7ec4..836e1d776d6 100644
--- a/source/blender/compositor/algorithms/intern/deriche_gaussian_blur.cc
+++ b/source/blender/compositor/algorithms/intern/deriche_gaussian_blur.cc
@@ -16,7 +16,7 @@
 #include "COM_algorithm_deriche_gaussian_blur.hh"
 #include "COM_deriche_gaussian_coefficients.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 #define FILTER_ORDER 4
 
@@ -273,4 +273,4 @@ void deriche_gaussian_blur(Context &context, Result &input, Result &output, floa
   horizontal_pass_result.release();
 }
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/algorithms/intern/extract_alpha.cc b/source/blender/compositor/algorithms/intern/extract_alpha.cc
index 1fb96c670b9..6b97077a907 100644
--- a/source/blender/compositor/algorithms/intern/extract_alpha.cc
+++ b/source/blender/compositor/algorithms/intern/extract_alpha.cc
@@ -13,7 +13,7 @@
 
 #include "COM_algorithm_extract_alpha.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 static void extract_alpha_gpu(Context &context, Result &input, Result &output)
 {
@@ -50,4 +50,4 @@ void extract_alpha(Context &context, Result &input, Result &output)
   }
 }
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/algorithms/intern/gamma_correct.cc b/source/blender/compositor/algorithms/intern/gamma_correct.cc
index 687eefce5b3..a389aaab221 100644
--- a/source/blender/compositor/algorithms/intern/gamma_correct.cc
+++ b/source/blender/compositor/algorithms/intern/gamma_correct.cc
@@ -12,7 +12,7 @@
 
 #include "COM_algorithm_gamma_correct.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 static void gamma_correct_gpu(Context &context, const Result &input, Result &output)
 {
@@ -90,4 +90,4 @@ void gamma_uncorrect(Context &context, const Result &input, Result &output)
   }
 }
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/algorithms/intern/jump_flooding.cc b/source/blender/compositor/algorithms/intern/jump_flooding.cc
index 3b1ad5bce5e..3303f0aa0ab 100644
--- a/source/blender/compositor/algorithms/intern/jump_flooding.cc
+++ b/source/blender/compositor/algorithms/intern/jump_flooding.cc
@@ -19,7 +19,7 @@
 
 #include "COM_algorithm_jump_flooding.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 static void jump_flooding_pass_gpu(Context &context, Result &input, Result &output, int step_size)
 {
@@ -144,4 +144,4 @@ void jump_flooding(Context &context, Result &input, Result &output)
   output.steal_data(*result_to_flood);
 }
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/algorithms/intern/morphological_blur.cc b/source/blender/compositor/algorithms/intern/morphological_blur.cc
index f5811e02487..3f5f5fdf521 100644
--- a/source/blender/compositor/algorithms/intern/morphological_blur.cc
+++ b/source/blender/compositor/algorithms/intern/morphological_blur.cc
@@ -15,7 +15,7 @@
 #include "COM_algorithm_morphological_blur.hh"
 #include "COM_algorithm_symmetric_separable_blur.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 static const char *get_shader(MorphologicalBlurOperation operation)
 {
@@ -101,4 +101,4 @@ void morphological_blur(Context &context,
   apply_morphological_operator(context, input, output, operation);
 }
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/algorithms/intern/morphological_distance.cc b/source/blender/compositor/algorithms/intern/morphological_distance.cc
index ab024cfc75e..c8fb32ebfd9 100644
--- a/source/blender/compositor/algorithms/intern/morphological_distance.cc
+++ b/source/blender/compositor/algorithms/intern/morphological_distance.cc
@@ -16,7 +16,7 @@
 
 #include "COM_algorithm_morphological_distance.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 static const char *get_shader_name(const int distance)
 {
@@ -115,4 +115,4 @@ void morphological_distance(Context &context,
   }
 }
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/algorithms/intern/morphological_distance_feather.cc b/source/blender/compositor/algorithms/intern/morphological_distance_feather.cc
index 0ef9984e268..31863641e66 100644
--- a/source/blender/compositor/algorithms/intern/morphological_distance_feather.cc
+++ b/source/blender/compositor/algorithms/intern/morphological_distance_feather.cc
@@ -14,7 +14,7 @@
 #include "COM_result.hh"
 #include "COM_utilities.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 /* The Morphological Distance Feather operation is a linear combination between the result of two
  * operations. The first operation is a Gaussian blur with a radius equivalent to the dilate/erode
@@ -307,4 +307,4 @@ void morphological_distance_feather(Context &context,
   horizontal_pass_result.release();
 }
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/algorithms/intern/parallel_reduction.cc b/source/blender/compositor/algorithms/intern/parallel_reduction.cc
index 45834166015..b0c0c7a64cc 100644
--- a/source/blender/compositor/algorithms/intern/parallel_reduction.cc
+++ b/source/blender/compositor/algorithms/intern/parallel_reduction.cc
@@ -22,7 +22,7 @@
 
 #include "COM_algorithm_parallel_reduction.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 /* Reduces the given texture into a single value and returns it. The return value should be freed
  * by a call to MEM_freeN. The return value is either a pointer to a float, or a pointer to an
@@ -807,4 +807,4 @@ float minimum_float_in_range(Context &context,
   return minimum_float_in_range_cpu(result, lower_bound, upper_bound);
 }
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/algorithms/intern/realize_on_domain.cc b/source/blender/compositor/algorithms/intern/realize_on_domain.cc
index ea8b1cab687..c91ea1a22d2 100644
--- a/source/blender/compositor/algorithms/intern/realize_on_domain.cc
+++ b/source/blender/compositor/algorithms/intern/realize_on_domain.cc
@@ -21,7 +21,7 @@
 
 #include "COM_algorithm_realize_on_domain.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 static const char *get_realization_shader(Result &input,
                                           const RealizationOptions &realization_options)
@@ -184,4 +184,4 @@ void realize_on_domain(Context &context,
   }
 }
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/algorithms/intern/recursive_gaussian_blur.cc b/source/blender/compositor/algorithms/intern/recursive_gaussian_blur.cc
index fdb86ad9663..d152dd6bf5f 100644
--- a/source/blender/compositor/algorithms/intern/recursive_gaussian_blur.cc
+++ b/source/blender/compositor/algorithms/intern/recursive_gaussian_blur.cc
@@ -13,7 +13,7 @@
 #include "COM_algorithm_symmetric_separable_blur.hh"
 #include "COM_algorithm_van_vliet_gaussian_blur.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 /* Compute the Gaussian sigma from the radius, where the radius is in pixels. Blender's filter is
  * truncated at |x| > 3 * sigma as can be seen in the R_FILTER_GAUSS case of the RE_filter_value
@@ -66,4 +66,4 @@ void recursive_gaussian_blur(Context &context, Result &input, Result &output, fl
   van_vliet_gaussian_blur(context, input, output, sigma);
 }
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/algorithms/intern/smaa.cc b/source/blender/compositor/algorithms/intern/smaa.cc
index 77205cd3070..5b4966a4be3 100644
--- a/source/blender/compositor/algorithms/intern/smaa.cc
+++ b/source/blender/compositor/algorithms/intern/smaa.cc
@@ -24,7 +24,7 @@
 
 #include "COM_smaa_precomputed_textures.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 /**
  *                  _______  ___  ___       ___           ___
@@ -1700,4 +1700,4 @@ void smaa(Context &context,
   weights.release();
 }
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/algorithms/intern/summed_area_table.cc b/source/blender/compositor/algorithms/intern/summed_area_table.cc
index 1ffea622ec8..72dffd13ee5 100644
--- a/source/blender/compositor/algorithms/intern/summed_area_table.cc
+++ b/source/blender/compositor/algorithms/intern/summed_area_table.cc
@@ -19,7 +19,7 @@
 
 #include "COM_algorithm_summed_area_table.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 /* ------------------------------------------------------------------------------------------------
  * Summed Area Table
@@ -279,4 +279,4 @@ void summed_area_table(Context &context,
   }
 }
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/algorithms/intern/symmetric_separable_blur.cc b/source/blender/compositor/algorithms/intern/symmetric_separable_blur.cc
index 1d6a748432d..707d401f922 100644
--- a/source/blender/compositor/algorithms/intern/symmetric_separable_blur.cc
+++ b/source/blender/compositor/algorithms/intern/symmetric_separable_blur.cc
@@ -18,7 +18,7 @@
 
 #include "COM_symmetric_separable_blur_weights.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 template<typename T>
 static void blur_pass(const Result &input,
@@ -313,4 +313,4 @@ void symmetric_separable_blur(Context &context,
   horizontal_pass_result.release();
 }
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/algorithms/intern/symmetric_separable_blur_variable_size.cc b/source/blender/compositor/algorithms/intern/symmetric_separable_blur_variable_size.cc
index 924715f1609..391053b962f 100644
--- a/source/blender/compositor/algorithms/intern/symmetric_separable_blur_variable_size.cc
+++ b/source/blender/compositor/algorithms/intern/symmetric_separable_blur_variable_size.cc
@@ -18,7 +18,7 @@
 
 #include "COM_symmetric_separable_blur_weights.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 static void blur_pass(const Result &input,
                       const Result &radius_input,
@@ -250,4 +250,4 @@ void symmetric_separable_blur_variable_size(Context &context,
   horizontal_pass_result.release();
 }
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/algorithms/intern/transform.cc b/source/blender/compositor/algorithms/intern/transform.cc
index b297b161980..d6cd6ec0c36 100644
--- a/source/blender/compositor/algorithms/intern/transform.cc
+++ b/source/blender/compositor/algorithms/intern/transform.cc
@@ -18,7 +18,7 @@
 
 #include "COM_algorithm_transform.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 /* Given a potentially transformed domain, compute a domain such that its rotation and scale become
  * identity and the size of the domain is increased/reduced to adapt to the new transformation. For
@@ -82,4 +82,4 @@ void transform(Context &context,
   output.get_realization_options().interpolation = realization_options.interpolation;
 }
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/algorithms/intern/van_vliet_gaussian_blur.cc b/source/blender/compositor/algorithms/intern/van_vliet_gaussian_blur.cc
index a2190710bb4..e06ddf94d10 100644
--- a/source/blender/compositor/algorithms/intern/van_vliet_gaussian_blur.cc
+++ b/source/blender/compositor/algorithms/intern/van_vliet_gaussian_blur.cc
@@ -15,7 +15,7 @@
 #include "COM_algorithm_van_vliet_gaussian_blur.hh"
 #include "COM_van_vliet_gaussian_coefficients.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 #define FILTER_ORDER 2
 
@@ -389,4 +389,4 @@ void van_vliet_gaussian_blur(Context &context, Result &input, Result &output, fl
   horizontal_pass_result.release();
 }
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/cached_resources/COM_bokeh_kernel.hh b/source/blender/compositor/cached_resources/COM_bokeh_kernel.hh
index 171a48dd522..be04edb0036 100644
--- a/source/blender/compositor/cached_resources/COM_bokeh_kernel.hh
+++ b/source/blender/compositor/cached_resources/COM_bokeh_kernel.hh
@@ -13,7 +13,7 @@
 #include "COM_cached_resource.hh"
 #include "COM_result.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 class Context;
 
@@ -95,4 +95,4 @@ class BokehKernelContainer : CachedResourceContainer {
               float lens_shift);
 };
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/cached_resources/COM_cached_image.hh b/source/blender/compositor/cached_resources/COM_cached_image.hh
index 4aa9c8538ce..308903db70d 100644
--- a/source/blender/compositor/cached_resources/COM_cached_image.hh
+++ b/source/blender/compositor/cached_resources/COM_cached_image.hh
@@ -17,7 +17,7 @@
 #include "COM_cached_resource.hh"
 #include "COM_result.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 class Context;
 
@@ -75,4 +75,4 @@ class CachedImageContainer : CachedResourceContainer {
   Result get(Context &context, Image *image, const ImageUser *image_user, const char *pass_name);
 };
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/cached_resources/COM_cached_mask.hh b/source/blender/compositor/cached_resources/COM_cached_mask.hh
index 7aedf3c046a..8035431de39 100644
--- a/source/blender/compositor/cached_resources/COM_cached_mask.hh
+++ b/source/blender/compositor/cached_resources/COM_cached_mask.hh
@@ -17,7 +17,7 @@
 #include "COM_cached_resource.hh"
 #include "COM_result.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 class Context;
 
@@ -93,4 +93,4 @@ class CachedMaskContainer : CachedResourceContainer {
               float motion_blur_shutter);
 };
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/cached_resources/COM_cached_resource.hh b/source/blender/compositor/cached_resources/COM_cached_resource.hh
index 78274e79527..9beadff915f 100644
--- a/source/blender/compositor/cached_resources/COM_cached_resource.hh
+++ b/source/blender/compositor/cached_resources/COM_cached_resource.hh
@@ -4,7 +4,7 @@
 
 #pragma once
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 /* -------------------------------------------------------------------------------------------------
  * Cached Resource.
@@ -49,4 +49,4 @@ class CachedResourceContainer {
   virtual void reset() = 0;
 };
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/cached_resources/COM_cached_shader.hh b/source/blender/compositor/cached_resources/COM_cached_shader.hh
index 0db2b381f78..50cc047bfac 100644
--- a/source/blender/compositor/cached_resources/COM_cached_shader.hh
+++ b/source/blender/compositor/cached_resources/COM_cached_shader.hh
@@ -15,7 +15,7 @@
 #include "COM_cached_resource.hh"
 #include "COM_result.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 /* ------------------------------------------------------------------------------------------------
  * Cached Shader Key.
@@ -67,4 +67,4 @@ class CachedShaderContainer : public CachedResourceContainer {
   GPUShader *get(const char *info_name, ResultPrecision precision);
 };
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/cached_resources/COM_cached_texture.hh b/source/blender/compositor/cached_resources/COM_cached_texture.hh
index 74286639663..0bcf276ca28 100644
--- a/source/blender/compositor/cached_resources/COM_cached_texture.hh
+++ b/source/blender/compositor/cached_resources/COM_cached_texture.hh
@@ -16,7 +16,7 @@
 #include "COM_cached_resource.hh"
 #include "COM_result.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 class Context;
 
@@ -85,4 +85,4 @@ class CachedTextureContainer : CachedResourceContainer {
                      float3 scale);
 };
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/cached_resources/COM_deriche_gaussian_coefficients.hh b/source/blender/compositor/cached_resources/COM_deriche_gaussian_coefficients.hh
index 078f81447ec..a7f3004abe9 100644
--- a/source/blender/compositor/cached_resources/COM_deriche_gaussian_coefficients.hh
+++ b/source/blender/compositor/cached_resources/COM_deriche_gaussian_coefficients.hh
@@ -12,7 +12,7 @@
 
 #include "COM_cached_resource.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 class Context;
 
@@ -84,4 +84,4 @@ class DericheGaussianCoefficientsContainer : CachedResourceContainer {
   DericheGaussianCoefficients &get(Context &context, float sigma);
 };
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/cached_resources/COM_distortion_grid.hh b/source/blender/compositor/cached_resources/COM_distortion_grid.hh
index 8d48b629664..fa31b38aa60 100644
--- a/source/blender/compositor/cached_resources/COM_distortion_grid.hh
+++ b/source/blender/compositor/cached_resources/COM_distortion_grid.hh
@@ -16,7 +16,7 @@
 #include "COM_cached_resource.hh"
 #include "COM_result.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 class Context;
 
@@ -88,4 +88,4 @@ class DistortionGridContainer : CachedResourceContainer {
       Context &context, MovieClip *movie_clip, int2 size, DistortionType type, int frame_number);
 };
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/cached_resources/COM_fog_glow_kernel.hh b/source/blender/compositor/cached_resources/COM_fog_glow_kernel.hh
index 7f517eeab8a..fcde8f232e8 100644
--- a/source/blender/compositor/cached_resources/COM_fog_glow_kernel.hh
+++ b/source/blender/compositor/cached_resources/COM_fog_glow_kernel.hh
@@ -13,7 +13,7 @@
 
 #include "COM_cached_resource.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 /* ------------------------------------------------------------------------------------------------
  * Fog Glow Kernel Key.
@@ -72,4 +72,4 @@ class FogGlowKernelContainer : CachedResourceContainer {
   FogGlowKernel &get(int kernel_size, int2 spatial_size);
 };
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/cached_resources/COM_keying_screen.hh b/source/blender/compositor/cached_resources/COM_keying_screen.hh
index 5fe253628c7..6f0f0dc948e 100644
--- a/source/blender/compositor/cached_resources/COM_keying_screen.hh
+++ b/source/blender/compositor/cached_resources/COM_keying_screen.hh
@@ -17,7 +17,7 @@
 #include "COM_cached_resource.hh"
 #include "COM_result.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 class Context;
 
@@ -86,4 +86,4 @@ class KeyingScreenContainer : CachedResourceContainer {
               float smoothness);
 };
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/cached_resources/COM_morphological_distance_feather_weights.hh b/source/blender/compositor/cached_resources/COM_morphological_distance_feather_weights.hh
index 2777a864d31..d9cd8859912 100644
--- a/source/blender/compositor/cached_resources/COM_morphological_distance_feather_weights.hh
+++ b/source/blender/compositor/cached_resources/COM_morphological_distance_feather_weights.hh
@@ -12,7 +12,7 @@
 
 #include "COM_cached_resource.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 class Context;
 
@@ -78,4 +78,4 @@ class MorphologicalDistanceFeatherWeightsContainer : CachedResourceContainer {
   MorphologicalDistanceFeatherWeights &get(Context &context, int type, int radius);
 };
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/cached_resources/COM_ocio_color_space_conversion_shader.hh b/source/blender/compositor/cached_resources/COM_ocio_color_space_conversion_shader.hh
index ff00108212d..64baa67761a 100644
--- a/source/blender/compositor/cached_resources/COM_ocio_color_space_conversion_shader.hh
+++ b/source/blender/compositor/cached_resources/COM_ocio_color_space_conversion_shader.hh
@@ -9,7 +9,7 @@
 
 #include "COM_cached_resource.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 class Context;
 
@@ -72,4 +72,4 @@ class OCIOColorSpaceConversionShaderContainer : CachedResourceContainer {
   OCIOColorSpaceConversionShader &get(Context &context, std::string source, std::string target);
 };
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/cached_resources/COM_smaa_precomputed_textures.hh b/source/blender/compositor/cached_resources/COM_smaa_precomputed_textures.hh
index ebbc06eeed3..23547953ea5 100644
--- a/source/blender/compositor/cached_resources/COM_smaa_precomputed_textures.hh
+++ b/source/blender/compositor/cached_resources/COM_smaa_precomputed_textures.hh
@@ -12,7 +12,7 @@
 #include "COM_cached_resource.hh"
 #include "COM_result.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 class Context;
 
@@ -68,4 +68,4 @@ class SMAAPrecomputedTexturesContainer : public CachedResourceContainer {
   SMAAPrecomputedTextures &get(Context &context);
 };
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/cached_resources/COM_symmetric_blur_weights.hh b/source/blender/compositor/cached_resources/COM_symmetric_blur_weights.hh
index d7e095e964d..1bc11a6924a 100644
--- a/source/blender/compositor/cached_resources/COM_symmetric_blur_weights.hh
+++ b/source/blender/compositor/cached_resources/COM_symmetric_blur_weights.hh
@@ -13,7 +13,7 @@
 
 #include "COM_cached_resource.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 class Context;
 
@@ -69,4 +69,4 @@ class SymmetricBlurWeightsContainer : public CachedResourceContainer {
   Result &get(Context &context, int type, float2 radius);
 };
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/cached_resources/COM_symmetric_separable_blur_weights.hh b/source/blender/compositor/cached_resources/COM_symmetric_separable_blur_weights.hh
index a1b5652acef..7f326e071a8 100644
--- a/source/blender/compositor/cached_resources/COM_symmetric_separable_blur_weights.hh
+++ b/source/blender/compositor/cached_resources/COM_symmetric_separable_blur_weights.hh
@@ -13,7 +13,7 @@
 
 #include "COM_cached_resource.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 class Context;
 
@@ -80,4 +80,4 @@ class SymmetricSeparableBlurWeightsContainer : public CachedResourceContainer {
 
 /** \} */
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/cached_resources/COM_van_vliet_gaussian_coefficients.hh b/source/blender/compositor/cached_resources/COM_van_vliet_gaussian_coefficients.hh
index 4e13db5d5c4..b4eea46ebbf 100644
--- a/source/blender/compositor/cached_resources/COM_van_vliet_gaussian_coefficients.hh
+++ b/source/blender/compositor/cached_resources/COM_van_vliet_gaussian_coefficients.hh
@@ -12,7 +12,7 @@
 
 #include "COM_cached_resource.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 class Context;
 
@@ -103,4 +103,4 @@ class VanVlietGaussianCoefficientsContainer : CachedResourceContainer {
   VanVlietGaussianCoefficients &get(Context &context, float sigma);
 };
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/cached_resources/intern/bokeh_kernel.cc b/source/blender/compositor/cached_resources/intern/bokeh_kernel.cc
index 127344e1553..b1f49a35fc1 100644
--- a/source/blender/compositor/cached_resources/intern/bokeh_kernel.cc
+++ b/source/blender/compositor/cached_resources/intern/bokeh_kernel.cc
@@ -18,7 +18,7 @@
 #include "COM_result.hh"
 #include "COM_utilities.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 /* --------------------------------------------------------------------
  * Bokeh Kernel Key.
@@ -308,4 +308,4 @@ Result &BokehKernelContainer::get(Context &context,
   return bokeh_kernel.result;
 }
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/cached_resources/intern/cached_image.cc b/source/blender/compositor/cached_resources/intern/cached_image.cc
index 9c686bbfbd5..c8e66638ad1 100644
--- a/source/blender/compositor/cached_resources/intern/cached_image.cc
+++ b/source/blender/compositor/cached_resources/intern/cached_image.cc
@@ -29,7 +29,7 @@
 #include "COM_result.hh"
 #include "COM_utilities.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 /* --------------------------------------------------------------------
  * Cached Image Key.
@@ -302,4 +302,4 @@ Result CachedImageContainer::get(Context &context,
   return cached_image.result;
 }
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/cached_resources/intern/cached_mask.cc b/source/blender/compositor/cached_resources/intern/cached_mask.cc
index 29852095829..b89d178825a 100644
--- a/source/blender/compositor/cached_resources/intern/cached_mask.cc
+++ b/source/blender/compositor/cached_resources/intern/cached_mask.cc
@@ -24,7 +24,7 @@
 #include "COM_result.hh"
 #include "COM_utilities.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 /* --------------------------------------------------------------------
  * Cached Mask Key.
@@ -208,4 +208,4 @@ Result &CachedMaskContainer::get(Context &context,
   return cached_mask.result;
 }
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/cached_resources/intern/cached_shader.cc b/source/blender/compositor/cached_resources/intern/cached_shader.cc
index ee129833d9d..172aa783bb2 100644
--- a/source/blender/compositor/cached_resources/intern/cached_shader.cc
+++ b/source/blender/compositor/cached_resources/intern/cached_shader.cc
@@ -16,7 +16,7 @@
 
 #include "gpu_shader_create_info.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 /* --------------------------------------------------------------------
  * Cached Shader Key.
@@ -98,4 +98,4 @@ GPUShader *CachedShaderContainer::get(const char *info_name, ResultPrecision pre
   return cached_shader.shader();
 }
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/cached_resources/intern/cached_texture.cc b/source/blender/compositor/cached_resources/intern/cached_texture.cc
index ef99defca63..88f6adee0c5 100644
--- a/source/blender/compositor/cached_resources/intern/cached_texture.cc
+++ b/source/blender/compositor/cached_resources/intern/cached_texture.cc
@@ -28,7 +28,7 @@
 #include "COM_result.hh"
 #include "COM_utilities.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 /* --------------------------------------------------------------------
  * Cached Texture Key.
@@ -164,4 +164,4 @@ CachedTexture &CachedTextureContainer::get(Context &context,
   return cached_texture;
 }
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/cached_resources/intern/deriche_gaussian_coefficients.cc b/source/blender/compositor/cached_resources/intern/deriche_gaussian_coefficients.cc
index 2ed1ad2aeed..cddcacfcf8e 100644
--- a/source/blender/compositor/cached_resources/intern/deriche_gaussian_coefficients.cc
+++ b/source/blender/compositor/cached_resources/intern/deriche_gaussian_coefficients.cc
@@ -32,7 +32,7 @@
 #include "COM_context.hh"
 #include "COM_deriche_gaussian_coefficients.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 /* --------------------------------------------------------------------
  * Deriche Gaussian Coefficients Key.
@@ -316,4 +316,4 @@ DericheGaussianCoefficients &DericheGaussianCoefficientsContainer::get(Context &
   return deriche_gaussian_coefficients;
 }
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/cached_resources/intern/distortion_grid.cc b/source/blender/compositor/cached_resources/intern/distortion_grid.cc
index ce8bc39751d..f3820578dc4 100644
--- a/source/blender/compositor/cached_resources/intern/distortion_grid.cc
+++ b/source/blender/compositor/cached_resources/intern/distortion_grid.cc
@@ -24,7 +24,7 @@
 #include "COM_distortion_grid.hh"
 #include "COM_result.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 /* --------------------------------------------------------------------
  * Distortion Grid Key.
@@ -148,4 +148,4 @@ Result &DistortionGridContainer::get(
   return distortion_grid.result;
 }
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/cached_resources/intern/fog_glow_kernel.cc b/source/blender/compositor/cached_resources/intern/fog_glow_kernel.cc
index 5e84ab2cf8b..abd41e763f9 100644
--- a/source/blender/compositor/cached_resources/intern/fog_glow_kernel.cc
+++ b/source/blender/compositor/cached_resources/intern/fog_glow_kernel.cc
@@ -23,7 +23,7 @@
 
 #include "COM_fog_glow_kernel.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 /* --------------------------------------------------------------------
  * Fog Glow Kernel Key.
@@ -177,4 +177,4 @@ FogGlowKernel &FogGlowKernelContainer::get(int kernel_size, int2 spatial_size)
   return kernel;
 }
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/cached_resources/intern/keying_screen.cc b/source/blender/compositor/cached_resources/intern/keying_screen.cc
index bbc3d72e256..6d75e8e1989 100644
--- a/source/blender/compositor/cached_resources/intern/keying_screen.cc
+++ b/source/blender/compositor/cached_resources/intern/keying_screen.cc
@@ -32,7 +32,7 @@
 #include "COM_result.hh"
 #include "COM_utilities.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 /* --------------------------------------------------------------------
  * Keying Screen Key.
@@ -285,4 +285,4 @@ Result &KeyingScreenContainer::get(Context &context,
   return keying_screen.result;
 }
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/cached_resources/intern/morphological_distance_feather_weights.cc b/source/blender/compositor/cached_resources/intern/morphological_distance_feather_weights.cc
index 9fca60279c7..9707d9d1ed6 100644
--- a/source/blender/compositor/cached_resources/intern/morphological_distance_feather_weights.cc
+++ b/source/blender/compositor/cached_resources/intern/morphological_distance_feather_weights.cc
@@ -20,7 +20,7 @@
 #include "COM_morphological_distance_feather_weights.hh"
 #include "COM_result.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 /* --------------------------------------------------------------------
  * Morphological Distance Feather Weights Key.
@@ -179,4 +179,4 @@ MorphologicalDistanceFeatherWeights &MorphologicalDistanceFeatherWeightsContaine
   return weights;
 }
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/cached_resources/intern/ocio_color_space_conversion_shader.cc b/source/blender/compositor/cached_resources/intern/ocio_color_space_conversion_shader.cc
index 9e389315f86..cd473a2873c 100644
--- a/source/blender/compositor/cached_resources/intern/ocio_color_space_conversion_shader.cc
+++ b/source/blender/compositor/cached_resources/intern/ocio_color_space_conversion_shader.cc
@@ -28,7 +28,7 @@
 #  include <OpenColorIO/OpenColorIO.h>
 #endif
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 /* ------------------------------------------------------------------------------------------------
  * OCIO Color Space Conversion Shader Key.
@@ -562,4 +562,4 @@ OCIOColorSpaceConversionShader &OCIOColorSpaceConversionShaderContainer::get(Con
   return shader;
 }
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/cached_resources/intern/smaa_precomputed_textures.cc b/source/blender/compositor/cached_resources/intern/smaa_precomputed_textures.cc
index 82dd89910d2..669e801a4ec 100644
--- a/source/blender/compositor/cached_resources/intern/smaa_precomputed_textures.cc
+++ b/source/blender/compositor/cached_resources/intern/smaa_precomputed_textures.cc
@@ -14,7 +14,7 @@
 #include "COM_smaa_precomputed_textures.hh"
 #include "COM_utilities.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 /* ------------------------------------------------------------------------------------------------
  * SMAA Precomputed Textures.
@@ -134,4 +134,4 @@ SMAAPrecomputedTextures &SMAAPrecomputedTexturesContainer::get(Context &context)
   return *textures_;
 }
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/cached_resources/intern/symmetric_blur_weights.cc b/source/blender/compositor/cached_resources/intern/symmetric_blur_weights.cc
index 0b24a941bba..d6e394fdc31 100644
--- a/source/blender/compositor/cached_resources/intern/symmetric_blur_weights.cc
+++ b/source/blender/compositor/cached_resources/intern/symmetric_blur_weights.cc
@@ -19,7 +19,7 @@
 #include "COM_result.hh"
 #include "COM_symmetric_blur_weights.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 /* --------------------------------------------------------------------
  * Symmetric Blur Weights Key.
@@ -142,4 +142,4 @@ Result &SymmetricBlurWeightsContainer::get(Context &context, int type, float2 ra
   return weights.result;
 }
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/cached_resources/intern/symmetric_separable_blur_weights.cc b/source/blender/compositor/cached_resources/intern/symmetric_separable_blur_weights.cc
index e85da4c4485..1dfc4d90ecf 100644
--- a/source/blender/compositor/cached_resources/intern/symmetric_separable_blur_weights.cc
+++ b/source/blender/compositor/cached_resources/intern/symmetric_separable_blur_weights.cc
@@ -18,7 +18,7 @@
 #include "COM_result.hh"
 #include "COM_symmetric_separable_blur_weights.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 /* --------------------------------------------------------------------
  * Symmetric Separable Blur Weights Key.
@@ -122,4 +122,4 @@ Result &SymmetricSeparableBlurWeightsContainer::get(Context &context, int type,
   return weights.result;
 }
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/cached_resources/intern/van_vliet_gaussian_coefficients.cc b/source/blender/compositor/cached_resources/intern/van_vliet_gaussian_coefficients.cc
index 2341c1107dc..a0f5e5b6abb 100644
--- a/source/blender/compositor/cached_resources/intern/van_vliet_gaussian_coefficients.cc
+++ b/source/blender/compositor/cached_resources/intern/van_vliet_gaussian_coefficients.cc
@@ -38,7 +38,7 @@
 #include "COM_context.hh"
 #include "COM_van_vliet_gaussian_coefficients.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 /* --------------------------------------------------------------------
  * Van Vliet Gaussian Coefficients Key.
@@ -533,4 +533,4 @@ VanVlietGaussianCoefficients &VanVlietGaussianCoefficientsContainer::get(Context
   return deriche_gaussian_coefficients;
 }
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/intern/COM_compositor.cc b/source/blender/compositor/intern/COM_compositor.cc
index a32f181dc3a..2a65c228263 100644
--- a/source/blender/compositor/intern/COM_compositor.cc
+++ b/source/blender/compositor/intern/COM_compositor.cc
@@ -54,8 +54,8 @@ void COM_execute(Render *render,
                  Scene *scene,
                  bNodeTree *node_tree,
                  const char *view_name,
-                 blender::realtime_compositor::RenderContext *render_context,
-                 blender::realtime_compositor::Profiler *profiler)
+                 blender::compositor::RenderContext *render_context,
+                 blender::compositor::Profiler *profiler)
 {
   /* Initialize mutex, TODO: this mutex init is actually not thread safe and
    * should be done somewhere as part of blender startup, all the other
diff --git a/source/blender/compositor/intern/compile_state.cc b/source/blender/compositor/intern/compile_state.cc
index 0a7ef50a0f4..cecf8761e40 100644
--- a/source/blender/compositor/intern/compile_state.cc
+++ b/source/blender/compositor/intern/compile_state.cc
@@ -19,7 +19,7 @@
 #include "COM_scheduler.hh"
 #include "COM_utilities.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 using namespace nodes::derived_node_tree_types;
 
@@ -193,4 +193,4 @@ Domain CompileState::compute_pixel_node_domain(DNode node)
   return node_domain;
 }
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/intern/context.cc b/source/blender/compositor/intern/context.cc
index 496b13fef2a..3ead0e38268 100644
--- a/source/blender/compositor/intern/context.cc
+++ b/source/blender/compositor/intern/context.cc
@@ -18,7 +18,7 @@
 #include "COM_static_cache_manager.hh"
 #include "COM_texture_pool.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 Context::Context(TexturePool &texture_pool) : texture_pool_(texture_pool) {}
 
@@ -119,4 +119,4 @@ StaticCacheManager &Context::cache_manager()
   return cache_manager_;
 }
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/intern/conversion_operation.cc b/source/blender/compositor/intern/conversion_operation.cc
index 21f9d317acb..727e935370c 100644
--- a/source/blender/compositor/intern/conversion_operation.cc
+++ b/source/blender/compositor/intern/conversion_operation.cc
@@ -12,7 +12,7 @@
 #include "COM_result.hh"
 #include "COM_utilities.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 /* --------------------------------------------------------------------
  * Conversion Operation
@@ -270,4 +270,4 @@ GPUShader *ConvertVectorToColorOperation::get_conversion_shader() const
   return context().get_shader("compositor_convert_vector_to_color");
 }
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/intern/domain.cc b/source/blender/compositor/intern/domain.cc
index 0e405298fce..0b677c5a1d3 100644
--- a/source/blender/compositor/intern/domain.cc
+++ b/source/blender/compositor/intern/domain.cc
@@ -7,7 +7,7 @@
 
 #include "COM_domain.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 Domain::Domain(const int2 &size) : size(size), transformation(float3x3::identity()) {}
 
@@ -36,4 +36,4 @@ bool operator!=(const Domain &a, const Domain &b)
   return !(a == b);
 }
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/intern/evaluator.cc b/source/blender/compositor/intern/evaluator.cc
index 66ea9a2ef4c..27fbf8abead 100644
--- a/source/blender/compositor/intern/evaluator.cc
+++ b/source/blender/compositor/intern/evaluator.cc
@@ -19,7 +19,7 @@
 #include "COM_shader_operation.hh"
 #include "COM_utilities.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 using namespace nodes::derived_node_tree_types;
 
@@ -234,4 +234,4 @@ void Evaluator::cancel_evaluation()
   }
 }
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/intern/input_single_value_operation.cc b/source/blender/compositor/intern/input_single_value_operation.cc
index 70d80db7103..33fa4236205 100644
--- a/source/blender/compositor/intern/input_single_value_operation.cc
+++ b/source/blender/compositor/intern/input_single_value_operation.cc
@@ -10,7 +10,7 @@
 #include "COM_result.hh"
 #include "COM_utilities.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 const StringRef InputSingleValueOperation::output_identifier_ = StringRef("Output");
 
@@ -63,4 +63,4 @@ void InputSingleValueOperation::populate_result(Result result)
   Operation::populate_result(output_identifier_, result);
 }
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/intern/meta_data.cc b/source/blender/compositor/intern/meta_data.cc
index df2171b883b..bd581ca1dcb 100644
--- a/source/blender/compositor/intern/meta_data.cc
+++ b/source/blender/compositor/intern/meta_data.cc
@@ -4,7 +4,7 @@
 
 #include "COM_meta_data.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 bool MetaData::is_cryptomatte_layer() const
 {
@@ -12,4 +12,4 @@ bool MetaData::is_cryptomatte_layer() const
          !this->cryptomatte.conversion.empty();
 }
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/intern/multi_function_procedure_operation.cc b/source/blender/compositor/intern/multi_function_procedure_operation.cc
index a74e8119a19..71707afd2d0 100644
--- a/source/blender/compositor/intern/multi_function_procedure_operation.cc
+++ b/source/blender/compositor/intern/multi_function_procedure_operation.cc
@@ -39,7 +39,7 @@
 #include "COM_scheduler.hh"
 #include "COM_utilities.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 using namespace nodes::derived_node_tree_types;
 
@@ -407,4 +407,4 @@ void MultiFunctionProcedureOperation::populate_operation_result(DOutputSocket ou
   parameter_identifiers_.append(output_identifier);
 }
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/intern/node_operation.cc b/source/blender/compositor/intern/node_operation.cc
index 43ca3f237e6..254aa0047bc 100644
--- a/source/blender/compositor/intern/node_operation.cc
+++ b/source/blender/compositor/intern/node_operation.cc
@@ -32,7 +32,7 @@
 #include "COM_scheduler.hh"
 #include "COM_utilities.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 using namespace nodes::derived_node_tree_types;
 
@@ -62,7 +62,7 @@ void NodeOperation::evaluate()
 void NodeOperation::compute_preview()
 {
   if (context().should_compute_node_previews() && is_node_preview_needed(node())) {
-    realtime_compositor::compute_preview(context(), node(), *get_preview_result());
+    compositor::compute_preview(context(), node(), *get_preview_result());
   }
 }
 
@@ -115,4 +115,4 @@ bool NodeOperation::should_compute_output(StringRef identifier)
   return get_result(identifier).should_compute();
 }
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/intern/operation.cc b/source/blender/compositor/intern/operation.cc
index 504756b12cc..8463142bcdd 100644
--- a/source/blender/compositor/intern/operation.cc
+++ b/source/blender/compositor/intern/operation.cc
@@ -20,7 +20,7 @@
 #include "COM_simple_operation.hh"
 #include "COM_texture_pool.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 Operation::Operation(Context &context) : context_(context) {}
 
@@ -221,4 +221,4 @@ void Operation::release_inputs()
   }
 }
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/intern/pixel_operation.cc b/source/blender/compositor/intern/pixel_operation.cc
index 25ac2b25100..0af41e05206 100644
--- a/source/blender/compositor/intern/pixel_operation.cc
+++ b/source/blender/compositor/intern/pixel_operation.cc
@@ -20,7 +20,7 @@
 #include "COM_shader_operation.hh"
 #include "COM_utilities.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 using namespace nodes::derived_node_tree_types;
 
@@ -57,7 +57,7 @@ void PixelOperation::compute_preview()
 {
   for (const DOutputSocket &output : preview_outputs_) {
     Result &result = get_result(get_output_identifier_from_output_socket(output));
-    realtime_compositor::compute_preview(context(), output.node(), result);
+    compositor::compute_preview(context(), output.node(), result);
     /* Preview results gets as an extra reference in pixel operations as can be seen in the
      * compute_results_reference_counts method, so release it after computing preview. */
     result.release();
@@ -100,4 +100,4 @@ void PixelOperation::release_inputs()
   }
 }
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/intern/profiler.cc b/source/blender/compositor/intern/profiler.cc
index 7d805f84e27..a0168d4a7b4 100644
--- a/source/blender/compositor/intern/profiler.cc
+++ b/source/blender/compositor/intern/profiler.cc
@@ -13,7 +13,7 @@
 #include "COM_context.hh"
 #include "COM_profiler.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 Map<bNodeInstanceKey, timeit::Nanoseconds> &Profiler::get_nodes_evaluation_times()
 {
@@ -69,4 +69,4 @@ void Profiler::finalize(const bNodeTree &node_tree)
   this->accumulate_node_group_times(node_tree, bke::NODE_INSTANCE_KEY_BASE);
 }
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/intern/realize_on_domain_operation.cc b/source/blender/compositor/intern/realize_on_domain_operation.cc
index 482c0508a7f..908ded2390d 100644
--- a/source/blender/compositor/intern/realize_on_domain_operation.cc
+++ b/source/blender/compositor/intern/realize_on_domain_operation.cc
@@ -12,7 +12,7 @@
 
 #include "COM_realize_on_domain_operation.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 /* ------------------------------------------------------------------------------------------------
  * Realize On Domain Operation
@@ -84,4 +84,4 @@ SimpleOperation *RealizeOnDomainOperation::construct_if_needed(
   return new RealizeOnDomainOperation(context, operation_domain, input_descriptor.type);
 }
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/intern/reduce_to_single_value_operation.cc b/source/blender/compositor/intern/reduce_to_single_value_operation.cc
index 074223d19f5..fb779f5e245 100644
--- a/source/blender/compositor/intern/reduce_to_single_value_operation.cc
+++ b/source/blender/compositor/intern/reduce_to_single_value_operation.cc
@@ -14,7 +14,7 @@
 #include "COM_reduce_to_single_value_operation.hh"
 #include "COM_result.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 ReduceToSingleValueOperation::ReduceToSingleValueOperation(Context &context, ResultType type)
     : SimpleOperation(context)
@@ -82,4 +82,4 @@ SimpleOperation *ReduceToSingleValueOperation::construct_if_needed(Context &cont
   return new ReduceToSingleValueOperation(context, input_result.type());
 }
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/intern/render_context.cc b/source/blender/compositor/intern/render_context.cc
index 78dff117940..0080ad09fda 100644
--- a/source/blender/compositor/intern/render_context.cc
+++ b/source/blender/compositor/intern/render_context.cc
@@ -28,7 +28,7 @@
 
 #include "COM_render_context.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 /* ------------------------------------------------------------------------------------------------
  * File Output
@@ -153,4 +153,4 @@ void RenderContext::save_file_outputs(Scene *scene)
   }
 }
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/intern/result.cc b/source/blender/compositor/intern/result.cc
index 4f1af7ea298..66d1824548f 100644
--- a/source/blender/compositor/intern/result.cc
+++ b/source/blender/compositor/intern/result.cc
@@ -17,7 +17,7 @@
 #include "COM_domain.hh"
 #include "COM_result.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 Result::Result(Context &context) : context_(&context) {}
 
@@ -778,4 +778,4 @@ void Result::allocate_data(int2 size, bool from_pool)
   }
 }
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/intern/scheduler.cc b/source/blender/compositor/intern/scheduler.cc
index d9bce6a5e90..e50cacdc732 100644
--- a/source/blender/compositor/intern/scheduler.cc
+++ b/source/blender/compositor/intern/scheduler.cc
@@ -16,7 +16,7 @@
 #include "COM_scheduler.hh"
 #include "COM_utilities.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 using namespace nodes::derived_node_tree_types;
 
@@ -363,4 +363,4 @@ Schedule compute_schedule(const Context &context, const DerivedNodeTree &tree)
   return schedule;
 }
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/intern/shader_node.cc b/source/blender/compositor/intern/shader_node.cc
index bda659b94dd..7ab3741184c 100644
--- a/source/blender/compositor/intern/shader_node.cc
+++ b/source/blender/compositor/intern/shader_node.cc
@@ -15,7 +15,7 @@
 #include "COM_shader_node.hh"
 #include "COM_utilities.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 using namespace nodes::derived_node_tree_types;
 
@@ -203,4 +203,4 @@ void ShaderNode::populate_outputs()
   }
 }
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/intern/shader_operation.cc b/source/blender/compositor/intern/shader_operation.cc
index a1c7dc127b8..25d77f4a425 100644
--- a/source/blender/compositor/intern/shader_operation.cc
+++ b/source/blender/compositor/intern/shader_operation.cc
@@ -34,7 +34,7 @@
 
 #include <sstream>
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 using namespace nodes::derived_node_tree_types;
 
@@ -553,4 +553,4 @@ void ShaderOperation::generate_code_for_inputs(GPUMaterial *material,
   shader_create_info.compute_source_generated += initialize_attributes.str();
 }
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/intern/simple_operation.cc b/source/blender/compositor/intern/simple_operation.cc
index bc2151984ac..5cfe8c9d9c1 100644
--- a/source/blender/compositor/intern/simple_operation.cc
+++ b/source/blender/compositor/intern/simple_operation.cc
@@ -7,7 +7,7 @@
 #include "COM_result.hh"
 #include "COM_simple_operation.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 const StringRef SimpleOperation::input_identifier_ = StringRef("Input");
 const StringRef SimpleOperation::output_identifier_ = StringRef("Output");
@@ -52,4 +52,4 @@ InputDescriptor &SimpleOperation::get_input_descriptor()
   return Operation::get_input_descriptor(input_identifier_);
 }
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/intern/static_cache_manager.cc b/source/blender/compositor/intern/static_cache_manager.cc
index 05ae8f0f0cf..b84d7056d2d 100644
--- a/source/blender/compositor/intern/static_cache_manager.cc
+++ b/source/blender/compositor/intern/static_cache_manager.cc
@@ -4,7 +4,7 @@
 
 #include "COM_static_cache_manager.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 void StaticCacheManager::reset()
 {
@@ -35,4 +35,4 @@ void StaticCacheManager::skip_next_reset()
   should_skip_next_reset_ = true;
 }
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/intern/texture_pool.cc b/source/blender/compositor/intern/texture_pool.cc
index fe877474101..f1a202605cf 100644
--- a/source/blender/compositor/intern/texture_pool.cc
+++ b/source/blender/compositor/intern/texture_pool.cc
@@ -13,7 +13,7 @@
 
 #include "COM_texture_pool.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 /* -------------------------------------------------------------------- */
 /** \name Texture Pool Key
@@ -69,4 +69,4 @@ void TexturePool::reset()
 
 /** \} */
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/intern/utilities.cc b/source/blender/compositor/intern/utilities.cc
index 5d6dc116d51..f42ee770df9 100644
--- a/source/blender/compositor/intern/utilities.cc
+++ b/source/blender/compositor/intern/utilities.cc
@@ -19,7 +19,7 @@
 #include "COM_result.hh"
 #include "COM_utilities.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 using namespace nodes::derived_node_tree_types;
 using TargetSocketPathInfo = DOutputSocket::TargetSocketPathInfo;
@@ -170,4 +170,4 @@ DOutputSocket find_preview_output_socket(const DNode &node)
   return DOutputSocket();
 }
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/utilities/COM_utilities_diagonals.hh b/source/blender/compositor/utilities/COM_utilities_diagonals.hh
index c62c31099d1..2aaecb24ab1 100644
--- a/source/blender/compositor/utilities/COM_utilities_diagonals.hh
+++ b/source/blender/compositor/utilities/COM_utilities_diagonals.hh
@@ -7,7 +7,7 @@
 #include "BLI_math_base.hh"
 #include "BLI_math_vector_types.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 
 /* Computes the number of diagonals in the matrix of the given size, where the diagonals are
  * indexed from the upper left corner to the lower right corner such that their start is at the
@@ -177,4 +177,4 @@ inline int2 get_anti_diagonal_direction()
   return int2(-1, 1);
 }
 
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
diff --git a/source/blender/draw/engines/compositor/compositor_engine.cc b/source/blender/draw/engines/compositor/compositor_engine.cc
index c5cc924cc3e..d3d3042017d 100644
--- a/source/blender/draw/engines/compositor/compositor_engine.cc
+++ b/source/blender/draw/engines/compositor/compositor_engine.cc
@@ -36,9 +36,9 @@
 
 #include "compositor_engine.h" /* Own include. */
 
-namespace blender::draw::compositor {
+namespace blender::draw::compositor_engine {
 
-class TexturePool : public realtime_compositor::TexturePool {
+class TexturePool : public compositor::TexturePool {
  public:
   GPUTexture *allocate_texture(int2 size, eGPUTextureFormat format) override
   {
@@ -48,15 +48,15 @@ class TexturePool : public realtime_compositor::TexturePool {
   }
 };
 
-class Context : public realtime_compositor::Context {
+class Context : public compositor::Context {
  private:
   /* A pointer to the info message of the compositor engine. This is a char array of size
    * GPU_INFO_SIZE. The message is cleared prior to updating or evaluating the compositor. */
   char *info_message_;
 
  public:
-  Context(realtime_compositor::TexturePool &texture_pool, char *info_message)
-      : realtime_compositor::Context(texture_pool), info_message_(info_message)
+  Context(compositor::TexturePool &texture_pool, char *info_message)
+      : compositor::Context(texture_pool), info_message_(info_message)
   {
   }
 
@@ -134,45 +134,41 @@ class Context : public realtime_compositor::Context {
     return visible_camera_region;
   }
 
-  realtime_compositor::Result get_output_result() override
+  compositor::Result get_output_result() override
   {
-    realtime_compositor::Result result = this->create_result(
-        realtime_compositor::ResultType::Color, realtime_compositor::ResultPrecision::Half);
+    compositor::Result result = this->create_result(compositor::ResultType::Color,
+                                                    compositor::ResultPrecision::Half);
     result.wrap_external(DRW_viewport_texture_list_get()->color);
     return result;
   }
 
-  realtime_compositor::Result get_viewer_output_result(
-      realtime_compositor::Domain /*domain*/,
-      bool /*is_data*/,
-      realtime_compositor::ResultPrecision /*precision*/) override
+  compositor::Result get_viewer_output_result(compositor::Domain /*domain*/,
+                                              bool /*is_data*/,
+                                              compositor::ResultPrecision /*precision*/) override
   {
-    realtime_compositor::Result result = this->create_result(
-        realtime_compositor::ResultType::Color, realtime_compositor::ResultPrecision::Half);
+    compositor::Result result = this->create_result(compositor::ResultType::Color,
+                                                    compositor::ResultPrecision::Half);
     result.wrap_external(DRW_viewport_texture_list_get()->color);
     return result;
   }
 
-  realtime_compositor::Result get_pass(const Scene *scene,
-                                       int view_layer,
-                                       const char *pass_name) override
+  compositor::Result get_pass(const Scene *scene, int view_layer, const char *pass_name) override
   {
     if (DEG_get_original_id(const_cast<ID *>(&scene->id)) !=
         DEG_get_original_id(&DRW_context_state_get()->scene->id))
     {
-      return realtime_compositor::Result(*this);
+      return compositor::Result(*this);
     }
 
     if (view_layer != 0) {
-      return realtime_compositor::Result(*this);
+      return compositor::Result(*this);
     }
 
     /* The combined pass is a special case where we return the viewport color texture, because it
      * includes Grease Pencil objects since GP is drawn using their own engine. */
     if (STREQ(pass_name, RE_PASSNAME_COMBINED)) {
       GPUTexture *combined_texture = DRW_viewport_texture_list_get()->color;
-      realtime_compositor::Result pass = realtime_compositor::Result(
-          *this, GPU_texture_format(combined_texture));
+      compositor::Result pass = compositor::Result(*this, GPU_texture_format(combined_texture));
       pass.wrap_external(combined_texture);
       return pass;
     }
@@ -180,13 +176,12 @@ class Context : public realtime_compositor::Context {
     /* Return the pass that was written by the engine if such pass was found. */
     GPUTexture *pass_texture = DRW_viewport_pass_texture_get(pass_name).gpu_texture();
     if (pass_texture) {
-      realtime_compositor::Result pass = realtime_compositor::Result(
-          *this, GPU_texture_format(pass_texture));
+      compositor::Result pass = compositor::Result(*this, GPU_texture_format(pass_texture));
       pass.wrap_external(pass_texture);
       return pass;
     }
 
-    return realtime_compositor::Result(*this);
+    return compositor::Result(*this);
   }
 
   StringRef get_view_name() const override
@@ -196,17 +191,17 @@ class Context : public realtime_compositor::Context {
     return view->name;
   }
 
-  realtime_compositor::ResultPrecision get_precision() const override
+  compositor::ResultPrecision get_precision() const override
   {
     switch (get_scene().r.compositor_precision) {
       case SCE_COMPOSITOR_PRECISION_AUTO:
-        return realtime_compositor::ResultPrecision::Half;
+        return compositor::ResultPrecision::Half;
       case SCE_COMPOSITOR_PRECISION_FULL:
-        return realtime_compositor::ResultPrecision::Full;
+        return compositor::ResultPrecision::Full;
     }
 
     BLI_assert_unreachable();
-    return realtime_compositor::ResultPrecision::Half;
+    return compositor::ResultPrecision::Half;
   }
 
   void set_info_message(StringRef message) const override
@@ -228,7 +223,7 @@ class Engine {
  private:
   TexturePool texture_pool_;
   Context context_;
-  realtime_compositor::Evaluator evaluator_;
+  compositor::Evaluator evaluator_;
   /* Stores the compositing region size at the time the last compositor evaluation happened. See
    * the update_compositing_region_size method for more information. */
   int2 last_compositing_region_size_;
@@ -272,9 +267,9 @@ class Engine {
   }
 };
 
-}  // namespace blender::draw::compositor
+}  // namespace blender::draw::compositor_engine
 
-using namespace blender::draw::compositor;
+using namespace blender::draw::compositor_engine;
 
 struct COMPOSITOR_Data {
   DrawEngineType *engine_type;
diff --git a/source/blender/editors/space_node/node_edit.cc b/source/blender/editors/space_node/node_edit.cc
index e9d2f6d1e0b..3856754770f 100644
--- a/source/blender/editors/space_node/node_edit.cc
+++ b/source/blender/editors/space_node/node_edit.cc
@@ -103,7 +103,7 @@ struct CompoJob {
   float *progress;
   bool cancelled;
 
-  realtime_compositor::Profiler profiler;
+  compositor::Profiler profiler;
 };
 
 float node_socket_calculate_height(const bNodeSocket &socket)
diff --git a/source/blender/nodes/NOD_composite.hh b/source/blender/nodes/NOD_composite.hh
index fc7caf942db..a4571cb6e20 100644
--- a/source/blender/nodes/NOD_composite.hh
+++ b/source/blender/nodes/NOD_composite.hh
@@ -10,10 +10,10 @@
 
 #include "BKE_node.hh"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 class RenderContext;
 class Profiler;
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
 namespace blender::bke {
 struct bNodeTreeType;
 }  // namespace blender::bke
@@ -42,8 +42,8 @@ void ntreeCompositExecTree(Render *render,
                            bNodeTree *ntree,
                            RenderData *rd,
                            const char *view_name,
-                           blender::realtime_compositor::RenderContext *render_context,
-                           blender::realtime_compositor::Profiler *profiler);
+                           blender::compositor::RenderContext *render_context,
+                           blender::compositor::Profiler *profiler);
 
 /**
  * Called from render pipeline, to tag render input and output.
diff --git a/source/blender/nodes/NOD_node_declaration.hh b/source/blender/nodes/NOD_node_declaration.hh
index 5cb13a93d49..784b99451b4 100644
--- a/source/blender/nodes/NOD_node_declaration.hh
+++ b/source/blender/nodes/NOD_node_declaration.hh
@@ -48,7 +48,7 @@ enum class OutputSocketFieldType {
 };
 
 /**
- * A bit-field that maps to the #realtime_compositor::InputRealizationOptions.
+ * A bit-field that maps to the #compositor::InputRealizationOptions.
  */
 enum class CompositorInputRealizationOptions : uint8_t {
   None = 0,
@@ -201,11 +201,11 @@ class SocketDeclaration : public ItemDeclaration {
       CompositorInputRealizationOptions::RealizeOnOperationDomain;
 
   /** The priority of the input for determining the domain of the node. See
-   * realtime_compositor::InputDescriptor for more information. */
+   * compositor::InputDescriptor for more information. */
   int compositor_domain_priority_ = 0;
 
   /** This input expects a single value and can't operate on non-single values. See
-   * realtime_compositor::InputDescriptor for more information. */
+   * compositor::InputDescriptor for more information. */
   bool compositor_expects_single_value_ = false;
 
   /** Utility method to make the socket available if there is a straightforward way to do so. */
@@ -357,13 +357,13 @@ class BaseSocketDeclarationBuilder {
 
   /**
    * The priority of the input for determining the domain of the node. See
-   * realtime_compositor::InputDescriptor for more information.
+   * compositor::InputDescriptor for more information.
    */
   BaseSocketDeclarationBuilder &compositor_domain_priority(int priority);
 
   /**
    * This input expects a single value and can't operate on non-single values. See
-   * realtime_compositor::InputDescriptor for more information.
+   * compositor::InputDescriptor for more information.
    */
   BaseSocketDeclarationBuilder &compositor_expects_single_value(bool value = true);
 
diff --git a/source/blender/nodes/composite/node_composite_tree.cc b/source/blender/nodes/composite/node_composite_tree.cc
index 995c620362e..331bdef616d 100644
--- a/source/blender/nodes/composite/node_composite_tree.cc
+++ b/source/blender/nodes/composite/node_composite_tree.cc
@@ -178,8 +178,8 @@ void ntreeCompositExecTree(Render *render,
                            bNodeTree *ntree,
                            RenderData *rd,
                            const char *view_name,
-                           blender::realtime_compositor::RenderContext *render_context,
-                           blender::realtime_compositor::Profiler *profiler)
+                           blender::compositor::RenderContext *render_context,
+                           blender::compositor::Profiler *profiler)
 {
   COM_execute(render, rd, scene, ntree, view_name, render_context, profiler);
 }
diff --git a/source/blender/nodes/composite/nodes/node_composite_alpha_over.cc b/source/blender/nodes/composite/nodes/node_composite_alpha_over.cc
index 99bff20c7b2..7e89ae4d49e 100644
--- a/source/blender/nodes/composite/nodes/node_composite_alpha_over.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_alpha_over.cc
@@ -59,7 +59,7 @@ static void node_composit_buts_alphaover(uiLayout *layout, bContext * /*C*/, Poi
   uiItemR(col, ptr, "premul", UI_ITEM_R_SPLIT_EMPTY_NAME, std::nullopt, ICON_NONE);
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 static bool get_use_premultiply(const bNode &node)
 {
diff --git a/source/blender/nodes/composite/nodes/node_composite_antialiasing.cc b/source/blender/nodes/composite/nodes/node_composite_antialiasing.cc
index 3cab2c0d93b..84fd8b1b3b4 100644
--- a/source/blender/nodes/composite/nodes/node_composite_antialiasing.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_antialiasing.cc
@@ -50,7 +50,7 @@ static void node_composit_buts_antialiasing(uiLayout *layout, bContext * /*C*/,
   uiItemR(col, ptr, "corner_rounding", UI_ITEM_NONE, std::nullopt, ICON_NONE);
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 class AntiAliasingOperation : public NodeOperation {
  public:
diff --git a/source/blender/nodes/composite/nodes/node_composite_bilateralblur.cc b/source/blender/nodes/composite/nodes/node_composite_bilateralblur.cc
index c0cc098db29..5dd9da85528 100644
--- a/source/blender/nodes/composite/nodes/node_composite_bilateralblur.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_bilateralblur.cc
@@ -55,7 +55,7 @@ static void node_composit_buts_bilateralblur(uiLayout *layout, bContext * /*C*/,
   uiItemR(col, ptr, "sigma_space", UI_ITEM_R_SPLIT_EMPTY_NAME, std::nullopt, ICON_NONE);
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 class BilateralBlurOperation : public NodeOperation {
  public:
diff --git a/source/blender/nodes/composite/nodes/node_composite_blur.cc b/source/blender/nodes/composite/nodes/node_composite_blur.cc
index 68e46e49cf3..7b4ea0512f3 100644
--- a/source/blender/nodes/composite/nodes/node_composite_blur.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_blur.cc
@@ -95,7 +95,7 @@ static void node_composit_buts_blur(uiLayout *layout, bContext * /*C*/, PointerR
   uiItemR(col, ptr, "use_extended_bounds", UI_ITEM_R_SPLIT_EMPTY_NAME, std::nullopt, ICON_NONE);
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 class BlurOperation : public NodeOperation {
  public:
diff --git a/source/blender/nodes/composite/nodes/node_composite_bokehblur.cc b/source/blender/nodes/composite/nodes/node_composite_bokehblur.cc
index 04db0e3a35b..26d412056fc 100644
--- a/source/blender/nodes/composite/nodes/node_composite_bokehblur.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_bokehblur.cc
@@ -60,7 +60,7 @@ static void node_composit_buts_bokehblur(uiLayout *layout, bContext * /*C*/, Poi
   uiItemR(layout, ptr, "use_extended_bounds", UI_ITEM_R_SPLIT_EMPTY_NAME, std::nullopt, ICON_NONE);
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 class BokehBlurOperation : public NodeOperation {
  public:
diff --git a/source/blender/nodes/composite/nodes/node_composite_bokehimage.cc b/source/blender/nodes/composite/nodes/node_composite_bokehimage.cc
index df0e7451fc9..8732cda1236 100644
--- a/source/blender/nodes/composite/nodes/node_composite_bokehimage.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_bokehimage.cc
@@ -65,7 +65,7 @@ static void node_composit_buts_bokehimage(uiLayout *layout, bContext * /*C*/, Po
           ICON_NONE);
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 class BokehImageOperation : public NodeOperation {
  public:
diff --git a/source/blender/nodes/composite/nodes/node_composite_boxmask.cc b/source/blender/nodes/composite/nodes/node_composite_boxmask.cc
index 8af2824f139..f52b8440fd1 100644
--- a/source/blender/nodes/composite/nodes/node_composite_boxmask.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_boxmask.cc
@@ -80,7 +80,7 @@ static void node_composit_buts_boxmask(uiLayout *layout, bContext * /*C*/, Point
   uiItemR(layout, ptr, "mask_type", UI_ITEM_R_SPLIT_EMPTY_NAME, std::nullopt, ICON_NONE);
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 template<CMPNodeMaskType MaskType>
 static void box_mask(const Result &base_mask,
diff --git a/source/blender/nodes/composite/nodes/node_composite_brightness.cc b/source/blender/nodes/composite/nodes/node_composite_brightness.cc
index c9a278b3ac8..8186cbf61d2 100644
--- a/source/blender/nodes/composite/nodes/node_composite_brightness.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_brightness.cc
@@ -48,7 +48,7 @@ static void node_composit_buts_brightcontrast(uiLayout *layout, bContext * /*C*/
   uiItemR(layout, ptr, "use_premultiply", UI_ITEM_R_SPLIT_EMPTY_NAME, std::nullopt, ICON_NONE);
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 static bool get_use_premultiply(const bNode &node)
 {
diff --git a/source/blender/nodes/composite/nodes/node_composite_channel_matte.cc b/source/blender/nodes/composite/nodes/node_composite_channel_matte.cc
index 62d5776b0a4..2e2799758b8 100644
--- a/source/blender/nodes/composite/nodes/node_composite_channel_matte.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_channel_matte.cc
@@ -106,7 +106,7 @@ static void node_composit_buts_channel_matte(uiLayout *layout, bContext * /*C*/,
           ICON_NONE);
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 static CMPNodeChannelMatteColorSpace get_color_space(const bNode &node)
 {
diff --git a/source/blender/nodes/composite/nodes/node_composite_chroma_matte.cc b/source/blender/nodes/composite/nodes/node_composite_chroma_matte.cc
index 2a0b442d149..d9ef5f0832d 100644
--- a/source/blender/nodes/composite/nodes/node_composite_chroma_matte.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_chroma_matte.cc
@@ -73,7 +73,7 @@ static void node_composit_buts_chroma_matte(uiLayout *layout, bContext * /*C*/,
   // uiItemR(col, ptr, "shadow_adjust", UI_ITEM_R_SLIDER, std::nullopt, ICON_NONE);
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 static float get_acceptance(const bNode &node)
 {
diff --git a/source/blender/nodes/composite/nodes/node_composite_color_matte.cc b/source/blender/nodes/composite/nodes/node_composite_color_matte.cc
index b7b5551b483..9f7a8788223 100644
--- a/source/blender/nodes/composite/nodes/node_composite_color_matte.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_color_matte.cc
@@ -77,7 +77,7 @@ static void node_composit_buts_color_matte(uiLayout *layout, bContext * /*C*/, P
           ICON_NONE);
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 static float get_hue_epsilon(const bNode &node)
 {
diff --git a/source/blender/nodes/composite/nodes/node_composite_color_spill.cc b/source/blender/nodes/composite/nodes/node_composite_color_spill.cc
index acd5f03860f..94789017494 100644
--- a/source/blender/nodes/composite/nodes/node_composite_color_spill.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_color_spill.cc
@@ -102,7 +102,7 @@ static void node_composit_buts_color_spill(uiLayout *layout, bContext * /*C*/, P
   }
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 /* Get the index of the channel used for spilling. */
 static int get_spill_channel(const bNode &node)
diff --git a/source/blender/nodes/composite/nodes/node_composite_colorbalance.cc b/source/blender/nodes/composite/nodes/node_composite_colorbalance.cc
index bfa13e12ff6..610a1609a9b 100644
--- a/source/blender/nodes/composite/nodes/node_composite_colorbalance.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_colorbalance.cc
@@ -209,7 +209,7 @@ static void node_composit_buts_colorbalance_ex(uiLayout *layout, bContext * /*C*
   }
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 static CMPNodeColorBalanceMethod get_color_balance_method(const bNode &node)
 {
diff --git a/source/blender/nodes/composite/nodes/node_composite_colorcorrection.cc b/source/blender/nodes/composite/nodes/node_composite_colorcorrection.cc
index b556f213c05..6dd463d4c2b 100644
--- a/source/blender/nodes/composite/nodes/node_composite_colorcorrection.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_colorcorrection.cc
@@ -311,7 +311,7 @@ static void node_composit_buts_colorcorrection_ex(uiLayout *layout,
   uiItemR(row, ptr, "midtones_end", UI_ITEM_R_SPLIT_EMPTY_NAME, std::nullopt, ICON_NONE);
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 class ColorCorrectionShaderNode : public ShaderNode {
  public:
diff --git a/source/blender/nodes/composite/nodes/node_composite_composite.cc b/source/blender/nodes/composite/nodes/node_composite_composite.cc
index d00b47667ba..55ee1ecf721 100644
--- a/source/blender/nodes/composite/nodes/node_composite_composite.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_composite.cc
@@ -35,7 +35,7 @@ static void node_composit_buts_composite(uiLayout *layout, bContext * /*C*/, Poi
   uiItemR(layout, ptr, "use_alpha", UI_ITEM_R_SPLIT_EMPTY_NAME, std::nullopt, ICON_NONE);
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 class CompositeOperation : public NodeOperation {
  public:
diff --git a/source/blender/nodes/composite/nodes/node_composite_convert_color_space.cc b/source/blender/nodes/composite/nodes/node_composite_convert_color_space.cc
index dba0a27f34e..fb03aa042fb 100644
--- a/source/blender/nodes/composite/nodes/node_composite_convert_color_space.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_convert_color_space.cc
@@ -62,7 +62,7 @@ static void node_composit_buts_convert_colorspace(uiLayout *layout,
   uiItemR(layout, ptr, "to_color_space", UI_ITEM_R_SPLIT_EMPTY_NAME, std::nullopt, ICON_NONE);
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 class ConvertColorSpaceOperation : public NodeOperation {
  public:
diff --git a/source/blender/nodes/composite/nodes/node_composite_cornerpin.cc b/source/blender/nodes/composite/nodes/node_composite_cornerpin.cc
index 6053cbac828..a60bf0e9709 100644
--- a/source/blender/nodes/composite/nodes/node_composite_cornerpin.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_cornerpin.cc
@@ -52,7 +52,7 @@ static void cmp_node_cornerpin_declare(NodeDeclarationBuilder &b)
   b.add_output<decl::Float>("Plane");
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 class CornerPinOperation : public NodeOperation {
  public:
diff --git a/source/blender/nodes/composite/nodes/node_composite_crop.cc b/source/blender/nodes/composite/nodes/node_composite_crop.cc
index e7f53a7b589..1826cdfd9fd 100644
--- a/source/blender/nodes/composite/nodes/node_composite_crop.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_crop.cc
@@ -70,7 +70,7 @@ static void node_composit_buts_crop(uiLayout *layout, bContext * /*C*/, PointerR
   }
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 class CropOperation : public NodeOperation {
  public:
diff --git a/source/blender/nodes/composite/nodes/node_composite_cryptomatte.cc b/source/blender/nodes/composite/nodes/node_composite_cryptomatte.cc
index 36a9110bfdc..8fe0aacdc37 100644
--- a/source/blender/nodes/composite/nodes/node_composite_cryptomatte.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_cryptomatte.cc
@@ -227,7 +227,7 @@ namespace blender::nodes::node_composite_base_cryptomatte_cc {
 
 NODE_STORAGE_FUNCS(NodeCryptomatte)
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 class BaseCryptoMatteOperation : public NodeOperation {
  public:
@@ -658,7 +658,7 @@ static void node_update_cryptomatte(bNodeTree *ntree, bNode *node)
   ntreeCompositCryptomatteUpdateLayerNames(node);
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 using namespace blender::nodes::node_composite_base_cryptomatte_cc;
 
 class CryptoMatteOperation : public BaseCryptoMatteOperation {
@@ -967,7 +967,7 @@ static void node_init_cryptomatte_legacy(bNodeTree *ntree, bNode *node)
   ntreeCompositCryptomatteAddSocket(ntree, node);
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 using namespace blender::nodes::node_composite_base_cryptomatte_cc;
 
 class LegacyCryptoMatteOperation : public BaseCryptoMatteOperation {
diff --git a/source/blender/nodes/composite/nodes/node_composite_curves.cc b/source/blender/nodes/composite/nodes/node_composite_curves.cc
index 3133ffa72ea..c9a4fa9e6b0 100644
--- a/source/blender/nodes/composite/nodes/node_composite_curves.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_curves.cc
@@ -45,7 +45,7 @@ static void node_composit_init_curves_time(bNodeTree * /*ntree*/, bNode *node)
   node->storage = BKE_curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f);
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 class TimeCurveOperation : public NodeOperation {
  public:
@@ -140,7 +140,7 @@ static void node_buts_curvevec(uiLayout *layout, bContext * /*C*/, PointerRNA *p
   uiTemplateCurveMapping(layout, ptr, "mapping", 'v', false, false, false, false);
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 static CurveMapping *get_curve_mapping(const bNode &node)
 {
@@ -260,7 +260,7 @@ static void node_composit_init_curve_rgb(bNodeTree * /*ntree*/, bNode *node)
   node->storage = BKE_curvemapping_add(4, 0.0f, 0.0f, 1.0f, 1.0f);
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 static CurveMapping *get_curve_mapping(const bNode &node)
 {
diff --git a/source/blender/nodes/composite/nodes/node_composite_defocus.cc b/source/blender/nodes/composite/nodes/node_composite_defocus.cc
index 29c09e0a5dd..de65a9f3bcb 100644
--- a/source/blender/nodes/composite/nodes/node_composite_defocus.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_defocus.cc
@@ -94,7 +94,7 @@ static void node_composit_buts_defocus(uiLayout *layout, bContext *C, PointerRNA
   uiItemR(sub, ptr, "z_scale", UI_ITEM_R_SPLIT_EMPTY_NAME, std::nullopt, ICON_NONE);
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 class DefocusOperation : public NodeOperation {
  public:
diff --git a/source/blender/nodes/composite/nodes/node_composite_denoise.cc b/source/blender/nodes/composite/nodes/node_composite_denoise.cc
index b62ca7ec4ef..6264f3c3651 100644
--- a/source/blender/nodes/composite/nodes/node_composite_denoise.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_denoise.cc
@@ -75,7 +75,7 @@ static void node_composit_buts_denoise(uiLayout *layout, bContext * /*C*/, Point
   uiItemR(layout, ptr, "use_hdr", UI_ITEM_R_SPLIT_EMPTY_NAME, std::nullopt, ICON_NONE);
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 /* A callback to cancel the filter operations by evaluating the context's is_canceled method. The
  * API specifies that true indicates the filter should continue, while false indicates it should
diff --git a/source/blender/nodes/composite/nodes/node_composite_despeckle.cc b/source/blender/nodes/composite/nodes/node_composite_despeckle.cc
index 33e5dbbd9d9..96cd2a8b9fa 100644
--- a/source/blender/nodes/composite/nodes/node_composite_despeckle.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_despeckle.cc
@@ -54,7 +54,7 @@ static void node_composit_buts_despeckle(uiLayout *layout, bContext * /*C*/, Poi
   uiItemR(col, ptr, "threshold_neighbor", UI_ITEM_R_SPLIT_EMPTY_NAME, std::nullopt, ICON_NONE);
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 class DespeckleOperation : public NodeOperation {
  public:
diff --git a/source/blender/nodes/composite/nodes/node_composite_diff_matte.cc b/source/blender/nodes/composite/nodes/node_composite_diff_matte.cc
index 7a58f28abd5..12a5176c634 100644
--- a/source/blender/nodes/composite/nodes/node_composite_diff_matte.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_diff_matte.cc
@@ -64,7 +64,7 @@ static void node_composit_buts_diff_matte(uiLayout *layout, bContext * /*C*/, Po
       col, ptr, "falloff", UI_ITEM_R_SPLIT_EMPTY_NAME | UI_ITEM_R_SLIDER, std::nullopt, ICON_NONE);
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 static float get_tolerance(const bNode &node)
 {
diff --git a/source/blender/nodes/composite/nodes/node_composite_dilate.cc b/source/blender/nodes/composite/nodes/node_composite_dilate.cc
index 4d692d3c194..6e5e0370b4b 100644
--- a/source/blender/nodes/composite/nodes/node_composite_dilate.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_dilate.cc
@@ -64,7 +64,7 @@ static void node_composit_buts_dilateerode(uiLayout *layout, bContext * /*C*/, P
   }
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 class DilateErodeOperation : public NodeOperation {
  public:
diff --git a/source/blender/nodes/composite/nodes/node_composite_directionalblur.cc b/source/blender/nodes/composite/nodes/node_composite_directionalblur.cc
index adf4cee605a..07fe6b0c8db 100644
--- a/source/blender/nodes/composite/nodes/node_composite_directionalblur.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_directionalblur.cc
@@ -63,7 +63,7 @@ static void node_composit_buts_dblur(uiLayout *layout, bContext * /*C*/, Pointer
   uiItemR(layout, ptr, "zoom", UI_ITEM_R_SPLIT_EMPTY_NAME, std::nullopt, ICON_NONE);
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 class DirectionalBlurOperation : public NodeOperation {
  public:
diff --git a/source/blender/nodes/composite/nodes/node_composite_displace.cc b/source/blender/nodes/composite/nodes/node_composite_displace.cc
index 19bd992aba0..1b844ef11c8 100644
--- a/source/blender/nodes/composite/nodes/node_composite_displace.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_displace.cc
@@ -45,7 +45,7 @@ static void cmp_node_displace_declare(NodeDeclarationBuilder &b)
   b.add_output<decl::Color>("Image");
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 class DisplaceOperation : public NodeOperation {
  public:
diff --git a/source/blender/nodes/composite/nodes/node_composite_distance_matte.cc b/source/blender/nodes/composite/nodes/node_composite_distance_matte.cc
index 25234f40bd6..1ff3496f4da 100644
--- a/source/blender/nodes/composite/nodes/node_composite_distance_matte.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_distance_matte.cc
@@ -72,7 +72,7 @@ static void node_composit_buts_distance_matte(uiLayout *layout, bContext * /*C*/
       col, ptr, "falloff", UI_ITEM_R_SPLIT_EMPTY_NAME | UI_ITEM_R_SLIDER, std::nullopt, ICON_NONE);
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 static CMPNodeDistanceMatteColorSpace get_color_space(const bNode &node)
 {
diff --git a/source/blender/nodes/composite/nodes/node_composite_double_edge_mask.cc b/source/blender/nodes/composite/nodes/node_composite_double_edge_mask.cc
index 44c9bd2e9d5..d52692f1b7e 100644
--- a/source/blender/nodes/composite/nodes/node_composite_double_edge_mask.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_double_edge_mask.cc
@@ -48,7 +48,7 @@ static void node_composit_buts_double_edge_mask(uiLayout *layout,
   uiItemR(col, ptr, "edge_mode", UI_ITEM_R_SPLIT_EMPTY_NAME, "", ICON_NONE);
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 class DoubleEdgeMaskOperation : public NodeOperation {
  public:
diff --git a/source/blender/nodes/composite/nodes/node_composite_ellipsemask.cc b/source/blender/nodes/composite/nodes/node_composite_ellipsemask.cc
index 60f99340164..48a793b003a 100644
--- a/source/blender/nodes/composite/nodes/node_composite_ellipsemask.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_ellipsemask.cc
@@ -78,7 +78,7 @@ static void node_composit_buts_ellipsemask(uiLayout *layout, bContext * /*C*/, P
   uiItemR(layout, ptr, "mask_type", UI_ITEM_R_SPLIT_EMPTY_NAME, std::nullopt, ICON_NONE);
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 template<CMPNodeMaskType MaskType>
 static void ellipse_mask(const Result &base_mask,
diff --git a/source/blender/nodes/composite/nodes/node_composite_exposure.cc b/source/blender/nodes/composite/nodes/node_composite_exposure.cc
index f334eac385d..aca9e93737b 100644
--- a/source/blender/nodes/composite/nodes/node_composite_exposure.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_exposure.cc
@@ -33,7 +33,7 @@ static void cmp_node_exposure_declare(NodeDeclarationBuilder &b)
   b.add_output<decl::Color>("Image");
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 class ExposureShaderNode : public ShaderNode {
  public:
diff --git a/source/blender/nodes/composite/nodes/node_composite_file_output.cc b/source/blender/nodes/composite/nodes/node_composite_file_output.cc
index 8fc4fdb1235..8e0e37d638d 100644
--- a/source/blender/nodes/composite/nodes/node_composite_file_output.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_file_output.cc
@@ -503,7 +503,7 @@ static void node_composit_buts_file_output_ex(uiLayout *layout, bContext *C, Poi
   }
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 class FileOutputOperation : public NodeOperation {
  public:
diff --git a/source/blender/nodes/composite/nodes/node_composite_filter.cc b/source/blender/nodes/composite/nodes/node_composite_filter.cc
index 57bcd50fda1..ba63fef8e8d 100644
--- a/source/blender/nodes/composite/nodes/node_composite_filter.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_filter.cc
@@ -41,7 +41,7 @@ static void node_composit_buts_filter(uiLayout *layout, bContext * /*C*/, Pointe
   uiItemR(layout, ptr, "filter_type", UI_ITEM_R_SPLIT_EMPTY_NAME, "", ICON_NONE);
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 class FilterOperation : public NodeOperation {
  public:
diff --git a/source/blender/nodes/composite/nodes/node_composite_flip.cc b/source/blender/nodes/composite/nodes/node_composite_flip.cc
index 39a45cb36ce..e9a1320b1a9 100644
--- a/source/blender/nodes/composite/nodes/node_composite_flip.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_flip.cc
@@ -38,7 +38,7 @@ static void node_composit_buts_flip(uiLayout *layout, bContext * /*C*/, PointerR
   uiItemR(layout, ptr, "axis", UI_ITEM_R_SPLIT_EMPTY_NAME, "", ICON_NONE);
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 class FlipOperation : public NodeOperation {
  public:
diff --git a/source/blender/nodes/composite/nodes/node_composite_gamma.cc b/source/blender/nodes/composite/nodes/node_composite_gamma.cc
index e63c2a3e813..cbf37a42fad 100644
--- a/source/blender/nodes/composite/nodes/node_composite_gamma.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_gamma.cc
@@ -37,7 +37,7 @@ static void cmp_node_gamma_declare(NodeDeclarationBuilder &b)
   b.add_output<decl::Color>("Image");
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 class GammaShaderNode : public ShaderNode {
  public:
diff --git a/source/blender/nodes/composite/nodes/node_composite_glare.cc b/source/blender/nodes/composite/nodes/node_composite_glare.cc
index e7b8c5879e1..c652100e12b 100644
--- a/source/blender/nodes/composite/nodes/node_composite_glare.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_glare.cc
@@ -128,7 +128,7 @@ static void node_composit_buts_glare(uiLayout *layout, bContext * /*C*/, Pointer
   }
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 class GlareOperation : public NodeOperation {
  public:
diff --git a/source/blender/nodes/composite/nodes/node_composite_hue_sat_val.cc b/source/blender/nodes/composite/nodes/node_composite_hue_sat_val.cc
index a099b54f882..634d3975b65 100644
--- a/source/blender/nodes/composite/nodes/node_composite_hue_sat_val.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_hue_sat_val.cc
@@ -58,7 +58,7 @@ static void cmp_node_huesatval_declare(NodeDeclarationBuilder &b)
   b.add_output<decl::Color>("Image");
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 class HueSaturationValueShaderNode : public ShaderNode {
  public:
diff --git a/source/blender/nodes/composite/nodes/node_composite_huecorrect.cc b/source/blender/nodes/composite/nodes/node_composite_huecorrect.cc
index 6665a77c8dc..baa48f2ca91 100644
--- a/source/blender/nodes/composite/nodes/node_composite_huecorrect.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_huecorrect.cc
@@ -57,7 +57,7 @@ static void node_composit_init_huecorrect(bNodeTree * /*ntree*/, bNode *node)
   cumapping->cur = 1;
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 static CurveMapping *get_curve_mapping(const bNode &node)
 {
diff --git a/source/blender/nodes/composite/nodes/node_composite_id_mask.cc b/source/blender/nodes/composite/nodes/node_composite_id_mask.cc
index 98f8daa1857..9a15036e3a3 100644
--- a/source/blender/nodes/composite/nodes/node_composite_id_mask.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_id_mask.cc
@@ -42,7 +42,7 @@ static void node_composit_buts_id_mask(uiLayout *layout, bContext * /*C*/, Point
   uiItemR(layout, ptr, "use_antialiasing", UI_ITEM_R_SPLIT_EMPTY_NAME, std::nullopt, ICON_NONE);
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 class IDMaskOperation : public NodeOperation {
  public:
diff --git a/source/blender/nodes/composite/nodes/node_composite_image.cc b/source/blender/nodes/composite/nodes/node_composite_image.cc
index 327a27ae026..c380ae65d55 100644
--- a/source/blender/nodes/composite/nodes/node_composite_image.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_image.cc
@@ -440,7 +440,7 @@ static void node_composit_copy_image(bNodeTree * /*dst_ntree*/,
   }
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 class ImageOperation : public NodeOperation {
  public:
@@ -659,7 +659,7 @@ static void node_composit_buts_viewlayers(uiLayout *layout, bContext *C, Pointer
   RNA_string_set(&op_ptr, "scene", scene_name);
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 class RenderLayerOperation : public NodeOperation {
  public:
diff --git a/source/blender/nodes/composite/nodes/node_composite_inpaint.cc b/source/blender/nodes/composite/nodes/node_composite_inpaint.cc
index ff892bab121..4795399a0ec 100644
--- a/source/blender/nodes/composite/nodes/node_composite_inpaint.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_inpaint.cc
@@ -40,7 +40,7 @@ static void node_composit_buts_inpaint(uiLayout *layout, bContext * /*C*/, Point
   uiItemR(layout, ptr, "distance", UI_ITEM_R_SPLIT_EMPTY_NAME, std::nullopt, ICON_NONE);
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 class InpaintOperation : public NodeOperation {
  public:
diff --git a/source/blender/nodes/composite/nodes/node_composite_invert.cc b/source/blender/nodes/composite/nodes/node_composite_invert.cc
index 30343b5503a..bea640dcd49 100644
--- a/source/blender/nodes/composite/nodes/node_composite_invert.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_invert.cc
@@ -54,7 +54,7 @@ static void node_composit_buts_invert(uiLayout *layout, bContext * /*C*/, Pointe
   uiItemR(col, ptr, "invert_alpha", UI_ITEM_R_SPLIT_EMPTY_NAME, std::nullopt, ICON_NONE);
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 static bool should_invert_rgb(const bNode &node)
 {
diff --git a/source/blender/nodes/composite/nodes/node_composite_keying.cc b/source/blender/nodes/composite/nodes/node_composite_keying.cc
index ba91cff473f..e5997824891 100644
--- a/source/blender/nodes/composite/nodes/node_composite_keying.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_keying.cc
@@ -82,7 +82,7 @@ static void node_composit_buts_keying(uiLayout *layout, bContext * /*C*/, Pointe
   uiItemR(layout, ptr, "blur_post", UI_ITEM_R_SPLIT_EMPTY_NAME, std::nullopt, ICON_NONE);
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 class KeyingOperation : public NodeOperation {
  public:
diff --git a/source/blender/nodes/composite/nodes/node_composite_keyingscreen.cc b/source/blender/nodes/composite/nodes/node_composite_keyingscreen.cc
index 7f863825ef3..cacb87e59af 100644
--- a/source/blender/nodes/composite/nodes/node_composite_keyingscreen.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_keyingscreen.cc
@@ -81,7 +81,7 @@ static void node_composit_buts_keyingscreen(uiLayout *layout, bContext *C, Point
   uiItemR(layout, ptr, "smoothness", UI_ITEM_NONE, std::nullopt, ICON_NONE);
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 class KeyingScreenOperation : public NodeOperation {
  public:
diff --git a/source/blender/nodes/composite/nodes/node_composite_kuwahara.cc b/source/blender/nodes/composite/nodes/node_composite_kuwahara.cc
index 8708c271ea4..ff786bfb385 100644
--- a/source/blender/nodes/composite/nodes/node_composite_kuwahara.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_kuwahara.cc
@@ -73,7 +73,7 @@ static void node_composit_buts_kuwahara(uiLayout *layout, bContext * /*C*/, Poin
   }
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 class ConvertKuwaharaOperation : public NodeOperation {
  public:
diff --git a/source/blender/nodes/composite/nodes/node_composite_lensdist.cc b/source/blender/nodes/composite/nodes/node_composite_lensdist.cc
index 40de89d2bb7..e8b4d5b4f19 100644
--- a/source/blender/nodes/composite/nodes/node_composite_lensdist.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_lensdist.cc
@@ -76,7 +76,7 @@ static void node_composit_buts_lensdist(uiLayout *layout, bContext * /*C*/, Poin
   uiItemR(col, ptr, "use_fit", UI_ITEM_R_SPLIT_EMPTY_NAME, std::nullopt, ICON_NONE);
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 /* --------------------------------------------------------------------
  * Screen Lens Distortion
diff --git a/source/blender/nodes/composite/nodes/node_composite_levels.cc b/source/blender/nodes/composite/nodes/node_composite_levels.cc
index ea8cf442540..f784b37eeae 100644
--- a/source/blender/nodes/composite/nodes/node_composite_levels.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_levels.cc
@@ -45,7 +45,7 @@ static void node_composit_buts_view_levels(uiLayout *layout, bContext * /*C*/, P
   uiItemR(layout, ptr, "channel", UI_ITEM_R_SPLIT_EMPTY_NAME, "", ICON_NONE);
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 class LevelsOperation : public NodeOperation {
  private:
diff --git a/source/blender/nodes/composite/nodes/node_composite_luma_matte.cc b/source/blender/nodes/composite/nodes/node_composite_luma_matte.cc
index aebaaa98c6b..451e4d6583f 100644
--- a/source/blender/nodes/composite/nodes/node_composite_luma_matte.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_luma_matte.cc
@@ -67,7 +67,7 @@ static void node_composit_buts_luma_matte(uiLayout *layout, bContext * /*C*/, Po
           ICON_NONE);
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 static float get_high(const bNode &node)
 {
diff --git a/source/blender/nodes/composite/nodes/node_composite_map_range.cc b/source/blender/nodes/composite/nodes/node_composite_map_range.cc
index bfdfc96fdcc..b02f36bf28d 100644
--- a/source/blender/nodes/composite/nodes/node_composite_map_range.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_map_range.cc
@@ -63,7 +63,7 @@ static void node_composit_buts_map_range(uiLayout *layout, bContext * /*C*/, Poi
   uiItemR(col, ptr, "use_clamp", UI_ITEM_R_SPLIT_EMPTY_NAME, std::nullopt, ICON_NONE);
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 static bool get_should_clamp(const bNode &node)
 {
diff --git a/source/blender/nodes/composite/nodes/node_composite_map_uv.cc b/source/blender/nodes/composite/nodes/node_composite_map_uv.cc
index 6ef58085fd3..0692ec3ae0c 100644
--- a/source/blender/nodes/composite/nodes/node_composite_map_uv.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_map_uv.cc
@@ -49,7 +49,7 @@ static void node_composit_init_map_uv(bNodeTree * /*ntree*/, bNode *node)
   node->custom2 = CMP_NODE_MAP_UV_FILTERING_ANISOTROPIC;
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 class MapUVOperation : public NodeOperation {
  public:
diff --git a/source/blender/nodes/composite/nodes/node_composite_map_value.cc b/source/blender/nodes/composite/nodes/node_composite_map_value.cc
index 2ca5d20ab11..68b52c58d4d 100644
--- a/source/blender/nodes/composite/nodes/node_composite_map_value.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_map_value.cc
@@ -65,7 +65,7 @@ static void node_composit_buts_map_value(uiLayout *layout, bContext * /*C*/, Poi
   uiItemR(sub, ptr, "max", UI_ITEM_R_SPLIT_EMPTY_NAME, "", ICON_NONE);
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 static bool get_use_min(const bNode &node)
 {
diff --git a/source/blender/nodes/composite/nodes/node_composite_mask.cc b/source/blender/nodes/composite/nodes/node_composite_mask.cc
index e8387972d53..f6b3a61b994 100644
--- a/source/blender/nodes/composite/nodes/node_composite_mask.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_mask.cc
@@ -70,7 +70,7 @@ static void node_composit_buts_mask(uiLayout *layout, bContext *C, PointerRNA *p
   }
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 class MaskOperation : public NodeOperation {
  public:
diff --git a/source/blender/nodes/composite/nodes/node_composite_math.cc b/source/blender/nodes/composite/nodes/node_composite_math.cc
index 62723f38491..a435b3fb2cd 100644
--- a/source/blender/nodes/composite/nodes/node_composite_math.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_math.cc
@@ -69,7 +69,7 @@ static void node_gather_link_searches(GatherLinkSearchOpParams &params)
   }
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 class MathShaderNode : public ShaderNode {
  public:
diff --git a/source/blender/nodes/composite/nodes/node_composite_mixrgb.cc b/source/blender/nodes/composite/nodes/node_composite_mixrgb.cc
index 195ab036694..b820b207ac3 100644
--- a/source/blender/nodes/composite/nodes/node_composite_mixrgb.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_mixrgb.cc
@@ -73,7 +73,7 @@ static void node_gather_link_searches(GatherLinkSearchOpParams &params)
   }
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 static int get_mode(const bNode &node)
 {
diff --git a/source/blender/nodes/composite/nodes/node_composite_movieclip.cc b/source/blender/nodes/composite/nodes/node_composite_movieclip.cc
index 809b0d2f26d..fb6b6e5f3bf 100644
--- a/source/blender/nodes/composite/nodes/node_composite_movieclip.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_movieclip.cc
@@ -76,7 +76,7 @@ static void node_composit_buts_movieclip_ex(uiLayout *layout, bContext *C, Point
   uiTemplateColorspaceSettings(layout, &clipptr, "colorspace_settings");
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 class MovieClipOperation : public NodeOperation {
  public:
diff --git a/source/blender/nodes/composite/nodes/node_composite_moviedistortion.cc b/source/blender/nodes/composite/nodes/node_composite_moviedistortion.cc
index 3293be6bdbf..be2310b2ba5 100644
--- a/source/blender/nodes/composite/nodes/node_composite_moviedistortion.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_moviedistortion.cc
@@ -87,7 +87,7 @@ static void node_composit_buts_moviedistortion(uiLayout *layout, bContext *C, Po
   uiItemR(layout, ptr, "distortion_type", UI_ITEM_R_SPLIT_EMPTY_NAME, "", ICON_NONE);
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 class MovieDistortionOperation : public NodeOperation {
  public:
diff --git a/source/blender/nodes/composite/nodes/node_composite_normal.cc b/source/blender/nodes/composite/nodes/node_composite_normal.cc
index d6928c159b8..9d6994bd9e1 100644
--- a/source/blender/nodes/composite/nodes/node_composite_normal.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_normal.cc
@@ -39,7 +39,7 @@ static void cmp_node_normal_declare(NodeDeclarationBuilder &b)
   b.add_output<decl::Float>("Dot");
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 /* The vector value is stored in the default value of the output socket. */
 static float3 get_vector_value(const bNode &node)
diff --git a/source/blender/nodes/composite/nodes/node_composite_normalize.cc b/source/blender/nodes/composite/nodes/node_composite_normalize.cc
index 29ae46f1203..05d06ea2769 100644
--- a/source/blender/nodes/composite/nodes/node_composite_normalize.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_normalize.cc
@@ -26,7 +26,7 @@ static void cmp_node_normalize_declare(NodeDeclarationBuilder &b)
   b.add_output<decl::Float>("Value");
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 class NormalizeOperation : public NodeOperation {
  private:
diff --git a/source/blender/nodes/composite/nodes/node_composite_pixelate.cc b/source/blender/nodes/composite/nodes/node_composite_pixelate.cc
index 6a33ee2c318..d6883120170 100644
--- a/source/blender/nodes/composite/nodes/node_composite_pixelate.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_pixelate.cc
@@ -39,7 +39,7 @@ static void node_composit_buts_pixelate(uiLayout *layout, bContext * /*C*/, Poin
   uiItemR(layout, ptr, "pixel_size", UI_ITEM_R_SPLIT_EMPTY_NAME, std::nullopt, ICON_NONE);
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 class PixelateOperation : public NodeOperation {
  public:
diff --git a/source/blender/nodes/composite/nodes/node_composite_planetrackdeform.cc b/source/blender/nodes/composite/nodes/node_composite_planetrackdeform.cc
index 7eb252c2d83..6401038a082 100644
--- a/source/blender/nodes/composite/nodes/node_composite_planetrackdeform.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_planetrackdeform.cc
@@ -113,7 +113,7 @@ static void node_composit_buts_planetrackdeform(uiLayout *layout, bContext *C, P
   }
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 class PlaneTrackDeformOperation : public NodeOperation {
  public:
diff --git a/source/blender/nodes/composite/nodes/node_composite_posterize.cc b/source/blender/nodes/composite/nodes/node_composite_posterize.cc
index 034b6e2d7fc..bdf904b4532 100644
--- a/source/blender/nodes/composite/nodes/node_composite_posterize.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_posterize.cc
@@ -37,7 +37,7 @@ static void cmp_node_posterize_declare(NodeDeclarationBuilder &b)
   b.add_output<decl::Color>("Image");
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 class PosterizeShaderNode : public ShaderNode {
  public:
diff --git a/source/blender/nodes/composite/nodes/node_composite_premulkey.cc b/source/blender/nodes/composite/nodes/node_composite_premulkey.cc
index 1df980c24f7..2b396f9a0f8 100644
--- a/source/blender/nodes/composite/nodes/node_composite_premulkey.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_premulkey.cc
@@ -38,7 +38,7 @@ static void node_composit_buts_premulkey(uiLayout *layout, bContext * /*C*/, Poi
   uiItemR(layout, ptr, "mapping", UI_ITEM_R_SPLIT_EMPTY_NAME, "", ICON_NONE);
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 static CMPNodeAlphaConvertMode get_mode(const bNode &node)
 {
diff --git a/source/blender/nodes/composite/nodes/node_composite_rgb.cc b/source/blender/nodes/composite/nodes/node_composite_rgb.cc
index 44ed1125135..7d59e567ca1 100644
--- a/source/blender/nodes/composite/nodes/node_composite_rgb.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_rgb.cc
@@ -23,7 +23,7 @@ static void cmp_node_rgb_declare(NodeDeclarationBuilder &b)
   b.add_output<decl::Color>("RGBA").default_value({0.5f, 0.5f, 0.5f, 1.0f});
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 class RGBOperation : public NodeOperation {
  public:
diff --git a/source/blender/nodes/composite/nodes/node_composite_rotate.cc b/source/blender/nodes/composite/nodes/node_composite_rotate.cc
index 2a6a2056559..00d85e5b779 100644
--- a/source/blender/nodes/composite/nodes/node_composite_rotate.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_rotate.cc
@@ -46,7 +46,7 @@ static void node_composit_buts_rotate(uiLayout *layout, bContext * /*C*/, Pointe
   uiItemR(layout, ptr, "filter_type", UI_ITEM_R_SPLIT_EMPTY_NAME, "", ICON_NONE);
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 class RotateOperation : public NodeOperation {
  public:
diff --git a/source/blender/nodes/composite/nodes/node_composite_scale.cc b/source/blender/nodes/composite/nodes/node_composite_scale.cc
index f0ba530f4ca..b77f16d0b91 100644
--- a/source/blender/nodes/composite/nodes/node_composite_scale.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_scale.cc
@@ -81,7 +81,7 @@ static void node_composit_buts_scale(uiLayout *layout, bContext * /*C*/, Pointer
   }
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 class ScaleOperation : public NodeOperation {
  public:
diff --git a/source/blender/nodes/composite/nodes/node_composite_scene_time.cc b/source/blender/nodes/composite/nodes/node_composite_scene_time.cc
index f45b8277e78..b873267bc9d 100644
--- a/source/blender/nodes/composite/nodes/node_composite_scene_time.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_scene_time.cc
@@ -17,7 +17,7 @@ static void cmp_node_scene_time_declare(NodeDeclarationBuilder &b)
   b.add_output<decl::Float>("Frame");
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 class SceneTimeOperation : public NodeOperation {
  public:
diff --git a/source/blender/nodes/composite/nodes/node_composite_sepcomb_color.cc b/source/blender/nodes/composite/nodes/node_composite_sepcomb_color.cc
index 4244fafa655..5a9ce3abee6 100644
--- a/source/blender/nodes/composite/nodes/node_composite_sepcomb_color.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_sepcomb_color.cc
@@ -89,7 +89,7 @@ static void cmp_node_separate_color_update(bNodeTree * /*ntree*/, bNode *node)
   node_cmp_combsep_color_label(&node->outputs, (CMPNodeCombSepColorMode)storage->mode);
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 class SeparateColorShaderNode : public ShaderNode {
  public:
@@ -293,7 +293,7 @@ static void cmp_node_combine_color_update(bNodeTree * /*ntree*/, bNode *node)
   node_cmp_combsep_color_label(&node->inputs, (CMPNodeCombSepColorMode)storage->mode);
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 class CombineColorShaderNode : public ShaderNode {
  public:
diff --git a/source/blender/nodes/composite/nodes/node_composite_sepcomb_hsva.cc b/source/blender/nodes/composite/nodes/node_composite_sepcomb_hsva.cc
index 0b2291eee86..c700c35ae91 100644
--- a/source/blender/nodes/composite/nodes/node_composite_sepcomb_hsva.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_sepcomb_hsva.cc
@@ -27,7 +27,7 @@ static void cmp_node_sephsva_declare(NodeDeclarationBuilder &b)
   b.add_output<decl::Float>("A").translation_context(BLT_I18NCONTEXT_COLOR);
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 class SeparateHSVAShaderNode : public ShaderNode {
  public:
@@ -94,7 +94,7 @@ static void cmp_node_combhsva_declare(NodeDeclarationBuilder &b)
   b.add_output<decl::Color>("Image");
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 class CombineHSVAShaderNode : public ShaderNode {
  public:
diff --git a/source/blender/nodes/composite/nodes/node_composite_sepcomb_rgba.cc b/source/blender/nodes/composite/nodes/node_composite_sepcomb_rgba.cc
index 4974b07cebb..0d34bf44340 100644
--- a/source/blender/nodes/composite/nodes/node_composite_sepcomb_rgba.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_sepcomb_rgba.cc
@@ -27,7 +27,7 @@ static void cmp_node_seprgba_declare(NodeDeclarationBuilder &b)
   b.add_output<decl::Float>("A").translation_context(BLT_I18NCONTEXT_COLOR);
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 class SeparateRGBAShaderNode : public ShaderNode {
  public:
@@ -94,7 +94,7 @@ static void cmp_node_combrgba_declare(NodeDeclarationBuilder &b)
   b.add_output<decl::Color>("Image");
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 class CombineRGBAShaderNode : public ShaderNode {
  public:
diff --git a/source/blender/nodes/composite/nodes/node_composite_sepcomb_xyz.cc b/source/blender/nodes/composite/nodes/node_composite_sepcomb_xyz.cc
index 80c7888d25c..2249487df68 100644
--- a/source/blender/nodes/composite/nodes/node_composite_sepcomb_xyz.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_sepcomb_xyz.cc
@@ -30,7 +30,7 @@ static void cmp_node_separate_xyz_declare(NodeDeclarationBuilder &b)
   b.add_output<decl::Float>("Z");
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 class SeparateXYZShaderNode : public ShaderNode {
  public:
@@ -91,7 +91,7 @@ static void cmp_node_combine_xyz_declare(NodeDeclarationBuilder &b)
   b.add_output<decl::Vector>("Vector");
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 class CombineXYZShaderNode : public ShaderNode {
  public:
diff --git a/source/blender/nodes/composite/nodes/node_composite_sepcomb_ycca.cc b/source/blender/nodes/composite/nodes/node_composite_sepcomb_ycca.cc
index f83d9373cb1..8e83b88c45a 100644
--- a/source/blender/nodes/composite/nodes/node_composite_sepcomb_ycca.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_sepcomb_ycca.cc
@@ -34,7 +34,7 @@ static void node_composit_init_mode_sepycca(bNodeTree * /*ntree*/, bNode *node)
   node->custom1 = 1; /* BLI_YCC_ITU_BT709 */
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 class SeparateYCCAShaderNode : public ShaderNode {
  public:
@@ -127,7 +127,7 @@ static void node_composit_init_mode_combycca(bNodeTree * /*ntree*/, bNode *node)
   node->custom1 = 1; /* BLI_YCC_ITU_BT709 */
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 class CombineYCCAShaderNode : public ShaderNode {
  public:
diff --git a/source/blender/nodes/composite/nodes/node_composite_sepcomb_yuva.cc b/source/blender/nodes/composite/nodes/node_composite_sepcomb_yuva.cc
index dbc54992d3a..2bbf17e1b98 100644
--- a/source/blender/nodes/composite/nodes/node_composite_sepcomb_yuva.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_sepcomb_yuva.cc
@@ -27,7 +27,7 @@ static void cmp_node_sepyuva_declare(NodeDeclarationBuilder &b)
   b.add_output<decl::Float>("A").translation_context(BLT_I18NCONTEXT_COLOR);
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 class SeparateYUVAShaderNode : public ShaderNode {
  public:
@@ -94,7 +94,7 @@ static void cmp_node_combyuva_declare(NodeDeclarationBuilder &b)
   b.add_output<decl::Color>("Image");
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 class CombineYUVAShaderNode : public ShaderNode {
  public:
diff --git a/source/blender/nodes/composite/nodes/node_composite_setalpha.cc b/source/blender/nodes/composite/nodes/node_composite_setalpha.cc
index d8abbe3c339..31680164ba8 100644
--- a/source/blender/nodes/composite/nodes/node_composite_setalpha.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_setalpha.cc
@@ -52,7 +52,7 @@ static void node_composit_buts_set_alpha(uiLayout *layout, bContext * /*C*/, Poi
   uiItemR(layout, ptr, "mode", UI_ITEM_R_SPLIT_EMPTY_NAME, std::nullopt, ICON_NONE);
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 static CMPNodeSetAlphaMode get_mode(const bNode &node)
 {
diff --git a/source/blender/nodes/composite/nodes/node_composite_split.cc b/source/blender/nodes/composite/nodes/node_composite_split.cc
index d486ee8a9b2..92e1da91ecc 100644
--- a/source/blender/nodes/composite/nodes/node_composite_split.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_split.cc
@@ -44,7 +44,7 @@ static void node_composit_buts_split(uiLayout *layout, bContext * /*C*/, Pointer
   uiItemR(col, ptr, "factor", UI_ITEM_R_SPLIT_EMPTY_NAME, std::nullopt, ICON_NONE);
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 class SplitOperation : public NodeOperation {
  public:
diff --git a/source/blender/nodes/composite/nodes/node_composite_stabilize2d.cc b/source/blender/nodes/composite/nodes/node_composite_stabilize2d.cc
index 521d148d3c8..08d617c8553 100644
--- a/source/blender/nodes/composite/nodes/node_composite_stabilize2d.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_stabilize2d.cc
@@ -66,7 +66,7 @@ static void node_composit_buts_stabilize2d(uiLayout *layout, bContext *C, Pointe
   uiItemR(layout, ptr, "invert", UI_ITEM_R_SPLIT_EMPTY_NAME, std::nullopt, ICON_NONE);
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 class Stabilize2DOperation : public NodeOperation {
  public:
diff --git a/source/blender/nodes/composite/nodes/node_composite_sunbeams.cc b/source/blender/nodes/composite/nodes/node_composite_sunbeams.cc
index 434d357e745..ae2fb8da35e 100644
--- a/source/blender/nodes/composite/nodes/node_composite_sunbeams.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_sunbeams.cc
@@ -52,7 +52,7 @@ static void node_composit_buts_sunbeams(uiLayout *layout, bContext * /*C*/, Poin
           ICON_NONE);
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 class SunBeamsOperation : public NodeOperation {
  public:
diff --git a/source/blender/nodes/composite/nodes/node_composite_switch.cc b/source/blender/nodes/composite/nodes/node_composite_switch.cc
index bf1936f70b1..dad99cc67e0 100644
--- a/source/blender/nodes/composite/nodes/node_composite_switch.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_switch.cc
@@ -29,7 +29,7 @@ static void node_composit_buts_switch(uiLayout *layout, bContext * /*C*/, Pointe
   uiItemR(layout, ptr, "check", UI_ITEM_R_SPLIT_EMPTY_NAME, std::nullopt, ICON_NONE);
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 class SwitchOperation : public NodeOperation {
  public:
diff --git a/source/blender/nodes/composite/nodes/node_composite_switchview.cc b/source/blender/nodes/composite/nodes/node_composite_switchview.cc
index 9c699cc4378..46c33a1640f 100644
--- a/source/blender/nodes/composite/nodes/node_composite_switchview.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_switchview.cc
@@ -52,7 +52,7 @@ static void init_switch_view(const bContext *C, PointerRNA *ptr)
   id_us_plus(node->id);
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 class SwitchViewOperation : public NodeOperation {
  public:
diff --git a/source/blender/nodes/composite/nodes/node_composite_texture.cc b/source/blender/nodes/composite/nodes/node_composite_texture.cc
index f5668a47cf0..14c1c398b7a 100644
--- a/source/blender/nodes/composite/nodes/node_composite_texture.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_texture.cc
@@ -32,7 +32,7 @@ static void cmp_node_texture_declare(NodeDeclarationBuilder &b)
   b.add_output<decl::Color>("Color");
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 class TextureOperation : public NodeOperation {
  public:
diff --git a/source/blender/nodes/composite/nodes/node_composite_tonemap.cc b/source/blender/nodes/composite/nodes/node_composite_tonemap.cc
index 813683e4f7f..a65c0ed649a 100644
--- a/source/blender/nodes/composite/nodes/node_composite_tonemap.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_tonemap.cc
@@ -89,7 +89,7 @@ static void node_composit_buts_tonemap(uiLayout *layout, bContext * /*C*/, Point
   }
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 class ToneMapOperation : public NodeOperation {
  public:
diff --git a/source/blender/nodes/composite/nodes/node_composite_trackpos.cc b/source/blender/nodes/composite/nodes/node_composite_trackpos.cc
index f7d37cf89a2..cbcd158f716 100644
--- a/source/blender/nodes/composite/nodes/node_composite_trackpos.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_trackpos.cc
@@ -103,7 +103,7 @@ static void node_composit_buts_trackpos(uiLayout *layout, bContext *C, PointerRN
   }
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 class TrackPositionOperation : public NodeOperation {
  public:
diff --git a/source/blender/nodes/composite/nodes/node_composite_transform.cc b/source/blender/nodes/composite/nodes/node_composite_transform.cc
index be793d3403a..b171a82ea42 100644
--- a/source/blender/nodes/composite/nodes/node_composite_transform.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_transform.cc
@@ -57,7 +57,7 @@ static void node_composit_buts_transform(uiLayout *layout, bContext * /*C*/, Poi
   uiItemR(layout, ptr, "filter_type", UI_ITEM_R_SPLIT_EMPTY_NAME, "", ICON_NONE);
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 class TransformOperation : public NodeOperation {
  public:
diff --git a/source/blender/nodes/composite/nodes/node_composite_translate.cc b/source/blender/nodes/composite/nodes/node_composite_translate.cc
index 8846ebdd1d4..fa0a671708e 100644
--- a/source/blender/nodes/composite/nodes/node_composite_translate.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_translate.cc
@@ -53,7 +53,7 @@ static void node_composit_buts_translate(uiLayout *layout, bContext * /*C*/, Poi
   uiItemR(layout, ptr, "wrap_axis", UI_ITEM_R_SPLIT_EMPTY_NAME, std::nullopt, ICON_NONE);
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 class TranslateOperation : public NodeOperation {
  public:
diff --git a/source/blender/nodes/composite/nodes/node_composite_val_to_rgb.cc b/source/blender/nodes/composite/nodes/node_composite_val_to_rgb.cc
index aa1067e0e5c..c6839fa10ed 100644
--- a/source/blender/nodes/composite/nodes/node_composite_val_to_rgb.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_val_to_rgb.cc
@@ -45,7 +45,7 @@ static void node_composit_init_valtorgb(bNodeTree * /*ntree*/, bNode *node)
   node->storage = BKE_colorband_add(true);
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 static ColorBand *get_color_band(const bNode &node)
 {
@@ -178,7 +178,7 @@ static void cmp_node_rgbtobw_declare(NodeDeclarationBuilder &b)
   b.add_output<decl::Float>("Val");
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 class RGBToBWShaderNode : public ShaderNode {
  public:
diff --git a/source/blender/nodes/composite/nodes/node_composite_value.cc b/source/blender/nodes/composite/nodes/node_composite_value.cc
index 177142a8858..27d9964dea4 100644
--- a/source/blender/nodes/composite/nodes/node_composite_value.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_value.cc
@@ -19,7 +19,7 @@ static void cmp_node_value_declare(NodeDeclarationBuilder &b)
   b.add_output<decl::Float>("Value").default_value(0.5f);
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 class ValueOperation : public NodeOperation {
  public:
diff --git a/source/blender/nodes/composite/nodes/node_composite_vec_blur.cc b/source/blender/nodes/composite/nodes/node_composite_vec_blur.cc
index acbda487059..27542f9eebc 100644
--- a/source/blender/nodes/composite/nodes/node_composite_vec_blur.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_vec_blur.cc
@@ -66,7 +66,7 @@ static void node_composit_buts_vecblur(uiLayout *layout, bContext * /*C*/, Point
   uiItemR(col, ptr, "factor", UI_ITEM_R_SPLIT_EMPTY_NAME, IFACE_("Blur"), ICON_NONE);
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 #define MOTION_BLUR_TILE_SIZE 32
 #define DEPTH_SCALE 100.0f
diff --git a/source/blender/nodes/composite/nodes/node_composite_viewer.cc b/source/blender/nodes/composite/nodes/node_composite_viewer.cc
index 6f45eb99bd0..14e9b8e0fd6 100644
--- a/source/blender/nodes/composite/nodes/node_composite_viewer.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_viewer.cc
@@ -49,7 +49,7 @@ static void node_composit_buts_viewer(uiLayout *layout, bContext * /*C*/, Pointe
   uiItemR(layout, ptr, "use_alpha", UI_ITEM_R_SPLIT_EMPTY_NAME, std::nullopt, ICON_NONE);
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 class ViewerOperation : public NodeOperation {
  public:
diff --git a/source/blender/nodes/composite/nodes/node_composite_zcombine.cc b/source/blender/nodes/composite/nodes/node_composite_zcombine.cc
index 6a82c8d78e3..b972134351c 100644
--- a/source/blender/nodes/composite/nodes/node_composite_zcombine.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_zcombine.cc
@@ -56,7 +56,7 @@ static void node_composit_buts_zcombine(uiLayout *layout, bContext * /*C*/, Poin
   uiItemR(col, ptr, "use_antialias_z", UI_ITEM_R_SPLIT_EMPTY_NAME, std::nullopt, ICON_NONE);
 }
 
-using namespace blender::realtime_compositor;
+using namespace blender::compositor;
 
 class ZCombineOperation : public NodeOperation {
  public:
diff --git a/source/blender/render/RE_compositor.hh b/source/blender/render/RE_compositor.hh
index d68412f4304..99ec93b25cc 100644
--- a/source/blender/render/RE_compositor.hh
+++ b/source/blender/render/RE_compositor.hh
@@ -6,10 +6,10 @@
 
 #include <memory>
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 class RenderContext;
 class Profiler;
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
 
 struct bNodeTree;
 struct Render;
@@ -33,8 +33,8 @@ void RE_compositor_execute(Render &render,
                            const RenderData &render_data,
                            const bNodeTree &node_tree,
                            const char *view_name,
-                           blender::realtime_compositor::RenderContext *render_context,
-                           blender::realtime_compositor::Profiler *profiler);
+                           blender::compositor::RenderContext *render_context,
+                           blender::compositor::Profiler *profiler);
 
 /* Free compositor caches. */
 void RE_compositor_free(Render &render);
diff --git a/source/blender/render/intern/compositor.cc b/source/blender/render/intern/compositor.cc
index 38a5977e8c2..fd00a809ed5 100644
--- a/source/blender/render/intern/compositor.cc
+++ b/source/blender/render/intern/compositor.cc
@@ -48,16 +48,16 @@ namespace blender::render {
  * TODO: should share pool with draw manager. It needs some globals initialization figured out
  * there first.
  */
-class TexturePool : public realtime_compositor::TexturePool {
+class TexturePool : public compositor::TexturePool {
  private:
   /** Textures that are not yet used and are available to be acquired. After evaluation, any
    * texture in this map should be freed because it was not acquired in the evaluation and is thus
    * unused. Textures removed from this map should be moved to the textures_in_use_ map when
    * acquired. */
-  Map<realtime_compositor::TexturePoolKey, Vector<GPUTexture *>> available_textures_;
+  Map<compositor::TexturePoolKey, Vector<GPUTexture *>> available_textures_;
   /** Textures that were acquired in this compositor evaluation. After evaluation, those textures
    * are moved to the available_textures_ map to be acquired in the next evaluation. */
-  Map<realtime_compositor::TexturePoolKey, Vector<GPUTexture *>> textures_in_use_;
+  Map<compositor::TexturePoolKey, Vector<GPUTexture *>> textures_in_use_;
 
  public:
   virtual ~TexturePool()
@@ -77,7 +77,7 @@ class TexturePool : public realtime_compositor::TexturePool {
 
   GPUTexture *allocate_texture(int2 size, eGPUTextureFormat format) override
   {
-    const realtime_compositor::TexturePoolKey key(size, format);
+    const compositor::TexturePoolKey key(size, format);
     Vector<GPUTexture *> &available_textures = available_textures_.lookup_or_add_default(key);
     GPUTexture *texture = nullptr;
     if (available_textures.is_empty()) {
@@ -128,15 +128,15 @@ class ContextInputData {
   const RenderData *render_data;
   const bNodeTree *node_tree;
   std::string view_name;
-  realtime_compositor::RenderContext *render_context;
-  realtime_compositor::Profiler *profiler;
+  compositor::RenderContext *render_context;
+  compositor::Profiler *profiler;
 
   ContextInputData(const Scene &scene,
                    const RenderData &render_data,
                    const bNodeTree &node_tree,
                    const char *view_name,
-                   realtime_compositor::RenderContext *render_context,
-                   realtime_compositor::Profiler *profiler)
+                   compositor::RenderContext *render_context,
+                   compositor::Profiler *profiler)
       : scene(&scene),
         render_data(&render_data),
         node_tree(&node_tree),
@@ -149,16 +149,16 @@ class ContextInputData {
 
 /* Render Context Data */
 
-class Context : public realtime_compositor::Context {
+class Context : public compositor::Context {
  private:
   /* Input data. */
   ContextInputData input_data_;
 
   /* Output combined result. */
-  realtime_compositor::Result output_result_;
+  compositor::Result output_result_;
 
   /* Viewer output result. */
-  realtime_compositor::Result viewer_output_result_;
+  compositor::Result viewer_output_result_;
 
   /* Cached GPU and CPU passes that the compositor took ownership of. Those had their reference
    * count incremented when accessed and need to be freed/have their reference count decremented
@@ -168,10 +168,10 @@ class Context : public realtime_compositor::Context {
 
  public:
   Context(const ContextInputData &input_data, TexturePool &texture_pool)
-      : realtime_compositor::Context(texture_pool),
+      : compositor::Context(texture_pool),
         input_data_(input_data),
-        output_result_(this->create_result(realtime_compositor::ResultType::Color)),
-        viewer_output_result_(this->create_result(realtime_compositor::ResultType::Color))
+        output_result_(this->create_result(compositor::ResultType::Color)),
+        viewer_output_result_(this->create_result(compositor::ResultType::Color))
   {
   }
 
@@ -242,7 +242,7 @@ class Context : public realtime_compositor::Context {
     return render_region;
   }
 
-  realtime_compositor::Result get_output_result() override
+  compositor::Result get_output_result() override
   {
     const int2 render_size = get_render_size();
     if (output_result_.is_allocated()) {
@@ -262,10 +262,9 @@ class Context : public realtime_compositor::Context {
     return output_result_;
   }
 
-  realtime_compositor::Result get_viewer_output_result(
-      realtime_compositor::Domain domain,
-      const bool is_data,
-      realtime_compositor::ResultPrecision precision) override
+  compositor::Result get_viewer_output_result(compositor::Domain domain,
+                                              const bool is_data,
+                                              compositor::ResultPrecision precision) override
   {
     viewer_output_result_.set_transformation(domain.transformation);
     viewer_output_result_.meta_data.is_non_color_data = is_data;
@@ -290,53 +289,53 @@ class Context : public realtime_compositor::Context {
     return viewer_output_result_;
   }
 
-  realtime_compositor::Result get_pass(const Scene *scene,
-                                       int view_layer_id,
-                                       const char *pass_name) override
+  compositor::Result get_pass(const Scene *scene,
+                              int view_layer_id,
+                              const char *pass_name) override
   {
     if (!scene) {
-      return realtime_compositor::Result(*this);
+      return compositor::Result(*this);
     }
 
     ViewLayer *view_layer = static_cast<ViewLayer *>(
         BLI_findlink(&scene->view_layers, view_layer_id));
     if (!view_layer) {
-      return realtime_compositor::Result(*this);
+      return compositor::Result(*this);
     }
 
     Render *render = RE_GetSceneRender(scene);
     if (!render) {
-      return realtime_compositor::Result(*this);
+      return compositor::Result(*this);
     }
 
     RenderResult *render_result = RE_AcquireResultRead(render);
     if (!render_result) {
       RE_ReleaseResult(render);
-      return realtime_compositor::Result(*this);
+      return compositor::Result(*this);
     }
 
     RenderLayer *render_layer = RE_GetRenderLayer(render_result, view_layer->name);
     if (!render_layer) {
       RE_ReleaseResult(render);
-      return realtime_compositor::Result(*this);
+      return compositor::Result(*this);
     }
 
     RenderPass *render_pass = RE_pass_find_by_name(
         render_layer, pass_name, this->get_view_name().data());
     if (!render_pass) {
       RE_ReleaseResult(render);
-      return realtime_compositor::Result(*this);
+      return compositor::Result(*this);
     }
 
     if (!render_pass || !render_pass->ibuf || !render_pass->ibuf->float_buffer.data) {
       RE_ReleaseResult(render);
-      return realtime_compositor::Result(*this);
+      return compositor::Result(*this);
     }
 
     const eGPUTextureFormat format = (render_pass->channels == 1) ? GPU_R32F :
                                      (render_pass->channels == 3) ? GPU_RGB32F :
                                                                     GPU_RGBA32F;
-    realtime_compositor::Result pass = realtime_compositor::Result(*this, format);
+    compositor::Result pass = compositor::Result(*this, format);
 
     if (this->use_gpu()) {
       GPUTexture *pass_texture = RE_pass_ensure_gpu_texture_cache(render, render_pass);
@@ -362,23 +361,23 @@ class Context : public realtime_compositor::Context {
     return input_data_.view_name;
   }
 
-  realtime_compositor::ResultPrecision get_precision() const override
+  compositor::ResultPrecision get_precision() const override
   {
     switch (input_data_.scene->r.compositor_precision) {
       case SCE_COMPOSITOR_PRECISION_AUTO:
         /* Auto uses full precision for final renders and half procession otherwise. */
         if (this->render_context()) {
-          return realtime_compositor::ResultPrecision::Full;
+          return compositor::ResultPrecision::Full;
         }
         else {
-          return realtime_compositor::ResultPrecision::Half;
+          return compositor::ResultPrecision::Half;
         }
       case SCE_COMPOSITOR_PRECISION_FULL:
-        return realtime_compositor::ResultPrecision::Full;
+        return compositor::ResultPrecision::Full;
     }
 
     BLI_assert_unreachable();
-    return realtime_compositor::ResultPrecision::Full;
+    return compositor::ResultPrecision::Full;
   }
 
   void set_info_message(StringRef /*message*/) const override
@@ -402,7 +401,7 @@ class Context : public realtime_compositor::Context {
   void populate_meta_data_for_pass(const Scene *scene,
                                    int view_layer_id,
                                    const char *pass_name,
-                                   realtime_compositor::MetaData &meta_data) const override
+                                   compositor::MetaData &meta_data) const override
   {
     if (!scene) {
       return;
@@ -433,7 +432,7 @@ class Context : public realtime_compositor::Context {
 
     struct StampCallbackData {
       std::string cryptomatte_layer_name;
-      realtime_compositor::MetaData *meta_data;
+      compositor::MetaData *meta_data;
     };
 
     /* Go over the stamp data and add any Cryptomatte related meta data. */
@@ -592,12 +591,12 @@ class Context : public realtime_compositor::Context {
     }
   }
 
-  realtime_compositor::RenderContext *render_context() const override
+  compositor::RenderContext *render_context() const override
   {
     return input_data_.render_context;
   }
 
-  realtime_compositor::Profiler *profiler() const override
+  compositor::Profiler *profiler() const override
   {
     return input_data_.profiler;
   }
@@ -633,7 +632,7 @@ class RealtimeCompositor {
    * changed them since the last evaluation. See the needs_to_be_recreated method for more info on
    * why those are needed. */
   bool uses_gpu_;
-  realtime_compositor::ResultPrecision used_precision_;
+  compositor::ResultPrecision used_precision_;
 
  public:
   RealtimeCompositor(Render &render, const ContextInputData &input_data) : render_(render)
@@ -704,7 +703,7 @@ class RealtimeCompositor {
     /* Always recreate the evaluator, as this only runs on compositing node changes and
      * there is no reason to cache this. Unlike the viewport where it helps for navigation. */
     {
-      realtime_compositor::Evaluator evaluator(*context_);
+      compositor::Evaluator evaluator(*context_);
       evaluator.evaluate();
     }
 
@@ -744,8 +743,8 @@ void Render::compositor_execute(const Scene &scene,
                                 const RenderData &render_data,
                                 const bNodeTree &node_tree,
                                 const char *view_name,
-                                blender::realtime_compositor::RenderContext *render_context,
-                                blender::realtime_compositor::Profiler *profiler)
+                                blender::compositor::RenderContext *render_context,
+                                blender::compositor::Profiler *profiler)
 {
   std::unique_lock lock(this->compositor_mutex);
 
@@ -784,8 +783,8 @@ void RE_compositor_execute(Render &render,
                            const RenderData &render_data,
                            const bNodeTree &node_tree,
                            const char *view_name,
-                           blender::realtime_compositor::RenderContext *render_context,
-                           blender::realtime_compositor::Profiler *profiler)
+                           blender::compositor::RenderContext *render_context,
+                           blender::compositor::Profiler *profiler)
 {
   render.compositor_execute(scene, render_data, node_tree, view_name, render_context, profiler);
 }
diff --git a/source/blender/render/intern/pipeline.cc b/source/blender/render/intern/pipeline.cc
index 4d6cefffff9..b259d96ad26 100644
--- a/source/blender/render/intern/pipeline.cc
+++ b/source/blender/render/intern/pipeline.cc
@@ -1373,7 +1373,7 @@ static void do_render_compositor(Render *re)
           /* If we have consistent depsgraph now would be a time to update them. */
         }
 
-        blender::realtime_compositor::RenderContext compositor_render_context;
+        blender::compositor::RenderContext compositor_render_context;
         LISTBASE_FOREACH (RenderView *, rv, &re->result->views) {
           ntreeCompositExecTree(re,
                                 re->pipeline_scene_eval,
diff --git a/source/blender/render/intern/render_types.h b/source/blender/render/intern/render_types.h
index 8737ad9b1ab..4013bf2bb02 100644
--- a/source/blender/render/intern/render_types.h
+++ b/source/blender/render/intern/render_types.h
@@ -23,10 +23,10 @@
 
 #include "tile_highlight.h"
 
-namespace blender::realtime_compositor {
+namespace blender::compositor {
 class RenderContext;
 class Profiler;
-}  // namespace blender::realtime_compositor
+}  // namespace blender::compositor
 
 struct bNodeTree;
 struct Depsgraph;
@@ -50,8 +50,8 @@ struct BaseRender {
                                   const RenderData &render_data,
                                   const bNodeTree &node_tree,
                                   const char *view_name,
-                                  blender::realtime_compositor::RenderContext *render_context,
-                                  blender::realtime_compositor::Profiler *profiler) = 0;
+                                  blender::compositor::RenderContext *render_context,
+                                  blender::compositor::Profiler *profiler) = 0;
   virtual void compositor_free() = 0;
 
   virtual void display_init(RenderResult *render_result) = 0;
@@ -102,8 +102,8 @@ struct ViewRender : public BaseRender {
                           const RenderData & /*render_data*/,
                           const bNodeTree & /*node_tree*/,
                           const char * /*view_name*/,
-                          blender::realtime_compositor::RenderContext * /*render_context*/,
-                          blender::realtime_compositor::Profiler * /*profiler*/) override
+                          blender::compositor::RenderContext * /*render_context*/,
+                          blender::compositor::Profiler * /*profiler*/) override
   {
   }
   void compositor_free() override {}
@@ -147,8 +147,8 @@ struct Render : public BaseRender {
                           const RenderData &render_data,
                           const bNodeTree &node_tree,
                           const char *view_name,
-                          blender::realtime_compositor::RenderContext *render_context,
-                          blender::realtime_compositor::Profiler *profiler) override;
+                          blender::compositor::RenderContext *render_context,
+                          blender::compositor::Profiler *profiler) override;
   void compositor_free() override;
 
   void display_init(RenderResult *render_result) override;