diff --git a/opm/parser/eclipse/Applications/KeywordDescriber.cpp b/opm/parser/eclipse/Applications/KeywordDescriber.cpp
index 792d80fde..91cd3b5ef 100644
--- a/opm/parser/eclipse/Applications/KeywordDescriber.cpp
+++ b/opm/parser/eclipse/Applications/KeywordDescriber.cpp
@@ -56,7 +56,7 @@ std::vector<std::string> createListOfKeywordsToDescribe(char** argv, bool allKey
 {
     std::vector<std::string> keywords;
     if (allKeywords) {
-        keywords = parser->getKeywords();
+        keywords = parser->getAllKeywords();
     } else {
         std::string keywordName = argv[1];
         keywords.push_back(keywordName);
diff --git a/opm/parser/eclipse/Parser/Parser.cpp b/opm/parser/eclipse/Parser/Parser.cpp
index 7dc7b81de..bc660cff4 100644
--- a/opm/parser/eclipse/Parser/Parser.cpp
+++ b/opm/parser/eclipse/Parser/Parser.cpp
@@ -156,8 +156,7 @@ namespace Opm {
         }
     }
 
-    //std::shared_ptr<std::vector<std::string> > Parser::getKeywords () const {
-    std::vector<std::string> Parser::getKeywords () const {
+    std::vector<std::string> Parser::getAllKeywords () const {
         std::map<std::string, ParserKeywordConstPtr>::const_iterator iterator;
         //std::shared_ptr<std::vector<std::string> > keywords(new std::vector<std::string>());
         std::vector<std::string> keywords;
diff --git a/opm/parser/eclipse/Parser/Parser.hpp b/opm/parser/eclipse/Parser/Parser.hpp
index 103edf7dc..4ad142dad 100644
--- a/opm/parser/eclipse/Parser/Parser.hpp
+++ b/opm/parser/eclipse/Parser/Parser.hpp
@@ -54,9 +54,7 @@ namespace Opm {
         bool dropKeyword(const std::string& keyword);
         bool canParseKeyword( const std::string& keyword) const;
         ParserKeywordConstPtr getKeyword(const std::string& keyword) const;
-        //void getKeywords(std::list<std::string> *keywords) const;
-        //std::shared_ptr<std::vector<std::string> > getKeywords () const;
-        std::vector<std::string> getKeywords () const;
+        std::vector<std::string> getAllKeywords () const;
 
         void loadKeywords(const Json::JsonObject& jsonKeywords);
         bool loadKeywordFromFile(const boost::filesystem::path& configFile);