diff -Naurp lirc-0.8.4/remotes/atiusb/lircd.conf.atiusb lirc-0.8.4.new/remotes/atiusb/lircd.conf.atiusb
--- lirc-0.8.4/remotes/atiusb/lircd.conf.atiusb	2008-10-16 15:13:22.000000000 -0400
+++ lirc-0.8.4.new/remotes/atiusb/lircd.conf.atiusb	2008-10-16 15:24:46.000000000 -0400
@@ -1794,7 +1794,7 @@ end remote
 
 begin remote
 
-  name  Medion_X10
+  name  Medion_X10_V2
   bits           16
   eps            30
   aeps          100
@@ -1872,7 +1872,7 @@ end remote
 
 begin remote
 
-  name  Medion_X10
+  name  Medion_X10_V3
   bits           16
   eps            30
   aeps          100
diff -Naurp lirc-0.8.4/remotes/bestbuy/lircd.conf.bestbuy2 lirc-0.8.4.new/remotes/bestbuy/lircd.conf.bestbuy2
--- lirc-0.8.4/remotes/bestbuy/lircd.conf.bestbuy2	2008-10-16 15:13:22.000000000 -0400
+++ lirc-0.8.4.new/remotes/bestbuy/lircd.conf.bestbuy2	2008-10-16 15:16:45.000000000 -0400
@@ -11,7 +11,7 @@
 
 begin remote
 
-  name  BESTBUY
+  name  BESTBUY2
   bits            7
   eps            30
   aeps          100
diff -Naurp lirc-0.8.4/remotes/dvico/lircd.conf.fusionHDTV lirc-0.8.4.new/remotes/dvico/lircd.conf.fusionHDTV
--- lirc-0.8.4/remotes/dvico/lircd.conf.fusionHDTV	2008-10-16 15:13:22.000000000 -0400
+++ lirc-0.8.4.new/remotes/dvico/lircd.conf.fusionHDTV	2008-10-16 15:23:52.000000000 -0400
@@ -153,7 +153,7 @@ end remote
 
 begin remote
 
-  name  DVICO_MCE
+  name  DVICO_MCE2
   bits            8
   eps            30
   aeps          100
diff -Naurp lirc-0.8.4/remotes/generic/NEC-pulse.conf lirc-0.8.4.new/remotes/generic/NEC-pulse.conf
--- lirc-0.8.4/remotes/generic/NEC-pulse.conf	2000-12-03 09:21:31.000000000 -0500
+++ lirc-0.8.4.new/remotes/generic/NEC-pulse.conf	2008-10-16 15:19:20.000000000 -0400
@@ -7,7 +7,7 @@
 
 begin remote
 
-  name  NEC
+  name  NEC_PULSE
   bits           16
   flags SPACE_ENC|CONST_LENGTH
   eps            30
diff -Naurp lirc-0.8.4/remotes/generic/NEC-short-pulse.conf lirc-0.8.4.new/remotes/generic/NEC-short-pulse.conf
--- lirc-0.8.4/remotes/generic/NEC-short-pulse.conf	2000-12-03 09:21:31.000000000 -0500
+++ lirc-0.8.4.new/remotes/generic/NEC-short-pulse.conf	2008-10-16 15:19:10.000000000 -0400
@@ -9,7 +9,7 @@
 
 begin remote
 
-  name  NEC
+  name  NEC_SHORT_PULSE
   bits           16
   flags SPACE_ENC|CONST_LENGTH
   eps            30
diff -Naurp lirc-0.8.4/remotes/generic/SONY12.conf lirc-0.8.4.new/remotes/generic/SONY12.conf
--- lirc-0.8.4/remotes/generic/SONY12.conf	2001-08-04 06:20:11.000000000 -0400
+++ lirc-0.8.4.new/remotes/generic/SONY12.conf	2008-10-16 15:18:02.000000000 -0400
@@ -6,7 +6,7 @@
 
 begin remote
 
-  name  SONY
+  name  SONY_12
   bits            7
   flags SPACE_ENC|CONST_LENGTH
   eps            30
diff -Naurp lirc-0.8.4/remotes/generic/SONY20.conf lirc-0.8.4.new/remotes/generic/SONY20.conf
--- lirc-0.8.4/remotes/generic/SONY20.conf	2000-12-03 09:21:31.000000000 -0500
+++ lirc-0.8.4.new/remotes/generic/SONY20.conf	2008-10-16 15:18:12.000000000 -0400
@@ -6,7 +6,7 @@
 
 begin remote
 
-  name  SONY
+  name  SONY_20
   bits            7
   flags SPACE_ENC|CONST_LENGTH
   eps            30
diff -Naurp lirc-0.8.4/remotes/hauppauge/lircd.conf.hauppauge lirc-0.8.4.new/remotes/hauppauge/lircd.conf.hauppauge
--- lirc-0.8.4/remotes/hauppauge/lircd.conf.hauppauge	2008-10-16 15:13:22.000000000 -0400
+++ lirc-0.8.4.new/remotes/hauppauge/lircd.conf.hauppauge	2008-10-16 15:16:14.000000000 -0400
@@ -278,14 +278,14 @@ end remote
 #
 # contributed by Matthew Wright
 #
-# brand:  Hauppauge (HRV-1600 RT Remote)
+# brand:  Hauppauge (HVR-1600 RT Remote)
 # model no. of remote control: A415-HPG-A
 # devices being controlled by this remote:
 #
 
 begin remote
 
-  name  Hauppauge
+  name  Hauppauge_HVR_1600
   bits           13
   flags RC5|CONST_LENGTH
   eps            30
diff -Naurp lirc-0.8.4/remotes/leadtek/lircd.conf.PVR2000 lirc-0.8.4.new/remotes/leadtek/lircd.conf.PVR2000
--- lirc-0.8.4/remotes/leadtek/lircd.conf.PVR2000	2008-10-16 15:13:22.000000000 -0400
+++ lirc-0.8.4.new/remotes/leadtek/lircd.conf.PVR2000	2008-10-16 15:17:46.000000000 -0400
@@ -74,7 +74,7 @@ end remote
 
 begin remote
 
-  name  PVR2000
+  name  PVR2000_V2
   bits           8
   flags  SHIFT_ENC
   gap       120000