diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index 62ba8d9528d84bd94f7ff32ed70aa46e5c056182..6570f7a2fac913bff09197a940755dd2a1494d1b 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -926,10 +926,10 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
             final List<SuggestedWords.SuggestedWordInfo> applicationSuggestedWords =
                     SuggestedWords.getFromApplicationSpecifiedCompletions(
                             applicationSpecifiedCompletions);
-            final SuggestedWords suggestedWords = SuggestedWords.getSuggestedWords(
+            final SuggestedWords suggestedWords = new SuggestedWords(
                     applicationSuggestedWords,
                     false /* typedWordValid */,
-                    false /* hasMinimalSuggestion */,
+                    false /* hasAutoCorrectionCandidate */,
                     false /* allowsToBeAutoCorrected */,
                     false /* isPunctuationSuggestions */,
                     false /* shouldBlockAutoCorrectionBySafetyNet */);
@@ -1790,9 +1790,9 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
                     SuggestedWords.getTypedWordAndPreviousSuggestions(
                             typedWord, previousSuggestions);
             final SuggestedWords obsoleteSuggestedWords =
-                    SuggestedWords.getSuggestedWords(typedWordAndPreviousSuggestions,
+                    new SuggestedWords(typedWordAndPreviousSuggestions,
                             false /* typedWordValid */,
-                            false /* hasMinimalSuggestion */,
+                            false /* hasAutoCorrectionCandidate */,
                             false /* allowsToBeAutoCorrected */,
                             false /* isPunctuationSuggestions */,
                             false /* shouldBlockAutoCorrectionBySafetyNet */);
diff --git a/java/src/com/android/inputmethod/latin/SettingsValues.java b/java/src/com/android/inputmethod/latin/SettingsValues.java
index df0e1696b747230baf684e534f3e3ca0df031087..d88047c3255077f205226b44fdfe1de1c95a9e93 100644
--- a/java/src/com/android/inputmethod/latin/SettingsValues.java
+++ b/java/src/com/android/inputmethod/latin/SettingsValues.java
@@ -183,9 +183,9 @@ public class SettingsValues {
                         KeySpecParser.getLabel(puncSpec)));
             }
         }
-        return SuggestedWords.getSuggestedWords(puncList,
+        return new SuggestedWords(puncList,
                 false /* typedWordValid */,
-                false /* hasMinimalSuggestion */,
+                false /* hasAutoCorrectionCandidate */,
                 false /* allowsToBeAutoCorrected */,
                 true /* isPunctuationSuggestions */,
                 false /* shouldBlockAutoCorrectionBySafetyNet */);
@@ -205,9 +205,9 @@ public class SettingsValues {
                 }
             }
         }
-        return SuggestedWords.getSuggestedWords(puncOutputTextList,
+        return new SuggestedWords(puncOutputTextList,
                 false /* typedWordValid */,
-                false /* hasMinimalSuggestion */,
+                false /* hasAutoCorrectionCandidate */,
                 false /* allowsToBeAutoCorrected */,
                 true /* isPunctuationSuggestions */,
                 false /* shouldBlockAutoCorrectionBySafetyNet */);
diff --git a/java/src/com/android/inputmethod/latin/Suggest.java b/java/src/com/android/inputmethod/latin/Suggest.java
index fea1b83bbcd9b611107277e5e73442b6d3fecd1a..7ac00a34ef9df02d75ba879191e120b227cecee1 100644
--- a/java/src/com/android/inputmethod/latin/Suggest.java
+++ b/java/src/com/android/inputmethod/latin/Suggest.java
@@ -269,10 +269,9 @@ public class Suggest implements Dictionary.WordCallback {
 
         StringUtils.removeDupes(mSuggestions);
 
-        return SuggestedWords.getSuggestedWords(
-                SuggestedWords.getFromCharSequenceList(mSuggestions),
+        return new SuggestedWords(SuggestedWords.getFromCharSequenceList(mSuggestions),
                 false /* typedWordValid */,
-                false /* hasMinimalSuggestion */,
+                false /* hasAutoCorrectionCandidate */,
                 false /* allowsToBeAutoCorrected */,
                 false /* isPunctuationSuggestions */,
                 false /* shouldBlockAutoCorrectionBySafetyNet */);
@@ -445,9 +444,9 @@ public class Suggest implements Dictionary.WordCallback {
         } else {
             shouldBlockAutoCorrectionBySatefyNet = false;
         }
-        return SuggestedWords.getSuggestedWords(scoreInfoList,
+        return new SuggestedWords(scoreInfoList,
                 !allowsToBeAutoCorrected /* typedWordValid */,
-                autoCorrectionAvailable /* hasMinimalSuggestion */,
+                autoCorrectionAvailable /* hasAutoCorrectionCandidate */,
                 allowsToBeAutoCorrected /* allowsToBeAutoCorrected */,
                 false /* isPunctuationSuggestions */,
                 shouldBlockAutoCorrectionBySatefyNet);
diff --git a/java/src/com/android/inputmethod/latin/SuggestedWords.java b/java/src/com/android/inputmethod/latin/SuggestedWords.java
index 60b55f58e68bdfe63685b0a261c07242f464b29c..7ce1049d7af8200822e86b909423c7d2352577dc 100644
--- a/java/src/com/android/inputmethod/latin/SuggestedWords.java
+++ b/java/src/com/android/inputmethod/latin/SuggestedWords.java
@@ -33,7 +33,7 @@ public class SuggestedWords {
     public final boolean mAllowsToBeAutoCorrected;
     private final List<SuggestedWordInfo> mSuggestedWordInfoList;
 
-    private SuggestedWords(final List<SuggestedWordInfo> suggestedWordInfoList,
+    public SuggestedWords(final List<SuggestedWordInfo> suggestedWordInfoList,
             final boolean typedWordValid,
             final boolean hasAutoCorrectionCandidate,
             final boolean allowsToBeAutoCorrected,
@@ -76,21 +76,6 @@ public class SuggestedWords {
                 + " mIsPunctuationSuggestions=" + mIsPunctuationSuggestions;
     }
 
-    public static SuggestedWords getSuggestedWords(
-            final List<SuggestedWordInfo> suggestedWordInfoList,
-            final boolean typedWordValid,
-            final boolean hasMinimalSuggestion,
-            final boolean allowsToBeAutoCorrected,
-            final boolean isPunctuationSuggestions,
-            final boolean shouldBlockAutoCorrectionBySafetyNet) {
-        return new SuggestedWords(suggestedWordInfoList,
-                typedWordValid,
-                hasMinimalSuggestion,
-                allowsToBeAutoCorrected,
-                isPunctuationSuggestions,
-                shouldBlockAutoCorrectionBySafetyNet);
-    }
-
     public static ArrayList<SuggestedWordInfo> getFromCharSequenceList(
             final List<CharSequence> wordList) {
         final ArrayList<SuggestedWordInfo> result = new ArrayList<SuggestedWordInfo>();