--- a/remotes/avermedia/lircd.conf.avermedia98
+++ b/remotes/avermedia/lircd.conf.avermedia98
@@ -29,49 +29,49 @@
 
       begin codes
           TV/FM                    0x0000000000000023
-          CD                       0x0000000000000022
+          KEY_CD                       0x0000000000000022
 #          TELETEXT                 0x000000000000C03F
-          POWER                    0x0000000000000027
+          KEY_POWER                    0x0000000000000027
 
-          1                        0x0000000000000018
-          2                        0x0000000000000010
-          3                        0x0000000000000008
-          VIDEO                    0x0000000000000000
+          KEY_1                        0x0000000000000018
+          KEY_2                        0x0000000000000010
+          KEY_3                        0x0000000000000008
+          KEY_VIDEO                    0x0000000000000000
 
-          4                        0x0000000000000019
-          5                        0x0000000000000011
-          6                        0x0000000000000009
-          AUDIO                    0x0000000000000001
+          KEY_4                        0x0000000000000019
+          KEY_5                        0x0000000000000011
+          KEY_6                        0x0000000000000009
+          KEY_AUDIO                    0x0000000000000001
 
-          7                        0x000000000000001A
-          8                        0x0000000000000012
-          9                        0x000000000000000A
+          KEY_7                        0x000000000000001A
+          KEY_8                        0x0000000000000012
+          KEY_9                        0x000000000000000A
           FULLSCREEN               0x0000000000000002
 
-          0                        0x000000000000001B
+          KEY_0                        0x000000000000001B
           DISPLAY                  0x0000000000000013
           COLOR                    0x000000000000000B
           LOOP                     0x0000000000000003
 
           UNLABELED                0x000000000000001C
-          LEFT                     0x0000000000000014
-          RIGHT                    0x000000000000000C
-          PREVIEW                  0x0000000000000004
+          KEY_LEFT                     0x0000000000000014
+          KEY_RIGHT                    0x000000000000000C
+          KEY_PREVIOUS                  0x0000000000000004
 
           AUTOSCAN                 0x000000000000001D
           FREEZE                   0x0000000000000015
           CAPTURE                  0x000000000000000D
-          MUTE                     0x0000000000000005
+          KEY_MUTE                     0x0000000000000005
 
-          RED                      0x000000000000001E
-          VOL_DOWN                 0x0000000000000016
-          VOL_UP                   0x000000000000000E
-          YELLOW                   0x0000000000000006
+          KEY_RED                      0x000000000000001E
+          KEY_VOLUMEDOWN                 0x0000000000000016
+          KEY_VOLUMEUP                   0x000000000000000E
+          KEY_YELLOW                   0x0000000000000006
 
-          GREEN                    0x000000000000001F
-          CH_DOWN                  0x0000000000000017
-          CH_UP                    0x000000000000000F
-          BLUE                     0x0000000000000007
+          KEY_GREEN                    0x000000000000001F
+          KEY_CHANNELDOWN                  0x0000000000000017
+          KEY_CHANNELUP                    0x000000000000000F
+          KEY_BLUE                     0x0000000000000007
       end codes
 
 end remote