diff --git a/DDCond/src/ConditionsDictionary.h b/DDCond/src/ConditionsDictionary.h
index 77b2955693296f77e34dcb2db01053ef869a1d07..6d1e75cf4763b27a2d13857dabc956afd6f478c4 100644
--- a/DDCond/src/ConditionsDictionary.h
+++ b/DDCond/src/ConditionsDictionary.h
@@ -37,39 +37,36 @@ namespace { class ConditionsDictionary {};   }
 #pragma link C++ namespace dd4hep::detail;
 #pragma link C++ namespace dd4hep::cond;
 
-using namespace dd4hep;
-using namespace dd4hep::cond;
-
 // These are necessary to support interactivity
-#pragma link C++ class UserPool-;
-#pragma link C++ class UpdatePool-;
-#pragma link C++ class ConditionsPool-;
-#pragma link C++ class ConditionsManager-;
-#pragma link C++ class ConditionsManagerObject-;
-#pragma link C++ class ConditionsIOVPool-;
-#pragma link C++ class ConditionsContent-;
-#pragma link C++ class ConditionsLoadInfo-;
-#pragma link C++ class ConditionsContent::LoadInfo<std::string>-;
-#pragma link C++ class std::map<Condition::key_type,ConditionsLoadInfo* >-;
-#pragma link C++ class std::map<Condition::key_type,ConditionDependency* >-;
+#pragma link C++ class dd4hep::cond::UserPool-;
+#pragma link C++ class dd4hep::cond::UpdatePool-;
+#pragma link C++ class dd4hep::cond::ConditionsPool-;
+#pragma link C++ class dd4hep::cond::ConditionsManager-;
+#pragma link C++ class dd4hep::cond::ConditionsManagerObject-;
+#pragma link C++ class dd4hep::cond::ConditionsIOVPool-;
+#pragma link C++ class dd4hep::cond::ConditionsContent-;
+#pragma link C++ class dd4hep::cond::ConditionsLoadInfo-;
+#pragma link C++ class dd4hep::cond::ConditionsContent::LoadInfo<std::string>-;
+#pragma link C++ class std::map<dd4hep::Condition::key_type,dd4hep::cond::ConditionsLoadInfo* >-;
+#pragma link C++ class std::map<dd4hep::Condition::key_type,dd4hep::cond::ConditionDependency* >-;
 
 // std::shared_ptr<T> is not yet supported by ROOT!
-//#pragma link C++ class std::shared_ptr<ConditionsPool>-;
-//#pragma link C++ class std::map<IOV::Key,std::shared_ptr<ConditionsPool> >-;
+//#pragma link C++ class std::shared_ptr<dd4hep::cond::ConditionsPool>-;
+//#pragma link C++ class std::map<dd4hep::IOV::Key,std::shared_ptr<dd4hep::cond::ConditionsPool> >-;
 
 // This one we need to save conditions pool to file
 #pragma link C++ class std::pair<std::string,IOV::Key>+;
 #pragma link C++ class std::pair<std::pair<std::string,int>, IOV::Key>+;
 #pragma link C++ class std::pair<std::string,std::pair<std::pair<std::string,int>,IOV::Key> >+;
 
-template class std::list< std::pair< std::pair< std::string, std::pair< std::pair<std::string,int>, IOV::Key> >, std::vector<Condition> > >;
-#pragma link C++ class std::list<std::pair<std::pair<std::string,std::pair<std::pair<std::string,int>,IOV::Key> >, std::vector<Condition> > >+;
+template class std::list< std::pair< std::pair< std::string, std::pair< std::pair<std::string,int>, dd4hep::IOV::Key> >, std::vector<dd4hep::Condition> > >;
+#pragma link C++ class std::list<std::pair<std::pair<std::string,std::pair<std::pair<std::string,int>,dd4hep::IOV::Key> >, std::vector<dd4hep::Condition> > >+;
 
-//#pragma link C++ class std::list<ConditionsRootPersistency::Pool>+;
-//#pragma link C++ class std::list<ConditionsRootPersistency::IOVPool>+;
+//#pragma link C++ class std::list<dd4hep::cond::ConditionsRootPersistency::Pool>+;
+//#pragma link C++ class std::list<dd4hep::cond::ConditionsRootPersistency::IOVPool>+;
 
-#pragma link C++ class ConditionsRootPersistency+;
-#pragma link C++ class ConditionsTreePersistency+;
+#pragma link C++ class dd4hep::cond::ConditionsRootPersistency+;
+#pragma link C++ class dd4hep::cond::ConditionsTreePersistency+;
 
 #endif