diff --git a/src/drivers/bus/mca.c b/src/drivers/bus/mca.c
index 9d572ef4..2cfbec4e 100644
--- a/src/drivers/bus/mca.c
+++ b/src/drivers/bus/mca.c
@@ -144,7 +144,7 @@ struct bus_driver mca_driver __bus_driver = {
  * Fill in a nic structure
  *
  */
-void fill_mca_nic ( struct nic *nic, struct mca_device *mca ) {
+void mca_fill_nic ( struct nic *nic, struct mca_device *mca ) {
 
 	/* ioaddr and irqno must be read in a device-dependent way
 	 * from the POS registers
diff --git a/src/include/eisa.h b/src/include/eisa.h
index 686c231a..ad716c28 100644
--- a/src/include/eisa.h
+++ b/src/include/eisa.h
@@ -76,7 +76,7 @@ struct eisa_driver {
  *
  */
 extern void eisa_device_enabled ( struct eisa_device *eisa, int enabled );
-extern void fill_eisa_nic ( struct nic *nic, struct eisa_device *eisa );
+extern void eisa_fill_nic ( struct nic *nic, struct eisa_device *eisa );
 
 static inline void enable_eisa_device ( struct eisa_device *eisa ) {
 	eisa_device_enabled ( eisa, 1 );
diff --git a/src/include/isa.h b/src/include/isa.h
index 0082eab8..97f5f7e1 100644
--- a/src/include/isa.h
+++ b/src/include/isa.h
@@ -71,7 +71,7 @@ struct isa_driver {
  * Functions in isa.c
  *
  */
-extern void fill_isa_nic ( struct nic *nic, struct isa_device *isa );
+extern void isa_fill_nic ( struct nic *nic, struct isa_device *isa );
 
 /*
  * ISA bus global definition
diff --git a/src/include/mca.h b/src/include/mca.h
index 3961375a..aff8073f 100644
--- a/src/include/mca.h
+++ b/src/include/mca.h
@@ -76,7 +76,7 @@ struct mca_driver {
  * Functions in mca.c
  *
  */
-extern void fill_mca_nic ( struct nic *nic, struct mca_device *mca );
+extern void mca_fill_nic ( struct nic *nic, struct mca_device *mca );
 
 /*
  * MCA bus global definition