diff --git a/DDG4/src/ComponentUtils.cpp b/DDG4/src/ComponentUtils.cpp
index ced2d43f9a6492937fad6a9c5a5f9ebc55ba9fef..1a939a2a0d373de568d0ec5e40a7529471c74170 100644
--- a/DDG4/src/ComponentUtils.cpp
+++ b/DDG4/src/ComponentUtils.cpp
@@ -338,6 +338,7 @@ void PropertyManager::dump()  const   {
   DD4HEP_INSTANTIATE_PROPERTY_TYPE1(x);		\
   DD4HEP_INSTANTIATE_PROPERTY_TYPE1(unsigned x)
 
+namespace DD4hep {
 DD4HEP_INSTANTIATE_PROPERTY_TYPE2(char);
 DD4HEP_INSTANTIATE_PROPERTY_TYPE2(short);
 DD4HEP_INSTANTIATE_PROPERTY_TYPE2(int);
@@ -351,4 +352,4 @@ DD4HEP_INSTANTIATE_PROPERTY_TYPE1(string);
 
 typedef map<string,int> map_string_int;
 DD4HEP_INSTANTIATE_PROPERTY_TYPE(map_string_int);
-
+}
diff --git a/DDG4/src/Geant4XMLSetup.cpp b/DDG4/src/Geant4XMLSetup.cpp
index 7a1fe3191a6ed392f2317c480ee2eb0c02d4057e..df45afb10ed1485a92ecf4009ff4fd0cc7d3ba6d 100644
--- a/DDG4/src/Geant4XMLSetup.cpp
+++ b/DDG4/src/Geant4XMLSetup.cpp
@@ -37,7 +37,7 @@ namespace DD4hep  {
     vector<XML::Attribute> attrs = props.attributes();
     for(vector<XML::Attribute>::iterator i=attrs.begin(); i!=attrs.end(); ++i)   {
       XML::Attribute a = *i;
-      handle[props.attr_name(a)].str(props.attr<string>(a));
+      handle[XML::_toString(props.attr_name(a))].str(props.attr<string>(a));
     }
   }
   template <typename T> static void _setProperties(const T& handle, xml_h& e)  {