diff --git a/java/res/xml/kbd_slavic.xml b/java/res/xml/kbd_east_slavic.xml
similarity index 93%
copy from java/res/xml/kbd_slavic.xml
copy to java/res/xml/kbd_east_slavic.xml
index ca891c0..3bc2339 100644
--- a/java/res/xml/kbd_slavic.xml
+++ b/java/res/xml/kbd_east_slavic.xml
@@ -22,5 +22,5 @@
     xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
 >
     <include
-        latin:keyboardLayout="@xml/rows_slavic" />
+        latin:keyboardLayout="@xml/rows_east_slavic" />
 </Keyboard>
diff --git a/java/res/xml/kbd_slavic.xml b/java/res/xml/kbd_nordic.xml
similarity index 93%
rename from java/res/xml/kbd_slavic.xml
rename to java/res/xml/kbd_nordic.xml
index ca891c0..a2196c9 100644
--- a/java/res/xml/kbd_slavic.xml
+++ b/java/res/xml/kbd_nordic.xml
@@ -4,7 +4,7 @@
 **
 ** Copyright 2011, The Android Open Source Project
 **
-** Licensed under the Apache License, Version 2.0 (the "License"):
+** Licensed under the Apache License, Version 2.0 (the "License");
 ** you may not use this file except in compliance with the License.
 ** You may obtain a copy of the License at
 **
@@ -22,5 +22,5 @@
     xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
 >
     <include
-        latin:keyboardLayout="@xml/rows_slavic" />
+        latin:keyboardLayout="@xml/rows_nordic" />
 </Keyboard>
diff --git a/java/res/xml/kbd_serbian.xml b/java/res/xml/kbd_serbian.xml
deleted file mode 100644
index 05597c4..0000000
--- a/java/res/xml/kbd_serbian.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2011, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
-    <include
-        latin:keyboardLayout="@xml/rows_serbian" />
-</Keyboard>
diff --git a/java/res/xml/kbd_scandinavian.xml b/java/res/xml/kbd_south_slavic.xml
similarity index 92%
rename from java/res/xml/kbd_scandinavian.xml
rename to java/res/xml/kbd_south_slavic.xml
index 46ddfcb..f3ad02c 100644
--- a/java/res/xml/kbd_scandinavian.xml
+++ b/java/res/xml/kbd_south_slavic.xml
@@ -22,5 +22,5 @@
     xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
 >
     <include
-        latin:keyboardLayout="@xml/rows_scandinavian" />
+        latin:keyboardLayout="@xml/rows_south_slavic" />
 </Keyboard>
diff --git a/java/res/xml/method.xml b/java/res/xml/method.xml
index 8b1a3ef..f330b26 100644
--- a/java/res/xml/method.xml
+++ b/java/res/xml/method.xml
@@ -20,9 +20,46 @@
 <!-- The attributes in this XML file provide configuration information -->
 <!-- for the Input Method Manager. -->
 
-<!-- Keyboard: en_US, en_GB, ar, be, bg, cs, da, de, de(QWERTY), el, es, es_US, et, fi, fr, fr_CA,
-     fr_CH, hr, hu, it, iw, ka, ky, lt, lv, mk, nb, nl, pl, pt, ro, ru, sk, sl, sr, sv, tr, uk,
-     vi -->
+<!-- Supported locales: name/layout
+    ar: Arabic/arabic
+    be: Belarusian/east_slavic
+    bg: Bulgarian/bulgarian
+    cs: Czech/qwertz
+    da: Danish/nordic
+    de: German/qwertz
+    de_ZZ: German (QWERTY)/qwerty
+    el: Greek/greek
+    en_US: English United States/qwerty
+    en_GB: English Great Britain/qwerty
+    es: Spanish/spanish
+    et: Estonian/nordic
+    fi: Finnish/nordic
+    fr: French/azerty
+    fr_CA: French Canada/qwerty
+    fr_CH: French Switzerland/qwertz
+    hr: Croatian/qwertz
+    hu: Hungarian/qwertz
+    it: Italian/qwerty
+    iw: Hebrew/hebrew
+    ka: Georgian/georgian
+    ky: Kyrgyz/east_slavic
+    lt: Lithuanian/qwerty
+    lv: Latvian/qwerty
+    mk: Macedonian/south_slavic
+    nb: Norwaian Bokmål/nordic
+    nl: Dutch/qwerty
+    pl: Polish/qwerty
+    pt: Portuguese/qwerty
+    ro: Romanian/qwerty
+    ru: Russian/east_slavic
+    sk: Slovak/qwerty
+    sl: Slovenian/qwerty
+    sr: Serbian/south_slavic
+    sv: Swedish/nordic
+    tr: Turkish/qwerty
+    uk: Ukrainian/east_slavic
+    vi: Vietnamese/qwerty
+    -->
 <!-- TODO: use <lang>_keyboard icon instead of a common keyboard icon. -->
 <!-- If IME doesn't have an applicable subtype, the first subtype will be used as a default
      subtype.-->
diff --git a/java/res/xml/rowkeys_slavic1.xml b/java/res/xml/rowkeys_east_slavic1.xml
similarity index 100%
rename from java/res/xml/rowkeys_slavic1.xml
rename to java/res/xml/rowkeys_east_slavic1.xml
diff --git a/java/res/xml/rowkeys_slavic2.xml b/java/res/xml/rowkeys_east_slavic2.xml
similarity index 100%
rename from java/res/xml/rowkeys_slavic2.xml
rename to java/res/xml/rowkeys_east_slavic2.xml
diff --git a/java/res/xml/rowkeys_slavic3.xml b/java/res/xml/rowkeys_east_slavic3.xml
similarity index 100%
rename from java/res/xml/rowkeys_slavic3.xml
rename to java/res/xml/rowkeys_east_slavic3.xml
diff --git a/java/res/xml/rowkeys_scandinavian1.xml b/java/res/xml/rowkeys_nordic1.xml
similarity index 100%
rename from java/res/xml/rowkeys_scandinavian1.xml
rename to java/res/xml/rowkeys_nordic1.xml
diff --git a/java/res/xml/rowkeys_scandinavian2.xml b/java/res/xml/rowkeys_nordic2.xml
similarity index 100%
rename from java/res/xml/rowkeys_scandinavian2.xml
rename to java/res/xml/rowkeys_nordic2.xml
diff --git a/java/res/xml/rowkeys_serbian1.xml b/java/res/xml/rowkeys_south_slavic1.xml
similarity index 100%
rename from java/res/xml/rowkeys_serbian1.xml
rename to java/res/xml/rowkeys_south_slavic1.xml
diff --git a/java/res/xml/rowkeys_serbian2.xml b/java/res/xml/rowkeys_south_slavic2.xml
similarity index 100%
rename from java/res/xml/rowkeys_serbian2.xml
rename to java/res/xml/rowkeys_south_slavic2.xml
diff --git a/java/res/xml/rowkeys_serbian3.xml b/java/res/xml/rowkeys_south_slavic3.xml
similarity index 100%
rename from java/res/xml/rowkeys_serbian3.xml
rename to java/res/xml/rowkeys_south_slavic3.xml
diff --git a/java/res/xml/rows_slavic.xml b/java/res/xml/rows_east_slavic.xml
similarity index 87%
rename from java/res/xml/rows_slavic.xml
rename to java/res/xml/rows_east_slavic.xml
index 25dae92..0193612 100644
--- a/java/res/xml/rows_slavic.xml
+++ b/java/res/xml/rows_east_slavic.xml
@@ -27,13 +27,13 @@
         latin:keyWidth="9.091%p"
     >
         <include
-            latin:keyboardLayout="@xml/rowkeys_slavic1" />
+            latin:keyboardLayout="@xml/rowkeys_east_slavic1" />
     </Row>
     <Row
             latin:keyWidth="9.091%p"
     >
         <include
-            latin:keyboardLayout="@xml/rowkeys_slavic2" />
+            latin:keyboardLayout="@xml/rowkeys_east_slavic2" />
     </Row>
     <Row
         latin:keyWidth="8.5%p"
@@ -42,7 +42,7 @@
             latin:keyStyle="shiftKeyStyle"
             latin:keyWidth="11.75%p" />
         <include
-            latin:keyboardLayout="@xml/rowkeys_slavic3" />
+            latin:keyboardLayout="@xml/rowkeys_east_slavic3" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyWidth="fillRight" />
diff --git a/java/res/xml/rows_scandinavian.xml b/java/res/xml/rows_nordic.xml
similarity index 91%
rename from java/res/xml/rows_scandinavian.xml
rename to java/res/xml/rows_nordic.xml
index 45642f4..51d20e8 100644
--- a/java/res/xml/rows_scandinavian.xml
+++ b/java/res/xml/rows_nordic.xml
@@ -27,13 +27,13 @@
         latin:keyWidth="9.091%p"
     >
         <include
-            latin:keyboardLayout="@xml/rowkeys_scandinavian1" />
+            latin:keyboardLayout="@xml/rowkeys_nordic1" />
     </Row>
     <Row
         latin:keyWidth="9.091%p"
     >
         <include
-            latin:keyboardLayout="@xml/rowkeys_scandinavian2" />
+            latin:keyboardLayout="@xml/rowkeys_nordic2" />
     </Row>
     <Row
         latin:keyWidth="10%p"
diff --git a/java/res/xml/rows_serbian.xml b/java/res/xml/rows_south_slavic.xml
similarity index 86%
rename from java/res/xml/rows_serbian.xml
rename to java/res/xml/rows_south_slavic.xml
index f3f4084..31bb389 100644
--- a/java/res/xml/rows_serbian.xml
+++ b/java/res/xml/rows_south_slavic.xml
@@ -27,13 +27,13 @@
         latin:keyWidth="9.091%p"
     >
         <include
-            latin:keyboardLayout="@xml/rowkeys_serbian1" />
+            latin:keyboardLayout="@xml/rowkeys_south_slavic1" />
     </Row>
     <Row
         latin:keyWidth="9.091%p"
     >
         <include
-            latin:keyboardLayout="@xml/rowkeys_serbian2" />
+            latin:keyboardLayout="@xml/rowkeys_south_slavic2" />
     </Row>
     <Row
         latin:keyWidth="8.5%p"
@@ -42,7 +42,7 @@
             latin:keyStyle="shiftKeyStyle"
             latin:keyWidth="11.75%p" />
         <include
-            latin:keyboardLayout="@xml/rowkeys_serbian3" />
+            latin:keyboardLayout="@xml/rowkeys_south_slavic3" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyWidth="fillRight" />