--- a/remotes/bestbuy/lircd.conf.bestbuy2
+++ b/remotes/bestbuy/lircd.conf.bestbuy2
@@ -27,29 +27,29 @@
       begin codes
           TV/FM                    0x0000000000000043
           SCAN                     0x0000000000000047
-          ZOOM                     0x000000000000005C
-          POWER                    0x000000000000005E
-          1                        0x0000000000000041
-          2                        0x000000000000004B
-          3                        0x000000000000005B
-          VOL+                     0x000000000000005F
-          4                        0x0000000000000045
-          5                        0x0000000000000049
-          6                        0x0000000000000055
-          VOL-                     0x0000000000000057
-          7                        0x0000000000000046
-          8                        0x000000000000004A
-          9                        0x0000000000000052
-          CH+                      0x0000000000000056
-          0                        0x0000000000000042
+          KEY_ZOOM                     0x000000000000005C
+          KEY_POWER                    0x000000000000005E
+          KEY_1                        0x0000000000000041
+          KEY_2                        0x000000000000004B
+          KEY_3                        0x000000000000005B
+          KEY_VOLUMEUP                     0x000000000000005F
+          KEY_4                        0x0000000000000045
+          KEY_5                        0x0000000000000049
+          KEY_6                        0x0000000000000055
+          KEY_VOLUMEDOWN                     0x0000000000000057
+          KEY_7                        0x0000000000000046
+          KEY_8                        0x000000000000004A
+          KEY_9                        0x0000000000000052
+          KEY_CHANNELUP                      0x0000000000000056
+          KEY_0                        0x0000000000000042
           LOOP                     0x0000000000000053
           +100                     0x0000000000000050
-          CH-                      0x0000000000000054
+          KEY_CHANNELDOWN                      0x0000000000000054
           SOURCE                   0x0000000000000040
-          MUTE                     0x0000000000000058
-          -                        0x0000000000000044
+          KEY_MUTE                     0x0000000000000058
+          KEY_KPMINUS                        0x0000000000000044
           FUNCTION                 0x000000000000004E
-          +                        0x000000000000004C
+          KEY_KPPLUS                        0x000000000000004C
           RESET                    0x000000000000004D
           FREEZE                   0x000000000000004F
       end codes