diff --git a/java/res/values/strings-appname.xml b/java/res/values/strings-appname.xml
index 19aaa25..ad25ff6 100644
--- a/java/res/values/strings-appname.xml
+++ b/java/res/values/strings-appname.xml
@@ -20,14 +20,14 @@
 
 <resources>
     <!-- Title for Latin Keyboard  -->
-    <string name="english_ime_name">Android keyboard</string>
+    <string name="english_ime_name">Android Keyboard</string>
 
     <!-- Name of Android spell checker service -->
-    <string name="spell_checker_service_name">Android spell checker</string>
+    <string name="spell_checker_service_name">Android Spell Checker</string>
 
     <!-- Title for Latin keyboard settings activity / dialog -->
-    <string name="english_ime_settings">Android keyboard settings</string>
+    <string name="english_ime_settings">Android Keyboard Settings</string>
 
     <!-- Title for the spell checking service settings screen -->
-    <string name="android_spell_checker_settings">Spell checking settings</string>
+    <string name="android_spell_checker_settings">Android Spell Checker Settings</string>
 </resources>
diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeyboardBuilder.java b/java/src/com/android/inputmethod/keyboard/internal/KeyboardBuilder.java
index ab851bd..8ae1b88 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/KeyboardBuilder.java
+++ b/java/src/com/android/inputmethod/keyboard/internal/KeyboardBuilder.java
@@ -24,7 +24,6 @@
 import android.util.Log;
 import android.util.TypedValue;
 import android.util.Xml;
-import android.view.InflateException;
 
 import com.android.inputmethod.annotations.UsedForTesting;
 import com.android.inputmethod.keyboard.Key;
@@ -750,7 +749,7 @@
 
     private void endRow(final KeyboardRow row) {
         if (mCurrentRow == null) {
-            throw new InflateException("orphan end row tag");
+            throw new RuntimeException("orphan end row tag");
         }
         if (mRightEdgeKey != null) {
             mRightEdgeKey.markAsRightEdge(mParams);