Index: kernel/test/synch/rwlock4.c
===================================================================
--- kernel/test/synch/rwlock4.c	(revision 70b6de17d76360ed8d3b167e184fa20dc135a760)
+++ kernel/test/synch/rwlock4.c	(revision 00bb696504df128091618d2a7955209b9f94202f)
@@ -47,5 +47,5 @@
 static rwlock_t rwlock;
 
-static SPINLOCK_INITIALIZE(lock);
+SPINLOCK_INITIALIZE(rw_lock);
 
 static waitq_t can_start;
@@ -63,8 +63,8 @@
 	uint32_t rc;
 
-	spinlock_lock(&lock);	
+	spinlock_lock(&rw_lock);	
 	rc = seed % max;
 	seed = (((seed<<2) ^ (seed>>2)) * 487) + rc;
-	spinlock_unlock(&lock);
+	spinlock_unlock(&rw_lock);
 	return rc;
 }
Index: kernel/test/synch/semaphore2.c
===================================================================
--- kernel/test/synch/semaphore2.c	(revision 70b6de17d76360ed8d3b167e184fa20dc135a760)
+++ kernel/test/synch/semaphore2.c	(revision 00bb696504df128091618d2a7955209b9f94202f)
@@ -42,5 +42,5 @@
 static semaphore_t sem;
 
-static SPINLOCK_INITIALIZE(lock);
+SPINLOCK_INITIALIZE(sem_lock);
 
 static waitq_t can_start;
@@ -57,8 +57,8 @@
 	uint32_t rc;
 
-	spinlock_lock(&lock);	
+	spinlock_lock(&sem_lock);	
 	rc = seed % max;
 	seed = (((seed<<2) ^ (seed>>2)) * 487) + rc;
-	spinlock_unlock(&lock);
+	spinlock_unlock(&sem_lock);
 	return rc;
 }