diff --git a/headers/private/firewire/firewirereg.h b/headers/private/firewire/firewirereg.h
index a4030c0855..f426e91a4a 100644
--- a/headers/private/firewire/firewirereg.h
+++ b/headers/private/firewire/firewirereg.h
@@ -176,7 +176,7 @@ struct firewire_comm{
 #ifndef __HAIKU__
 	struct mtx tlabel_lock;
 #else
-	benaphore tlabel_lock;
+	mutex tlabel_lock;
 #endif
 	STAILQ_HEAD(, fw_bind) binds;
 	STAILQ_HEAD(, fw_device) devices;
@@ -225,8 +225,8 @@ struct firewire_comm{
 	struct taskqueue *taskqueue;
 	struct proc *probe_thread;
 #else
-	benaphore mtx;
-	benaphore wait_lock;
+	mutex mtx;
+	mutex wait_lock;
 	void *taskqueue;
 	thread_id probe_thread;
 	sem_id Sem;
diff --git a/headers/private/firewire/fwglue.h b/headers/private/firewire/fwglue.h
index 83ddde87df..ee6c2bdb38 100644
--- a/headers/private/firewire/fwglue.h
+++ b/headers/private/firewire/fwglue.h
@@ -33,10 +33,10 @@ typedef uint32_t bus_size_t;
 #define atomic_readandclear_int(ptr) atomic_set((int32 *)(ptr), 0)
 #define atomic_set_int(ptr, value) atomic_or((int32 *)(ptr), value)
 
-#define mtx_lock benaphore_lock
-#define mtx_unlock benaphore_unlock
-#define mtx_destroy benaphore_destroy
-#define mtx_init(lockaddr, name, type, opts) benaphore_init(lockaddr, name)
+#define mtx_lock mutex_lock
+#define mtx_unlock mutex_unlock
+#define mtx_destroy mutex_destroy
+#define mtx_init(lockaddr, name, type, opts) mutex_init(lockaddr, name)
 
 #define splfw() 0
 #define splx(s)