diff --git a/geometry/pc b/geometry/pc
index 943d22a..c083d63 100644
--- a/geometry/pc
+++ b/geometry/pc
@@ -1319,7 +1319,7 @@ xkb_geometry "kr106" {
 
 }; // End of "kr106" geometry
 
-// Based on the pc(basic) layout. The keypad, sysreq/ScrLk/Break, and multimedia
+// Based on the pc(pc105) layout. The keypad, sysreq/ScrLk/Break, and multimedia
 // keys are not shown because they are shared with other keys via the <FN> key.
 // This should not be a problem if the normal symbols are used, as the keys will
 // show through normally, they just won't show from xkbprint. For the record,
diff --git a/rules/base.ml1_s.part b/rules/base.ml1_s.part
index bef256b..ff1c35c 100644
--- a/rules/base.ml1_s.part
+++ b/rules/base.ml1_s.part
@@ -5,6 +5,5 @@
   macintosh_old	us			=	macintosh_vndr/us(oldmac)
   macintosh_old	$macvendorlayouts	=	macintosh_vndr/us(oldmac)+macintosh_vndr/%l[1]%(v[1])
   macintosh_old	*			=	macintosh_vndr/us(oldmac)+%l[1]%(v[1])
- $macs		$macvendorlayouts	=	pc(pc105)+macintosh_vndr/%l[1]%(v[1])
- $pcmodels	*			=	pc(%m)+%l[1]%(v[1])
-  *		*			=	pc(pc105)+%l[1]%(v[1])
+ $macs		$macvendorlayouts	=	pc+macintosh_vndr/%l[1]%(v[1])
+  *		*			=	pc+%l[1]%(v[1])
diff --git a/rules/base.ml_s.part b/rules/base.ml_s.part
index ad2111c..d9555af 100644
--- a/rules/base.ml_s.part
+++ b/rules/base.ml_s.part
@@ -7,19 +7,15 @@
   sun5		$nonlatin		=	latin+sun_vndr/us(sun5)+%l%(v):2
   sun5		*			=	latin+sun_vndr/us(sun5)+%l%(v)
   pc98		nec_vndr/jp		=	nec_vndr/jp(pc98)
-  abnt2		br			=	pc(pc104)+br
+  abnt2		br			=	pc+br
   macintosh_old	us			=	macintosh_vndr/us(oldmac)
   macintosh_old	en_US			=	macintosh_vndr/us(oldmac)
   macintosh_old	$macvendorlayouts	=	macintosh_vndr/us(oldmac)+macintosh_vndr/%l%(v)
   macintosh_old	$nonlatin		=	macintosh_vndr/us(oldmac)+%l%(v):2
   macintosh_old	*			=	macintosh_vndr/us(oldmac)+%l%(v)
- $macbooks	*			=	pc(pc105)+%l%(v)
- $macs		en_US			=	pc(pc105)+macintosh_vndr/us(extended)
- $macs		$macvendorlayouts	=	pc(pc105)+macintosh_vndr/%l%(v)
- $pcmodels      intl   			=       us(%mcompose)
-  *		intl			=	us(pc104compose)
-  *		jp			=	pc(pc102)+jp(latin)+jp:2
- $pcmodels	$nonlatin		=	pc(%m)+us+%l%(v):2
- $pcmodels	*			=	pc(%m)+%l%(v)
-  *	   	$nonlatin		=	pc(pc105)+us+%l%(v):2
-  *		*			=	pc(pc105)+%l%(v)
+ $macbooks	*			=	pc+%l%(v)
+ $macs		en_US			=	pc+macintosh_vndr/us(extended)
+ $macs		$macvendorlayouts	=	pc+macintosh_vndr/%l%(v)
+  *		jp			=	pc+jp(latin)+jp:2
+  *	   	$nonlatin		=	pc+us+%l%(v):2
+  *		*			=	pc+%l%(v)
diff --git a/rules/compat/ml1_s.sh b/rules/compat/ml1_s.sh
index 19c383f..a0c0a2e 100755
--- a/rules/compat/ml1_s.sh
+++ b/rules/compat/ml1_s.sh
@@ -5,11 +5,9 @@ OUTFILE=base.ml1_s.part
 > $OUTFILE
 
 awk '{ 
-  printf "  $pcmodels	%s			=	pc(%%m)+%s%%(v[1])\n", $1, $2; 
-  printf "  *		%s			=	pc(pc105)+%s%%(v[1])\n", $1, $2; 
+  printf "  *		%s			=	pc+%s%%(v[1])\n", $1, $2; 
 }' < layoutRename.lst >> $OUTFILE
 
 awk '{ 
-  printf "  $pcmodels	%s(%s)			=	pc(%%m)+%s(%s)\n", $1, $2, $3, $4; 
-  printf "  *		%s(%s)			=	pc(pc105)+%s(%s)\n", $1, $2, $3, $4; 
+  printf "  *		%s(%s)			=	pc+%s(%s)\n", $1, $2, $3, $4; 
 }' < variantRename.lst >> $OUTFILE
diff --git a/rules/compat/ml1v1_s.sh b/rules/compat/ml1v1_s.sh
index 49a4bd0..9037e16 100755
--- a/rules/compat/ml1v1_s.sh
+++ b/rules/compat/ml1v1_s.sh
@@ -5,6 +5,5 @@ OUTFILE=base.ml1v1_s.part
 > $OUTFILE
 
 awk '{ 
-  printf "  $pcmodels	%s		%s		=	pc(%%m)+%s(%s)\n", $1, $2, $3, $4; 
-  printf "  *		%s		%s		=	pc(pc105)+%s(%s)\n", $1, $2, $3, $4; 
+  printf "  *		%s		%s		=	pc+%s(%s)\n", $1, $2, $3, $4; 
 }' < variantRename.lst >> $OUTFILE
diff --git a/rules/compat/ml1v_s.sh b/rules/compat/ml1v_s.sh
index 71c2c8d..2b9496e 100755
--- a/rules/compat/ml1v_s.sh
+++ b/rules/compat/ml1v_s.sh
@@ -5,6 +5,5 @@ OUTFILE=base.ml1v_s.part
 > $OUTFILE
 
 awk '{ 
-  printf "  $pcmodels	%s		%s		=	pc(%%m)+%s(%s)\n", $1, $2, $3, $4; 
-  printf "  *		%s		%s		=	pc(pc105)+%s(%s)\n", $1, $2, $3, $4; 
+  printf "  *		%s		%s		=	pc+%s(%s)\n", $1, $2, $3, $4; 
 }' < variantRename.lst >> $OUTFILE
diff --git a/rules/compat/ml_s.sh b/rules/compat/ml_s.sh
index 473e73b..6f6ccc4 100755
--- a/rules/compat/ml_s.sh
+++ b/rules/compat/ml_s.sh
@@ -5,11 +5,9 @@ OUTFILE=base.ml_s.part
 > $OUTFILE
 
 awk '{ 
-  printf "  $pcmodels	%s			=	pc(%%m)+%s\n", $1, $2; 
-  printf "  *		%s			=	pc(pc105)+%s\n", $1, $2; 
+  printf "  *		%s			=	pc+%s\n", $1, $2; 
 }' < layoutRename.lst >> $OUTFILE
 
 awk '{ 
-  printf "  $pcmodels	%s(%s)			=	pc(%%m)+%s(%s)\n", $1, $2, $3, $4; 
-  printf "  *		%s(%s)			=	pc(pc105)+%s(%s)\n", $1, $2, $3, $4; 
+  printf "  *		%s(%s)			=	pc+%s(%s)\n", $1, $2, $3, $4; 
 }' < variantRename.lst >> $OUTFILE
diff --git a/rules/compat/mlv_s.sh b/rules/compat/mlv_s.sh
index 48bd098..5a3a9a1 100755
--- a/rules/compat/mlv_s.sh
+++ b/rules/compat/mlv_s.sh
@@ -5,6 +5,5 @@ OUTFILE=base.mlv_s.part
 > $OUTFILE
 
 awk '{ 
-  printf "  $pcmodels	%s		%s		=	pc(%%m)+%s(%s)\n", $1, $2, $3, $4; 
-  printf "  *		%s		%s		=	pc(pc105)+%s(%s)\n", $1, $2, $3, $4; 
+  printf "  *		%s		%s		=	pc+%s(%s)\n", $1, $2, $3, $4; 
 }' < variantRename.lst >> $OUTFILE
diff --git a/symbols/pc b/symbols/pc
index 56ecf82..86af4ad 100644
--- a/symbols/pc
+++ b/symbols/pc
@@ -3,8 +3,8 @@
 //
 // $XFree86: xc/programs/xkbcomp/symbols/pc,v 1.9 2003/06/09 19:59:46 dawes Exp $
 
-partial hidden alphanumeric_keys modifier_keys 
-xkb_symbols "basic" {
+default partial alphanumeric_keys modifier_keys 
+xkb_symbols "pc105" {
 
     key <ESC>  {	[ Escape			]	};
 
@@ -67,25 +67,6 @@ xkb_symbols "basic" {
     modifier_map Mod4   { <HYPR> };
 };
 
-// definition for all PC-AT type keyboard, all extra keys are
-// defined in pc(basic).
-xkb_symbols "pc101" {
-    include "pc(basic)"
-};
-
-xkb_symbols "pc102" {
-    include "pc(basic)"
-};
-
-default
-xkb_symbols "pc104" {
-    include "pc(basic)"
-};
-
-xkb_symbols "pc105" {
-    include "pc(pc104)"
-};
-
 partial hidden alphanumeric_keys
 xkb_symbols "function" {
     key <FK01> {