diff --git a/sys/dev/xen/bus/xenpv.c b/sys/dev/xen/bus/xenpv.c
--- a/sys/dev/xen/bus/xenpv.c
+++ b/sys/dev/xen/bus/xenpv.c
@@ -77,14 +77,14 @@
 		return;
 
 	/* Make sure there's only one xenpv device. */
-	if (devclass_get_device(xenpv_devclass, 0))
+	if (devclass_get_device(devclass_find(driver->name), 0))
 		return;
 
 	/*
 	 * The xenpv bus should be the last to attach in order
 	 * to properly detect if an ISA bus has already been added.
 	 */
-	if (BUS_ADD_CHILD(parent, UINT_MAX, "xenpv", 0) == NULL)
+	if (BUS_ADD_CHILD(parent, UINT_MAX, driver->name, 0) == NULL)
 		panic("Unable to attach xenpv bus.");
 }
 
diff --git a/sys/dev/xen/timer/timer.c b/sys/dev/xen/timer/timer.c
--- a/sys/dev/xen/timer/timer.c
+++ b/sys/dev/xen/timer/timer.c
@@ -109,10 +109,10 @@
 		return;
 
 	/* Handle all Xen PV timers in one device instance. */
-	if (devclass_get_device(xentimer_devclass, 0))
+	if (devclass_get_device(devclass_find(driver->name), 0))
 		return;
 
-	BUS_ADD_CHILD(parent, 0, "xen_et", 0);
+	BUS_ADD_CHILD(parent, 0, driver->name, 0);
 }
 
 static int