diff --git a/src/ifcgeom_schema_agnostic/IteratorImplementation.cpp b/src/ifcgeom_schema_agnostic/IteratorImplementation.cpp
index ad94ad063c..07c7819635 100644
--- a/src/ifcgeom_schema_agnostic/IteratorImplementation.cpp
+++ b/src/ifcgeom_schema_agnostic/IteratorImplementation.cpp
@@ -8,13 +8,13 @@
 // - extern void init_IteratorImplementation_Ifc2x3(IteratorFactoryImplementation*);
 // - ...
 #define EXTERNAL_DEFS(r, data, elem) \
-	extern void BOOST_PP_CAT(init_IteratorImplementation_, elem)(IteratorFactoryImplementation*);
+	extern void BOOST_PP_CAT(init_IteratorImplementation_Ifc, elem)(IteratorFactoryImplementation*);
 
 // Declares the schema-based external iterator initialization routines:
 // - init_IteratorImplementation_Ifc2x3(this);
 // - ...
 #define CALL_DEFS(r, data, elem) \
-	BOOST_PP_CAT(init_IteratorImplementation_, elem)(this);
+	BOOST_PP_CAT(init_IteratorImplementation_Ifc, elem)(this);
 
 IFC_GEOM_API IteratorFactoryImplementation& iterator_implementations() {
 	static IteratorFactoryImplementation impl;
diff --git a/src/ifcgeom_schema_agnostic/Kernel.cpp b/src/ifcgeom_schema_agnostic/Kernel.cpp
index 4eeb0bf874..50c9689ada 100644
--- a/src/ifcgeom_schema_agnostic/Kernel.cpp
+++ b/src/ifcgeom_schema_agnostic/Kernel.cpp
@@ -55,13 +55,13 @@ IfcGeom::impl::KernelFactoryImplementation& IfcGeom::impl::kernel_implementation
 // - extern void init_KernelImplementation_Ifc2x3(IfcGeom::impl::KernelFactoryImplementation*);
 // - ...
 #define EXTERNAL_DEFS(r, data, elem) \
-	extern void BOOST_PP_CAT(init_KernelImplementation_, elem)(IfcGeom::impl::KernelFactoryImplementation*);
+	extern void BOOST_PP_CAT(init_KernelImplementation_Ifc, elem)(IfcGeom::impl::KernelFactoryImplementation*);
 
 // Declares the schema-based external iterator initialization routines:
 // - init_IteratorImplementation_Ifc2x3(this);
 // - ...
 #define CALL_DEFS(r, data, elem) \
-	BOOST_PP_CAT(init_KernelImplementation_, elem)(this);
+	BOOST_PP_CAT(init_KernelImplementation_Ifc, elem)(this);
 
 BOOST_PP_SEQ_FOR_EACH(EXTERNAL_DEFS, , SCHEMA_SEQ)
 
diff --git a/src/serializers/XmlSerializer.cpp b/src/serializers/XmlSerializer.cpp
index 25ac9b8aeb..65e3af117f 100644
--- a/src/serializers/XmlSerializer.cpp
+++ b/src/serializers/XmlSerializer.cpp
@@ -5,10 +5,10 @@
 #include <boost/algorithm/string/case_conv.hpp>
 
 #define EXTERNAL_DEFS(r, data, elem) \
-	extern void BOOST_PP_CAT(init_XmlSerializer, elem)(XmlSerializerFactory::Factory*);
+	extern void BOOST_PP_CAT(init_XmlSerializerIfc, elem)(XmlSerializerFactory::Factory*);
 
 #define CALL_DEFS(r, data, elem) \
-	BOOST_PP_CAT(init_XmlSerializer, elem)(this);
+	BOOST_PP_CAT(init_XmlSerializerIfc, elem)(this);
 
 BOOST_PP_SEQ_FOR_EACH(EXTERNAL_DEFS, , SCHEMA_SEQ)