diff --git a/FileIO/GMSInterface.cpp b/FileIO/GMSInterface.cpp
index 1f5c2524c928a31541c1e1c0480a32b933244292..718fbcd381fc607c35f8af1a0f7d02301b5dd7b6 100644
--- a/FileIO/GMSInterface.cpp
+++ b/FileIO/GMSInterface.cpp
@@ -25,7 +25,7 @@
 #include "Elements/Tet.h"
 #include "GMSInterface.h"
 #include "Mesh.h"
-#include "MshEnums.h"
+#include "MeshEnums.h"
 #include "Node.h"
 #include "StationBorehole.h"
 // BaseLib
diff --git a/FileIO/RapidXmlIO/BoostVtuInterface.h b/FileIO/RapidXmlIO/BoostVtuInterface.h
index 5550999aa73761a95ed05246db4e7b21ca56d270..5b5df346454c89bffdb947ef75d88a35acb21cb9 100644
--- a/FileIO/RapidXmlIO/BoostVtuInterface.h
+++ b/FileIO/RapidXmlIO/BoostVtuInterface.h
@@ -20,7 +20,7 @@
 #include <string>
 #include <vector>
 
-#include "MshEnums.h"
+#include "MeshEnums.h"
 
 #include <boost/property_tree/ptree.hpp>
 #include <boost/property_tree/xml_parser.hpp>
diff --git a/FileIO/RapidXmlIO/RapidVtuInterface.h b/FileIO/RapidXmlIO/RapidVtuInterface.h
index 664fd891d3732ebc100d63184a20d89969b0ab87..9928597555fa7c3687b97491bad3b3246738e983 100644
--- a/FileIO/RapidXmlIO/RapidVtuInterface.h
+++ b/FileIO/RapidXmlIO/RapidVtuInterface.h
@@ -20,7 +20,7 @@
 #include <string>
 #include <vector>
 
-#include "MshEnums.h"
+#include "MeshEnums.h"
 #include "RapidXML/rapidxml.hpp"
 
 class ProjectData;
diff --git a/Gui/DataView/MshModel.cpp b/Gui/DataView/MshModel.cpp
index 56e6c35ec59c101260d8840e91259fe3e3f066bd..534e2717e282f9801f9b6a37dc01ccba5d4a6589 100644
--- a/Gui/DataView/MshModel.cpp
+++ b/Gui/DataView/MshModel.cpp
@@ -26,7 +26,7 @@
 // MeshLib
 #include "Node.h"
 #include "Elements/Element.h"
-#include "MshEnums.h"
+#include "MeshEnums.h"
 
 // Qt
 #include <QFileInfo>
diff --git a/Gui/DataView/MshQualitySelectionDialog.h b/Gui/DataView/MshQualitySelectionDialog.h
index ce5778f5bba6b526e988528ecb99467f2214c940..ef4812c70d44b62b19f48d4460aa0c6d928b7a1e 100644
--- a/Gui/DataView/MshQualitySelectionDialog.h
+++ b/Gui/DataView/MshQualitySelectionDialog.h
@@ -15,7 +15,7 @@
 #ifndef MSHQUALITYSELECTIONDIALOG_H
 #define MSHQUALITYSELECTIONDIALOG_H
 
-#include "MshEnums.h"
+#include "MeshEnums.h"
 #include "ui_MshQualitySelection.h"
 #include <QDialog>
 
diff --git a/Gui/VtkVis/VtkMeshConverter.h b/Gui/VtkVis/VtkMeshConverter.h
index 8d98c6ff22d62593b486b91d19d8f33599e4b917..da79fedbc8f26f99e30346d429dd5dedc6a5e070 100644
--- a/Gui/VtkVis/VtkMeshConverter.h
+++ b/Gui/VtkVis/VtkMeshConverter.h
@@ -20,7 +20,7 @@ namespace MeshLib {
 	class Mesh;
 }
 
-#include "MshEnums.h"
+#include "MeshEnums.h"
 
 class vtkImageData; // For conversion from Image to QuadMesh
 class vtkUnstructuredGrid; // For conversion vom vtk to ogs mesh
diff --git a/Gui/VtkVis/VtkVisPipeline.h b/Gui/VtkVis/VtkVisPipeline.h
index 3fa2f0508e0fb7556b0bb3aeec95065c049c6c02..545d8c7e231ec4b05818ea3517b6544da1d1bc96 100644
--- a/Gui/VtkVis/VtkVisPipeline.h
+++ b/Gui/VtkVis/VtkVisPipeline.h
@@ -19,7 +19,7 @@
 #include "Color.h"
 #include "FEMCondition.h"
 #include "GeoType.h"
-#include "MshEnums.h"
+#include "MeshEnums.h"
 #include "Point.h"
 #include "TreeModel.h"
 
diff --git a/MeshLib/Elements/Element.h b/MeshLib/Elements/Element.h
index c31210925e5506fb19d6a1f2422ffda39f57ba4f..f1e9e8a3142156b56e55b4c5129520d95a4e9695 100644
--- a/MeshLib/Elements/Element.h
+++ b/MeshLib/Elements/Element.h
@@ -16,7 +16,7 @@
 #define ELEMENT_H_
 
 #include <vector>
-#include "MshEnums.h"
+#include "MeshEnums.h"
 #include "Mesh.h"
 
 namespace MeshLib {
diff --git a/MeshLib/Elements/TemplateEdge.h b/MeshLib/Elements/TemplateEdge.h
index 0a6d35265d9f7c554a5ee46d06dac9f5bda7d327..630cdeeeb08503e67d73b1d8dd6d838609ae0ee4 100644
--- a/MeshLib/Elements/TemplateEdge.h
+++ b/MeshLib/Elements/TemplateEdge.h
@@ -18,7 +18,7 @@
 #include <array>
 #include <limits>
 
-#include "MshEnums.h"
+#include "MeshEnums.h"
 #include "Element.h"
 #include "Node.h"
 
diff --git a/MeshLib/Elements/TemplateHex.h b/MeshLib/Elements/TemplateHex.h
index b705f3c8c0acf18df809accc204b7d88b0ca9fdb..c11dc0d5ac124d203eb0233ecc48d8b438d1797e 100644
--- a/MeshLib/Elements/TemplateHex.h
+++ b/MeshLib/Elements/TemplateHex.h
@@ -16,7 +16,7 @@
 #define TEMPLATEHEX_H_
 
 #include <array>
-#include "MshEnums.h"
+#include "MeshEnums.h"
 #include "Cell.h"
 
 namespace MeshLib {
diff --git a/MeshLib/Elements/TemplatePrism.h b/MeshLib/Elements/TemplatePrism.h
index 9a1b48c7303ee02373dfdb3d91945b77c43387e6..7947d02d71ce095122cdeaae83fa1ef063cc3df6 100644
--- a/MeshLib/Elements/TemplatePrism.h
+++ b/MeshLib/Elements/TemplatePrism.h
@@ -16,7 +16,7 @@
 #define TEMPLATEPRISM_H_
 
 #include <array>
-#include "MshEnums.h"
+#include "MeshEnums.h"
 #include "Cell.h"
 
 namespace MeshLib {
diff --git a/MeshLib/Elements/TemplatePyramid.h b/MeshLib/Elements/TemplatePyramid.h
index cf213dd041af6b87d63e7c2a3376de5681a7ac3c..da01bbb5668f1fe8fb3ca6a7c0fde2e077798310 100644
--- a/MeshLib/Elements/TemplatePyramid.h
+++ b/MeshLib/Elements/TemplatePyramid.h
@@ -16,7 +16,7 @@
 #define TEMPLATEPYRAMID_H_
 
 #include <array>
-#include "MshEnums.h"
+#include "MeshEnums.h"
 #include "Cell.h"
 
 namespace MeshLib {
diff --git a/MeshLib/Elements/TemplateQuad.h b/MeshLib/Elements/TemplateQuad.h
index 049b1ab58c74ec27b7db7a0a9c97479dd8bedddc..4acd39f9183787e290a44c55bbae4dea1b17fda1 100644
--- a/MeshLib/Elements/TemplateQuad.h
+++ b/MeshLib/Elements/TemplateQuad.h
@@ -16,7 +16,7 @@
 #define TEMPLATEQUAD_H_
 
 #include <array>
-#include "MshEnums.h"
+#include "MeshEnums.h"
 #include "Face.h"
 
 namespace MeshLib {
diff --git a/MeshLib/Elements/TemplateTet.h b/MeshLib/Elements/TemplateTet.h
index 71a430ee6acb94078c41d5929aef449d3c5a3dea..51fa10769fecb5e69a9be4981baaecd4d16722b0 100644
--- a/MeshLib/Elements/TemplateTet.h
+++ b/MeshLib/Elements/TemplateTet.h
@@ -16,7 +16,7 @@
 #define TEMPLATETET_H_
 
 #include <array>
-#include "MshEnums.h"
+#include "MeshEnums.h"
 #include "Cell.h"
 
 namespace MeshLib {
diff --git a/MeshLib/Elements/TemplateTri.h b/MeshLib/Elements/TemplateTri.h
index 3adaa403998c0fa20875c3cde9c6739960b69f90..ac299793adec51e6a1713302afd246c381e7cb6b 100644
--- a/MeshLib/Elements/TemplateTri.h
+++ b/MeshLib/Elements/TemplateTri.h
@@ -19,7 +19,7 @@
 #include "Edge.h"
 #include "Node.h"
 #include "Face.h"
-#include "MshEnums.h"
+#include "MeshEnums.h"
 
 #include "MathTools.h"
 
diff --git a/MeshLib/Mesh.h b/MeshLib/Mesh.h
index 7f80d6128b565e1b9eb901c54e50d71d30bdcbd2..239497d71a8b49afa73795136cdd9d0994d6de7a 100644
--- a/MeshLib/Mesh.h
+++ b/MeshLib/Mesh.h
@@ -19,7 +19,7 @@
 #include <string>
 #include <vector>
 
-#include "MshEnums.h"
+#include "MeshEnums.h"
 
 #include "BaseLib/Counter.h"
 
diff --git a/MeshLib/MshEnums.cpp b/MeshLib/MeshEnums.cpp
similarity index 98%
rename from MeshLib/MshEnums.cpp
rename to MeshLib/MeshEnums.cpp
index 813e8f76b5fd86a61dc1c882d2eea036b55d3abf..3a13628987ce3734b955ba9bf50765377d83756f 100644
--- a/MeshLib/MshEnums.cpp
+++ b/MeshLib/MeshEnums.cpp
@@ -12,7 +12,7 @@
  *
  */
 
-#include "MshEnums.h"
+#include "MeshEnums.h"
 
 const std::string MshElemType2String(const MshElemType::type t)
 {
diff --git a/MeshLib/MshEnums.h b/MeshLib/MeshEnums.h
similarity index 95%
rename from MeshLib/MshEnums.h
rename to MeshLib/MeshEnums.h
index 760f78df01423fd0c1fa4d6b2367c8d2c0940fc1..61d66969d79512471bd76fc5cfdfbb68326e9f5d 100644
--- a/MeshLib/MshEnums.h
+++ b/MeshLib/MeshEnums.h
@@ -12,8 +12,8 @@
  *
  */
 
-#ifndef MSHENUMS_H
-#define MSHENUMS_H
+#ifndef MESHENUMS_H
+#define MESHENUMS_H
 
 #include <string>
 
@@ -82,4 +82,4 @@ MshElemType::type String2MshElemType(const std::string &s);
 
 const std::string MshQualityType2String(const MshQualityType::type t);
 
-#endif //MSHENUMS_H
+#endif //MESHENUMS_H
diff --git a/MeshLib/MeshGenerators/ConvertRasterToMesh.h b/MeshLib/MeshGenerators/ConvertRasterToMesh.h
index 0421b379fe71b48074a3c3f597cfa266159d0ec6..42ffc4eeb00d769ccffa0203f5f4c21d811907c2 100644
--- a/MeshLib/MeshGenerators/ConvertRasterToMesh.h
+++ b/MeshLib/MeshGenerators/ConvertRasterToMesh.h
@@ -19,7 +19,7 @@
 #include "Raster.h"
 
 // MeshLib
-#include "MshEnums.h"
+#include "MeshEnums.h"
 
 namespace MeshLib {
 
diff --git a/Utils/SimpleMeshCreation/createMeshElemPropertiesFromASCRaster.cpp b/Utils/SimpleMeshCreation/createMeshElemPropertiesFromASCRaster.cpp
index 1ace613dc25013da9c2ec62cb7f290ab7c1f467d..7386366bcc8182f3ae9286252193aa8d53c1647d 100644
--- a/Utils/SimpleMeshCreation/createMeshElemPropertiesFromASCRaster.cpp
+++ b/Utils/SimpleMeshCreation/createMeshElemPropertiesFromASCRaster.cpp
@@ -45,7 +45,7 @@
 #include "Elements/Element.h"
 #include "Mesh.h"
 #include "MeshEditing/Mesh2MeshPropertyInterpolation.h"
-#include "MshEnums.h"
+#include "MeshEnums.h"
 
 int main (int argc, char* argv[])
 {