diff --git a/arch/ia64/include/asm/intr_remapping.h b/arch/ia64/include/asm/irq_remapping.h
similarity index 100%
rename from arch/ia64/include/asm/intr_remapping.h
rename to arch/ia64/include/asm/irq_remapping.h
diff --git a/arch/x86/include/asm/intr_remapping.h b/arch/x86/include/asm/irq_remapping.h
similarity index 97%
rename from arch/x86/include/asm/intr_remapping.h
rename to arch/x86/include/asm/irq_remapping.h
index f9cbbcb2956ebd8968e46e3f09e0f3ff396e4a86..dcb0c723102855647693e7036684158ae61493d2 100644
--- a/arch/x86/include/asm/intr_remapping.h
+++ b/arch/x86/include/asm/irq_remapping.h
@@ -19,8 +19,8 @@
  * the x86 interrupt management code.
  */
 
-#ifndef __X86_INTR_REMAPPING_H
-#define __X86_INTR_REMAPPING_H
+#ifndef __X86_IRQ_REMAPPING_H
+#define __X86_IRQ_REMAPPING_H
 
 #ifdef CONFIG_IRQ_REMAP
 
@@ -100,4 +100,4 @@ static inline int setup_hpet_msi_remapped(unsigned int irq, unsigned int id)
 }
 #endif /* CONFIG_IRQ_REMAP */
 
-#endif /* __X86_INTR_REMAPPING_H */
+#endif /* __X86_IRQ_REMAPPING_H */
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index c02c666c462862b9408b19a56524b690c725dab7..3722179a49db6d95aa5e868622637e983da44d3c 100644
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -35,7 +35,7 @@
 #include <linux/smp.h>
 #include <linux/mm.h>
 
-#include <asm/intr_remapping.h>
+#include <asm/irq_remapping.h>
 #include <asm/perf_event.h>
 #include <asm/x86_init.h>
 #include <asm/pgalloc.h>
diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
index abbbcd4d1d7197c9cb23b3cf162731097c5733c1..ef0648cd7084a08c57ad3acb4b7f7fce1dbbdfea 100644
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
@@ -57,7 +57,7 @@
 #include <asm/msidef.h>
 #include <asm/hypertransport.h>
 #include <asm/setup.h>
-#include <asm/intr_remapping.h>
+#include <asm/irq_remapping.h>
 #include <asm/hpet.h>
 #include <asm/hw_irq.h>
 
diff --git a/drivers/iommu/Makefile b/drivers/iommu/Makefile
index 823e1cf8708f4f673541e69c3375d7c868b00226..3e5e82ae9f0de957a7c67f004776850cc7ef3536 100644
--- a/drivers/iommu/Makefile
+++ b/drivers/iommu/Makefile
@@ -4,7 +4,7 @@ obj-$(CONFIG_AMD_IOMMU) += amd_iommu.o amd_iommu_init.o
 obj-$(CONFIG_AMD_IOMMU_V2) += amd_iommu_v2.o
 obj-$(CONFIG_DMAR_TABLE) += dmar.o
 obj-$(CONFIG_INTEL_IOMMU) += iova.o intel-iommu.o
-obj-$(CONFIG_IRQ_REMAP) += intel_intr_remapping.o intr_remapping.o
+obj-$(CONFIG_IRQ_REMAP) += intel_irq_remapping.o irq_remapping.o
 obj-$(CONFIG_OMAP_IOMMU) += omap-iommu.o
 obj-$(CONFIG_OMAP_IOVMM) += omap-iovmm.o
 obj-$(CONFIG_OMAP_IOMMU_DEBUG) += omap-iommu-debug.o
diff --git a/drivers/iommu/dmar.c b/drivers/iommu/dmar.c
index ee74f698eef817af8788c3f01674f578170c38e7..5ef65cf661528b4408e4d4d620af02918985253a 100644
--- a/drivers/iommu/dmar.c
+++ b/drivers/iommu/dmar.c
@@ -36,7 +36,7 @@
 #include <linux/tboot.h>
 #include <linux/dmi.h>
 #include <linux/slab.h>
-#include <asm/intr_remapping.h>
+#include <asm/irq_remapping.h>
 #include <asm/iommu_table.h>
 
 #define PREFIX "DMAR: "
diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
index cef5b8226f3d0fe929f6259777e1acd574a28deb..bf2fbaad5e2295a2417c26ef1224ea8a51e8238e 100644
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -42,7 +42,7 @@
 #include <linux/dmi.h>
 #include <linux/pci-ats.h>
 #include <linux/memblock.h>
-#include <asm/intr_remapping.h>
+#include <asm/irq_remapping.h>
 #include <asm/cacheflush.h>
 #include <asm/iommu.h>
 
diff --git a/drivers/iommu/intel_intr_remapping.c b/drivers/iommu/intel_irq_remapping.c
similarity index 99%
rename from drivers/iommu/intel_intr_remapping.c
rename to drivers/iommu/intel_irq_remapping.c
index efeb601c782f9b9ab95701efabb97d784f7bff94..b4d39507681a413041f65e7a35d6d74b56bb6030 100644
--- a/drivers/iommu/intel_intr_remapping.c
+++ b/drivers/iommu/intel_irq_remapping.c
@@ -11,11 +11,11 @@
 #include <asm/cpu.h>
 #include <linux/intel-iommu.h>
 #include <acpi/acpi.h>
-#include <asm/intr_remapping.h>
+#include <asm/irq_remapping.h>
 #include <asm/pci-direct.h>
 #include <asm/msidef.h>
 
-#include "intr_remapping.h"
+#include "irq_remapping.h"
 
 struct ioapic_scope {
 	struct intel_iommu *iommu;
diff --git a/drivers/iommu/intr_remapping.c b/drivers/iommu/irq_remapping.c
similarity index 99%
rename from drivers/iommu/intr_remapping.c
rename to drivers/iommu/irq_remapping.c
index 523a7b3a120553b87bfa5030d743b980b888e592..1cf350e02da8a27a33ff82380624b5085ff58395 100644
--- a/drivers/iommu/intr_remapping.c
+++ b/drivers/iommu/irq_remapping.c
@@ -2,7 +2,7 @@
 #include <linux/string.h>
 #include <linux/errno.h>
 
-#include "intr_remapping.h"
+#include "irq_remapping.h"
 
 int irq_remapping_enabled;
 
diff --git a/drivers/iommu/intr_remapping.h b/drivers/iommu/irq_remapping.h
similarity index 96%
rename from drivers/iommu/intr_remapping.h
rename to drivers/iommu/irq_remapping.h
index bd5d98fec14827128d2180250294a080813e7284..b12974cc1dfe73be3b4366651c26382f1ef8ea23 100644
--- a/drivers/iommu/intr_remapping.h
+++ b/drivers/iommu/irq_remapping.h
@@ -19,8 +19,8 @@
  * remapping drivers but with no need to be visible outside of the IOMMU layer.
  */
 
-#ifndef __INTR_REMAPPING_H
-#define __INTR_REMAPPING_H
+#ifndef __IRQ_REMAPPING_H
+#define __IRQ_REMAPPING_H
 
 #ifdef CONFIG_IRQ_REMAP
 
@@ -85,4 +85,4 @@ extern struct irq_remap_ops intel_irq_remap_ops;
 
 #endif /* CONFIG_IRQ_REMAP */
 
-#endif /* __INTR_REMAPPING_H */
+#endif /* __IRQ_REMAPPING_H */