diff --git a/IrInputRemoteKeyCodes.h b/IrInputRemoteKeyCodes.h
index c34e49d..6cf16e7 100644
--- a/IrInputRemoteKeyCodes.h
+++ b/IrInputRemoteKeyCodes.h
@@ -39,8 +39,8 @@
 * -# None
 *
 */
-#ifndef _IARM_IR_KEYCODES_H_
-#define _IARM_IR_KEYCODES_H_
+#ifndef _IR_INPUT_REMOTE_KEYCODES_H_
+#define _IR_INPUT_REMOTE_KEYCODES_H_
 
 
 #include <linux/input.h>
@@ -72,13 +72,13 @@ static IARM_keycodes kcodesMap_IARM2Linux[] =
 	IARM_TO_LINUX_KEY( KED_GUIDE,KEY_HOME)
 	IARM_TO_LINUX_KEY( KED_INFO, KEY_F9)
 	IARM_TO_LINUX_KEY( KED_STAR, KEY_F6)
-	IARM_TO_LINUX_KEY( KED_INFO, KEY_F9)
 	IARM_TO_LINUX_KEY( KED_TVPOWER, KEY_F1)
 	IARM_TO_LINUX_KEY( KED_INPUTKEY, KEY_F15)
 	IARM_TO_LINUX_KEY( KED_OK, KEY_OK)
 	IARM_TO_LINUX_KEY( KED_SELECT, KEY_ENTER)
 	IARM_TO_LINUX_KEY( KED_ENTER, KEY_ENTER)
     IARM_TO_LINUX_KEY( KED_EXIT, KEY_ESC)
+	IARM_TO_LINUX_KEY( KED_BACK, KEY_ESC)
     IARM_TO_LINUX_KEY( KED_PERIOD, KEY_F5)
 	IARM_TO_LINUX_KEY( KED_PUSH_TO_TALK, KEY_F8)
 	IARM_TO_LINUX_KEY( KED_POWER, KEY_POWER) //FP
@@ -128,6 +128,7 @@ static IARM_keycodes kcodesMap_IARM2Linux[] =
     IARM_TO_LINUX_KEY( KED_SEARCH, KEY_F3)
     
     IARM_TO_LINUX_KEY( KED_RF_PAIR_GHOST, KEY_BLUETOOTH)
+	IARM_TO_LINUX_KEY( KED_STB_MENU, KEY_F9)          //cog
 
 
     IARM_TO_LINUX_KEY( KED_UNDEFINEDKEY, KEY_UNKNOWN)
@@ -137,7 +138,7 @@ static IARM_keycodes kcodesMap_IARM2Linux[] =
 }
 #endif
 
-#endif /* _IARM_IR_KEYCODES_H_ */
+#endif /* _IR_INPUT_REMOTE_KEYCODES_H_ */
 
 
 /* End of IARM_BUS_IRMGR_API doxygen group */
diff --git a/UIEventSimulator.h b/UIEventSimulator.h
index 99ef52e..d28902b 100644
--- a/UIEventSimulator.h
+++ b/UIEventSimulator.h
@@ -47,6 +47,7 @@ lookUpTable table[] =
 { "left", KED_ARROWLEFT },
 { "right", KED_ARROWRIGHT },
 { "select", KED_SELECT },
+{ "enter", KED_SELECT },
 { "enter", KED_ENTER },
 { "exit", KED_EXIT },
 { "chup", KED_CHANNELUP },
@@ -85,7 +86,7 @@ lookUpTable table[] =
 { "previous", KED_PREVIOUS },
 { "next", KED_NEXT },
 { "menu", KED_MENU },
-{ "home", KED_MENU },
+{ "home", KED_MENU }, 
 { "inputkey", KED_INPUTKEY },
 { "livetv", KED_LIVE },
 { "mydvr", KED_MYDVR },
@@ -107,7 +108,7 @@ lookUpTable table[] =
 { "dmcquery", KED_DMC_QUERY },
 { "otrstart", KED_OTR_START },
 { "strstop", KED_OTR_STOP },
-{ "Period", KED_PERIOD },
+{ "period", KED_PERIOD },
 { "push2talk", KED_PUSH_TO_TALK },
 { "mute", KED_MUTE },
 { "info", KED_INFO },
diff --git a/uInputInternal.h b/uInputInternal.h
index e8a4592..c6776b5 100644
--- a/uInputInternal.h
+++ b/uInputInternal.h
@@ -61,8 +61,8 @@
 **/
 
 
-#ifndef _IARM_UINPUT_INTERNAL_
-#define _IARM_UINPUT_INTERNAL_
+#ifndef _UINPUT_INTERNAL_
+#define _UINPUT_INTERNAL_
 #include "libIARM.h"
 #include <string.h>
 #include <stdbool.h>
@@ -100,7 +100,7 @@ typedef void (* uinput_dispatcher_t) (int keyCode, int keyType, int source);
  *
  * @return Error code if fails.
  */
-int UINPUT_init();
+int UINPUT_init(void);
 
 /**
  * @brief get the dispather that will listen for IARM  IR 
diff --git a/uinput.c b/uinput.c
index 58f4ffe..3370f72 100644
--- a/uinput.c
+++ b/uinput.c
@@ -142,7 +142,7 @@ static void udispatcher (int keyCode, int keyType, int source)
 }
 
 
-int UINPUT_init()
+int UINPUT_init(void)
 {
 #ifndef UINPUT_VERSION
 #define UINPUT_VERSION (0)