Revert "Rename: "Nodes" modifier to "Empty""

This reverts commit 4a2734a835c10d5bffaaceddc59c41837801f402.

Reverting this so that all we change is the UI name, not the DNA struct
and the internal variable names.

11 files changed, 99 insertions, 99 deletions

diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c
index fdd5704aa75..9f3793e76fb 100644
--- a/source/blender/blenkernel/intern/node.c
+++ b/source/blender/blenkernel/intern/node.c
@@ -3987,10 +3987,10 @@ void ntreeUpdateAllUsers(Main *main, bNodeTree *ngroup)
   if (ngroup->type == NTREE_GEOMETRY) {
     LISTBASE_FOREACH (Object *, object, &main->objects) {
       LISTBASE_FOREACH (ModifierData *, md, &object->modifiers) {
-        if (md->type == eModifierType_Empty) {
-          EmptyModifierData *emd = (EmptyModifierData *)md;
-          if (emd->node_group == ngroup) {
-            MOD_nodes_update_interface(object, emd);
+        if (md->type == eModifierType_Nodes) {
+          NodesModifierData *nmd = (NodesModifierData *)md;
+          if (nmd->node_group == ngroup) {
+            MOD_nodes_update_interface(object, nmd);
           }
         }
       }
diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c
index 1812f4a015d..6bd95cd8e51 100644
--- a/source/blender/editors/object/object_modifier.c
+++ b/source/blender/editors/object/object_modifier.c
@@ -234,8 +234,8 @@ ModifierData *ED_object_modifier_add(
       /* ensure skin-node customdata exists */
       BKE_mesh_ensure_skin_customdata(ob->data);
     }
-    else if (type == eModifierType_Empty) {
-      MOD_nodes_init(bmain, (EmptyModifierData *)new_md);
+    else if (type == eModifierType_Nodes) {
+      MOD_nodes_init(bmain, (NodesModifierData *)new_md);
     }
   }
 
diff --git a/source/blender/makesdna/DNA_modifier_defaults.h b/source/blender/makesdna/DNA_modifier_defaults.h
index 8bcd41e6aa8..f73f43ddade 100644
--- a/source/blender/makesdna/DNA_modifier_defaults.h
+++ b/source/blender/makesdna/DNA_modifier_defaults.h
@@ -573,7 +573,7 @@
     .flag = 0, \
   }
 
-#define _DNA_DEFAULT_EmptyModifierData \
+#define _DNA_DEFAULT_NodesModifierData \
   { 0 }
 
 #define _DNA_DEFAULT_SkinModifierData \
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h
index 35f03311552..d7ad1d59002 100644
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@ -94,7 +94,7 @@ typedef enum ModifierType {
   eModifierType_WeightedNormal = 54,
   eModifierType_Weld = 55,
   eModifierType_Fluid = 56,
-  eModifierType_Empty = 57,
+  eModifierType_Nodes = 57,
   eModifierType_MeshToVolume = 58,
   eModifierType_VolumeDisplace = 59,
   eModifierType_VolumeToMesh = 60,
@@ -2220,16 +2220,16 @@ enum {
 #define MOD_MESHSEQ_READ_ALL \
   (MOD_MESHSEQ_READ_VERT | MOD_MESHSEQ_READ_POLY | MOD_MESHSEQ_READ_UV | MOD_MESHSEQ_READ_COLOR)
 
-typedef struct EmptyModifierSettings {
+typedef struct NodesModifierSettings {
   /* This stores data that is passed into the node group. */
   struct IDProperty *properties;
-} EmptyModifierSettings;
+} NodesModifierSettings;
 
-typedef struct EmptyModifierData {
+typedef struct NodesModifierData {
   ModifierData modifier;
   struct bNodeTree *node_group;
-  struct EmptyModifierSettings settings;
-} EmptyModifierData;
+  struct NodesModifierSettings settings;
+} NodesModifierData;
 
 typedef struct MeshToVolumeModifierData {
   ModifierData modifier;
diff --git a/source/blender/makesdna/intern/dna_defaults.c b/source/blender/makesdna/intern/dna_defaults.c
index 7977a55d7be..1a8bd25215f 100644
--- a/source/blender/makesdna/intern/dna_defaults.c
+++ b/source/blender/makesdna/intern/dna_defaults.c
@@ -271,7 +271,7 @@ SDNA_DEFAULT_DECL_STRUCT(ScrewModifierData);
 /* Shape key modifier has no items. */
 SDNA_DEFAULT_DECL_STRUCT(ShrinkwrapModifierData);
 SDNA_DEFAULT_DECL_STRUCT(SimpleDeformModifierData);
-SDNA_DEFAULT_DECL_STRUCT(EmptyModifierData);
+SDNA_DEFAULT_DECL_STRUCT(NodesModifierData);
 SDNA_DEFAULT_DECL_STRUCT(SkinModifierData);
 SDNA_DEFAULT_DECL_STRUCT(SmoothModifierData);
 /* Softbody modifier skipped for now. */
@@ -491,7 +491,7 @@ const void *DNA_default_table[SDNA_TYPE_MAX] = {
     /* Shape key modifier has no items. */
     SDNA_DEFAULT_DECL(ShrinkwrapModifierData),
     SDNA_DEFAULT_DECL(SimpleDeformModifierData),
-    SDNA_DEFAULT_DECL(EmptyModifierData),
+    SDNA_DEFAULT_DECL(NodesModifierData),
     SDNA_DEFAULT_DECL(SkinModifierData),
     SDNA_DEFAULT_DECL(SmoothModifierData),
     /* Softbody modifier skipped for now. */
diff --git a/source/blender/makesrna/RNA_access.h b/source/blender/makesrna/RNA_access.h
index 94472372eb4..bc25a404de8 100644
--- a/source/blender/makesrna/RNA_access.h
+++ b/source/blender/makesrna/RNA_access.h
@@ -566,8 +566,8 @@ extern StructRNA RNA_SimpleDeformModifier;
 extern StructRNA RNA_SimplifyGpencilModifier;
 extern StructRNA RNA_Simulation;
 #ifdef WITH_GEOMETRY_NODES
-extern StructRNA RNA_EmptyModifier;
-extern StructRNA RNA_EmptyModifierSettings;
+extern StructRNA RNA_NodesModifier;
+extern StructRNA RNA_NodesModifierSettings;
 #endif
 extern StructRNA RNA_GeometryNode;
 extern StructRNA RNA_GeometryNodeTree;
diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c
index dab9ec970ae..d0697530e0c 100644
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@ -163,7 +163,7 @@ const EnumPropertyItem rna_enum_object_modifier_type_items[] = {
      ICON_MOD_MULTIRES,
      "Multiresolution",
      "Subdivide the mesh in a way that allows editing the higher subdivision levels"},
-    {eModifierType_Empty, "EMPTY", ICON_MESH_DATA, "Empty", ""}, /* TODO: Use correct icon. */
+    {eModifierType_Nodes, "NODES", ICON_MESH_DATA, "Nodes", ""}, /* TODO: Use correct icon. */
     {eModifierType_Remesh,
      "REMESH",
      ICON_MOD_REMESH,
@@ -1586,25 +1586,25 @@ static int rna_MeshSequenceCacheModifier_read_velocity_get(PointerRNA *ptr)
 #  endif
 }
 
-static bool rna_EmptyModifier_node_group_poll(PointerRNA *ptr, PointerRNA value)
+static bool rna_NodesModifier_node_group_poll(PointerRNA *ptr, PointerRNA value)
 {
-  EmptyModifierData *emd = ptr->data;
+  NodesModifierData *nmd = ptr->data;
   bNodeTree *ntree = value.data;
-  UNUSED_VARS(emd, ntree);
+  UNUSED_VARS(nmd, ntree);
   return true;
 }
 
-static void rna_EmptyModifier_node_group_update(Main *bmain, Scene *scene, PointerRNA *ptr)
+static void rna_NodesModifier_node_group_update(Main *bmain, Scene *scene, PointerRNA *ptr)
 {
   Object *object = (Object *)ptr->owner_id;
-  EmptyModifierData *emd = ptr->data;
+  NodesModifierData *nmd = ptr->data;
   rna_Modifier_dependency_update(bmain, scene, ptr);
-  MOD_nodes_update_interface(object, emd);
+  MOD_nodes_update_interface(object, nmd);
 }
 
-static IDProperty *rna_EmptyModifierSettings_properties(PointerRNA *ptr, bool create)
+static IDProperty *rna_NodesModifierSettings_properties(PointerRNA *ptr, bool create)
 {
-  EmptyModifierSettings *settings = ptr->data;
+  NodesModifierSettings *settings = ptr->data;
   if (create && settings->properties == NULL) {
     IDPropertyTemplate val = {0};
     settings->properties = IDP_New(IDP_GROUP, &val, "Nodes Modifier Settings");
@@ -1612,7 +1612,7 @@ static IDProperty *rna_EmptyModifierSettings_properties(PointerRNA *ptr, bool cr
   return settings->properties;
 }
 
-static char *rna_EmptyModifierSettings_path(PointerRNA *UNUSED(ptr))
+static char *rna_NodesModifierSettings_path(PointerRNA *UNUSED(ptr))
 {
   return BLI_strdup("settings");
 }
@@ -6935,12 +6935,12 @@ static void rna_def_modifier_nodes_settings(BlenderRNA *brna)
 {
   StructRNA *srna;
 
-  srna = RNA_def_struct(brna, "EmptyModifierSettings", NULL);
-  RNA_def_struct_nested(brna, srna, "EmptyModifier");
-  RNA_def_struct_path_func(srna, "rna_EmptyModifierSettings_path");
+  srna = RNA_def_struct(brna, "NodesModifierSettings", NULL);
+  RNA_def_struct_nested(brna, srna, "NodesModifier");
+  RNA_def_struct_path_func(srna, "rna_NodesModifierSettings_path");
   RNA_def_struct_ui_text(
       srna, "Nodes Modifier Settings", "Settings that are passed into the node group");
-  RNA_def_struct_idprops_func(srna, "rna_EmptyModifierSettings_properties");
+  RNA_def_struct_idprops_func(srna, "rna_NodesModifierSettings_properties");
 }
 
 static void rna_def_modifier_nodes(BlenderRNA *brna)
@@ -6948,18 +6948,18 @@ static void rna_def_modifier_nodes(BlenderRNA *brna)
   StructRNA *srna;
   PropertyRNA *prop;
 
-  srna = RNA_def_struct(brna, "EmptyModifier", "Modifier");
+  srna = RNA_def_struct(brna, "NodesModifier", "Modifier");
   RNA_def_struct_ui_text(srna, "Nodes Modifier", "");
-  RNA_def_struct_sdna(srna, "EmptyModifierData");
+  RNA_def_struct_sdna(srna, "NodesModifierData");
   RNA_def_struct_ui_icon(srna, ICON_MESH_DATA); /* TODO: Use correct icon. */
 
   RNA_define_lib_overridable(true);
 
   prop = RNA_def_property(srna, "node_group", PROP_POINTER, PROP_NONE);
   RNA_def_property_ui_text(prop, "Node Group", "Node group that controls what this modifier does");
-  RNA_def_property_pointer_funcs(prop, NULL, NULL, NULL, "rna_EmptyModifier_node_group_poll");
+  RNA_def_property_pointer_funcs(prop, NULL, NULL, NULL, "rna_NodesModifier_node_group_poll");
   RNA_def_property_flag(prop, PROP_EDITABLE);
-  RNA_def_property_update(prop, 0, "rna_EmptyModifier_node_group_update");
+  RNA_def_property_update(prop, 0, "rna_NodesModifier_node_group_update");
 
   prop = RNA_def_property(srna, "settings", PROP_POINTER, PROP_NONE);
   RNA_def_property_flag(prop, PROP_NEVER_NULL);
diff --git a/source/blender/modifiers/MOD_modifiertypes.h b/source/blender/modifiers/MOD_modifiertypes.h
index b4bd5828095..f36cb7ded9c 100644
--- a/source/blender/modifiers/MOD_modifiertypes.h
+++ b/source/blender/modifiers/MOD_modifiertypes.h
@@ -85,7 +85,7 @@ extern ModifierTypeInfo modifierType_CorrectiveSmooth;
 extern ModifierTypeInfo modifierType_MeshSequenceCache;
 extern ModifierTypeInfo modifierType_SurfaceDeform;
 extern ModifierTypeInfo modifierType_WeightedNormal;
-extern ModifierTypeInfo modifierType_Empty;
+extern ModifierTypeInfo modifierType_Nodes;
 extern ModifierTypeInfo modifierType_MeshToVolume;
 extern ModifierTypeInfo modifierType_VolumeDisplace;
 extern ModifierTypeInfo modifierType_VolumeToMesh;
diff --git a/source/blender/modifiers/MOD_nodes.h b/source/blender/modifiers/MOD_nodes.h
index 2c33c2ad448..9c75e7e3416 100644
--- a/source/blender/modifiers/MOD_nodes.h
+++ b/source/blender/modifiers/MOD_nodes.h
@@ -18,15 +18,15 @@
 
 struct Main;
 struct Object;
-struct EmptyModifierData;
+struct NodesModifierData;
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-void MOD_nodes_update_interface(struct Object *object, struct EmptyModifierData *emd);
+void MOD_nodes_update_interface(struct Object *object, struct NodesModifierData *nmd);
 
-void MOD_nodes_init(struct Main *bmain, struct EmptyModifierData *emd);
+void MOD_nodes_init(struct Main *bmain, struct NodesModifierData *nmd);
 
 #ifdef __cplusplus
 }
diff --git a/source/blender/modifiers/intern/MOD_nodes.cc b/source/blender/modifiers/intern/MOD_nodes.cc
index 8714d722ddd..93d1c60f1ba 100644
--- a/source/blender/modifiers/intern/MOD_nodes.cc
+++ b/source/blender/modifiers/intern/MOD_nodes.cc
@@ -83,11 +83,11 @@ using namespace blender::bke;
 
 static void initData(ModifierData *md)
 {
-  EmptyModifierData *emd = (EmptyModifierData *)md;
+  NodesModifierData *nmd = (NodesModifierData *)md;
 
-  BLI_assert(MEMCMP_STRUCT_AFTER_IS_ZERO(emd, modifier));
+  BLI_assert(MEMCMP_STRUCT_AFTER_IS_ZERO(nmd, modifier));
 
-  MEMCPY_STRUCT_AFTER(emd, DNA_struct_default_get(EmptyModifierData), modifier);
+  MEMCPY_STRUCT_AFTER(nmd, DNA_struct_default_get(NodesModifierData), modifier);
 }
 
 static void addIdsUsedBySocket(const ListBase *sockets, Set<ID *> &ids)
@@ -121,12 +121,12 @@ static void findUsedIds(const bNodeTree &tree, Set<ID *> &ids)
 
 static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphContext *ctx)
 {
-  EmptyModifierData *emd = reinterpret_cast<EmptyModifierData *>(md);
-  if (emd->node_group != nullptr) {
-    DEG_add_node_tree_relation(ctx->node, emd->node_group, "Nodes Modifier");
+  NodesModifierData *nmd = reinterpret_cast<NodesModifierData *>(md);
+  if (nmd->node_group != nullptr) {
+    DEG_add_node_tree_relation(ctx->node, nmd->node_group, "Nodes Modifier");
 
     Set<ID *> used_ids;
-    findUsedIds(*emd->node_group, used_ids);
+    findUsedIds(*nmd->node_group, used_ids);
     for (ID *id : used_ids) {
       if (GS(id->name) == ID_OB) {
         DEG_add_object_relation(ctx->node, (Object *)id, DEG_OB_COMP_TRANSFORM, "Nodes Modifier");
@@ -140,8 +140,8 @@ static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphConte
 
 static void foreachIDLink(ModifierData *md, Object *ob, IDWalkFunc walk, void *userData)
 {
-  EmptyModifierData *emd = reinterpret_cast<EmptyModifierData *>(md);
-  walk(userData, ob, (ID **)&emd->node_group, IDWALK_CB_USER);
+  NodesModifierData *nmd = reinterpret_cast<NodesModifierData *>(md);
+  walk(userData, ob, (ID **)&nmd->node_group, IDWALK_CB_USER);
 
   struct ForeachSettingData {
     IDWalkFunc walk;
@@ -150,7 +150,7 @@ static void foreachIDLink(ModifierData *md, Object *ob, IDWalkFunc walk, void *u
   } settings = {walk, userData, ob};
 
   IDP_foreach_property(
-      emd->settings.properties,
+      nmd->settings.properties,
       IDP_TYPE_FILTER_ID,
       [](IDProperty *id_prop, void *user_data) {
         ForeachSettingData *settings = (ForeachSettingData *)user_data;
@@ -164,9 +164,9 @@ static bool isDisabled(const struct Scene *UNUSED(scene),
                        ModifierData *md,
                        bool UNUSED(useRenderParams))
 {
-  EmptyModifierData *emd = reinterpret_cast<EmptyModifierData *>(md);
+  NodesModifierData *nmd = reinterpret_cast<NodesModifierData *>(md);
 
-  if (emd->node_group == nullptr) {
+  if (nmd->node_group == nullptr) {
     return true;
   }
 
@@ -612,34 +612,34 @@ static const SocketPropertyType *get_socket_property_type(const bNodeSocket &bso
  * inputs. If any properties correspond to the old properties by name and type, carry over
  * the values.
  */
-void MOD_nodes_update_interface(Object *object, EmptyModifierData *emd)
+void MOD_nodes_update_interface(Object *object, NodesModifierData *nmd)
 {
-  if (emd->node_group == nullptr) {
+  if (nmd->node_group == nullptr) {
     return;
   }
 
-  IDProperty *old_properties = emd->settings.properties;
+  IDProperty *old_properties = nmd->settings.properties;
 
   {
     IDPropertyTemplate idprop = {0};
-    emd->settings.properties = IDP_New(IDP_GROUP, &idprop, "Nodes Modifier Settings");
+    nmd->settings.properties = IDP_New(IDP_GROUP, &idprop, "Nodes Modifier Settings");
   }
 
   IDProperty *ui_container_group;
   {
     IDPropertyTemplate idprop = {0};
     ui_container_group = IDP_New(IDP_GROUP, &idprop, "_RNA_UI");
-    IDP_AddToGroup(emd->settings.properties, ui_container_group);
+    IDP_AddToGroup(nmd->settings.properties, ui_container_group);
   }
 
-  LISTBASE_FOREACH (bNodeSocket *, socket, &emd->node_group->inputs) {
+  LISTBASE_FOREACH (bNodeSocket *, socket, &nmd->node_group->inputs) {
     const SocketPropertyType *property_type = get_socket_property_type(*socket);
     if (property_type == nullptr) {
       continue;
     }
 
     IDProperty *new_prop = socket_add_property(
-        emd->settings.properties, ui_container_group, *property_type, *socket);
+        nmd->settings.properties, ui_container_group, *property_type, *socket);
 
     if (old_properties != nullptr) {
       IDProperty *old_prop = IDP_GetPropertyFromGroup(old_properties, socket->identifier);
@@ -656,10 +656,10 @@ void MOD_nodes_update_interface(Object *object, EmptyModifierData *emd)
   DEG_id_tag_update(&object->id, ID_RECALC_GEOMETRY);
 }
 
-void MOD_nodes_init(Main *bmain, EmptyModifierData *emd)
+void MOD_nodes_init(Main *bmain, NodesModifierData *nmd)
 {
   bNodeTree *ntree = ntreeAddTree(bmain, "Geometry Node Group", ntreeType_Geometry->idname);
-  emd->node_group = ntree;
+  nmd->node_group = ntree;
 
   ntreeAddSocketInterface(ntree, SOCK_IN, "NodeSocketGeometry", "Geometry");
   ntreeAddSocketInterface(ntree, SOCK_OUT, "NodeSocketGeometry", "Geometry");
@@ -680,7 +680,7 @@ void MOD_nodes_init(Main *bmain, EmptyModifierData *emd)
   ntreeUpdateTree(bmain, ntree);
 }
 
-static void initialize_group_input(EmptyModifierData &emd,
+static void initialize_group_input(NodesModifierData &nmd,
                                    const bNodeSocket &socket,
                                    const CPPType &cpp_type,
                                    void *r_value)
@@ -690,11 +690,11 @@ static void initialize_group_input(EmptyModifierData &emd,
     cpp_type.copy_to_uninitialized(cpp_type.default_value(), r_value);
     return;
   }
-  if (emd.settings.properties == nullptr) {
+  if (nmd.settings.properties == nullptr) {
     socket_cpp_value_get(socket, r_value);
     return;
   }
-  const IDProperty *property = IDP_GetPropertyFromGroup(emd.settings.properties,
+  const IDProperty *property = IDP_GetPropertyFromGroup(nmd.settings.properties,
                                                         socket.identifier);
   if (property == nullptr) {
     socket_cpp_value_get(socket, r_value);
@@ -727,7 +727,7 @@ static GeometrySetPtr compute_geometry(const DerivedNodeTree &tree,
                                        Span<const DOutputSocket *> group_input_sockets,
                                        const DInputSocket &socket_to_compute,
                                        GeometrySetPtr input_geometry_set,
-                                       EmptyModifierData *emd)
+                                       NodesModifierData *nmd)
 {
   ResourceCollector resources;
   LinearAllocator<> &allocator = resources.linear_allocator();
@@ -752,7 +752,7 @@ static GeometrySetPtr compute_geometry(const DerivedNodeTree &tree,
     for (const DOutputSocket *socket : remaining_input_sockets) {
       const CPPType &cpp_type = *socket_cpp_type_get(*socket->typeinfo());
       void *value_in = allocator.allocate(cpp_type.size(), cpp_type.alignment());
-      initialize_group_input(*emd, *socket->bsocket(), cpp_type, value_in);
+      initialize_group_input(*nmd, *socket->bsocket(), cpp_type, value_in);
       group_inputs.add_new(socket, {cpp_type, value_in});
     }
   }
@@ -778,16 +778,16 @@ static GeometrySetPtr compute_geometry(const DerivedNodeTree &tree,
  */
 static void check_property_socket_sync(const Object *ob, ModifierData *md)
 {
-  EmptyModifierData *emd = reinterpret_cast<EmptyModifierData *>(md);
+  NodesModifierData *nmd = reinterpret_cast<NodesModifierData *>(md);
 
   int i = 0;
-  LISTBASE_FOREACH_INDEX (const bNodeSocket *, socket, &emd->node_group->inputs, i) {
+  LISTBASE_FOREACH_INDEX (const bNodeSocket *, socket, &nmd->node_group->inputs, i) {
     /* The first socket is the special geometry socket for the modifier object. */
     if (i == 0 && socket->type == SOCK_GEOMETRY) {
       continue;
     }
 
-    IDProperty *property = IDP_GetPropertyFromGroup(emd->settings.properties, socket->identifier);
+    IDProperty *property = IDP_GetPropertyFromGroup(nmd->settings.properties, socket->identifier);
     if (property == nullptr) {
       if (socket->type == SOCK_STRING) {
         BKE_modifier_set_error(ob, md, "String sockets cannot be exposed in the modifier");
@@ -813,7 +813,7 @@ static void check_property_socket_sync(const Object *ob, ModifierData *md)
     }
   }
 
-  if (!BLI_listbase_is_single(&emd->node_group->outputs)) {
+  if (!BLI_listbase_is_single(&nmd->node_group->outputs)) {
     BKE_modifier_set_error(ob, md, "The node group must have a single geometry output");
   }
 }
@@ -822,15 +822,15 @@ static GeometrySetPtr modifyGeometry(ModifierData *md,
                                      const ModifierEvalContext *ctx,
                                      GeometrySetPtr input_geometry_set)
 {
-  EmptyModifierData *emd = reinterpret_cast<EmptyModifierData *>(md);
-  if (emd->node_group == nullptr) {
+  NodesModifierData *nmd = reinterpret_cast<NodesModifierData *>(md);
+  if (nmd->node_group == nullptr) {
     return input_geometry_set;
   }
 
   check_property_socket_sync(ctx->object, md);
 
   NodeTreeRefMap tree_refs;
-  DerivedNodeTree tree{emd->node_group, tree_refs};
+  DerivedNodeTree tree{nmd->node_group, tree_refs};
 
   if (tree.has_link_cycles()) {
     BKE_modifier_set_error(ctx->object, md, "Node group has cycles");
@@ -862,7 +862,7 @@ static GeometrySetPtr modifyGeometry(ModifierData *md,
   }
 
   GeometrySetPtr output_geometry_set = compute_geometry(
-      tree, group_inputs, *group_outputs[0], std::move(input_geometry_set), emd);
+      tree, group_inputs, *group_outputs[0], std::move(input_geometry_set), nmd);
   return output_geometry_set;
 }
 
@@ -923,19 +923,19 @@ static void panel_draw(const bContext *UNUSED(C), Panel *panel)
   uiLayout *layout = panel->layout;
 
   PointerRNA *ptr = modifier_panel_get_property_pointers(panel, nullptr);
-  EmptyModifierData *emd = static_cast<EmptyModifierData *>(ptr->data);
+  NodesModifierData *nmd = static_cast<NodesModifierData *>(ptr->data);
 
   uiLayoutSetPropSep(layout, true);
   uiLayoutSetPropDecorate(layout, false);
 
   uiItemR(layout, ptr, "node_group", 0, nullptr, ICON_MESH_DATA);
 
-  if (emd->node_group != nullptr && emd->settings.properties != nullptr) {
+  if (nmd->node_group != nullptr && nmd->settings.properties != nullptr) {
     PointerRNA settings_ptr;
-    RNA_pointer_create(ptr->owner_id, &RNA_EmptyModifierSettings, &emd->settings, &settings_ptr);
+    RNA_pointer_create(ptr->owner_id, &RNA_NodesModifierSettings, &nmd->settings, &settings_ptr);
 
-    LISTBASE_FOREACH (bNodeSocket *, socket, &emd->node_group->inputs) {
-      draw_property_for_socket(layout, &settings_ptr, emd->settings.properties, *socket);
+    LISTBASE_FOREACH (bNodeSocket *, socket, &nmd->node_group->inputs) {
+      draw_property_for_socket(layout, &settings_ptr, nmd->settings.properties, *socket);
     }
   }
 
@@ -945,53 +945,53 @@ static void panel_draw(const bContext *UNUSED(C), Panel *panel)
 
 static void panelRegister(ARegionType *region_type)
 {
-  modifier_panel_register(region_type, eModifierType_Empty, panel_draw);
+  modifier_panel_register(region_type, eModifierType_Nodes, panel_draw);
 }
 
 static void blendWrite(BlendWriter *writer, const ModifierData *md)
 {
-  const EmptyModifierData *emd = reinterpret_cast<const EmptyModifierData *>(md);
-  if (emd->settings.properties != nullptr) {
+  const NodesModifierData *nmd = reinterpret_cast<const NodesModifierData *>(md);
+  if (nmd->settings.properties != nullptr) {
     /* Note that the property settings are based on the socket type info
      * and don't necessarily need to be written, but we can't just free them. */
-    IDP_BlendWrite(writer, emd->settings.properties);
+    IDP_BlendWrite(writer, nmd->settings.properties);
   }
 }
 
 static void blendRead(BlendDataReader *reader, ModifierData *md)
 {
-  EmptyModifierData *emd = reinterpret_cast<EmptyModifierData *>(md);
-  BLO_read_data_address(reader, &emd->settings.properties);
-  IDP_BlendDataRead(reader, &emd->settings.properties);
+  NodesModifierData *nmd = reinterpret_cast<NodesModifierData *>(md);
+  BLO_read_data_address(reader, &nmd->settings.properties);
+  IDP_BlendDataRead(reader, &nmd->settings.properties);
 }
 
 static void copyData(const ModifierData *md, ModifierData *target, const int flag)
 {
-  const EmptyModifierData *emd = reinterpret_cast<const EmptyModifierData *>(md);
-  EmptyModifierData *temd = reinterpret_cast<EmptyModifierData *>(target);
+  const NodesModifierData *nmd = reinterpret_cast<const NodesModifierData *>(md);
+  NodesModifierData *tnmd = reinterpret_cast<NodesModifierData *>(target);
 
   BKE_modifier_copydata_generic(md, target, flag);
 
-  if (emd->settings.properties != nullptr) {
-    temd->settings.properties = IDP_CopyProperty_ex(emd->settings.properties, flag);
+  if (nmd->settings.properties != nullptr) {
+    tnmd->settings.properties = IDP_CopyProperty_ex(nmd->settings.properties, flag);
   }
 }
 
 static void freeData(ModifierData *md)
 {
-  EmptyModifierData *emd = reinterpret_cast<EmptyModifierData *>(md);
-  if (emd->settings.properties != nullptr) {
-    IDP_FreeProperty_ex(emd->settings.properties, false);
-    emd->settings.properties = nullptr;
+  NodesModifierData *nmd = reinterpret_cast<NodesModifierData *>(md);
+  if (nmd->settings.properties != nullptr) {
+    IDP_FreeProperty_ex(nmd->settings.properties, false);
+    nmd->settings.properties = nullptr;
   }
 }
 
-ModifierTypeInfo modifierType_Empty = {
-    /* name */ "Empty",
-    /* structName */ "EmptyModifierData",
-    /* structSize */ sizeof(EmptyModifierData),
+ModifierTypeInfo modifierType_Nodes = {
+    /* name */ "Nodes",
+    /* structName */ "NodesModifierData",
+    /* structSize */ sizeof(NodesModifierData),
 #ifdef WITH_GEOMETRY_NODES
-    /* srna */ &RNA_EmptyModifier,
+    /* srna */ &RNA_NodesModifier,
 #else
     /* srna */ &RNA_Modifier,
 #endif
diff --git a/source/blender/modifiers/intern/MOD_util.c b/source/blender/modifiers/intern/MOD_util.c
index 54809fed569..32d40027537 100644
--- a/source/blender/modifiers/intern/MOD_util.c
+++ b/source/blender/modifiers/intern/MOD_util.c
@@ -342,7 +342,7 @@ void modifier_type_init(ModifierTypeInfo *types[])
   INIT_TYPE(MeshSequenceCache);
   INIT_TYPE(SurfaceDeform);
   INIT_TYPE(WeightedNormal);
-  INIT_TYPE(Empty);
+  INIT_TYPE(Nodes);
   INIT_TYPE(MeshToVolume);
   INIT_TYPE(VolumeDisplace);
   INIT_TYPE(VolumeToMesh);