diff --git a/Geo/MHexahedron.cpp b/Geo/MHexahedron.cpp
index f8da47a28c078eea07fb1dda7970611d622588b6..30492e70a5393ed6799e76d7e03d2be5d0c18a1f 100644
--- a/Geo/MHexahedron.cpp
+++ b/Geo/MHexahedron.cpp
@@ -16,7 +16,7 @@
 #include "qualityMeasures.h"
 #endif
 
-std::map<int, indicesReversed> MHexahedronN::_order2indicesReversed;
+std::map<int, indicesReversed> MHexahedronN::_order2indicesReversedHex;
 
 void MHexahedron::getEdgeRep(bool curved, int num, double *x, double *y, double *z,
                              SVector3 *n)
@@ -411,7 +411,7 @@ int MHexahedronN::getNumFacesRep(bool curved)
                        CTX::instance()->mesh.numSubEdges * 2) : 12;
 }
 
-void _getIndicesReversed(int order, indicesReversed &indices)
+void _getIndicesReversedHex(int order, indicesReversed &indices)
 {
   fullMatrix<double> ref = gmshGenerateMonomialsHexahedron(order);
 
@@ -432,12 +432,12 @@ void _getIndicesReversed(int order, indicesReversed &indices)
 void MHexahedronN::reverse()
 {
   std::map<int, indicesReversed>::iterator it;
-  it = _order2indicesReversed.find(_order);
-  if (it == _order2indicesReversed.end()) {
+  it = _order2indicesReversedHex.find(_order);
+  if (it == _order2indicesReversedHex.end()) {
     indicesReversed indices;
-    _getIndicesReversed(_order, indices);
-    _order2indicesReversed[_order] = indices;
-    it = _order2indicesReversed.find(_order);
+    _getIndicesReversedHex(_order, indices);
+    _order2indicesReversedHex[_order] = indices;
+    it = _order2indicesReversedHex.find(_order);
   }
 
   indicesReversed &indices = it->second;
diff --git a/Geo/MHexahedron.h b/Geo/MHexahedron.h
index d392fe8bd48364320d31ab0d5aa87080b6daac54..ba874743441510d1c514e54555af6fd464da08d6 100644
--- a/Geo/MHexahedron.h
+++ b/Geo/MHexahedron.h
@@ -476,7 +476,7 @@ class MHexahedron27 : public MHexahedron {
 typedef std::vector<int> indicesReversed;
 
 class MHexahedronN : public MHexahedron {
-  static std::map<int, indicesReversed> _order2indicesReversed;
+  static std::map<int, indicesReversed> _order2indicesReversedHex;
 
  protected:
   const char _order;
diff --git a/Geo/MPrism.cpp b/Geo/MPrism.cpp
index dc26b031d07ebb5d8e0cefa8cbebdada2c03dddd..c833c6079ae472b4c3d83586d7e26a93a5bd8848 100644
--- a/Geo/MPrism.cpp
+++ b/Geo/MPrism.cpp
@@ -13,7 +13,7 @@
 #include "qualityMeasures.h"
 #endif
 
-std::map<int, indicesReversed> MPrismN::_order2indicesReversed;
+std::map<int, indicesReversed> MPrismN::_order2indicesReversedPri;
 
 void MPrism::getEdgeRep(bool curved, int num, double *x, double *y, double *z,
                         SVector3 *n)
@@ -550,7 +550,7 @@ double MPrism::gammaShapeMeasure()
 #endif
 }
 
-void _getIndicesReversed(int order, indicesReversed &indices)
+void _getIndicesReversedPri(int order, indicesReversed &indices)
 {
   fullMatrix<double> ref = gmshGenerateMonomialsPrism(order);
 
@@ -571,12 +571,12 @@ void _getIndicesReversed(int order, indicesReversed &indices)
 void MPrismN::reverse()
 {
   std::map<int, indicesReversed>::iterator it;
-  it = _order2indicesReversed.find(_order);
-  if (it == _order2indicesReversed.end()) {
+  it = _order2indicesReversedPri.find(_order);
+  if (it == _order2indicesReversedPri.end()) {
     indicesReversed indices;
-    _getIndicesReversed(_order, indices);
-    _order2indicesReversed[_order] = indices;
-    it = _order2indicesReversed.find(_order);
+    _getIndicesReversedPri(_order, indices);
+    _order2indicesReversedPri[_order] = indices;
+    it = _order2indicesReversedPri.find(_order);
   }
 
   indicesReversed &indices = it->second;
diff --git a/Geo/MPrism.h b/Geo/MPrism.h
index b763e8034cfc184e85eb55011a02fd558feae7c1..bfbde23d5f91855236ff49859fce46ff2cf96a9c 100644
--- a/Geo/MPrism.h
+++ b/Geo/MPrism.h
@@ -401,7 +401,7 @@ class MPrism18 : public MPrism {
 typedef std::vector<int> indicesReversed;
 
 class MPrismN : public MPrism {
-  static std::map<int, indicesReversed> _order2indicesReversed;
+  static std::map<int, indicesReversed> _order2indicesReversedPri;
 
  protected:
   std::vector<MVertex *> _vs;
diff --git a/Geo/MPyramid.cpp b/Geo/MPyramid.cpp
index 0f9ae92613febae1da0d014b9ff47dece2f4085f..1ce974cc9354b4c2fe452c2947da861bac6b7c01 100644
--- a/Geo/MPyramid.cpp
+++ b/Geo/MPyramid.cpp
@@ -10,7 +10,7 @@
 #include "BasisFactory.h"
 #include "pointsGenerators.h"
 
-std::map<int, indicesReversed> MPyramidN::_order2indicesReversed;
+std::map<int, indicesReversed> MPyramidN::_order2indicesReversedPyr;
 
 int MPyramid::getVolumeSign()
 {
@@ -335,7 +335,7 @@ void MPyramidN::getFaceRep(bool curved, int num,
   else MPyramid::getFaceRep(false, num, x, y, z, n);
 }
 
-void _getIndicesReversed(int order, indicesReversed &indices)
+void _getIndicesReversedPyr(int order, indicesReversed &indices)
 {
   fullMatrix<double> ref = gmshGenerateMonomialsPyramid(order);
 
@@ -356,12 +356,12 @@ void _getIndicesReversed(int order, indicesReversed &indices)
 void MPyramidN::reverse()
 {
   std::map<int, indicesReversed>::iterator it;
-  it = _order2indicesReversed.find(_order);
-  if (it == _order2indicesReversed.end()) {
+  it = _order2indicesReversedPyr.find(_order);
+  if (it == _order2indicesReversedPyr.end()) {
     indicesReversed indices;
-    _getIndicesReversed(_order, indices);
-    _order2indicesReversed[_order] = indices;
-    it = _order2indicesReversed.find(_order);
+    _getIndicesReversedPyr(_order, indices);
+    _order2indicesReversedPyr[_order] = indices;
+    it = _order2indicesReversedPyr.find(_order);
   }
 
   indicesReversed &indices = it->second;
diff --git a/Geo/MPyramid.h b/Geo/MPyramid.h
index 128207abef9d791e4f8003ec7d40577883768c13..3bfe80a329da5966e1172e7cc5ea4de2663a76f0 100644
--- a/Geo/MPyramid.h
+++ b/Geo/MPyramid.h
@@ -222,7 +222,7 @@ class MPyramid : public MElement {
 typedef std::vector<int> indicesReversed;
 
 class MPyramidN : public MPyramid {
-  static std::map<int, indicesReversed> _order2indicesReversed;
+  static std::map<int, indicesReversed> _order2indicesReversedPyr;
 
  protected:
   std::vector<MVertex*> _vs;
diff --git a/Geo/MTetrahedron.cpp b/Geo/MTetrahedron.cpp
index 2a04407e5ae2d9185a7532ec79fa9a197ceae28a..e8baab9e22bacfa10f13b73bbf80963edab58164 100644
--- a/Geo/MTetrahedron.cpp
+++ b/Geo/MTetrahedron.cpp
@@ -18,7 +18,7 @@
 
 #define SQU(a)      ((a)*(a))
 
-std::map<int, indicesReversed> MTetrahedronN::_order2indicesReversed;
+std::map<int, indicesReversed> MTetrahedronN::_order2indicesReversedTet;
 
 void MTetrahedron::getEdgeRep(bool curved, int num, double *x, double *y, double *z,
                               SVector3 *n)
@@ -318,7 +318,7 @@ void MTetrahedron::getFaceInfo(const MFace &face, int &ithFace, int &sign, int &
   Msg::Error("Could not get face information for tetrahedron %d", getNum());
 }
 
-void _getIndicesReversed(int order, indicesReversed &indices)
+void _getIndicesReversedTet(int order, indicesReversed &indices)
 {
   fullMatrix<double> ref = gmshGenerateMonomialsTetrahedron(order);
 
@@ -339,12 +339,12 @@ void _getIndicesReversed(int order, indicesReversed &indices)
 void MTetrahedronN::reverse()
 {
   std::map<int, indicesReversed>::iterator it;
-  it = _order2indicesReversed.find(_order);
-  if (it == _order2indicesReversed.end()) {
+  it = _order2indicesReversedTet.find(_order);
+  if (it == _order2indicesReversedTet.end()) {
     indicesReversed indices;
-    _getIndicesReversed(_order, indices);
-    _order2indicesReversed[_order] = indices;
-    it = _order2indicesReversed.find(_order);
+    _getIndicesReversedTet(_order, indices);
+    _order2indicesReversedTet[_order] = indices;
+    it = _order2indicesReversedTet.find(_order);
   }
 
   indicesReversed &indices = it->second;
diff --git a/Geo/MTetrahedron.h b/Geo/MTetrahedron.h
index c186a330d7f463e0493a863c02afdb2284ff8b11..79409e7291359433e918b048bbf5c85c4528f424 100644
--- a/Geo/MTetrahedron.h
+++ b/Geo/MTetrahedron.h
@@ -312,7 +312,7 @@ class MTetrahedron10 : public MTetrahedron {
 typedef std::vector<int> indicesReversed;
 
 class MTetrahedronN : public MTetrahedron {
-  static std::map<int, indicesReversed> _order2indicesReversed;
+  static std::map<int, indicesReversed> _order2indicesReversedTet;
 
  protected:
   std::vector<MVertex *> _vs;