--- xc.orig/programs/Xserver/hw/xfree86/common/xf86Xinput.c	2004-09-20 05:46:14.000000000 +0200
+++ xc/programs/Xserver/hw/xfree86/common/xf86Xinput.c	2004-09-20 05:55:02.000000000 +0200
@@ -308,8 +308,8 @@
 	if (dev == NULL)
 	    FatalError("Too many input devices");
 	
-	local->atom = MakeAtom(local->name,
-			       strlen(local->name),
+	local->atom = MakeAtom(local->type_name,
+			       strlen(local->type_name),
 			       TRUE);
 	AssignTypeAndName (dev, local->atom, local->name);
 	dev->public.devicePrivate = (pointer) local;