diff --git a/DDDetectors/src/CaloFaceBarrel_surfaces.cpp b/DDDetectors/src/CaloFaceBarrel_surfaces.cpp
index 4fa16e8aed75dbaa809e57853ba9d48859394101..a506cd5ab087b7ed00a32da70c51eab43b5a44c8 100644
--- a/DDDetectors/src/CaloFaceBarrel_surfaces.cpp
+++ b/DDDetectors/src/CaloFaceBarrel_surfaces.cpp
@@ -28,7 +28,7 @@ namespace {
 
 // Framework include files
 #define SURFACEINSTALLER_DATA UserData
-#define DD4HEP_USE_SURFACEINSTALL_HELPER dd4hep_CaloFaceBarrelSurfacePlugin
+#define DD4HEP_USE_SURFACEINSTALL_HELPER DD4hep_CaloFaceBarrelSurfacePlugin
 #include "DD4hep/Printout.h"
 #include "DD4hep/SurfaceInstaller.h"
 #include "DDRec/DetectorData.h"
diff --git a/DDDetectors/src/CaloFaceEndcap_surfaces.cpp b/DDDetectors/src/CaloFaceEndcap_surfaces.cpp
index c4df7b5b2ffe83ba08dfd36a588fbaf43bdb3337..ae696a5d94a4ff8ff18cff2a3637eaa9b16b86c2 100644
--- a/DDDetectors/src/CaloFaceEndcap_surfaces.cpp
+++ b/DDDetectors/src/CaloFaceEndcap_surfaces.cpp
@@ -27,7 +27,7 @@ namespace {
 
 // Framework include files
 #define SURFACEINSTALLER_DATA UserData
-#define DD4HEP_USE_SURFACEINSTALL_HELPER dd4hep_CaloFaceEndcapSurfacePlugin
+#define DD4HEP_USE_SURFACEINSTALL_HELPER DD4hep_CaloFaceEndcapSurfacePlugin
 #include "DD4hep/Printout.h"
 #include "DD4hep/SurfaceInstaller.h"
 #include "DDRec/DetectorData.h"
diff --git a/DDDetectors/src/GenericSurfaceInstaller.cpp b/DDDetectors/src/GenericSurfaceInstaller.cpp
index b517e6afca492bb3f3f0f332d4777ea0bf509928..f9ed3dbe6ec33e1d630764537e555fb00f5aa32f 100644
--- a/DDDetectors/src/GenericSurfaceInstaller.cpp
+++ b/DDDetectors/src/GenericSurfaceInstaller.cpp
@@ -70,7 +70,7 @@ namespace {
 
 // Framework include files
 #define SURFACEINSTALLER_DATA UserData
-#define DD4HEP_USE_SURFACEINSTALL_HELPER dd4hep_GenericSurfaceInstallerPlugin
+#define DD4HEP_USE_SURFACEINSTALL_HELPER DD4hep_GenericSurfaceInstallerPlugin
 #include "DD4hep/SurfaceInstaller.h"
 
 namespace{
diff --git a/DDDetectors/src/PolyhedraEndcapCalorimeter2_surfaces.cpp b/DDDetectors/src/PolyhedraEndcapCalorimeter2_surfaces.cpp
index d098e11c7d1a27bce0f706ceb1a930e5fdaac925..ec5a7d20f8a9b3e4d559c14a43f97b73fe482257 100644
--- a/DDDetectors/src/PolyhedraEndcapCalorimeter2_surfaces.cpp
+++ b/DDDetectors/src/PolyhedraEndcapCalorimeter2_surfaces.cpp
@@ -15,7 +15,7 @@
 // 
 //==========================================================================
 // Framework include files
-#define  DD4HEP_USE_SURFACEINSTALL_HELPER  dd4hep_PolyhedraEndcapCalorimeterSurfacePlugin
+#define  DD4HEP_USE_SURFACEINSTALL_HELPER  DD4hep_PolyhedraEndcapCalorimeterSurfacePlugin
 #include "DD4hep/SurfaceInstaller.h"
 
 /// Install measurement surfaces
diff --git a/DDDetectors/src/SiTrackerBarrel_surfaces.cpp b/DDDetectors/src/SiTrackerBarrel_surfaces.cpp
index 22c64831af46b540922dea21dce9352dc6e4cc68..49cb5c11ba6075cee5e2d26b377b994baae70e0e 100644
--- a/DDDetectors/src/SiTrackerBarrel_surfaces.cpp
+++ b/DDDetectors/src/SiTrackerBarrel_surfaces.cpp
@@ -23,7 +23,7 @@ namespace {
 
 // Framework include files
 #define SURFACEINSTALLER_DATA UserData
-#define DD4HEP_USE_SURFACEINSTALL_HELPER dd4hep_SiTrackerBarrelSurfacePlugin
+#define DD4HEP_USE_SURFACEINSTALL_HELPER DD4hep_SiTrackerBarrelSurfacePlugin
 #include "DD4hep/SurfaceInstaller.h"
 
 namespace{
diff --git a/DDDetectors/src/SiTrackerEndcap_surfaces.cpp b/DDDetectors/src/SiTrackerEndcap_surfaces.cpp
index c524d6b8ebfa625a7b35dc77f6cf29e040ce26ee..0634e2b36ab46a1c7cd8a489a6acd4a58be47497 100644
--- a/DDDetectors/src/SiTrackerEndcap_surfaces.cpp
+++ b/DDDetectors/src/SiTrackerEndcap_surfaces.cpp
@@ -15,7 +15,7 @@
 // 
 //==========================================================================
 // Framework include files
-#define  DD4HEP_USE_SURFACEINSTALL_HELPER  dd4hep_SiTrackerEndcapSurfacePlugin
+#define  DD4HEP_USE_SURFACEINSTALL_HELPER  DD4hep_SiTrackerEndcapSurfacePlugin
 #include "DD4hep/SurfaceInstaller.h"
 
 /// Install measurement surfaces
diff --git a/DDDetectors/src/SurfaceExamplePlugin.cpp b/DDDetectors/src/SurfaceExamplePlugin.cpp
index 1d6e72e8f74c61b70a73c8bc3d639861ecfa5c27..1a44948d2798ed46dfd11813892864ebd8400983 100644
--- a/DDDetectors/src/SurfaceExamplePlugin.cpp
+++ b/DDDetectors/src/SurfaceExamplePlugin.cpp
@@ -17,7 +17,7 @@
 // Framework include files
 namespace { struct UserData { /* int a,b,c; */ }; }
 #define SURFACEINSTALLER_DATA UserData
-#define DD4HEP_USE_SURFACEINSTALL_HELPER dd4hep_SurfaceExamplePlugin
+#define DD4HEP_USE_SURFACEINSTALL_HELPER DD4hep_SurfaceExamplePlugin
 #include "DD4hep/SurfaceInstaller.h"
 
 namespace {