diff --git a/symbols/macintosh_vndr/ch b/symbols/macintosh_vndr/ch
index 54d0683..192936d 100644
--- a/symbols/macintosh_vndr/ch
+++ b/symbols/macintosh_vndr/ch
@@ -7,20 +7,20 @@
 partial alphanumeric_keys
 xkb_symbols "extended" {
     
-    name[Group1]= "Swiss German Apple Extended Keyboard II";
+    name[Group1]= "Switzerland - German, Mac";
 
     // Alphanumeric section
 
     key <AE01> { [	1,	plus, 	plusminus,	infinity		]	};
     key <AE02> { [	2,	quotedbl, leftdoublequotemark, rightdoublequotemark 	]	};
-    key <AE03> { [	3,	asterisk, 	numbersign,	leftcaret		]	};
+    key <AE03> { [	3,	asterisk, 	numbersign,	leftcaret	]	};
 					// not displayed here
-    key <AE04> { [	4,	ccedilla, 	Ccedilla,	slash			]	};
-    key <AE05> { [	5,	percent, 	bracketleft				]	};
-    key <AE06> { [	6,	ampersand, 	bracketright				]	};
+    key <AE04> { [	4,	ccedilla, 	Ccedilla,	slash		]	};
+    key <AE05> { [	5,	percent, 	bracketleft			]	};
+    key <AE06> { [	6,	ampersand, 	bracketright			]	};
     key <AE07> { [	7,	slash, 	bar,		backslash		]	};
-    key <AE08> { [	8,	parenleft, 	braceleft,	Ograve			]	};
-    key <AE09> { [	9,	parenright, 	braceright,	Ocircumflex		]	};
+    key <AE08> { [	8,	parenleft, 	braceleft,	Ograve		]	};
+    key <AE09> { [	9,	parenright, 	braceright,	Ocircumflex	]	};
     key <AE10> { [	0,	equal, 	notequal,	Uacute			]	};
     key <AE11> { [	apostrophe,	question, 	questiondown, 	NoSymbol		]	};
     key <AE12> { [	dead_circumflex,dead_grave, 	dead_acute,	asciicircum		]	};
@@ -47,8 +47,8 @@ xkb_symbols "extended" {
     key <AC07> { [ 	j,	J,  	masculine,	eth	 		]	};
     key <AC08> { [ 	k,	K, 	Greek_DELTA,	macron			]	};
     key <AC09> { [ 	l,	L, 	notsign,	caret			]	};
-    key <AC10> { [	odiaeresis,	eacute, 	cent,		breve 			]	};
-    key <AC11> { [	adiaeresis,	agrave, 	ae,		AE			]	};
+    key <AC10> { [	odiaeresis,	eacute, 	cent,		breve	]	};
+    key <AC11> { [	adiaeresis,	agrave, 	ae,		AE	]	};
     key <AB01> { [	y,	Y, 	yen,		Ydiaeresis		]	};
     key <AB02> { [ 	x,	X, 	similarequal,	trademark		]	};
     key <AB03> { [ 	c,	C, 	copyright,	NoSymbol		]	};
@@ -58,9 +58,9 @@ xkb_symbols "extended" {
 					// to be fixed att
     key <AB07> { [ 	m,	M, 	mu,		dead_abovering		]       };
 					// not sure att
-    key <AB08> { [	comma,	semicolon, 	guillemotleft,	guillemotright		]	};
+    key <AB08> { [	comma,	semicolon, 	guillemotleft,	guillemotright	]	};
     key <AB09> { [	period,	colon, 	ellipsis,	division		]	};
-    key <AB10> { [	minus,	underscore, 	hyphen,		emdash			]	};
+    key <AB10> { [	minus,	underscore, 	hyphen,		emdash		]	};
     key <TLDE> { [	section,	degree,   	NoSymbol, 	NoSymbol		]	};
 			// ligature fi	// per mille
     key <SPCE> { [	space, 	nobreakspace,	nobreakspace		]	};
@@ -83,16 +83,16 @@ xkb_symbols "fr" {
     // keyboard and a very simple Swiss/French keybaord
 
     include "macintosh_vndr/ch(extended)"
-    name[Group1]= "Swiss French";
+    name[Group1]= "Switzerland - French, Mac";
 
     override key <AD11> {
-	[ egrave,	udiaeresis,  bracketleft			]
+	[ egrave,	udiaeresis,  bracketleft	]
     };
     override key <AC10> {
 	[ eacute,	odiaeresis	]
     };
     override key <AC11> {
-	[ agrave,	adiaeresis,   braceleft			]
+	[ agrave,	adiaeresis,   braceleft		]
     };
 };
 
diff --git a/symbols/macintosh_vndr/de b/symbols/macintosh_vndr/de
index dadcf22..c9060b0 100644
--- a/symbols/macintosh_vndr/de
+++ b/symbols/macintosh_vndr/de
@@ -10,22 +10,22 @@ xkb_symbols "basic" {
     // keyboard and a very simple German keybaord
 
     include "latin"
+    name[Group1]= "Germany - Mac";
 
     // Alphanumeric section
-    name[Group1]= "German";
-    key <TLDE> {	[ dead_circumflex,	degree,    notsign 			]	};
+    key <TLDE> {	[ dead_circumflex,	degree,    notsign 		]	};
     key <AE01> {	[         1,    exclam,  exclamdown,   at		]	};
     key <AE02> {	[	  2,	quotedbl,  twosuperior			]	};
     key <AE03> {	[	  3,	section,  threesuperior,sterling	]	};
     key <AE04> {	[	  4,	dollar,  onequarter,	currency	]	};
     key <AE05> {	[	  5,	percent,  bracketleft			]	};
-    key <AE06> {	[	  6,	ampersand,  bracketright			]	};
-    key <AE07> {	[	  7,	slash,        bar,    backslash	]	};
+    key <AE06> {	[	  6,	ampersand,  bracketright		]	};
+    key <AE07> {	[	  7,	slash,        bar,    backslash		]	};
     key <AE08> {	[	  8,	parenleft,  braceleft,    asciitilde	]	};
     key <AE09> {	[	  9,	parenright, braceright			]	};
     key <AE10> {	[	  0,	equal,  braceright,	degree		]	};
     key <AE11> {	[    ssharp,	question,  backslash,	questiondown	]	};
-    key <AE12> {	[ dead_acute,	dead_grave,  dead_cedilla			]	};
+    key <AE12> {	[ dead_acute,	dead_grave,  dead_cedilla		]	};
 
     key <AD01> {	[	  q,	Q, guillemotleft,guillemotright	]	};
     key <AD03> {	[	  e,	E,   EuroSign			]	};
@@ -63,6 +63,8 @@ partial alphanumeric_keys 
 xkb_symbols "Sundeadkeys" {
     // modify the default German layout to use Sun dead keys
     include "macintosh_vndr/de(basic)"
+    name[Group1]= "Germany - Mac, Sun dead keys";
+
     key <TLDE> {	[ SunFA_Circum,	degree,    notsign 			]	};
     key <AE12> {	[ SunFA_Acute,	SunFA_Grave,  SunFA_Cedilla			]	};
     key <AD11> {	[ udiaeresis,	Udiaeresis,  SunFA_Diaeresis		]	};
@@ -82,12 +84,14 @@ partial alphanumeric_keys 
 xkb_symbols "nodeadkeys" {
     // modify the default German layout to not have any dead keys
     include "macintosh_vndr/de(basic)"
+    name[Group1]= "Germany - Mac, eliminate dead keys";
+
     key <TLDE> {	[ asciicircum,	degree,    notsign 			]	};
-    key <AE12> {	[ acute,	grave,  cedilla			]	};
+    key <AE12> {	[ acute,	grave,  cedilla				]	};
     key <AD11> {	[ udiaeresis,	Udiaeresis,  diaeresis 			]	};
     key <AD12> {	[      plus,	asterisk,  asciitilde,	macron		]	};
-    key <AC10> {	[ odiaeresis,	Odiaeresis,  acute				]	};
-    key <AC11> {	[ adiaeresis,	Adiaeresis,  asciicircum			]	};
+    key <AC10> {	[ odiaeresis,	Odiaeresis,  acute			]	};
+    key <AC11> {	[ adiaeresis,	Adiaeresis,  asciicircum		]	};
 
-    key <BKSL> {	[ numbersign,	apostrophe,  grave				]	};
+    key <BKSL> {	[ numbersign,	apostrophe,  grave			]	};
 };
diff --git a/symbols/macintosh_vndr/dk b/symbols/macintosh_vndr/dk
index 1110385..f03b87b 100644
--- a/symbols/macintosh_vndr/dk
+++ b/symbols/macintosh_vndr/dk
@@ -8,8 +8,7 @@ xkb_symbols "basic" {
     // and all of ISO-8859-1 characters available.
 
     include "latin"
-
-    name[Group1]= "Danish";
+    name[Group1]= "Denmark - Mac";
 
     key <TLDE> {	[  onehalf,         section,    threequarters,       paragraph	]};
     key <LSGT> {	[     less,         greater,        backslash,         notsign	]};
@@ -59,6 +58,8 @@ xkb_symbols "full" {
 partial alphanumeric_keys 
 xkb_symbols "nodeadkeys" {
     include "macintosh_vndr/dk(basic)"
+    name[Group1]= "Denmark - Mac, eliminate dead keys";
+
     key <AE12> {	[           acute,           grave,              bar,          ogonek	]	};
     key <AD12> {	[       diaeresis,     asciicircum,       asciitilde,     dead_macron     	]      	};
 };
diff --git a/symbols/macintosh_vndr/es b/symbols/macintosh_vndr/es
index ca04917..f7112eb 100644
--- a/symbols/macintosh_vndr/es
+++ b/symbols/macintosh_vndr/es
@@ -6,8 +6,7 @@ xkb_symbols "basic" {
     // keyboard and a very simple Spanish keybaord
 
     include "latin"
-
-    name[Group1]= "Spanish";
+    name[Group1]= "Spain - Mac";
 
     key <TLDE> {	[     bracketleft,    bracketright,        braceleft,      braceright	]	};
     key <LSGT> {	[            less,         greater,      bracketleft,       braceleft	]	};
diff --git a/symbols/macintosh_vndr/fi b/symbols/macintosh_vndr/fi
index 796e727..6cb5fa3 100644
--- a/symbols/macintosh_vndr/fi
+++ b/symbols/macintosh_vndr/fi
@@ -5,8 +5,8 @@ xkb_symbols "basic" {
     // Describes the differences between a very simple mac_US
     // keyboard and a very simple Swedish(Finland) keybaord
 
-    name[Group1]= "Finnish";
     include "macintosh_vndr/se(basic)" // for consistent naming
+    name[Group1]= "Finland - Mac";
 
 };
 
@@ -14,4 +14,5 @@ xkb_symbols "basic" {
 partial alphanumeric_keys 
 xkb_symbols "nodeadkeys" {
     include "macintosh_vndr/se(basic)"	// for consistent naming
+    name[Group1]= "Finland - Mac, eliminate dead keys";
 };
diff --git a/symbols/macintosh_vndr/fr b/symbols/macintosh_vndr/fr
index 7526924..1f32320 100644
--- a/symbols/macintosh_vndr/fr
+++ b/symbols/macintosh_vndr/fr
@@ -22,12 +22,10 @@
 
 xkb_symbols "extended" {
 
-    name[Group1]= "FR-1";
-    key <ESC>  {	[ Escape			]	};
+    name[Group1]= "France - Mac";
 
     // Alphanumeric section
     key <TLDE> {	[          at,     numbersign, periodcentered,  Ydiaeresis	]	}; // MISSING: Ydiaeresis; eherlent : ok in Latin9
-    key <ENTR> {        [    KP_Enter                   ]       };
     key <AE01> {	[   ampersand,    1,   VoidSymbol,    dead_acute	]	}; // MISSING: Apple
     key <AE02> {	[      eacute,    2,   ediaeresis,        Eacute	]	};
     key <AE03> {	[    quotedbl,    3,   VoidSymbol,    VoidSymbol	] 	}; // CHECK all quotemarks
@@ -83,30 +81,7 @@ xkb_symbols "extended" {
     key <SPCE> {	[     space,  space, nobreakspace,   nobreakspace	]	};
     // End alphanumeric section
 
-    // Begin "Keypad" section
-    key <KPCL> {	[  Clear		]	};
-    key <KPEQ> {	[  KP_Equal		]	};
-    key <KPDV> {	[  KP_Divide		]	};
-    key <KPMU> {	[  KP_Multiply		]	};
-
-    key	 <KP7> {	[  KP_7			]	};
-    key	 <KP8> {	[  KP_8			]	};
-    key	 <KP9> {	[  KP_9			]	};
-    key <KPSU> {	[  KP_Subtract		]	};
-
-    key	 <KP4> {	[  KP_4			]	};
-    key	 <KP5> {	[  KP_5			]	};
-    key	 <KP6> {	[  KP_6			]	};
-    key <KPAD> {	[  KP_Add		]	};
-
-    key	 <KP1> {	[  KP_1			]	};
-    key	 <KP2> {	[  KP_2			]	};
-    key	 <KP3> {	[  KP_3			]	};
-    key <KPEN> {	[  KP_Enter		]	};
-
-    key	 <KP0> {	[  KP_0			]	};
     key <KPDL> {	[  comma,KP_Decimal	]	};
- // End "Keypad" section
 
     include "level3(ralt_switch)"
 };
diff --git a/symbols/macintosh_vndr/gb b/symbols/macintosh_vndr/gb
index 5a9b40a..bb409b8 100644
--- a/symbols/macintosh_vndr/gb
+++ b/symbols/macintosh_vndr/gb
@@ -8,7 +8,7 @@ xkb_symbols "basic" {
 
     include "latin"
 
-    name[Group1]= "Great Britain";
+    name[Group1]= "United Kingdom - Mac";
 
     key <AE03> {	[               3,        sterling,       numbersign	]	};
 
diff --git a/symbols/macintosh_vndr/is b/symbols/macintosh_vndr/is
index 0f8636f..32f8bcf 100644
--- a/symbols/macintosh_vndr/is
+++ b/symbols/macintosh_vndr/is
@@ -57,7 +57,7 @@
 
 partial default alphanumeric_keys
 xkb_symbols "basic" {
-    name[Group1]= "Icelandic";
+    name[Group1]= "Iceland - Mac";
 
 	//-- Row 5 (E) --//
 	key <TLDE> {	[	sterling,	section, 	UF8FF,		apostrophe	]	};
@@ -123,5 +123,6 @@ xkb_symbols "basic" {
 
 partial alphanumeric_keys
 xkb_symbols "nodeadkeys" {
-	include	"macintosh_vndr/is(basic)" // for consistent naming
+    include	"macintosh_vndr/is(basic)" // for consistent naming
+    name[Group1]= "Iceland - Mac, eliminate dead keys";
 };
diff --git a/symbols/macintosh_vndr/it b/symbols/macintosh_vndr/it
index b369055..aabc96a 100644
--- a/symbols/macintosh_vndr/it
+++ b/symbols/macintosh_vndr/it
@@ -1,7 +1,7 @@
 
 xkb_symbols "extended" {
 
-    name[Group1]= "italian";
+    name[Group1]= "Italy - Mac";
 
     // Alphanumeric section
     key <LSGT> {	[        less,  greater   	]	};
diff --git a/symbols/macintosh_vndr/nl b/symbols/macintosh_vndr/nl
index e6fbd07..b60690e 100644
--- a/symbols/macintosh_vndr/nl
+++ b/symbols/macintosh_vndr/nl
@@ -7,7 +7,7 @@ xkb_symbols "basic" {
 
     include "latin"
 
-    name[Group1]= "Netherland";
+    name[Group1]= "Netherlands - Mac";
 
     include "level3(ralt_switch)"
 
diff --git a/symbols/macintosh_vndr/no b/symbols/macintosh_vndr/no
index 1469a4c..c264928 100644
--- a/symbols/macintosh_vndr/no
+++ b/symbols/macintosh_vndr/no
@@ -8,7 +8,7 @@ xkb_symbols "basic" {
 
     include "latin"
 
-    name[Group1]= "Norwegian";
+    name[Group1]= "Norway - Mac";
 
     key <TLDE> {	[             bar,         section      ]	};
     key <AE02> {	[               2,        quotedbl, 	       at,	 oneeighth	]	};
@@ -42,8 +42,9 @@ partial alphanumeric_keys 
 xkb_symbols "nodeadkeys" {
 
     // Modifies the basic Norwegian layout to eliminate dead keys
-
     include "macintosh_vndr/no(basic)"
+    name[Group1]= "Norway - Mac, eliminate dead keys";
+
     key <AE12> {	[           grave,           acute, 	    acute,          ogonek 	]	};
     key <AD12> {	[       diaeresis,     asciicircum,       asciitilde,          macron     	]      	};
 
diff --git a/symbols/macintosh_vndr/pt b/symbols/macintosh_vndr/pt
index 5071a73..db090f2 100644
--- a/symbols/macintosh_vndr/pt
+++ b/symbols/macintosh_vndr/pt
@@ -10,7 +10,7 @@ xkb_symbols "basic" {
 
     include "latin"
 
-    name[Group1]= "Portuguese";
+    name[Group1]= "Portugal - Mac";
 
     key <LSGT> {	[	     less,	   greater, 	      bar,       brokenbar	]	};
     key <AE02> {	[               2,	  quotedbl, 	       at,       oneeighth	]	};
@@ -39,6 +39,7 @@ xkb_symbols "basic" {
 partial alphanumeric_keys 
 xkb_symbols "Sundeadkeys" {
     include "macintosh_vndr/pt(basic)" // for consistent naming
+    name[Group1]= "Portugal - Mac, Sun dead keys";
     
     key <AE12> {	[	     plus,        asterisk,  SunFA_Diaeresis, SunFA_Diaeresis      ]	};
     key <AC11> {	[     SunFA_Tilde,    SunFA_Circum	]	};
@@ -53,6 +54,7 @@ xkb_symbols "sundeadkeys" {
 partial alphanumeric_keys 
 xkb_symbols "nodeadkeys" {
     include "macintosh_vndr/pt(basic)" // for consistent naming
+    name[Group1]= "Portugal - Mac, eliminate dead keys";
 
     key <AE12> {	[	     plus,        asterisk, 	 quotedbl,        quotedbl      ]	};
     key <AC11> {	[      asciitilde,     asciicircum	]	};
diff --git a/symbols/macintosh_vndr/se b/symbols/macintosh_vndr/se
index de05337..783748c 100644
--- a/symbols/macintosh_vndr/se
+++ b/symbols/macintosh_vndr/se
@@ -8,7 +8,7 @@ xkb_symbols "basic" {
 
     include "latin"
 
-    name[Group1]= "Swedish";
+    name[Group1]= "Sweden - Mac";
 
     key <TLDE> {	[         section,         degree	]	};
 
@@ -41,4 +41,5 @@ xkb_symbols "basic" {
 partial alphanumeric_keys 
 xkb_symbols "nodeadkeys" {
     include "macintosh_vndr/se(basic)" // for consistent naming
+    name[Group1]= "Sweden - Mac, eliminate dead keys";
 };
diff --git a/symbols/macintosh_vndr/us b/symbols/macintosh_vndr/us
index f896ed7..9a7016d 100644
--- a/symbols/macintosh_vndr/us
+++ b/symbols/macintosh_vndr/us
@@ -5,7 +5,7 @@
 
 xkb_symbols "extended" {
 
-    name[Group1]= "US/ASCII";
+    name[Group1]= "U.S. English";
     key <ESC>  {	[ Escape			]	};
 
     // Alphanumeric section
@@ -95,59 +95,6 @@ xkb_symbols "extended" {
     include "compose(rwin)"
     include "macintosh_vndr/apple(extended)"
 
-// *** FIXME
-//    key <LSGT> {	[ quoteleft,	asciitilde	]	};
-//    key <AE01> {	[	  1,	exclam 		],
-//			[exclamdown,    slash		]	};
-//    key <AE02> {	[	  2,	at		],
-//			[ trademark,    eth		]	};
-//    key <AE03> {	[	  3,	numbersign	],
-//			[ sterling			]	};
-//    key <AE04> {	[	  4,	dollar		],
-//			[      cent			]	};
-//    key <AE05> {	[	  5,	percent		],
-//			[  infinity			]	};
-//    key <AE06> {	[	  6,	asciicircum	],
-//			[ section			]	};
-//    key <AE07> {	[	  7,	ampersand	],
-//			[ paragraph			]	};
-//    key <AE08> {	[	  8,	asterisk	],
-//			[periodcentered			]	};
-//    key <AE09> {	[	  9,	parenleft	],
-//			[ordfeminine			]	};
-//    key <AE12> {	[     equal,	plus		],
-//			[  notequal,    plusminus	]	};
-//    key <AD01> {	[	  q,	Q 		],
-//			[	oe,	OE		]	};
-//    key <AD04> {	[	  r,	R		],
-//			[registered			]	};
-//    key <AD05> {	[	  t,	T		],
-//			[    dagger			]	};
-//    key <BKSL> {	[ backslash,	bar		],
-//			[guillemotleft,guillemotright	]	};
-//    key <AC01> {	[	  a,	A 		],
-//			[     aring,    Aring		]	};
-//    key <AC02> {	[	  s,	S		],
-//			[    ssharp,    Iacute		]	};
-//    key <AC03> {	[	  d,	D		],
-//				eth,	Icircumflex	]	};
-//    key <AC04> {	[	  f,	F		],
-//			[		Idiaeresis	]	};
-//    key <AC05> {	[	  g,	G		],
-//			[ copyright			]	};
-//    key <AC09> {	[	  l,	L		],
-//			[   notsign,    Ograve		]	};
-//    key <AC11> {	[ quoteright,	quotedbl	],
-//			[        ae,	AE		]	};
-//    key <AB03> {	[	  c,	C		],
-//			[ ccedilla,	Ccedilla	]	};
-//    key <AB06> {	[	  n,	N		],
-//			[asciitilde			]	};
-//    key <AB07> {	[	  m,	M		],
-//			[	 mu,	Acircumflex	]	};
-//    key <RALT> {	[ Mode_switch,	Multi_key	]	};
-//    modifier_map Mod3   { Mode_switch };
-
 };
 
 hidden