diff --git a/src/landmark/landmark_polyline_2d.cpp b/src/landmark/landmark_polyline_2d.cpp
index 6447961ac92d206b533dd914724a6498d6597137..29d9041d363eff2008e23ecb695d60d6c9388946 100644
--- a/src/landmark/landmark_polyline_2d.cpp
+++ b/src/landmark/landmark_polyline_2d.cpp
@@ -1077,7 +1077,7 @@ void LandmarkPolyline2d::tryMergeLandmarks(LandmarkPolyline2dPtrList& _lmk_list,
 // Register landmark creator
 namespace
 {
-const bool WOLF_UNUSED registered_lmk_polyline_2d = FactoryLandmark::get().registerCreator("LandmarkPolyline2d", LandmarkPolyline2d::create);
+const bool WOLF_UNUSED registered_lmk_polyline_2d = FactoryLandmark::registerCreator("LandmarkPolyline2d", LandmarkPolyline2d::create);
 }
 
 } /* namespace wolf */
diff --git a/src/yaml/processor_odom_icp_yaml.cpp b/src/yaml/processor_odom_icp_yaml.cpp
index ca24d0f2fd66690713d85cb4dab8a766db95a294..f694eee062f8b3d80dc45d8516a2083de0c497ac 100644
--- a/src/yaml/processor_odom_icp_yaml.cpp
+++ b/src/yaml/processor_odom_icp_yaml.cpp
@@ -58,7 +58,7 @@ ParamsProcessorBasePtr createParamsProcessorOdomIcp(const std::string& _filename
 }
 
 // register into factory
-const bool WOLF_UNUSED registered_odom_Icp_params = FactoryParamsProcessor::get().registerCreator("ProcessorOdomIcp", createParamsProcessorOdomIcp);
+const bool WOLF_UNUSED registered_odom_Icp_params = FactoryParamsProcessor::registerCreator("ProcessorOdomIcp", createParamsProcessorOdomIcp);
 
 } // namespace [void]
 } // namespace wolf
diff --git a/src/yaml/sensor_laser_2d_yaml.cpp b/src/yaml/sensor_laser_2d_yaml.cpp
index ddda8729a0c60577902947f929e9bef918da3021..93bcb8e55780c6fc2ba0bf2e71feb2a75b662e36 100644
--- a/src/yaml/sensor_laser_2d_yaml.cpp
+++ b/src/yaml/sensor_laser_2d_yaml.cpp
@@ -52,7 +52,7 @@ ParamsSensorBasePtr createIntrinsicsLaser2d(const std::string& _filename_dot_yam
 }
 
 // register into factory
-const bool WOLF_UNUSED registered_laser_params = FactoryParamsSensor::get().registerCreator("SensorLaser2d", createIntrinsicsLaser2d);
+const bool WOLF_UNUSED registered_laser_params = FactoryParamsSensor::registerCreator("SensorLaser2d", createIntrinsicsLaser2d);
 
 } // namespace [void]
 } // namespace wolf
diff --git a/test/gtest_processor_odom_icp.cpp b/test/gtest_processor_odom_icp.cpp
index d70ebc5afe41a4e8d3e2dcdd120969716bd9de44..8b8d0fbb38a22bc5733c6f22097e0017b187ec03 100644
--- a/test/gtest_processor_odom_icp.cpp
+++ b/test/gtest_processor_odom_icp.cpp
@@ -84,7 +84,7 @@ TEST(ParamsProcessorOdomIcp, default_construct_and_print)
 
 TEST(ParamsProcessorOdomIcp, factory_and_print)
 {
-    auto params = std::static_pointer_cast<ParamsProcessorOdomIcp>(FactoryParamsProcessor::get().create("ProcessorOdomIcp", laser_root_dir + "/test/yaml/processor_odom_icp.yaml"));
+    auto params = std::static_pointer_cast<ParamsProcessorOdomIcp>(FactoryParamsProcessor::create("ProcessorOdomIcp", laser_root_dir + "/test/yaml/processor_odom_icp.yaml"));
     ASSERT_TRUE(params); // not nullptr
 
     // check a couple of entries.
@@ -105,7 +105,7 @@ TEST(ProcessorOdomIcp, Constructor)
 
 TEST(ProcessorOdomIcp, creator_yaml)
 {
-    auto params = std::static_pointer_cast<ParamsProcessorOdomIcp>(FactoryParamsProcessor::get().create("ProcessorOdomIcp", laser_root_dir + "/test/yaml/processor_odom_icp.yaml"));
+    auto params = std::static_pointer_cast<ParamsProcessorOdomIcp>(FactoryParamsProcessor::create("ProcessorOdomIcp", laser_root_dir + "/test/yaml/processor_odom_icp.yaml"));
     auto prc    = std::make_shared<ProcessorOdomIcp>(params);
 
     ASSERT_TRUE(prc); // not nullptr