diff --git a/include/Nebula.h b/include/Nebula.h
index 255c955451..0e1f9bcbc4 100644
--- a/include/Nebula.h
+++ b/include/Nebula.h
@@ -501,11 +501,11 @@ public:
      *  Gets a DS configuration attribute
      */
     int get_ds_conf_attribute(
-        const string& ds_name,
+        const std::string& ds_name,
         const VectorAttribute* &value) const
     {
-        vector<const Attribute*>::const_iterator it;
-        vector<const Attribute*> values;
+        std::vector<const Attribute*>::const_iterator it;
+        std::vector<const Attribute*> values;
         std::string template_ds_name;
         std::string ds_name_upper;
 
diff --git a/src/nebula/NebulaTemplate.cc b/src/nebula/NebulaTemplate.cc
index c0c111c0c7..8bdc54a285 100644
--- a/src/nebula/NebulaTemplate.cc
+++ b/src/nebula/NebulaTemplate.cc
@@ -153,17 +153,19 @@ void OpenNebulaTemplate::set_multiple_conf_default()
 void OpenNebulaTemplate::register_multiple_conf_default(
                                                 const std::string& conf_section)
 {
-    string      defaults_name, attributes_name;
+    std::string defaults_name, attributes_name;
+
     Attribute * defaults_value;
+
     bool found;
 
     const VectorAttribute* defaults_attr;
     const VectorAttribute* attributes_attr;
 
-    map<string, Attribute *>::iterator  iter_defaults, prev;
+    std::map<std::string, Attribute *>::iterator  iter_defaults, prev;
 
-    vector<const Attribute*>::const_iterator iter_attributes;
-    vector<const Attribute*> attributes_values;
+    std::vector<const Attribute*>::const_iterator iter_attributes;
+    std::vector<const Attribute*> attributes_values;
 
     get(conf_section.c_str(), attributes_values);
 
@@ -242,7 +244,7 @@ void OpenNebulaTemplate::set_conf_ds(const std::string& name,
                                      const std::string& persistent_only)
 {
     VectorAttribute *   vattribute;
-    map<string,string>  vvalue;
+    std::map<std::string,std::string>  vvalue;
 
     vvalue.insert(make_pair("NAME", name));
     vvalue.insert(make_pair("REQUIRED_ATTRS", required_attrs));
@@ -261,7 +263,7 @@ void OpenNebulaTemplate::set_conf_tm(const std::string& name,
                                      const std::string& ds_migrate)
 {
     VectorAttribute *   vattribute;
-    map<string,string>  vvalue;
+    std::map<std::string,std::string>  vvalue;
 
     vvalue.insert(make_pair("NAME", name));
     vvalue.insert(make_pair("LN_TARGET", ln_target));
diff --git a/src/rm/RequestManagerAllocate.cc b/src/rm/RequestManagerAllocate.cc
index 2e027ef553..3790daf0fc 100644
--- a/src/rm/RequestManagerAllocate.cc
+++ b/src/rm/RequestManagerAllocate.cc
@@ -482,7 +482,7 @@ void ImageAllocate::request_execute(xmlrpc_c::paramList const& params,
 
     if ( ds_persistent_only && persistent_attr == false )
     {
-        ostringstream oss;
+        std::ostringstream oss;
         oss << "This Datastore only accepts persistent images.";
 
         failure_response(INTERNAL, allocate_error(oss.str()), att);