diff --git a/data/keyboards/geometry/numbers-keypad.xml b/data/keyboards/geometry/number-keypad.xml
similarity index 100%
rename from data/keyboards/geometry/numbers-keypad.xml
rename to data/keyboards/geometry/number-keypad.xml
diff --git a/data/keyboards/keyboards.xml b/data/keyboards/keyboards.xml
index a5536c49..197e0174 100644
--- a/data/keyboards/keyboards.xml
+++ b/data/keyboards/keyboards.xml
@@ -90,8 +90,11 @@
 	    longname="Telugu (Inscript)" language="te"/>
 
   <!-- Common keyboards -->
-  <keyboard id="numbers" name="numbers"
-	    geometry="numbers-keypad" symbols="special/numbers"
+  <keyboard id="number" name="number"
+	    geometry="number-keypad" symbols="special/number"
 	    longname="Numeric keypad" language="all"/>
+  <keyboard id="phone" name="phone"
+	    geometry="number-keypad" symbols="special/number"
+	    longname="Phone keypad" language="all"/>
 
 </keyboards>
diff --git a/data/keyboards/symbols/special/numbers.xml b/data/keyboards/symbols/special/number.xml
similarity index 100%
rename from data/keyboards/symbols/special/numbers.xml
rename to data/keyboards/symbols/special/number.xml
diff --git a/data/squeekboard.gresources.xml b/data/squeekboard.gresources.xml
index 25830247..bb094938 100644
--- a/data/squeekboard.gresources.xml
+++ b/data/squeekboard.gresources.xml
@@ -4,7 +4,7 @@
    <file compressed="true">style.css</file>
    <file compressed="true" preprocess="xml-stripblanks">keyboards/geometry/compact.xml</file>
    <file compressed="true" preprocess="xml-stripblanks">keyboards/geometry/extended.xml</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/geometry/numbers-keypad.xml</file>
+   <file compressed="true" preprocess="xml-stripblanks">keyboards/geometry/number-keypad.xml</file>
    <file compressed="true" preprocess="xml-stripblanks">keyboards/keyboards.xml</file>
    <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/ar.xml</file>
    <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/as-inscript.xml</file>
@@ -35,7 +35,7 @@
    <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/ug.xml</file>
    <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/us.xml</file>
    <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/zh-bopomofo.xml</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/special/numbers.xml</file>
+   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/special/number.xml</file>
    <file>icons/key-enter.svg</file>
    <file>icons/key-shift.svg</file>
    <file>icons/keyboard-mode-symbolic.svg</file>
diff --git a/eekboard/eekboard-context-service.c b/eekboard/eekboard-context-service.c
index 797837b0..e1efb432 100644
--- a/eekboard/eekboard-context-service.c
+++ b/eekboard/eekboard-context-service.c
@@ -302,8 +302,14 @@ settings_update_layout(EekboardContextService *context)
 
     EekboardContextServicePrivate *priv = EEKBOARD_CONTEXT_SERVICE_GET_PRIVATE(context);
 
-    if (priv->purpose == ZWP_TEXT_INPUT_V3_CONTENT_PURPOSE_PHONE)
-        keyboard_layout = g_strdup("numbers");
+    switch (priv->purpose) {
+    case ZWP_TEXT_INPUT_V3_CONTENT_PURPOSE_NUMBER:
+    case ZWP_TEXT_INPUT_V3_CONTENT_PURPOSE_PHONE:
+        keyboard_layout = g_strdup("number");
+        break;
+    default:
+        ;
+    }
 
     // generic part follows
     static guint keyboard_id = 0;