Index: kernel/genarch/src/drivers/via-cuda/cuda.c
===================================================================
--- kernel/genarch/src/drivers/via-cuda/cuda.c	(revision 4872160f9c176d257f1757469d1adec8033d95f9)
+++ kernel/genarch/src/drivers/via-cuda/cuda.c	(revision c55515574bc591ba52d9f94a2bbf91debeb5943e)
@@ -99,5 +99,5 @@
 		instance->snd_bytes = 0;
 
-		spinlock_initialize(&instance->dev_lock, "cuda_dev");
+		spinlock_initialize(&instance->dev_lock, "cuda.instance.dev_lock");
 
 		/* Disable all interrupts from CUDA. */
Index: kernel/genarch/src/fb/fb.c
===================================================================
--- kernel/genarch/src/fb/fb.c	(revision 4872160f9c176d257f1757469d1adec8033d95f9)
+++ kernel/genarch/src/fb/fb.c	(revision c55515574bc591ba52d9f94a2bbf91debeb5943e)
@@ -554,5 +554,5 @@
 	fbdev->data = instance;
 	
-	spinlock_initialize(&instance->lock, "*fb_lock");
+	spinlock_initialize(&instance->lock, "*fb.instance.lock");
 	instance->rgb_conv = rgb_conv;
 	instance->pixelbytes = pixelbytes;
Index: kernel/genarch/src/kbrd/kbrd.c
===================================================================
--- kernel/genarch/src/kbrd/kbrd.c	(revision 4872160f9c176d257f1757469d1adec8033d95f9)
+++ kernel/genarch/src/kbrd/kbrd.c	(revision c55515574bc591ba52d9f94a2bbf91debeb5943e)
@@ -169,5 +169,5 @@
 		indev_initialize("kbrd", &instance->raw, &kbrd_raw_ops);
 		
-		spinlock_initialize(&instance->keylock, "instance_keylock");
+		spinlock_initialize(&instance->keylock, "kbrd.instance.keylock");
 		instance->keyflags = 0;
 		instance->lockflags = 0;
Index: kernel/genarch/src/kbrd/kbrd_pl050.c
===================================================================
--- kernel/genarch/src/kbrd/kbrd_pl050.c	(revision 4872160f9c176d257f1757469d1adec8033d95f9)
+++ kernel/genarch/src/kbrd/kbrd_pl050.c	(revision c55515574bc591ba52d9f94a2bbf91debeb5943e)
@@ -181,5 +181,5 @@
 		indev_initialize("kbrd", &instance->raw, &kbrd_raw_ops);
 		
-		spinlock_initialize(&instance->keylock, "instance_keylock");
+		spinlock_initialize(&instance->keylock, "kbrd_pl050.instance.keylock");
 		instance->keyflags = 0;
 		instance->lockflags = 0;