diff --git a/MeshLib/Elements/Hex.h b/MeshLib/Elements/TemplateHex.h
similarity index 95%
rename from MeshLib/Elements/Hex.h
rename to MeshLib/Elements/TemplateHex.h
index 8bd27c4149668657aa70de8d4bc8bf3e7b8c5c79..8b40b39226d0784a7bf93a4b0a367f2897bdb665 100644
--- a/MeshLib/Elements/Hex.h
+++ b/MeshLib/Elements/TemplateHex.h
@@ -5,13 +5,13 @@
  *              http://www.opengeosys.org/project/license
  *
  *
- * \file Hex.h
+ * \file TemplateHex.h
  *
  * Created on 2012-05-02 by Karsten Rink
  */
 
-#ifndef HEX_H_
-#define HEX_H_
+#ifndef TEMPLATEHEX_H_
+#define TEMPLATEHEX_H_
 
 #include "Cell.h"
 
@@ -112,11 +112,9 @@ protected:
 
 }; /* class */
 
-typedef TemplateHex<1,8> Hex;
-
 } /* namespace */
 
-#include "Hex.hpp"
+#include "TemplateHex.hpp"
 
-#endif /* HEX_H_ */
+#endif /* TEMPLATEHEX_H_ */
 
diff --git a/MeshLib/Elements/Hex.hpp b/MeshLib/Elements/TemplateHex.hpp
similarity index 99%
rename from MeshLib/Elements/Hex.hpp
rename to MeshLib/Elements/TemplateHex.hpp
index b0bae99689ec41f6c56bd55af83557bba27859d9..92e1a821868c5321c7b8a0cbba5241c38dd9e999 100644
--- a/MeshLib/Elements/Hex.hpp
+++ b/MeshLib/Elements/TemplateHex.hpp
@@ -5,19 +5,17 @@
  *              http://www.opengeosys.org/project/license
  *
  *
- * \file Hex.cpp
+ * \file TemplateHex.hpp
  *
  * Created on 2012-05-02 by Karsten Rink
  */
 
-#include "Hex.h"
 #include "Node.h"
 #include "Quad.h"
 #include "Prism.h"
 
 #include "MathTools.h"
 
-
 namespace MeshLib {
 
 template <unsigned ORDER, unsigned NNODES>