diff --git a/rules/base.extras.xml.in b/rules/base.extras.xml.in
index c5ff4a62..4faff93c 100644
--- a/rules/base.extras.xml.in
+++ b/rules/base.extras.xml.in
@@ -7,7 +7,7 @@
       <configItem>
         <name>apl</name>
         <_shortDescription>APL</_shortDescription>
-        <_description>APL</_description>
+        <_description>APL Keyboard Symbols</_description>
         <languageList><iso639Id>eng</iso639Id></languageList>
       </configItem>
       <variantList/>
@@ -40,7 +40,7 @@
       <configItem>
         <name>ir</name>
         <_shortDescription>Iran</_shortDescription>
-        <_description>Iran</_description>
+        <_description>Persian</_description>
         <languageList><iso639Id>per</iso639Id></languageList>
       </configItem>
       <variantList>
@@ -132,15 +132,15 @@
     <layout>
       <configItem>
         <name>us</name>
-        <_shortDescription>USA</_shortDescription>
-        <_description>USA</_description>
+        <_shortDescription>en</_shortDescription>
+        <_description>English (US)</_description>
         <languageList><iso639Id>eng</iso639Id></languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>intl-unicode</name>
-            <_description>English (US, international (AltGr Unicode combining)</_description>
+            <_description>English (US, international AltGr Unicode combining)</_description>
           </configItem>
         </variant>
         <variant>
@@ -185,7 +185,7 @@
       <configItem>
         <name>rs</name>
         <_shortDescription>Srb</_shortDescription>
-        <_description>Serbia</_description>
+        <_description>Serbian</_description>
         <languageList><iso639Id>srp</iso639Id></languageList>
       </configItem>
       <variantList>
diff --git a/symbols/apl b/symbols/apl
index 4421cc39..0ebc2684 100644
--- a/symbols/apl
+++ b/symbols/apl
@@ -122,7 +122,7 @@ xkb_symbols "unified" {
 default
 partial alphanumeric_keys modifier_keys 
 xkb_symbols "sax" {
-	name[Group1]= "APL Keyboard Symbols: Sharp APL for Unix";
+	name[Group1]= "APL Keyboard Symbols";
 
 	include "apl(unified)"
 
diff --git a/symbols/et b/symbols/et
index dccf9ca0..22ba892a 100644
--- a/symbols/et
+++ b/symbols/et
@@ -14,7 +14,7 @@ xkb_symbols "basic" {
 partial alphanumeric_keys
 xkb_symbols "olpc" {
 
-    name[Group1]="Ethiopia";
+    name[Group1]="Amharic";
 
     key <AE01>	{ [        0x01001369,  0x01001372 ] }; // 1
     key <AE02>	{ [        0x0100136a,  0x01001373 ] }; // 2
diff --git a/symbols/us b/symbols/us
index 19ddae86..1d8bdd0d 100644
--- a/symbols/us
+++ b/symbols/us
@@ -992,7 +992,7 @@ partial alphanumeric_keys
 xkb_symbols "olpc" {
 
    include "us(basic)"
-   name[Group1]= "USA";
+   name[Group1]= "English (US)";
 
    // OLPC international US English keyboard layout.
    // It's a little different from the usual international layout.
@@ -1146,7 +1146,7 @@ xkb_symbols "hbs" {
 partial alphanumeric_keys
 xkb_symbols "htcdream" {
         include "inet(htcdream)"
-        name[Group1]= "English (USA)";
+        name[Group1]= "English (US)";
 
         //second row
         key <AD01> { [ q, Q, Tab, Tab ] };