diff --git a/java/AndroidManifest.xml b/java/AndroidManifest.xml
index b1e5ec6..de4ac61 100644
--- a/java/AndroidManifest.xml
+++ b/java/AndroidManifest.xml
@@ -8,7 +8,7 @@
     <uses-permission android:name="android.permission.READ_CONTACTS" />
 
     <application android:label="@string/english_ime_name"
-            android:backupAgent="LatinIMEBackupAgent"
+            android:backupAgent="BackupAgent"
             android:killAfterRestore="false">
 
         <service android:name="LatinIME"
@@ -20,13 +20,13 @@
             <meta-data android:name="android.view.im" android:resource="@xml/method" />
         </service>
 
-        <activity android:name="LatinIMESettings" android:label="@string/english_ime_settings">
+        <activity android:name="Settings" android:label="@string/english_ime_settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
             </intent-filter>
         </activity>
 
-        <activity android:name="LatinIMEDebugSettings" android:label="@string/english_ime_debug_settings">
+        <activity android:name="DebugSettings" android:label="@string/english_ime_debug_settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
             </intent-filter>
diff --git a/java/res/xml/method.xml b/java/res/xml/method.xml
index 4ee60da..a381821 100644
--- a/java/res/xml/method.xml
+++ b/java/res/xml/method.xml
@@ -25,7 +25,7 @@
 <!-- TODO: use <lang>_keyboard icon instead of a common keyboard icon. -->
 <!-- TODO: use <lang>_mic icon instead of a common mic icon. -->
 <input-method xmlns:android="http://schemas.android.com/apk/res/android"
-        android:settingsActivity="com.android.inputmethod.latin.LatinIMESettings"
+        android:settingsActivity="com.android.inputmethod.latin.Settings"
         android:isDefault="@bool/im_is_default">
     <!-- If IME doesn't have an applicable subtype, the first subtype will be used as a default
          subtype.-->
diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
index d3302fd..88e7ad5 100644
--- a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
+++ b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
@@ -17,8 +17,8 @@
 package com.android.inputmethod.keyboard;
 
 import com.android.inputmethod.latin.LatinIME;
-import com.android.inputmethod.latin.LatinIMESettings;
-import com.android.inputmethod.latin.LatinIMEUtil;
+import com.android.inputmethod.latin.Settings;
+import com.android.inputmethod.latin.Utils;
 import com.android.inputmethod.latin.LatinImeLogger;
 import com.android.inputmethod.latin.R;
 import com.android.inputmethod.latin.SubtypeSwitcher;
@@ -562,20 +562,20 @@
                 newLayout = Integer.valueOf(DEFAULT_LAYOUT_ID);
             }
 
-            LatinIMEUtil.GCUtils.getInstance().reset();
+            Utils.GCUtils.getInstance().reset();
             boolean tryGC = true;
-            for (int i = 0; i < LatinIMEUtil.GCUtils.GC_TRY_LOOP_MAX && tryGC; ++i) {
+            for (int i = 0; i < Utils.GCUtils.GC_TRY_LOOP_MAX && tryGC; ++i) {
                 try {
                     mInputView = (LatinKeyboardView) mInputMethodService.getLayoutInflater(
                             ).inflate(THEMES[newLayout], null);
                     tryGC = false;
                 } catch (OutOfMemoryError e) {
                     Log.w(TAG, "load keyboard failed: " + e);
-                    tryGC = LatinIMEUtil.GCUtils.getInstance().tryGCOrWait(
+                    tryGC = Utils.GCUtils.getInstance().tryGCOrWait(
                             mLayoutId + "," + newLayout, e);
                 } catch (InflateException e) {
                     Log.w(TAG, "load keyboard failed: " + e);
-                    tryGC = LatinIMEUtil.GCUtils.getInstance().tryGCOrWait(
+                    tryGC = Utils.GCUtils.getInstance().tryGCOrWait(
                             mLayoutId + "," + newLayout, e);
                 }
             }
@@ -603,7 +603,7 @@
                     sharedPreferences.getString(key, DEFAULT_LAYOUT_ID));
             createInputViewInternal(layoutId, false);
             postSetInputView();
-        } else if (LatinIMESettings.PREF_SETTINGS_KEY.equals(key)) {
+        } else if (Settings.PREF_SETTINGS_KEY.equals(key)) {
             mHasSettingsKey = getSettingsKeyMode(sharedPreferences, mInputMethodService);
             createInputViewInternal(mLayoutId, true);
             postSetInputView();
@@ -629,13 +629,13 @@
         final boolean showSettingsKeyOption = resources.getBoolean(
                 R.bool.config_enable_show_settings_key_option);
         if (showSettingsKeyOption) {
-            final String settingsKeyMode = prefs.getString(LatinIMESettings.PREF_SETTINGS_KEY,
+            final String settingsKeyMode = prefs.getString(Settings.PREF_SETTINGS_KEY,
                     resources.getString(DEFAULT_SETTINGS_KEY_MODE));
             // We show the settings key when 1) SETTINGS_KEY_MODE_ALWAYS_SHOW or
             // 2) SETTINGS_KEY_MODE_AUTO and there are two or more enabled IMEs on the system
             if (settingsKeyMode.equals(resources.getString(SETTINGS_KEY_MODE_ALWAYS_SHOW))
                     || (settingsKeyMode.equals(resources.getString(SETTINGS_KEY_MODE_AUTO))
-                            && LatinIMEUtil.hasMultipleEnabledIMEsOrSubtypes(
+                            && Utils.hasMultipleEnabledIMEsOrSubtypes(
                                     ((InputMethodManager) context.getSystemService(
                                             Context.INPUT_METHOD_SERVICE))))) {
                 return true;
diff --git a/java/src/com/android/inputmethod/keyboard/LatinKeyboardView.java b/java/src/com/android/inputmethod/keyboard/LatinKeyboardView.java
index 5c1c62b..79b0cbf 100644
--- a/java/src/com/android/inputmethod/keyboard/LatinKeyboardView.java
+++ b/java/src/com/android/inputmethod/keyboard/LatinKeyboardView.java
@@ -16,7 +16,7 @@
 
 package com.android.inputmethod.keyboard;
 
-import com.android.inputmethod.latin.LatinIMEUtil;
+import com.android.inputmethod.latin.Utils;
 import com.android.inputmethod.voice.VoiceIMEConnector;
 
 import android.content.Context;
@@ -330,14 +330,14 @@
 
     @Override
     public void draw(Canvas c) {
-        LatinIMEUtil.GCUtils.getInstance().reset();
+        Utils.GCUtils.getInstance().reset();
         boolean tryGC = true;
-        for (int i = 0; i < LatinIMEUtil.GCUtils.GC_TRY_LOOP_MAX && tryGC; ++i) {
+        for (int i = 0; i < Utils.GCUtils.GC_TRY_LOOP_MAX && tryGC; ++i) {
             try {
                 super.draw(c);
                 tryGC = false;
             } catch (OutOfMemoryError e) {
-                tryGC = LatinIMEUtil.GCUtils.getInstance().tryGCOrWait("LatinKeyboardView", e);
+                tryGC = Utils.GCUtils.getInstance().tryGCOrWait("LatinKeyboardView", e);
             }
         }
         if (DEBUG_AUTO_PLAY) {
diff --git a/java/src/com/android/inputmethod/latin/LatinIMEBackupAgent.java b/java/src/com/android/inputmethod/latin/BackupAgent.java
similarity index 94%
rename from java/src/com/android/inputmethod/latin/LatinIMEBackupAgent.java
rename to java/src/com/android/inputmethod/latin/BackupAgent.java
index a14a475..ee070af 100644
--- a/java/src/com/android/inputmethod/latin/LatinIMEBackupAgent.java
+++ b/java/src/com/android/inputmethod/latin/BackupAgent.java
@@ -22,7 +22,7 @@
 /**
  * Backs up the Latin IME shared preferences.
  */
-public class LatinIMEBackupAgent extends BackupAgentHelper {
+public class BackupAgent extends BackupAgentHelper {
 
     @Override
     public void onCreate() {
diff --git a/java/src/com/android/inputmethod/latin/LatinIMEDebugSettings.java b/java/src/com/android/inputmethod/latin/DebugSettings.java
similarity index 95%
rename from java/src/com/android/inputmethod/latin/LatinIMEDebugSettings.java
rename to java/src/com/android/inputmethod/latin/DebugSettings.java
index 68738ec..03211f3 100644
--- a/java/src/com/android/inputmethod/latin/LatinIMEDebugSettings.java
+++ b/java/src/com/android/inputmethod/latin/DebugSettings.java
@@ -24,10 +24,10 @@
 import android.preference.PreferenceActivity;
 import android.util.Log;
 
-public class LatinIMEDebugSettings extends PreferenceActivity
+public class DebugSettings extends PreferenceActivity
         implements SharedPreferences.OnSharedPreferenceChangeListener {
 
-    private static final String TAG = "LatinIMEDebugSettings";
+    private static final String TAG = "DebugSettings";
     private static final String DEBUG_MODE_KEY = "debug_mode";
 
     private CheckBoxPreference mDebugMode;
diff --git a/java/src/com/android/inputmethod/latin/InputLanguageSelection.java b/java/src/com/android/inputmethod/latin/InputLanguageSelection.java
index ad3f1db..a558216 100644
--- a/java/src/com/android/inputmethod/latin/InputLanguageSelection.java
+++ b/java/src/com/android/inputmethod/latin/InputLanguageSelection.java
@@ -69,7 +69,7 @@
         addPreferencesFromResource(R.xml.language_prefs);
         // Get the settings preferences
         mPrefs = PreferenceManager.getDefaultSharedPreferences(this);
-        mSelectedLanguages = mPrefs.getString(LatinIME.PREF_SELECTED_LANGUAGES, "");
+        mSelectedLanguages = mPrefs.getString(Settings.PREF_SELECTED_LANGUAGES, "");
         String[] languageList = mSelectedLanguages.split(",");
         mAvailableLanguages = getUniqueLocales();
         PreferenceGroup parent = getPreferenceScreen();
@@ -143,7 +143,7 @@
         }
         if (checkedLanguages.length() < 1) checkedLanguages = null; // Save null
         Editor editor = mPrefs.edit();
-        editor.putString(LatinIME.PREF_SELECTED_LANGUAGES, checkedLanguages);
+        editor.putString(Settings.PREF_SELECTED_LANGUAGES, checkedLanguages);
         SharedPreferencesCompat.apply(editor);
     }
 
diff --git a/java/src/com/android/inputmethod/latin/LanguageSwitcher.java b/java/src/com/android/inputmethod/latin/LanguageSwitcher.java
index fc725bf..6faf7f9 100644
--- a/java/src/com/android/inputmethod/latin/LanguageSwitcher.java
+++ b/java/src/com/android/inputmethod/latin/LanguageSwitcher.java
@@ -52,8 +52,8 @@
      * @return whether there was any change
      */
     public boolean loadLocales(SharedPreferences sp) {
-        String selectedLanguages = sp.getString(LatinIME.PREF_SELECTED_LANGUAGES, null);
-        String currentLanguage   = sp.getString(LatinIME.PREF_INPUT_LANGUAGE, null);
+        String selectedLanguages = sp.getString(Settings.PREF_SELECTED_LANGUAGES, null);
+        String currentLanguage   = sp.getString(Settings.PREF_INPUT_LANGUAGE, null);
         if (selectedLanguages == null || selectedLanguages.length() < 1) {
             loadDefaults();
             if (mLocales.size() == 0) {
@@ -187,7 +187,7 @@
 
     public void persist(SharedPreferences prefs) {
         Editor editor = prefs.edit();
-        editor.putString(LatinIME.PREF_INPUT_LANGUAGE, getInputLanguage());
+        editor.putString(Settings.PREF_INPUT_LANGUAGE, getInputLanguage());
         SharedPreferencesCompat.apply(editor);
     }
 }
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index ed5ce6b..27af98e 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -22,7 +22,7 @@
 import com.android.inputmethod.keyboard.KeyboardSwitcher;
 import com.android.inputmethod.keyboard.KeyboardView;
 import com.android.inputmethod.keyboard.LatinKeyboardView;
-import com.android.inputmethod.latin.LatinIMEUtil.RingCharBuffer;
+import com.android.inputmethod.latin.Utils.RingCharBuffer;
 import com.android.inputmethod.voice.VoiceIMEConnector;
 
 import org.xmlpull.v1.XmlPullParserException;
@@ -88,18 +88,6 @@
     private static final boolean DEBUG = false;
     private static final boolean TRACE = false;
 
-    private static final String PREF_SOUND_ON = "sound_on";
-    private static final String PREF_POPUP_ON = "popup_on";
-    private static final String PREF_AUTO_CAP = "auto_cap";
-    private static final String PREF_QUICK_FIXES = "quick_fixes";
-    private static final String PREF_SHOW_SUGGESTIONS_SETTING = "show_suggestions_setting";
-    private static final String PREF_AUTO_COMPLETION_THRESHOLD = "auto_completion_threshold";
-    private static final String PREF_BIGRAM_SUGGESTIONS = "bigram_suggestion";
-
-    public static final String PREF_SELECTED_LANGUAGES = "selected_languages";
-    public static final String PREF_INPUT_LANGUAGE = "input_language";
-    private static final String PREF_RECORRECTION_ENABLED = "recorrection_enabled";
-
     private static final int DELAY_UPDATE_SUGGESTIONS = 180;
     private static final int DELAY_UPDATE_OLD_SUGGESTIONS = 300;
     private static final int DELAY_UPDATE_SHIFT_STATE = 300;
@@ -346,17 +334,17 @@
         final Configuration conf = mResources.getConfiguration();
         mSubtypeSwitcher = SubtypeSwitcher.getInstance();
         mKeyboardSwitcher = KeyboardSwitcher.getInstance();
-        mReCorrectionEnabled = prefs.getBoolean(PREF_RECORRECTION_ENABLED,
+        mReCorrectionEnabled = prefs.getBoolean(Settings.PREF_RECORRECTION_ENABLED,
                 getResources().getBoolean(R.bool.default_recorrection_enabled));
 
-        LatinIMEUtil.GCUtils.getInstance().reset();
+        Utils.GCUtils.getInstance().reset();
         boolean tryGC = true;
-        for (int i = 0; i < LatinIMEUtil.GCUtils.GC_TRY_LOOP_MAX && tryGC; ++i) {
+        for (int i = 0; i < Utils.GCUtils.GC_TRY_LOOP_MAX && tryGC; ++i) {
             try {
                 initSuggest();
                 tryGC = false;
             } catch (OutOfMemoryError e) {
-                tryGC = LatinIMEUtil.GCUtils.getInstance().tryGCOrWait("InitSuggest", e);
+                tryGC = Utils.GCUtils.getInstance().tryGCOrWait("InitSuggest", e);
             }
         }
 
@@ -419,7 +407,7 @@
             mSuggest.close();
         }
         final SharedPreferences prefs = mPrefs;
-        mQuickFixes = prefs.getBoolean(PREF_QUICK_FIXES, true);
+        mQuickFixes = prefs.getBoolean(Settings.PREF_QUICK_FIXES, true);
 
         int[] dictionaries = getDictionary(orig);
         mSuggest = new Suggest(this, dictionaries);
@@ -1063,7 +1051,7 @@
 
     private void onSettingsKeyPressed() {
         if (!isShowingOptionDialog()) {
-            if (LatinIMEUtil.hasMultipleEnabledIMEsOrSubtypes(mImm)) {
+            if (Utils.hasMultipleEnabledIMEsOrSubtypes(mImm)) {
                 showOptionsMenu();
             } else {
                 launchSettings();
@@ -1073,7 +1061,7 @@
 
     private void onSettingsKeyLongPressed() {
         if (!isShowingOptionDialog()) {
-            if (LatinIMEUtil.hasMultipleEnabledIMEsOrSubtypes(mImm)) {
+            if (Utils.hasMultipleEnabledIMEsOrSubtypes(mImm)) {
                 mImm.showInputMethodPicker();
             } else {
                 launchSettings();
@@ -1898,10 +1886,11 @@
     public void onSharedPreferenceChanged(SharedPreferences sharedPreferences,
             String key) {
         mSubtypeSwitcher.onSharedPreferenceChanged(sharedPreferences, key);
-        if (PREF_SELECTED_LANGUAGES.equals(key)) {
+        if (Settings.PREF_SELECTED_LANGUAGES.equals(key)) {
             mRefreshKeyboardRequired = true;
-        } else if (PREF_RECORRECTION_ENABLED.equals(key)) {
-            mReCorrectionEnabled = sharedPreferences.getBoolean(PREF_RECORRECTION_ENABLED,
+        } else if (Settings.PREF_RECORRECTION_ENABLED.equals(key)) {
+            mReCorrectionEnabled = sharedPreferences.getBoolean(
+                    Settings.PREF_RECORRECTION_ENABLED,
                     getResources().getBoolean(R.bool.default_recorrection_enabled));
         }
     }
@@ -2071,8 +2060,8 @@
 
     private void updateSuggestionVisibility(SharedPreferences prefs) {
         final String suggestionVisiblityStr = prefs.getString(
-                PREF_SHOW_SUGGESTIONS_SETTING, mResources.getString(
-                        R.string.prefs_suggestion_visibility_default_value));
+                Settings.PREF_SHOW_SUGGESTIONS_SETTING,
+                mResources.getString(R.string.prefs_suggestion_visibility_default_value));
         for (int visibility : SUGGESTION_VISIBILITY_VALUE_ARRAY) {
             if (suggestionVisiblityStr.equals(mResources.getString(visibility))) {
                 mSuggestionVisibility = visibility;
@@ -2082,11 +2071,11 @@
     }
 
     protected void launchSettings() {
-        launchSettings(LatinIMESettings.class);
+        launchSettings(Settings.class);
     }
 
     public void launchDebugSettings() {
-        launchSettings(LatinIMEDebugSettings.class);
+        launchSettings(DebugSettings.class);
     }
 
     protected void launchSettings(Class<? extends PreferenceActivity> settingsClass) {
@@ -2102,12 +2091,12 @@
         final SharedPreferences prefs = mPrefs;
         Vibrator vibrator = (Vibrator) getSystemService(Context.VIBRATOR_SERVICE);
         mVibrateOn = vibrator != null && vibrator.hasVibrator()
-                && prefs.getBoolean(LatinIMESettings.PREF_VIBRATE_ON, false);
-        mSoundOn = prefs.getBoolean(PREF_SOUND_ON, false);
-        mPopupOn = prefs.getBoolean(PREF_POPUP_ON,
+                && prefs.getBoolean(Settings.PREF_VIBRATE_ON, false);
+        mSoundOn = prefs.getBoolean(Settings.PREF_SOUND_ON, false);
+        mPopupOn = prefs.getBoolean(Settings.PREF_POPUP_ON,
                 mResources.getBoolean(R.bool.default_popup_preview));
-        mAutoCap = prefs.getBoolean(PREF_AUTO_CAP, true);
-        mQuickFixes = prefs.getBoolean(PREF_QUICK_FIXES, true);
+        mAutoCap = prefs.getBoolean(Settings.PREF_AUTO_CAP, true);
+        mQuickFixes = prefs.getBoolean(Settings.PREF_QUICK_FIXES, true);
 
         mAutoCorrectEnabled = isAutoCorrectEnabled(prefs);
         mBigramSuggestionEnabled = mAutoCorrectEnabled && isBigramSuggestionEnabled(prefs);
@@ -2131,7 +2120,8 @@
         // When auto completion setting is turned off, the threshold is ignored.
         if (!isAutoCorrectEnabled(sp)) return;
 
-        final String currentAutoCompletionSetting = sp.getString(PREF_AUTO_COMPLETION_THRESHOLD,
+        final String currentAutoCompletionSetting = sp.getString(
+                Settings.PREF_AUTO_COMPLETION_THRESHOLD,
                 mResources.getString(R.string.auto_completion_threshold_mode_value_modest));
         final String[] autoCompletionThresholdValues = mResources.getStringArray(
                 R.array.auto_complete_threshold_values);
@@ -2159,7 +2149,8 @@
     }
 
     private boolean isAutoCorrectEnabled(SharedPreferences sp) {
-        final String currentAutoCompletionSetting = sp.getString(PREF_AUTO_COMPLETION_THRESHOLD,
+        final String currentAutoCompletionSetting = sp.getString(
+                Settings.PREF_AUTO_COMPLETION_THRESHOLD,
                 mResources.getString(R.string.auto_completion_threshold_mode_value_modest));
         final String autoCompletionOff = mResources.getString(
                 R.string.auto_completion_threshold_mode_value_off);
@@ -2168,7 +2159,7 @@
 
     private boolean isBigramSuggestionEnabled(SharedPreferences sp) {
        // TODO: Define default value instead of 'true'.
-       return sp.getBoolean(PREF_BIGRAM_SUGGESTIONS, true);
+       return sp.getBoolean(Settings.PREF_BIGRAM_SUGGESTIONS, true);
     }
 
     private void initSuggestPuncList() {
diff --git a/java/src/com/android/inputmethod/latin/LatinIMESettings.java b/java/src/com/android/inputmethod/latin/Settings.java
similarity index 84%
rename from java/src/com/android/inputmethod/latin/LatinIMESettings.java
rename to java/src/com/android/inputmethod/latin/Settings.java
index 3aa89dd..9c7c5aa 100644
--- a/java/src/com/android/inputmethod/latin/LatinIMESettings.java
+++ b/java/src/com/android/inputmethod/latin/Settings.java
@@ -39,19 +39,26 @@
 
 import java.util.Locale;
 
-public class LatinIMESettings extends PreferenceActivity
+public class Settings extends PreferenceActivity
         implements SharedPreferences.OnSharedPreferenceChangeListener,
         DialogInterface.OnDismissListener {
+    private static final String TAG = "Settings";
 
-    private static final String QUICK_FIXES_KEY = "quick_fixes";
-    private static final String PREDICTION_SETTINGS_KEY = "prediction_settings";
-    private static final String VOICE_SETTINGS_KEY = "voice_mode";
-    private static final String PREF_AUTO_COMPLETION_THRESHOLD = "auto_completion_threshold";
-    private static final String PREF_BIGRAM_SUGGESTIONS = "bigram_suggestion";
+    public static final String PREF_VIBRATE_ON = "vibrate_on";
+    public static final String PREF_SOUND_ON = "sound_on";
+    public static final String PREF_POPUP_ON = "popup_on";
+    public static final String PREF_RECORRECTION_ENABLED = "recorrection_enabled";
+    public static final String PREF_AUTO_CAP = "auto_cap";
     public static final String PREF_SETTINGS_KEY = "settings_key";
-    /* package */ static final String PREF_VIBRATE_ON = "vibrate_on";
+    public static final String PREF_VOICE_SETTINGS_KEY = "voice_mode";
+    public static final String PREF_INPUT_LANGUAGE = "input_language";
+    public static final String PREF_SELECTED_LANGUAGES = "selected_languages";
 
-    private static final String TAG = "LatinIMESettings";
+    public static final String PREF_PREDICTION_SETTINGS_KEY = "prediction_settings";
+    public static final String PREF_QUICK_FIXES = "quick_fixes";
+    public static final String PREF_SHOW_SUGGESTIONS_SETTING = "show_suggestions_setting";
+    public static final String PREF_AUTO_COMPLETION_THRESHOLD = "auto_completion_threshold";
+    public static final String PREF_BIGRAM_SUGGESTIONS = "bigram_suggestion";
 
     // Dialog ids
     private static final int VOICE_INPUT_CONFIRM_DIALOG = 0;
@@ -80,14 +87,15 @@
     protected void onCreate(Bundle icicle) {
         super.onCreate(icicle);
         addPreferencesFromResource(R.xml.prefs);
-        mQuickFixes = (CheckBoxPreference) findPreference(QUICK_FIXES_KEY);
-        mVoicePreference = (ListPreference) findPreference(VOICE_SETTINGS_KEY);
+        mQuickFixes = (CheckBoxPreference) findPreference(PREF_QUICK_FIXES);
+        mVoicePreference = (ListPreference) findPreference(PREF_VOICE_SETTINGS_KEY);
         mSettingsKeyPreference = (ListPreference) findPreference(PREF_SETTINGS_KEY);
         SharedPreferences prefs = getPreferenceManager().getSharedPreferences();
         prefs.registerOnSharedPreferenceChangeListener(this);
 
         mVoiceModeOff = getString(R.string.voice_mode_off);
-        mVoiceOn = !(prefs.getString(VOICE_SETTINGS_KEY, mVoiceModeOff).equals(mVoiceModeOff));
+        mVoiceOn = !(prefs.getString(PREF_VOICE_SETTINGS_KEY, mVoiceModeOff)
+                .equals(mVoiceModeOff));
         mLogger = VoiceInputLogger.getLogger(this);
 
         mAutoCompletionThreshold = (ListPreference) findPreference(PREF_AUTO_COMPLETION_THRESHOLD);
@@ -118,7 +126,7 @@
         super.onResume();
         int autoTextSize = AutoText.getSize(getListView());
         if (autoTextSize < 1) {
-            ((PreferenceGroup) findPreference(PREDICTION_SETTINGS_KEY))
+            ((PreferenceGroup) findPreference(PREF_PREDICTION_SETTINGS_KEY))
                     .removePreference(mQuickFixes);
         }
         if (!VoiceIMEConnector.VOICE_INSTALLED
@@ -141,14 +149,15 @@
     public void onSharedPreferenceChanged(SharedPreferences prefs, String key) {
         (new BackupManager(this)).dataChanged();
         // If turning on voice input, show dialog
-        if (key.equals(VOICE_SETTINGS_KEY) && !mVoiceOn) {
-            if (!prefs.getString(VOICE_SETTINGS_KEY, mVoiceModeOff)
+        if (key.equals(PREF_VOICE_SETTINGS_KEY) && !mVoiceOn) {
+            if (!prefs.getString(PREF_VOICE_SETTINGS_KEY, mVoiceModeOff)
                     .equals(mVoiceModeOff)) {
                 showVoiceConfirmation();
             }
         }
         ensureConsistencyOfAutoCompletionSettings();
-        mVoiceOn = !(prefs.getString(VOICE_SETTINGS_KEY, mVoiceModeOff).equals(mVoiceModeOff));
+        mVoiceOn = !(prefs.getString(PREF_VOICE_SETTINGS_KEY, mVoiceModeOff)
+                .equals(mVoiceModeOff));
         updateVoiceModeSummary();
         updateSettingsKeySummary();
     }
diff --git a/java/src/com/android/inputmethod/latin/SubtypeSwitcher.java b/java/src/com/android/inputmethod/latin/SubtypeSwitcher.java
index 3ee4eb8..b67dd22 100644
--- a/java/src/com/android/inputmethod/latin/SubtypeSwitcher.java
+++ b/java/src/com/android/inputmethod/latin/SubtypeSwitcher.java
@@ -316,7 +316,7 @@
 
     public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
         if (USE_SPACEBAR_LANGUAGE_SWITCHER) {
-            if (LatinIME.PREF_SELECTED_LANGUAGES.equals(key)) {
+            if (Settings.PREF_SELECTED_LANGUAGES.equals(key)) {
                 mLanguageSwitcher.loadLocales(sharedPreferences);
             }
         }
diff --git a/java/src/com/android/inputmethod/latin/Suggest.java b/java/src/com/android/inputmethod/latin/Suggest.java
index 2f18887..a6df187 100644
--- a/java/src/com/android/inputmethod/latin/Suggest.java
+++ b/java/src/com/android/inputmethod/latin/Suggest.java
@@ -284,7 +284,7 @@
                     && mSuggestions.size() > 0 && mPriorities.length > 0) {
                 // TODO: when the normalized score of the first suggestion is nearly equals to
                 //       the normalized score of the second suggestion, behave less aggressive.
-                final double normalizedScore = LatinIMEUtil.calcNormalizedScore(
+                final double normalizedScore = Utils.calcNormalizedScore(
                         mOriginalWord, mSuggestions.get(0), mPriorities[0]);
                 if (LatinImeLogger.sDBG) {
                     Log.d(TAG, "Normalized " + mOriginalWord + "," + mSuggestions.get(0) + ","
diff --git a/java/src/com/android/inputmethod/latin/LatinIMEUtil.java b/java/src/com/android/inputmethod/latin/Utils.java
similarity index 99%
rename from java/src/com/android/inputmethod/latin/LatinIMEUtil.java
rename to java/src/com/android/inputmethod/latin/Utils.java
index f508b9a..0a73dde 100644
--- a/java/src/com/android/inputmethod/latin/LatinIMEUtil.java
+++ b/java/src/com/android/inputmethod/latin/Utils.java
@@ -35,7 +35,7 @@
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
-public class LatinIMEUtil {
+public class Utils {
 
     /**
      * Cancel an {@link AsyncTask}.