diff --git a/src/tinygettext/dictionary_manager.cpp b/src/tinygettext/dictionary_manager.cpp
index 4817a0c2a..3b43c4b38 100644
--- a/src/tinygettext/dictionary_manager.cpp
+++ b/src/tinygettext/dictionary_manager.cpp
@@ -120,7 +120,7 @@ DictionaryManager::get_dictionary(const Language& language)
 
     dictionaries[language] = dict;
 
-    for (SearchPath::reverse_iterator p = search_path.rbegin(); p != search_path.rend(); ++p)
+    for (Search_Path::reverse_iterator p = search_path.rbegin(); p != search_path.rend(); ++p)
     {
       std::vector<std::string> files = filesystem->open_directory(*p);
 
@@ -191,7 +191,7 @@ DictionaryManager::get_languages()
 {
   std::set<Language> languages;
 
-  for (SearchPath::iterator p = search_path.begin(); p != search_path.end(); ++p)
+  for (Search_Path::iterator p = search_path.begin(); p != search_path.end(); ++p)
   {
     std::vector<std::string> files = filesystem->open_directory(*p);
 
diff --git a/src/tinygettext/dictionary_manager.hpp b/src/tinygettext/dictionary_manager.hpp
index c90511324..324c70776 100644
--- a/src/tinygettext/dictionary_manager.hpp
+++ b/src/tinygettext/dictionary_manager.hpp
@@ -42,8 +42,8 @@ private:
   typedef std::map<Language, Dictionary*> Dictionaries;
   Dictionaries dictionaries;
 
-  typedef std::vector<std::string> SearchPath;
-  SearchPath search_path;
+  typedef std::vector<std::string> Search_Path;
+  Search_Path search_path;
 
   std::string charset;
   bool        use_fuzzy;