diff --git a/source/blender/nodes/composite/nodes/node_composite_movieclip.cc b/source/blender/nodes/composite/nodes/node_composite_movieclip.cc
index a4d5f294fe0..9fc5a53c5aa 100644
--- a/source/blender/nodes/composite/nodes/node_composite_movieclip.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_movieclip.cc
@@ -16,9 +16,9 @@
 
 #include "node_composite_util.hh"
 
-namespace blender::nodes::node_composite_movieclip_cc {
+namespace blender::nodes::composite::movieclip {
 
-static void cmp_node_movieclip_declare(NodeDeclarationBuilder &b)
+static void node_declare(NodeDeclarationBuilder &b)
 {
   b.add_output<decl::Color>(N_("Image"));
   b.add_output<decl::Float>(N_("Alpha"));
@@ -28,7 +28,7 @@ static void cmp_node_movieclip_declare(NodeDeclarationBuilder &b)
   b.add_output<decl::Float>(N_("Angle"));
 }
 
-static void init(const bContext *C, PointerRNA *ptr)
+static void node_init_api(const bContext *C, PointerRNA *ptr)
 {
   bNode *node = (bNode *)ptr->data;
   Scene *scene = CTX_data_scene(C);
@@ -40,7 +40,7 @@ static void init(const bContext *C, PointerRNA *ptr)
   user->framenr = 1;
 }
 
-static void node_composit_buts_movieclip(uiLayout *layout, bContext *C, PointerRNA *ptr)
+static void node_draw_buttons(uiLayout *layout, bContext *C, PointerRNA *ptr)
 {
   uiTemplateID(layout,
                C,
@@ -54,7 +54,7 @@ static void node_composit_buts_movieclip(uiLayout *layout, bContext *C, PointerR
                nullptr);
 }
 
-static void node_composit_buts_movieclip_ex(uiLayout *layout, bContext *C, PointerRNA *ptr)
+static void node_draw_buttons_ex(uiLayout *layout, bContext *C, PointerRNA *ptr)
 {
   bNode *node = (bNode *)ptr->data;
   PointerRNA clipptr;
@@ -79,19 +79,19 @@ static void node_composit_buts_movieclip_ex(uiLayout *layout, bContext *C, Point
   uiTemplateColorspaceSettings(layout, &clipptr, "colorspace_settings");
 }
 
-}  // namespace blender::nodes::node_composite_movieclip_cc
+}  // namespace blender::nodes::composite::movieclip
 
 void register_node_type_cmp_movieclip()
 {
-  namespace file_ns = blender::nodes::node_composite_movieclip_cc;
+  namespace movieclip = blender::nodes::composite::movieclip;
 
   static bNodeType ntype;
 
   cmp_node_type_base(&ntype, CMP_NODE_MOVIECLIP, "Movie Clip", NODE_CLASS_INPUT);
-  ntype.declare = file_ns::cmp_node_movieclip_declare;
-  ntype.draw_buttons = file_ns::node_composit_buts_movieclip;
-  ntype.draw_buttons_ex = file_ns::node_composit_buts_movieclip_ex;
-  ntype.initfunc_api = file_ns::init;
+  ntype.declare = movieclip::node_declare;
+  ntype.draw_buttons = movieclip::node_draw_buttons;
+  ntype.draw_buttons_ex = movieclip::node_draw_buttons_ex;
+  ntype.initfunc_api = movieclip::node_init_api;
   ntype.flag |= NODE_PREVIEW;
   node_type_storage(
       &ntype, "MovieClipUser", node_free_standard_storage, node_copy_standard_storage);