diff --git a/src/ifcgeom/IfcGeomIteratorImplementation.h b/src/ifcgeom/IfcGeomIteratorImplementation.h
index 172f19a837..8f2f21f1b0 100644
--- a/src/ifcgeom/IfcGeomIteratorImplementation.h
+++ b/src/ifcgeom/IfcGeomIteratorImplementation.h
@@ -171,11 +171,11 @@ namespace {
 		}
 	}
 }
-
+#define IteratorImplementation MAKE_TYPE_NAME(IteratorImplementation_)
 namespace IfcGeom {
 	
 	template <typename P, typename PP>
-	class MAKE_TYPE_NAME(IteratorImplementation_) : public IteratorImplementation<P, PP> {
+	class IteratorImplementation : public IteratorImplementation<P, PP> {
 	private:
 
 		std::atomic<int> progress_;
@@ -185,8 +185,8 @@ namespace IfcGeom {
 		typename std::vector<IfcGeom::Element<P, PP>*>::const_iterator task_result_iterator_;
 		typename std::vector<IfcGeom::BRepElement<P, PP>*>::const_iterator native_task_result_iterator_;
 
-		MAKE_TYPE_NAME(IteratorImplementation_)(const MAKE_TYPE_NAME(IteratorImplementation_)&); // N/I
-		MAKE_TYPE_NAME(IteratorImplementation_)& operator=(const MAKE_TYPE_NAME(IteratorImplementation_)&); // N/I
+		IteratorImplementation(const IteratorImplementation&); // N/I
+		IteratorImplementation& operator=(const IteratorImplementation&); // N/I
 
 		MAKE_TYPE_NAME(Kernel) kernel;
 
@@ -1017,7 +1017,7 @@ namespace IfcGeom {
 		}
 		
 	public:
-		MAKE_TYPE_NAME(IteratorImplementation_)(const IteratorSettings& settings, IfcParse::IfcFile* file, const std::vector<IfcGeom::filter_t>& filters, int num_threads)
+		IteratorImplementation(const IteratorSettings& settings, IfcParse::IfcFile* file, const std::vector<IfcGeom::filter_t>& filters, int num_threads)
 			: settings(settings)
 			, ifc_file(file)
 			, filters_(filters)
@@ -1027,7 +1027,7 @@ namespace IfcGeom {
 			_initialize();
 		}
 
-		~MAKE_TYPE_NAME(IteratorImplementation_)() {
+		~IteratorImplementation() {
 			if (owns_ifc_file) {
 				delete ifc_file;
 			}