diff --git a/java-overridable/src/com/android/inputmethod/latin/define/ProductionFlags.java b/java-overridable/src/com/android/inputmethod/latin/define/ProductionFlags.java
index 43675682d..f31c20822 100644
--- a/java-overridable/src/com/android/inputmethod/latin/define/ProductionFlags.java
+++ b/java-overridable/src/com/android/inputmethod/latin/define/ProductionFlags.java
@@ -45,9 +45,10 @@ public final class ProductionFlags {
     public static final boolean ENABLE_ACCOUNT_SIGN_IN = false;
 
     /**
-     * When {@code true}, personal dictionary sync feature is ready to be enabled.
+     * When {@code true}, user history dictionary sync feature is ready to be enabled.
      */
-    public static final boolean ENABLE_PERSONAL_DICTIONARY_SYNC = ENABLE_ACCOUNT_SIGN_IN && false;
+    public static final boolean ENABLE_USER_HISTORY_DICTIONARY_SYNC =
+            ENABLE_ACCOUNT_SIGN_IN && false;
 
     /**
      * When {@code true}, the IME maintains per account {@link UserHistoryDictionary}.
diff --git a/java/src/com/android/inputmethod/latin/settings/AccountsSettingsFragment.java b/java/src/com/android/inputmethod/latin/settings/AccountsSettingsFragment.java
index 8f4ec4f1b..10d570cbf 100644
--- a/java/src/com/android/inputmethod/latin/settings/AccountsSettingsFragment.java
+++ b/java/src/com/android/inputmethod/latin/settings/AccountsSettingsFragment.java
@@ -84,7 +84,7 @@ public final class AccountsSettingsFragment extends SubScreenFragment {
             removePreference(PREF_SYNC_NOW);
             removePreference(PREF_CLEAR_SYNC_DATA);
         }
-        if (!ProductionFlags.ENABLE_PERSONAL_DICTIONARY_SYNC) {
+        if (!ProductionFlags.ENABLE_USER_HISTORY_DICTIONARY_SYNC) {
             removePreference(PREF_ENABLE_CLOUD_SYNC);
             removePreference(PREF_SYNC_NOW);
             removePreference(PREF_CLEAR_SYNC_DATA);
@@ -154,7 +154,7 @@ public final class AccountsSettingsFragment extends SubScreenFragment {
      * Enables the Sync preference UI and updates its summary.
      */
     private void enableSyncPreference() {
-        if (!ProductionFlags.ENABLE_PERSONAL_DICTIONARY_SYNC) {
+        if (!ProductionFlags.ENABLE_USER_HISTORY_DICTIONARY_SYNC) {
             return;
         }
 
@@ -168,7 +168,7 @@ public final class AccountsSettingsFragment extends SubScreenFragment {
      * the fact that an account needs to be selected for sync.
      */
     private void disableSyncPreference() {
-        if (!ProductionFlags.ENABLE_PERSONAL_DICTIONARY_SYNC) {
+        if (!ProductionFlags.ENABLE_USER_HISTORY_DICTIONARY_SYNC) {
             return;
         }