diff --git a/src/App/ElementNamingUtils.cpp b/src/App/ElementNamingUtils.cpp
index 4f4d95ac30..5810cdc102 100644
--- a/src/App/ElementNamingUtils.cpp
+++ b/src/App/ElementNamingUtils.cpp
@@ -93,8 +93,6 @@ const char *Data::hasMappedElementName(const char *subname) {
     return isMappedElement(findElementName(subname));
 }
 
-// Currently used by CrossSection.cpp and FeatureTransformed.cpp with different label types
-// with a default of "I"  and "_" used by CrossSection.
 const std::string Data::indexSuffix(int index, const char *label)
 {
     if ( index < 2 ) {  // Don't add a suffix for item #1, begin appending at 2
diff --git a/src/App/ElementNamingUtils.h b/src/App/ElementNamingUtils.h
index 75ee651d30..cedc2c1342 100644
--- a/src/App/ElementNamingUtils.h
+++ b/src/App/ElementNamingUtils.h
@@ -69,8 +69,7 @@ constexpr const char* POSTFIX_GEN                       = ";:G";
 constexpr const char* POSTFIX_MODGEN                    = ";:MG";
 constexpr const char* POSTFIX_DUPLICATE                 = ";D";
 
-constexpr const char* ELEMENT_MAP_INDEX                 = "I";
-constexpr const char* ELEMENT_MAP_INDEX2                 = "_";
+constexpr const char* ELEMENT_MAP_INDEX                 = "_";
 
 /// Check if a subname contains missing element
 AppExport bool hasMissingElement(const char *subname);
diff --git a/src/Mod/Part/App/CrossSection.cpp b/src/Mod/Part/App/CrossSection.cpp
index 5c36701789..3671934178 100644
--- a/src/Mod/Part/App/CrossSection.cpp
+++ b/src/Mod/Part/App/CrossSection.cpp
@@ -265,7 +265,7 @@ void TopoCrossSection::sliceNonSolid(int idx,
     BRepAlgoAPI_Section cs(shape.getShape(), gp_Pln(a, b, c, -d));
     if (cs.IsDone()) {
         std::string prefix(op);
-        prefix += Data::indexSuffix(idx,Data::ELEMENT_MAP_INDEX2);
+        prefix += Data::indexSuffix(idx);
         auto res = TopoShape()
                        .makeElementShape(cs, shape, prefix.c_str())
                        .makeElementWires()
@@ -294,7 +294,7 @@ void TopoCrossSection::sliceSolid(int idx,
     BRepPrimAPI_MakeHalfSpace mkSolid(TopoDS::Face(face.getShape()), refPoint);
     TopoShape solid(idx);
     std::string prefix(op);
-    prefix += Data::indexSuffix(idx,Data::ELEMENT_MAP_INDEX2);
+    prefix += Data::indexSuffix(idx);
     solid.makeElementShape(mkSolid, face, prefix.c_str());
     BRepAlgoAPI_Cut mkCut(shape.getShape(), solid.getShape());