diff --git a/MeshLib/Elements/Quad.h b/MeshLib/Elements/TemplateQuad.h
similarity index 96%
rename from MeshLib/Elements/Quad.h
rename to MeshLib/Elements/TemplateQuad.h
index fbc6d04a35bc9b214ee18110e9fd95f8bd3e9f21..2dcae2b4612b85d100ceceef113a70af020265d4 100644
--- a/MeshLib/Elements/Quad.h
+++ b/MeshLib/Elements/TemplateQuad.h
@@ -10,8 +10,8 @@
  * Created on 2012-05-02 by Karsten Rink
  */
 
-#ifndef QUAD_H_
-#define QUAD_H_
+#ifndef TEMPLATEQUAD_H_
+#define TEMPLATEQUAD_H_
 
 #include "Face.h"
 
@@ -107,11 +107,9 @@ const unsigned TemplateQuad<ORDER,NNODES>::_edge_nodes[4][2] =
 	{0, 3}  // Edge 3
 };
 
-typedef TemplateQuad<1,4> Quad;
-
 } /* namespace */
 
-#include "Quad.hpp"
+#include "TemplateQuad.hpp"
 
-#endif /* QUAD_H_ */
+#endif /* TEMPLATEQUAD_H_ */
 
diff --git a/MeshLib/Elements/Quad.hpp b/MeshLib/Elements/TemplateQuad.hpp
similarity index 100%
rename from MeshLib/Elements/Quad.hpp
rename to MeshLib/Elements/TemplateQuad.hpp