Yahoo! Models test pased ok!

11 files changed, 55 insertions, 55 deletions

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)"	};
 };