diff --git a/Framework/include/QualityControl/Checker.h b/Framework/include/QualityControl/Checker.h
index 9d72101e96..b453303e80 100644
--- a/Framework/include/QualityControl/Checker.h
+++ b/Framework/include/QualityControl/Checker.h
@@ -89,7 +89,7 @@ class Checker : public FairMQDevice
     void loadLibrary(const std::string libraryName);
     CheckInterface* instantiateCheck(std::string checkName, std::string className);
     static void CustomCleanupTMessage(void *data, void *object);
-    void populateConfig( std::unique_ptr<AliceO2::Configuration::ConfigurationInterface>& config, std::string checkerName);
+    void populateConfig( std::unique_ptr<o2::configuration::ConfigurationInterface>& config, std::string checkerName);
 
     o2::quality_control::core::QcInfoLogger &mLogger;
     o2::quality_control::repository::DatabaseInterface *mDatabase;
diff --git a/Framework/include/QualityControl/TaskDevice.h b/Framework/include/QualityControl/TaskDevice.h
index 104f598d12..9dd3b86701 100644
--- a/Framework/include/QualityControl/TaskDevice.h
+++ b/Framework/include/QualityControl/TaskDevice.h
@@ -61,7 +61,7 @@ class TaskDevice : public FairMQDevice
   private:
     std::string mTaskName;
     TaskConfig mTaskConfig;
-    std::unique_ptr<AliceO2::Configuration::ConfigurationInterface> mConfigFile;
+    std::unique_ptr<o2::configuration::ConfigurationInterface> mConfigFile;
     std::unique_ptr<o2::monitoring::Monitoring> mCollector;
     std::unique_ptr<AliceO2::DataSampling::SamplerInterface> mSampler;
     o2::quality_control::core::TaskInterface *mTask;
diff --git a/Framework/src/AlfaReceiverForTests.cxx b/Framework/src/AlfaReceiverForTests.cxx
index b8c74642d8..0853ba639a 100644
--- a/Framework/src/AlfaReceiverForTests.cxx
+++ b/Framework/src/AlfaReceiverForTests.cxx
@@ -47,4 +47,4 @@ bool AlfaReceiverForTests::HandleData(FairMQMessagePtr &msg, int /*index*/)
 }
 }
 }
-}
\ No newline at end of file
+}
diff --git a/Framework/src/CcdbDatabase.cxx b/Framework/src/CcdbDatabase.cxx
index d19c401536..3107d2756f 100644
--- a/Framework/src/CcdbDatabase.cxx
+++ b/Framework/src/CcdbDatabase.cxx
@@ -327,4 +327,4 @@ std::string CcdbDatabase::getObjectPath(std::string taskName, std::string object
 
 }
 }
-}
\ No newline at end of file
+}
diff --git a/Framework/src/Checker.cxx b/Framework/src/Checker.cxx
index 51cf2c9828..66135e3244 100644
--- a/Framework/src/Checker.cxx
+++ b/Framework/src/Checker.cxx
@@ -16,7 +16,7 @@
 #include "QualityControl/DatabaseFactory.h"
 
 using namespace AliceO2::Common;
-using namespace AliceO2::Configuration;
+using namespace o2::configuration;
 
 /**
  * \brief Handy class to deserialize messages and make sure buffer is not deleted along with the message.
@@ -36,7 +36,7 @@ class HistoMessage : public TMessage
 using namespace std;
 using namespace AliceO2::InfoLogger;
 using namespace std::chrono;
-using namespace AliceO2::Configuration;
+using namespace o2::configuration;
 using namespace o2::monitoring;
 
 namespace o2 {
diff --git a/Framework/src/SpyMainFrame.cxx b/Framework/src/SpyMainFrame.cxx
index 8aa9eb010d..3dfc9a69e8 100644
--- a/Framework/src/SpyMainFrame.cxx
+++ b/Framework/src/SpyMainFrame.cxx
@@ -18,7 +18,7 @@
 
 using namespace std;
 using namespace o2::quality_control::repository;
-using namespace AliceO2::Configuration;
+using namespace o2::configuration;
 
 namespace o2 {
 namespace quality_control {
diff --git a/Framework/src/TaskDevice.cxx b/Framework/src/TaskDevice.cxx
index 6571da1c4b..e0fb630be0 100644
--- a/Framework/src/TaskDevice.cxx
+++ b/Framework/src/TaskDevice.cxx
@@ -18,7 +18,7 @@
 namespace bpo = boost::program_options;
 using namespace std;
 using namespace std::chrono;
-using namespace AliceO2::Configuration;
+using namespace o2::configuration;
 using namespace o2::monitoring;
 
 /*
diff --git a/Framework/src/qcCheckerLauncher.cxx b/Framework/src/qcCheckerLauncher.cxx
index 04b67eb0d5..cfdded90ab 100644
--- a/Framework/src/qcCheckerLauncher.cxx
+++ b/Framework/src/qcCheckerLauncher.cxx
@@ -22,7 +22,7 @@
 
 using namespace std;
 using namespace o2::quality_control::core;
-using namespace AliceO2::Configuration;
+using namespace o2::configuration;
 using namespace o2::quality_control::checker;
 namespace po = boost::program_options;
 
diff --git a/Framework/src/runInformationService.cxx b/Framework/src/runInformationService.cxx
index 00ace33bcd..7d3a923d04 100644
--- a/Framework/src/runInformationService.cxx
+++ b/Framework/src/runInformationService.cxx
@@ -32,4 +32,4 @@ FairMQDevicePtr getDevice(const FairMQProgOptions & /*config*/)
   InformationService *is = new InformationService();
 
   return is;
-}
\ No newline at end of file
+}
diff --git a/Framework/src/runInformationServiceDump.cxx b/Framework/src/runInformationServiceDump.cxx
index 7beea76ce8..2ddf08419b 100644
--- a/Framework/src/runInformationServiceDump.cxx
+++ b/Framework/src/runInformationServiceDump.cxx
@@ -29,4 +29,4 @@ void addCustomOptions(bpo::options_description &options)
 FairMQDevicePtr getDevice(const FairMQProgOptions & /*config*/)
 {
   return new InformationServiceDump();
-}
\ No newline at end of file
+}
diff --git a/Modules/Common/src/MeanIsAbove.cxx b/Modules/Common/src/MeanIsAbove.cxx
index 26ae0b65e6..7ac2ee3c59 100644
--- a/Modules/Common/src/MeanIsAbove.cxx
+++ b/Modules/Common/src/MeanIsAbove.cxx
@@ -16,7 +16,7 @@
 ClassImp(o2::quality_control_modules::common::MeanIsAbove)
 
 using namespace std;
-using namespace AliceO2::Configuration;
+using namespace o2::configuration;
 
 namespace o2 {
 namespace quality_control_modules {
diff --git a/Modules/Example/include/Example/BenchmarkTask.h b/Modules/Example/include/Example/BenchmarkTask.h
index 41f405588c..1712d6fc9c 100644
--- a/Modules/Example/include/Example/BenchmarkTask.h
+++ b/Modules/Example/include/Example/BenchmarkTask.h
@@ -44,7 +44,7 @@ class BenchmarkTask: public TaskInterface
   private:
 
     std::vector<TH1F*> mHistos;
-    std::unique_ptr<AliceO2::Configuration::ConfigurationInterface> mConfigFile;
+    std::unique_ptr<o2::configuration::ConfigurationInterface> mConfigFile;
     size_t mNumberHistos;
     size_t mNumberChecks;
     std::string mTypeOfChecks;
diff --git a/Modules/Example/src/BenchmarkTask.cxx b/Modules/Example/src/BenchmarkTask.cxx
index a4d2faec97..b4b51ec06c 100644
--- a/Modules/Example/src/BenchmarkTask.cxx
+++ b/Modules/Example/src/BenchmarkTask.cxx
@@ -10,7 +10,7 @@
 #include <thread>
 
 using namespace std;
-using namespace AliceO2::Configuration;
+using namespace o2::configuration;
 
 namespace o2 {
 namespace quality_control_modules {