diff --git a/drivers/firewire/Makefile b/drivers/firewire/Makefile
index a7c31e9039c14c0912554ed981c1fa390ce7606d..bc3b9bf822bf1e15c661944edae679406e673a0e 100644
--- a/drivers/firewire/Makefile
+++ b/drivers/firewire/Makefile
@@ -2,10 +2,10 @@
 # Makefile for the Linux IEEE 1394 implementation
 #
 
-firewire-core-y += fw-card.o fw-topology.o fw-transaction.o fw-iso.o \
-                   fw-device.o fw-cdev.o
-firewire-ohci-y += fw-ohci.o
-firewire-sbp2-y += fw-sbp2.o
+firewire-core-y += core-card.o core-cdev.o core-device.o \
+                   core-iso.o core-topology.o core-transaction.o
+firewire-ohci-y += ohci.o
+firewire-sbp2-y += sbp2.o
 
 obj-$(CONFIG_FIREWIRE) += firewire-core.o
 obj-$(CONFIG_FIREWIRE_OHCI) += firewire-ohci.o
diff --git a/drivers/firewire/fw-card.c b/drivers/firewire/core-card.c
similarity index 100%
rename from drivers/firewire/fw-card.c
rename to drivers/firewire/core-card.c
diff --git a/drivers/firewire/fw-cdev.c b/drivers/firewire/core-cdev.c
similarity index 100%
rename from drivers/firewire/fw-cdev.c
rename to drivers/firewire/core-cdev.c
diff --git a/drivers/firewire/fw-device.c b/drivers/firewire/core-device.c
similarity index 100%
rename from drivers/firewire/fw-device.c
rename to drivers/firewire/core-device.c
diff --git a/drivers/firewire/fw-iso.c b/drivers/firewire/core-iso.c
similarity index 100%
rename from drivers/firewire/fw-iso.c
rename to drivers/firewire/core-iso.c
diff --git a/drivers/firewire/fw-topology.c b/drivers/firewire/core-topology.c
similarity index 100%
rename from drivers/firewire/fw-topology.c
rename to drivers/firewire/core-topology.c
diff --git a/drivers/firewire/fw-transaction.c b/drivers/firewire/core-transaction.c
similarity index 100%
rename from drivers/firewire/fw-transaction.c
rename to drivers/firewire/core-transaction.c
diff --git a/drivers/firewire/fw-ohci.c b/drivers/firewire/ohci.c
similarity index 100%
rename from drivers/firewire/fw-ohci.c
rename to drivers/firewire/ohci.c
diff --git a/drivers/firewire/fw-sbp2.c b/drivers/firewire/sbp2.c
similarity index 100%
rename from drivers/firewire/fw-sbp2.c
rename to drivers/firewire/sbp2.c