diff --git a/drivers/media/rc/Makefile b/drivers/media/rc/Makefile
index 38873cff342956cf6e71c061f4528f3c6d5aa2e8..479a8f4c3a9ee8b629befece92baf9971688b14f 100644
--- a/drivers/media/rc/Makefile
+++ b/drivers/media/rc/Makefile
@@ -1,9 +1,9 @@
 ir-common-objs  := ir-functions.o
-ir-core-objs	:= ir-keytable.o ir-sysfs.o ir-raw-event.o rc-map.o
+rc-core-objs	:= rc-main.o rc-sysfs.o rc-raw.o rc-map.o
 
 obj-y += keymaps/
 
-obj-$(CONFIG_IR_CORE) += ir-core.o
+obj-$(CONFIG_IR_CORE) += rc-core.o
 obj-$(CONFIG_IR_LEGACY) += ir-common.o
 obj-$(CONFIG_LIRC) += lirc_dev.o
 obj-$(CONFIG_IR_NEC_DECODER) += ir-nec-decoder.o
diff --git a/drivers/media/rc/ir-functions.c b/drivers/media/rc/ir-functions.c
index ec021c92527af6e6bd6fd283adf4e6a33bf9089e..14397d0541d85cfcf9d12cc15c388f167582307d 100644
--- a/drivers/media/rc/ir-functions.c
+++ b/drivers/media/rc/ir-functions.c
@@ -24,7 +24,7 @@
 #include <linux/string.h>
 #include <linux/jiffies.h>
 #include <media/ir-common.h>
-#include "ir-core-priv.h"
+#include "rc-core-priv.h"
 
 /* -------------------------------------------------------------------------- */
 
diff --git a/drivers/media/rc/ir-jvc-decoder.c b/drivers/media/rc/ir-jvc-decoder.c
index 63dca6e5458b9100b098c4673a28b7aa1f474cf4..d83a5f64bfe4e8c4ee2a90d1007f740064be3514 100644
--- a/drivers/media/rc/ir-jvc-decoder.c
+++ b/drivers/media/rc/ir-jvc-decoder.c
@@ -13,7 +13,7 @@
  */
 
 #include <linux/bitrev.h>
-#include "ir-core-priv.h"
+#include "rc-core-priv.h"
 
 #define JVC_NBITS		16		/* dev(8) + func(8) */
 #define JVC_UNIT		525000		/* ns */
diff --git a/drivers/media/rc/ir-lirc-codec.c b/drivers/media/rc/ir-lirc-codec.c
index 9fc0db9d344d6458f6297cc4e015bc12d9486332..9345995dbf14a183f12a714e70f9cf101f2c8c3f 100644
--- a/drivers/media/rc/ir-lirc-codec.c
+++ b/drivers/media/rc/ir-lirc-codec.c
@@ -17,7 +17,7 @@
 #include <media/lirc.h>
 #include <media/lirc_dev.h>
 #include <media/ir-core.h>
-#include "ir-core-priv.h"
+#include "rc-core-priv.h"
 
 #define LIRCBUF_SIZE 256
 
diff --git a/drivers/media/rc/ir-nec-decoder.c b/drivers/media/rc/ir-nec-decoder.c
index 70993f79c8a2b9bb2a556f618df782cb59114368..cad4e994aa78bcd52ea4615a6744a82b9ea34b1e 100644
--- a/drivers/media/rc/ir-nec-decoder.c
+++ b/drivers/media/rc/ir-nec-decoder.c
@@ -13,7 +13,7 @@
  */
 
 #include <linux/bitrev.h>
-#include "ir-core-priv.h"
+#include "rc-core-priv.h"
 
 #define NEC_NBITS		32
 #define NEC_UNIT		562500  /* ns */
diff --git a/drivers/media/rc/ir-rc5-decoder.c b/drivers/media/rc/ir-rc5-decoder.c
index 572ed4ca8c6886eac536015f6b928e218e601878..c07f6e0bb962aa130a6eeb268adb5905742eb7d1 100644
--- a/drivers/media/rc/ir-rc5-decoder.c
+++ b/drivers/media/rc/ir-rc5-decoder.c
@@ -20,7 +20,7 @@
  * the first two bits are start bits, and a third one is a filing bit
  */
 
-#include "ir-core-priv.h"
+#include "rc-core-priv.h"
 
 #define RC5_NBITS		14
 #define RC5X_NBITS		20
diff --git a/drivers/media/rc/ir-rc5-sz-decoder.c b/drivers/media/rc/ir-rc5-sz-decoder.c
index 7c413501a3f776361d96c9094850182cdc4c075c..0c3b6eb4ccd64c047fe710a3c66c62b4fd2ad8f2 100644
--- a/drivers/media/rc/ir-rc5-sz-decoder.c
+++ b/drivers/media/rc/ir-rc5-sz-decoder.c
@@ -20,7 +20,7 @@
  * the first two bits are start bits, and a third one is a filing bit
  */
 
-#include "ir-core-priv.h"
+#include "rc-core-priv.h"
 
 #define RC5_SZ_NBITS		15
 #define RC5_UNIT		888888 /* ns */
diff --git a/drivers/media/rc/ir-rc6-decoder.c b/drivers/media/rc/ir-rc6-decoder.c
index d25da91f44ff4fdbbd1fb24fa6c8c9305690e711..48e82be5e01e2ef17a50264c2a8b9610f9eac1d5 100644
--- a/drivers/media/rc/ir-rc6-decoder.c
+++ b/drivers/media/rc/ir-rc6-decoder.c
@@ -12,7 +12,7 @@
  * GNU General Public License for more details.
  */
 
-#include "ir-core-priv.h"
+#include "rc-core-priv.h"
 
 /*
  * This decoder currently supports:
diff --git a/drivers/media/rc/ir-sony-decoder.c b/drivers/media/rc/ir-sony-decoder.c
index 2d15730822bc78931c3e4c9c0aad33211563ed70..0a5cadbf9bfbeed0476c97c8537dd56da6bde1c8 100644
--- a/drivers/media/rc/ir-sony-decoder.c
+++ b/drivers/media/rc/ir-sony-decoder.c
@@ -13,7 +13,7 @@
  */
 
 #include <linux/bitrev.h>
-#include "ir-core-priv.h"
+#include "rc-core-priv.h"
 
 #define SONY_UNIT		600000 /* ns */
 #define SONY_HEADER_PULSE	(4 * SONY_UNIT)
diff --git a/drivers/media/rc/ir-core-priv.h b/drivers/media/rc/rc-core-priv.h
similarity index 100%
rename from drivers/media/rc/ir-core-priv.h
rename to drivers/media/rc/rc-core-priv.h
diff --git a/drivers/media/rc/ir-keytable.c b/drivers/media/rc/rc-main.c
similarity index 99%
rename from drivers/media/rc/ir-keytable.c
rename to drivers/media/rc/rc-main.c
index 8039110350d3ed4eadb951a75a31fa718f156b5a..d6de2e25315ee834a51602175f3858bf7020ec78 100644
--- a/drivers/media/rc/ir-keytable.c
+++ b/drivers/media/rc/rc-main.c
@@ -15,7 +15,7 @@
 
 #include <linux/input.h>
 #include <linux/slab.h>
-#include "ir-core-priv.h"
+#include "rc-core-priv.h"
 
 /* Sizes are in bytes, 256 bytes allows for 32 entries on x64 */
 #define IR_TAB_MIN_SIZE	256
diff --git a/drivers/media/rc/ir-raw-event.c b/drivers/media/rc/rc-raw.c
similarity index 99%
rename from drivers/media/rc/ir-raw-event.c
rename to drivers/media/rc/rc-raw.c
index a06a07e4e0b1b88b3cb054eaf19bbbd2316d298b..d6c556e3f0d85c51d1850815ed49695c91acafcc 100644
--- a/drivers/media/rc/ir-raw-event.c
+++ b/drivers/media/rc/rc-raw.c
@@ -16,7 +16,7 @@
 #include <linux/mutex.h>
 #include <linux/sched.h>
 #include <linux/freezer.h>
-#include "ir-core-priv.h"
+#include "rc-core-priv.h"
 
 /* Define the max number of pulse/space transitions to buffer */
 #define MAX_IR_EVENT_SIZE      512
diff --git a/drivers/media/rc/ir-sysfs.c b/drivers/media/rc/rc-sysfs.c
similarity index 99%
rename from drivers/media/rc/ir-sysfs.c
rename to drivers/media/rc/rc-sysfs.c
index 38423a8da8717e32aeb5b08e95a0fc02424e43ca..a5f81d107ed44a10f9ffd03c48d7240c96017070 100644
--- a/drivers/media/rc/ir-sysfs.c
+++ b/drivers/media/rc/rc-sysfs.c
@@ -15,7 +15,7 @@
 #include <linux/slab.h>
 #include <linux/input.h>
 #include <linux/device.h>
-#include "ir-core-priv.h"
+#include "rc-core-priv.h"
 
 #define IRRCV_NUM_DEVICES	256