Sync group names with layout names

53 files changed, 239 insertions, 239 deletions

diff --git a/symbols/brai b/symbols/brai
index 18ff0a04..2a7072d4 100644
--- a/symbols/brai
+++ b/symbols/brai
@@ -22,7 +22,7 @@ partial alphanumeric_keys
 xkb_symbols "left_hand" {
     include "brai(keypad)"
 
-    name[Group1]="Braille - Left hand";
+    name[Group1]="Braille (left hand)";
 
     key <AC03>	{ [ braille_dot_1 ] };
     key <AC02>	{ [ braille_dot_2 ] };
@@ -37,7 +37,7 @@ partial alphanumeric_keys
 xkb_symbols "right_hand" {
     include "brai(keypad)"
 
-    name[Group1]="Braille - Right hand";
+    name[Group1]="Braille (right hand)";
 
     key <AC07>	{ [ braille_dot_1 ] };
     key <AB05>	{ [ braille_dot_2 ] };
diff --git a/symbols/bw b/symbols/bw
index e69a6f0f..0baadbaa 100644
--- a/symbols/bw
+++ b/symbols/bw
@@ -3,7 +3,7 @@ xkb_symbols "tswana" {
 
     include "us"
 
-    name[Group1]= "Botswana";
+    name[Group1]= "Tswana";
         
     key <AC10> { [ semicolon,	    colon,  0x01000324,  0x01000324 ] };	//COMBINING DIAERESIS BELOW	
     key <AC11> { [apostrophe,    quotedbl,  0x01000301,  0x01000308 ] };	//COMBINING ACUTE ACCENT, COMBINING DIAERESIS
diff --git a/symbols/ch b/symbols/ch
index 83e8b485..d890c33a 100644
--- a/symbols/ch
+++ b/symbols/ch
@@ -4,7 +4,7 @@ xkb_symbols "basic" {
     include "latin"
 
     // Alphanumeric section
-    name[Group1]= "Switzerland";
+    name[Group1]= "German (Switzerland)";
     key <TLDE> { [    section,     degree                           ] };
     key <AE01> { [          1,       plus,          bar, exclamdown ] };
     key <AE02> { [          2,   quotedbl,           at, oneeighth  ] };
@@ -41,7 +41,7 @@ partial alphanumeric_keys
 xkb_symbols "legacy" {
     include "ch(basic)"
 
-    name[Group1]= "Switzerland - Legacy";
+    name[Group1]= "German (Switzerland, legacy)";
     key <AE07> { [          7,      slash,    brokenbar             ] };
 };
 
@@ -62,14 +62,14 @@ xkb_symbols "de_Sundeadkeys" {
 partial alphanumeric_keys 
 xkb_symbols "de_sundeadkeys" {
     include "ch(de_Sundeadkeys)"
-    name[Group1]= "Switzerland - German, Sun dead keys";
+    name[Group1]= "German (Switzerland, Sun dead keys)";
 };
 
 partial alphanumeric_keys 
 xkb_symbols "de_nodeadkeys" {
     // modify the basic Swiss German layout not to have any dead keys
     include "ch(basic)"
-    name[Group1]= "Switzerland - German, eliminate dead keys";
+    name[Group1]= "German (Switzerland, eliminate dead keys)";
     key <AE11> { [  apostrophe, question,        acute  ] };
     key <AE12> { [ asciicircum,    grave,   asciitilde  ] };
     key <AD12> { [   diaeresis,   exclam, bracketright  ] };
@@ -82,7 +82,7 @@ xkb_symbols "fr" {
     // keyboard and a very simple Swiss/French keybaord
 
     include "ch(basic)"
-    name[Group1]= "Switzerland - French";
+    name[Group1]= "French (Switzerland)";
 
     override key <AD11> {
 	[ egrave,	udiaeresis,	bracketleft	]
@@ -107,14 +107,14 @@ xkb_symbols "fr_Sundeadkeys" {
 partial alphanumeric_keys
 xkb_symbols "fr_sundeadkeys" {
     include "ch(fr_Sundeadkeys)"
-    name[Group1]= "Switzerland - French, Sun dead keys";
+    name[Group1]= "French (Switzerland, Sun dead keys)";
 };
 
 partial alphanumeric_keys
 xkb_symbols "fr_nodeadkeys" {
     // modify the basic Swiss French layout not to have any dead keys
     include "ch(fr)"
-    name[Group1]= "Switzerland - French, eliminate dead keys";
+    name[Group1]= "French (Switzerland, eliminate dead keys)";
     key <AE11> { [  apostrophe, question,        acute  ] };
     key <AE12> { [ asciicircum,    grave,   asciitilde  ] };
     key <AD12> { [   diaeresis,   exclam, bracketright  ] };
@@ -128,7 +128,7 @@ xkb_symbols "fr_nodeadkeys" {
 partial alphanumeric_keys
 xkb_symbols "de_mac" {
     
-    name[Group1]= "Switzerland - German (Macintosh)";
+    name[Group1]= "German (Switzerland, Macintosh)";
 
     // Alphanumeric section
 
@@ -199,7 +199,7 @@ xkb_symbols "fr_mac" {
     // keyboard and a very simple Swiss/French keybaord
 
     include "ch(de_mac)"
-    name[Group1]= "Switzerland - French (Macintosh)";
+    name[Group1]= "French (Switzerland, Macintosh)";
 
     override key <AD11> {
 	[ egrave,	udiaeresis,  bracketleft	]
diff --git a/symbols/epo b/symbols/epo
index 7ba965b0..84050111 100644
--- a/symbols/epo
+++ b/symbols/epo
@@ -48,7 +48,7 @@ xkb_symbols "basic" {
 partial alphanumeric_keys
 xkb_symbols "legacy" {
 
-  name[Group1]= "Esperanto - displaced semicolon and quote (obsolete)";
+  name[Group1]= "Esperanto (displaced semicolon and quote, obsolete)";
 
   key.type[Group1] = "FOUR_LEVEL";
 
diff --git a/symbols/es b/symbols/es
index 88b390d9..f8483bb2 100644
--- a/symbols/es
+++ b/symbols/es
@@ -7,7 +7,7 @@ xkb_symbols "basic" {
 
     include "latin(type4)"
 
-    name[Group1]="Spain";
+    name[Group1]="Spanish";
 
     key <AE01>	{ [         1,     exclam,          bar,   exclamdown ]	};
     key <AE03>	{ [         3, periodcentered, numbersign,   sterling ]	};
@@ -42,7 +42,7 @@ xkb_symbols "sundeadkeys" {
 
     include "es(Sundeadkeys)"
 
-    name[Group1]="Spain - Sun dead keys";
+    name[Group1]="Spanish (Sun dead keys)";
 };
 
 partial alphanumeric_keys
@@ -50,7 +50,7 @@ xkb_symbols "nodeadkeys" {
 
     include "es(basic)"
 
-    name[Group1]="Spain - Eliminate dead keys";
+    name[Group1]="Spanish (eliminate dead keys)";
 
     key <AD11>	{ [     grave, asciicircum,  bracketleft,      degree ]	};
     key <AD12>	{ [      plus,   asterisk, bracketright,       macron ]	};
@@ -64,7 +64,7 @@ xkb_symbols "nodeadkeys" {
 partial alphanumeric_keys
 xkb_symbols "dvorak" {
 
-    name[Group1]="Spain - Dvorak";
+    name[Group1]="Spanish (Dvorak)";
 
     // Alphanumeric section
     key <TLDE> {[  masculine, ordfeminine, backslash, degree		]};
@@ -127,7 +127,7 @@ xkb_symbols "cat" {
 
     include "es(basic)"
 
-    name[Group1]="Spain - Catalan variant with middle-dot L";
+    name[Group1]="Catalan (Spain, with middle-dot L)";
 
     key <AC09>  { [	    l,      L,		0x1000140,  0x100013F ] };
 };
@@ -137,7 +137,7 @@ xkb_symbols "ast" {
 
     include "es(basic)"
 
-    name[Group1]="Spain - Asturian variant with bottom-dot H and bottom-dot L";
+    name[Group1]="Asturian (Spain, with bottom-dot H and bottom-dot L)";
 
     key <AC06>  { [	    h,      H,		0x1001E25,  0x1001E24 ] };
     key <AC09>  { [	    l,      L,		0x1001E37,  0x1001E36 ] };
@@ -151,7 +151,7 @@ xkb_symbols "mac" {
     // keyboard and a very simple Spanish keybaord
 
     include "es"
-    name[Group1]= "Spain - Macintosh";
+    name[Group1]= "Spanish (Macintosh)";
 
 };
 
@@ -159,7 +159,7 @@ partial alphanumeric_keys
 xkb_symbols "olpc" {
 
     include "us(basic)"
-    name[Group1]="Spain";
+    name[Group1]="Spanish";
 
     key <TLDE> { [    masculine,    ordfeminine      ] };
     key <AE01> { [            1,         exclam,             bar ] };
@@ -196,7 +196,7 @@ xkb_symbols "deadtilde" {
 
     include "es(basic)"
 
-    name[Group1]="Spain - Include dead tilde";
+    name[Group1]="Spanish (include dead tilde)";
 
     key <AE04>	{ [         4,     dollar,   dead_tilde,       dollar ]	};
 };
@@ -208,7 +208,7 @@ xkb_symbols "olpc2" {
     // Contact: Sayamindu Dasgupta <sayamindu@laptop.org>
 
     include "us(olpc)"
-    name[Group1]="Spain - OLPC2";
+    name[Group1]="Spanish (OLPC2)";
 
     key <AE03> { [  3, numbersign,   dead_grave,  dead_grave] }; // combining grave
     key <I236>  { [ XF86Start ] };
diff --git a/symbols/et b/symbols/et
index 7d15967e..dccf9ca0 100644
--- a/symbols/et
+++ b/symbols/et
@@ -8,7 +8,7 @@
 partial default alphanumeric_keys
 xkb_symbols "basic" {
     include "et(olpc)"
-    name[Group1]="Ethiopia";
+    name[Group1]="Amharic";
 };
 
 partial alphanumeric_keys
diff --git a/symbols/gb b/symbols/gb
index 80fe4fa2..d460d3d6 100644
--- a/symbols/gb
+++ b/symbols/gb
@@ -10,7 +10,7 @@ xkb_symbols "basic" {
 
     include "latin"
 
-    name[Group1]="United Kingdom";
+    name[Group1]="English (UK)";
 
     key <AE02>	{ [         2,   quotedbl,  twosuperior,    oneeighth ]	};
     key <AE03>	{ [         3,   sterling, threesuperior,    sterling ]	};
@@ -41,7 +41,7 @@ xkb_symbols "intl" {
 
     include "latin" 
 
-    name[Group1]="United Kingdom - International (with dead keys)"; 
+    name[Group1]="English (UK, international with dead keys)"; 
 
     key <AE02>  { [   2,  dead_diaeresis,      twosuperior,     onehalf ] };
     key <AE03>  { [   3,        sterling,    threesuperior,    onethird ] };
@@ -59,7 +59,7 @@ xkb_symbols "intl" {
 
 partial alphanumeric_keys 
 xkb_symbols "extd" {
-    // Clone of the Microsoft "United Kingdom - Extended" layout, which
+    // Clone of the Microsoft "English (UK, Extended" layout, which
     // includes dead keys for: grave; diaeresis; circumflex; tilde; and
     // accute. It also enables direct access to accute characters using
     // the Multi_key (Alt Gr).
@@ -72,7 +72,7 @@ xkb_symbols "extd" {
 
     include "latin"
 
-    name[Group1]="United Kingdom - Extended - Winkeys";
+    name[Group1]="English (UK, extended WinKeys)";
     
     // Alphanumeric section
     key <TLDE> { [ dead_grave,    notsign,       brokenbar,    NoSymbol ] };
@@ -108,7 +108,7 @@ partial alphanumeric_keys
 xkb_symbols "colemak" {
     include "us(colemak)"
 
-    name[Group1]="United Kingdom - Colemak";
+    name[Group1]="English (UK, Colemak)";
 
     key <AE02>	{ [         2,   quotedbl,  twosuperior,    oneeighth ]	};
     key <AE03>	{ [         3,   sterling, threesuperior,    sterling ]	};
@@ -131,7 +131,7 @@ partial alphanumeric_keys
 xkb_symbols "dvorak" {
     include "us(dvorak-alt-intl)"
 
-    name[Group1]="United Kingdom - Dvorak";
+    name[Group1]="English (UK, Dvorak)";
 
     key <AD01> { [ apostrophe,	at		] };
     key <AE02> { [	    2,	quotedbl,  twosuperior,   NoSymbol	] };
@@ -146,7 +146,7 @@ partial alphanumeric_keys
 xkb_symbols "dvorakukp" {
     include "gb(dvorak)"
 
-    name[Group1]="United Kingdom - Dvorak (UK Punctuation)";
+    name[Group1]="English (UK, Dvorak with UK punctuation)";
 
     key <AE11> {        [     minus,    underscore      ]       };
     key <AE12> {        [     equal,    plus            ]       };
@@ -165,7 +165,7 @@ xkb_symbols "mac" {
 
     include "latin"
 
-    name[Group1]= "United Kingdom - Macintosh";
+    name[Group1]= "English (UK, Macintosh)";
 
     key <AE02> {	[               2,              at,         EuroSign	]	};
     key <AE03> {	[               3,        sterling,       numbersign	]	};
@@ -181,7 +181,7 @@ xkb_symbols "mac_intl" {
 
     include "latin" 
 
-    name[Group1]="United Kingdom - Macintosh (International)"; 
+    name[Group1]="English (UK, Macintosh international)"; 
 
     key <AE02>  { [   2,                       at,           EuroSign,    onehalf ] };
     key <AE03>  { [   3,                 sterling,        twosuperior,   onethird ] };
diff --git a/symbols/ie b/symbols/ie
index 93fffde9..070c9d9a 100644
--- a/symbols/ie
+++ b/symbols/ie
@@ -32,7 +32,7 @@ xkb_symbols "basic" {
     //  - non-breaking space as AltGr+Space and AltGr+Shift+Space
     //  - matches hardware (keys and engraved symbols) for Irish keyboards
 
-    name[Group1] = "Ireland";
+    name[Group1] = "Irish";
 
     //
     // Numeric row `1234567890-=
@@ -130,7 +130,7 @@ xkb_symbols "CloGaelach" {
 
     include "ie(basic)"
 
-    name[Group1] = "Ireland - CloGaelach";
+    name[Group1] = "CloGaelach";
 
     key <TLDE> { [     grave, notsign,  brokenbar,       ssharp ] };
     key <AD04> { [         r,       R,  0x100027C,   registered ] };
@@ -157,7 +157,7 @@ xkb_symbols "UnicodeExpert" {
 
 // This should eventually be a "Unicode Expert" layout like the Mac one.
 
-    name[Group1] = "Ireland - UnicodeExpert";
+    name[Group1] = "Irish (UnicodeExpert)";
 
     //
     // Numeric row `1234567890-=
@@ -247,7 +247,7 @@ xkb_symbols "UnicodeExpert" {
 partial alphanumeric_keys
 xkb_symbols "ogam" {
 
-    name[Group1] = "Ireland - Ogham";
+    name[Group1] = "Ogham";
 
     key.type[Group1] = "ONE_LEVEL";
 
@@ -315,7 +315,7 @@ xkb_symbols "ogam_is434" {
     // This has the full layout of IS434 with an Irish QWERTY keyboard,
     // and the Ogham characters accessed when CAPS LOCK is on.
 
-    name[Group1] = "Ireland - Ogham IS434";
+    name[Group1] = "Ogham (IS434)";
 
     key.type[Group1] = "THREE_LEVEL";
 
diff --git a/symbols/ir b/symbols/ir
index 94bdede2..0414d02d 100644
--- a/symbols/ir
+++ b/symbols/ir
@@ -251,7 +251,7 @@ xkb_symbols "ku_ara" {
 // Layout by Ernst Tremel, http://ubuntuforums.org/showpost.php?p=9365469&postcount=32
 // Creation of this file by Simos Xenitellis.
 
-partial default alphanumeric_keys
+partial alphanumeric_keys
 xkb_symbols "ave"
 {
 	name[Group1] = "Avestan";
diff --git a/symbols/jp b/symbols/jp
index 247965e5..5b5db626 100644
--- a/symbols/jp
+++ b/symbols/jp
@@ -5,7 +5,7 @@
 partial default alphanumeric_keys
 xkb_symbols "106" {
     include "jp(common)"
-    name[Group1]= "Japan";
+    name[Group1]= "Japanese";
 
     key <AE10> { [ 0, asciitilde	] };
     key <AE13> { [ backslash, bar 	] };
@@ -108,7 +108,7 @@ partial alphanumeric_keys
 xkb_symbols "OADG109A" {
 
     include "jp(common)"
-    name[Group1]= "Japan - OADG 109A";
+    name[Group1]= "Japanese (OADG 109A)";
 
     key <AE10> { [ 0		] };
     key <AE13> { [ yen, bar 	] };
@@ -124,7 +124,7 @@ xkb_symbols "kana86" {
     include "altwin(menu)"
     include "jp(kana)"
     include "jp(OADG109A)"
-    name[Group1]= "Japan - Kana 86";
+    name[Group1]= "Japanese (Kana 86)";
 
     key <ESC> {		[ Escape	]	};
     key <NMLK> {	[ Num_Lock, Pointer_EnableKeys		]	};
@@ -145,7 +145,7 @@ xkb_symbols "kana86" {
 partial alphanumeric_keys
 xkb_symbols "kana" {
 
-    name[Group1]= "Japan - Kana";
+    name[Group1]= "Japanese (Kana)";
 
     // Alphanumeric section
     key <HZTG> {
@@ -241,7 +241,7 @@ xkb_symbols "nicola_f_bs" {
 // Copied from macintosh_vndr/jp
 partial alphanumeric_keys
 xkb_symbols "mac" {
-    name[Group1]	= "Japan - Macintosh";
+    name[Group1]	= "Japanese (Macintosh)";
     include "jp(kana)"
 
     replace key <CAPS> { [ Caps_Lock ] };
diff --git a/symbols/ke b/symbols/ke
index 487cc78c..3ecf3de8 100644
--- a/symbols/ke
+++ b/symbols/ke
@@ -8,7 +8,7 @@ xkb_symbols "swa" {
 
     include "us"
 
-    name[Group1]= "Kenya";
+    name[Group1]= "Swahili (Kenya)";
     
     key <AC10> { [ semicolon,	    colon,  0x01000324,  0x01000324 ] };	//COMBINING DIAERESIS BELOW	
     key <AC11> { [apostrophe,    quotedbl,  0x01000301,  0x01000308 ] };	//COMBINING ACUTE ACCENT, COMBINING DIAERESIS
@@ -27,7 +27,7 @@ xkb_symbols "kik" {
 
     include "us"
 
-    name[Group1]= "Kenya - Kikuyu";
+    name[Group1]= "Kikuyu";
     
     key <AC10> { [ semicolon,	    colon,  0x01000324,  0x01000324 ] };	//COMBINING DIAERESIS BELOW	
     key <AC11> { [apostrophe,    quotedbl,  0x01000301,  0x01000308 ] };	//COMBINING ACUTE ACCENT, COMBINING DIAERESIS
diff --git a/symbols/kg b/symbols/kg
index d3f73f11..bb1b2d53 100644
--- a/symbols/kg
+++ b/symbols/kg
@@ -21,7 +21,7 @@
 partial default alphanumeric_keys
 xkb_symbols "basic" {
 
-    name[Group1]= "Kyrgyzstan";
+    name[Group1]= "Kyrgyz";
 
     key	<AE01> {	[		1,	    exclam 	]	};
     key	<AE02> {	[		2,        quotedbl	]	};
@@ -78,7 +78,7 @@ xkb_symbols "basic" {
 partial alphanumeric_keys
 xkb_symbols "phonetic" {
 
-    name[Group1]="Kyrgyzstan - Phonetic";
+    name[Group1]="Kyrgyz (phonetic)";
 
     key	<AE01> {	[		1,	    	exclam 			]	};
     key	<AE02> {	[		2,        	quotedbl		]	};
diff --git a/symbols/kh b/symbols/kh
index 8ad4a6c5..d93517a3 100644
--- a/symbols/kh
+++ b/symbols/kh
@@ -26,7 +26,7 @@
 
 partial default alphanumeric_keys
 xkb_symbols "basic" {
-    name[Group1]= "Cambodia";
+    name[Group1]= "Khmer (Cambodia)";
     
 // there are four levels defined:
 //
diff --git a/symbols/kr b/symbols/kr
index d065c0b8..464566cf 100644
--- a/symbols/kr
+++ b/symbols/kr
@@ -1,14 +1,14 @@
 default  alphanumeric_keys
 xkb_symbols "kr106" {
     include "us"
-    name[Group1]= "Korea, Republic of";
+    name[Group1]= "Korean";
     include "kr(koreankeys)"
 };
 
 alphanumeric_keys
 xkb_symbols "kr104" {
     include "us"
-    name[Group1]= "Korea, Republic of - 101/104 key Compatible";
+    name[Group1]= "Korean (101/104 key compatible)";
     include "kr(koreankeys)"
     include "kr(koreankeys_raltctl)"
 };
diff --git a/symbols/kz b/symbols/kz
index 53ffcb86..c6da615d 100644
--- a/symbols/kz
+++ b/symbols/kz
@@ -13,7 +13,7 @@
 partial default alphanumeric_keys 
 xkb_symbols "basic" {
 
-    name[Group1] = "Kazakhstan";
+    name[Group1] = "Kazakh";
 
 key.type[group1] = "FOUR_LEVEL";
 
@@ -77,7 +77,7 @@ key.type[group1]="TWO_LEVEL";
 partial alphanumeric_keys
 xkb_symbols "ruskaz" {
 
-    name[Group1] = "Kazakhstan - Russian with Kazakh";
+    name[Group1] = "Russian (Kazakhstan, with Kazakh)";
 
 key.type[group1] = "FOUR_LEVEL";
 
@@ -138,7 +138,7 @@ key.type[group1] = "FOUR_LEVEL_ALPHABETIC";
 partial alphanumeric_keys
 xkb_symbols "kazrus" {
 
-    name[Group1] = "Kazakhstan - Kazakh with Russian";
+    name[Group1] = "Kazakh (with Russian)";
 
 key.type[group1] = "FOUR_LEVEL";
 
@@ -206,7 +206,7 @@ xkb_symbols "olpc" {
 
    include "kz(basic)"
 
-   name[Group1] = "Kazakhstan";
+   name[Group1] = "Kazakh";
 
    key <TLDE> { [ parenleft,               parenright ] };
    key <BKSL> { [ Cyrillic_io,             Cyrillic_IO ] };
diff --git a/symbols/la b/symbols/la
index 31921e27..a174ddfc 100644
--- a/symbols/la
+++ b/symbols/la
@@ -7,7 +7,7 @@ xkb_symbols "basic" {
     // keyboard and a Lao keyboard
     // This keymap uses the Lao keyboard standard [kind of] widely used inLaos
 
-    name[Group1]= "Laos";
+    name[Group1]= "Lao";
 
     // Alphanumeric section
     key <TLDE> { [ 0x100200D			]};
@@ -87,7 +87,7 @@ xkb_symbols "stea" {
     // have been omitted.
 
 
-    name[Group1]= "Laos - STEA (proposed standard layout)";
+    name[Group1]= "Lao (STEA proposed standard layout)";
 
     // Alphanumeric section
     key <TLDE> { [  quotedbl,      apostrophe           	]};
diff --git a/symbols/latam b/symbols/latam
index fd17bd88..6cc9c685 100644
--- a/symbols/latam
+++ b/symbols/latam
@@ -6,7 +6,7 @@ xkb_symbols "basic" {
 
     include "latin(type4)"
 
-    name[Group1]="Latin American";
+    name[Group1]="Spanish (Latin American)";
 
     key <AE01>	{ [         1,     exclam,          bar,   exclamdown ]	};
     key <AE03>	{ [         3, numbersign, periodcentered,   sterling ]	};
@@ -38,7 +38,7 @@ xkb_symbols "Sundeadkeys" {
 partial alphanumeric_keys
 xkb_symbols "sundeadkeys" {
     include "latam(Sundeadkeys)"
-    name[Group1]="Latin American - Sun dead keys";
+    name[Group1]="Spanish (Latin American, Sun dead keys)";
 };
 
 partial alphanumeric_keys
@@ -46,7 +46,7 @@ xkb_symbols "nodeadkeys" {
 
     include "latam(basic)"
 
-    name[Group1]="Latin American - Eliminate dead keys";
+    name[Group1]="Spanish (Latin American, eliminate dead keys)";
 
     key <AE12>	{ [questiondown, exclamdown,    cedilla,       ogonek ]	};
     key <AD11>	{ [     grave, asciicircum, bracketleft,       degree ]	};
@@ -62,7 +62,7 @@ xkb_symbols "deadtilde" {
 
     include "latam(basic)"
 
-    name[Group1]="Latin American - Include dead tilde";
+    name[Group1]="Spanish (Latin American, include dead tilde)";
 
     key <AD12>	{ [      plus,   asterisk,   dead_tilde,  dead_macron ]	};
 };
diff --git a/symbols/lk b/symbols/lk
index 928781d0..c1a16abd 100644
--- a/symbols/lk
+++ b/symbols/lk
@@ -33,7 +33,7 @@ xkb_symbols "sin_phonetic" {
 
   include "us"
 // it is default - no details in the name
-  name[Group1] = "Sri Lanka";
+  name[Group1] = "Sinhala";
   key.type[Group1] = "FOUR_LEVEL";
 
   // q - p
@@ -80,12 +80,12 @@ xkb_symbols "sin_phonetic" {
 partial alphanumeric_keys
 xkb_symbols "tam_unicode" {
     include "in(tam_unicode)"
-    name[Group1]= "Sri Lanka - Tamil Unicode";
+    name[Group1]= "Tamil (Sri Lanka, Unicode)";
 };
 
 partial alphanumeric_keys
 xkb_symbols "tam_TAB" {
     include "in(tam_TAB)"
-    name[Group1]= "Sri Lanka - Tamil TAB Typewriter";
+    name[Group1]= "Tamil (Sri Lanka, TAB Typewriter)";
 };
 
diff --git a/symbols/lt b/symbols/lt
index c19629f9..8b243edc 100644
--- a/symbols/lt
+++ b/symbols/lt
@@ -14,7 +14,7 @@ xkb_symbols "basic" {
     include "eurosign(e)"
     include "level3(ralt_switch)"
 
-    name[Group1]="Lithuania";
+    name[Group1]="Lithuanian";
 
     key <TLDE> {[               grave,   asciitilde,    acute                ]};
     key <AE01> {[             aogonek,      Aogonek,        1,        exclam ]};
@@ -42,7 +42,7 @@ xkb_symbols "us" {
     include "eurosign(e)"
     include "level3(ralt_switch)"
 
-    name[Group1]="Lithuania - US keyboard with Lithuanian letters";
+    name[Group1]="Lithuanian (US keyboard with Lithuanian letters)";
 
     key <TLDE> {[    grave,    asciitilde,               acute               ]};
     key <AE01> {[        1,        exclam,             aogonek,      Aogonek ]};
@@ -78,7 +78,7 @@ xkb_symbols "std" {
     include "kpdl(comma)"
     include "level3(ralt_switch)"
 
-    name[Group1]="Lithuania - Standard";
+    name[Group1]="Lithuanian (standard)";
 
     key <TLDE> {[        grave,  asciitilde,               acute ]};
     key <AE01> {[       exclam,           1,                  at ]};
@@ -130,7 +130,7 @@ xkb_symbols "ibm" {
     include "nbsp(level3)"
     include "level3(ralt_switch)"
 
-    name[Group1]="Lithuania - IBM (LST 1205-92)";
+    name[Group1]="Lithuanian (IBM LST 1205-92)";
 
     key <TLDE> {[              grave,          asciitilde,          acute               ]};
     key <AE01> {[             exclam,                   1                               ]};
@@ -180,7 +180,7 @@ xkb_symbols "lekp" {
     include "capslock(backspace)"
     include "level3(ralt_switch)"
     
-    name[Group1]="Lithuania - LEKP";
+    name[Group1]="Lithuanian (LEKP)";
     
     key <TLDE> {[        grave,          asciitilde,         acute ]};
     key <AE01> {[        slash,          numbersign,           bar ]};
@@ -241,7 +241,7 @@ xkb_symbols "lekpa" {
     include "capslock(backspace)"
     include "level3(ralt_switch)"
 
-    name[Group1]="Lithuania - LEKPa";
+    name[Group1]="Lithuanian (LEKPa)";
 
     key <TLDE> {[        grave,          asciitilde,         acute ]};
     key <AE01> {[        slash,            quotedbl,           bar ]};
@@ -300,7 +300,7 @@ xkb_symbols "dvorak" {
 
     include "us(dvorak)"
 
-    name[Group1]="Lithuania - Dvorak";
+    name[Group1]="Lithuanian (Dvorak)";
 
     key <AE01>	{ [   aogonek,      Aogonek,        1,      exclam ] };
     key <AE02>	{ [    ccaron,       Ccaron,        2,          at ] };
diff --git a/symbols/lv b/symbols/lv
index b275fcfd..843efadc 100644
--- a/symbols/lv
+++ b/symbols/lv
@@ -29,7 +29,7 @@
 partial default alphanumeric_keys modifier_keys
 xkb_symbols "basic" {
 
-    name[Group1]= "Latvia";
+    name[Group1]= "Latvian";
 
         key <TLDE>      {[grave, asciitilde, acute, asciitilde]};
         key <AE01>      {[1, exclam, onesuperior, exclamdown]};
@@ -92,7 +92,7 @@ xkb_symbols "apostrophe" {
 
     include "lv(basic)"
 
-    name[Group1]= "Latvia - Apostrophe (') variant";
+    name[Group1]= "Latvian (apostrophe ' variant)";
 
 	key <AC11>	{[ISO_Level3_Latch, quotedbl, apostrophe, quotedbl]};
         key <SPCE>      {[space, space, apostrophe]};
@@ -105,7 +105,7 @@ xkb_symbols "tilde" {
 
     include "lv(basic)"
 
-    name[Group1]= "Latvia - Tilde (~) variant";
+    name[Group1]= "Latvian (tilde ~ variant)";
 
 	key <TLDE>	{[ISO_Level3_Latch, asciitilde, grave, acute]}; 
         key <SPCE>      {[space, space, asciitilde]};
@@ -118,7 +118,7 @@ xkb_symbols "fkey" {
 
     include "lv(basic)"
 
-    name[Group1]= "Latvia - F-letter (F) variant";
+    name[Group1]= "Latvian (F variant)";
 
         key <AC04>      {[ISO_Level3_Latch, ISO_Level3_Latch, f, F]};
         key <SPCE>      {[space, space, f, F]};
diff --git a/symbols/me b/symbols/me
index ffab5585..e898b9d7 100644
--- a/symbols/me
+++ b/symbols/me
@@ -6,47 +6,47 @@
 default partial alphanumeric_keys
 xkb_symbols "basic" {
   include "rs(latin)"
-  name[Group1]= "Montenegro";
+  name[Group1]= "Montenegrin";
 };
 
 
 partial alphanumeric_keys
 xkb_symbols "cyrillic" {
   include "rs(basic)"
-  name[Group1]= "Montenegro - Cyrillic";
+  name[Group1]= "Montenegrin (Cyrillic)";
 };
 
 
 partial alphanumeric_keys
 xkb_symbols "cyrillicyz" {
   include "rs(yz)"
-  name[Group1]= "Montenegro - Cyrillic, Z and ZHE swapped";
+  name[Group1]= "Montenegrin (Cyrillic, Z and ZHE swapped)";
 };
 
 partial alphanumeric_keys
 xkb_symbols "latinunicode" {
   include "rs(latinunicode)"
-  name[Group1]= "Montenegro - Latin unicode";
+  name[Group1]= "Montenegrin (Latin unicode)";
 };
 
 partial alphanumeric_keys
 xkb_symbols "latinyz" {
   include "rs(latinyz)"
-  name[Group1]= "Montenegro - Latin qwerty";
+  name[Group1]= "Montenegrin (Latin qwerty)";
 };
 
 partial alphanumeric_keys
 xkb_symbols "latinunicodeyz" {
   include "rs(latinunicodeyz)"
-  name[Group1]= "Montenegro - Latin unicode qwerty";
+  name[Group1]= "Montenegrin (Latin unicode qwerty)";
 };
 
 xkb_symbols "cyrillicalternatequotes" {
   include "rs(alternatequotes)"
-  name[Group1]= "Montenegro - Cyrillic with guillemets";
+  name[Group1]= "Montenegrin (Cyrillic with guillemets)";
 };
 
 xkb_symbols "latinalternatequotes" {
   include "rs(latinalternatequotes)"
-  name[Group1]= "Montenegro - Latin with guillemets";
+  name[Group1]= "Montenegrin (Latin with guillemets)";
 };
diff --git a/symbols/mk b/symbols/mk
index e7a84348..ec92c086 100644
--- a/symbols/mk
+++ b/symbols/mk
@@ -4,7 +4,7 @@
 
 partial default alphanumeric_keys
 xkb_symbols "basic" { 
-    name[Group1]= "Macedonia";
+    name[Group1]= "Macedonian";
 
     key <AB01> { [     Cyrillic_ze,     Cyrillic_ZE	]	};
     key <AC02> { [     Cyrillic_es,     Cyrillic_ES	]	};
@@ -60,6 +60,6 @@ xkb_symbols "basic" {
 partial alphanumeric_keys
 xkb_symbols "nodeadkeys" {
     include "mk(basic)"
-    name[Group1]= "Macedonia - Eliminate dead keys";
+    name[Group1]= "Macedonian (eliminate dead keys)";
     key <TLDE> { [           grave,      asciitilde ]   };
 };
diff --git a/symbols/ml b/symbols/ml
index 59bed0dd..a3a747c4 100644
--- a/symbols/ml
+++ b/symbols/ml
@@ -3,7 +3,7 @@ xkb_symbols "basic" {
 
     include "fr(basic)"
 
-    name[Group1]="Mali";
+    name[Group1]="Bambara";
 
     key <AB06>	{ [         n,          N,         U0272,       U019D ]	}; // n N ɲ Ɲ
     key <AC02>	{ [         s,          S,         U0161,       U0160 ]	}; // s S š Š
@@ -19,7 +19,7 @@ xkb_symbols "fr-oss" {
 
     include "fr(oss)"
 
-    name[Group1]="Mali - Français (France Alternative)";
+    name[Group1]="French (Mali, alternative)";
 
     // š Š on d replaces ë Ë
     // ɲ Ɲ on j replaces ü Ü
@@ -41,7 +41,7 @@ xkb_symbols "us-mac" {
 
     include "us(mac)"
 
-    name[Group1]="Mali - English (USA Macintosh)";
+    name[Group1]="English (Mali, US Macintosh)";
 
     // ž Ž on z replaces Ω ¸
     // ɛ Ɛ on a replaces å Å
@@ -64,7 +64,7 @@ xkb_symbols "us-intl" {
 
     include "us(intl)"
 
-    name[Group1]="Mali - English (USA International)";
+    name[Group1]="English (Mali, US international)";
 
     // ž Ž on x replaces
     // š Š on s replaces ß §
diff --git a/symbols/mm b/symbols/mm
index 074dfc89..8ab8f0de 100644
--- a/symbols/mm
+++ b/symbols/mm
@@ -1,6 +1,6 @@
 partial default alphanumeric_keys 
 xkb_symbols "basic" {
-    name[Group1]= "Myanmar";
+    name[Group1]= "Burmese";
 
     // Alphanumeric section
     key <TLDE> { [      U1050,      U100E,        grave,  asciitilde ] };
diff --git a/symbols/mn b/symbols/mn
index a838bd5e..279514a4 100644
--- a/symbols/mn
+++ b/symbols/mn
@@ -6,7 +6,7 @@
 partial default alphanumeric_keys
 xkb_symbols "basic" {
 
-  name[Group1]= "Mongolia";
+  name[Group1]= "Mongolian";
 
   key <TLDE> { [ equal,       	   plus,  		degree          ] };
   key <AE01> { [ 1,                numerosign,        	multiply        ] };
diff --git a/symbols/mt b/symbols/mt
index dd5fd180..d42064a0 100644
--- a/symbols/mt
+++ b/symbols/mt
@@ -6,7 +6,7 @@ xkb_symbols "basic" {
 
     include "latin"
 
-    name[Group1]="Malta";
+    name[Group1]="Maltese";
 
     // Copied from GB layout
     key <AE02> { [         2,   quotedbl,  twosuperior,    oneeighth ] };
@@ -48,7 +48,7 @@ xkb_symbols "us" {
     // Describes the differences between the mt
     // keyboard and a US-based physical keyboard
 
-    name[Group1]="Malta - Maltese keyboard with US layout";
+    name[Group1]="Maltese (with US layout)";
 
     // The following four sets are the four additional letters, with the US
     // equivalents
diff --git a/symbols/mv b/symbols/mv
index 1d6b857e..ed530612 100644
--- a/symbols/mv
+++ b/symbols/mv
@@ -6,7 +6,7 @@
 partial default alphanumeric_keys
 xkb_symbols "basic" {
 
-    name[Group1]="Maldives";
+    name[Group1]="Dhivehi";
 
 // The key <TLDE> should have the same values as US_en keyboard
 
diff --git a/symbols/ng b/symbols/ng
index 03f759eb..ecf5be79 100644
--- a/symbols/ng
+++ b/symbols/ng
@@ -3,7 +3,7 @@ xkb_symbols "basic" {
 
     include "us"
 
-    name[Group1]= "Nigeria";
+    name[Group1]= "English (Nigeria)";
     key <AE04> { [          4, 0x010020A6,     dollar,       cent ] };
     include "level3(ralt_switch)"
 };
@@ -12,7 +12,7 @@ partial alphanumeric_keys
 xkb_symbols "yoruba" {
     include "ng(basic)"
 
-    name[Group1]= "Nigeria - Yoruba";
+    name[Group1]= "Yoruba";
 
     key <AD01> { [ 0x01001EB9, 0x01001EB8,          q,          Q ] };
     key <AB02> { [ 0x01001ECD, 0x01001ECC,          x,          X ] }; 
@@ -23,7 +23,7 @@ partial alphanumeric_keys
 xkb_symbols "igbo" {
     include "ng(basic)"
 
-    name[Group1]= "Nigeria - Igbo";
+    name[Group1]= "Igbo";
 
     key <AD01> { [ 0x01001ECB, 0x01001ECA,          q,          Q ] };
     key <AB02> { [ 0x01001E45, 0x01001E44,          x,          X ] }; 
@@ -35,7 +35,7 @@ partial alphanumeric_keys
 xkb_symbols "hausa" {
     include "ng(basic)"
 
-    name[Group1]= "Nigeria - Hausa";
+    name[Group1]= "Hausa";
 
     key <AD01> { [ 0x01000071, 0x01000051,          q,          Q ] };
     key <AD02> { [ udiaeresis, Udiaeresis,          w,          W ] };
diff --git a/symbols/no b/symbols/no
index 2a6c7c25..83ad9f08 100644
--- a/symbols/no
+++ b/symbols/no
@@ -9,7 +9,7 @@ xkb_symbols "basic" {
 
     include "latin(type2)"
 
-    name[Group1]="Norway";
+    name[Group1]="Norwegian";
 
     key <AB09>	{ [    period,      colon, ellipsis,   periodcentered ]	};
     key <AB10>	{ [     minus, underscore,       endash,       emdash ]	};
@@ -42,7 +42,7 @@ xkb_symbols "nodeadkeys" {
 
     include "no(basic)"
 
-    name[Group1]="Norway - Eliminate dead keys";
+    name[Group1]="Norwegian (eliminate dead keys)";
 
     key <AE12>	{ [ backslash,      grave,        acute,       ogonek ]	};
     key <AD12>	{ [ diaeresis, asciicircum,   asciitilde,      macron ]	};
@@ -57,7 +57,7 @@ partial alphanumeric_keys
 xkb_symbols "dvorak" {
     include "us(dvorak)"
 
-    name[Group1]="Norway - Dvorak";
+    name[Group1]="Norwegian (Dvorak)";
 
     key <TLDE> { [	  bar,	section, brokenbar, paragraph	] };
 
@@ -118,7 +118,7 @@ partial alphanumeric_keys
 xkb_symbols "smi" {
     include "latin"
 
-    name[Group1]= "Norway - Northern Saami";
+    name[Group1]= "Saami (Norway)";
 
     key <AE01>	{ [         1,     exclam,    copyright,   exclamdown ]	};
     key <AE02>	{ [         2,   quotedbl,           at,   registered ]	};
@@ -181,7 +181,7 @@ xkb_symbols "smi_nodeadkeys" {
 
     include "no(smi)"
 
-    name[Group1]= "Norway - Northern Saami, eliminate dead keys";
+    name[Group1]= "Saami (Norway, eliminate dead keys)";
 
     key <AE12>	{ [ backslash,      grave,        acute,       ogonek ]	};
 };
@@ -194,7 +194,7 @@ xkb_symbols "mac" {
     // keyboard and a very simple Norwegian keybaord
 
     include "latin(type4)"
-    name[Group1]= "Norway - Macintosh";
+    name[Group1]= "Norwegian (Macintosh)";
 
     key <TLDE>	{ [       bar,    section     ]	};
     key <AE03>	{ [         3, numbersign,     sterling,     sterling ]	};
@@ -218,7 +218,7 @@ xkb_symbols "mac_nodeadkeys" {
 
     // Modifies the basic Norwegian layout to eliminate dead keys
     include "no(mac)"
-    name[Group1]= "Norway - Macintosh, eliminate dead keys";
+    name[Group1]= "Norwegian (Macintosh, eliminate dead keys)";
 
     key <AE12>	{ [      grave,     acute,        acute,       ogonek ]	};
     key <AD12>	{ [  diaeresis, asciicircum, asciitilde,       macron ]	};
diff --git a/symbols/np b/symbols/np
index e139b0ff..eb8e54ad 100644
--- a/symbols/np
+++ b/symbols/np
@@ -3,7 +3,7 @@
 partial default alphanumeric_keys 
 xkb_symbols "basic" {
 
-      name[Group1]= "Nepal";
+      name[Group1]= "Nepali";
 
 // `,1,2,3,4,5,6,7,8,9,0,-,=
 
diff --git a/symbols/ph b/symbols/ph
index fd522980..7b294948 100644
--- a/symbols/ph
+++ b/symbols/ph
@@ -44,7 +44,7 @@
 partial default alphanumeric_keys
 xkb_symbols "basic" {
 
-    name[Group1]= "Philippines";
+    name[Group1]= "Filipino";
 
 //	ISO grouping:	|--------- Group1 ---------|	|--------- Group2 ---------|
 //			Level1		Level2		Level3		Level4
@@ -139,7 +139,7 @@ xkb_symbols "basic" {
 partial alphanumeric_keys
 xkb_symbols "qwerty-bay" {
 
-    name[Group1]= "Philippines - QWERTY (Baybayin)";
+    name[Group1]= "Filipino (QWERTY Baybayin)";
 
 //	ISO grouping:	|--------- Group1 ---------|	|--------- Group2 ---------|
 //			Level1		Level2		Level3		Level4
@@ -235,7 +235,7 @@ xkb_symbols "qwerty-bay" {
 partial alphanumeric_keys
 xkb_symbols "capewell-dvorak" {
 
-    name[Group1]= "Philippines - Capewell-Dvorak (Latin)";
+    name[Group1]= "Filipino (Capewell-Dvorak Latin)";
 
 //	ISO grouping:	|--------- Group1 ---------|	|--------- Group2 ---------|
 //			Level1		Level2		Level3		Level4
@@ -330,7 +330,7 @@ xkb_symbols "capewell-dvorak" {
 partial alphanumeric_keys
 xkb_symbols "capewell-dvorak-bay" {
 
-    name[Group1]= "Philippines - Capewell-Dvorak (Baybayin)";
+    name[Group1]= "Filipino (Capewell-Dvorak Baybayin)";
 
 //	ISO grouping:	|--------- Group1 ---------|	|--------- Group2 ---------|
 //			Level1		Level2		Level3		Level4
@@ -426,7 +426,7 @@ xkb_symbols "capewell-dvorak-bay" {
 partial alphanumeric_keys
 xkb_symbols "capewell-qwerf2k6" {
 
-    name[Group1]= "Philippines - Capewell-QWERF 2006 (Latin)";
+    name[Group1]= "Filipino (Capewell-QWERF 2006 Latin)";
 
 //	ISO grouping:	|--------- Group1 ---------|	|--------- Group2 ---------|
 //			Level1		Level2		Level3		Level4
@@ -521,7 +521,7 @@ xkb_symbols "capewell-qwerf2k6" {
 partial alphanumeric_keys
 xkb_symbols "capewell-qwerf2k6-bay" {
 
-    name[Group1]= "Philippines - Capewell-QWERF 2006 (Baybayin)";
+    name[Group1]= "Filipino (Capewell-QWERF 2006 Baybayin)";
 
 //	ISO grouping:	|--------- Group1 ---------|	|--------- Group2 ---------|
 //			Level1		Level2		Level3		Level4
@@ -617,7 +617,7 @@ xkb_symbols "capewell-qwerf2k6-bay" {
 partial alphanumeric_keys
 xkb_symbols "colemak" {
 
-    name[Group1]= "Philippines - Colemak (Latin)";
+    name[Group1]= "Filipino (Colemak Latin)";
 
 //	ISO grouping:	|--------- Group1 ---------|	|--------- Group2 ---------|
 //			Level1		Level2		Level3		Level4
@@ -712,7 +712,7 @@ xkb_symbols "colemak" {
 partial alphanumeric_keys
 xkb_symbols "colemak-bay" {
 
-    name[Group1]= "Philippines - Colemak (Baybayin)";
+    name[Group1]= "Filipino (Colemak Baybayin)";
 
 //	ISO grouping:	|--------- Group1 ---------|	|--------- Group2 ---------|
 //			Level1		Level2		Level3		Level4
@@ -808,7 +808,7 @@ xkb_symbols "colemak-bay" {
 partial alphanumeric_keys
 xkb_symbols "dvorak" {
 
-    name[Group1]= "Philippines - Dvorak (Latin)";
+    name[Group1]= "Filipino (Dvorak Latin)";
 
 //	ISO grouping:	|--------- Group1 ---------|	|--------- Group2 ---------|
 //			Level1		Level2		Level3		Level4
@@ -903,7 +903,7 @@ xkb_symbols "dvorak" {
 partial alphanumeric_keys
 xkb_symbols "dvorak-bay" {
 
-    name[Group1]= "Philippines - Dvorak (Baybayin)";
+    name[Group1]= "Filipino (Dvorak Baybayin)";
 
 //	ISO grouping:	|--------- Group1 ---------|	|--------- Group2 ---------|
 //			Level1		Level2		Level3		Level4
diff --git a/symbols/pk b/symbols/pk
index 9e40345c..abf2f669 100644
--- a/symbols/pk
+++ b/symbols/pk
@@ -10,7 +10,7 @@
 partial default alphanumeric_keys
 xkb_symbols "urd-phonetic" {
 
-   name[Group1]= "Pakistan";
+   name[Group1]= "Urdu (Pakistan)";
 
    key <TLDE> {  [     0x100064b  ,       0x100007E, 0x100200C     ]     };
    key <AE01> {  [     0x1000031  ,       0x1000021      ]     };
@@ -73,7 +73,7 @@ xkb_symbols "urd-phonetic" {
 partial alphanumeric_keys
 xkb_symbols "urd-crulp" {
 
-   name[Group1]= "Pakistan - CRULP";
+   name[Group1]= "Urdu (Pakistan, CRULP)";
 // www.crulp.org phonetic v1.1
 
    key <TLDE> {  [     0x100007E  ,       0x100064B      ]     };
@@ -137,7 +137,7 @@ xkb_symbols "urd-crulp" {
 
 partial alphanumeric_keys
 xkb_symbols "urd-nla" {
-   name[Group1]= "Pakistan - NLA";
+   name[Group1]= "Urdu (Pakistan, NLA)";
 // www.nla.gov.pk
 
    key <TLDE> {  [     0x1000060  ,       0x100007E, 0x100200C     ]     };
@@ -199,7 +199,7 @@ xkb_symbols "urd-nla" {
 
 partial alphanumeric_keys
 xkb_symbols "snd" {
-   name[Group1]= "Pakistan - Sindhi";
+   name[Group1]= "Sindhi";
 // www.bhurgri.com
 
      key <TLDE> {  [       0x1002019,       0x1002018                 ]       };
@@ -260,7 +260,7 @@ xkb_symbols "snd" {
 
 partial alphanumeric_keys
 xkb_symbols "ara" {
-   name[Group1]= "Pakistan - Arabic";
+   name[Group1]= "Arabic (Pakistan)";
 
 // NOTES:
 //
@@ -331,7 +331,7 @@ xkb_symbols "olpc" {
 
    include "pk(ara)"
 
-   name[Group1]= "Pakistan";
+   name[Group1]= "Urdu (Pakistan)";
 
    // Keys '~' - '='
    key <TLDE> {  [ 0x1000654, 0x100064B ] };
diff --git a/symbols/pl b/symbols/pl
index 944ddb0a..12f3e012 100644
--- a/symbols/pl
+++ b/symbols/pl
@@ -5,7 +5,7 @@ xkb_symbols "basic" {
 
     include "latin"
 
-    name[Group1]="Poland";
+    name[Group1]="Polish";
 
     key <AD01>  { [         q,          Q ] };
     key <AD02>  { [         w,          W ] };
@@ -34,7 +34,7 @@ xkb_symbols "qwertz" {
 
     include "latin(type3)"
 
-    name[Group1]="Poland - qwertz";
+    name[Group1]="Polish (qwertz)";
 
     key <AE01>	{ [         1,     exclam,   asciitilde,   exclamdown ]	};
     key <AE02>	{ [         2,   quotedbl,   dead_caron,    oneeighth ]	};
@@ -87,7 +87,7 @@ partial alphanumeric_keys
 xkb_symbols "dvorak" {
     include "us(dvorak)"
     
-    name[Group1] = "Poland - Dvorak";
+    name[Group1] = "Polish (Dvorak)";
 
     key <AD08> { [	    c,	C,	cacute,	Cacute		]	};
     key <AD10> { [	    l,	L,     lstroke, Lstroke		]	};
@@ -113,7 +113,7 @@ partial alphanumeric_keys
 xkb_symbols "dvorak_quotes" {
     include "pl(dvorak)"
     
-    name[Group1] = "Poland - Dvorak, Polish quotes on quotemark key";
+    name[Group1] = "Polish (Dvorak, Polish quotes on quotemark key)";
 
     key <AD01> { [  apostrophe,	quotedbl, doublelowquotemark, rightdoublequotemark	] };
 
@@ -126,7 +126,7 @@ partial alphanumeric_keys
 xkb_symbols "dvorak_altquotes" {
     include "pl(dvorak)"
 
-    name[Group1] = "Poland - Dvorak, Polish quotes on key 1";
+    name[Group1] = "Polish (Dvorak, Polish quotes on key 1)";
 
     key <AE01> { [	    1,	exclam, doublelowquotemark, rightdoublequotemark	]	};
 };
@@ -161,7 +161,7 @@ partial alphanumeric_keys
 xkb_symbols "dvp" {
     include "us(dvp)"
 
-    name[Group1] = "Poland - Programmer Dvorak";
+    name[Group1] = "Polish (programmer Dvorak)";
 
     //             Unmodified    Shift           AltGr            Shift+AltGr
     // symbols row, left side
@@ -211,7 +211,7 @@ xkb_symbols "csb" {
 
     include "latin"
 
-    name[Group1]="Poland - Kashubian";
+    name[Group1]="Kashubian";
 
     key <AD01>  { [         q,          Q ] };
     key <AD02>  { [         w,          W ] };
@@ -312,7 +312,7 @@ partial alphanumeric_keys
 xkb_symbols "ru_phonetic_dvorak" {
    include "us(dvorak)"
 
-   name[Group1] = "Poland - Russian phonetic Dvorak";
+   name[Group1] = "Russian (Poland, phonetic Dvorak)";
 
    // lower row
    key <AB02> { [ Cyrillic_ya, Cyrillic_YA ] };
diff --git a/symbols/pt b/symbols/pt
index e4472d1e..d55af93b 100644
--- a/symbols/pt
+++ b/symbols/pt
@@ -47,7 +47,7 @@ xkb_symbols "nodeadkeys" {
 
     include "pt(basic)" // for consistent naming
 
-    name[Group1]="Portugal - Eliminate dead keys";
+    name[Group1]="Portuguese (eliminate dead keys)";
 
     key <AE12>	{ [guillemotleft, guillemotright, cedilla,     ogonek ]	};
     key <AD11>	{ [      plus,   asterisk,     quotedbl,     quotedbl ]	};
@@ -67,7 +67,7 @@ xkb_symbols "mac" {
     // keyboard and a very simple Portuguese keybaord
 
     include "pt"
-    name[Group1]= "Portugal - Macintosh";
+    name[Group1]= "Portuguese (Macintosh)";
 
     key <AE06>	{ [         6,  ampersand, threequarters, fiveeighths ]	};
     key <AE08>	{ [         8,  parenleft,  bracketleft,    braceleft ]	};
@@ -82,7 +82,7 @@ xkb_symbols "mac" {
 partial alphanumeric_keys 
 xkb_symbols "mac_sundeadkeys" {
     include "pt(mac)"
-    name[Group1]= "Portugal - Macintosh, Sun dead keys";
+    name[Group1]= "Portuguese (Macintosh, Sun dead keys)";
     
     key <AE12> {	[	     plus,        asterisk,  dead_diaeresis, dead_diaeresis      ]	};
     key <AC11> {	[     dead_tilde,    dead_circumflex	]	};
@@ -92,7 +92,7 @@ xkb_symbols "mac_sundeadkeys" {
 partial alphanumeric_keys 
 xkb_symbols "mac_nodeadkeys" {
     include "pt(mac)"
-    name[Group1]= "Portugal - Macintosh, eliminate dead keys";
+    name[Group1]= "Portuguese (Macintosh, eliminate dead keys)";
 
     key <AE12> {	[	     plus,        asterisk, 	 quotedbl,        quotedbl      ]	};
     key <AC11> {	[      asciitilde,     asciicircum	]	};
@@ -110,7 +110,7 @@ xkb_symbols "mac_nodeadkeys" {
 partial alphanumeric_keys
 xkb_symbols "nativo" {
 
-    name[Group1]="Portugal - Nativo";
+    name[Group1]="Portuguese (Nativo)";
 
 // Numeric row
     key <TLDE> { [         plus,        asterisk,       dead_diaeresis,        plusminus ] };
@@ -186,7 +186,7 @@ partial alphanumeric_keys
 xkb_symbols "nativo-us" {
     include "pt(nativo)"
 
-    name[Group1]="Portugal - Nativo for USA keyboards";
+    name[Group1]="Portuguese (Nativo for USA keyboards)";
 
 // Lower row
     key <AB01> { [            y,               Y,              ccedilla,        Ccedilla ] };
@@ -205,7 +205,7 @@ partial alphanumeric_keys
 xkb_symbols "nativo-epo" {
     include "pt(nativo)"
 
-    name[Group1]="Portugal - Nativo for Esperanto";
+    name[Group1]="Esperanto (Portugal, Nativo)";
 
 // Upper row Esperanto
     key <AD04> { [            h,               H,          hcircumflex,      Hcircumflex ] };
diff --git a/symbols/ro b/symbols/ro
index 1d405a76..58e58c56 100644
--- a/symbols/ro
+++ b/symbols/ro
@@ -25,7 +25,7 @@ xkb_symbols "basic" {
 
     include "us"
 
-    name[Group1]="Romania";
+    name[Group1]="Romanian";
 
     key <AE01> { [ 1,                 exclam,  dead_tilde		  ] };
     key <AE02> { [ 2,                     at,  dead_caron		  ] };
@@ -67,7 +67,7 @@ xkb_symbols "cedilla" {
 
     include "ro(basic)"
 
-    name[Group1]="Romania - Cedilla";
+    name[Group1]="Romanian (cedilla)";
 
     key <AD05> { [ t,                      T,  tcedilla,	 Tcedilla ] };
     key <AC02> { [ s,                      S,  scedilla,	 Scedilla ] };
@@ -82,7 +82,7 @@ xkb_symbols "std" {
 
     include "us"
 
-    name[Group1]="Romania - Standard";
+    name[Group1]="Romanian (standard)";
 
     key <TLDE> { [ doublelowquotemark, rightdoublequotemark, grave, asciitilde ] };
     key <AE01> { [ 1,                 exclam,  dead_tilde		  ] };
@@ -126,7 +126,7 @@ xkb_symbols "std_cedilla" {
 
     include "ro(std)"
 
-    name[Group1]="Romania - Standard (Cedilla)";
+    name[Group1]="Romanian (standard cedilla)";
 
     key <AC10> { [ scedilla, 	    Scedilla ] };
     key <AC11> { [ tcedilla, 	    Tcedilla ] };
@@ -141,7 +141,7 @@ xkb_symbols "winkeys" {
 
     include "latin"
 
-    name[Group1]="Romania - Winkeys";
+    name[Group1]="Romanian (WinKeys)";
 
     // Alphanumeric section
     key <TLDE> { [ bracketright, bracketleft            ]       };
@@ -202,7 +202,7 @@ xkb_symbols "crh_dobruja" {
 
     include "tr(crh)"
 
-    name[Group1]="Romania - Crimean Tatar (Dobruja Q)";
+    name[Group1]="Crimean Tatar (Dobruja Q)";
 
     key <AD02>	{ [         w,          W,         abreve,         Abreve ] };
     key <AD05>	{ [         t,          T,      0x100021b,      0x100021a ] };
@@ -224,7 +224,7 @@ xkb_symbols "ergonomic" {
 
     include "ro(basic)"
 
-    name[Group1]="Romania - Ergonomic Touchtype";
+    name[Group1]="Romanian (ergonomic Touchtype)";
 
     key <AD01> { [ abreve,            Abreve,  q,                       Q ] };
     key <AD02> { [ 0x1000219,      0x1000218,  w,                       W ] };
diff --git a/symbols/rs b/symbols/rs
index d4628852..71541bcb 100644
--- a/symbols/rs
+++ b/symbols/rs
@@ -16,7 +16,7 @@
 default partial alphanumeric_keys
 xkb_symbols "basic" {
 
-  name[Group1]= "Serbia";
+  name[Group1]= "Serbian";
 
   include "rs(cyrlevel3)"
   include "rs(common)"
@@ -28,7 +28,7 @@ xkb_symbols "basic" {
 partial alphanumeric_keys
 xkb_symbols "latin" {
 
-  name[Group1]= "Serbia - Latin";
+  name[Group1]= "Serbian (Latin)";
 
   include "latin(type3)"
   include "rs(latalpha)"
@@ -42,7 +42,7 @@ partial alphanumeric_keys
 xkb_symbols "yz" {
   // Cyrillic_zhe and Cyrillic_ze swapped.
 
-  name[Group1]= "Serbia - Z and ZHE swapped";
+  name[Group1]= "Serbian (Z and ZHE swapped)";
 
   include "rs(basic)"
 
@@ -247,7 +247,7 @@ xkb_symbols "latinunicode" {
   // This mapping supports the Unicode characters 0x1c4-0x1cc (dz, lj, and nj
   // as single character). You get the title form with AltGr+Shift.
 
-  name[Group1]= "Serbia - Latin Unicode";
+  name[Group1]= "Serbian (Latin Unicode)";
 
   include "rs(latin)"
   include "rs(twoletter)"
@@ -257,7 +257,7 @@ partial alphanumeric_keys
 xkb_symbols "latinyz" {
   // For those who insist on using "english-position" Z and Y.
 
-  name[Group1]= "Serbia - Latin qwerty";
+  name[Group1]= "Serbian (Latin qwerty)";
 
   include "rs(latin)"
 
@@ -269,7 +269,7 @@ partial alphanumeric_keys
 xkb_symbols "latinunicodeyz" {
   // Unicode, ZHE and Z swapped.
 
-  name[Group1]= "Serbia - Latin Unicode qwerty";
+  name[Group1]= "Serbian (Latin Unicode qwerty)";
 
   include "rs(latinunicode)"
 
@@ -280,7 +280,7 @@ xkb_symbols "latinunicodeyz" {
 xkb_symbols "alternatequotes" {
   // Another acceptable »pair of quotes« for Serbian 
 
-  name[Group1]= "Serbia - With guillemets";
+  name[Group1]= "Serbian (with guillemets)";
 
   include "rs(basic)"
 
@@ -291,7 +291,7 @@ xkb_symbols "alternatequotes" {
 xkb_symbols "latinalternatequotes" {
   // Another acceptable »pair of quotes« for Serbian 
 
-  name[Group1]= "Serbia - Latin with guillemets";
+  name[Group1]= "Serbian (Latin with guillemets)";
 
   include "rs(latin)"
 
@@ -304,7 +304,7 @@ xkb_symbols "rue" {
   // Croatia by the Rusyn people), based on Ukrainian homophonic.
   // Author: Ljubomir J. Papuga (Любомир Я. Папуґа) <papuga.rs@gmail.com>
 
-  name[Group1]= "Serbia - Pannonian Rusyn Homophonic";
+  name[Group1]= "Pannonian Rusyn (homophonic)";
 
   include "ua(homophonic)"
 
@@ -332,7 +332,7 @@ xkb_symbols "combiningkeys" {
   // Raw combining characters instead of dead keys,
   // especially good for post-accenting texts.
 
-  name[Group1]= "Serbia - Combining accents instead of dead keys";
+  name[Group1]= "Serbian (combining accents instead of dead keys)";
 
   include "rs(basic)"
 
diff --git a/symbols/ru b/symbols/ru
index 79323ca8..7cbb28f4 100644
--- a/symbols/ru
+++ b/symbols/ru
@@ -9,7 +9,7 @@ partial default alphanumeric_keys
 xkb_symbols "winkeys" {
     include "ru(common)"
 
-    name[Group1]= "Russia";
+    name[Group1]= "Russian";
 
     key <AE03> {        [               3,      numerosign      ]       };
     key <AE04> {        [               4,       semicolon      ]       };
@@ -84,7 +84,7 @@ partial alphanumeric_keys
 xkb_symbols "legacy" {
     include "ru(common)"
 
-    name[Group1]= "Russia - Legacy";
+    name[Group1]= "Russian (legacy)";
 };
 
 partial alphanumeric_keys
@@ -106,7 +106,7 @@ xkb_symbols "olpc" {
 partial alphanumeric_keys
 xkb_symbols "typewriter" {
     include "ru(common)"
-    name[Group1]= "Russia - Typewriter";
+    name[Group1]= "Russian (typewriter)";
     key	<TLDE> {	[	      bar,	      plus	] 	};
     key	<AE01> {	[      numerosign,		 1 	]	};
     key	<AE02> {	[           minus,		 2	]	};
@@ -130,7 +130,7 @@ xkb_symbols "typewriter" {
 partial alphanumeric_keys
 xkb_symbols "typewriter-legacy" {
     include "ru(common)"
-    name[Group1]= "Russia - Typewriter, legacy";
+    name[Group1]= "Russian (typewriter, legacy)";
     key	<TLDE> {	[      apostrophe,	  quotedbl	] 	};
     key	<AE01> {	[	   exclam,		 1 	]	};
     key	<AE02> {	[      numerosign,		 2	]	};
@@ -151,7 +151,7 @@ xkb_symbols "typewriter-legacy" {
 partial alphanumeric_keys
 xkb_symbols "phonetic" {
 
-    name[Group1]= "Russia - Phonetic";
+    name[Group1]= "Russian (phonetic)";
 
     key	<AE01> {	[		1,	    exclam 	]	};
     key	<AE02> {	[		2,        	at	]	};
@@ -210,7 +210,7 @@ partial alphanumeric_keys
 xkb_symbols "phonetic_winkeys" {
 
     include "ru(phonetic)"
-    name[Group1]= "Russia - Phonetic Winkeys";
+    name[Group1]= "Russian (phonetic WinKeys)";
 
     key	<LatX> {	[     Cyrillic_ha,     Cyrillic_HA	]	};
     key	<LatH> {	[     Cyrillic_che,     Cyrillic_CHE	]	};
@@ -221,7 +221,7 @@ xkb_symbols "phonetic_winkeys" {
 partial alphanumeric_keys
 xkb_symbols "tt" {
     include "ru(winkeys)"
-    name[Group1]= "Russia - Tatar";
+    name[Group1]= "Tatar";
 
     key.type[group1]="FOUR_LEVEL";
 
@@ -246,7 +246,7 @@ partial alphanumeric_keys
 xkb_symbols "os_legacy" {
     include "ru(common)"
 
-    name[Group1]= "Russia - Ossetian, legacy";
+    name[Group1]= "Ossetian (legacy)";
 
     key	<TLDE> {	[      Cyrillic_e,      Cyrillic_E	]	};
     key	<AC07> {	[      Cyrillic_o,	Cyrillic_O, Cyrillic_io, Cyrillic_IO	]	};
@@ -257,7 +257,7 @@ partial alphanumeric_keys
 xkb_symbols "os_winkeys" {
     include "ru(winkeys)"
 
-    name[Group1]= "Russia - Ossetian, Winkeys";
+    name[Group1]= "Ossetian (WinKeys)";
 
     key	<TLDE> {	[      Cyrillic_e,      Cyrillic_E	]	};
     key	<AC07> {	[      Cyrillic_o,	Cyrillic_O, Cyrillic_io, Cyrillic_IO	]	};
@@ -268,7 +268,7 @@ partial alphanumeric_keys
 xkb_symbols "cv" {
     include "ru(winkeys)"
 
-    name[Group1]= "Russia - Chuvash";
+    name[Group1]= "Chuvash";
 
     key.type[group1]="FOUR_LEVEL";
 
@@ -288,7 +288,7 @@ partial alphanumeric_keys
 xkb_symbols "udm" {
     include "ru(winkeys)"
 
-    name[Group1]= "Russia - Udmurt";
+    name[Group1]= "Udmurt";
 
     key.type[group1]="FOUR_LEVEL";
 
@@ -310,7 +310,7 @@ partial alphanumeric_keys
 xkb_symbols "cv_latin" {
     include "us(alt-intl)"
 
-    name[Group1]= "Russia - Chuvash Latin";
+    name[Group1]= "Chuvash (Latin)";
 
     key.type[group1]="FOUR_LEVEL";
 
@@ -341,7 +341,7 @@ xkb_symbols "kom" {
 
     include "ru(winkeys)"
 
-    name[Group1]= "Russia - Komi";
+    name[Group1]= "Komi";
 
     key.type[group1]="FOUR_LEVEL_ALPHABETIC";
 
@@ -365,7 +365,7 @@ xkb_symbols "sah" {
 
     include "ru(winkeys)"
 
-    name[Group1]= "Russia - Yakut";
+    name[Group1]= "Yakut";
 
     key.type[group1]="FOUR_LEVEL_ALPHABETIC";
 
@@ -409,7 +409,7 @@ partial alphanumeric_keys
 xkb_symbols "xal" {
     include "ru(winkeys)"
 
-    name[Group1]= "Russia - Kalmyk";
+    name[Group1]= "Kalmyk";
 
     key.type[group1]="FOUR_LEVEL";
 
@@ -445,7 +445,7 @@ xkb_symbols "dos" {
 
     include "ru(common)"
 
-    name[Group1]= "Russia - DOS";
+    name[Group1]= "Russian (DOS)";
 
     key        <TLDE> {        [   parenright,  parenleft   ] };
     key        <AE04> {        [   4,           currency    ] };
@@ -459,7 +459,7 @@ partial alphanumeric_keys
 xkb_symbols "bak" {
     include "ru(winkeys)"
 
-    name[Group1]= "Russia - Bashkirian";
+    name[Group1]= "Bashkirian";
     key.type[group1]="FOUR_LEVEL";
 
     key <TLDE> { [     0x010004d9,       0x010004d8,   Cyrillic_io,   Cyrillic_IO      ] };
@@ -487,7 +487,7 @@ xkb_symbols "srp" {
     include "ru(common)"
     include "level3(ralt_switch)"
 
-    name[Group1]= "Russia - Serbian";
+    name[Group1]= "Serbian (Russia)";
 
     key <AE03> { [ 3, numerosign ] };
     key <AE04> { [ 4, semicolon ] };
@@ -512,7 +512,7 @@ partial alphanumeric_keys
 xkb_symbols "chm" {
     include "ru(common)"
     
-    name[Group1]= "Russia - Mari";
+    name[Group1]= "Mari";
 
     key.type[group1]="FOUR_LEVEL_ALPHABETIC";
     key <AC04> { [      Cyrillic_a,     Cyrillic_A,    U04D3,       U04D2     ] };
@@ -537,7 +537,7 @@ xkb_symbols "chm" {
 partial alphanumeric_keys
 xkb_symbols "chu"
 {
-	    name[Group1]= "Russia - Church Slavonic";
+	    name[Group1]= "Church Slavonic";
 	    key <TLDE> { [ U0457, U0407, U0482, U20DD ] }; // ї Ї ҂ e.g: а⃝ where the last is a combining ten thousands sign
 	    key <AE01> { [ U0461, U0460, U047D, U047C] }; // ѡ Ѡ ѽ Ѽ
 	    key <AE02> { [ U0454, U0404, U0465, U0464] }; // є Є ѥ Ѥ
diff --git a/symbols/se b/symbols/se
index dfd00465..67747344 100644
--- a/symbols/se
+++ b/symbols/se
@@ -9,7 +9,7 @@ xkb_symbols "basic" {
 partial alphanumeric_keys
 xkb_symbols "se" {
 
-    name[Group1]="Sweden";
+    name[Group1]="Swedish";
 
     key <AE05>	{ [         5,    percent,     EuroSign,         cent ]	};
     key <AE11>	{ [      plus,   question,    backslash, questiondown ]	};
@@ -39,7 +39,7 @@ xkb_symbols "nodeadkeys" {
     include "latin(type2_nodeadkeys)"
     include "se(se)"
 
-    name[Group1]="Sweden - Eliminate dead keys";
+    name[Group1]="Swedish (eliminate dead keys)";
 
     key <AE12>	{ [     acute,      grave,    plusminus,      notsign ]	};
 
@@ -49,7 +49,7 @@ xkb_symbols "nodeadkeys" {
 partial alphanumeric_keys 
 xkb_symbols "dvorak" {
 
-    name[Group1]="Sweden - Dvorak";
+    name[Group1]="Swedish (Dvorak)";
 
     include "se(basic)"
 
@@ -105,7 +105,7 @@ partial alphanumeric_keys
 xkb_symbols "rus" {
     include "se(basic)"
 
-    name[Group1]="Sweden - Russian phonetic";
+    name[Group1]="Russian (Sweden, phonetic)";
     key.type[group1]="ALPHABETIC";
 
     key <TLDE> {	[ Cyrillic_io, Cyrillic_IO ]	};
@@ -152,7 +152,7 @@ xkb_symbols "rus_nodeadkeys" {
     include "se(nodeadkeys)"
     include "se(rus)"
 
-    name[Group1]="Sweden - Russian phonetic, eliminate dead keys";
+    name[Group1]="Russian (Sweden, phonetic, eliminate dead keys)";
 
     key <AE12> {	[ Cyrillic_hardsign, Cyrillic_HARDSIGN ]	};
 };
@@ -166,7 +166,7 @@ xkb_symbols "smi" {
 
     include "fi(smi)"
 
-    name[Group1]= "Sweden - Northern Saami";
+    name[Group1]= "Saami (Sweden)";
 };
 
 // Copied from macintosh_vndr/se
@@ -177,7 +177,7 @@ xkb_symbols "mac" {
     // keyboard and a very simple Swedish(Sweden) keybaord
 
     include "latin"
-    name[Group1]= "Sweden - Macintosh";
+    name[Group1]= "Swedish (Macintosh)";
 
     key <TLDE> {	[         section,         degree	]	};
     key <AE01> {	[               1,          exclam,        copyright,      exclamdown	]	};
@@ -210,7 +210,7 @@ xkb_symbols "mac" {
 partial alphanumeric_keys
 xkb_symbols "svdvorak" {
 
-   name[Group1]="Sweden - Svdvorak";
+   name[Group1]="Swedish (Svdvorak)";
 
    include "se(basic)"
 
diff --git a/symbols/si b/symbols/si
index a9d57c15..7503bce1 100644
--- a/symbols/si
+++ b/symbols/si
@@ -1,7 +1,7 @@
 default partial alphanumeric_keys
 xkb_symbols "basic" {
 
-    name[Group1]="Slovenia";
+    name[Group1]="Slovenian";
 
     include "rs(latin)"
 
@@ -11,7 +11,7 @@ xkb_symbols "basic" {
 partial alphanumeric_keys 
 xkb_symbols "us" {
 
-    name[Group1]= "Slovenia - US keyboard with Slovenian letters";
+    name[Group1]= "Slovenian (US keyboard with Slovenian letters)";
 
     include "rs(latinyz)"
 
@@ -22,7 +22,7 @@ xkb_symbols "us" {
 partial alphanumeric_keys 
 xkb_symbols "alternatequotes" {
 
-    name[Group1]= "Slovenia - Use guillemets for quotes";
+    name[Group1]= "Slovenian (use guillemets for quotes)";
 
     include "rs(latinalternatequotes)"
 
diff --git a/symbols/sk b/symbols/sk
index 9ff50555..3a1b4a49 100644
--- a/symbols/sk
+++ b/symbols/sk
@@ -7,7 +7,7 @@ xkb_symbols "basic" {
 
     include "latin"
 
-    name[Group1] = "Slovakia";
+    name[Group1] = "Slovak";
 
     key <TLDE>	{ [ semicolon, dead_abovering,    grave,   asciitilde ]	};
     key <AE01>	{ [      plus,          1,       exclam,   dead_tilde ]	};
@@ -73,7 +73,7 @@ xkb_symbols "basic" {
 xkb_symbols "bksl" {
     include "sk(basic)"
 
-    name[Group1] = "Slovakia - Extended Backslash";
+    name[Group1] = "Slovak (extended Backslash)";
 
     key <BKSL>	{ [ backslash,        bar,        slash,     NoSymbol ]	};
 };
@@ -87,7 +87,7 @@ xkb_symbols "qwerty" {
     
     include "sk(basic)"
 
-    name[Group1] = "Slovakia - qwerty";
+    name[Group1] = "Slovak (qwerty)";
 
     key <AB01>	{ [         z,          Z,       degree,     NoSymbol ]	};
     key <AD06>	{ [         y,          Y,     NoSymbol,     NoSymbol ]	};
@@ -97,7 +97,7 @@ xkb_symbols "qwerty" {
 xkb_symbols "qwerty_bksl" {
     include "sk(qwerty)"
 
-    name[Group1] = "Slovakia - qwerty, extended Backslash";
+    name[Group1] = "Slovak (qwerty, extended Backslash)";
 
     key <BKSL>	{ [ backslash,        bar,        slash,     NoSymbol ]	};
 };
diff --git a/symbols/sn b/symbols/sn
index 90ffe611..5b0befc8 100644
--- a/symbols/sn
+++ b/symbols/sn
@@ -3,7 +3,7 @@ xkb_symbols "basic" {
 
     include "latin"
 
-    name[Group1]="Senegal";
+    name[Group1]="Wolof";
 
     key <AE01>	{ [ ampersand,          1,          bar,     NoSymbol ]	};
     key <AE02>	{ [    eacute,          2,   asciitilde,       Eacute ]	};
diff --git a/symbols/sy b/symbols/sy
index c55ea174..6e2932b1 100644
--- a/symbols/sy
+++ b/symbols/sy
@@ -1,12 +1,12 @@
 partial default alphanumeric_keys
 xkb_symbols "basic" {
     include "ara(basic)"
-    name[Group1]= "Syria";
+    name[Group1]= "Arabic (Syria)";
 };
 
 partial alphanumeric_keys
 xkb_symbols "syc" {
-    name[Group1]= "Syria - Syriac";
+    name[Group1]= "Syriac";
 
     key <TLDE> {  [	0x100070F,	0x100032E,	Arabic_shadda		]     };
     key <AE01> {  [  	1,		exclam,		0x1000701		]     };
@@ -76,7 +76,7 @@ xkb_symbols "syc" {
 
 partial alphanumeric_keys
 xkb_symbols "syc_phonetic" {
-    name[Group1]= "Syria - Syriac phonetic";
+    name[Group1]= "Syriac (phonetic)";
 
     key <TLDE> {  [	0x100070F,	0x100032E,	Arabic_shadda		]     };
     key <AE01> {  [  	1,		exclam,		0x1000701		]     };
@@ -146,17 +146,17 @@ xkb_symbols "syc_phonetic" {
 partial alphanumeric_keys
 xkb_symbols "ku" {
     include "tr(ku)"
-    name[Group1]= "Syria - Kurdish, Latin Q";
+    name[Group1]= "Kurdish (Syria, Latin Q)";
 };
 
 partial alphanumeric_keys
 xkb_symbols "ku_f" {
     include "tr(ku_f)"
-    name[Group1]= "Syria - Kurdish, (F)";
+    name[Group1]= "Kurdish (Syria, F)";
 };
 
 partial alphanumeric_keys
 xkb_symbols "ku_alt" {
     include "tr(ku_alt)"
-    name[Group1]= "Syria - Kurdish, Latin Alt-Q";
+    name[Group1]= "Kurdish (Syria, Latin Alt-Q)";
 };
diff --git a/symbols/th b/symbols/th
index 7fb2a241..a23ff45a 100644
--- a/symbols/th
+++ b/symbols/th
@@ -2,7 +2,7 @@
 
 partial default alphanumeric_keys 
 xkb_symbols "basic" {
-    name[Group1]= "Thailand";
+    name[Group1]= "Thai";
 
     // converted to THai keysysms - Pablo Saratxaga <pablo@mandrakesoft.com>
 
@@ -61,7 +61,7 @@ xkb_symbols "basic" {
 
 partial alphanumeric_keys 
 xkb_symbols "pat" {
-    name[Group1]= "Thailand - Pattachote";
+    name[Group1]= "Thai (Pattachote)";
     // The thai layout defines a second keyboard group and changes
     // the behavior of a few modifier keys.
     
@@ -123,7 +123,7 @@ xkb_symbols "pat" {
 
 partial alphanumeric_keys 
 xkb_symbols "tis" {
-    name[Group1]= "Thailand - TIS-820.2538";
+    name[Group1]= "Thai (TIS-820.2538)";
     // The thai layout defines a second keyboard group and changes
     // the behavior of a few modifier keys.  
 
@@ -186,7 +186,7 @@ xkb_symbols "tis" {
 partial alphanumeric_keys
 xkb_symbols "olpc" {
 
-    name[Group1]= "Thailand";
+    name[Group1]= "Thai";
     // The OLPC thai layout
     // walter@laptop.org
 
diff --git a/symbols/tj b/symbols/tj
index 76063be2..e4c4af4f 100644
--- a/symbols/tj
+++ b/symbols/tj
@@ -14,7 +14,7 @@
 partial default alphanumeric_keys
 xkb_symbols "basic"
 {
-	name[Group1] = "Tajikistan";
+	name[Group1] = "Tajik";
 
     	include "kpdl(comma)"
 	include "level3(ralt_switch)"
@@ -80,7 +80,7 @@ xkb_symbols "basic"
 
 xkb_symbols "legacy"
 {
-	name[Group1] = "Tajikistan - Legacy";
+	name[Group1] = "Tajik (legacy)";
 
 	include "kpdl(comma)"
 	include "level3(ralt_switch)"
diff --git a/symbols/tm b/symbols/tm
index 7a934658..ad520a6d 100644
--- a/symbols/tm
+++ b/symbols/tm
@@ -3,7 +3,7 @@
 // Default layout (based on Vista Turkmen layout)
 default partial
 xkb_symbols "basic" {
-    name[Group1]="Turkmenistan";
+    name[Group1]="Turkmen";
     
     include "us"
     key <TLDE> {	[    zcaron, 	Zcaron,		grave,	asciitilde	]	};
@@ -25,7 +25,7 @@ xkb_symbols "basic" {
 // This layout provides turkmen letter via the AltGr key
 partial
 xkb_symbols "alt" {
-    name[Group1]="Turkmenistan - Alt-Q";
+    name[Group1]="Turkmen (Alt-Q)";
 
     include "us"
 
diff --git a/symbols/tr b/symbols/tr
index 6092ce1c..025f844b 100644
--- a/symbols/tr
+++ b/symbols/tr
@@ -9,7 +9,7 @@ xkb_symbols "basic" {
 
     include "latin"
 
-    name[Group1]="Turkey";
+    name[Group1]="Turkish";
 
     key <AE01>	{ [         1,    exclam,        greater,    exclamdown ] };
     key <AE02>	{ [         2, apostrophe,      sterling,   twosuperior ] };
@@ -64,7 +64,7 @@ xkb_symbols "f" {
 
     include "latin"
 
-    name[Group1]="Turkey - (F)";
+    name[Group1]="Turkish (F)";
 
     key <AE01>	{ [         1,     exclam,  onesuperior,   exclamdown ]	};
     key <AE02>	{ [         2,   quotedbl,  twosuperior,   VoidSymbol ]	};
@@ -129,7 +129,7 @@ xkb_symbols "alt" {
 
     include "latin"
 
-    name[Group1]="Turkey - Alt-Q";
+    name[Group1]="Turkish (Alt-Q)";
 
     key <AE07>  { [         7,   ampersand,  lowleftcorner,  upleftcorner ] };
     key <AE08>  { [         8,    asterisk,          leftt,          topt ] };
@@ -167,7 +167,7 @@ xkb_symbols "sundeadkeys" {
     // For naming consistency
     include "tr(Sundeadkeys)"
 
-    name[Group1]="Turkey - Sun dead keys";
+    name[Group1]="Turkish (Sun dead keys)";
 };
 
 // Kurdish Q Layout
@@ -180,7 +180,7 @@ xkb_symbols "ku" {
 
    include "tr(basic)"
 
-   name[Group1]="Turkey - Kurdish, Latin Q";
+   name[Group1]="Kurdish (Turkey, Latin Q)";
 
     key <AD08>	{ [          i,           I,     idotless,            I ] };
     key <AD11>	{ [          x,           X,       gbreve,       Gbreve ] };
@@ -195,7 +195,7 @@ xkb_symbols "ku_f" {
 
     include "tr(f)"
 
-    name[Group1]="Turkey - Kurdish, (F)";
+    name[Group1]="Kurdish (Turkey, F)";
 
     key <AD03>	{ [         x,          X,       gbreve,        Gbreve]	};
     key <AD04>	{ [         i,          I,    paragraph,   VoidSymbol ] };
@@ -214,7 +214,7 @@ xkb_symbols "ku_alt" {
 
     include "tr(alt)"
 
-    name[Group1]="Turkey - Kurdish, Latin Alt-Q";
+    name[Group1]="Kurdish (Turkey, Latin Alt-Q)";
 
     key <AD03>  { [         e,           E,  ecircumflex,  Ecircumflex ] };
     key <AD07>  { [         u,           U,  ucircumflex,  Ucircumflex ] };
@@ -228,7 +228,7 @@ partial
 xkb_symbols "intl" {
     include "latin"
 
-    name[Group1]="Turkey - International (with dead keys)";
+    name[Group1]="Turkish (international with dead keys)";
 
     key <AE01>	{ type[group1] = "FOUR_LEVEL", [         1,    exclam,    onesuperior,    exclamdown ]	};
     key <AE02>	{ type[group1] = "FOUR_LEVEL", [         2, apostrophe,   sterling,   twosuperior ]	};
@@ -274,7 +274,7 @@ xkb_symbols "intl" {
 
 partial alphanumeric_keys
 xkb_symbols "olpc" {
-    name[Group1]= "Turkey";
+    name[Group1]= "Turkish";
     include "tr(intl)"
 
     key <AE01>	{ [         1,    exclam,    VoidSymbol,    VoidSymbol ] };
@@ -309,7 +309,7 @@ xkb_symbols "crh" {
 
     include "tr(basic)"
 
-    name[Group1]="Turkey - Crimean Tatar (Turkish Q)";
+    name[Group1]="Crimean Tatar (Turkish Q)";
 
     key <AE11>	{ [         x,          X,          asterisk,      question ]   };
 
@@ -326,7 +326,7 @@ xkb_symbols "crh_f" {
 
     include "tr(f)"
 
-    name[Group1]="Turkey - Crimean Tatar (Turkish F)";
+    name[Group1]="Crimean Tatar (Turkish F)";
 
     key <AE11>	{ [         x,          X,           slash,        question ]	};
 
@@ -345,7 +345,7 @@ xkb_symbols "crh_alt" {
 
     include "tr(alt)"
 
-    name[Group1]="Turkey - Crimean Tatar (Turkish Alt-Q)";
+    name[Group1]="Crimean Tatar (Turkish Alt-Q)";
 
     key <AC04>	{ [         f,          F,          iacute,          Iacute ]	};
     key <AC07>	{ [         j,          J,          ibreve,          Ibreve ]	};
diff --git a/symbols/tw b/symbols/tw
index bad11168..561cb029 100644
--- a/symbols/tw
+++ b/symbols/tw
@@ -3,7 +3,7 @@
 partial default alphanumeric_keys
 xkb_symbols "tw" {
 
-    name[Group1]= "Taiwan";
+    name[Group1]= "Taiwanese";
 
     include "us(basic)"
 
@@ -51,7 +51,7 @@ xkb_symbols "tw" {
 partial alphanumeric_keys
 xkb_symbols "indigenous" {
 
-  name[Group1]= "Taiwan - Indigenous";
+  name[Group1]= "Taiwanese (indigenous)";
 
   include "tw(tw)"
 
@@ -63,7 +63,7 @@ xkb_symbols "indigenous" {
 partial alphanumeric_keys
 xkb_symbols "saisiyat" {
 
-  name[Group1]= "Taiwan - Saisiyat";
+  name[Group1]= "Saisiyat (Taiwan)";
 
   include "tw(indigenous)"
 
diff --git a/symbols/tz b/symbols/tz
index c6fd05ce..e4d50539 100644
--- a/symbols/tz
+++ b/symbols/tz
@@ -5,7 +5,7 @@
 
 partial default alphanumeric_keys 
 xkb_symbols "swa" {
-    name[Group1]= "Tanzania";
+    name[Group1]= "Swahili (Tanzania)";
 
     key <TLDE> {  [  0x1000670,         VoidSymbol             ]  };
 
diff --git a/symbols/ua b/symbols/ua
index ac8e4a27..262243e2 100644
--- a/symbols/ua
+++ b/symbols/ua
@@ -9,7 +9,7 @@ partial default alphanumeric_keys
 xkb_symbols "unicode" {
     include "ua(winkeys)"
  
-    name[Group1]= "Ukraine";
+    name[Group1]= "Ukrainian";
 
     key <TLDE> {    [           U2019, 	apostrophe,    U0301,   asciitilde     ]       };	// Apostrophe and Stress symbol
     key <AE02> {    [               1,      exclam,  onesuperior               ]       };
@@ -46,7 +46,7 @@ xkb_symbols "unicode" {
 partial alphanumeric_keys 
 xkb_symbols "legacy" {
 
-    name[Group1]= "Ukraine - Legacy";
+    name[Group1]= "Ukrainian (legacy)";
 
     key	<TLDE> {	[      apostrophe,	asciitilde	]	};
     key	<AE01> {	[		1,	    exclam 	]	};
@@ -107,7 +107,7 @@ partial alphanumeric_keys
 xkb_symbols "winkeys" {
     include "ua(legacy)"
  
-    name[Group1]= "Ukraine - Winkeys";
+    name[Group1]= "Ukrainian (WinKeys)";
 
     key <AE03> {        [               3,      numerosign      ]       };
     key <AE04> {        [               4,       semicolon      ]       };
@@ -122,7 +122,7 @@ partial alphanumeric_keys
 xkb_symbols "typewriter" {
     include "ua(legacy)"
 
-    name[Group1]= "Ukraine - Typewriter";
+    name[Group1]= "Ukrainian (typewriter)";
 
     key	<TLDE> {	[      apostrophe,	  quotedbl	] 	};
     key	<AE01> {	[	   exclam,		 1 	]	};
@@ -151,7 +151,7 @@ partial alphanumeric_keys
 xkb_symbols "phonetic" {
   include "ua(legacy)"
   
-  name[Group1]= "Ukraine - Phonetic";
+  name[Group1]= "Ukrainian (phonetic)";
 
   key <LatQ> {   [ Cyrillic_ya,       Cyrillic_YA         ]    };
   key <LatW> {   [ Cyrillic_ve,       Cyrillic_VE         ]    };
@@ -197,7 +197,7 @@ partial alphanumeric_keys
 xkb_symbols "rstu" {
     include "ua(legacy)"
 
-    name[Group1]= "Ukraine - Standard RSTU";
+    name[Group1]= "Ukrainian (standard RSTU)";
 
     key	<TLDE> {	[      apostrophe,	  question	] 	};
     key	<AE01> {	[	   exclam,		 1 	]	};
@@ -227,7 +227,7 @@ xkb_symbols "rstu" {
 partial alphanumeric_keys
 xkb_symbols "rstu_ru" {
     include "ru(common)"
-    name[Group1]= "Ukraine - Standard RSTU on Russian layout";
+    name[Group1]= "Russian (Ukraine, standard RSTU)";
 
     key <TLDE> {        [      apostrophe,        question      ]       };
     key <AE01> {        [          exclam,               1      ]       };
@@ -253,7 +253,7 @@ key.type[group1]="ALPHABETIC";
 partial alphanumeric_keys
 xkb_symbols "homophonic" {
   include "ua(legacy)"
-  name[Group1]= "Ukraine - Homophonic";
+  name[Group1]= "Ukrainian (homophonic)";
 
   key <TLDE> {	 [          grave,	underscore	]	};
   key <AE01> {	 [		1,	    exclam 	]	};
diff --git a/symbols/us b/symbols/us
index cb949228..19ddae86 100644
--- a/symbols/us
+++ b/symbols/us
@@ -2,7 +2,7 @@ default
 partial alphanumeric_keys modifier_keys 
 xkb_symbols "basic" {
 
-    name[Group1]= "English (USA)";
+    name[Group1]= "English (US)";
 
     // Alphanumeric section
     key <TLDE> {	[     grave,	asciitilde	]	};
@@ -554,7 +554,7 @@ partial alphanumeric_keys
 xkb_symbols "dvp" {
     include "us(dvorak)"
 
-    name[Group1] = "USA - Programmer Dvorak";
+    name[Group1] = "English (programmer Dvorak)";
 
     //             Unmodified       Shift           AltGr            Shift+AltGr
     // symbols row, left side
@@ -1123,7 +1123,7 @@ xkb_symbols "chr" {
 partial alphanumeric_keys
 xkb_symbols "hbs" {
 
-  name[Group1]= "Serbo-Croatian (USA)";
+  name[Group1]= "Serbo-Croatian (US)";
 
   include "us"
 
@@ -1212,7 +1212,7 @@ xkb_symbols "htcdream" {
 partial alphanumeric_keys
 xkb_symbols "intl-unicode" {
 
- name[Group1]= "USA - International (AltGr Unicode combining)";
+ name[Group1]= "English (US, international AltGr Unicode combining)";
 
  include "us(intl)"
  include "level3(ralt_switch)"
@@ -1262,7 +1262,7 @@ xkb_symbols "intl-unicode" {
 partial alphanumeric_keys
 xkb_symbols "alt-intl-unicode" {
 
- name[Group1]= "USA - International (AltGr Unicode combining, alternative)";
+ name[Group1]= "English (US, international AltGr Unicode combining, alternative)";
 
  include "extras/us(intl-unicode)"
  include "level3(ralt_switch)"
@@ -1282,7 +1282,7 @@ xkb_symbols "ats" {
 
     include "us"
 
-    name[Group1]= "USA - Atsina";
+    name[Group1]= "Atsina";
 
     //Using Dead key to get COMBINING COMMA ABOVE for ejectives on
     //q, l, t, s, m, g, k, p, w, y, r
@@ -1313,7 +1313,7 @@ xkb_symbols "crd" {
 
   include "us"
 
-  name[Group1]= "USA - Couer D'alene Salish";
+  name[Group1]= "Couer D'alene Salish";
 
   // Alphanumeric section
   key <AD02> { [         w,           W, U02B7, U02B7 ] }; 
diff --git a/symbols/uz b/symbols/uz
index 68862bbc..d0e3c04b 100644
--- a/symbols/uz
+++ b/symbols/uz
@@ -33,7 +33,7 @@
 partial default alphanumeric_keys 
 xkb_symbols "cyrillic" {
 
-    name[Group1]= "Uzbekistan";
+    name[Group1]= "Uzbek";
 
     key	<AE01> {	[		1,	    exclam 	]	};
     key	<AE02> {	[		2,        quotedbl	]	};
@@ -93,6 +93,6 @@ key.type[group1]="ALPHABETIC";
 partial alphanumeric_keys
 xkb_symbols "latin" {
     include "us"
-    name[Group1]= "Uzbekistan - Latin";
+    name[Group1]= "Uzbek (Latin)";
     key <AC11>  { [0x010002BB, quotedbl] };
 };
diff --git a/symbols/vn b/symbols/vn
index 06240f24..397a2812 100644
--- a/symbols/vn
+++ b/symbols/vn
@@ -13,7 +13,7 @@ xkb_symbols "basic" {
 
     include "us"
 
-    name[Group1]= "Vietnam";
+    name[Group1]= "Vietnamese";
 
     // Alphanumeric section
     key <TLDE> { [ quoteleft, asciitilde  ]	};
diff --git a/symbols/za b/symbols/za
index 3f78753c..c5f69946 100644
--- a/symbols/za
+++ b/symbols/za
@@ -9,7 +9,7 @@ xkb_symbols "basic" {
 
     include "latin"
 
-    name[Group1]="South Africa";
+    name[Group1]="English (South Africa)";
 
     key <TLDE>  { [     grave,  asciitilde,  dead_grave ] };
     key <AE02>	{ [         2,         at,      yen ]	};