--- a/remotes/bestbuy/lircd.conf.bestbuy
+++ b/remotes/bestbuy/lircd.conf.bestbuy
@@ -26,36 +26,36 @@
 
 
       begin codes
-          0                        0x0000000000000000
-          1                        0x0000000000000001
-          2                        0x0000000000000002
-          3                        0x0000000000000003
-          4                        0x0000000000000004
-          5                        0x0000000000000005
-          6                        0x0000000000000006
-          7                        0x0000000000000007
-          8                        0x0000000000000008
-          9                        0x0000000000000009
-          TV                       0x000000000000001C
-          POWER                    0x0000000000000012
-          VIDEO                    0x0000000000000011
-          PREVIEW                  0x000000000000000F
-          MUTE                     0x0000000000000013
+          KEY_0                        0x0000000000000000
+          KEY_1                        0x0000000000000001
+          KEY_2                        0x0000000000000002
+          KEY_3                        0x0000000000000003
+          KEY_4                        0x0000000000000004
+          KEY_5                        0x0000000000000005
+          KEY_6                        0x0000000000000006
+          KEY_7                        0x0000000000000007
+          KEY_8                        0x0000000000000008
+          KEY_9                        0x0000000000000009
+          KEY_TV                       0x000000000000001C
+          KEY_POWER                    0x0000000000000012
+          KEY_VIDEO                    0x0000000000000011
+          KEY_PREVIOUS                  0x000000000000000F
+          KEY_MUTE                     0x0000000000000013
           SCAN                     0x0000000000000010
-          CHANNEL_UP               0x000000000000001A
-          CHANNEL_DOWN             0x000000000000001E
-          VOL_UP                   0x000000000000001B
-          VOL_DOWN                 0x000000000000001F
+          KEY_CHANNELUP               0x000000000000001A
+          KEY_CHANNELDOWN             0x000000000000001E
+          KEY_VOLUMEUP                   0x000000000000001B
+          KEY_VOLUMEDOWN                 0x000000000000001F
           LOOP                     0x000000000000000A
           100                      0x0000000000000017
-          ZOOM                     0x000000000000000D
-          RECORD                   0x000000000000000E
-          STOP                     0x000000000000001D
-          PLAY                     0x0000000000000019
+          KEY_ZOOM                     0x000000000000000D
+          KEY_RECORD                   0x000000000000000E
+          KEY_STOP                     0x000000000000001D
+          KEY_PLAY                     0x0000000000000019
           FREEZE                   0x0000000000000016
           COLOR                    0x0000000000000014
-          LEFT                     0x0000000000000018
-          RIGHT                    0x000000000000000C
+          KEY_LEFT                     0x0000000000000018
+          KEY_RIGHT                    0x000000000000000C
       end codes
 
 end remote