diff --git a/demos/demo_wolf_factories.cpp b/demos/demo_wolf_factories.cpp
index ddd2d26a78f4edb8ed4ce66d99fdf245f9ae4381..1bca72e7fe74dfc89fe47bbe43f5c07cc827143d 100644
--- a/demos/demo_wolf_factories.cpp
+++ b/demos/demo_wolf_factories.cpp
@@ -59,8 +59,8 @@ int main(void)
     cout << "\n================== ParamsSensor Factory ===================" << endl;
 
     // Use params factory for camera intrinsics
-    ParamsSensorBasePtr intr_cam_ptr = ParamsSensorFactory::get().create("CAMERA", wolf_config + "/camera_params_ueye_sim.yaml");
-    ProcessorParamsBasePtr params_ptr = ProcessorParamsFactory::get().create("IMAGE FEATURE", wolf_config + "/processor_image_feature.yaml");
+    ParamsSensorBasePtr intr_cam_ptr = ParamsSensorFactory::create("CAMERA", wolf_config + "/camera_params_ueye_sim.yaml");
+    ProcessorParamsBasePtr params_ptr = ProcessorParamsFactory::create("IMAGE FEATURE", wolf_config + "/processor_image_feature.yaml");
 
     cout << "CAMERA with intrinsics      : " << (static_pointer_cast<ParamsSensorCamera>(intr_cam_ptr))->pinhole_model_raw.transpose() << endl;
 //    cout << "Processor IMAGE image width : " << (static_pointer_cast<ProcessorParamsImage>(params_ptr))->image.width << endl;
diff --git a/src/landmark/landmark_ahp.cpp b/src/landmark/landmark_ahp.cpp
index 6b72f7532169245f01160fe1f95680bd515b2ab0..74dfb289169e1bf3408885408a7528c8d0a281e9 100644
--- a/src/landmark/landmark_ahp.cpp
+++ b/src/landmark/landmark_ahp.cpp
@@ -70,7 +70,7 @@ LandmarkBasePtr LandmarkAhp::create(const YAML::Node& _node)
 // Register landmark creator
 namespace
 {
-const bool WOLF_UNUSED registered_lmk_ahp = FactoryLandmark::get().registerCreator("LandmarkAhp", LandmarkAhp::create);
+const bool WOLF_UNUSED registered_lmk_ahp = FactoryLandmark::registerCreator("LandmarkAhp", LandmarkAhp::create);
 }
 
 } // namespace wolf
diff --git a/src/landmark/landmark_hp.cpp b/src/landmark/landmark_hp.cpp
index 943209c83bbbd6a2aa1f753e9df291ec71603fb3..d5e454fca8390967f41208893f8e94127e5116b6 100644
--- a/src/landmark/landmark_hp.cpp
+++ b/src/landmark/landmark_hp.cpp
@@ -56,7 +56,7 @@ LandmarkBasePtr LandmarkHp::create(const YAML::Node& _node)
 // Register landmark creator
 namespace
 {
-const bool WOLF_UNUSED registered_lmk_hp = FactoryLandmark::get().registerCreator("LandmarkHp", LandmarkHp::create);
+const bool WOLF_UNUSED registered_lmk_hp = FactoryLandmark::registerCreator("LandmarkHp", LandmarkHp::create);
 }
 
 } // namespace wolf
diff --git a/src/yaml/processor_bundle_adjustment_yaml.cpp b/src/yaml/processor_bundle_adjustment_yaml.cpp
index 82680274b75f399a75e67546cf53af4f7ca386b3..6fc78f42087f63fe09f51e8a6532c51dd1b21f0d 100644
--- a/src/yaml/processor_bundle_adjustment_yaml.cpp
+++ b/src/yaml/processor_bundle_adjustment_yaml.cpp
@@ -64,7 +64,7 @@ static ParamsProcessorBasePtr createParamsProcessorBundleAdjustment(const std::s
 }
 
 // Register in the FactorySensor
-const bool WOLF_UNUSED registered_prc_bundle_adjustment = FactoryParamsProcessor::get().registerCreator("ProcessorBundleAdjustment", createParamsProcessorBundleAdjustment);
+const bool WOLF_UNUSED registered_prc_bundle_adjustment = FactoryParamsProcessor::registerCreator("ProcessorBundleAdjustment", createParamsProcessorBundleAdjustment);
 
 } // namespace [unnamed]
 
diff --git a/src/yaml/processor_image_yaml.cpp b/src/yaml/processor_image_yaml.cpp
index 7c150215c5bef713e9e76b8d75412d2ad015c8d3..f6ead0c6bebff28e50633ac198f99c9de0949fae 100644
--- a/src/yaml/processor_image_yaml.cpp
+++ b/src/yaml/processor_image_yaml.cpp
@@ -63,8 +63,8 @@ static ParamsProcessorBasePtr createParamsProcessorImage(const std::string & _fi
 }
 
 // Register in the FactorySensor
-const bool WOLF_UNUSED registered_prc_image_feature_par = FactoryParamsProcessor::get().registerCreator("ProcessorTrackerFeatureImage", createParamsProcessorImage);
-const bool WOLF_UNUSED registered_prc_image_landmark_par = FactoryParamsProcessor::get().registerCreator("ProcessorTrackerLandmarkImage", createParamsProcessorImage);
+const bool WOLF_UNUSED registered_prc_image_feature_par = FactoryParamsProcessor::registerCreator("ProcessorTrackerFeatureImage", createParamsProcessorImage);
+const bool WOLF_UNUSED registered_prc_image_landmark_par = FactoryParamsProcessor::registerCreator("ProcessorTrackerLandmarkImage", createParamsProcessorImage);
 
 }
 }
diff --git a/src/yaml/processor_tracker_feature_trifocal_yaml.cpp b/src/yaml/processor_tracker_feature_trifocal_yaml.cpp
index 21ca4d7a5c3d55f4a33cda0504be12b560256380..f9238365fd2cc10cca437bdcd37c34b1c19d3c1b 100644
--- a/src/yaml/processor_tracker_feature_trifocal_yaml.cpp
+++ b/src/yaml/processor_tracker_feature_trifocal_yaml.cpp
@@ -66,7 +66,7 @@ static ParamsProcessorBasePtr createParamsProcessorTrackerFeatureTrifocal(const
 }
 
 // Register in the FactorySensor
-const bool WOLF_UNUSED registered_prc_trifocal = FactoryParamsProcessor::get().registerCreator("ProcessorTrackerFeatureTrifocal", createParamsProcessorTrackerFeatureTrifocal);
+const bool WOLF_UNUSED registered_prc_trifocal = FactoryParamsProcessor::registerCreator("ProcessorTrackerFeatureTrifocal", createParamsProcessorTrackerFeatureTrifocal);
 
 } // namespace [unnamed]
 
diff --git a/src/yaml/sensor_camera_yaml.cpp b/src/yaml/sensor_camera_yaml.cpp
index 848010e012ae720c83b07d6d20e5c1c04c1ba481..d06e952feaa5eb49f120d79887e8f56199475510 100644
--- a/src/yaml/sensor_camera_yaml.cpp
+++ b/src/yaml/sensor_camera_yaml.cpp
@@ -106,7 +106,7 @@ static ParamsSensorBasePtr createParamsSensorCamera(const std::string & _filenam
 }
 
 // Register in the FactorySensor
-const bool WOLF_UNUSED registered_camera_intr = FactoryParamsSensor::get().registerCreator("SensorCamera", createParamsSensorCamera);
+const bool WOLF_UNUSED registered_camera_intr = FactoryParamsSensor::registerCreator("SensorCamera", createParamsSensorCamera);
 
 } // namespace [unnamed]