Yahoo! Models test pased ok!

83 files changed, 527 insertions, 461 deletions

diff --git a/geometry/digital_vndr/Makefile.am b/geometry/digital_vndr/Makefile.am
index 3e918b9f..24535df2 100644
--- a/geometry/digital_vndr/Makefile.am
+++ b/geometry/digital_vndr/Makefile.am
@@ -3,4 +3,4 @@ lk  pc  unix
 
 EXTRA_DIST= $(geom_DATA)
                                                                                           
-geomdir = $(xkb_base)/geometry/digital.vndr
+geomdir = $(xkb_base)/geometry/digital_vndr
diff --git a/geometry/digital_vndr/pc b/geometry/digital_vndr/pc
index 6c02fae4..ad4ffc65 100644
--- a/geometry/digital_vndr/pc
+++ b/geometry/digital_vndr/pc
@@ -164,7 +164,7 @@ partial xkb_geometry "leds_alone" {
 };
 
 xkb_geometry "pc101" {
-    include "digital.vndr/pc(common)"
+    include "digital_vndr/pc(common)"
 
     shape.cornerRadius = 1;
     shape "BKSP" { primary = { [36,19] }, { [3,2], [33,16] } };
@@ -225,7 +225,7 @@ xkb_geometry "pc101" {
 };
 
 xkb_geometry "pc102" {
-    include "digital.vndr/pc(common)"
+    include "digital_vndr/pc(common)"
 
     shape.cornerRadius = 1;
     shape "BKSP" { primary = { [36,19] }, { [3,2], [33,16] } };
@@ -289,7 +289,7 @@ xkb_geometry "pc102" {
 };
 
 xkb_geometry "pcxaj" {
-    include "digital.vndr/pc(common)"
+    include "digital_vndr/pc(common)"
 
     shape.cornerRadius = 1;
     shape "BKSP" { primary = { [36,19] }, { [3,2], [33,16] } };
diff --git a/geometry/ibm_vndr/Makefile.am b/geometry/ibm_vndr/Makefile.am
index 883420e6..6e80f01f 100644
--- a/geometry/ibm_vndr/Makefile.am
+++ b/geometry/ibm_vndr/Makefile.am
@@ -3,4 +3,4 @@ thinkpad
 
 EXTRA_DIST= $(geom_DATA)
                                                                                           
-geomdir = $(xkb_base)/geometry/ibm.vndr
+geomdir = $(xkb_base)/geometry/ibm_vndr
diff --git a/geometry/ibm_vndr/thinkpad b/geometry/ibm_vndr/thinkpad
index 9eaf5323..6599c418 100644
--- a/geometry/ibm_vndr/thinkpad
+++ b/geometry/ibm_vndr/thinkpad
@@ -167,7 +167,7 @@ xkb_geometry "common" {
 // 85 keys
 // US/English (FRU 02K4785).
 xkb_geometry "us" {
-    include "ibm.vndr/thinkpad(common)"
+    include "ibm_vndr/thinkpad(common)"
     description = "IBM ThinkPad 560Z/600/600E/A22E, US";
 
     shape "RTRN" { cornerRadius = 1, { [43, 18] }, { [2.5, 0], [40.5, 14] } };
@@ -217,7 +217,7 @@ xkb_geometry "us" {
 // 86 keys
 // Tested on: DE/German, UK/English (FRU 02K4787).
 xkb_geometry "intl" {
-    include "ibm.vndr/thinkpad(common)"
+    include "ibm_vndr/thinkpad(common)"
     description = "IBM ThinkPad 560Z/600/600E/A22E, Intl";
 
     shape "RTRN" { cornerRadius = 1, { [28, 0], [28, 37], [4, 37], [4, 18],
diff --git a/geometry/sgi_vndr/Makefile.am b/geometry/sgi_vndr/Makefile.am
index c72d1c2b..52ce17d7 100644
--- a/geometry/sgi_vndr/Makefile.am
+++ b/geometry/sgi_vndr/Makefile.am
@@ -3,4 +3,4 @@ indigo  indy  O2
 
 EXTRA_DIST= $(geom_DATA)
                                                                                           
-geomdir = $(xkb_base)/geometry/sgi.vndr
+geomdir = $(xkb_base)/geometry/sgi_vndr
diff --git a/keycodes/digital_vndr/Makefile.am b/keycodes/digital_vndr/Makefile.am
index 29dad843..471f8bbd 100644
--- a/keycodes/digital_vndr/Makefile.am
+++ b/keycodes/digital_vndr/Makefile.am
@@ -3,4 +3,4 @@ lk pc
                                                                                           
 EXTRA_DIST= $(kc_DATA)
                                                                                           
-kcdir = $(xkb_base)/keycodes/digital.vndr
+kcdir = $(xkb_base)/keycodes/digital_vndr
diff --git a/keycodes/digital_vndr/lk b/keycodes/digital_vndr/lk
index d9fbcba6..8523b95d 100644
--- a/keycodes/digital_vndr/lk
+++ b/keycodes/digital_vndr/lk
@@ -151,7 +151,7 @@ xkb_keycodes "lk_common" {
 };
 
 xkb_keycodes "lkx01" {
-    include "digital.vndr/lk(lk_common)"
+    include "digital_vndr/lk(lk_common)"
     <AB00>	= 201;
     <FK13>	= 115;
     <FK14>	= 116;
@@ -178,7 +178,7 @@ xkb_keycodes "lkx01" {
 };
 
 xkb_keycodes "lk201" {
-    include "digital.vndr/lk(lkx01)"
+    include "digital_vndr/lk(lkx01)"
     indicator 4 = "Scroll Lock";
     indicator 3 = "Caps Lock";
     indicator 2 = "Compose";
@@ -186,20 +186,20 @@ xkb_keycodes "lk201" {
 };
 
 xkb_keycodes "lk421" {
-    include	"digital.vndr/lk(lkx01)"
+    include	"digital_vndr/lk(lkx01)"
     <LALT>	= 172;
     <RALT>	= 178;
     <RCMP>	= 173;
 };
 
 xkb_keycodes "lk401" {
-    include	"digital.vndr/lk(lk421)"
+    include	"digital_vndr/lk(lk421)"
     indicator 4 = "Scroll Lock";
     indicator 3 = "Caps Lock";
 };
 
 xkb_keycodes "lk44x" {
-    include "digital.vndr/lk(lk_common)"
+    include "digital_vndr/lk(lk_common)"
     <ESC>	= 85;
     <PRSC>	= 115;
     <SCLK>	= 116;
@@ -221,7 +221,7 @@ xkb_keycodes "lk44x" {
 };
 
 xkb_keycodes "lk443" {
-    include "digital.vndr/lk(lk44x)"
+    include "digital_vndr/lk(lk44x)"
     <BKSL>	= 247;
     indicator 3 = "Caps Lock";
     indicator 4 = "Scroll Lock";
@@ -229,7 +229,7 @@ xkb_keycodes "lk443" {
 };
 
 xkb_keycodes "lk444" {
-    include "digital.vndr/lk(lk44x)"
+    include "digital_vndr/lk(lk44x)"
     <BKSL>	= 201;
     <AC12>	= 247;
     indicator 3 = "Caps Lock";
@@ -247,25 +247,25 @@ xkb_keycodes "lk444" {
 // LK441-LT = lk443
 
 xkb_keycodes "lk421aj" {
-    include "digital.vndr/lk(lk421)"
+    include "digital_vndr/lk(lk421)"
     <AB11>  = 252;
 };
 
 xkb_keycodes "lk421jj" {
-    include "digital.vndr/lk(lk421aj)"
+    include "digital_vndr/lk(lk421aj)"
     <MUHE>  = 94;
     <KANJ>  = 95;
     <HIRA>  = 97;
 };
 
 xkb_keycodes "lk401bj" {
-    include "digital.vndr/lk(lk401)"
+    include "digital_vndr/lk(lk401)"
     <MUHE>  = 94;
     <KANJ>  = 95;
     <HIRA>  = 97;
 };
 
 xkb_keycodes "lk401jj" {
-    include "digital.vndr/lk(lk401bj)"
+    include "digital_vndr/lk(lk401bj)"
     <AB11>  = 252;
 };
diff --git a/keycodes/digital_vndr/pc b/keycodes/digital_vndr/pc
index d37053aa..51171562 100644
--- a/keycodes/digital_vndr/pc
+++ b/keycodes/digital_vndr/pc
@@ -160,7 +160,7 @@ xkb_keycodes "pc_common" {
 };
 
 xkb_keycodes "pc10x" {
-    include "digital.vndr/pc(pc_common)"
+    include "digital_vndr/pc(pc_common)"
     <ESC>	= 8;
     <AE00>	= 14;
     <PRSC>	= 87;
@@ -186,28 +186,28 @@ xkb_keycodes "pc10x" {
 };
 
 xkb_keycodes "pc101" {
-    include "digital.vndr/pc(pc10x)"
+    include "digital_vndr/pc(pc10x)"
     <BKSL>  = 92;
     indicator 5 = "Num Lock";
 };
 
 
 xkb_keycodes "pc102" {
-    include "digital.vndr/pc(pc10x)"
+    include "digital_vndr/pc(pc10x)"
     <BKSL>  = 19;
     <AC12>  = 83;
     indicator 5 = "Num Lock";
 };
 
 xkb_keycodes "pc104" {
-    include "digital.vndr/pc(pc101)"
+    include "digital_vndr/pc(pc101)"
     <LWIN>  = 139;
     <RWIN>  = 140;
     <MENU>  = 141;
 };
 
 xkb_keycodes "lk411_common" {
-    include "digital.vndr/pc(pc_common)"
+    include "digital_vndr/pc(pc_common)"
     <AE00>      = 8;
     <AB00>      = 14;
     <FK13>	= 24;
@@ -240,12 +240,12 @@ xkb_keycodes "lk411_common" {
 };
 
 xkb_keycodes "lk411" {
-    include "digital.vndr/pc(lk411_common)"
+    include "digital_vndr/pc(lk411_common)"
     <BKSL>	= 92;
 };
 
 xkb_keycodes "lk450" {
-    include	"digital.vndr/pc(lk411)"
+    include	"digital_vndr/pc(lk411)"
     indicator 2 = "Compose";
     indicator 1 = "Wait";
 };
@@ -258,7 +258,7 @@ xkb_keycodes "lk450" {
 // LK411-LT = lk411
 
 xkb_keycodes "pcxajaa" {
-    include "digital.vndr/pc(pc10x)"
+    include "digital_vndr/pc(pc10x)"
     <BKSL>  = 93;
     <AC12>  = 83;
     <AB11>  = 81;
@@ -269,7 +269,7 @@ xkb_keycodes "pcxajaa" {
 };
 
 xkb_keycodes "lk411jj" {
-    include "digital.vndr/pc(lk411_common)"
+    include "digital_vndr/pc(lk411_common)"
     <AB11>  = 81;
     <BKSL>  = 83;
     <MUHE>  = 133;
diff --git a/keycodes/sgi_vndr/Makefile.am b/keycodes/sgi_vndr/Makefile.am
index 25a3f58b..9cf7804b 100644
--- a/keycodes/sgi_vndr/Makefile.am
+++ b/keycodes/sgi_vndr/Makefile.am
@@ -3,4 +3,4 @@ indigo indy iris
                                                                                           
 EXTRA_DIST= $(kc_DATA)
                                                                                           
-kcdir = $(xkb_base)/keycodes/sgi.vndr
+kcdir = $(xkb_base)/keycodes/sgi_vndr
diff --git a/keycodes/sgi_vndr/indigo b/keycodes/sgi_vndr/indigo
index 35aef870..fd87e57b 100644
--- a/keycodes/sgi_vndr/indigo
+++ b/keycodes/sgi_vndr/indigo
@@ -135,6 +135,6 @@ default xkb_keycodes "pc101" {
     indicator 7 = "Scroll Lock";
 };
 xkb_keycodes "pc102" {
-    include "sgi.vndr/indigo(pc101)"
+    include "sgi_vndr/indigo(pc101)"
     <LSGT> = 118;
 };
diff --git a/keycodes/sgi_vndr/indy b/keycodes/sgi_vndr/indy
index cd242677..a777c374 100644
--- a/keycodes/sgi_vndr/indy
+++ b/keycodes/sgi_vndr/indy
@@ -2,7 +2,7 @@
 default xkb_keycodes "universal" {
     minimum= 15;
     maximum= 149;
-    include "sgi.vndr/indy(pc105)"
+    include "sgi_vndr/indy(pc105)"
     alternate <BKSL> = 91;
     alternate <BKSL> = 100;
     alternate <BKSL> = 101;
@@ -146,12 +146,12 @@ xkb_keycodes "pc101" {
 xkb_keycodes "pc102" {
     <BKSL> = 91;
     <LSGT> = 27;
-    augment "sgi.vndr/indy(pc101)"
+    augment "sgi_vndr/indy(pc101)"
     maximum= 149;
     minimum= 15;
 };
 xkb_keycodes "pc104" {
-    include "sgi.vndr/indy(pc101)"
+    include "sgi_vndr/indy(pc101)"
     minimum= 15;
     maximum= 149;
 
@@ -163,7 +163,7 @@ xkb_keycodes "pc104" {
 };
 xkb_keycodes "pc105" {
     <LSGT> = 27;
-    augment "sgi.vndr/indy(pc104)"
+    augment "sgi_vndr/indy(pc104)"
     minimum= 15;
     maximum= 149;
 };
@@ -177,7 +177,7 @@ xkb_keycodes "jp106" {
     alias <TLDE> = <HZTG>;
     alias <AE00> = <HZTG>;
     alias <AE13> = <BKSL>;
-    augment "sgi.vndr/indy(pc101)"
+    augment "sgi_vndr/indy(pc101)"
     minimum= 15;
     maximum= 149;
 };
diff --git a/keycodes/sgi_vndr/iris b/keycodes/sgi_vndr/iris
index 70cf9be3..a4118a6b 100644
--- a/keycodes/sgi_vndr/iris
+++ b/keycodes/sgi_vndr/iris
@@ -1,6 +1,6 @@
 // $Xorg: iris,v 1.3 2000/08/17 19:54:39 cpqbld Exp $
 default xkb_keycodes "iris" {
-    include "sgi.vndr/indigo(pc101)"
+    include "sgi_vndr/indigo(pc101)"
     indicator 1 = "L1";
     indicator 2 = "L2";
     indicator 3 = "L3";
diff --git a/keymap/digital_vndr/Makefile.am b/keymap/digital_vndr/Makefile.am
index f592c5cc..b17bbe33 100644
--- a/keymap/digital_vndr/Makefile.am
+++ b/keymap/digital_vndr/Makefile.am
@@ -3,6 +3,6 @@ us
                                                                                           
 EXTRA_DIST= $(km_DATA)
                                                                                           
-kmdir = $(xkb_base)/keymap/digital.vndr
+kmdir = $(xkb_base)/keymap/digital_vndr
 
 
diff --git a/keymap/digital_vndr/us b/keymap/digital_vndr/us
index c1648be5..7f5180e2 100644
--- a/keymap/digital_vndr/us
+++ b/keymap/digital_vndr/us
@@ -55,134 +55,134 @@
 // **************************************************************
 
 xkb_keymap "lk201" {
-    xkb_keycodes        { include "digital.vndr/lk(lk201)" 		};
+    xkb_keycodes        { include "digital_vndr/lk(lk201)" 		};
     xkb_types           { include "default"    	        	};
     xkb_compatibility   { include "default"			};
-    xkb_symbols         { include "digital.vndr/us(vt105)"		};
+    xkb_symbols         { include "digital_vndr/us(vt105)"		};
     xkb_geometry	{ description = "Digital US LK201";
-			  include "digital.vndr/lk(lk201)"		};
+			  include "digital_vndr/lk(lk201)"		};
 };
 
 xkb_keymap "lk401" {
-    xkb_keycodes        { include "digital.vndr/lk(lk401)" 		};
+    xkb_keycodes        { include "digital_vndr/lk(lk401)" 		};
     xkb_types           { include "default"    	        	};
     xkb_compatibility   { include "default"			};
-    xkb_symbols         { include "digital.vndr/us(vt108)"		};
+    xkb_symbols         { include "digital_vndr/us(vt108)"		};
     xkb_geometry	{ description = "Digital US LK401";
-			  include "digital.vndr/lk(lk401)"		};
+			  include "digital_vndr/lk(lk401)"		};
 };
 
 xkb_keymap "lk411" {
-    xkb_keycodes        { include "digital.vndr/pc(lk411)" 		};
+    xkb_keycodes        { include "digital_vndr/pc(lk411)" 		};
     xkb_types           { include "default"    	        	};
     xkb_compatibility   { include "default"			};
-    xkb_symbols         { include "digital.vndr/us(vt108)"		};
+    xkb_symbols         { include "digital_vndr/us(vt108)"		};
     xkb_geometry	{ description = "Digital US LK411";
-			  include "digital.vndr/lk(lk401)"		};
+			  include "digital_vndr/lk(lk401)"		};
 };
 
 xkb_keymap "lk421" {
-    xkb_keycodes        { include "digital.vndr/lk(lk421)"		};
+    xkb_keycodes        { include "digital_vndr/lk(lk421)"		};
     xkb_types           { include "default"    	        	};
     xkb_compatibility   { include "default"	        	};
-    xkb_symbols         { include "digital.vndr/us(unix)"		};
+    xkb_symbols         { include "digital_vndr/us(unix)"		};
     xkb_geometry	{ description = "Digital US LK421";
-			  include "digital.vndr/unix(unix)"		};
+			  include "digital_vndr/unix(unix)"		};
 };
 
 xkb_keymap "lk441" {
-    xkb_keycodes        { include "digital.vndr/lk(lk443)" 		};
+    xkb_keycodes        { include "digital_vndr/lk(lk443)" 		};
     xkb_types           { include "default"    	        	};
     xkb_compatibility   { include "default"			};
-    xkb_symbols         { include "digital.vndr/us(lk44x)"		};
+    xkb_symbols         { include "digital_vndr/us(lk44x)"		};
     xkb_geometry	{ description = "Digital US LK441";
-			  include "digital.vndr/pc(pc101)"
-			  include "digital.vndr/pc(leds_alone)"	};
+			  include "digital_vndr/pc(pc101)"
+			  include "digital_vndr/pc(leds_alone)"	};
 };
 
 xkb_keymap "lk443" {
-    xkb_keycodes        { include "digital.vndr/lk(lk443)" 		};
+    xkb_keycodes        { include "digital_vndr/lk(lk443)" 		};
     xkb_types           { include "default"    	        	};
     xkb_compatibility   { include "default"			};
-    xkb_symbols         { include "digital.vndr/us(lk44x)"		};
+    xkb_symbols         { include "digital_vndr/us(lk44x)"		};
     xkb_geometry	{ description = "Digital US LK443";
-			  include "digital.vndr/pc(pc101)"
-			  include "digital.vndr/pc(leds_alone)"	};
+			  include "digital_vndr/pc(pc101)"
+			  include "digital_vndr/pc(leds_alone)"	};
 };
 
 xkb_keymap "lk44x" {
-    xkb_keycodes        { include "digital.vndr/lk(lk443)" 		};
+    xkb_keycodes        { include "digital_vndr/lk(lk443)" 		};
     xkb_types           { include "default"    	        	};
     xkb_compatibility   { include "default"			};
-    xkb_symbols         { include "digital.vndr/us(lk44x)"		};
+    xkb_symbols         { include "digital_vndr/us(lk44x)"		};
     xkb_geometry	{ description = "Digital US LK443";
-			  include "digital.vndr/pc(pc101)"
-			  include "digital.vndr/pc(leds_alone)"	};
+			  include "digital_vndr/pc(pc101)"
+			  include "digital_vndr/pc(leds_alone)"	};
 };
 
 xkb_keymap "lk450" {
-    xkb_keycodes        { include "digital.vndr/pc(lk450)" 		};
+    xkb_keycodes        { include "digital_vndr/pc(lk450)" 		};
     xkb_types           { include "default"    	        	};
     xkb_compatibility   { include "default"			};
-    xkb_symbols         { include "digital.vndr/us(vt108)"		};
+    xkb_symbols         { include "digital_vndr/us(vt108)"		};
     xkb_geometry	{ description = "Digital US LK450";
-			  include "digital.vndr/lk(lk450)"		};
+			  include "digital_vndr/lk(lk450)"		};
 };
 
 xkb_keymap "pcxalaa" {
-    xkb_keycodes        { include "digital.vndr/pc(pc101)" 		};
+    xkb_keycodes        { include "digital_vndr/pc(pc101)" 		};
     xkb_types           { include "default"   	 		};
     xkb_compatibility   { include "default"			};
-    xkb_symbols         { include "digital.vndr/us(pcxalaa)"		};
+    xkb_symbols         { include "digital_vndr/us(pcxalaa)"		};
     xkb_geometry	{ description = "Digital US PCXAL-AA";
-			  include "digital.vndr/pc(pc101)"
-			  include "digital.vndr/pc(leds_alone)"	};
+			  include "digital_vndr/pc(pc101)"
+			  include "digital_vndr/pc(leds_alone)"	};
 };
 
 xkb_keymap "pcxalfa" {
-    xkb_keycodes        { include "digital.vndr/pc(pc101)" 		};
+    xkb_keycodes        { include "digital_vndr/pc(pc101)" 		};
     xkb_types           { include "default"   	 		};
     xkb_compatibility   { include "default"			};
-    xkb_symbols         { include "digital.vndr/us(pcxalfa)"		};
+    xkb_symbols         { include "digital_vndr/us(pcxalfa)"		};
     xkb_geometry	{ description = "Digital US PCXAL-FA";
-			  include "digital.vndr/pc(pc101)"
-			  include "digital.vndr/pc(leds_on_keys)"	};
+			  include "digital_vndr/pc(pc101)"
+			  include "digital_vndr/pc(leds_on_keys)"	};
 };
 
 xkb_keymap "pcxalga" {
-    xkb_keycodes        { include "digital.vndr/pc(pc101)" 		};
+    xkb_keycodes        { include "digital_vndr/pc(pc101)" 		};
     xkb_types           { include "default"   	 		};
     xkb_compatibility   { include "default"			};
-    xkb_symbols         { include "digital.vndr/us(pcxalga)"		};
+    xkb_symbols         { include "digital_vndr/us(pcxalga)"		};
     xkb_geometry	{ description = "Digital US PCXAL-GA";
-			  include "digital.vndr/pc(pc101)"
-			  include "digital.vndr/pc(leds_alone)"	};
+			  include "digital_vndr/pc(pc101)"
+			  include "digital_vndr/pc(leds_alone)"	};
 };
 
 xkb_keymap "pcxalka" {
-    xkb_keycodes        { include "digital.vndr/pc(pc101)" 		};
+    xkb_keycodes        { include "digital_vndr/pc(pc101)" 		};
     xkb_types           { include "default"   	 		};
     xkb_compatibility   { include "default"			};
-    xkb_symbols         { include "digital.vndr/us(pcxalka)"		};
+    xkb_symbols         { include "digital_vndr/us(pcxalka)"		};
     xkb_geometry	{ description = "Digital US PCXAL-KA";
-			  include "digital.vndr/pc(pc101)"
-			  include "digital.vndr/pc(leds_alone)"	};
+			  include "digital_vndr/pc(pc101)"
+			  include "digital_vndr/pc(leds_alone)"	};
 };
 
 xkb_keymap "pcxal" {
-    xkb_keycodes        { include "digital.vndr/pc(pc101)" 		};
+    xkb_keycodes        { include "digital_vndr/pc(pc101)" 		};
     xkb_types           { include "default"   	 		};
     xkb_compatibility   { include "default"			};
-    xkb_symbols         { include "digital.vndr/us(pcxal)"		};
+    xkb_symbols         { include "digital_vndr/us(pcxal)"		};
     xkb_geometry	{ description = "Digital US PCXAL";
-			  include "digital.vndr/pc(pc101)"
-			  include "digital.vndr/pc(leds_alone)"	};
+			  include "digital_vndr/pc(pc101)"
+			  include "digital_vndr/pc(leds_alone)"	};
 };
 
 xkb_keymap "mnk" {
-    xkb_keycodes        { include "digital.vndr/pc(pc104)" 		};
+    xkb_keycodes        { include "digital_vndr/pc(pc104)" 		};
     xkb_types           { include "default"   	 		};
     xkb_compatibility   { include "default"			};
-    xkb_symbols         { include "digital.vndr/us(pc104)"		};
+    xkb_symbols         { include "digital_vndr/us(pc104)"		};
     xkb_geometry	{ include "microsoft"			};
 };
diff --git a/keymap/macintosh b/keymap/macintosh
index 80aa12c7..f3fb5533 100644
--- a/keymap/macintosh
+++ b/keymap/macintosh
@@ -4,7 +4,7 @@ default xkb_keymap "macintosh" {
     xkb_keycodes	{ include "xfree86"				};
     xkb_types		{ include "default"				};
     xkb_compatibility	{ include "default"				};
-    xkb_symbols		{ include "macintosh.vndr/us(extended)"		};
+    xkb_symbols		{ include "macintosh_vndr/us(extended)"		};
     xkb_geometry	{ include "macintosh"				};
 };
 
@@ -12,6 +12,6 @@ xkb_keymap "macintosh_old" {
     xkb_keycodes	{ include "macintosh"				};
     xkb_types		{ include "default"				};
     xkb_compatibility	{ include "default"				};
-    xkb_symbols		{ include "macintosh.vndr/us(extended)"		};
+    xkb_symbols		{ include "macintosh_vndr/us(extended)"		};
     xkb_geometry	{ include "macintosh"				};
 };
diff --git a/keymap/sgi_vndr/Makefile.am b/keymap/sgi_vndr/Makefile.am
index 8020d247..4acb4f2a 100644
--- a/keymap/sgi_vndr/Makefile.am
+++ b/keymap/sgi_vndr/Makefile.am
@@ -11,4 +11,4 @@ th us
                                                                                           
 EXTRA_DIST= $(km_DATA)
                                                                                           
-kmdir = $(xkb_base)/keymap/sgi.vndr
+kmdir = $(xkb_base)/keymap/sgi_vndr
diff --git a/keymap/sgi_vndr/be b/keymap/sgi_vndr/be
index ed80bd32..9905f0ba 100644
--- a/keymap/sgi_vndr/be
+++ b/keymap/sgi_vndr/be
@@ -1,34 +1,34 @@
 // $Xorg: be,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
 default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi.vndr/indy(universal)"		};
+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
     xkb_types		{ include "default"			};
     xkb_compatibility	{ include "default"			};
     xkb_symbols 	{ include "en_US(pc_universal)+be"	};
-    xkb_geometry	{ include "sgi.vndr/indy(pc102)"		};
+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
 };
 xkb_keymap "indy_nodeadkeys" {
-    xkb_keycodes	{ include "sgi.vndr/indy(universal)"	};
+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
     xkb_symbols 	{ 
 	include "en_US(pc_universal_nodeadkeys)+be(nodeadkeys)"
     };
-    xkb_geometry	{ include "sgi.vndr/indy(pc102)"	};
+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};
 };
 xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi.vndr/indigo(pc102)"	};
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
     xkb_symbols 	{ include "en_US(pc102)+be"	};
-    xkb_geometry	{ include "sgi.vndr/indigo(pc102)"	};
+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
 };
 xkb_keymap "indigo_nodeadkeys" {
-    xkb_keycodes	{ include "sgi.vndr/indigo(pc102)"	};
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
     xkb_symbols 	{ 
 	include "en_US(pc102_nodeadkeys)+be(nodeadkeys)"
     };
-    xkb_geometry	{ include "sgi.vndr/indigo(pc102)"	};
+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
 };
 
diff --git a/keymap/sgi_vndr/bg b/keymap/sgi_vndr/bg
index c1709884..4f925733 100644
--- a/keymap/sgi_vndr/bg
+++ b/keymap/sgi_vndr/bg
@@ -1,19 +1,19 @@
 // $Xorg: bg,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
 default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi.vndr/indy(universal)"	};
+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
     xkb_symbols  { 
 	include "us(pc_universal)+bg+group(shift_toggle)"
     };
-    xkb_geometry	{ include "sgi.vndr/indy(pc102)"	};
+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};
 };
 xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi.vndr/indigo(pc102)"	};
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
     xkb_symbols { 
 	include "us(pc102)+bg+group(shift_toggle)"
     };
-    xkb_geometry	{ include "sgi.vndr/indigo(pc102)"	};
+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
 };
diff --git a/keymap/sgi_vndr/ca b/keymap/sgi_vndr/ca
index e1b862c5..38f48965 100644
--- a/keymap/sgi_vndr/ca
+++ b/keymap/sgi_vndr/ca
@@ -1,33 +1,33 @@
 // $Xorg: ca,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
 default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi.vndr/indy(universal)"		};
+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
     xkb_types		{ include "default"			};
     xkb_compatibility	{ include "default"			};
     xkb_symbols 	{ include "en_US(pc_universal)+ca"	};
-    xkb_geometry	{ include "sgi.vndr/indy(pc102)"		};
+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
 };
 xkb_keymap "indy_nodeadkeys" {
-    xkb_keycodes	{ include "sgi.vndr/indy(universal)"	};
+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
     xkb_symbols 	{ 
 	include "en_US(pc_universal_nodeadkeys)+ca(nodeadkeys)"
     };
-    xkb_geometry	{ include "sgi.vndr/indy(pc102)"	};
+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};
 };
 xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi.vndr/indigo(pc102)"	};
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
     xkb_symbols 	{ include "en_US(pc102)+ca"	};
-    xkb_geometry	{ include "sgi.vndr/indigo(pc102)"	};
+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
 };
 xkb_keymap "indigo_nodeadkeys" {
-    xkb_keycodes	{ include "sgi.vndr/indigo(pc102)"	};
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
     xkb_symbols 	{
 	include "en_US(pc102_nodeadkeys)+ca(nodeadkeys)"
     };
-    xkb_geometry	{ include "sgi.vndr/indigo(pc102)"	};
+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
 };
diff --git a/keymap/sgi_vndr/ch b/keymap/sgi_vndr/ch
index e7ba8689..6970a367 100644
--- a/keymap/sgi_vndr/ch
+++ b/keymap/sgi_vndr/ch
@@ -1,67 +1,67 @@
 // $Xorg: de_CH,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
 default xkb_keymap "de_indy" {
-    xkb_keycodes	{ include "sgi.vndr/indy(universal)"		};
+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
     xkb_types		{ include "default"			};
     xkb_compatibility	{ include "default"			};
     xkb_symbols 	{ include "en_US(pc_universal)+ch(de)"	};
-    xkb_geometry	{ include "sgi.vndr/indy(pc102)"		};
+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
 };
 xkb_keymap "de_indy_nodeadkeys" {
-    xkb_keycodes	{ include "sgi.vndr/indy(universal)"	};
+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
     xkb_symbols 	{ 
 	include "en_US(pc_universal_nodeadkeys)+ch(de_nodeadkeys)"
     };
-    xkb_geometry	{ include "sgi.vndr/indy(pc102)"	};
+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};
 };
 xkb_keymap "de_indigo" {
-    xkb_keycodes	{ include "sgi.vndr/indigo(pc102)"	};
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
     xkb_symbols 	{ include "en_US(pc102)+ch(de)"	};
-    xkb_geometry	{ include "sgi.vndr/indigo(pc102)"	};
+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
 };
 xkb_keymap "de_indigo_nodeadkeys" {
-    xkb_keycodes	{ include "sgi.vndr/indigo(pc102)"	};
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
     xkb_symbols 	{ 
 	include "en_US(pc102_nodeadkeys)+ch(dr_nodeadkeys)"
     };
-    xkb_geometry	{ include "sgi.vndr/indigo(pc102)"	};
+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
 };
 
 default xkb_keymap "fr_indy" {
-    xkb_keycodes	{ include "sgi.vndr/indy(universal)"		};
+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
     xkb_types		{ include "default"			};
     xkb_compatibility	{ include "default"			};
     xkb_symbols 	{ include "en_US(pc_universal)+ch(fr)"	};
-    xkb_geometry	{ include "sgi.vndr/indy(pc102)"		};
+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
 };
 xkb_keymap "fr_indy_nodeadkeys" {
-    xkb_keycodes	{ include "sgi.vndr/indy(universal)"	};
+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
     xkb_symbols 	{ 
 	include "en_US(pc_universal_nodeadkeys)+ch(fr_nodeadkeys)"
     };
-    xkb_geometry	{ include "sgi.vndr/indy(pc102)"	};
+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};
 };
 xkb_keymap "fr_indigo" {
-    xkb_keycodes	{ include "sgi.vndr/indigo(pc102)"	};
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
     xkb_symbols 	{ include "en_US(pc102)+ch(fr)"	};
-    xkb_geometry	{ include "sgi.vndr/indigo(pc102)"	};
+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
 };
 xkb_keymap "fr_indigo_nodeadkeys" {
-    xkb_keycodes	{ include "sgi.vndr/indigo(pc102)"	};
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
     xkb_symbols 	{ 
 	include "en_US(pc102_nodeadkeys)+ch(fr_nodeadkeys)"
     };
-    xkb_geometry	{ include "sgi.vndr/indigo(pc102)"	};
+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
 };
 
diff --git a/keymap/sgi_vndr/cz b/keymap/sgi_vndr/cz
index df8c707e..0f7e2165 100644
--- a/keymap/sgi_vndr/cz
+++ b/keymap/sgi_vndr/cz
@@ -5,32 +5,32 @@
 // $XFree86$
 
 default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi.vndr/indy(universal)"		};
+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
     xkb_types		{ include "default"			};
     xkb_compatibility	{ include "default"			};
     xkb_symbols 	{ include "us(pc_universal)+cz"		};
-    xkb_geometry	{ include "sgi.vndr/indy(pc102)"		};
+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
 };
 xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi.vndr/indigo(pc102)"		};
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
     xkb_types		{ include "default"			};
     xkb_compatibility	{ include "default"			};
     xkb_symbols 	{ include "us(pc102)+cz"		};
-    xkb_geometry	{ include "sgi.vndr/indigo(pc102)"		};
+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
 };
 
 default xkb_keymap "indy_qwerty" {
-    xkb_keycodes	{ include "sgi.vndr/indy(universal)"		};
+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
     xkb_types		{ include "default"			};
     xkb_compatibility	{ include "default"			};
     xkb_symbols 	{ include "us(pc_universal)+cz(qwerty)"  };
-    xkb_geometry	{ include "sgi.vndr/indy(pc102)"		};
+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
 };
 xkb_keymap "indigo_qwerty" {
-    xkb_keycodes	{ include "sgi.vndr/indigo(pc102)"		};
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
     xkb_types		{ include "default"			};
     xkb_compatibility	{ include "default"			};
     xkb_symbols 	{ include "us(pc102)+cz(qwerty)"		};
-    xkb_geometry	{ include "sgi.vndr/indigo(pc102)"		};
+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
 };
 
diff --git a/keymap/sgi_vndr/de b/keymap/sgi_vndr/de
index 3286de2c..1ad7fe7b 100644
--- a/keymap/sgi_vndr/de
+++ b/keymap/sgi_vndr/de
@@ -1,34 +1,34 @@
 // $Xorg: de,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
 default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi.vndr/indy(universal)"			};
+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"			};
     xkb_types		{ include "default"				};
     xkb_compatibility	{ include "default"				};
     xkb_symbols 	{ include "en_US(pc_universal)+de"		};
-    xkb_geometry	{ include "sgi.vndr/indy(pc102)"			};
+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"			};
 };
 xkb_keymap "indy_nodeadkeys" {
-    xkb_keycodes	{ include "sgi.vndr/indy(universal)"		};
+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
     xkb_types		{ include "default"			};
     xkb_compatibility	{ include "default"			};
     xkb_symbols 	{ 
 	include "en_US(pc_universal_nodeadkeys)+de(nodeadkeys)"
     };
-    xkb_geometry	{ include "sgi.vndr/indy(pc102)"		};
+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
 };
 xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi.vndr/indigo(pc102)"		};
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
     xkb_types		{ include "default"			};
     xkb_compatibility	{ include "default"			};
     xkb_symbols 	{ include "en_US(pc102)+de"		};
-    xkb_geometry	{ include "sgi.vndr/indigo(pc102)"		};
+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
 };
 xkb_keymap "indigo_nodeadkeys" {
-    xkb_keycodes	{ include "sgi.vndr/indigo(pc102)"		};
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
     xkb_types		{ include "default"			};
     xkb_compatibility	{ include "default"			};
     xkb_symbols {
 	include "en_US(pc102_nodeadkeys)+de(nodeadkeys)"
     };
-    xkb_geometry	{ include "sgi.vndr/indigo(pc102)"		};
+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
 };
 
diff --git a/keymap/sgi_vndr/dk b/keymap/sgi_vndr/dk
index 9fb71ad1..832f01da 100644
--- a/keymap/sgi_vndr/dk
+++ b/keymap/sgi_vndr/dk
@@ -1,34 +1,34 @@
 // $Xorg: dk,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
 default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi.vndr/indy(universal)"			};
+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"			};
     xkb_types		{ include "default"				};
     xkb_compatibility	{ include "default"				};
     xkb_symbols 	{ include "en_US(pc_universal)+dk"		};
-    xkb_geometry	{ include "sgi.vndr/indy(pc102)"			};
+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"			};
 };
 xkb_keymap "indy_nodeadkeys" {
-    xkb_keycodes	{ include "sgi.vndr/indy(universal)"		};
+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
     xkb_types		{ include "default"			};
     xkb_compatibility	{ include "default"			};
     xkb_symbols 	{ 
 	include "en_US(pc_universal_nodeadkeys)+dk(nodeadkeys)"
     };
-    xkb_geometry	{ include "sgi.vndr/indy(pc102)"		};
+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
 };
 xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi.vndr/indigo(pc102)"		};
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
     xkb_types		{ include "default"			};
     xkb_compatibility	{ include "default"			};
     xkb_symbols 	{ include "en_US(pc102)+dk"		};
-    xkb_geometry	{ include "sgi.vndr/indigo(pc102)"		};
+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
 };
 xkb_keymap "indigo_nodeadkeys" {
-    xkb_keycodes	{ include "sgi.vndr/indigo(pc102)"		};
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
     xkb_types		{ include "default"			};
     xkb_compatibility	{ include "default"			};
     xkb_symbols 	{ 
 	include "en_US(pc102_nodeadkeys)+dk(nodeadkeys)"
     };
-    xkb_geometry	{ include "sgi.vndr/indigo(pc102)"		};
+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
 };
 
diff --git a/keymap/sgi_vndr/dvorak b/keymap/sgi_vndr/dvorak
index 9c51632b..bd594b0e 100644
--- a/keymap/sgi_vndr/dvorak
+++ b/keymap/sgi_vndr/dvorak
@@ -1,15 +1,15 @@
 // $Xorg: dvorak,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
 default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi.vndr/indy(universal)"		};
+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
     xkb_types		{ include "default"			};
     xkb_compatibility	{ include "default"			};
     xkb_symbols 	{ include "us(pc_universal)+dvorak"	};
-    xkb_geometry	{ include "sgi.vndr/indy(pc101)"		};
+    xkb_geometry	{ include "sgi_vndr/indy(pc101)"		};
 };
 xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi.vndr/indigo"		};
+    xkb_keycodes	{ include "sgi_vndr/indigo"		};
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
     xkb_symbols 	{ include "us(pc101)+dvorak"	};
-    xkb_geometry	{ include "sgi.vndr/indigo(pc101)"	};
+    xkb_geometry	{ include "sgi_vndr/indigo(pc101)"	};
 };
diff --git a/keymap/sgi_vndr/en_US b/keymap/sgi_vndr/en_US
index b4702236..76f3d037 100644
--- a/keymap/sgi_vndr/en_US
+++ b/keymap/sgi_vndr/en_US
@@ -1,58 +1,58 @@
 // $Xorg: en_US,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
 default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi.vndr/indy(universal)"	};
+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
     xkb_symbols 	{ include "en_US(pc_universal)"	};
-    xkb_geometry	{ include "sgi.vndr/indy(pc102)"	};
+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};
 };
 xkb_keymap "indy_nodeadkeys" {
-    xkb_keycodes	{ include "sgi.vndr/indy(universal)"			};
+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"			};
     xkb_types		{ include "default"				};
     xkb_compatibility	{ include "default"				};
     xkb_symbols 	{ include "en_US(pc_universal_nodeadkeys)"	};
-    xkb_geometry	{ include "sgi.vndr/indy(pc102)"			};
+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"			};
 };
 xkb_keymap "indy101" {
-    xkb_keycodes	{ include "sgi.vndr/indy(universal)"	};
+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
     xkb_symbols 	{ include "en_US(pc_universal)"	};
-    xkb_geometry	{ include "sgi.vndr/indy(pc101)"	};
+    xkb_geometry	{ include "sgi_vndr/indy(pc101)"	};
 };
 xkb_keymap "indy101_nodeadkeys" {
-    xkb_keycodes	{ include "sgi.vndr/indy(universal)"			};
+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"			};
     xkb_types		{ include "default"				};
     xkb_compatibility	{ include "default"				};
     xkb_symbols 	{ include "en_US(pc_universal_nodeadkeys)"	};
-    xkb_geometry	{ include "sgi.vndr/indy(pc101)"			};
+    xkb_geometry	{ include "sgi_vndr/indy(pc101)"			};
 };
 xkb_keymap "indy104" {
-    xkb_keycodes	{ include "sgi.vndr/indy(universal)"	};
+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
     xkb_symbols 	{ include "en_US(pc_universal)"	};
     xkb_geometry	{ include "microsoft(natural)"	};
 };
 xkb_keymap "indy104_nodeadkeys" {
-    xkb_keycodes	{ include "sgi.vndr/indy(universal)"			};
+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"			};
     xkb_types		{ include "default"				};
     xkb_compatibility	{ include "default"				};
     xkb_symbols 	{ include "en_US(pc_universal_nodeadkeys)"	};
     xkb_geometry	{ include "microsoft(natural)"			};
 };
 xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi.vndr/indigo(pc102)"	};
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
     xkb_symbols 	{ include "en_US(pc102)"	};
-    xkb_geometry	{ include "sgi.vndr/indigo(pc102)"	};
+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
 };
 xkb_keymap "indigo_nodeadkeys" {
-    xkb_keycodes	{ include "sgi.vndr/indigo(pc102)"		};
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
     xkb_types		{ include "default"			};
     xkb_compatibility	{ include "default"			};
     xkb_symbols 	{ include "en_US(pc102_nodeadkeys)"	};
-    xkb_geometry	{ include "sgi.vndr/indigo(pc102)"		};
+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
 };
 
diff --git a/keymap/sgi_vndr/es b/keymap/sgi_vndr/es
index 69556713..f1aad9a7 100644
--- a/keymap/sgi_vndr/es
+++ b/keymap/sgi_vndr/es
@@ -1,34 +1,34 @@
 // $Xorg: es,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
 default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi.vndr/indy(universal)"		};
+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
     xkb_types		{ include "default"			};
     xkb_compatibility	{ include "default"			};
     xkb_symbols 	{ include "en_US(pc_universal)+es"	};
-    xkb_geometry	{ include "sgi.vndr/indy(pc102)"		};
+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
 };
 xkb_keymap "indy_nodeadkeys" {
-    xkb_keycodes	{ include "sgi.vndr/indy(universal)"	};
+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
     xkb_symbols 	{
 	include "en_US(pc_universal_nodeadkeys)+es(nodeadkeys)"
     };
-    xkb_geometry	{ include "sgi.vndr/indy(pc102)"	};
+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};
 };
 xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi.vndr/indigo(pc102)"	};
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
     xkb_symbols 	{ include "en_US(pc102)+es"	};
-    xkb_geometry	{ include "sgi.vndr/indigo(pc102)"	};
+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
 };
 xkb_keymap "indigo_nodeadkeys" {
-    xkb_keycodes	{ include "sgi.vndr/indigo(pc102)"	};
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
     xkb_symbols 	{
 	include "en_US(pc102_nodeadkeys)+es(nodeadkeys)"
     };
-    xkb_geometry	{ include "sgi.vndr/indigo(pc102)"	};
+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
 };
 
diff --git a/keymap/sgi_vndr/fi b/keymap/sgi_vndr/fi
index 0d40592e..67af07eb 100644
--- a/keymap/sgi_vndr/fi
+++ b/keymap/sgi_vndr/fi
@@ -1,34 +1,34 @@
 // $Xorg: fi,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
 default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi.vndr/indy(universal)"		};
+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
     xkb_types		{ include "default"			};
     xkb_compatibility	{ include "default"			};
     xkb_symbols 	{ include "en_US(pc_universal)+fi"	};
-    xkb_geometry	{ include "sgi.vndr/indy(pc102)"		};
+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
 };
 xkb_keymap "indy_nodeadkeys" {
-    xkb_keycodes	{ include "sgi.vndr/indy(universal)"	};
+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
     xkb_symbols 	{
 	include "en_US(pc_universal_nodeadkeys)+fi(nodeadkeys)"
     };
-    xkb_geometry	{ include "sgi.vndr/indy(pc102)"	};
+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};
 };
 xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi.vndr/indigo(pc102)"	};
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
     xkb_symbols 	{ include "en_US(pc102)+fi"	};
-    xkb_geometry	{ include "sgi.vndr/indigo(pc102)"	};
+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
 };
 xkb_keymap "indigo_nodeadkeys" {
-    xkb_keycodes	{ include "sgi.vndr/indigo(pc102)"	};
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
     xkb_symbols 	{
 	include "en_US(pc102_nodeadkeys)+fi(nodeadkeys)"
     };
-    xkb_geometry	{ include "sgi.vndr/indigo(pc102)"	};
+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
 };
 
diff --git a/keymap/sgi_vndr/fr b/keymap/sgi_vndr/fr
index c23b2f30..b6aea29d 100644
--- a/keymap/sgi_vndr/fr
+++ b/keymap/sgi_vndr/fr
@@ -1,34 +1,34 @@
 // $Xorg: fr,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
 default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi.vndr/indy(universal)"		};
+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
     xkb_types		{ include "default"			};
     xkb_compatibility	{ include "default"			};
     xkb_symbols 	{ include "en_US(pc_universal)+fr"	};
-    xkb_geometry	{ include "sgi.vndr/indy(pc102)"		};
+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
 };
 xkb_keymap "indy_nodeadkeys" {
-    xkb_keycodes	{ include "sgi.vndr/indy(universal)"	};
+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
     xkb_symbols  { 
 	include "en_US(pc_universal_nodeadkeys)+fr(nodeadkeys)"
     };
-    xkb_geometry	{ include "sgi.vndr/indy(pc102)"	};
+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};
 };
 xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi.vndr/indigo(pc102)"	};
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
     xkb_symbols 	{ include "en_US(pc102)+fr"	};
-    xkb_geometry	{ include "sgi.vndr/indigo(pc102)"	};
+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
 };
 xkb_keymap "indigo_nodeadkeys" {
-    xkb_keycodes	{ include "sgi.vndr/indigo(pc102)"	};
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
     xkb_symbols 	{ 
 	include "en_US(pc102_nodeadkeys)+fr(nodeadkeys)"
     };
-    xkb_geometry	{ include "sgi.vndr/indigo(pc102)"	};
+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
 };
 
diff --git a/keymap/sgi_vndr/gb b/keymap/sgi_vndr/gb
index dfb2b884..6fa6d651 100644
--- a/keymap/sgi_vndr/gb
+++ b/keymap/sgi_vndr/gb
@@ -1,34 +1,34 @@
 // $Xorg: gb,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
 default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi.vndr/indy(universal)"		};
+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
     xkb_types		{ include "default"			};
     xkb_compatibility	{ include "default"			};
     xkb_symbols 	{ include "en_US(pc_universal)+gb"	};
-    xkb_geometry	{ include "sgi.vndr/indy(pc102)"		};
+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
 };
 xkb_keymap "indy_nodeadkeys" {
-    xkb_keycodes	{ include "sgi.vndr/indy(universal)"	};
+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
     xkb_symbols 	{
 	include "en_US(pc_universal_nodeadkeys)+gb(nodeadkeys)"
     };
-    xkb_geometry	{ include "sgi.vndr/indy(pc102)"	};
+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};
 };
 xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi.vndr/indigo(pc102)"	};
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
     xkb_symbols 	{ include "en_US(pc102)+gb"	};
-    xkb_geometry	{ include "sgi.vndr/indigo(pc102)"	};
+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
 };
 xkb_keymap "indigo_nodeadkeys" {
-    xkb_keycodes	{ include "sgi.vndr/indigo(pc102)"	};
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
     xkb_symbols 	{
 	include "en_US(pc102_nodeadkeys)+gb(nodeadkeys)"
     };
-    xkb_geometry	{ include "sgi.vndr/indigo(pc102)"	};
+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
 };
 
diff --git a/keymap/sgi_vndr/hu b/keymap/sgi_vndr/hu
index 773992fa..5778dea1 100644
--- a/keymap/sgi_vndr/hu
+++ b/keymap/sgi_vndr/hu
@@ -1,105 +1,105 @@
 // $Xorg: hu,v 1.3 2000/08/17 19:54:41 cpqbld Exp $
 default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi.vndr/indy(universal)"			};
+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"			};
     xkb_types		{ include "default"				};
     xkb_compatibility	{ include "default"				};
     xkb_symbols 	{ include "en_US(pc_universal)+hu(basic)"	};
-    xkb_geometry	{ include "sgi.vndr/indy(pc102)"			};
+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"			};
 };
 xkb_keymap "indy_toggle" {
-    xkb_keycodes	{ include "sgi.vndr/indy(universal)"		};
+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
     xkb_types		{ include "default"			};
     xkb_compatibility	{ include "default"			};
     xkb_symbols { 
 	include "en_US(pc_universal)+hu(basic)+group(toggle)" 
     };
-    xkb_geometry	{ include "sgi.vndr/indy(pc102)"		};
+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
 };
 xkb_keymap "indy_shift_toggle" {
-    xkb_keycodes	{ include "sgi.vndr/indy(universal)"		};
+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
     xkb_types		{ include "default"			};
     xkb_compatibility	{ include "default"			};
     xkb_symbols { 
 	include "en_US(pc_universal)+hu(basic)+group(shift_toggle)" 
     };
-    xkb_geometry	{ include "sgi.vndr/indy(pc102)"		};
+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
 };
 xkb_keymap "indy_ctrl_shift_toggle" {
-    xkb_keycodes	{ include "sgi.vndr/indy(universal)"		};
+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
     xkb_types		{ include "default"			};
     xkb_compatibility	{ include "default"			};
     xkb_symbols { 
 	include "en_US(pc_universal)+hu(basic)+group(ctrl_shift_toggle)" 
     };
-    xkb_geometry	{ include "sgi.vndr/indy(pc102)"		};
+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
 };
 xkb_keymap "indy_ctrl_alt_toggle" {
-    xkb_keycodes	{ include "sgi.vndr/indy(universal)"		};
+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
     xkb_types		{ include "default"			};
     xkb_compatibility	{ include "default"			};
     xkb_symbols { 
 	include "en_US(pc_universal)+hu(basic)+group(ctrl_alt_toggle)" 
     };
-    xkb_geometry	{ include "sgi.vndr/indy(pc102)"		};
+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
 };
 xkb_keymap "indy_caps_toggle" {
-    xkb_keycodes	{ include "sgi.vndr/indy(universal)"		};
+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
     xkb_types		{ include "default"			};
     xkb_compatibility	{ include "default"			};
     xkb_symbols { 
 	include "en_US(pc_universal)+hu(basic)+group(caps_toggle)" 
     };
-    xkb_geometry	{ include "sgi.vndr/indy(pc102)"		};
+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
 };
 xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi.vndr/indigo(pc102)"		};
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
     xkb_types		{ include "default"			};
     xkb_compatibility	{ include "default"			};
     xkb_symbols 	{ include "en_US(pc102)+hu(basic)"	};
-    xkb_geometry	{ include "sgi.vndr/indigo(pc102)"		};
+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
 };
 xkb_keymap "indigo_toggle" {
-    xkb_keycodes	{ include "sgi.vndr/indigo(pc102)"		};
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
     xkb_types		{ include "default"			};
     xkb_compatibility	{ include "default"			};
     xkb_symbols { 
 	include "en_US(pc102)+hu(basic)+group(toggle)" 
     };
-    xkb_geometry	{ include "sgi.vndr/indigo(pc102)"		};
+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
 };
 xkb_keymap "indigo_shift_toggle" {
-    xkb_keycodes	{ include "sgi.vndr/indigo(pc102)"		};
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
     xkb_types		{ include "default"			};
     xkb_compatibility	{ include "default"			};
     xkb_symbols { 
 	include "en_US(pc102)+hu(basic)+group(shift_toggle)" 
     };
-    xkb_geometry	{ include "sgi.vndr/indigo(pc102)"		};
+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
 };
 xkb_keymap "indigo_ctrl_shift_toggle" {
-    xkb_keycodes	{ include "sgi.vndr/indigo(pc102)"		};
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
     xkb_types		{ include "default"			};
     xkb_compatibility	{ include "default"			};
     xkb_symbols { 
 	include "en_US(pc102)+hu(basic)+group(ctrl_shift_toggle)" 
     };
-    xkb_geometry	{ include "sgi.vndr/indigo(pc102)"		};
+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
 };
 xkb_keymap "indigo_ctrl_alt_toggle" {
-    xkb_keycodes	{ include "sgi.vndr/indigo(pc102)"		};
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
     xkb_types		{ include "default"			};
     xkb_compatibility	{ include "default"			};
     xkb_symbols { 
 	include "en_US(pc102)+hu(basic)+group(ctrl_alt_toggle)" 
     };
-    xkb_geometry	{ include "sgi.vndr/indigo(pc102)"		};
+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
 };
 xkb_keymap "indigo_caps_toggle" {
-    xkb_keycodes	{ include "sgi.vndr/indigo(pc102)"		};
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
     xkb_types		{ include "default"			};
     xkb_compatibility	{ include "default"			};
     xkb_symbols { 
 	include "en_US(pc102)+hu(basic)+group(caps_toggle)" 
     };
-    xkb_geometry	{ include "sgi.vndr/indigo(pc102)"		};
+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
 };
diff --git a/keymap/sgi_vndr/it b/keymap/sgi_vndr/it
index cb99344f..ed92227b 100644
--- a/keymap/sgi_vndr/it
+++ b/keymap/sgi_vndr/it
@@ -1,34 +1,34 @@
 // $Xorg: it,v 1.3 2000/08/17 19:54:41 cpqbld Exp $
 default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi.vndr/indy(universal)"		};
+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
     xkb_types		{ include "default"			};
     xkb_compatibility	{ include "default"			};
     xkb_symbols 	{ include "en_US(pc_universal)+it"	};
-    xkb_geometry	{ include "sgi.vndr/indy(pc102)"		};
+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
 };
 xkb_keymap "indy_nodeadkeys" {
-    xkb_keycodes	{ include "sgi.vndr/indy(universal)"	};
+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
     xkb_symbols 	{
 	include "en_US(pc_universal_nodeadkeys)+it(nodeadkeys)"
     };
-    xkb_geometry	{ include "sgi.vndr/indy(pc102)"	};
+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};
 };
 xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi.vndr/indigo(pc102)"	};
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
     xkb_symbols 	{ include "en_US(pc102)+it"	};
-    xkb_geometry	{ include "sgi.vndr/indigo(pc102)"	};
+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
 };
 xkb_keymap "indigo_nodeadkeys" {
-    xkb_keycodes	{ include "sgi.vndr/indigo(pc102)"	};
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
     xkb_symbols 	{
 	include "en_US(pc102_nodeadkeys)+it(nodeadkeys)"
     };
-    xkb_geometry	{ include "sgi.vndr/indigo(pc102)"	};
+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
 };
 
diff --git a/keymap/sgi_vndr/jp b/keymap/sgi_vndr/jp
index d42baea6..74ed4243 100644
--- a/keymap/sgi_vndr/jp
+++ b/keymap/sgi_vndr/jp
@@ -1,8 +1,8 @@
 // $Xorg: jp,v 1.3 2000/08/17 19:54:41 cpqbld Exp $
 default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi.vndr/indy(jp106)"			};
+    xkb_keycodes	{ include "sgi_vndr/indy(jp106)"			};
     xkb_types		{ include "default"				};
     xkb_compatibility	{ include "default"				};
-    xkb_symbols 	{ include "us(pc101)+sgi.vndr/jp"			};
-    xkb_geometry	{ include "sgi.vndr/indy(jp106)"			};
+    xkb_symbols 	{ include "us(pc101)+sgi_vndr/jp"			};
+    xkb_geometry	{ include "sgi_vndr/indy(jp106)"			};
 };
diff --git a/keymap/sgi_vndr/no b/keymap/sgi_vndr/no
index 3b9f838e..fd32c72c 100644
--- a/keymap/sgi_vndr/no
+++ b/keymap/sgi_vndr/no
@@ -1,34 +1,34 @@
 // $Xorg: no,v 1.3 2000/08/17 19:54:41 cpqbld Exp $
 default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi.vndr/indy(universal)"		};
+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
     xkb_types		{ include "default"			};
     xkb_compatibility	{ include "default"			};
     xkb_symbols 	{ include "en_US(pc_universal)+no"	};
-    xkb_geometry	{ include "sgi.vndr/indy(pc102)"		};
+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
 };
 xkb_keymap "indy_nodeadkeys" {
-    xkb_keycodes	{ include "sgi.vndr/indy(universal)"	};
+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
     xkb_symbols 	{
 	include "en_US(pc_universal_nodeadkeys)+no(nodeadkeys)"
     };
-    xkb_geometry	{ include "sgi.vndr/indy(pc102)"	};
+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};
 };
 xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi.vndr/indigo(pc102)"	};
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
     xkb_symbols 	{ include "en_US(pc102)+no"	};
-    xkb_geometry	{ include "sgi.vndr/indigo(pc102)"	};
+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
 };
 xkb_keymap "indigo_nodeadkeys" {
-    xkb_keycodes	{ include "sgi.vndr/indigo(pc102)"	};
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
     xkb_symbols 	{
 	include "en_US(pc102_nodeadkeys)+no(nodeadkeys)"
     };
-    xkb_geometry	{ include "sgi.vndr/indigo(pc102)"	};
+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
 };
 
diff --git a/keymap/sgi_vndr/pl b/keymap/sgi_vndr/pl
index ee422386..3641a31a 100644
--- a/keymap/sgi_vndr/pl
+++ b/keymap/sgi_vndr/pl
@@ -1,29 +1,29 @@
 // $Xorg: pl,v 1.3 2000/08/17 19:54:41 cpqbld Exp $
 default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi.vndr/indy(universal)"	};
+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
     xkb_symbols 	{ include "us(pc_universal)+pl"	};
-    xkb_geometry	{ include "sgi.vndr/indy(pc102)"	};
+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};
 };
 xkb_keymap "indy_nodeadkeys" {
-    xkb_keycodes	{ include "sgi.vndr/indy(universal)"			};
+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"			};
     xkb_types		{ include "default"				};
     xkb_compatibility	{ include "default"				};
     xkb_symbols 	{ include "us(pc_universal)+pl(nodeadkeys)" 	};
-    xkb_geometry	{ include "sgi.vndr/indy(pc102)"			};
+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"			};
 };
 xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi.vndr/indigo(pc102)"	};
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
     xkb_symbols 	{ include "us(pc102)+pl"	};
-    xkb_geometry	{ include "sgi.vndr/indigo(pc102)"	};
+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
 };
 xkb_keymap "indigo_nodeadkeys" {
-    xkb_keycodes	{ include "sgi.vndr/indigo(pc102)"	};
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
     xkb_symbols 	{ include "us(pc102)+pl(nodeadkeys)" };
-    xkb_geometry	{ include "sgi.vndr/indigo(pc102)"	};
+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
 };
diff --git a/keymap/sgi_vndr/pt b/keymap/sgi_vndr/pt
index 1b487246..3ec03471 100644
--- a/keymap/sgi_vndr/pt
+++ b/keymap/sgi_vndr/pt
@@ -1,34 +1,34 @@
 // $Xorg: pt,v 1.3 2000/08/17 19:54:41 cpqbld Exp $
 default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi.vndr/indy(universal)"		};
+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
     xkb_types		{ include "default"			};
     xkb_compatibility	{ include "default"			};
     xkb_symbols 	{ include "en_US(pc_universal)+pt"	};
-    xkb_geometry	{ include "sgi.vndr/indy(pc102)"		};
+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
 };
 xkb_keymap "indy_nodeadkeys" {
-    xkb_keycodes	{ include "sgi.vndr/indy(universal)"	};
+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
     xkb_symbols 	{
 	include "en_US(pc_universal_nodeadkeys)+pt(nodeadkeys)"
     };
-    xkb_geometry	{ include "sgi.vndr/indy(pc102)"	};
+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};
 };
 xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi.vndr/indigo(pc102)"	};
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
     xkb_symbols 	{ include "en_US(pc102)+pt"	};
-    xkb_geometry	{ include "sgi.vndr/indigo(pc102)"	};
+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
 };
 xkb_keymap "indigo_nodeadkeys" {
-    xkb_keycodes	{ include "sgi.vndr/indigo(pc102)"	};
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
     xkb_symbols 	{
 	include "en_US(pc102_nodeadkeys)+pt(nodeadkeys)"
     };
-    xkb_geometry	{ include "sgi.vndr/indigo(pc102)"	};
+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
 };
 
diff --git a/keymap/sgi_vndr/ru b/keymap/sgi_vndr/ru
index 89e6d832..1746ff36 100644
--- a/keymap/sgi_vndr/ru
+++ b/keymap/sgi_vndr/ru
@@ -1,105 +1,105 @@
 // $Xorg: ru,v 1.3 2000/08/17 19:54:41 cpqbld Exp $
 default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi.vndr/indy(universal)"			};
+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"			};
     xkb_types		{ include "default"				};
     xkb_compatibility	{ include "default"				};
     xkb_symbols 	{ include "en_US(pc_universal)+ru(basic)"	};
-    xkb_geometry	{ include "sgi.vndr/indy(pc102)"			};
+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"			};
 };
 xkb_keymap "indy_toggle" {
-    xkb_keycodes	{ include "sgi.vndr/indy(universal)"		};
+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
     xkb_types		{ include "default"			};
     xkb_compatibility	{ include "default"			};
     xkb_symbols { 
 	include "en_US(pc_universal)+ru(basic)+group(toggle)" 
     };
-    xkb_geometry	{ include "sgi.vndr/indy(pc102)"		};
+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
 };
 xkb_keymap "indy_shift_toggle" {
-    xkb_keycodes	{ include "sgi.vndr/indy(universal)"		};
+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
     xkb_types		{ include "default"			};
     xkb_compatibility	{ include "default"			};
     xkb_symbols { 
 	include "en_US(pc_universal)+ru(basic)+group(shift_toggle)" 
     };
-    xkb_geometry	{ include "sgi.vndr/indy(pc102)"		};
+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
 };
 xkb_keymap "indy_ctrl_shift_toggle" {
-    xkb_keycodes	{ include "sgi.vndr/indy(universal)"		};
+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
     xkb_types		{ include "default"			};
     xkb_compatibility	{ include "default"			};
     xkb_symbols { 
 	include "en_US(pc_universal)+ru(basic)+group(ctrl_shift_toggle)" 
     };
-    xkb_geometry	{ include "sgi.vndr/indy(pc102)"		};
+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
 };
 xkb_keymap "indy_ctrl_alt_toggle" {
-    xkb_keycodes	{ include "sgi.vndr/indy(universal)"		};
+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
     xkb_types		{ include "default"			};
     xkb_compatibility	{ include "default"			};
     xkb_symbols { 
 	include "en_US(pc_universal)+ru(basic)+group(ctrl_alt_toggle)" 
     };
-    xkb_geometry	{ include "sgi.vndr/indy(pc102)"		};
+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
 };
 xkb_keymap "indy_caps_toggle" {
-    xkb_keycodes	{ include "sgi.vndr/indy(universal)"		};
+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
     xkb_types		{ include "default"			};
     xkb_compatibility	{ include "default"			};
     xkb_symbols { 
 	include "en_US(pc_universal)+ru(basic)+group(caps_toggle)" 
     };
-    xkb_geometry	{ include "sgi.vndr/indy(pc102)"		};
+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
 };
 xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi.vndr/indigo(pc102)"		};
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
     xkb_types		{ include "default"			};
     xkb_compatibility	{ include "default"			};
     xkb_symbols 	{ include "en_US(pc102)+ru(basic)"	};
-    xkb_geometry	{ include "sgi.vndr/indigo(pc102)"		};
+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
 };
 xkb_keymap "indigo_toggle" {
-    xkb_keycodes	{ include "sgi.vndr/indigo(pc102)"		};
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
     xkb_types		{ include "default"			};
     xkb_compatibility	{ include "default"			};
     xkb_symbols { 
 	include "en_US(pc102)+ru(basic)+group(toggle)" 
     };
-    xkb_geometry	{ include "sgi.vndr/indigo(pc102)"		};
+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
 };
 xkb_keymap "indigo_shift_toggle" {
-    xkb_keycodes	{ include "sgi.vndr/indigo(pc102)"		};
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
     xkb_types		{ include "default"			};
     xkb_compatibility	{ include "default"			};
     xkb_symbols { 
 	include "en_US(pc102)+ru(basic)+group(shift_toggle)" 
     };
-    xkb_geometry	{ include "sgi.vndr/indigo(pc102)"		};
+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
 };
 xkb_keymap "indigo_ctrl_shift_toggle" {
-    xkb_keycodes	{ include "sgi.vndr/indigo(pc102)"		};
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
     xkb_types		{ include "default"			};
     xkb_compatibility	{ include "default"			};
     xkb_symbols { 
 	include "en_US(pc102)+ru(basic)+group(ctrl_shift_toggle)" 
     };
-    xkb_geometry	{ include "sgi.vndr/indigo(pc102)"		};
+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
 };
 xkb_keymap "indigo_ctrl_alt_toggle" {
-    xkb_keycodes	{ include "sgi.vndr/indigo(pc102)"		};
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
     xkb_types		{ include "default"			};
     xkb_compatibility	{ include "default"			};
     xkb_symbols { 
 	include "en_US(pc102)+ru(basic)+group(ctrl_alt_toggle)" 
     };
-    xkb_geometry	{ include "sgi.vndr/indigo(pc102)"		};
+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
 };
 xkb_keymap "indigo_caps_toggle" {
-    xkb_keycodes	{ include "sgi.vndr/indigo(pc102)"		};
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
     xkb_types		{ include "default"			};
     xkb_compatibility	{ include "default"			};
     xkb_symbols { 
 	include "en_US(pc102)+ru(basic)+group(caps_toggle)" 
     };
-    xkb_geometry	{ include "sgi.vndr/indigo(pc102)"		};
+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
 };
diff --git a/keymap/sgi_vndr/se b/keymap/sgi_vndr/se
index 9cc7da75..910a8cc8 100644
--- a/keymap/sgi_vndr/se
+++ b/keymap/sgi_vndr/se
@@ -1,34 +1,34 @@
 // $Xorg: se,v 1.3 2000/08/17 19:54:41 cpqbld Exp $
 default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi.vndr/indy(universal)"		};
+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
     xkb_types		{ include "default"			};
     xkb_compatibility	{ include "default"			};
     xkb_symbols 	{ include "en_US(pc_universal)+se"	};
-    xkb_geometry	{ include "sgi.vndr/indy(pc102)"		};
+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
 };
 xkb_keymap "indy_nodeadkeys" {
-    xkb_keycodes	{ include "sgi.vndr/indy(universal)"	};
+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
     xkb_symbols 	{
 	include "en_US(pc_universal_nodeadkeys)+se(nodeadkeys)"
     };
-    xkb_geometry	{ include "sgi.vndr/indy(pc102)"	};
+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};
 };
 xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi.vndr/indigo(pc102)"	};
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
     xkb_symbols 	{ include "en_US(pc102)+se"	};
-    xkb_geometry	{ include "sgi.vndr/indigo(pc102)"	};
+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
 };
 xkb_keymap "indigo_nodeadkeys" {
-    xkb_keycodes	{ include "sgi.vndr/indigo(pc102)"	};
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
     xkb_symbols 	{ 
 	include "en_US(pc102_nodeadkeys)+se(nodeadkeys)"
     };
-    xkb_geometry	{ include "sgi.vndr/indigo(pc102)"	};
+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
 };
 
diff --git a/keymap/sgi_vndr/sk b/keymap/sgi_vndr/sk
index cfc77e6e..e8e283d2 100644
--- a/keymap/sgi_vndr/sk
+++ b/keymap/sgi_vndr/sk
@@ -5,32 +5,32 @@
 // $XFree86$
 
 default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi.vndr/indy(universal)"		};
+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
     xkb_types		{ include "default"			};
     xkb_compatibility	{ include "default"			};
     xkb_symbols 	{ include "us(pc_universal)+sk"		};
-    xkb_geometry	{ include "sgi.vndr/indy(pc102)"		};
+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
 };
 xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi.vndr/indigo(pc102)"		};
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
     xkb_types		{ include "default"			};
     xkb_compatibility	{ include "default"			};
     xkb_symbols 	{ include "us(pc102)+sk"		};
-    xkb_geometry	{ include "sgi.vndr/indigo(pc102)"		};
+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
 };
 
 default xkb_keymap "indy_qwerty" {
-    xkb_keycodes	{ include "sgi.vndr/indy(universal)"		};
+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
     xkb_types		{ include "default"			};
     xkb_compatibility	{ include "default"			};
     xkb_symbols 	{ include "us(pc_universal)+sk(qwerty)"	};
-    xkb_geometry	{ include "sgi.vndr/indy(pc102)"		};
+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
 };
 xkb_keymap "indigo_qwerty" {
-    xkb_keycodes	{ include "sgi.vndr/indigo(pc102)"		};
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
     xkb_types		{ include "default"			};
     xkb_compatibility	{ include "default"			};
     xkb_symbols 	{ include "us(pc102)+sk(qwerty)"		};
-    xkb_geometry	{ include "sgi.vndr/indigo(pc102)"		};
+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
 };
 
diff --git a/keymap/sgi_vndr/th b/keymap/sgi_vndr/th
index 25cd2521..412b5e60 100644
--- a/keymap/sgi_vndr/th
+++ b/keymap/sgi_vndr/th
@@ -1,17 +1,17 @@
 // $Xorg: th,v 1.3 2000/08/17 19:54:41 cpqbld Exp $
 default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi.vndr/indy(universal)"	};
+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
     xkb_symbols 	{
 	include "en_US(pc_universal)+th+group(shift_toggle)"
     };
-    xkb_geometry	{ include "sgi.vndr/indy(pc102)"	};
+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};
 };
 xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi.vndr/indigo(pc102)"	};
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
     xkb_symbols 	{ include "en_US(pc102)+th+group(shift_toggle)"	};
-    xkb_geometry	{ include "sgi.vndr/indigo(pc102)"	};
+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
 };
diff --git a/keymap/sgi_vndr/us b/keymap/sgi_vndr/us
index 76c1a001..5850145c 100644
--- a/keymap/sgi_vndr/us
+++ b/keymap/sgi_vndr/us
@@ -1,43 +1,43 @@
 // $Xorg: us,v 1.3 2000/08/17 19:54:41 cpqbld Exp $
 default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi.vndr/indy(universal)"		};
+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
     xkb_types		{ include "default"			};
     xkb_compatibility	{ include "default"			};
     xkb_symbols 	{ include "us(pc_universal)"		};
-    xkb_geometry	{ include "sgi.vndr/indy(pc101)"		};
+    xkb_geometry	{ include "sgi_vndr/indy(pc101)"		};
 };
 xkb_keymap "indy101_euro" {
-    xkb_keycodes	{ include "sgi.vndr/indy(universal)"	};
+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
     xkb_symbols 	{ include "us(pc_universal)"	};
-    xkb_geometry	{ include "sgi.vndr/indy(pc101)"	};
+    xkb_geometry	{ include "sgi_vndr/indy(pc101)"	};
 };
 xkb_keymap "indy_compose" {
-    xkb_keycodes	{ include "sgi.vndr/indy(universal)"	};
+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
     xkb_symbols 	{ include "us(pc_universal)"	};
-    xkb_geometry	{ include "sgi.vndr/indy(pc101)"	};
+    xkb_geometry	{ include "sgi_vndr/indy(pc101)"	};
 };
 xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi.vndr/indigo(pc101)"	};
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc101)"	};
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
     xkb_symbols 	{ include "us(pc101)"		};
-    xkb_geometry	{ include "sgi.vndr/indigo(pc101)"	};
+    xkb_geometry	{ include "sgi_vndr/indigo(pc101)"	};
 };
 xkb_keymap "indigo_compose" {
-    xkb_keycodes	{ include "sgi.vndr/indigo(pc101)"	};
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc101)"	};
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
     xkb_symbols 	{ include "us(pc101compose)"	};
-    xkb_geometry	{ include "sgi.vndr/indigo(pc101)"	};
+    xkb_geometry	{ include "sgi_vndr/indigo(pc101)"	};
 };
 xkb_keymap "indigo101_compose" {
-    xkb_keycodes	{ include "sgi.vndr/indigo(pc101)"	};
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc101)"	};
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
     xkb_symbols 	{ include "us(pc101euro)"	};
-    xkb_geometry	{ include "sgi.vndr/indigo(pc101)"	};
+    xkb_geometry	{ include "sgi_vndr/indigo(pc101)"	};
 };
diff --git a/keymap/sony b/keymap/sony
index 4f5a6e6b..c4be3b1b 100644
--- a/keymap/sony
+++ b/keymap/sony
@@ -28,6 +28,6 @@ xkb_keymap "news5000-nwp5461" {
     xkb_keycodes	{ include "sony(nwp5461)"	};
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "sony.vndr/us(nwp5461)"	};
+    xkb_symbols 	{ include "sony_vndr/us(nwp5461)"	};
     xkb_geometry	{ include "sony(nwp5461)"	};
 };
diff --git a/keymap/sun_vndr/Makefile.am b/keymap/sun_vndr/Makefile.am
index 7d3133b0..47953c4b 100644
--- a/keymap/sun_vndr/Makefile.am
+++ b/keymap/sun_vndr/Makefile.am
@@ -6,4 +6,4 @@ us
                                                                                           
 EXTRA_DIST= $(km_DATA)
                                                                                           
-kmdir = $(xkb_base)/keymap/sun.vndr
+kmdir = $(xkb_base)/keymap/sun_vndr
diff --git a/keymap/sun_vndr/de b/keymap/sun_vndr/de
index 152b6248..4c1ded3f 100644
--- a/keymap/sun_vndr/de
+++ b/keymap/sun_vndr/de
@@ -29,7 +29,7 @@ xkb_keymap "type4_de" {
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
     xkb_symbols 	{ 
-	include "sun.vndr/us(sun4)+iso9995-3(basic)+de"
+	include "sun_vndr/us(sun4)+iso9995-3(basic)+de"
     };
     xkb_geometry	{ include "sun(type4)"		};
 };
@@ -38,7 +38,7 @@ xkb_keymap "type4_de_nodeadkeys" {
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
     xkb_symbols 	{ 
-	include "sun.vndr/us(sun4)+iso9995-3(nodeadkeys)+de(nodeadkeys)"
+	include "sun_vndr/us(sun4)+iso9995-3(nodeadkeys)+de(nodeadkeys)"
     };
     xkb_geometry	{ include "sun(type4)"		};
 };
@@ -47,7 +47,7 @@ xkb_keymap "type4_de_openlook" {
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
     xkb_symbols 	{ 
-	include "sun.vndr/us(sun4ol)+iso9995-3(basic)+de"
+	include "sun_vndr/us(sun4ol)+iso9995-3(basic)+de"
     };
     xkb_geometry	{ include "sun(type4)"		};
 };
@@ -56,7 +56,7 @@ default xkb_keymap "type5_de" {
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
     xkb_symbols 	{ 
-	include "sun.vndr/us(sun5)+iso9995-3(basic)+de"
+	include "sun_vndr/us(sun5)+iso9995-3(basic)+de"
     };
     xkb_geometry	{ include "sun(type5euro)"	};
 };
@@ -65,7 +65,7 @@ xkb_keymap "type5_de_nodeadkeys" {
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
     xkb_symbols 	{ 
-	include "sun.vndr/us(sun5)+iso9995-3(nodeadkeys)+de(nodeadkeys)" 
+	include "sun_vndr/us(sun5)+iso9995-3(nodeadkeys)+de(nodeadkeys)" 
     };
     xkb_geometry	{ include "sun(type5euro)"	};
 };
@@ -73,6 +73,6 @@ xkb_keymap "type5_de_openlook" {
     xkb_keycodes	{ include "sun(type5_euro)"	};
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "sun.vndr/us(sun5ol)+iso9995-3+de"	};
+    xkb_symbols 	{ include "sun_vndr/us(sun5ol)+iso9995-3+de"	};
     xkb_geometry	{ include "sun(type5euro)"	};
 };
diff --git a/keymap/sun_vndr/es b/keymap/sun_vndr/es
index 227d38ce..2de81c01 100644
--- a/keymap/sun_vndr/es
+++ b/keymap/sun_vndr/es
@@ -24,14 +24,14 @@
 //other dealings in this Software without prior written authorization
 //from The Open Group.
 //
-// $XFree86: xc/programs/xkbcomp/keymap/sun.vndr/es,v 1.2 2000/10/28 00:34:05 dawes Exp $
+// $XFree86: xc/programs/xkbcomp/keymap/sun_vndr/es,v 1.2 2000/10/28 00:34:05 dawes Exp $
 //
 xkb_keymap "type4_es" {
     xkb_keycodes	{ include "sun(type4_euro)"	};
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
     xkb_symbols 	{ 
-	include "sun.vndr/us(sun4)+iso9995-3(basic)+es"
+	include "sun_vndr/us(sun4)+iso9995-3(basic)+es"
     };
     xkb_geometry	{ include "sun(type4)"		};
 };
@@ -40,7 +40,7 @@ xkb_keymap "type4_es_openlook" {
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
     xkb_symbols 	{ 
-	include "sun.vndr/us(sun4ol)+iso9995-3(basic)+es"
+	include "sun_vndr/us(sun4ol)+iso9995-3(basic)+es"
     };
     xkb_geometry	{ include "sun(type4)"		};
 };
@@ -49,7 +49,7 @@ default xkb_keymap "type5_es" {
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
     xkb_symbols 	{ 
-	include "sun.vndr/us(sun5)+iso9995-3(basic)+es"
+	include "sun_vndr/us(sun5)+iso9995-3(basic)+es"
     };
     xkb_geometry	{ include "sun(type5euro)"	};
 };
@@ -57,6 +57,6 @@ xkb_keymap "type5_es_openlook" {
     xkb_keycodes	{ include "sun(type5_euro)"	};
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "sun.vndr/us(sun5ol)+iso9995-3+es"	};
+    xkb_symbols 	{ include "sun_vndr/us(sun5ol)+iso9995-3+es"	};
     xkb_geometry	{ include "sun(type5euro)"	};
 };
diff --git a/keymap/sun_vndr/fi b/keymap/sun_vndr/fi
index a1973697..296ef66c 100644
--- a/keymap/sun_vndr/fi
+++ b/keymap/sun_vndr/fi
@@ -24,14 +24,14 @@
 //other dealings in this Software without prior written authorization
 //from The Open Group.
 //
-// $XFree86: xc/programs/xkbcomp/keymap/sun.vndr/fi,v 1.2 2000/10/28 00:34:05 dawes Exp $
+// $XFree86: xc/programs/xkbcomp/keymap/sun_vndr/fi,v 1.2 2000/10/28 00:34:05 dawes Exp $
 //
 xkb_keymap "type4_fi" {
     xkb_keycodes	{ include "sun(type4_euro)"	};
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
     xkb_symbols 	{ 
-	include "sun.vndr/us(sun4)+iso9995-3(basic)+fi"
+	include "sun_vndr/us(sun4)+iso9995-3(basic)+fi"
     };
     xkb_geometry	{ include "sun(type4)"		};
 };
@@ -40,7 +40,7 @@ xkb_keymap "type4_fi_openlook" {
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
     xkb_symbols 	{ 
-	include "sun.vndr/us(sun4ol)+iso9995-3(basic)+fi"
+	include "sun_vndr/us(sun4ol)+iso9995-3(basic)+fi"
     };
     xkb_geometry	{ include "sun(type4)"		};
 };
@@ -49,7 +49,7 @@ default xkb_keymap "type5_fi" {
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
     xkb_symbols 	{ 
-	include "sun.vndr/us(sun5)+iso9995-3(basic)+fi"
+	include "sun_vndr/us(sun5)+iso9995-3(basic)+fi"
     };
     xkb_geometry	{ include "sun(type5euro)"	};
 };
@@ -57,6 +57,6 @@ xkb_keymap "type5_fi_openlook" {
     xkb_keycodes	{ include "sun(type5_euro)"	};
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "sun.vndr/us(sun5ol)+iso9995-3+fi"	};
+    xkb_symbols 	{ include "sun_vndr/us(sun5ol)+iso9995-3+fi"	};
     xkb_geometry	{ include "sun(type5euro)"	};
 };
diff --git a/keymap/sun_vndr/fr b/keymap/sun_vndr/fr
index 6ed6b6f7..9301ce03 100644
--- a/keymap/sun_vndr/fr
+++ b/keymap/sun_vndr/fr
@@ -24,14 +24,14 @@
 //other dealings in this Software without prior written authorization
 //from The Open Group.
 //
-// $XFree86: xc/programs/xkbcomp/keymap/sun.vndr/fr,v 1.2 2000/10/28 00:34:05 dawes Exp $
+// $XFree86: xc/programs/xkbcomp/keymap/sun_vndr/fr,v 1.2 2000/10/28 00:34:05 dawes Exp $
 //
 xkb_keymap "type4_fr" {
     xkb_keycodes	{ include "sun(type4_euro)"	};
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
     xkb_symbols 	{ 
-	include "sun.vndr/us(sun4)+iso9995-3(basic)+fr"
+	include "sun_vndr/us(sun4)+iso9995-3(basic)+fr"
     };
     xkb_geometry	{ include "sun(type4)"		};
 };
@@ -40,7 +40,7 @@ xkb_keymap "type4_fr_openlook" {
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
     xkb_symbols 	{ 
-	include "sun.vndr/us(sun4ol)+iso9995-3(basic)+fr"
+	include "sun_vndr/us(sun4ol)+iso9995-3(basic)+fr"
     };
     xkb_geometry	{ include "sun(type4)"		};
 };
@@ -49,7 +49,7 @@ default xkb_keymap "type5_fr" {
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
     xkb_symbols 	{ 
-	include "sun.vndr/us(sun5)+iso9995-3(basic)+fr"
+	include "sun_vndr/us(sun5)+iso9995-3(basic)+fr"
     };
     xkb_geometry	{ include "sun(type5euro)"	};
 };
@@ -57,6 +57,6 @@ xkb_keymap "type5_fr_openlook" {
     xkb_keycodes	{ include "sun(type5_euro)"	};
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "sun.vndr/us(sun5ol)+iso9995-3+fr"	};
+    xkb_symbols 	{ include "sun_vndr/us(sun5ol)+iso9995-3+fr"	};
     xkb_geometry	{ include "sun(type5euro)"	};
 };
diff --git a/keymap/sun_vndr/no b/keymap/sun_vndr/no
index 32868d1f..45669237 100644
--- a/keymap/sun_vndr/no
+++ b/keymap/sun_vndr/no
@@ -24,14 +24,14 @@
 //other dealings in this Software without prior written authorization
 //from The Open Group.
 //
-// $XFree86: xc/programs/xkbcomp/keymap/sun.vndr/no,v 1.2 2000/10/28 00:34:05 dawes Exp $
+// $XFree86: xc/programs/xkbcomp/keymap/sun_vndr/no,v 1.2 2000/10/28 00:34:05 dawes Exp $
 //
 xkb_keymap "type4_no" {
     xkb_keycodes	{ include "sun(type4_euro)"	};
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
     xkb_symbols 	{ 
-	include "sun.vndr/us(sun4)+iso9995-3(basic)+no"
+	include "sun_vndr/us(sun4)+iso9995-3(basic)+no"
     };
     xkb_geometry	{ include "sun(type4)"		};
 };
@@ -40,7 +40,7 @@ xkb_keymap "type4_no_openlook" {
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
     xkb_symbols 	{ 
-	include "sun.vndr/us(sun4ol)+iso9995-3(basic)+no"
+	include "sun_vndr/us(sun4ol)+iso9995-3(basic)+no"
     };
     xkb_geometry	{ include "sun(type4)"		};
 };
@@ -49,7 +49,7 @@ default xkb_keymap "type5_no" {
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
     xkb_symbols 	{ 
-	include "sun.vndr/us(sun5)+iso9995-3(basic)+no"
+	include "sun_vndr/us(sun5)+iso9995-3(basic)+no"
     };
     xkb_geometry	{ include "sun(type5euro)"	};
 };
@@ -57,6 +57,6 @@ xkb_keymap "type5_no_openlook" {
     xkb_keycodes	{ include "sun(type5_euro)"	};
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "sun.vndr/us(sun5ol)+iso9995-3+no"	};
+    xkb_symbols 	{ include "sun_vndr/us(sun5ol)+iso9995-3+no"	};
     xkb_geometry	{ include "sun(type5euro)"	};
 };
diff --git a/keymap/sun_vndr/pl b/keymap/sun_vndr/pl
index cfcca7b0..904ffb2d 100644
--- a/keymap/sun_vndr/pl
+++ b/keymap/sun_vndr/pl
@@ -24,14 +24,14 @@
 //other dealings in this Software without prior written authorization
 //from The Open Group.
 //
-// $XFree86: xc/programs/xkbcomp/keymap/sun.vndr/pl,v 1.2 2000/10/28 00:34:05 dawes Exp $
+// $XFree86: xc/programs/xkbcomp/keymap/sun_vndr/pl,v 1.2 2000/10/28 00:34:05 dawes Exp $
 //
 xkb_keymap "type4_pl" {
     xkb_keycodes	{ include "sun(type4_euro)"	};
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
     xkb_symbols 	{ 
-	include "sun.vndr/us(sun4)+iso9995-3(basic)+pl"
+	include "sun_vndr/us(sun4)+iso9995-3(basic)+pl"
     };
     xkb_geometry	{ include "sun(type4)"		};
 };
@@ -40,7 +40,7 @@ xkb_keymap "type4_pl_openlook" {
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
     xkb_symbols 	{ 
-	include "sun.vndr/us(sun4ol)+iso9995-3(basic)+pl"
+	include "sun_vndr/us(sun4ol)+iso9995-3(basic)+pl"
     };
     xkb_geometry	{ include "sun(type4)"		};
 };
@@ -49,7 +49,7 @@ default xkb_keymap "type5_pl" {
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
     xkb_symbols 	{ 
-	include "sun.vndr/us(sun5)+iso9995-3(basic)+pl"
+	include "sun_vndr/us(sun5)+iso9995-3(basic)+pl"
     };
     xkb_geometry	{ include "sun(type5euro)"	};
 };
@@ -57,6 +57,6 @@ xkb_keymap "type5_pl_openlook" {
     xkb_keycodes	{ include "sun(type5_euro)"	};
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "sun.vndr/us(sun5ol)+iso9995-3+pl"	};
+    xkb_symbols 	{ include "sun_vndr/us(sun5ol)+iso9995-3+pl"	};
     xkb_geometry	{ include "sun(type5euro)"	};
 };
diff --git a/keymap/sun_vndr/ru b/keymap/sun_vndr/ru
index e5d18c60..fc7d75b1 100644
--- a/keymap/sun_vndr/ru
+++ b/keymap/sun_vndr/ru
@@ -24,14 +24,14 @@
 //other dealings in this Software without prior written authorization
 //from The Open Group.
 //
-// $XFree86: xc/programs/xkbcomp/keymap/sun.vndr/ru,v 1.2 2000/10/28 00:34:05 dawes Exp $
+// $XFree86: xc/programs/xkbcomp/keymap/sun_vndr/ru,v 1.2 2000/10/28 00:34:05 dawes Exp $
 //
 xkb_keymap "type4_ru" {
     xkb_keycodes	{ include "sun(type4_euro)"	};
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
     xkb_symbols 	{ 
-	include "sun.vndr/us(sun4)+iso9995-3(basic)+ru"
+	include "sun_vndr/us(sun4)+iso9995-3(basic)+ru"
     };
     xkb_geometry	{ include "sun(type4)"		};
 };
@@ -40,7 +40,7 @@ xkb_keymap "type4_ru_openlook" {
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
     xkb_symbols 	{ 
-	include "sun.vndr/us(sun4ol)+iso9995-3(basic)+ru"
+	include "sun_vndr/us(sun4ol)+iso9995-3(basic)+ru"
     };
     xkb_geometry	{ include "sun(type4)"		};
 };
@@ -49,7 +49,7 @@ default xkb_keymap "type5_ru" {
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
     xkb_symbols 	{ 
-	include "sun.vndr/us(sun5)+iso9995-3(basic)+ru"
+	include "sun_vndr/us(sun5)+iso9995-3(basic)+ru"
     };
     xkb_geometry	{ include "sun(type5euro)"	};
 };
@@ -57,6 +57,6 @@ xkb_keymap "type5_ru_openlook" {
     xkb_keycodes	{ include "sun(type5_euro)"	};
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "sun.vndr/us(sun5ol)+iso9995-3+ru"	};
+    xkb_symbols 	{ include "sun_vndr/us(sun5ol)+iso9995-3+ru"	};
     xkb_geometry	{ include "sun(type5euro)"	};
 };
diff --git a/keymap/sun_vndr/se b/keymap/sun_vndr/se
index 5d0e601e..fad7009e 100644
--- a/keymap/sun_vndr/se
+++ b/keymap/sun_vndr/se
@@ -1,11 +1,11 @@
-// $XFree86: xc/programs/xkbcomp/keymap/sun.vndr/se,v 1.2 1998/12/20 09:34:42 dawes Exp $
+// $XFree86: xc/programs/xkbcomp/keymap/sun_vndr/se,v 1.2 1998/12/20 09:34:42 dawes Exp $
 
 default xkb_keymap "type5c_se_fixdollar" {
     xkb_keycodes	{ include "sun(type5_se)"	};
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
     xkb_symbols 	{ 
-	include "sun.vndr/se(sun5)+se(fixdollar)"
+	include "sun_vndr/se(sun5)+se(fixdollar)"
     };
     xkb_geometry	{ include "sun(type5c_se)"	};
 };
@@ -14,7 +14,7 @@ xkb_keymap "type5c_se" {
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
     xkb_symbols 	{ 
-	include "sun.vndr/se(sun5)"
+	include "sun_vndr/se(sun5)"
     };
     xkb_geometry	{ include "sun(type5c_se)"	};
 };
@@ -23,7 +23,7 @@ xkb_keymap "type5_se" {
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
     xkb_symbols 	{ 
-	include "sun.vndr/se(sun5)"
+	include "sun_vndr/se(sun5)"
     };
     xkb_geometry	{ include "sun(type5_se)"	};
 };
@@ -32,7 +32,7 @@ xkb_keymap "type4_se_fixdollar_swapctl" {
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
     xkb_symbols 	{ 
-	include "sun.vndr/se(sun4)+se(fixdollar)"
+	include "sun_vndr/se(sun4)+se(fixdollar)"
     };
     xkb_geometry	{ include "sun(type4_se)"	};
 };
@@ -41,7 +41,7 @@ xkb_keymap "type4_se_fixdollar" {
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
     xkb_symbols 	{ 
-	include "sun.vndr/se(sun4)+se(fixdollar)"
+	include "sun_vndr/se(sun4)+se(fixdollar)"
     };
     xkb_geometry	{ include "sun(type4_se)"	};
 };
@@ -50,7 +50,7 @@ xkb_keymap "type4_se" {
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
     xkb_symbols 	{ 
-	include "sun.vndr/se(sun4)"
+	include "sun_vndr/se(sun4)"
     };
     xkb_geometry	{ include "sun(type4_se)"	};
 };
diff --git a/keymap/sun_vndr/uk b/keymap/sun_vndr/uk
index 0918bfa0..e1fb4970 100644
--- a/keymap/sun_vndr/uk
+++ b/keymap/sun_vndr/uk
@@ -24,14 +24,14 @@
 //other dealings in this Software without prior written authorization
 //from The Open Group.
 //
-// $XFree86: xc/programs/xkbcomp/keymap/sun.vndr/uk,v 1.2 2000/10/28 00:34:05 dawes Exp $
+// $XFree86: xc/programs/xkbcomp/keymap/sun_vndr/uk,v 1.2 2000/10/28 00:34:05 dawes Exp $
 //
 xkb_keymap "type4_uk" {
     xkb_keycodes	{ include "sun(type4_euro)"	};
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
     xkb_symbols 	{ 
-	include "sun.vndr/us(sun4)+iso9995-3(basic)+uk"
+	include "sun_vndr/us(sun4)+iso9995-3(basic)+uk"
     };
     xkb_geometry	{ include "sun(type4)"		};
 };
@@ -40,7 +40,7 @@ xkb_keymap "type4_uk_openlook" {
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
     xkb_symbols 	{ 
-	include "sun.vndr/us(sun4ol)+iso9995-3(basic)+uk"
+	include "sun_vndr/us(sun4ol)+iso9995-3(basic)+uk"
     };
     xkb_geometry	{ include "sun(type4)"		};
 };
@@ -49,7 +49,7 @@ default xkb_keymap "type5_uk" {
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
     xkb_symbols 	{ 
-	include "sun.vndr/us(sun5)+iso9995-3(basic)+uk"
+	include "sun_vndr/us(sun5)+iso9995-3(basic)+uk"
     };
     xkb_geometry	{ include "sun(type5euro)"	};
 };
@@ -57,6 +57,6 @@ xkb_keymap "type5_uk_openlook" {
     xkb_keycodes	{ include "sun(type5_euro)"	};
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "sun.vndr/us(sun5ol)+iso9995-3+uk"	};
+    xkb_symbols 	{ include "sun_vndr/us(sun5ol)+iso9995-3+uk"	};
     xkb_geometry	{ include "sun(type5euro)"	};
 };
diff --git a/keymap/sun_vndr/us b/keymap/sun_vndr/us
index 971311e7..397482f8 100644
--- a/keymap/sun_vndr/us
+++ b/keymap/sun_vndr/us
@@ -28,41 +28,41 @@ xkb_keymap "type4_us" {
     xkb_keycodes	{ include "sun(type4)"		};
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "sun.vndr/us(sun4)"	};
+    xkb_symbols 	{ include "sun_vndr/us(sun4)"	};
     xkb_geometry	{ include "sun(type4)"		};
 };
 xkb_keymap "type4_us_openlook" {
     xkb_keycodes	{ include "sun(type4)"		};
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "sun.vndr/us(sun4ol)"	};
+    xkb_symbols 	{ include "sun_vndr/us(sun4ol)"	};
     xkb_geometry	{ include "sun(type4)"		};
 };
 default xkb_keymap "type5_us" {
     xkb_keycodes	{ include "sun(type5)"		};
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "sun.vndr/us(sun5)"	};
+    xkb_symbols 	{ include "sun_vndr/us(sun5)"	};
     xkb_geometry	{ include "sun(type5)"		};
 };
 xkb_keymap "type5_us_openlook" {
     xkb_keycodes	{ include "sun(type5)"		};
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "sun.vndr/us(sun5ol)"	};
+    xkb_symbols 	{ include "sun_vndr/us(sun5ol)"	};
     xkb_geometry	{ include "sun(type5)"		};
 };
 xkb_keymap "type5_unix" {
     xkb_keycodes	{ include "sun(type5)"		};
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "sun.vndr/us(sun5)"	};
+    xkb_symbols 	{ include "sun_vndr/us(sun5)"	};
     xkb_geometry	{ include "sun(type5unix)"	};
 };
 xkb_keymap "type5_unix_openlook" {
     xkb_keycodes	{ include "sun(type5)"		};
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "sun.vndr/us(sun5ol)"	};
+    xkb_symbols 	{ include "sun_vndr/us(sun5ol)"	};
     xkb_geometry	{ include "sun(type5unix)"	};
 };
diff --git a/keymap/xfree98 b/keymap/xfree98
index c47c483f..b344eedb 100644
--- a/keymap/xfree98
+++ b/keymap/xfree98
@@ -30,6 +30,6 @@ default xkb_keymap "jp" {
     xkb_keycodes	{ include "xfree98"		};
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "nec.vndr/jp(pc98)"	};
+    xkb_symbols		{ include "nec_vndr/jp(pc98)"	};
     xkb_geometry	{ include "nec(pc98)"		};
 };
diff --git a/rules/base b/rules/base
index 1c94e0fd..9be1125c 100644
--- a/rules/base
+++ b/rules/base
@@ -47,7 +47,7 @@
   flexpro	=	keytronic(FlexPro)
   hp6000	=	hp(omnibook)
   omnikey101	=	northgate(omnikey101)
-  thinkpad	=	ibm.vndr/thinkpad(common)
+  thinkpad	=	ibm_vndr/thinkpad(common)
  $pcmodels	=	pc(%m)
   jp106		=	pc(jp106)
   everex	=	everex(STEPnote)
@@ -58,18 +58,18 @@
   *		=       pc(pc104)
 
 ! model		variant		layout	=	symbols
- $maclaptop	nodeadkeys	*	=	macintosh.vndr/us(extended)+macintosh.vndr/%l%(v)+apple(laptop_bad_switch)
- $mac		nodeadkeys	*	=	macintosh.vndr/us(extended)+macintosh.vndr/%l%(v)
+ $maclaptop	nodeadkeys	*	=	macintosh_vndr/us(extended)+macintosh_vndr/%l%(v)+macintosh_vndr/apple(laptop_bad_switch)
+ $mac		nodeadkeys	*	=	macintosh_vndr/us(extended)+macintosh_vndr/%l%(v)
 
 ! model		layout	=	symbols
-  pc98		nec/jp	=	nec.vndr/jp(pc98)
+  pc98		nec/jp	=	nec_vndr/jp(pc98)
   abnt2		br	=	pc(pc104)+br
- $maclaptop	us	=	macintosh.vndr/us(extended)+apple(laptop_bad_switch)
- $maclaptop	en_US	=	macintosh.vndr/us(extended)+apple(laptop_bad_switch)
- $maclaptop	*	=	macintosh.vndr/us(extended)+apple(laptop_bad_switch)+macintosh.vndr/%l%(v)
- $mac		us	=	macintosh.vndr/us(extended)
- $mac		en_US	=	macintosh.vndr/us(extended)
- $mac		*	=	macintosh.vndr/us(extended)+macintosh.vndr/%l%(v)
+ $maclaptop	us	=	macintosh_vndr/us(extended)+macintosh_vndr/apple(laptop_bad_switch)
+ $maclaptop	en_US	=	macintosh_vndr/us(extended)+macintosh_vndr/apple(laptop_bad_switch)
+ $maclaptop	*	=	macintosh_vndr/us(extended)+apple(laptop_bad_switch)+macintosh_vndr/%l%(v)
+ $mac		us	=	macintosh_vndr/us(extended)
+ $mac		en_US	=	macintosh_vndr/us(extended)
+ $mac		*	=	macintosh_vndr/us(extended)+macintosh_vndr/%l%(v)
  $pcmodels      intl    =       us(%mcompose)
   *		intl	=	us(pc104compose)
   *		jp	=	pc(pc102)+jp(latin)+jp:2
diff --git a/rules/base.xml.in b/rules/base.xml.in
index 5e7d8196..05510737 100644
--- a/rules/base.xml.in
+++ b/rules/base.xml.in
@@ -1938,7 +1938,7 @@
     </layout>
     <layout>
       <configItem>
-        <name>nec.vndr/jp</name>
+        <name>nec_vndr/jp</name>
         <_shortDescription>Jpn</_shortDescription>
         <_description>PC-98xx Series</_description>
       </configItem>
diff --git a/symbols/digital_vndr/Makefile.am b/symbols/digital_vndr/Makefile.am
index 95bfacb7..8ae7f356 100644
--- a/symbols/digital_vndr/Makefile.am
+++ b/symbols/digital_vndr/Makefile.am
@@ -4,4 +4,4 @@ vt
 
 EXTRA_DIST= $(symbols_DATA)
 
-symbolsdir = $(xkb_base)/symbols/digital.vndr
+symbolsdir = $(xkb_base)/symbols/digital_vndr
diff --git a/symbols/digital_vndr/lk b/symbols/digital_vndr/lk
index 3bf14fd9..4d311c7e 100644
--- a/symbols/digital_vndr/lk
+++ b/symbols/digital_vndr/lk
@@ -124,7 +124,7 @@ default xkb_symbols "common" {
 };
 
 xkb_symbols "lk401" {
-    include "symbols/digital.vndr/lk(common)"
+    include "symbols/digital_vndr/lk(common)"
     key <RALT>              { [ Alt_R,      Meta_R          ] };
     key <LCMP>              { [ Multi_key                   ] };
     key <RCMP>              { [ Multi_key                   ] };
diff --git a/symbols/digital_vndr/pc b/symbols/digital_vndr/pc
index 450e6c47..e3908738 100644
--- a/symbols/digital_vndr/pc
+++ b/symbols/digital_vndr/pc
@@ -167,7 +167,7 @@ xkb_symbols "pc" {
 };
 
 xkb_symbols "pc104" {
-    include "digital.vndr/pc(pc)"
+    include "digital_vndr/pc(pc)"
 
     replace key <LALT> {       [       Alt_L ] };
     key	<LWIN> {       [	 Meta_L ] };
diff --git a/symbols/digital_vndr/us b/symbols/digital_vndr/us
index 69994cd1..7e1131a6 100644
--- a/symbols/digital_vndr/us
+++ b/symbols/digital_vndr/us
@@ -129,8 +129,8 @@ xkb_symbols "us" {
 // *								*
 // **************************************************************
 xkb_symbols "vt105-tw" {
-    include "digital.vndr/us(us)"
-    include "digital.vndr/vt(vt105)"
+    include "digital_vndr/us(us)"
+    include "digital_vndr/vt(vt105)"
     override key <AE03> { 
 	symbols[Group1]= [ 3, numbersign ],
 	symbols[Group2]= [ sterling ]
@@ -138,8 +138,8 @@ xkb_symbols "vt105-tw" {
     key <AB00> {       [	     less,	  greater ] };
 };
 
-xkb_symbols "vt105-dp" { include "digital.vndr/us(vt105-tw)" };
-xkb_symbols "vt105"    { include "digital.vndr/us(vt105-tw)" };
+xkb_symbols "vt105-dp" { include "digital_vndr/us(vt105-tw)" };
+xkb_symbols "vt105"    { include "digital_vndr/us(vt105-tw)" };
 
 // **************************************************************
 // *								*
@@ -150,8 +150,8 @@ xkb_symbols "vt105"    { include "digital.vndr/us(vt105-tw)" };
 // *								*
 // **************************************************************
 xkb_symbols "vt108-tw" {
-    include "digital.vndr/us(us)"
-    include "digital.vndr/vt(vt108)"
+    include "digital_vndr/us(us)"
+    include "digital_vndr/vt(vt108)"
     replace key <LCMP> { [ Multi_key ] };
     override key <AE03> { 
 	symbols[Group1]= [ 3, numbersign ],
@@ -160,8 +160,8 @@ xkb_symbols "vt108-tw" {
     key <AB00> {       [	     less,	  greater ] };
 };
 
-xkb_symbols "vt108-dp" { include "digital.vndr/us(vt108-tw)" };
-xkb_symbols "vt108"    { include "digital.vndr/us(vt108-tw)" };
+xkb_symbols "vt108-dp" { include "digital_vndr/us(vt108-tw)" };
+xkb_symbols "vt108"    { include "digital_vndr/us(vt108-tw)" };
 
 // **************************************************************
 // *								*
@@ -175,7 +175,7 @@ xkb_symbols "vt108"    { include "digital.vndr/us(vt108-tw)" };
 // *								*
 // **************************************************************
 xkb_symbols "unix" {
-    include "digital.vndr/us(vt108)"
+    include "digital_vndr/us(vt108)"
     override key <AE00>	{ [ Escape ] };
     override key <AB00>	{ [ grave, asciitilde ] };
 };
@@ -189,16 +189,16 @@ xkb_symbols "unix" {
 // *								*
 // **************************************************************
 xkb_symbols "pcxalga" {
-    include "digital.vndr/pc(pc)"
-    include "digital.vndr/us(us)"
+    include "digital_vndr/pc(pc)"
+    include "digital_vndr/us(us)"
     replace key <RALT> { [ Alt_R, Meta_R ] };
 };
 
-xkb_symbols "pcxal"   { include "digital.vndr/us(pcxalga)" };
-xkb_symbols "pcxalaa" { include "digital.vndr/us(pcxalga)" };
-xkb_symbols "pcxalfa" { include "digital.vndr/us(pcxalga)" };
-xkb_symbols "pcxalka" { include "digital.vndr/us(pcxalga)" };
-xkb_symbols "lk44x"   { include "digital.vndr/us(pcxalga)" };
+xkb_symbols "pcxal"   { include "digital_vndr/us(pcxalga)" };
+xkb_symbols "pcxalaa" { include "digital_vndr/us(pcxalga)" };
+xkb_symbols "pcxalfa" { include "digital_vndr/us(pcxalga)" };
+xkb_symbols "pcxalka" { include "digital_vndr/us(pcxalga)" };
+xkb_symbols "lk44x"   { include "digital_vndr/us(pcxalga)" };
 
 // **************************************************************
 // *								*
@@ -206,7 +206,7 @@ xkb_symbols "lk44x"   { include "digital.vndr/us(pcxalga)" };
 // *								*
 // **************************************************************
 xkb_symbols "pc104" {
-    include "digital.vndr/pc(pc104)"
-    include "digital.vndr/us(us)"
+    include "digital_vndr/pc(pc104)"
+    include "digital_vndr/us(us)"
     replace key <RALT> { [ Alt_R ] };
 };
diff --git a/symbols/digital_vndr/vt b/symbols/digital_vndr/vt
index c382dc2c..483f1deb 100644
--- a/symbols/digital_vndr/vt
+++ b/symbols/digital_vndr/vt
@@ -149,7 +149,7 @@ xkb_symbols "vt105" {
 
 xkb_symbols "vt108" {
 
-    include "digital.vndr/vt(vt105)"
+    include "digital_vndr/vt(vt105)"
 
     replace key <LCMP> { [ Mode_switch ] };
 
diff --git a/symbols/fujitsu_vndr/Makefile.am b/symbols/fujitsu_vndr/Makefile.am
index b50a9c3f..801bbf1a 100644
--- a/symbols/fujitsu_vndr/Makefile.am
+++ b/symbols/fujitsu_vndr/Makefile.am
@@ -3,4 +3,4 @@ jp us
 
 EXTRA_DIST= $(symbols_DATA)
 
-symbolsdir = $(xkb_base)/symbols/fujitsu.vndr
+symbolsdir = $(xkb_base)/symbols/fujitsu_vndr
diff --git a/symbols/fujitsu_vndr/jp b/symbols/fujitsu_vndr/jp
index a3599b2e..2f49dea7 100644
--- a/symbols/fujitsu_vndr/jp
+++ b/symbols/fujitsu_vndr/jp
@@ -27,7 +27,7 @@
 // Japanese layout for a Fujitsu 140 key keyboard
 
 xkb_symbols {
-    override "fujitsu.vndr/us"
+    override "fujitsu_vndr/us"
     augment key <AE01> { [],			[ kana_NU	] 	};
 	    key <AE02> { [ 2, quotedbl	],	[ kana_FU	]	};
 	    key <AE03> { [ 3, numbersign ],	[ kana_A, kana_a ]	};
diff --git a/symbols/hp_vndr/Makefile.am b/symbols/hp_vndr/Makefile.am
index 828ce7a6..d874bb6d 100644
--- a/symbols/hp_vndr/Makefile.am
+++ b/symbols/hp_vndr/Makefile.am
@@ -3,4 +3,4 @@ us
 
 EXTRA_DIST= $(symbols_DATA)
 
-symbolsdir = $(xkb_base)/symbols/hp.vndr
+symbolsdir = $(xkb_base)/symbols/hp_vndr
diff --git a/symbols/macintosh_vndr/Makefile.am b/symbols/macintosh_vndr/Makefile.am
index 8bc7e8bc..2154ee4b 100644
--- a/symbols/macintosh_vndr/Makefile.am
+++ b/symbols/macintosh_vndr/Makefile.am
@@ -1,5 +1,5 @@
 symbols_DATA = \
-ch de dk \
+apple ch de dk \
 es fi fr \
 gb it \
 nl no pt \
@@ -7,4 +7,4 @@ se us
 
 EXTRA_DIST= $(symbols_DATA)
 
-symbolsdir = $(xkb_base)/symbols/macintosh.vndr
+symbolsdir = $(xkb_base)/symbols/macintosh_vndr
diff --git a/symbols/macintosh_vndr/apple b/symbols/macintosh_vndr/apple
new file mode 100644
index 00000000..0a1d844f
--- /dev/null
+++ b/symbols/macintosh_vndr/apple
@@ -0,0 +1,60 @@
+//
+// Keyboard modification for Apple keyboards
+//
+// $XFree86: xc/programs/xkbcomp/symbols/apple,v 1.2 2003/10/24 20:38:20 tsi Exp $
+
+partial default modifier_keys
+xkb_symbols "extended" {
+
+    key <KPEQ> { [ KP_Equal ] }; 
+
+// The key in the PC's Insert position is sometimes engraved Help (at least
+// in Switzerland and Great Britain), with Insert sometimes above. But in the
+// US and Canada, it remains Insert. So this should probably be an XkbOption,
+// but I have to do more research.
+// Perhaps Help should be the primary symbol with Insert in the 1st shift-level
+//    key  <INS> { [ Help, Insert ] };
+// The keys next to F12, labeled F13, F14, & F15 generate codes that XFree86
+// claims not to generate. I think they should be equivalent to the PC keys
+// Print Screen / SysRq, Scroll Lock, and Pause. Linux kernel bug?
+//    key <PRSC> { [ F13 ] }; // should be keycode 93 or
+//    key <FK13> { [ F13 ] }; // should be keycode 118
+//    key <SCLK> { [ F14 ] }; // should be keycode 123 or
+//    key <FK14> { [ F14 ] }; // should be keycode 119
+//    key <PAUS> { [ F15 ] }; // should be keycode 127 or
+//    key <FK15> { [ F15 ] }; // should be keycode 120
+};
+
+partial modifier_keys
+xkb_symbols "laptop" {
+
+    include "macintosh_vndr/apple(extended)"
+
+    // The real numlock key on the iBook (shared with F5) works internally to
+    // the keyboard. It illuminates the Num_Lock led and locks the fn-key to
+    // type only the keypad keys on the letter keys (U=4, I=5, O=6, P=*, etc.).
+    // The key in the Num_lock position is engraved with Clear.
+    override key <NMLK> { [ Clear ] };
+    // The key engraved Delete sends BKSP. To get Delete, use Shift-Delete
+    override key <BKSP> { [ BackSpace, Delete ] };
+    // These keyboards only generate a <RALT> when pressing fn+Alt. This makes
+    // it impossible to get to the third shift level on keys that are on
+    // the fn-keypad, so use the Enter key (right of <SPC>) for Mode_switch,
+    // and use fn+Enter (Apple's code for Menu) for KP_Enter.
+    replace key <KPEN> { [ ISO_Level3_Shift ] };
+    modifier_map Mod2  { ISO_Level3_Shift };	
+    // Linux kernel bug with Menu on macs means this doesn't work yet
+//    replace key <MENU> { [ KP_Enter ] }; // should be keycode 117
+};
+
+partial modifier_keys
+xkb_symbols "laptop_bad_switch" {
+    include "macintosh_vndr/apple(laptop)"
+
+    // Before XFree86 4.3, most keymaps were configured to generate the 
+    // third-level shift from the second group as opposed to the third-level
+    // of the first group. These keymaps require this mapping to work as
+    // expected.
+    replace key <KPEN> { [ Mode_switch ] };
+    modifier_map Mod2  { Mode_switch };	
+};
diff --git a/symbols/macintosh_vndr/ch b/symbols/macintosh_vndr/ch
index ea8448e4..093de091 100644
--- a/symbols/macintosh_vndr/ch
+++ b/symbols/macintosh_vndr/ch
@@ -151,7 +151,7 @@ xkb_symbols "extended" {
 
 partial alphanumeric_keys 
 xkb_symbols "de" {
-    include "macintosh.vndr/ch(extended)"
+    include "macintosh_vndr/ch(extended)"
 };
 
 partial alphanumeric_keys 
@@ -160,7 +160,7 @@ xkb_symbols "fr" {
     // Describes the differences between a very simple US/ASCII
     // keyboard and a very simple Swiss/French keybaord
 
-    include "macintosh.vndr/ch(extended)"
+    include "macintosh_vndr/ch(extended)"
     name[Group1]= "Swiss French";
 
     override key <AD11> {
@@ -178,5 +178,5 @@ xkb_symbols "fr" {
 
 partial alphanumeric_keys
 xkb_symbols "nodeadkeys" {
-    include "macintosh.vndr/fr_CH" // for consistent naming
+    include "macintosh_vndr/fr_CH" // for consistent naming
 };
diff --git a/symbols/macintosh_vndr/de b/symbols/macintosh_vndr/de
index 0d85d2f5..e6dd01b5 100644
--- a/symbols/macintosh_vndr/de
+++ b/symbols/macintosh_vndr/de
@@ -99,7 +99,7 @@ xkb_symbols "basic" {
 partial alphanumeric_keys 
 xkb_symbols "Sundeadkeys" {
     // modify the default German layout to use Sun dead keys
-    include "macintosh.vndr/de(basic)"
+    include "macintosh_vndr/de(basic)"
     key <TLDE> {	[ SunFA_Circum,	degree		],
 			[   notsign 			]	};
     key <AE12> {	[ SunFA_Acute,	SunFA_Grave	],
@@ -119,13 +119,13 @@ xkb_symbols "Sundeadkeys" {
 
 partial alphanumeric_keys 
 xkb_symbols "sundeadkeys" {
-    include "macintosh.vndr/de(Sundeadkeys)"
+    include "macintosh_vndr/de(Sundeadkeys)"
 };
 
 partial alphanumeric_keys 
 xkb_symbols "nodeadkeys" {
     // modify the default German layout to not have any dead keys
-    include "macintosh.vndr/de(basic)"
+    include "macintosh_vndr/de(basic)"
     key <TLDE> {	[ asciicircum,	degree		],
 			[   notsign 			]	};
     key <AE12> {	[ acute,	grave		],
diff --git a/symbols/macintosh_vndr/dk b/symbols/macintosh_vndr/dk
index fded9984..97ef6d67 100644
--- a/symbols/macintosh_vndr/dk
+++ b/symbols/macintosh_vndr/dk
@@ -84,7 +84,7 @@ xkb_symbols "full" {
 
 partial alphanumeric_keys 
 xkb_symbols "nodeadkeys" {
-    include "macintosh.vndr/dk(basic)"
+    include "macintosh_vndr/dk(basic)"
     key <AE12> {	[	    acute,	     grave	],	
 			[	      bar,	    ogonek	]	};
     key <AD12> {	[       diaeresis,     asciicircum     	],	
diff --git a/symbols/macintosh_vndr/fi b/symbols/macintosh_vndr/fi
index a197891a..1eda0957 100644
--- a/symbols/macintosh_vndr/fi
+++ b/symbols/macintosh_vndr/fi
@@ -8,12 +8,12 @@ xkb_symbols "basic" {
     // keyboard and a very simple Swedish(Finland) keybaord
 
     name[Group1]= "Finnish";
-    include "macintosh.vndr/se(basic)" // for consistent naming
+    include "macintosh_vndr/se(basic)" // for consistent naming
 
 };
 
 
 partial alphanumeric_keys 
 xkb_symbols "nodeadkeys" {
-    include "macintosh.vndr/se(basic)"	// for consistent naming
+    include "macintosh_vndr/se(basic)"	// for consistent naming
 };
diff --git a/symbols/macintosh_vndr/no b/symbols/macintosh_vndr/no
index 8b4586fb..4fc2e8b4 100644
--- a/symbols/macintosh_vndr/no
+++ b/symbols/macintosh_vndr/no
@@ -49,7 +49,7 @@ xkb_symbols "nodeadkeys" {
 
     // Modifies the basic Norwegian layout to eliminate dead keys
 
-    include "macintosh.vndr/no(basic)"
+    include "macintosh_vndr/no(basic)"
     key <AE12> {	[           grave,           acute	],
 			[	    acute,          ogonek 	]	};
     key <AD12> {	[       diaeresis,     asciicircum     	],	
diff --git a/symbols/macintosh_vndr/pt b/symbols/macintosh_vndr/pt
index ebeffe19..f0019d02 100644
--- a/symbols/macintosh_vndr/pt
+++ b/symbols/macintosh_vndr/pt
@@ -42,7 +42,7 @@ xkb_symbols "basic" {
 
 partial alphanumeric_keys 
 xkb_symbols "Sundeadkeys" {
-    include "macintosh.vndr/pt(basic)" // for consistent naming
+    include "macintosh_vndr/pt(basic)" // for consistent naming
     
     key <AE12> {	[	     plus,        asterisk 	],
 			[ SunFA_Diaeresis, SunFA_Diaeresis      ]	};
@@ -52,12 +52,12 @@ xkb_symbols "Sundeadkeys" {
 
 partial alphanumeric_keys 
 xkb_symbols "sundeadkeys" {
-    include "macintosh.vndr/pt(Sundeadkeys)" // for consistent naming
+    include "macintosh_vndr/pt(Sundeadkeys)" // for consistent naming
 };
 
 partial alphanumeric_keys 
 xkb_symbols "nodeadkeys" {
-    include "macintosh.vndr/pt(basic)" // for consistent naming
+    include "macintosh_vndr/pt(basic)" // for consistent naming
 
     key <AE12> {	[	     plus,        asterisk 	],
 			[	 quotedbl,        quotedbl      ]	};
diff --git a/symbols/macintosh_vndr/se b/symbols/macintosh_vndr/se
index a1cf333a..2ab855eb 100644
--- a/symbols/macintosh_vndr/se
+++ b/symbols/macintosh_vndr/se
@@ -52,5 +52,5 @@ xkb_symbols "basic" {
 
 partial alphanumeric_keys 
 xkb_symbols "nodeadkeys" {
-    include "macintosh.vndr/se(basic)" // for consistent naming
+    include "macintosh_vndr/se(basic)" // for consistent naming
 };
diff --git a/symbols/macintosh_vndr/us b/symbols/macintosh_vndr/us
index c53a1521..a6f972ac 100644
--- a/symbols/macintosh_vndr/us
+++ b/symbols/macintosh_vndr/us
@@ -146,7 +146,7 @@ xkb_symbols "extended" {
     // end modifier mappings
 
     include "compose(rwin)"
-    include "apple(extended)"
+    include "macintosh_vndr/apple(extended)"
 
 // *** FIXME
 //    key <LSGT> {	[ quoteleft,	asciitilde	]	};
diff --git a/symbols/nec_vndr/Makefile.am b/symbols/nec_vndr/Makefile.am
index b99c920c..2de14206 100644
--- a/symbols/nec_vndr/Makefile.am
+++ b/symbols/nec_vndr/Makefile.am
@@ -3,4 +3,4 @@ jp
 
 EXTRA_DIST= $(symbols_DATA)
 
-symbolsdir = $(xkb_base)/symbols/nec.vndr
+symbolsdir = $(xkb_base)/symbols/nec_vndr
diff --git a/symbols/sgi_vndr/Makefile.am b/symbols/sgi_vndr/Makefile.am
index e0ad557e..d16aa2b6 100644
--- a/symbols/sgi_vndr/Makefile.am
+++ b/symbols/sgi_vndr/Makefile.am
@@ -3,4 +3,4 @@ jp
 
 EXTRA_DIST= $(symbols_DATA)
 
-symbolsdir = $(xkb_base)/symbols/sgi.vndr
+symbolsdir = $(xkb_base)/symbols/sgi_vndr
diff --git a/symbols/sony_vndr/Makefile.am b/symbols/sony_vndr/Makefile.am
index c59c0c28..06ad913f 100644
--- a/symbols/sony_vndr/Makefile.am
+++ b/symbols/sony_vndr/Makefile.am
@@ -3,4 +3,4 @@ us
 
 EXTRA_DIST= $(symbols_DATA)
 
-symbolsdir = $(xkb_base)/symbols/sony.vndr
+symbolsdir = $(xkb_base)/symbols/sony_vndr
diff --git a/symbols/sun_vndr/Makefile.am b/symbols/sun_vndr/Makefile.am
index 2ba5a3df..af2a2580 100644
--- a/symbols/sun_vndr/Makefile.am
+++ b/symbols/sun_vndr/Makefile.am
@@ -3,4 +3,4 @@ se us usb
 
 EXTRA_DIST= $(symbols_DATA)
 
-symbolsdir = $(xkb_base)/symbols/sun.vndr
+symbolsdir = $(xkb_base)/symbols/sun_vndr
diff --git a/symbols/sun_vndr/se b/symbols/sun_vndr/se
index f4ffa29f..3e2d51ef 100644
--- a/symbols/sun_vndr/se
+++ b/symbols/sun_vndr/se
@@ -1,4 +1,4 @@
-// $XFree86: xc/programs/xkbcomp/symbols/sun.vndr/se,v 1.2 1998/12/20 09:40:28 dawes Exp $
+// $XFree86: xc/programs/xkbcomp/symbols/sun_vndr/se,v 1.2 1998/12/20 09:40:28 dawes Exp $
 //
 // Swedish layout for a Type 5/5c Sun keyboard
 xkb_symbols "sun5" {
diff --git a/symbols/sun_vndr/us b/symbols/sun_vndr/us
index d893fa28..430bbc7b 100644
--- a/symbols/sun_vndr/us
+++ b/symbols/sun_vndr/us
@@ -24,7 +24,7 @@
 //other dealings in this Software without prior written authorization
 //from The Open Group.
 //
-// $XFree86: xc/programs/xkbcomp/symbols/sun.vndr/us,v 1.6 2001/12/14 20:02:05 dawes Exp $
+// $XFree86: xc/programs/xkbcomp/symbols/sun_vndr/us,v 1.6 2001/12/14 20:02:05 dawes Exp $
 //
 // US/ASCII layout for a Type 4 Sun keyboard
 xkb_symbols "sun4" {
@@ -124,8 +124,8 @@ hidden partial function_keys xkb_symbols "broken_openlook_map" {
 
 // US/ASCII layout for a Type 4 Sun keyboard w/ broken OpenLook keymap
 xkb_symbols "sun4ol" {
-    override "sun.vndr/us(sun4)"
-    include "sun.vndr/us(broken_openlook_map)"
+    override "sun_vndr/us(sun4)"
+    include "sun_vndr/us(broken_openlook_map)"
 };
 
 // US/ASCII layout for a Type 5 Sun keyboard
@@ -228,8 +228,8 @@ xkb_symbols "sun5" {
 
 // US/ASCII layout for a Type 5 Sun keyboard w/ broken OpenLook keymap
 xkb_symbols "sun5ol" {
-    override "sun.vndr/us(sun5)"
-    include "sun.vndr/us(broken_openlook_map)"
+    override "sun_vndr/us(sun5)"
+    include "sun_vndr/us(broken_openlook_map)"
 };
 
 // US/ASCII layout for a Type 6 Sun keyboard
@@ -310,7 +310,7 @@ xkb_symbols "sun6" {
     key <VOL+> { [  SunAudioRaiseVolume,SunVideoRaiseBrightness        ]       };
     key <POWR> { [  SunPowerSwitch,    SunPowerSwitchShift     ]       };
 
-    // from symbols/sun.vndr/us(type5)
+    // from symbols/sun_vndr/us(type5)
     key <STOP> { [ Cancel      ],      [ F11           ]       };
     key <AGAI> { [ Redo                ],      [ F12           ]       };
     key <PROP> { [ SunProps    ],      [ F13           ]       };
@@ -333,6 +333,6 @@ xkb_symbols "sun6" {
 
 // US/ASCII layout for a Type 6 Sun keyboard w/ broken OpenLook keymap
 xkb_symbols "sun6ol" {
-    override "sun.vndr/us(sun6)"
-    include "sun.vndr/us(broken_openlook_map)"
+    override "sun_vndr/us(sun6)"
+    include "sun_vndr/us(broken_openlook_map)"
 };
diff --git a/symbols/xfree68_vndr/Makefile.am b/symbols/xfree68_vndr/Makefile.am
index b0d462d9..66669a80 100644
--- a/symbols/xfree68_vndr/Makefile.am
+++ b/symbols/xfree68_vndr/Makefile.am
@@ -3,4 +3,4 @@ amiga ataritt
 
 EXTRA_DIST= $(symbols_DATA)
 
-symbolsdir = $(xkb_base)/symbols/xfree68.vndr
+symbolsdir = $(xkb_base)/symbols/xfree68_vndr
diff --git a/tests/testLayouts.pl b/tests/testLayouts.pl
index c022e648..f172ebfa 100755
--- a/tests/testLayouts.pl
+++ b/tests/testLayouts.pl
@@ -1,11 +1,12 @@
 #!/bin/env perl
 
 use strict;
+use warnings;
 use xkbTestFunc;
 
 backupXkbSettings();
                                                                                                                  
-dumpXkbSettings( $origXkbRules, $origXkbModel, $origXkbLayouts, $origXkbVariants, $origXkbOptions );
+dumpXkbSettingsBackup();
 
 testLevel2( "layout", "variant", 2, "(", ")" );
 
diff --git a/tests/testModels.pl b/tests/testModels.pl
index f740f6a6..42e2a4c8 100644
--- a/tests/testModels.pl
+++ b/tests/testModels.pl
@@ -1,12 +1,13 @@
 #!/bin/env perl
 
 use strict;
+use warnings;
 use xkbTestFunc;
 
-backupXkbSettings();
+xkbTestFunc::backupXkbSettings();
                                                                                                                  
-dumpXkbSettings( $origXkbRules, $origXkbModel, $origXkbLayouts, $origXkbVariants, $origXkbOptions );
+xkbTestFunc::dumpXkbSettingsBackup();
                                                                                                                  
-testLevel1( "model", 1 );
+xkbTestFunc::testLevel1( "model", 1 );
 
-restoreXkbSettings();
+xkbTestFunc::restoreXkbSettings();
diff --git a/tests/xkbTestFunc.pm b/tests/xkbTestFunc.pm
index aaed2a87..b6120881 100755
--- a/tests/xkbTestFunc.pm
+++ b/tests/xkbTestFunc.pm
@@ -1,12 +1,15 @@
-#!/bin/env perl
+package xkbTestFunc;
 
 use strict;
+use warnings;
 
-my $origXkbRules;
-my $origXkbModel;
-my $origXkbLayouts;
-my $origXkbOptions;
-my $origXkbVariants;
+our $VERSION='1.00';
+
+our $origXkbRules;
+our $origXkbModel;
+our $origXkbLayouts;
+our $origXkbOptions;
+our $origXkbVariants;
 
 sub backupXkbSettings
 {
@@ -63,6 +66,11 @@ sub dumpXkbSettings
   print "options: [$xkbOptions]\n" ;
 }
 
+sub dumpXkbSettingsBackup
+{
+  dumpXkbSettings( $origXkbRules, $origXkbModel, $origXkbLayouts, $origXkbVariants, $origXkbOptions );
+}
+
 sub testLevel1
 {
   my ( $type, $idx ) = @_;
@@ -77,7 +85,7 @@ sub testLevel1
       my $paramValue=$1;
       print "--- setting $type: [$paramValue]\n";
       my @params = defaultXkbSettings();
-      @params[$idx] = $paramValue;
+      $params[$idx] = $paramValue;
       dumpXkbSettings ( @params );
       setXkbSettings ( @params );
       #print "--- dump:\n";
@@ -102,7 +110,7 @@ sub testLevel2
       print "--- scanning $type: [$paramValue]\n";
 
       my @params = defaultXkbSettings();
-      @params[$idx] = "$paramValue";
+      $params[$idx] = "$paramValue";
       dumpXkbSettings ( @params );
       setXkbSettings ( @params );
       #print "--- dump:\n";
@@ -118,24 +126,20 @@ sub testLevel2
           my $paramValue2=$1;
           print "  --- $subtype: [$paramValue2]\n";
           my @params = defaultXkbSettings();
-          @params[$idx] = "$paramValue$delim1$paramValue2$delim2";
+          $params[$idx] = "$paramValue$delim1$paramValue2$delim2";
           dumpXkbSettings ( @params );
           setXkbSettings ( @params );
           #print "--- dump:\n";
           #dumpXkbSettings( getXkbSettings() );
         }
       }
-      close XSLTPROa2C;
+      close XSLTPROC2;
     }
   }
   close XSLTPROC;
 }
 
-backupXkbSettings();
-
-dumpXkbSettings( $origXkbRules, $origXkbModel, $origXkbLayouts, $origXkbVariants, $origXkbOptions );
-
-#testLevel1( "model", 1 );
-testLevel2( "layout", "variant", 2, "(", ")" );
+1;
+__END__
 
-restoreXkbSettings();
+No docs yet