diff --git a/gazebo/msgs/generator/GazeboGenerator.cc b/gazebo/msgs/generator/GazeboGenerator.cc
index 0a681f6dec..10d76c7df6 100644
--- a/gazebo/msgs/generator/GazeboGenerator.cc
+++ b/gazebo/msgs/generator/GazeboGenerator.cc
@@ -37,7 +37,7 @@ namespace cpp {
 GazeboGenerator::GazeboGenerator(const std::string &/*_name*/) {}
 GazeboGenerator::~GazeboGenerator() {}
 bool GazeboGenerator::Generate(const FileDescriptor *_file,
-                               const string &/*parameter*/,
+                               const std::string &/*parameter*/,
                                OutputDirectory *_generator_context,
                                std::string * /*_error*/) const
 {
diff --git a/gazebo/msgs/generator/GazeboGenerator.hh b/gazebo/msgs/generator/GazeboGenerator.hh
index 6900e281aa..665deb8329 100644
--- a/gazebo/msgs/generator/GazeboGenerator.hh
+++ b/gazebo/msgs/generator/GazeboGenerator.hh
@@ -37,9 +37,9 @@ class GazeboGenerator : public CodeGenerator
   public: virtual ~GazeboGenerator();
 
   public: virtual bool Generate(const FileDescriptor* file,
-                const string& parameter,
+                const std::string& parameter,
                 OutputDirectory *directory,
-                string* error) const;
+                std::string* error) const;
 
   // private: GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(GazeboGenerator);
 };