diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/latin/inputlogic/InputLogic.java b/app/src/main/java/org/dslul/openboard/inputmethod/latin/inputlogic/InputLogic.java
index a58dd4b8e..920364b9c 100644
--- a/app/src/main/java/org/dslul/openboard/inputmethod/latin/inputlogic/InputLogic.java
+++ b/app/src/main/java/org/dslul/openboard/inputmethod/latin/inputlogic/InputLogic.java
@@ -1003,7 +1003,7 @@ public final class InputLogic {
                 // phantom space state when typing decimal numbers, with the drawback of not
                 // setting phantom space state after ending a sentence with a non-word.
                 if (wasComposingWord
-                    && settingsValues.mInsertMoreSpacesEnabled
+                    && settingsValues.mAutospaceAfterPunctuationEnabled
                     && settingsValues.isUsuallyFollowedBySpace(codePoint)) {
                 mSpaceState = SpaceState.PHANTOM;
             }
diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/Settings.java b/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/Settings.java
index 01682d497..135c6ceab 100644
--- a/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/Settings.java
+++ b/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/Settings.java
@@ -94,7 +94,7 @@ public final class Settings implements SharedPreferences.OnSharedPreferenceChang
     public static final String PREF_KEYBOARD_HEIGHT_SCALE = "pref_keyboard_height_scale";
     public static final String PREF_SPACE_TRACKPAD = "pref_space_trackpad";
     public static final String PREF_DELETE_SWIPE = "pref_delete_swipe";
-    public static final String PREF_INSERT_MORE_SPACES = "pref_insert_more_spaces";
+    public static final String PREF_AUTOSPACE_AFTER_PUNCTUATION = "pref_autospace_after_punctuation";
     public static final String PREF_ALWAYS_INCOGNITO_MODE =
             "pref_always_incognito_mode";
     public static final String PREF_BIGRAM_PREDICTIONS = "next_word_prediction";
@@ -393,8 +393,8 @@ public final class Settings implements SharedPreferences.OnSharedPreferenceChang
         return prefs.getBoolean(PREF_DELETE_SWIPE, true);
     }
 
-    public static boolean readInsertMoreSpacesEnabled(final SharedPreferences prefs) {
-        return prefs.getBoolean(PREF_INSERT_MORE_SPACES, false);
+    public static boolean readAutospaceAfterPunctuationEnabled(final SharedPreferences prefs) {
+        return prefs.getBoolean(PREF_AUTOSPACE_AFTER_PUNCTUATION, false);
     }
 
     public static boolean readUseFullscreenMode(final Resources res) {
diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/SettingsValues.java b/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/SettingsValues.java
index 4e160ce1b..e639a6e3d 100644
--- a/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/SettingsValues.java
+++ b/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/SettingsValues.java
@@ -80,7 +80,7 @@ public class SettingsValues {
     public final boolean mBlockPotentiallyOffensive;
     public final boolean mSpaceTrackpadEnabled;
     public final boolean mDeleteSwipeEnabled;
-    public final boolean mInsertMoreSpacesEnabled;
+    public final boolean mAutospaceAfterPunctuationEnabled;
     public final boolean mClipboardHistoryEnabled;
     public final long mClipboardHistoryRetentionTime;
     public final boolean mOneHandedModeEnabled;
@@ -238,7 +238,7 @@ public class SettingsValues {
         }
         mSpaceTrackpadEnabled = Settings.readSpaceTrackpadEnabled(prefs);
         mDeleteSwipeEnabled = Settings.readDeleteSwipeEnabled(prefs);
-        mInsertMoreSpacesEnabled = Settings.readInsertMoreSpacesEnabled(prefs);
+        mAutospaceAfterPunctuationEnabled = Settings.readAutospaceAfterPunctuationEnabled(prefs);
         mClipboardHistoryEnabled = Settings.readClipboardHistoryEnabled(prefs);
         mClipboardHistoryRetentionTime = Settings.readClipboardHistoryRetentionTime(prefs, res);
         mOneHandedModeEnabled = Settings.readOneHandedModeEnabled(prefs);
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 06aa5fc17..c6fd5fa0d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -187,9 +187,9 @@
     <!-- Description for "space_trackpad" option. -->
     <string name="space_trackpad_summary">Swipe on the spacebar to move the cursor</string>
     <!-- Preferences item for enabling inserting more spaces key -->
-    <string name="insert_more_spaces">Insert spaces after punctuation</string>
+    <string name="autospace_after_punctuation">Autospace after punctuation</string>
     <!-- Description for "insert_more_spaces" option. -->
-    <string name="insert_more_spaces_summary">Automatically insert space after punctuation, even if the previous word was not a suggestion</string>
+    <string name="autospace_after_punctuation_summary">Automatically insert space after punctuation when typing a new word</string>
     <!-- Preferences item for disabling word learning -->
     <string name="prefs_force_incognito_mode">Force incognito mode</string>
     <!-- Description for "prefs_force_incognito_mode" option. -->
diff --git a/app/src/main/res/xml/prefs_screen_advanced.xml b/app/src/main/res/xml/prefs_screen_advanced.xml
index ad3a4c02e..6d13600b3 100644
--- a/app/src/main/res/xml/prefs_screen_advanced.xml
+++ b/app/src/main/res/xml/prefs_screen_advanced.xml
@@ -77,9 +77,9 @@
             android:defaultValue="true" />
 
         <CheckBoxPreference
-            android:key="pref_insert_more_spaces"
-            android:title="@string/insert_more_spaces"
-            android:summary="@string/insert_more_spaces_summary"
+            android:key="pref_autospace_after_punctuation"
+            android:title="@string/autospace_after_punctuation"
+            android:summary="@string/autospace_after_punctuation_summary"
             android:defaultValue="false" />
 
     </PreferenceCategory>