diff --git a/MeshLib/Elements/TemplateHex.tpp b/MeshLib/Elements/TemplateHex-impl.h
similarity index 100%
rename from MeshLib/Elements/TemplateHex.tpp
rename to MeshLib/Elements/TemplateHex-impl.h
diff --git a/MeshLib/Elements/TemplateHex.h b/MeshLib/Elements/TemplateHex.h
index f5e4481827e04a327a9ed1c71e523e096c26b291..27504ac63d45e0fdf99b75daa3325687f28cff3d 100644
--- a/MeshLib/Elements/TemplateHex.h
+++ b/MeshLib/Elements/TemplateHex.h
@@ -133,7 +133,7 @@ protected:
 
 } /* namespace */
 
-#include "TemplateHex.tpp"
+#include "TemplateHex-impl.h"
 
 #endif /* TEMPLATEHEX_H_ */
 
diff --git a/MeshLib/Elements/TemplateLine.tpp b/MeshLib/Elements/TemplateLine-impl.h
similarity index 100%
rename from MeshLib/Elements/TemplateLine.tpp
rename to MeshLib/Elements/TemplateLine-impl.h
diff --git a/MeshLib/Elements/TemplateLine.h b/MeshLib/Elements/TemplateLine.h
index e59223989dd819b1c576132a2b44a3cf5e65daad..ae9dbcadf4f255aef671922607695606c072dee0 100644
--- a/MeshLib/Elements/TemplateLine.h
+++ b/MeshLib/Elements/TemplateLine.h
@@ -111,7 +111,7 @@ protected:
 
 } /* namespace */
 
-#include "TemplateLine.tpp"
+#include "TemplateLine-impl.h"
 
 #endif /* TEMPLATELINE_H_ */
 
diff --git a/MeshLib/Elements/TemplatePrism.tpp b/MeshLib/Elements/TemplatePrism-impl.h
similarity index 100%
rename from MeshLib/Elements/TemplatePrism.tpp
rename to MeshLib/Elements/TemplatePrism-impl.h
diff --git a/MeshLib/Elements/TemplatePrism.h b/MeshLib/Elements/TemplatePrism.h
index a9dbba8547f9dceff2e86455267204dd0bd8e0e4..41305a7de2f1eeb747ed5bf1b77ab1f035fcaf5e 100644
--- a/MeshLib/Elements/TemplatePrism.h
+++ b/MeshLib/Elements/TemplatePrism.h
@@ -138,7 +138,7 @@ protected:
 
 } /* namespace */
 
-#include "TemplatePrism.tpp"
+#include "TemplatePrism-impl.h"
 
 #endif /* TEMPLATEPRISM_H_ */
 
diff --git a/MeshLib/Elements/TemplatePyramid.tpp b/MeshLib/Elements/TemplatePyramid-impl.h
similarity index 100%
rename from MeshLib/Elements/TemplatePyramid.tpp
rename to MeshLib/Elements/TemplatePyramid-impl.h
diff --git a/MeshLib/Elements/TemplatePyramid.h b/MeshLib/Elements/TemplatePyramid.h
index bfdceef8a2820de972f374cdfa5a8f0cb54c594b..6965eca08978be21caa9171c50e92d0d710f82bb 100644
--- a/MeshLib/Elements/TemplatePyramid.h
+++ b/MeshLib/Elements/TemplatePyramid.h
@@ -136,7 +136,7 @@ protected:
 
 } /* namespace */
 
-#include "TemplatePyramid.tpp"
+#include "TemplatePyramid-impl.h"
 
 #endif /* TEMPLATEPYRAMID_H_ */
 
diff --git a/MeshLib/Elements/TemplateQuad.tpp b/MeshLib/Elements/TemplateQuad-impl.h
similarity index 100%
rename from MeshLib/Elements/TemplateQuad.tpp
rename to MeshLib/Elements/TemplateQuad-impl.h
diff --git a/MeshLib/Elements/TemplateQuad.h b/MeshLib/Elements/TemplateQuad.h
index 119111c8bc48f6e2758a8874778ec90829157c28..e735e46c26330e355fd691d3549c8d62f2d8976c 100644
--- a/MeshLib/Elements/TemplateQuad.h
+++ b/MeshLib/Elements/TemplateQuad.h
@@ -151,7 +151,7 @@ const unsigned TemplateQuad<NNODES, CELLQUADTYPE>::n_base_nodes = 4;
 
 } /* namespace */
 
-#include "TemplateQuad.tpp"
+#include "TemplateQuad-impl.h"
 
 #endif /* TEMPLATEQUAD_H_ */
 
diff --git a/MeshLib/Elements/TemplateTet.tpp b/MeshLib/Elements/TemplateTet-impl.h
similarity index 100%
rename from MeshLib/Elements/TemplateTet.tpp
rename to MeshLib/Elements/TemplateTet-impl.h
diff --git a/MeshLib/Elements/TemplateTet.h b/MeshLib/Elements/TemplateTet.h
index c2255b64881f53c52702cf210e6d754d80d7729f..de9f82be76d23bff27942980bda934528372b50d 100644
--- a/MeshLib/Elements/TemplateTet.h
+++ b/MeshLib/Elements/TemplateTet.h
@@ -139,7 +139,7 @@ protected:
 
 } /* namespace */
 
-#include "TemplateTet.tpp"
+#include "TemplateTet-impl.h"
 
 #endif /* TEMPLATETET_H_ */
 
diff --git a/MeshLib/Elements/TemplateTri.tpp b/MeshLib/Elements/TemplateTri-impl.h
similarity index 100%
rename from MeshLib/Elements/TemplateTri.tpp
rename to MeshLib/Elements/TemplateTri-impl.h
diff --git a/MeshLib/Elements/TemplateTri.h b/MeshLib/Elements/TemplateTri.h
index 78e47d451763c4105f0dc2361dbbd7004e9187d1..6d1bb35427e60df038df363b04351eb5cdd600fe 100644
--- a/MeshLib/Elements/TemplateTri.h
+++ b/MeshLib/Elements/TemplateTri.h
@@ -151,7 +151,7 @@ const unsigned TemplateTri<NNODES,CELLTRITYPE>::_edge_nodes[3][2] = {
 
 } /* namespace */
 
-#include "TemplateTri.tpp"
+#include "TemplateTri-impl.h"
 
 #endif /* TEMPLATETRI_H_ */