diff --git a/base_classes/NXcg_face_list_data_structure.nxdl.xml b/base_classes/NXcg_face_list_data_structure.nxdl.xml
index 83ba78029..51b1a501a 100644
--- a/base_classes/NXcg_face_list_data_structure.nxdl.xml
+++ b/base_classes/NXcg_face_list_data_structure.nxdl.xml
@@ -97,7 +97,7 @@ duplicate of an NXoff_geometry ?-->
              Number of faces of the primitives.
         </doc>
     </field>
-    <field name="vertex_identifier_offset" type="NX_INT" units="NX_UNITLESS">
+    <field name="identifier_vertex_offset" type="NX_INT" units="NX_UNITLESS">
         <doc>
              Integer offset whereby the identifier of the first member
              of the vertices differs from zero.
@@ -106,7 +106,7 @@ duplicate of an NXoff_geometry ?-->
              Inspect the definition of NXcg_primitive for further details.
         </doc>
     </field>
-    <field name="edge_identifier_offset" type="NX_INT" units="NX_UNITLESS">
+    <field name="identifier_edge_offset" type="NX_INT" units="NX_UNITLESS">
         <doc>
              Integer offset whereby the identifier of the first member
              of the edges differs from zero.
@@ -115,7 +115,7 @@ duplicate of an NXoff_geometry ?-->
              Inspect the definition of NXcg_primitive for further details.
         </doc>
     </field>
-    <field name="face_identifier_offset" type="NX_INT" units="NX_UNITLESS">
+    <field name="identifier_face_offset" type="NX_INT" units="NX_UNITLESS">
         <doc>
              Integer offset whereby the identifier of the first member
              of the faces differs from zero.
@@ -124,7 +124,7 @@ duplicate of an NXoff_geometry ?-->
              Inspect the definition of NXcg_primitive for further details.
         </doc>
     </field>
-    <field name="vertex_identifier" type="NX_INT" units="NX_UNITLESS">
+    <field name="identifier_vertex" type="NX_INT" units="NX_UNITLESS">
         <doc>
              Integer identifier to distinguish all vertices explicitly.
         </doc>
@@ -132,7 +132,7 @@ duplicate of an NXoff_geometry ?-->
             <dim index="1" value="n_v"/>
         </dimensions>
     </field>
-    <field name="edge_identifier" type="NX_INT" units="NX_UNITLESS">
+    <field name="identifier_edge" type="NX_INT" units="NX_UNITLESS">
         <doc>
              Integer used to distinguish all edges explicitly.
         </doc>
@@ -140,7 +140,7 @@ duplicate of an NXoff_geometry ?-->
             <dim index="1" value="n_e"/>
         </dimensions>
     </field>
-    <field name="face_identifier" type="NX_INT" units="NX_UNITLESS">
+    <field name="identifier_face" type="NX_INT" units="NX_UNITLESS">
         <doc>
              Integer used to distinguish all faces explicitly.
         </doc>
diff --git a/base_classes/NXcg_half_edge_data_structure.nxdl.xml b/base_classes/NXcg_half_edge_data_structure.nxdl.xml
index ef44041a7..9f1e7f9c2 100644
--- a/base_classes/NXcg_half_edge_data_structure.nxdl.xml
+++ b/base_classes/NXcg_half_edge_data_structure.nxdl.xml
@@ -83,7 +83,7 @@
             <dim index="1" value="n_he"/>
         </dimensions>
     </field>
-    <field name="vertex_identifier_offset" type="NX_INT" units="NX_UNITLESS">
+    <field name="identifier_vertex_offset" type="NX_INT" units="NX_UNITLESS">
         <doc>
              Integer offset whereby the identifier of the first member
              of the vertices differs from zero.
@@ -92,7 +92,7 @@
              Inspect the definition of :ref:`NXcg_primitive` for further details.
         </doc>
     </field>
-    <field name="edge_identifier_offset" type="NX_INT" units="NX_UNITLESS">
+    <field name="identifier_edge_offset" type="NX_INT" units="NX_UNITLESS">
         <doc>
              Integer offset whereby the identifier of the first member
              of the edges differs from zero.
@@ -101,7 +101,7 @@
              Inspect the definition of :ref:`NXcg_primitive` for further details.
         </doc>
     </field>
-    <field name="face_identifier_offset" type="NX_INT">
+    <field name="identifier_face_offset" type="NX_INT">
         <doc>
              Integer offset whereby the identifier of the first member
              of the faces differs from zero.
@@ -110,7 +110,7 @@
              Inspect the definition of :ref:`NXcg_primitive` for further details.
         </doc>
     </field>
-    <!--therefore, vertex_-, face_-, half_edge_-identifier are implicit-->
+    <!--therefore, identifier_ -vertex, -face, -half_edge are implicit-->
     <field name="position" type="NX_NUMBER" units="NX_ANY">
         <doc>
              The position of the vertices.