diff --git a/ApplicationCode/FileInterface/RifEclipseOutputFileTools.cpp b/ApplicationCode/FileInterface/RifEclipseOutputFileTools.cpp
index 7e175a8caf..d3a56469f5 100644
--- a/ApplicationCode/FileInterface/RifEclipseOutputFileTools.cpp
+++ b/ApplicationCode/FileInterface/RifEclipseOutputFileTools.cpp
@@ -85,7 +85,7 @@ int RifEclipseOutputFileTools::numOccurrences(const QString& keyword)
 /// Get keywords found on file given by name.
 /// If numDataItems != cvf::UNDEFINED_SIZE_T, get keywords with that exact number of data items only.
 //--------------------------------------------------------------------------------------------------
-bool RifEclipseOutputFileTools::keywordsOnFile(QStringList* keywords, size_t numDataItems, size_t numSteps)
+bool RifEclipseOutputFileTools::keywordsWithGivenResultValueCount(QStringList* keywords, size_t expectedResultValueCount, size_t numSteps)
 {
     CVF_ASSERT(m_file);
     CVF_ASSERT(keywords);
@@ -98,16 +98,16 @@ bool RifEclipseOutputFileTools::keywordsOnFile(QStringList* keywords, size_t num
     for (int i = 0; i < numKeywords; i++)
     {
         const char* kw = ecl_file_iget_distinct_kw(m_file , i);
-        int numKWOccurences = ecl_file_get_num_named_kw(m_file, kw);
+        int numKeywordOccurrences = ecl_file_get_num_named_kw(m_file, kw);
 
-        if (numDataItems != cvf::UNDEFINED_SIZE_T)
+        if (expectedResultValueCount != cvf::UNDEFINED_SIZE_T)
         {
             bool dataTypeSupported = true;
-            int numKWValues = 0;
+            int fileResultValueCount = 0;
             int j;
-            for (j = 0; j < numKWOccurences; j++)
+            for (j = 0; j < numKeywordOccurrences; j++)
             {
-                numKWValues += ecl_file_iget_named_size(m_file, kw, j);
+                fileResultValueCount += ecl_file_iget_named_size(m_file, kw, j);
 
                 // Check the data type - only float and double are supported
                 ecl_type_enum dataType = ecl_file_iget_named_type(m_file, kw, j);
@@ -122,11 +122,11 @@ bool RifEclipseOutputFileTools::keywordsOnFile(QStringList* keywords, size_t num
             {
                 if (numSteps != cvf::UNDEFINED_SIZE_T && numSteps > 0)
                 {
-                    numKWValues /= static_cast<int>(numSteps);
+                    fileResultValueCount /= static_cast<int>(numSteps);
                 }
 
                 // Append keyword to the list if it has the given number of values in total
-                if (numKWValues == static_cast<int>(numDataItems))
+                if (fileResultValueCount == static_cast<int>(expectedResultValueCount))
                 {
                     keywords->append(QString(kw));
                 }
diff --git a/ApplicationCode/FileInterface/RifEclipseOutputFileTools.h b/ApplicationCode/FileInterface/RifEclipseOutputFileTools.h
index f62d0c3c9d..fbfc1c046a 100644
--- a/ApplicationCode/FileInterface/RifEclipseOutputFileTools.h
+++ b/ApplicationCode/FileInterface/RifEclipseOutputFileTools.h
@@ -43,7 +43,7 @@ public:
     void                close();
 
     int                 numOccurrences(const QString& keyword);
-    bool                keywordsOnFile(QStringList* keywords, size_t numDataItems = cvf::UNDEFINED_SIZE_T, size_t numSteps = cvf::UNDEFINED_SIZE_T);
+    bool                keywordsWithGivenResultValueCount(QStringList* keywords, size_t expectedResultValueCount = cvf::UNDEFINED_SIZE_T, size_t numSteps = cvf::UNDEFINED_SIZE_T);
 
     bool                timeStepsText(QStringList* timeSteps);
     bool                timeSteps(QList<QDateTime>* timeSteps);
diff --git a/ApplicationCode/FileInterface/RifEclipseRestartFilesetAccess.cpp b/ApplicationCode/FileInterface/RifEclipseRestartFilesetAccess.cpp
index b72a082630..bbcbf77345 100644
--- a/ApplicationCode/FileInterface/RifEclipseRestartFilesetAccess.cpp
+++ b/ApplicationCode/FileInterface/RifEclipseRestartFilesetAccess.cpp
@@ -131,7 +131,7 @@ QStringList RifEclipseRestartFilesetAccess::resultNames()
 
     // Get the results found on the first file
     QStringList resultsList;
-    m_files[0]->keywordsOnFile(&resultsList, m_numActiveCells, 1);
+    m_files[0]->keywordsWithGivenResultValueCount(&resultsList, m_numActiveCells, 1);
 
     return resultsList;
 }
diff --git a/ApplicationCode/FileInterface/RifEclipseUnifiedRestartFileAccess.cpp b/ApplicationCode/FileInterface/RifEclipseUnifiedRestartFileAccess.cpp
index 8e04b973df..70f4719677 100644
--- a/ApplicationCode/FileInterface/RifEclipseUnifiedRestartFileAccess.cpp
+++ b/ApplicationCode/FileInterface/RifEclipseUnifiedRestartFileAccess.cpp
@@ -114,7 +114,7 @@ QStringList RifEclipseUnifiedRestartFileAccess::resultNames()
 {
     // Get the results found on the UNRST file
     QStringList resultsList;
-    m_file->keywordsOnFile(&resultsList, m_numActiveCells, numTimeSteps());
+    m_file->keywordsWithGivenResultValueCount(&resultsList, m_numActiveCells, numTimeSteps());
 
     return resultsList;
 }
diff --git a/ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp b/ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp
index 14e0808cd8..fa5e7d02c2 100644
--- a/ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp
+++ b/ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp
@@ -368,7 +368,7 @@ bool RifReaderEclipseOutput::buildMetaData(RigReservoir* reservoir)
 
         // Get the names of the static results
         QStringList staticResults;
-        initFile->keywordsOnFile(&staticResults, numActiveCells);
+        initFile->keywordsWithGivenResultValueCount(&staticResults, numActiveCells);
         QStringList staticResultNames = staticResults;
 
         QList<QDateTime> staticDate;