diff --git a/source/blender/blenkernel/BKE_image.hh b/source/blender/blenkernel/BKE_image.hh
index d9ebe2cce37..84e401be452 100644
--- a/source/blender/blenkernel/BKE_image.hh
+++ b/source/blender/blenkernel/BKE_image.hh
@@ -563,7 +563,7 @@ void BKE_image_ensure_gpu_texture(Image *image, ImageUser *iuser);
  * and view can be cached at a time, so the cache should be invalidated in operators and RNA
  * callbacks that change the layer, pass, or view of the image to maintain a correct cache state.
  * However, in some cases, multiple layers, passes, or views might be needed at the same time, like
- * is the case for the realtime compositor. This is currently not supported, so the caller should
+ * is the case for the compositor. This is currently not supported, so the caller should
  * ensure that the requested layer is indeed the cached one and invalidated the cached otherwise by
  * calling BKE_image_ensure_gpu_texture. This is a workaround until image can support a more
  * complete caching system.
diff --git a/source/blender/blenkernel/BKE_node.hh b/source/blender/blenkernel/BKE_node.hh
index b48acc88ca5..7823a87ac3c 100644
--- a/source/blender/blenkernel/BKE_node.hh
+++ b/source/blender/blenkernel/BKE_node.hh
@@ -328,10 +328,10 @@ struct bNodeType {
    * responsibility of the caller. */
   NodeGetCompositorShaderNodeFunction get_compositor_shader_node;
 
-  /* A message to display in the node header for unsupported realtime compositor nodes. The message
+  /* A message to display in the node header for unsupported compositor nodes. The message
    * is assumed to be static and thus require no memory handling. This field is to be removed when
    * all nodes are supported. */
-  const char *realtime_compositor_unsupported_message;
+  const char *compositor_unsupported_message;
 
   /* Build a multi-function for this node. */
   NodeMultiFunctionBuildFunction build_multi_function;
diff --git a/source/blender/compositor/intern/COM_compositor.cc b/source/blender/compositor/intern/COM_compositor.cc
index 2a65c228263..d92d209a856 100644
--- a/source/blender/compositor/intern/COM_compositor.cc
+++ b/source/blender/compositor/intern/COM_compositor.cc
@@ -77,7 +77,6 @@ void COM_execute(Render *render,
   compositor_init_node_previews(render_data, node_tree);
   compositor_reset_node_tree_status(node_tree);
 
-  /* Realtime compositor. */
   RE_compositor_execute(
       *render, *scene, *render_data, *node_tree, view_name, render_context, profiler);
 
diff --git a/source/blender/editors/space_node/node_draw.cc b/source/blender/editors/space_node/node_draw.cc
index abbc30e3406..9ada6e01eaf 100644
--- a/source/blender/editors/space_node/node_draw.cc
+++ b/source/blender/editors/space_node/node_draw.cc
@@ -134,9 +134,9 @@ struct TreeDrawContext {
 
   NestedTreePreviews *nested_group_infos = nullptr;
   /**
-   * True if there is an active realtime compositor using the node tree, false otherwise.
+   * True if there is an active compositor using the node tree, false otherwise.
    */
-  bool used_by_realtime_compositor = false;
+  bool used_by_compositor = false;
 
   blender::Map<bNodeInstanceKey, blender::timeit::Nanoseconds>
       *compositor_per_node_execution_time = nullptr;
@@ -2566,7 +2566,7 @@ static void node_add_unsupported_compositor_operation_error_message_button(const
                nullptr,
                0,
                0,
-               TIP_(node.typeinfo->realtime_compositor_unsupported_message));
+               TIP_(node.typeinfo->compositor_unsupported_message));
   UI_block_emboss_set(&block, UI_EMBOSS);
 }
 
@@ -2576,9 +2576,7 @@ static void node_add_error_message_button(const TreeDrawContext &tree_draw_ctx,
                                           const rctf &rect,
                                           float &icon_offset)
 {
-  if (tree_draw_ctx.used_by_realtime_compositor &&
-      node.typeinfo->realtime_compositor_unsupported_message)
-  {
+  if (tree_draw_ctx.used_by_compositor && node.typeinfo->compositor_unsupported_message) {
     node_add_unsupported_compositor_operation_error_message_button(node, block, rect, icon_offset);
     return;
   }
@@ -4721,7 +4719,7 @@ static void snode_setup_v2d(SpaceNode &snode, ARegion &region, const float2 &cen
 }
 
 /* Similar to DRW_is_viewport_compositor_enabled() in `draw_manager.cc` but checks all 3D views. */
-static bool realtime_compositor_is_in_use(const bContext &context)
+static bool compositor_is_in_use(const bContext &context)
 {
   const Scene *scene = CTX_data_scene(&context);
   if (!scene->use_nodes) {
@@ -4797,7 +4795,7 @@ static void draw_nodetree(const bContext &C,
   }
   else if (ntree.type == NTREE_COMPOSIT) {
     const Scene *scene = CTX_data_scene(&C);
-    tree_draw_ctx.used_by_realtime_compositor = realtime_compositor_is_in_use(C);
+    tree_draw_ctx.used_by_compositor = compositor_is_in_use(C);
     tree_draw_ctx.compositor_per_node_execution_time =
         &scene->runtime->compositor.per_node_execution_time;
   }
diff --git a/source/blender/gpu/intern/gpu_shader_create_info_list.hh b/source/blender/gpu/intern/gpu_shader_create_info_list.hh
index 160e77247c1..d7c80aac4c4 100644
--- a/source/blender/gpu/intern/gpu_shader_create_info_list.hh
+++ b/source/blender/gpu/intern/gpu_shader_create_info_list.hh
@@ -50,7 +50,7 @@
 #  include "gpu_shader_fullscreen_blit_info.hh"
 #endif
 
-/* Realtime compositor. */
+/* Compositor. */
 #include "compositor_alpha_crop_info.hh"
 #include "compositor_bilateral_blur_info.hh"
 #include "compositor_bokeh_blur_info.hh"
diff --git a/source/blender/nodes/composite/nodes/node_composite_image.cc b/source/blender/nodes/composite/nodes/node_composite_image.cc
index c380ae65d55..67f74076678 100644
--- a/source/blender/nodes/composite/nodes/node_composite_image.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_image.cc
@@ -824,7 +824,7 @@ void register_node_type_cmp_rlayers()
   ntype.initfunc_api = file_ns::node_composit_init_rlayers;
   ntype.poll = file_ns::node_composit_poll_rlayers;
   ntype.get_compositor_operation = file_ns::get_compositor_operation;
-  ntype.realtime_compositor_unsupported_message = N_(
+  ntype.compositor_unsupported_message = N_(
       "Render passes not supported in the Viewport compositor");
   ntype.flag |= NODE_PREVIEW;
   blender::bke::node_type_storage(&ntype,
diff --git a/source/blender/nodes/composite/nodes/node_composite_texture.cc b/source/blender/nodes/composite/nodes/node_composite_texture.cc
index 14c1c398b7a..8bdf6061f2d 100644
--- a/source/blender/nodes/composite/nodes/node_composite_texture.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_texture.cc
@@ -111,7 +111,7 @@ void register_node_type_cmp_texture()
 
   cmp_node_type_base(&ntype, CMP_NODE_TEXTURE, "Texture", NODE_CLASS_INPUT);
   ntype.declare = file_ns::cmp_node_texture_declare;
-  ntype.realtime_compositor_unsupported_message = N_(
+  ntype.compositor_unsupported_message = N_(
       "Texture nodes not supported in the Viewport compositor");
   ntype.flag |= NODE_PREVIEW;
   ntype.get_compositor_operation = file_ns::get_compositor_operation;
diff --git a/source/blender/render/RE_compositor.hh b/source/blender/render/RE_compositor.hh
index 99ec93b25cc..e7f30f13bf9 100644
--- a/source/blender/render/RE_compositor.hh
+++ b/source/blender/render/RE_compositor.hh
@@ -17,14 +17,14 @@ struct RenderData;
 struct Scene;
 
 /* ------------------------------------------------------------------------------------------------
- * Render Realtime Compositor
+ * Render Compositor
  *
  * Implementation of the compositor for final rendering, as opposed to the viewport compositor
  * that is part of the draw manager. The input and output of this is pre-existing RenderResult
  * buffers in scenes, that are uploaded to and read back from the GPU. */
 
 namespace blender::render {
-class RealtimeCompositor;
+class Compositor;
 }
 
 /* Execute compositor. */
diff --git a/source/blender/render/intern/compositor.cc b/source/blender/render/intern/compositor.cc
index fd00a809ed5..e510327a081 100644
--- a/source/blender/render/intern/compositor.cc
+++ b/source/blender/render/intern/compositor.cc
@@ -617,9 +617,9 @@ class Context : public compositor::Context {
   }
 };
 
-/* Render Realtime Compositor */
+/* Render Compositor */
 
-class RealtimeCompositor {
+class Compositor {
  private:
   /* Render instance for GPU context to run compositor in. */
   Render &render_;
@@ -635,7 +635,7 @@ class RealtimeCompositor {
   compositor::ResultPrecision used_precision_;
 
  public:
-  RealtimeCompositor(Render &render, const ContextInputData &input_data) : render_(render)
+  Compositor(Render &render, const ContextInputData &input_data) : render_(render)
   {
     texture_pool_ = std::make_unique<TexturePool>();
     context_ = std::make_unique<Context>(input_data, *texture_pool_);
@@ -644,7 +644,7 @@ class RealtimeCompositor {
     used_precision_ = context_->get_precision();
   }
 
-  ~RealtimeCompositor()
+  ~Compositor()
   {
     /* Use uses_gpu_ instead of context_->use_gpu() because we are freeing resources from the last
      * evaluation. See uses_gpu_ for more information. */
@@ -762,7 +762,7 @@ void Render::compositor_execute(const Scene &scene,
   }
 
   if (!this->compositor) {
-    this->compositor = new blender::render::RealtimeCompositor(*this, input_data);
+    this->compositor = new blender::render::Compositor(*this, input_data);
   }
 
   this->compositor->execute();
diff --git a/source/blender/render/intern/render_types.h b/source/blender/render/intern/render_types.h
index 4013bf2bb02..b025650846c 100644
--- a/source/blender/render/intern/render_types.h
+++ b/source/blender/render/intern/render_types.h
@@ -45,7 +45,6 @@ struct BaseRender {
    * highlight. */
   virtual blender::render::TilesHighlight *get_tile_highlight() = 0;
 
-  /* GPU/realtime compositor. */
   virtual void compositor_execute(const Scene &scene,
                                   const RenderData &render_data,
                                   const bNodeTree &node_tree,
@@ -210,10 +209,9 @@ struct Render : public BaseRender {
   struct Depsgraph *pipeline_depsgraph = nullptr;
   Scene *pipeline_scene_eval = nullptr;
 
-  /* Realtime Compositor.
-   * NOTE: Use bare pointer instead of smart pointer because the RealtimeCompositor is a fully
-   * opaque type. */
-  blender::render::RealtimeCompositor *compositor = nullptr;
+  /* Compositor.
+   * NOTE: Use bare pointer instead of smart pointer because the it is a fully opaque type. */
+  blender::render::Compositor *compositor = nullptr;
   std::mutex compositor_mutex;
 
   /* Callbacks for the corresponding base class method implementation. */
diff --git a/tests/python/CMakeLists.txt b/tests/python/CMakeLists.txt
index 18d5804b18d..ef00c34fa52 100644
--- a/tests/python/CMakeLists.txt
+++ b/tests/python/CMakeLists.txt
@@ -895,7 +895,7 @@ endif()
 
 if(WITH_COMPOSITOR_REALTIME_TESTS)
   if(NOT OPENIMAGEIO_TOOL)
-    message(WARNING "Disabling realtime compositor tests because OIIO oiiotool does not exist")
+    message(WARNING "Disabling compositor tests because OIIO oiiotool does not exist")
   else()
     set(compositor_tests
         color