Cleanup.

Function renaming, moving around for future patch readability

Change-Id: Id33b961cf2e899b5a3c9189951d2199aba801666
diff --git a/native/src/unigram_dictionary.cpp b/native/src/unigram_dictionary.cpp
index d01f9c0..3c25eda 100644
--- a/native/src/unigram_dictionary.cpp
+++ b/native/src/unigram_dictionary.cpp
@@ -866,7 +866,7 @@
     const int newWordLength = firstWordLength + secondWordLength + 1;
     // Allocating variable length array on stack
     unsigned short word[newWordLength];
-    const int firstFreq = getBestWordFreq(firstWordStartPos, firstWordLength, mWord);
+    const int firstFreq = getMostFrequentWordLike(firstWordStartPos, firstWordLength, mWord);
     if (DEBUG_DICT) {
         LOGI("First freq: %d", firstFreq);
     }
@@ -876,7 +876,7 @@
         word[i] = mWord[i];
     }
 
-    const int secondFreq = getBestWordFreq(secondWordStartPos, secondWordLength, mWord);
+    const int secondFreq = getMostFrequentWordLike(secondWordStartPos, secondWordLength, mWord);
     if (DEBUG_DICT) {
         LOGI("Second  freq:  %d", secondFreq);
     }
@@ -997,7 +997,7 @@
     const int newWordLength = firstWordLength + secondWordLength + 1;
     // Allocating variable length array on stack
     unsigned short word[newWordLength];
-    const int firstFreq = getBestWordFreq(firstWordStartPos, firstWordLength, mWord);
+    const int firstFreq = getMostFrequentWordLike(firstWordStartPos, firstWordLength, mWord);
     if (DEBUG_DICT) {
         LOGI("First freq: %d", firstFreq);
     }
@@ -1007,7 +1007,7 @@
         word[i] = mWord[i];
     }
 
-    const int secondFreq = getBestWordFreq(secondWordStartPos, secondWordLength, mWord);
+    const int secondFreq = getMostFrequentWordLike(secondWordStartPos, secondWordLength, mWord);
     if (DEBUG_DICT) {
         LOGI("Second  freq:  %d", secondFreq);
     }