diff --git a/kernel/busses/i2c-isa.c b/kernel/busses/i2c-isa.c
index 8ec904ae..0bb32381 100644
--- a/kernel/busses/i2c-isa.c
+++ b/kernel/busses/i2c-isa.c
@@ -1,5 +1,5 @@
 /*
-    isa.c - Part of lm_sensors, Linux kernel modules for hardware
+    i2c-isa.c - Part of lm_sensors, Linux kernel modules for hardware
             monitoring
     Copyright (c) 1998  Frodo Looijaard <frodol@dds.nl> 
 
@@ -35,7 +35,7 @@
 #endif
 
 #include "version.h"
-#include "isa.h"
+#include "i2c-isa.h"
 
 static int isa_master_xfer (struct isa_adapter *adap,
                             struct i2c_msg msgs[], int num);
diff --git a/kernel/chips/adm9240.c b/kernel/chips/adm9240.c
index 4739d375..ac92aaa6 100644
--- a/kernel/chips/adm9240.c
+++ b/kernel/chips/adm9240.c
@@ -55,7 +55,7 @@
 #include <linux/types.h>
 #include "smbus.h"
 #include "version.h"
-#include "isa.h"
+#include "i2c-isa.h"
 #include "sensors.h"
 #include "i2c.h"
 #include "compat.h"
diff --git a/kernel/chips/lm78.c b/kernel/chips/lm78.c
index f8a56de4..99fabca5 100644
--- a/kernel/chips/lm78.c
+++ b/kernel/chips/lm78.c
@@ -28,7 +28,7 @@
 #include <linux/types.h>
 #include "smbus.h"
 #include "version.h"
-#include "isa.h"
+#include "i2c-isa.h"
 #include "sensors.h"
 #include "i2c.h"
 #include "compat.h"
diff --git a/kernel/chips/lm80.c b/kernel/chips/lm80.c
index 97644aa9..692a9412 100644
--- a/kernel/chips/lm80.c
+++ b/kernel/chips/lm80.c
@@ -29,7 +29,7 @@
 #include <linux/types.h>
 #include "smbus.h"
 #include "version.h"
-#include "isa.h"
+#include "i2c-isa.h"
 #include "sensors.h"
 #include "i2c.h"
 #include "compat.h"
diff --git a/kernel/chips/w83781d.c b/kernel/chips/w83781d.c
index fbf8bf0e..0e579f01 100644
--- a/kernel/chips/w83781d.c
+++ b/kernel/chips/w83781d.c
@@ -29,7 +29,7 @@
 #include <linux/types.h>
 #include "smbus.h"
 #include "version.h"
-#include "isa.h"
+#include "i2c-isa.h"
 #include "sensors.h"
 #include "i2c.h"
 #include "compat.h"
diff --git a/kernel/i2c-dev.c b/kernel/i2c-dev.c
index 00e5f670..e6b283bc 100644
--- a/kernel/i2c-dev.c
+++ b/kernel/i2c-dev.c
@@ -29,7 +29,7 @@
 #include "compat.h"
 #include "i2c.h"
 #include "smbus.h"
-#include "isa.h"
+#include "i2c-isa.h"
 #include "sensors.h"
 #include "version.h"
 #include "i2c-dev.h"
diff --git a/kernel/i2c-proc.c b/kernel/i2c-proc.c
index 8b3046bd..33513fdb 100644
--- a/kernel/i2c-proc.c
+++ b/kernel/i2c-proc.c
@@ -23,7 +23,7 @@
 
 #include "i2c.h"
 #include "smbus.h"
-#include "isa.h"
+#include "i2c-isa.h"
 #include "version.h"
 #include "compat.h"
 #include "sensors.h"
diff --git a/kernel/include/Module.mk b/kernel/include/Module.mk
index ea66c227..b728c5b7 100644
--- a/kernel/include/Module.mk
+++ b/kernel/include/Module.mk
@@ -20,7 +20,7 @@
 # verbatim in the rules, until it is redefined. 
 MODULE_DIR := kernel/include
 
-KERNELINCLUDEFILES := $(MODULE_DIR)/sensors.h $(MODULE_DIR)/isa.h \
+KERNELINCLUDEFILES := $(MODULE_DIR)/sensors.h $(MODULE_DIR)/i2c-isa.h \
                       $(MODULE_DIR)/smbus.h $(MODULE_DIR)/i2c-dev.h
 
 install-all-kernel-include:
diff --git a/kernel/include/i2c-isa.h b/kernel/include/i2c-isa.h
index e5a91f90..57af3e48 100644
--- a/kernel/include/i2c-isa.h
+++ b/kernel/include/i2c-isa.h
@@ -1,6 +1,6 @@
 /*
-    isa.h - Part of lm_sensors, Linux kernel modules for hardware
-            monitoring
+    i2c-isa.h - Part of lm_sensors, Linux kernel modules for hardware
+                monitoring
     Copyright (c) 1998  Frodo Looijaard <frodol@dds.nl>
 
     This program is free software; you can redistribute it and/or modify
diff --git a/kernel/sensors.c b/kernel/sensors.c
index 2823810b..656b2496 100644
--- a/kernel/sensors.c
+++ b/kernel/sensors.c
@@ -27,7 +27,7 @@
 #include "version.h"
 #include "compat.h"
 #include "i2c.h"
-#include "isa.h"
+#include "i2c-isa.h"
 #include "sensors.h"