diff --git a/source/blender/editors/interface/interface_template_grease_pencil_layer_tree.cc b/source/blender/editors/interface/interface_template_grease_pencil_layer_tree.cc
index cad54c3be3d..b9164f5e64a 100644
--- a/source/blender/editors/interface/interface_template_grease_pencil_layer_tree.cc
+++ b/source/blender/editors/interface/interface_template_grease_pencil_layer_tree.cc
@@ -208,9 +208,15 @@ class LayerViewItem : public AbstractTreeViewItem {
     return true;
   }
 
-  bool rename(const bContext & /*C*/, StringRefNull new_name) override
+  bool rename(const bContext &C, StringRefNull new_name) override
   {
-    grease_pencil_.rename_node(layer_.as_node(), new_name);
+    PointerRNA layer_ptr = RNA_pointer_create(&grease_pencil_.id, &RNA_GreasePencilLayer, &layer_);
+    PropertyRNA *prop = RNA_struct_find_property(&layer_ptr, "name");
+
+    RNA_property_string_set(&layer_ptr, prop, new_name.c_str());
+    RNA_property_update(&const_cast<bContext &>(C), &layer_ptr, prop);
+
+    ED_undo_push(&const_cast<bContext &>(C), "Rename Grease Pencil Layer");
     return true;
   }