diff --git a/cmdline/CtaAdminCmdParser.hpp b/cmdline/CtaAdminCmdParser.hpp
index 9611d03e31f3566c0361dfa1ff95734102da0096..8bd454b3e66d54de947382681919a1398ca3946c 100644
--- a/cmdline/CtaAdminCmdParser.hpp
+++ b/cmdline/CtaAdminCmdParser.hpp
@@ -27,8 +27,6 @@
 
 namespace cta::admin {
 
-using namespace common::dataStructures;
-
 /*!
  * Command line option class
  */
@@ -515,12 +513,13 @@ const Option opt_isrepackvo {Option::OPT_BOOL, "--isrepackvo", "--irvo", R"( <"t
 const Option opt_max_files_to_select {Option::OPT_UINT, "--maxfilestoselect", "--mfts", " <max_files_to_select>"};
 const Option opt_log_unixtime_min {Option::OPT_UINT, "--logunixtimemin", "--ltmin", " <min_recycle_log_unixtime>"};
 const Option opt_log_unixtime_max {Option::OPT_UINT, "--logunixtimemax", "--ltmax", " <max_recycle_log_unixtime>"};
-const Option opt_archive_route_type {Option::OPT_STR,
-                                     "--archiveroutetype",
-                                     "--art",
-                                     std::string(R"( <")") +
-                                       cta::common::dataStructures::toString(ArchiveRouteType::DEFAULT) + R"(" or ")" +
-                                       cta::common::dataStructures::toString(ArchiveRouteType::REPACK) + R"(">)"};
+const Option opt_archive_route_type {
+  Option::OPT_STR,
+  "--archiveroutetype",
+  "--art",
+  std::string(R"( <")") +
+    cta::common::dataStructures::toString(cta::common::dataStructures::ArchiveRouteType::DEFAULT) + R"(" or ")" +
+    cta::common::dataStructures::toString(cta::common::dataStructures::ArchiveRouteType::REPACK) + R"(">)"};
 const Option opt_missingfilecopies {Option::OPT_FLAG, "--missingfilecopies", "--mfc", ""};
 
 /*!
diff --git a/common/json/test/JSONCTestObject.hpp b/common/json/test/JSONCTestObject.hpp
index 9b38ea6f51600ed39731bc2fee403919ce2b5ae9..0794fae5b56bfab5b01b321e202ba5b14e29fbf5 100644
--- a/common/json/test/JSONCTestObject.hpp
+++ b/common/json/test/JSONCTestObject.hpp
@@ -20,14 +20,12 @@
 #include "common/json/object/JSONCObject.hpp"
 #include "TestObject.hpp"
 
-using namespace cta::utils::json;
-
 namespace unitTests {
 
 /**
  * This class is only use to unit test the JSONCObject class
  */
-class JSONCTestObject : public object::JSONCObject, public TestObject {
+class JSONCTestObject : public cta::utils::json::object::JSONCObject, public TestObject {
 public:
   JSONCTestObject();
   void buildFromJSON(const std::string & json) override;
@@ -35,5 +33,4 @@ public:
   std::string getJSON() override;
   ~JSONCTestObject() final = default;
 };
-
 }
diff --git a/disk/JSONDiskSystem.hpp b/disk/JSONDiskSystem.hpp
index d9b6331c611114cbc4854303557f0a539ffe0c20..3347445569d8c4d896533f2cf3346cafa6b533d0 100644
--- a/disk/JSONDiskSystem.hpp
+++ b/disk/JSONDiskSystem.hpp
@@ -20,15 +20,13 @@
 #include "DiskSystem.hpp"
 #include "common/json/object/JSONCObject.hpp"
 
-using namespace cta::utils::json::object;
-
 namespace cta::disk {
 
 /**
  * This class allows to transform a DiskSystem object into a JSON string
  * and to build a DiskSystem object from a JSON string
  */
-class JSONDiskSystem : public DiskSystem, public JSONCObject {
+class JSONDiskSystem : public DiskSystem, public cta::utils::json::object::JSONCObject {
 public:
   JSONDiskSystem();
   explicit JSONDiskSystem(const DiskSystem& diskSystem);