diff --git a/Documentation/ibm-acpi.txt b/Documentation/thinkpad-acpi.txt
similarity index 100%
rename from Documentation/ibm-acpi.txt
rename to Documentation/thinkpad-acpi.txt
diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
index 848b398482d9..ebf4ff2f858e 100644
--- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@ -12,4 +12,4 @@ obj-$(CONFIG_TIFM_CORE)       	+= tifm_core.o
 obj-$(CONFIG_TIFM_7XX1)       	+= tifm_7xx1.o
 obj-$(CONFIG_SGI_IOC4)		+= ioc4.o
 obj-$(CONFIG_SONY_LAPTOP)	+= sony-laptop.o
-obj-$(CONFIG_ACPI_IBM)		+= ibm_acpi.o
+obj-$(CONFIG_ACPI_IBM)		+= thinkpad_acpi.o
diff --git a/drivers/misc/ibm_acpi.c b/drivers/misc/thinkpad_acpi.c
similarity index 99%
rename from drivers/misc/ibm_acpi.c
rename to drivers/misc/thinkpad_acpi.c
index ae03b8f6f7be..2836516ece86 100644
--- a/drivers/misc/ibm_acpi.c
+++ b/drivers/misc/thinkpad_acpi.c
@@ -79,7 +79,7 @@
  *  2004-08-09	0.1	initial release, support for X series
  */
 
-#include "ibm_acpi.h"
+#include "thinkpad_acpi.h"
 
 MODULE_AUTHOR("Borislav Deianov, Henrique de Moraes Holschuh");
 MODULE_DESCRIPTION(IBM_DESC);
diff --git a/drivers/misc/ibm_acpi.h b/drivers/misc/thinkpad_acpi.h
similarity index 100%
rename from drivers/misc/ibm_acpi.h
rename to drivers/misc/thinkpad_acpi.h