diff --git a/corsika/detail/setup/SetupStack.hpp b/corsika/detail/setup/SetupStack.hpp
index 6577b023fa1db2f4da4d577c4b17236b78c4cb51..e58ff5d9c7a7e88450147d8761e22585c1de8512 100644
--- a/corsika/detail/setup/SetupStack.hpp
+++ b/corsika/detail/setup/SetupStack.hpp
@@ -28,7 +28,7 @@ namespace corsika {
     // environment:
     template <typename TStackIter>
     using SetupGeometryDataInterface =
-        typename node::make_GeometryDataInterface<TStackIter, setup::Environment>::type;
+        typename node::MakeGeometryDataInterface<TStackIter, setup::Environment>::type;
 
     // combine particle data stack with geometry information for tracking
     template <typename TStackIter>
diff --git a/corsika/stack/GeometryNodeStackExtension.hpp b/corsika/stack/GeometryNodeStackExtension.hpp
index 9cd81cc77256bbf6e8d04699a189e517689b2edb..e7298bea4bc4b04d5869ee70f440c3398b90d52a 100644
--- a/corsika/stack/GeometryNodeStackExtension.hpp
+++ b/corsika/stack/GeometryNodeStackExtension.hpp
@@ -117,7 +117,7 @@ namespace corsika::node {
   };
 
   template <typename T, typename TEnv>
-  struct make_GeometryDataInterface {
+  struct MakeGeometryDataInterface {
     typedef GeometryDataInterface<T, TEnv> type;
   };
 
diff --git a/corsika/stack/WeightStackExtension.hpp b/corsika/stack/WeightStackExtension.hpp
index 2cbcce482d6e72f5cdca335c0ddc260acb1fc744..372d266991bdd5a06089b7a09e8286690c7e3bdb 100644
--- a/corsika/stack/WeightStackExtension.hpp
+++ b/corsika/stack/WeightStackExtension.hpp
@@ -112,7 +112,7 @@ namespace corsika::weights {
   };
 
   template <typename TParentStack>
-  struct make_WeightDataInterface {
+  struct MakeWeightDataInterface {
     typedef WeightDataInterface<TParentStack> type;
   };
 
diff --git a/tests/stack/testGeometryNodeStackExtension.cpp b/tests/stack/testGeometryNodeStackExtension.cpp
index c623709e68ade4d0a093cdf1dfd9574e7c5b2c4c..8256927d92ed44f57d84a0ddfa370244630c9483 100644
--- a/tests/stack/testGeometryNodeStackExtension.cpp
+++ b/tests/stack/testGeometryNodeStackExtension.cpp
@@ -26,7 +26,7 @@ public:
 // the GeometryNode stack needs to know the type of geometry-nodes from the DummyEnv:
 template <typename TStackIter>
 using DummyGeometryDataInterface =
-    typename node::make_GeometryDataInterface<TStackIter, DummyEnv>::type;
+    typename node::MakeGeometryDataInterface<TStackIter, DummyEnv>::type;
 
 // combine dummy stack with geometry information for tracking
 template <typename TStackIter>
diff --git a/tests/stack/testWeightStackExtension.cpp b/tests/stack/testWeightStackExtension.cpp
index 715051b0514f3e2622adbf76f02edb6a6102f4ff..4fc44e76adf5f0659949a382825c8717a6a4f85e 100644
--- a/tests/stack/testWeightStackExtension.cpp
+++ b/tests/stack/testWeightStackExtension.cpp
@@ -20,7 +20,7 @@ using namespace std;
 // the Weight stack:
 template <typename TStackIter>
 using DummyWeightDataInterface =
-    typename weights::make_WeightDataInterface<TStackIter>::type;
+    typename weights::MakeWeightDataInterface<TStackIter>::type;
 
 // combine dummy stack with geometry information for tracking
 template <typename TStackIter>