Yahoo! Models test pased ok!

41 files changed, 335 insertions, 335 deletions

diff --git a/keymap/digital_vndr/Makefile.am b/keymap/digital_vndr/Makefile.am
index f592c5c..b17bbe3 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 c1648be..7f5180e 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 80aa12c..f3fb553 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 8020d24..4acb4f2 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 ed80bd3..9905f0b 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 c170988..4f92573 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 e1b862c..38f4896 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 e7ba868..6970a36 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 df8c707..0f7e216 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 3286de2..1ad7fe7 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 9fb71ad..832f01d 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 9c51632..bd594b0 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 b470223..76f3d03 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 6955671..f1aad9a 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 0d40592..67af07e 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 c23b2f3..b6aea29 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 dfb2b88..6fa6d65 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 773992f..5778dea 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 cb99344..ed92227 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 d42baea..74ed424 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 3b9f838..fd32c72 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 ee42238..3641a31 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 1b48724..3ec0347 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 89e6d83..1746ff3 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 9cc7da7..910a8cc 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 cfc77e6..e8e283d 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 25cd252..412b5e6 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 76c1a00..5850145 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 4f5a6e6..c4be3b1 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 7d3133b..47953c4 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 152b624..4c1ded3 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 227d38c..2de81c0 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 a197369..296ef66 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 6ed6b6f..9301ce0 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 32868d1..4566923 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 cfcca7b..904ffb2 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 e5d18c6..fc7d75b 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 5d0e601..fad7009 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 0918bfa..e1fb497 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 971311e..397482f 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 c47c483..b344eed 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)"		};
 };