diff --git a/legacy/elementary/ChangeLog b/legacy/elementary/ChangeLog
index 37b5535a8b..052bd6c73e 100644
--- a/legacy/elementary/ChangeLog
+++ b/legacy/elementary/ChangeLog
@@ -1516,6 +1516,10 @@
         * File Selector : Support elm_object_part_text_set() for the ok, cancel
         part to change the OK, Cancel button label.
 
+2013-07-25  Carsten Haitzler (The Rasterman)
+
+        * Add throttle policy settings to elm
+
 2013-07-26  ChunEon Park (Hermet)
 
         * Flip : Fix the flip page to not flip on a direction if the direction
@@ -1524,3 +1528,8 @@
 2013-07-31  Shinwoo Kim
 
         * Add _elm_access_object_get, deprecate _elm_access_info_get.
+
+2013-07-31  Carsten Haitzler (The Rasterman)
+
+        * Fix elm to use key not keyname (otherwise xmodmap and friends
+        don't work).
diff --git a/legacy/elementary/src/bin/test_access.c b/legacy/elementary/src/bin/test_access.c
index 340684ed35..522238c009 100644
--- a/legacy/elementary/src/bin/test_access.c
+++ b/legacy/elementary/src/bin/test_access.c
@@ -312,9 +312,9 @@ _key_down_cb(void *data, int type __UNUSED__, void *ei)
    a = calloc(1, sizeof(Elm_Access_Action_Info));
    if (!a) return ECORE_CALLBACK_PASS_ON;
 
-   if (ev && ev->keyname)
+   if (ev && ev->key)
      {
-        if (!strcmp(ev->keyname, "F1"))
+        if (!strcmp(ev->key, "F1"))
           {
              a->highlight_cycle = EINA_TRUE;
              elm_access_action(data, ELM_ACCESS_ACTION_HIGHLIGHT_NEXT, a);
diff --git a/legacy/elementary/src/bin/test_focus.c b/legacy/elementary/src/bin/test_focus.c
index 254291661f..11529b95cb 100644
--- a/legacy/elementary/src/bin/test_focus.c
+++ b/legacy/elementary/src/bin/test_focus.c
@@ -26,7 +26,7 @@ _on_key_down(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj __UNUSE
 {
    //Evas_Event_Key_Down *event = einfo;
    //printf("%s %p Key %s Parent %p\n", evas_object_type_get(obj),
-   //       obj, event->keyname, evas_object_smart_parent_get(obj));
+   //       obj, event->key, evas_object_smart_parent_get(obj));
 }
 
 static void
diff --git a/legacy/elementary/src/bin/test_glview.c b/legacy/elementary/src/bin/test_glview.c
index 55f8a66fa3..f3dbd2a7e2 100644
--- a/legacy/elementary/src/bin/test_glview.c
+++ b/legacy/elementary/src/bin/test_glview.c
@@ -525,31 +525,31 @@ _key_down(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *eve
    ev = (Evas_Event_Key_Down *)event_info;
    GLData *gld = evas_object_data_get(obj, "gld");
 
-   if (strcmp(ev->keyname, "Left") == 0)
+   if (strcmp(ev->key, "Left") == 0)
      {
         gld->view_roty += 5.0;
         return;
      }
 
-   if (strcmp(ev->keyname, "Right") == 0)
+   if (strcmp(ev->key, "Right") == 0)
      {
         gld->view_roty -= 5.0;
         return;
      }
 
-   if (strcmp(ev->keyname, "Up") == 0)
+   if (strcmp(ev->key, "Up") == 0)
      {
         gld->view_rotx += 5.0;
         return;
      }
 
-   if (strcmp(ev->keyname, "Down") == 0)
+   if (strcmp(ev->key, "Down") == 0)
      {
         gld->view_rotx -= 5.0;
         return;
      }
-   if ((strcmp(ev->keyname, "Escape") == 0) ||
-       (strcmp(ev->keyname, "Return") == 0))
+   if ((strcmp(ev->key, "Escape") == 0) ||
+       (strcmp(ev->key, "Return") == 0))
      {
         //_on_done(data, obj, event_info);
         return;
diff --git a/legacy/elementary/src/lib/elc_ctxpopup.c b/legacy/elementary/src/lib/elc_ctxpopup.c
index a84565bb00..a80acc657a 100644
--- a/legacy/elementary/src/lib/elc_ctxpopup.c
+++ b/legacy/elementary/src/lib/elc_ctxpopup.c
@@ -126,7 +126,7 @@ _elm_ctxpopup_smart_event(Eo *obj, void *_pd, va_list *list)
    if (type != EVAS_CALLBACK_KEY_DOWN) return;
    if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
 
-   if (!strcmp(ev->keyname, "Tab"))
+   if (!strcmp(ev->key, "Tab"))
      {
         if (evas_key_modifier_is_set(ev->modifiers, "Shift"))
           elm_widget_focus_cycle(sd->box, ELM_FOCUS_PREVIOUS);
@@ -136,30 +136,30 @@ _elm_ctxpopup_smart_event(Eo *obj, void *_pd, va_list *list)
         return;
      }
 
-   if (((!strcmp(ev->keyname, "Left")) ||
-        (!strcmp(ev->keyname, "KP_Left")) ||
-        (!strcmp(ev->keyname, "Right")) ||
-        (!strcmp(ev->keyname, "KP_Right")) ||
-        (!strcmp(ev->keyname, "Up")) ||
-        (!strcmp(ev->keyname, "KP_Up")) ||
-        (!strcmp(ev->keyname, "Down")) ||
-        (!strcmp(ev->keyname, "KP_Down"))) && (!ev->string))
+   if (((!strcmp(ev->key, "Left")) ||
+        (!strcmp(ev->key, "KP_Left")) ||
+        (!strcmp(ev->key, "Right")) ||
+        (!strcmp(ev->key, "KP_Right")) ||
+        (!strcmp(ev->key, "Up")) ||
+        (!strcmp(ev->key, "KP_Up")) ||
+        (!strcmp(ev->key, "Down")) ||
+        (!strcmp(ev->key, "KP_Down"))) && (!ev->string))
      {
         if (sd->box)
           {
              double degree = 0.0;
 
-             if ((!strcmp(ev->keyname, "Left")) ||
-                 (!strcmp(ev->keyname, "KP_Left")))
+             if ((!strcmp(ev->key, "Left")) ||
+                 (!strcmp(ev->key, "KP_Left")))
                degree = 270.0;
-             else if ((!strcmp(ev->keyname, "Right")) ||
-                      (!strcmp(ev->keyname, "KP_Right")))
+             else if ((!strcmp(ev->key, "Right")) ||
+                      (!strcmp(ev->key, "KP_Right")))
                degree = 90.0;
-             else if ((!strcmp(ev->keyname, "Up")) ||
-                      (!strcmp(ev->keyname, "KP_Up")))
+             else if ((!strcmp(ev->key, "Up")) ||
+                      (!strcmp(ev->key, "KP_Up")))
                degree = 0.0;
-             else if ((!strcmp(ev->keyname, "Down")) ||
-                      (!strcmp(ev->keyname, "KP_Down")))
+             else if ((!strcmp(ev->key, "Down")) ||
+                      (!strcmp(ev->key, "KP_Down")))
                degree = 180.0;
 
              elm_widget_focus_direction_go(obj, degree);
@@ -169,7 +169,7 @@ _elm_ctxpopup_smart_event(Eo *obj, void *_pd, va_list *list)
           }
      }
 
-   if (strcmp(ev->keyname, "Escape")) return;
+   if (strcmp(ev->key, "Escape")) return;
 
    evas_object_hide(obj);
    ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
diff --git a/legacy/elementary/src/lib/elc_multibuttonentry.c b/legacy/elementary/src/lib/elc_multibuttonentry.c
index 7531b07b4f..109b272578 100644
--- a/legacy/elementary/src/lib/elc_multibuttonentry.c
+++ b/legacy/elementary/src/lib/elc_multibuttonentry.c
@@ -1017,8 +1017,8 @@ _layout_key_up_cb(void *data,
    if (sd->last_btn_select)
      {
         if (sd->selected_it &&
-            ((strcmp(ev->keyname, "BackSpace") == 0) ||
-             (strcmp(ev->keyname, "Delete") == 0)))
+            ((strcmp(ev->key, "BackSpace") == 0) ||
+             (strcmp(ev->key, "Delete") == 0)))
           {
              item = (Elm_Multibuttonentry_Item *)sd->selected_it;
              if (item && sd->editable)
@@ -1028,8 +1028,8 @@ _layout_key_up_cb(void *data,
                }
           }
         else if (((!sd->selected_it && (sd->n_str == 0) &&
-                   (strcmp(ev->keyname, "BackSpace") == 0)) ||
-                  (strcmp(ev->keyname, "Delete") == 0)))
+                   (strcmp(ev->key, "BackSpace") == 0)) ||
+                  (strcmp(ev->key, "Delete") == 0)))
           {
              item = eina_list_data_get(eina_list_last(sd->items));
              if (item)
@@ -1050,7 +1050,7 @@ _entry_key_down_cb(void *data,
    Evas_Event_Key_Down *ev = (Evas_Event_Key_Down *)event_info;
 
    if (sd->n_str == 1 &&
-       (!strcmp(ev->keyname, "BackSpace") || !strcmp(ev->keyname, "Delete")))
+       (!strcmp(ev->key, "BackSpace") || !strcmp(ev->key, "Delete")))
      sd->last_btn_select = EINA_FALSE;
 }
 
@@ -1069,7 +1069,7 @@ _entry_key_up_cb(void *data,
    str = elm_object_text_get(sd->entry);
 
    if (strlen(str) &&
-       (!strcmp(ev->keyname, "KP_Enter") || !strcmp(ev->keyname, "Return")))
+       (!strcmp(ev->key, "KP_Enter") || !strcmp(ev->key, "Return")))
      {
         _button_item_add(sd, str, MULTIBUTTONENTRY_POS_END, NULL, NULL, NULL);
         sd->n_str = 0;
diff --git a/legacy/elementary/src/lib/elc_naviframe.c b/legacy/elementary/src/lib/elc_naviframe.c
index f8b99ff6f2..0e28e38dc4 100644
--- a/legacy/elementary/src/lib/elc_naviframe.c
+++ b/legacy/elementary/src/lib/elc_naviframe.c
@@ -1391,7 +1391,7 @@ _elm_naviframe_smart_event(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
    if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
    if (elm_widget_disabled_get(obj)) return;
    if (type != EVAS_CALLBACK_KEY_DOWN) return;
-   if (strcmp(ev->keyname, "BackSpace")) return;
+   if (strcmp(ev->key, "BackSpace")) return;
 
    eo_do(obj, elm_obj_naviframe_top_item_get((Elm_Object_Item **)&it));
    if (!it) return;
diff --git a/legacy/elementary/src/lib/elc_player.c b/legacy/elementary/src/lib/elc_player.c
index 14b8564fba..38d02b4104 100644
--- a/legacy/elementary/src/lib/elc_player.c
+++ b/legacy/elementary/src/lib/elc_player.c
@@ -76,8 +76,8 @@ _elm_player_smart_event(Eo *obj, void *_pd, va_list *list)
    if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
    if (!sd->video) return;
 
-   if ((!strcmp(ev->keyname, "Left")) ||
-       ((!strcmp(ev->keyname, "KP_Left")) && (!ev->string)))
+   if ((!strcmp(ev->key, "Left")) ||
+       ((!strcmp(ev->key, "KP_Left")) && (!ev->string)))
      {
         double current, last;
 
@@ -94,8 +94,8 @@ _elm_player_smart_event(Eo *obj, void *_pd, va_list *list)
         if (ret) *ret = EINA_TRUE;
         return;
      }
-   if ((!strcmp(ev->keyname, "Right")) ||
-       ((!strcmp(ev->keyname, "KP_Right")) && (!ev->string)))
+   if ((!strcmp(ev->key, "Right")) ||
+       ((!strcmp(ev->key, "KP_Right")) && (!ev->string)))
      {
         double current, last;
 
@@ -113,7 +113,7 @@ _elm_player_smart_event(Eo *obj, void *_pd, va_list *list)
         if (ret) *ret = EINA_TRUE;
         return;
      }
-   if (!strcmp(ev->keyname, "space"))
+   if (!strcmp(ev->key, "space"))
      {
         if (elm_video_is_playing_get(sd->video))
           elm_video_pause(sd->video);
diff --git a/legacy/elementary/src/lib/elc_popup.c b/legacy/elementary/src/lib/elc_popup.c
index 84c1d28c54..f08e65656e 100644
--- a/legacy/elementary/src/lib/elc_popup.c
+++ b/legacy/elementary/src/lib/elc_popup.c
@@ -1430,7 +1430,7 @@ _elm_popup_smart_event(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
    if (type != EVAS_CALLBACK_KEY_DOWN) return;
    if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
 
-   if (!strcmp(ev->keyname, "Tab"))
+   if (!strcmp(ev->key, "Tab"))
      {
         if (evas_key_modifier_is_set(ev->modifiers, "Shift"))
           elm_widget_focus_cycle(obj, ELM_FOCUS_PREVIOUS);
@@ -1439,26 +1439,26 @@ _elm_popup_smart_event(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
 
         goto success;
      }
-   else if ((!strcmp(ev->keyname, "Left")) ||
-            ((!strcmp(ev->keyname, "KP_Left")) && (!ev->string)))
+   else if ((!strcmp(ev->key, "Left")) ||
+            ((!strcmp(ev->key, "KP_Left")) && (!ev->string)))
      {
         elm_widget_focus_direction_go(obj, 270.0);
         goto success;
      }
-   else if ((!strcmp(ev->keyname, "Right")) ||
-            ((!strcmp(ev->keyname, "KP_Right")) && (!ev->string)))
+   else if ((!strcmp(ev->key, "Right")) ||
+            ((!strcmp(ev->key, "KP_Right")) && (!ev->string)))
      {
         elm_widget_focus_direction_go(obj, 90.0);
         goto success;
      }
-   else if ((!strcmp(ev->keyname, "Up")) ||
-            ((!strcmp(ev->keyname, "KP_Up")) && (!ev->string)))
+   else if ((!strcmp(ev->key, "Up")) ||
+            ((!strcmp(ev->key, "KP_Up")) && (!ev->string)))
      {
         elm_widget_focus_direction_go(obj, 0.0);
         goto success;
      }
-   else if ((!strcmp(ev->keyname, "Down")) ||
-            ((!strcmp(ev->keyname, "KP_Down")) && (!ev->string)))
+   else if ((!strcmp(ev->key, "Down")) ||
+            ((!strcmp(ev->key, "KP_Down")) && (!ev->string)))
      {
         elm_widget_focus_direction_go(obj, 180.0);
         goto success;
diff --git a/legacy/elementary/src/lib/elm_button.c b/legacy/elementary/src/lib/elm_button.c
index 9dada591de..2f8d879f11 100644
--- a/legacy/elementary/src/lib/elm_button.c
+++ b/legacy/elementary/src/lib/elm_button.c
@@ -181,9 +181,9 @@ _elm_button_smart_event(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
    if (type != EVAS_CALLBACK_KEY_DOWN) return;
    if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
 
-   if ((strcmp(ev->keyname, "Return")) &&
-       (strcmp(ev->keyname, "KP_Enter")) &&
-       (strcmp(ev->keyname, "space")))
+   if ((strcmp(ev->key, "Return")) &&
+       (strcmp(ev->key, "KP_Enter")) &&
+       (strcmp(ev->key, "space")))
      return;
 
    _activate(obj);
diff --git a/legacy/elementary/src/lib/elm_calendar.c b/legacy/elementary/src/lib/elm_calendar.c
index dd9a3a3a8b..6910ef2759 100644
--- a/legacy/elementary/src/lib/elm_calendar.c
+++ b/legacy/elementary/src/lib/elm_calendar.c
@@ -857,13 +857,13 @@ _elm_calendar_smart_event(Eo *obj, void *_pd, va_list *list)
    if (type != EVAS_CALLBACK_KEY_DOWN) return;
    if (elm_widget_disabled_get(obj)) return;
 
-   if ((!strcmp(ev->keyname, "Prior")) ||
-       ((!strcmp(ev->keyname, "KP_Prior")) && (!ev->string)))
+   if ((!strcmp(ev->key, "Prior")) ||
+       ((!strcmp(ev->key, "KP_Prior")) && (!ev->string)))
      {
         if (_update_data(obj, EINA_TRUE, -1)) _populate(obj);
      }
-   else if ((!strcmp(ev->keyname, "Next")) ||
-            ((!strcmp(ev->keyname, "KP_Next")) && (!ev->string)))
+   else if ((!strcmp(ev->key, "Next")) ||
+            ((!strcmp(ev->key, "KP_Next")) && (!ev->string)))
      {
         if (_update_data(obj, EINA_TRUE, 1)) _populate(obj);
      }
@@ -871,32 +871,32 @@ _elm_calendar_smart_event(Eo *obj, void *_pd, va_list *list)
             && ((sd->select_mode != ELM_CALENDAR_SELECT_MODE_ONDEMAND)
                 || (sd->selected)))
      {
-        if ((!strcmp(ev->keyname, "Left")) ||
-            ((!strcmp(ev->keyname, "KP_Left")) && (!ev->string)))
+        if ((!strcmp(ev->key, "Left")) ||
+            ((!strcmp(ev->key, "KP_Left")) && (!ev->string)))
           {
              if ((sd->select_mode != ELM_CALENDAR_SELECT_MODE_ONDEMAND)
                  || ((sd->shown_time.tm_year == sd->selected_time.tm_year)
                      && (sd->shown_time.tm_mon == sd->selected_time.tm_mon)))
                _update_sel_it(obj, sd->selected_it - 1);
           }
-        else if ((!strcmp(ev->keyname, "Right")) ||
-                 ((!strcmp(ev->keyname, "KP_Right")) && (!ev->string)))
+        else if ((!strcmp(ev->key, "Right")) ||
+                 ((!strcmp(ev->key, "KP_Right")) && (!ev->string)))
           {
              if ((sd->select_mode != ELM_CALENDAR_SELECT_MODE_ONDEMAND)
                  || ((sd->shown_time.tm_year == sd->selected_time.tm_year)
                      && (sd->shown_time.tm_mon == sd->selected_time.tm_mon)))
                _update_sel_it(obj, sd->selected_it + 1);
           }
-        else if ((!strcmp(ev->keyname, "Up")) ||
-                 ((!strcmp(ev->keyname, "KP_Up")) && (!ev->string)))
+        else if ((!strcmp(ev->key, "Up")) ||
+                 ((!strcmp(ev->key, "KP_Up")) && (!ev->string)))
           {
              if ((sd->select_mode != ELM_CALENDAR_SELECT_MODE_ONDEMAND)
                  || ((sd->shown_time.tm_year == sd->selected_time.tm_year)
                      && (sd->shown_time.tm_mon == sd->selected_time.tm_mon)))
                _update_sel_it(obj, sd->selected_it - ELM_DAY_LAST);
           }
-        else if ((!strcmp(ev->keyname, "Down")) ||
-                 ((!strcmp(ev->keyname, "KP_Down")) && (!ev->string)))
+        else if ((!strcmp(ev->key, "Down")) ||
+                 ((!strcmp(ev->key, "KP_Down")) && (!ev->string)))
           {
              if ((sd->select_mode != ELM_CALENDAR_SELECT_MODE_ONDEMAND)
                  || ((sd->shown_time.tm_year == sd->selected_time.tm_year)
diff --git a/legacy/elementary/src/lib/elm_check.c b/legacy/elementary/src/lib/elm_check.c
index 7fc6af092a..bd2777eb77 100644
--- a/legacy/elementary/src/lib/elm_check.c
+++ b/legacy/elementary/src/lib/elm_check.c
@@ -159,9 +159,9 @@ _elm_check_smart_event(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
 
    if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
 
-   if ((strcmp(ev->keyname, "Return")) &&
-       (strcmp(ev->keyname, "KP_Enter")) &&
-       (strcmp(ev->keyname, "space")))
+   if ((strcmp(ev->key, "Return")) &&
+       (strcmp(ev->key, "KP_Enter")) &&
+       (strcmp(ev->key, "space")))
      return;
 
    _activate(obj);
diff --git a/legacy/elementary/src/lib/elm_colorselector.c b/legacy/elementary/src/lib/elm_colorselector.c
index 25e272762e..05998a1b20 100644
--- a/legacy/elementary/src/lib/elm_colorselector.c
+++ b/legacy/elementary/src/lib/elm_colorselector.c
@@ -1663,8 +1663,8 @@ _elm_colorselector_smart_event(Eo *obj, void *_pd, va_list *list)
    if (elm_widget_disabled_get(obj)) return;
    if (!sd->selected) sd->selected = sd->items;
 
-   if ((!strcmp(ev->keyname, "Left")) ||
-       ((!strcmp(ev->keyname, "KP_Left")) && (!ev->string)))
+   if ((!strcmp(ev->key, "Left")) ||
+       ((!strcmp(ev->key, "KP_Left")) && (!ev->string)))
      {
         if (sd->focused == ELM_COLORSELECTOR_PALETTE && sd->selected)
           cl = eina_list_prev(sd->selected);
@@ -1672,8 +1672,8 @@ _elm_colorselector_smart_event(Eo *obj, void *_pd, va_list *list)
           _button_clicked_cb(sd->cb_data[sd->sel_color_type], sd->cb_data[sd->sel_color_type]->lbt, NULL);
         else return;
      }
-   else if ((!strcmp(ev->keyname, "Right")) ||
-            ((!strcmp(ev->keyname, "KP_Right")) && (!ev->string)))
+   else if ((!strcmp(ev->key, "Right")) ||
+            ((!strcmp(ev->key, "KP_Right")) && (!ev->string)))
      {
         if (sd->focused == ELM_COLORSELECTOR_PALETTE && sd->selected)
           cl = eina_list_next(sd->selected);
@@ -1681,8 +1681,8 @@ _elm_colorselector_smart_event(Eo *obj, void *_pd, va_list *list)
           _button_clicked_cb(sd->cb_data[sd->sel_color_type], sd->cb_data[sd->sel_color_type]->rbt, NULL);
         else return;
      }
-   else if ((!strcmp(ev->keyname, "Up")) ||
-            ((!strcmp(ev->keyname, "KP_Up")) && (!ev->string)))
+   else if ((!strcmp(ev->key, "Up")) ||
+            ((!strcmp(ev->key, "KP_Up")) && (!ev->string)))
      {
         if (sd->focused == ELM_COLORSELECTOR_COMPONENTS)
           {
@@ -1710,8 +1710,8 @@ _elm_colorselector_smart_event(Eo *obj, void *_pd, va_list *list)
             if (!cl) cl = sd->selected;
         }
      }
-   else if ((!strcmp(ev->keyname, "Down")) ||
-            ((!strcmp(ev->keyname, "KP_Down")) && (!ev->string)))
+   else if ((!strcmp(ev->key, "Down")) ||
+            ((!strcmp(ev->key, "KP_Down")) && (!ev->string)))
      {
         if (sd->focused == ELM_COLORSELECTOR_PALETTE)
           {
diff --git a/legacy/elementary/src/lib/elm_diskselector.c b/legacy/elementary/src/lib/elm_diskselector.c
index 4ad0af89d0..ec8d2b0074 100644
--- a/legacy/elementary/src/lib/elm_diskselector.c
+++ b/legacy/elementary/src/lib/elm_diskselector.c
@@ -975,29 +975,29 @@ _elm_diskselector_smart_event(Eo *obj, void *_pd, va_list *list)
         return;
      }
 
-   if ((!strcmp(ev->keyname, "Left")) ||
-       ((!strcmp(ev->keyname, "KP_Left")) && (!ev->string)) ||
-       (!strcmp(ev->keyname, "Up")) ||
-       ((!strcmp(ev->keyname, "KP_Up")) && (!ev->string)))
+   if ((!strcmp(ev->key, "Left")) ||
+       ((!strcmp(ev->key, "KP_Left")) && (!ev->string)) ||
+       (!strcmp(ev->key, "Up")) ||
+       ((!strcmp(ev->key, "KP_Up")) && (!ev->string)))
      {
         l = sd->selected_item->node->prev;
         if ((!l) && (sd->round))
           l = eina_list_last(sd->items);
      }
-   else if ((!strcmp(ev->keyname, "Right")) ||
-            ((!strcmp(ev->keyname, "KP_Right")) && (!ev->string)) ||
-            (!strcmp(ev->keyname, "Down")) ||
-            ((!strcmp(ev->keyname, "KP_Down")) && (!ev->string)))
+   else if ((!strcmp(ev->key, "Right")) ||
+            ((!strcmp(ev->key, "KP_Right")) && (!ev->string)) ||
+            (!strcmp(ev->key, "Down")) ||
+            ((!strcmp(ev->key, "KP_Down")) && (!ev->string)))
      {
         l = sd->selected_item->node->next;
         if ((!l) && (sd->round))
           l = sd->items;
      }
-   else if ((!strcmp(ev->keyname, "Home")) ||
-            ((!strcmp(ev->keyname, "KP_Home")) && (!ev->string)))
+   else if ((!strcmp(ev->key, "Home")) ||
+            ((!strcmp(ev->key, "KP_Home")) && (!ev->string)))
      l = sd->items;
-   else if ((!strcmp(ev->keyname, "End")) ||
-            ((!strcmp(ev->keyname, "KP_End")) && (!ev->string)))
+   else if ((!strcmp(ev->key, "End")) ||
+            ((!strcmp(ev->key, "KP_End")) && (!ev->string)))
      l = eina_list_last(sd->items);
    else return;
 
diff --git a/legacy/elementary/src/lib/elm_entry.c b/legacy/elementary/src/lib/elm_entry.c
index 2a663e69d6..3bad6f797f 100644
--- a/legacy/elementary/src/lib/elm_entry.c
+++ b/legacy/elementary/src/lib/elm_entry.c
@@ -1499,7 +1499,7 @@ _key_down_cb(void *data,
 {
    Evas_Event_Key_Down *ev = event_info;
 
-   if (!strcmp(ev->keyname, "Menu"))
+   if (!strcmp(ev->key, "Menu"))
      _menu_call(data);
 }
 
diff --git a/legacy/elementary/src/lib/elm_flipselector.c b/legacy/elementary/src/lib/elm_flipselector.c
index 38115afa81..fd7b3ffc14 100644
--- a/legacy/elementary/src/lib/elm_flipselector.c
+++ b/legacy/elementary/src/lib/elm_flipselector.c
@@ -453,9 +453,9 @@ _elm_flipselector_smart_event(Eo *obj, void *_pd, va_list *list)
    ev = event_info;
    if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
 
-   if ((!strcmp(ev->keyname, "Down")) || (!strcmp(ev->keyname, "KP_Down")))
+   if ((!strcmp(ev->key, "Down")) || (!strcmp(ev->key, "KP_Down")))
      is_up = EINA_FALSE;
-   else if ((strcmp(ev->keyname, "Up")) && (strcmp(ev->keyname, "KP_Up")))
+   else if ((strcmp(ev->key, "Up")) && (strcmp(ev->key, "KP_Up")))
      return;
 
    ELM_SAFE_FREE(sd->spin, ecore_timer_del);
diff --git a/legacy/elementary/src/lib/elm_gengrid.c b/legacy/elementary/src/lib/elm_gengrid.c
index a8dde7e509..f263d8aa0a 100644
--- a/legacy/elementary/src/lib/elm_gengrid.c
+++ b/legacy/elementary/src/lib/elm_gengrid.c
@@ -1733,8 +1733,8 @@ _elm_gengrid_smart_event(Eo *obj, void *_pd, va_list *list)
          elm_scrollable_interface_page_size_get(&page_x, &page_y),
          elm_scrollable_interface_content_viewport_size_get(&v_w, &v_h));
 
-   if ((!strcmp(ev->keyname, "Left")) ||
-       ((!strcmp(ev->keyname, "KP_Left")) && (!ev->string)))
+   if ((!strcmp(ev->key, "Left")) ||
+       ((!strcmp(ev->key, "KP_Left")) && (!ev->string)))
      {
         if ((sd->horizontal) &&
             (((evas_key_modifier_is_set(ev->modifiers, "Shift")) &&
@@ -1757,8 +1757,8 @@ _elm_gengrid_smart_event(Eo *obj, void *_pd, va_list *list)
         else
           x -= step_x;
      }
-   else if ((!strcmp(ev->keyname, "Right")) ||
-            ((!strcmp(ev->keyname, "KP_Right")) && (!ev->string)))
+   else if ((!strcmp(ev->key, "Right")) ||
+            ((!strcmp(ev->key, "KP_Right")) && (!ev->string)))
      {
         if ((sd->horizontal) &&
             (((evas_key_modifier_is_set(ev->modifiers, "Shift")) &&
@@ -1781,8 +1781,8 @@ _elm_gengrid_smart_event(Eo *obj, void *_pd, va_list *list)
         else
           x += step_x;
      }
-   else if ((!strcmp(ev->keyname, "Up")) ||
-            ((!strcmp(ev->keyname, "KP_Up")) && (!ev->string)))
+   else if ((!strcmp(ev->key, "Up")) ||
+            ((!strcmp(ev->key, "KP_Up")) && (!ev->string)))
      {
         if ((sd->horizontal) &&
             (((evas_key_modifier_is_set(ev->modifiers, "Shift")) &&
@@ -1805,8 +1805,8 @@ _elm_gengrid_smart_event(Eo *obj, void *_pd, va_list *list)
         else
           y -= step_y;
      }
-   else if ((!strcmp(ev->keyname, "Down")) ||
-            ((!strcmp(ev->keyname, "KP_Down")) && (!ev->string)))
+   else if ((!strcmp(ev->key, "Down")) ||
+            ((!strcmp(ev->key, "KP_Down")) && (!ev->string)))
      {
         if ((sd->horizontal) &&
             (((evas_key_modifier_is_set(ev->modifiers, "Shift")) &&
@@ -1829,8 +1829,8 @@ _elm_gengrid_smart_event(Eo *obj, void *_pd, va_list *list)
         else
           y += step_y;
      }
-   else if ((!strcmp(ev->keyname, "Home")) ||
-            ((!strcmp(ev->keyname, "KP_Home")) && (!ev->string)))
+   else if ((!strcmp(ev->key, "Home")) ||
+            ((!strcmp(ev->key, "KP_Home")) && (!ev->string)))
      {
         it = elm_gengrid_first_item_get(obj);
         elm_gengrid_item_bring_in(it, ELM_GENGRID_ITEM_SCROLLTO_IN);
@@ -1839,8 +1839,8 @@ _elm_gengrid_smart_event(Eo *obj, void *_pd, va_list *list)
         if (ret) *ret = EINA_TRUE;
         return;
      }
-   else if ((!strcmp(ev->keyname, "End")) ||
-            ((!strcmp(ev->keyname, "KP_End")) && (!ev->string)))
+   else if ((!strcmp(ev->key, "End")) ||
+            ((!strcmp(ev->key, "KP_End")) && (!ev->string)))
      {
         it = elm_gengrid_last_item_get(obj);
         elm_gengrid_item_bring_in(it, ELM_GENGRID_ITEM_SCROLLTO_IN);
@@ -1849,8 +1849,8 @@ _elm_gengrid_smart_event(Eo *obj, void *_pd, va_list *list)
         if (ret) *ret = EINA_TRUE;
         return;
      }
-   else if ((!strcmp(ev->keyname, "Prior")) ||
-            ((!strcmp(ev->keyname, "KP_Prior")) && (!ev->string)))
+   else if ((!strcmp(ev->key, "Prior")) ||
+            ((!strcmp(ev->key, "KP_Prior")) && (!ev->string)))
      {
         if (sd->horizontal)
           {
@@ -1867,8 +1867,8 @@ _elm_gengrid_smart_event(Eo *obj, void *_pd, va_list *list)
                y -= page_y;
           }
      }
-   else if ((!strcmp(ev->keyname, "Next")) ||
-            ((!strcmp(ev->keyname, "KP_Next")) && (!ev->string)))
+   else if ((!strcmp(ev->key, "Next")) ||
+            ((!strcmp(ev->key, "KP_Next")) && (!ev->string)))
      {
         if (sd->horizontal)
           {
@@ -1885,16 +1885,16 @@ _elm_gengrid_smart_event(Eo *obj, void *_pd, va_list *list)
                y += page_y;
           }
      }
-   else if (!strcmp(ev->keyname, "Escape"))
+   else if (!strcmp(ev->key, "Escape"))
      {
         if (!_all_items_deselect(sd)) return;
         ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
         if (ret) *ret = EINA_TRUE;
         return;
      }
-   else if (((!strcmp(ev->keyname, "Return")) ||
-             (!strcmp(ev->keyname, "KP_Enter")) ||
-             (!strcmp(ev->keyname, "space")))
+   else if (((!strcmp(ev->key, "Return")) ||
+             (!strcmp(ev->key, "KP_Enter")) ||
+             (!strcmp(ev->key, "space")))
             && (!sd->multi) && (sd->selected))
      {
         it = elm_gengrid_selected_item_get(obj);
diff --git a/legacy/elementary/src/lib/elm_genlist.c b/legacy/elementary/src/lib/elm_genlist.c
index c83a272899..d9f90fa7e9 100644
--- a/legacy/elementary/src/lib/elm_genlist.c
+++ b/legacy/elementary/src/lib/elm_genlist.c
@@ -2398,24 +2398,24 @@ _elm_genlist_smart_event(Eo *obj, void *_pd, va_list *list)
          elm_scrollable_interface_page_size_get(&page_x, &page_y),
          elm_scrollable_interface_content_viewport_size_get(&v_w, &v_h));
 
-   if ((!strcmp(ev->keyname, "Left")) ||
-       ((!strcmp(ev->keyname, "KP_Left")) && (!ev->string)))
+   if ((!strcmp(ev->key, "Left")) ||
+       ((!strcmp(ev->key, "KP_Left")) && (!ev->string)))
      {
         x -= step_x;
 
         Elm_Gen_Item *gt = (Elm_Gen_Item*)elm_genlist_selected_item_get(obj);
         _elm_genlist_item_focus_set(gt, ELM_FOCUS_LEFT);
      }
-   else if ((!strcmp(ev->keyname, "Right")) ||
-            ((!strcmp(ev->keyname, "KP_Right")) && (!ev->string)))
+   else if ((!strcmp(ev->key, "Right")) ||
+            ((!strcmp(ev->key, "KP_Right")) && (!ev->string)))
      {
         x += step_x;
 
         Elm_Gen_Item *gt = (Elm_Gen_Item*)elm_genlist_selected_item_get(obj);
         _elm_genlist_item_focus_set(gt, ELM_FOCUS_RIGHT);
      }
-   else if ((!strcmp(ev->keyname, "Up")) ||
-            ((!strcmp(ev->keyname, "KP_Up")) && (!ev->string)))
+   else if ((!strcmp(ev->key, "Up")) ||
+            ((!strcmp(ev->key, "KP_Up")) && (!ev->string)))
      {
         if (((evas_key_modifier_is_set(ev->modifiers, "Shift")) &&
              (_item_multi_select_up(sd)))
@@ -2428,8 +2428,8 @@ _elm_genlist_smart_event(Eo *obj, void *_pd, va_list *list)
         else
           y -= step_y;
      }
-   else if ((!strcmp(ev->keyname, "Down")) ||
-            ((!strcmp(ev->keyname, "KP_Down")) && (!ev->string)))
+   else if ((!strcmp(ev->key, "Down")) ||
+            ((!strcmp(ev->key, "KP_Down")) && (!ev->string)))
      {
         if (((evas_key_modifier_is_set(ev->modifiers, "Shift")) &&
              (_item_multi_select_down(sd)))
@@ -2442,8 +2442,8 @@ _elm_genlist_smart_event(Eo *obj, void *_pd, va_list *list)
         else
           y += step_y;
      }
-   else if ((!strcmp(ev->keyname, "Home")) ||
-            ((!strcmp(ev->keyname, "KP_Home")) && (!ev->string)))
+   else if ((!strcmp(ev->key, "Home")) ||
+            ((!strcmp(ev->key, "KP_Home")) && (!ev->string)))
      {
         it = elm_genlist_first_item_get(obj);
         elm_genlist_item_bring_in(it, ELM_GENLIST_ITEM_SCROLLTO_IN);
@@ -2452,8 +2452,8 @@ _elm_genlist_smart_event(Eo *obj, void *_pd, va_list *list)
         if (ret) *ret = EINA_TRUE;
         return;
      }
-   else if ((!strcmp(ev->keyname, "End")) ||
-            ((!strcmp(ev->keyname, "KP_End")) && (!ev->string)))
+   else if ((!strcmp(ev->key, "End")) ||
+            ((!strcmp(ev->key, "KP_End")) && (!ev->string)))
      {
         it = elm_genlist_last_item_get(obj);
         elm_genlist_item_bring_in(it, ELM_GENLIST_ITEM_SCROLLTO_IN);
@@ -2462,32 +2462,32 @@ _elm_genlist_smart_event(Eo *obj, void *_pd, va_list *list)
         if (ret) *ret = EINA_TRUE;
         return;
      }
-   else if ((!strcmp(ev->keyname, "Prior")) ||
-            ((!strcmp(ev->keyname, "KP_Prior")) && (!ev->string)))
+   else if ((!strcmp(ev->key, "Prior")) ||
+            ((!strcmp(ev->key, "KP_Prior")) && (!ev->string)))
      {
         if (page_y < 0)
           y -= -(page_y * v_h) / 100;
         else
           y -= page_y;
      }
-   else if ((!strcmp(ev->keyname, "Next")) ||
-            ((!strcmp(ev->keyname, "KP_Next")) && (!ev->string)))
+   else if ((!strcmp(ev->key, "Next")) ||
+            ((!strcmp(ev->key, "KP_Next")) && (!ev->string)))
      {
         if (page_y < 0)
           y += -(page_y * v_h) / 100;
         else
           y += page_y;
      }
-   else if (!strcmp(ev->keyname, "Escape"))
+   else if (!strcmp(ev->key, "Escape"))
      {
         if (!_all_items_deselect(sd)) return;
         ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
         if (ret) *ret = EINA_TRUE;
         return;
      }
-   else if (((!strcmp(ev->keyname, "Return")) ||
-             (!strcmp(ev->keyname, "KP_Enter")) ||
-             (!strcmp(ev->keyname, "space")))
+   else if (((!strcmp(ev->key, "Return")) ||
+             (!strcmp(ev->key, "KP_Enter")) ||
+             (!strcmp(ev->key, "space")))
             && (!sd->multi) && (sd->selected))
      {
         it = elm_genlist_selected_item_get(obj);
diff --git a/legacy/elementary/src/lib/elm_gesture_layer.c b/legacy/elementary/src/lib/elm_gesture_layer.c
index 91d0309def..3332fe3ffd 100644
--- a/legacy/elementary/src/lib/elm_gesture_layer.c
+++ b/legacy/elementary/src/lib/elm_gesture_layer.c
@@ -3208,9 +3208,9 @@ _zoom_with_wheel_test(Evas_Object *obj,
       case EVAS_CALLBACK_KEY_UP:
       {
          Evas_Event_Key_Up *p = event_info;
-         if ((!strcmp(p->keyname, "Control_L")) ||
+         if ((!strcmp(p->key, "Control_L")) ||
              /* Test if we ended a zoom gesture when releasing CTRL */
-             (!strcmp(p->keyname, "Control_R")))
+             (!strcmp(p->key, "Control_R")))
            {
               if ((st->zoom_wheel) &&
                   ((gesture_zoom->state == ELM_GESTURE_STATE_START) ||
diff --git a/legacy/elementary/src/lib/elm_list.c b/legacy/elementary/src/lib/elm_list.c
index be353ba20f..11d48a0a0d 100644
--- a/legacy/elementary/src/lib/elm_list.c
+++ b/legacy/elementary/src/lib/elm_list.c
@@ -287,8 +287,8 @@ _elm_list_smart_event(Eo *obj, void *_pd, va_list *list)
          elm_scrollable_interface_content_viewport_size_get(&v_w, &v_h));
 
    /* TODO: fix logic for horizontal mode */
-   if ((!strcmp(ev->keyname, "Left")) ||
-       ((!strcmp(ev->keyname, "KP_Left")) && !ev->string))
+   if ((!strcmp(ev->key, "Left")) ||
+       ((!strcmp(ev->key, "KP_Left")) && !ev->string))
      {
         it = (Elm_List_Item *)elm_list_selected_item_get(obj);
         Eina_Bool focused = _elm_list_item_focus_set(it, ELM_FOCUS_LEFT, sd->h_mode);
@@ -305,8 +305,8 @@ _elm_list_smart_event(Eo *obj, void *_pd, va_list *list)
         else
           x -= step_x;
      }
-   else if ((!strcmp(ev->keyname, "Right")) ||
-            ((!strcmp(ev->keyname, "KP_Right")) && !ev->string))
+   else if ((!strcmp(ev->key, "Right")) ||
+            ((!strcmp(ev->key, "KP_Right")) && !ev->string))
      {
         it = (Elm_List_Item *)elm_list_selected_item_get(obj);
         Eina_Bool focused = _elm_list_item_focus_set(it, ELM_FOCUS_RIGHT, sd->h_mode);
@@ -323,8 +323,8 @@ _elm_list_smart_event(Eo *obj, void *_pd, va_list *list)
         else
           x += step_x;
      }
-   else if ((!strcmp(ev->keyname, "Up")) ||
-            ((!strcmp(ev->keyname, "KP_Up")) && !ev->string))
+   else if ((!strcmp(ev->key, "Up")) ||
+            ((!strcmp(ev->key, "KP_Up")) && !ev->string))
      {
         it = (Elm_List_Item *)elm_list_selected_item_get(obj);
         Eina_Bool focused = _elm_list_item_focus_set(it, ELM_FOCUS_UP, sd->h_mode);
@@ -341,8 +341,8 @@ _elm_list_smart_event(Eo *obj, void *_pd, va_list *list)
         else
           y -= step_y;
      }
-   else if ((!strcmp(ev->keyname, "Down")) ||
-            ((!strcmp(ev->keyname, "KP_Down")) && !ev->string))
+   else if ((!strcmp(ev->key, "Down")) ||
+            ((!strcmp(ev->key, "KP_Down")) && !ev->string))
      {
         it = (Elm_List_Item *)elm_list_selected_item_get(obj);
         Eina_Bool focused = _elm_list_item_focus_set(it, ELM_FOCUS_DOWN, sd->h_mode);
@@ -359,8 +359,8 @@ _elm_list_smart_event(Eo *obj, void *_pd, va_list *list)
         else
           y += step_y;
      }
-   else if ((!strcmp(ev->keyname, "Home")) ||
-            ((!strcmp(ev->keyname, "KP_Home")) && !ev->string))
+   else if ((!strcmp(ev->key, "Home")) ||
+            ((!strcmp(ev->key, "KP_Home")) && !ev->string))
      {
         it = eina_list_data_get(sd->items);
         elm_list_item_bring_in((Elm_Object_Item *)it);
@@ -368,8 +368,8 @@ _elm_list_smart_event(Eo *obj, void *_pd, va_list *list)
         if (ret) *ret = EINA_TRUE;
         return;
      }
-   else if ((!strcmp(ev->keyname, "End")) ||
-            ((!strcmp(ev->keyname, "KP_End")) && !ev->string))
+   else if ((!strcmp(ev->key, "End")) ||
+            ((!strcmp(ev->key, "KP_End")) && !ev->string))
      {
         it = eina_list_data_get(eina_list_last(sd->items));
         elm_list_item_bring_in((Elm_Object_Item *)it);
@@ -377,8 +377,8 @@ _elm_list_smart_event(Eo *obj, void *_pd, va_list *list)
         if (ret) *ret = EINA_TRUE;
         return;
      }
-   else if ((!strcmp(ev->keyname, "Prior")) ||
-            ((!strcmp(ev->keyname, "KP_Prior")) && !ev->string))
+   else if ((!strcmp(ev->key, "Prior")) ||
+            ((!strcmp(ev->key, "KP_Prior")) && !ev->string))
      {
         if (sd->h_mode)
           {
@@ -395,8 +395,8 @@ _elm_list_smart_event(Eo *obj, void *_pd, va_list *list)
                y -= page_y;
           }
      }
-   else if ((!strcmp(ev->keyname, "Next")) ||
-            ((!strcmp(ev->keyname, "KP_Next")) && !ev->string))
+   else if ((!strcmp(ev->key, "Next")) ||
+            ((!strcmp(ev->key, "KP_Next")) && !ev->string))
      {
         if (sd->h_mode)
           {
@@ -413,15 +413,15 @@ _elm_list_smart_event(Eo *obj, void *_pd, va_list *list)
                y += page_y;
           }
      }
-   else if (((!strcmp(ev->keyname, "Return")) ||
-             (!strcmp(ev->keyname, "KP_Enter")) ||
-             (!strcmp(ev->keyname, "space")))
+   else if (((!strcmp(ev->key, "Return")) ||
+             (!strcmp(ev->key, "KP_Enter")) ||
+             (!strcmp(ev->key, "space")))
             && (!sd->multi) && (sd->selected))
      {
         it = (Elm_List_Item *)elm_list_selected_item_get(obj);
         if (it) evas_object_smart_callback_call(WIDGET(it), SIG_ACTIVATED, it);
      }
-   else if (!strcmp(ev->keyname, "Escape"))
+   else if (!strcmp(ev->key, "Escape"))
      {
         if (!_all_items_unselect(sd)) return;
         ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
diff --git a/legacy/elementary/src/lib/elm_map.c b/legacy/elementary/src/lib/elm_map.c
index a6d41b8060..a8d6ab2696 100644
--- a/legacy/elementary/src/lib/elm_map.c
+++ b/legacy/elementary/src/lib/elm_map.c
@@ -3911,49 +3911,49 @@ _elm_map_smart_event(Eo *obj, void *_pd, va_list *list)
          elm_scrollable_interface_page_size_get(&page_x, &page_y),
          elm_scrollable_interface_content_viewport_size_get(NULL, &vh));
 
-   if ((!strcmp(ev->keyname, "Left")) ||
-       ((!strcmp(ev->keyname, "KP_Left")) && (!ev->string)))
+   if ((!strcmp(ev->key, "Left")) ||
+       ((!strcmp(ev->key, "KP_Left")) && (!ev->string)))
      {
         x -= step_x;
      }
-   else if ((!strcmp(ev->keyname, "Right")) ||
-            ((!strcmp(ev->keyname, "KP_Right")) && (!ev->string)))
+   else if ((!strcmp(ev->key, "Right")) ||
+            ((!strcmp(ev->key, "KP_Right")) && (!ev->string)))
      {
         x += step_x;
      }
-   else if ((!strcmp(ev->keyname, "Up")) ||
-            ((!strcmp(ev->keyname, "KP_Up")) && (!ev->string)))
+   else if ((!strcmp(ev->key, "Up")) ||
+            ((!strcmp(ev->key, "KP_Up")) && (!ev->string)))
      {
         y -= step_y;
      }
-   else if ((!strcmp(ev->keyname, "Down")) ||
-            ((!strcmp(ev->keyname, "KP_Down")) && (!ev->string)))
+   else if ((!strcmp(ev->key, "Down")) ||
+            ((!strcmp(ev->key, "KP_Down")) && (!ev->string)))
      {
         y += step_y;
      }
-   else if ((!strcmp(ev->keyname, "Prior")) ||
-            ((!strcmp(ev->keyname, "KP_Prior")) && (!ev->string)))
+   else if ((!strcmp(ev->key, "Prior")) ||
+            ((!strcmp(ev->key, "KP_Prior")) && (!ev->string)))
      {
         if (page_y < 0)
           y -= -(page_y * vh) / 100;
         else
           y -= page_y;
      }
-   else if ((!strcmp(ev->keyname, "Next")) ||
-            ((!strcmp(ev->keyname, "KP_Next")) && (!ev->string)))
+   else if ((!strcmp(ev->key, "Next")) ||
+            ((!strcmp(ev->key, "KP_Next")) && (!ev->string)))
      {
         if (page_y < 0)
           y += -(page_y * vh) / 100;
         else
           y += page_y;
      }
-   else if (!strcmp(ev->keyname, "KP_Add"))
+   else if (!strcmp(ev->key, "KP_Add"))
      {
         _zoom_with_animation(sd, sd->zoom + 1, 10);
         if (ret) *ret = EINA_TRUE;
         return;
      }
-   else if (!strcmp(ev->keyname, "KP_Subtract"))
+   else if (!strcmp(ev->key, "KP_Subtract"))
      {
         _zoom_with_animation(sd, sd->zoom - 1, 10);
         if (ret) *ret = EINA_TRUE;
diff --git a/legacy/elementary/src/lib/elm_panel.c b/legacy/elementary/src/lib/elm_panel.c
index 848f8d4760..9481d04c57 100644
--- a/legacy/elementary/src/lib/elm_panel.c
+++ b/legacy/elementary/src/lib/elm_panel.c
@@ -252,9 +252,9 @@ _elm_panel_smart_event(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
    if ((src != obj) || (type != EVAS_CALLBACK_KEY_DOWN)) return;
    if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
 
-   if ((strcmp(ev->keyname, "Return")) &&
-       (strcmp(ev->keyname, "KP_Enter")) &&
-       (strcmp(ev->keyname, "space")))
+   if ((strcmp(ev->key, "Return")) &&
+       (strcmp(ev->key, "KP_Enter")) &&
+       (strcmp(ev->key, "space")))
      return;
 
    _panel_toggle(NULL, obj, NULL, NULL);
diff --git a/legacy/elementary/src/lib/elm_photocam.c b/legacy/elementary/src/lib/elm_photocam.c
index c20b129a5e..9479d19bd6 100644
--- a/legacy/elementary/src/lib/elm_photocam.c
+++ b/legacy/elementary/src/lib/elm_photocam.c
@@ -979,43 +979,43 @@ _elm_photocam_smart_event(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
          elm_scrollable_interface_page_size_get(&page_x, &page_y),
          elm_scrollable_interface_content_viewport_size_get(&v_w, &v_h));
 
-   if ((!strcmp(ev->keyname, "Left")) ||
-       ((!strcmp(ev->keyname, "KP_Left")) && (!ev->string)))
+   if ((!strcmp(ev->key, "Left")) ||
+       ((!strcmp(ev->key, "KP_Left")) && (!ev->string)))
      {
         x -= step_x;
      }
-   else if ((!strcmp(ev->keyname, "Right")) ||
-            ((!strcmp(ev->keyname, "KP_Right")) && (!ev->string)))
+   else if ((!strcmp(ev->key, "Right")) ||
+            ((!strcmp(ev->key, "KP_Right")) && (!ev->string)))
      {
         x += step_x;
      }
-   else if ((!strcmp(ev->keyname, "Up")) ||
-            ((!strcmp(ev->keyname, "KP_Up")) && (!ev->string)))
+   else if ((!strcmp(ev->key, "Up")) ||
+            ((!strcmp(ev->key, "KP_Up")) && (!ev->string)))
      {
         y -= step_y;
      }
-   else if ((!strcmp(ev->keyname, "Down")) ||
-            ((!strcmp(ev->keyname, "KP_Down")) && (!ev->string)))
+   else if ((!strcmp(ev->key, "Down")) ||
+            ((!strcmp(ev->key, "KP_Down")) && (!ev->string)))
      {
         y += step_y;
      }
-   else if ((!strcmp(ev->keyname, "Prior")) ||
-            ((!strcmp(ev->keyname, "KP_Prior")) && (!ev->string)))
+   else if ((!strcmp(ev->key, "Prior")) ||
+            ((!strcmp(ev->key, "KP_Prior")) && (!ev->string)))
      {
         if (page_y < 0)
           y -= -(page_y * v_h) / 100;
         else
           y -= page_y;
      }
-   else if ((!strcmp(ev->keyname, "Next")) ||
-            ((!strcmp(ev->keyname, "KP_Next")) && (!ev->string)))
+   else if ((!strcmp(ev->key, "Next")) ||
+            ((!strcmp(ev->key, "KP_Next")) && (!ev->string)))
      {
         if (page_y < 0)
           y += -(page_y * v_h) / 100;
         else
           y += page_y;
      }
-   else if ((!strcmp(ev->keyname, "KP_Add")))
+   else if ((!strcmp(ev->key, "KP_Add")))
      {
         zoom = elm_photocam_zoom_get(obj);
         zoom -= 0.5;
@@ -1024,7 +1024,7 @@ _elm_photocam_smart_event(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
         if (ret) *ret = EINA_TRUE;
         return;
      }
-   else if ((!strcmp(ev->keyname, "KP_Subtract")))
+   else if ((!strcmp(ev->key, "KP_Subtract")))
      {
         zoom = elm_photocam_zoom_get(obj);
         zoom += 0.5;
diff --git a/legacy/elementary/src/lib/elm_radio.c b/legacy/elementary/src/lib/elm_radio.c
index e606b739ee..79138e1368 100644
--- a/legacy/elementary/src/lib/elm_radio.c
+++ b/legacy/elementary/src/lib/elm_radio.c
@@ -164,9 +164,9 @@ _elm_radio_smart_event(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
 
    if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
 
-   if ((strcmp(ev->keyname, "Return")) &&
-       (strcmp(ev->keyname, "KP_Enter")) &&
-       (strcmp(ev->keyname, "space")))
+   if ((strcmp(ev->key, "Return")) &&
+       (strcmp(ev->key, "KP_Enter")) &&
+       (strcmp(ev->key, "space")))
      return;
 
    _activate(obj);
diff --git a/legacy/elementary/src/lib/elm_scroller.c b/legacy/elementary/src/lib/elm_scroller.c
index 1719acd297..cfaba5e5ee 100644
--- a/legacy/elementary/src/lib/elm_scroller.c
+++ b/legacy/elementary/src/lib/elm_scroller.c
@@ -86,14 +86,14 @@ _elm_scroller_smart_event(Eo *obj, void *_pd, va_list *list)
          evas_obj_position_get(&c_x, &c_y),
          evas_obj_size_get(&max_x, &max_y));
 
-   if (((!strcmp(ev->keyname, "Left")) ||
-        (!strcmp(ev->keyname, "KP_Left")) ||
-        (!strcmp(ev->keyname, "Right")) ||
-        (!strcmp(ev->keyname, "KP_Right")) ||
-        (!strcmp(ev->keyname, "Up")) ||
-        (!strcmp(ev->keyname, "KP_Up")) ||
-        (!strcmp(ev->keyname, "Down")) ||
-        (!strcmp(ev->keyname, "KP_Down"))) && (!ev->string))
+   if (((!strcmp(ev->key, "Left")) ||
+        (!strcmp(ev->key, "KP_Left")) ||
+        (!strcmp(ev->key, "Right")) ||
+        (!strcmp(ev->key, "KP_Right")) ||
+        (!strcmp(ev->key, "Up")) ||
+        (!strcmp(ev->key, "KP_Up")) ||
+        (!strcmp(ev->key, "Down")) ||
+        (!strcmp(ev->key, "KP_Down"))) && (!ev->string))
      {
         Evas_Object *current_focus = NULL;
         Eina_List *can_focus_list = NULL;
@@ -157,17 +157,17 @@ _elm_scroller_smart_event(Eo *obj, void *_pd, va_list *list)
 
              list_data_get = eina_list_data_get;
 
-             if ((!strcmp(ev->keyname, "Left")) ||
-                 (!strcmp(ev->keyname, "KP_Left")))
+             if ((!strcmp(ev->key, "Left")) ||
+                 (!strcmp(ev->key, "KP_Left")))
                degree = 270.0;
-             else if ((!strcmp(ev->keyname, "Right")) ||
-                      (!strcmp(ev->keyname, "KP_Right")))
+             else if ((!strcmp(ev->key, "Right")) ||
+                      (!strcmp(ev->key, "KP_Right")))
                degree = 90.0;
-             else if ((!strcmp(ev->keyname, "Up")) ||
-                      (!strcmp(ev->keyname, "KP_Up")))
+             else if ((!strcmp(ev->key, "Up")) ||
+                      (!strcmp(ev->key, "KP_Up")))
                degree = 0.0;
-             else if ((!strcmp(ev->keyname, "Down")) ||
-                      (!strcmp(ev->keyname, "KP_Down")))
+             else if ((!strcmp(ev->key, "Down")) ||
+                      (!strcmp(ev->key, "KP_Down")))
                degree = 180.0;
 
              if (elm_widget_focus_list_direction_get
@@ -198,50 +198,50 @@ _elm_scroller_smart_event(Eo *obj, void *_pd, va_list *list)
                }
           }
      }
-   if ((!strcmp(ev->keyname, "Left")) ||
-       ((!strcmp(ev->keyname, "KP_Left")) && (!ev->string)))
+   if ((!strcmp(ev->key, "Left")) ||
+       ((!strcmp(ev->key, "KP_Left")) && (!ev->string)))
      {
         if (x <= 0) return;
         x -= step_x;
      }
-   else if ((!strcmp(ev->keyname, "Right")) ||
-            ((!strcmp(ev->keyname, "KP_Right")) && (!ev->string)))
+   else if ((!strcmp(ev->key, "Right")) ||
+            ((!strcmp(ev->key, "KP_Right")) && (!ev->string)))
      {
         if (x >= (max_x - v_w)) return;
         x += step_x;
      }
-   else if ((!strcmp(ev->keyname, "Up")) ||
-            ((!strcmp(ev->keyname, "KP_Up")) && (!ev->string)))
+   else if ((!strcmp(ev->key, "Up")) ||
+            ((!strcmp(ev->key, "KP_Up")) && (!ev->string)))
      {
         if (y == 0) return;
         y -= step_y;
      }
-   else if ((!strcmp(ev->keyname, "Down")) ||
-            ((!strcmp(ev->keyname, "KP_Down")) && (!ev->string)))
+   else if ((!strcmp(ev->key, "Down")) ||
+            ((!strcmp(ev->key, "KP_Down")) && (!ev->string)))
      {
         if (y >= (max_y - v_h)) return;
         y += step_y;
      }
-   else if ((!strcmp(ev->keyname, "Home")) ||
-            ((!strcmp(ev->keyname, "KP_Home")) && (!ev->string)))
+   else if ((!strcmp(ev->key, "Home")) ||
+            ((!strcmp(ev->key, "KP_Home")) && (!ev->string)))
      {
         y = 0;
      }
-   else if ((!strcmp(ev->keyname, "End")) ||
-            ((!strcmp(ev->keyname, "KP_End")) && (!ev->string)))
+   else if ((!strcmp(ev->key, "End")) ||
+            ((!strcmp(ev->key, "KP_End")) && (!ev->string)))
      {
         y = max_y - v_h;
      }
-   else if ((!strcmp(ev->keyname, "Prior")) ||
-            ((!strcmp(ev->keyname, "KP_Prior")) && (!ev->string)))
+   else if ((!strcmp(ev->key, "Prior")) ||
+            ((!strcmp(ev->key, "KP_Prior")) && (!ev->string)))
      {
         if (page_y < 0)
           y -= -(page_y * v_h) / 100;
         else
           y -= page_y;
      }
-   else if ((!strcmp(ev->keyname, "Next")) ||
-            ((!strcmp(ev->keyname, "KP_Next")) && (!ev->string)))
+   else if ((!strcmp(ev->key, "Next")) ||
+            ((!strcmp(ev->key, "KP_Next")) && (!ev->string)))
      {
         if (page_y < 0)
           y += -(page_y * v_h) / 100;
diff --git a/legacy/elementary/src/lib/elm_slider.c b/legacy/elementary/src/lib/elm_slider.c
index ddf6412f9d..7df5834d5e 100644
--- a/legacy/elementary/src/lib/elm_slider.c
+++ b/legacy/elementary/src/lib/elm_slider.c
@@ -384,8 +384,8 @@ key_down:
    ev = event_info;
    if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
    if (elm_widget_disabled_get(obj)) return;
-   if ((!strcmp(ev->keyname, "Left")) ||
-       ((!strcmp(ev->keyname, "KP_Left")) && (!ev->string)))
+   if ((!strcmp(ev->key, "Left")) ||
+       ((!strcmp(ev->key, "KP_Left")) && (!ev->string)))
      {
         if (!sd->horizontal) return;
         if (!sd->inverted) _drag_down(obj, NULL, NULL, NULL);
@@ -393,8 +393,8 @@ key_down:
         ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
         goto success;
      }
-   else if ((!strcmp(ev->keyname, "Right")) ||
-            ((!strcmp(ev->keyname, "KP_Right")) && (!ev->string)))
+   else if ((!strcmp(ev->key, "Right")) ||
+            ((!strcmp(ev->key, "KP_Right")) && (!ev->string)))
      {
         if (!sd->horizontal) return;
         if (!sd->inverted) _drag_up(obj, NULL, NULL, NULL);
@@ -402,8 +402,8 @@ key_down:
         ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
         goto success;
      }
-   else if ((!strcmp(ev->keyname, "Up")) ||
-            ((!strcmp(ev->keyname, "KP_Up")) && (!ev->string)))
+   else if ((!strcmp(ev->key, "Up")) ||
+            ((!strcmp(ev->key, "KP_Up")) && (!ev->string)))
      {
         if (sd->horizontal) return;
         if (sd->inverted) _drag_up(obj, NULL, NULL, NULL);
@@ -411,8 +411,8 @@ key_down:
         ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
         goto success;
      }
-   else if ((!strcmp(ev->keyname, "Down")) ||
-            ((!strcmp(ev->keyname, "KP_Down")) && (!ev->string)))
+   else if ((!strcmp(ev->key, "Down")) ||
+            ((!strcmp(ev->key, "KP_Down")) && (!ev->string)))
      {
         if (sd->horizontal) return;
         if (sd->inverted) _drag_down(obj, NULL, NULL, NULL);
diff --git a/legacy/elementary/src/lib/elm_slideshow.c b/legacy/elementary/src/lib/elm_slideshow.c
index c5c4525f20..7656508a37 100644
--- a/legacy/elementary/src/lib/elm_slideshow.c
+++ b/legacy/elementary/src/lib/elm_slideshow.c
@@ -42,8 +42,8 @@ _elm_slideshow_smart_event(Eo *obj, void *_pd, va_list *list)
 
    Elm_Slideshow_Smart_Data *sd = _pd;
 
-   if ((!strcmp(ev->keyname, "Left")) ||
-       ((!strcmp(ev->keyname, "KP_Left")) && (!ev->string)))
+   if ((!strcmp(ev->key, "Left")) ||
+       ((!strcmp(ev->key, "KP_Left")) && (!ev->string)))
      {
         elm_slideshow_previous(obj);
         ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
@@ -52,8 +52,8 @@ _elm_slideshow_smart_event(Eo *obj, void *_pd, va_list *list)
         return;
      }
 
-   if ((!strcmp(ev->keyname, "Right")) ||
-       ((!strcmp(ev->keyname, "KP_Right")) && (!ev->string)))
+   if ((!strcmp(ev->key, "Right")) ||
+       ((!strcmp(ev->key, "KP_Right")) && (!ev->string)))
      {
         elm_slideshow_next(obj);
         ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
@@ -62,9 +62,9 @@ _elm_slideshow_smart_event(Eo *obj, void *_pd, va_list *list)
         return;
      }
 
-   if ((!strcmp(ev->keyname, "Return")) ||
-       (!strcmp(ev->keyname, "KP_Enter")) ||
-       (!strcmp(ev->keyname, "space")))
+   if ((!strcmp(ev->key, "Return")) ||
+       (!strcmp(ev->key, "KP_Enter")) ||
+       (!strcmp(ev->key, "space")))
      {
         if (sd->timeout)
           {
diff --git a/legacy/elementary/src/lib/elm_spinner.c b/legacy/elementary/src/lib/elm_spinner.c
index 060f443fad..c274404d7d 100644
--- a/legacy/elementary/src/lib/elm_spinner.c
+++ b/legacy/elementary/src/lib/elm_spinner.c
@@ -443,10 +443,10 @@ _elm_spinner_smart_event(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
         Evas_Event_Key_Down *ev = event_info;
 
         if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
-        else if (!strcmp(ev->keyname, "Left") ||
-                 ((!strcmp(ev->keyname, "KP_Left")) && (!ev->string)) ||
-                 !strcmp(ev->keyname, "Down") ||
-                 ((!strcmp(ev->keyname, "KP_Down")) && (!ev->string)))
+        else if (!strcmp(ev->key, "Left") ||
+                 ((!strcmp(ev->key, "KP_Left")) && (!ev->string)) ||
+                 !strcmp(ev->key, "Down") ||
+                 ((!strcmp(ev->key, "KP_Down")) && (!ev->string)))
           {
              _val_dec_start(obj);
              elm_layout_signal_emit(obj, "elm,left,anim,activate", "elm");
@@ -454,10 +454,10 @@ _elm_spinner_smart_event(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
              if (ret) *ret = EINA_TRUE;
              return;
           }
-        else if (!strcmp(ev->keyname, "Right") ||
-                 ((!strcmp(ev->keyname, "KP_Right")) && (!ev->string)) ||
-                 !strcmp(ev->keyname, "Up") ||
-                 ((!strcmp(ev->keyname, "KP_Up")) && (!ev->string)))
+        else if (!strcmp(ev->key, "Right") ||
+                 ((!strcmp(ev->key, "KP_Right")) && (!ev->string)) ||
+                 !strcmp(ev->key, "Up") ||
+                 ((!strcmp(ev->key, "KP_Up")) && (!ev->string)))
           {
              _val_inc_start(obj);
              elm_layout_signal_emit(obj, "elm,right,anim,activate", "elm");
@@ -471,15 +471,15 @@ _elm_spinner_smart_event(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
         Evas_Event_Key_Down *ev = event_info;
 
         if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
-        if (!strcmp(ev->keyname, "Right") ||
-            ((!strcmp(ev->keyname, "KP_Right")) && (!ev->string)) ||
-            !strcmp(ev->keyname, "Up") ||
-            ((!strcmp(ev->keyname, "KP_Up")) && (!ev->string)))
+        if (!strcmp(ev->key, "Right") ||
+            ((!strcmp(ev->key, "KP_Right")) && (!ev->string)) ||
+            !strcmp(ev->key, "Up") ||
+            ((!strcmp(ev->key, "KP_Up")) && (!ev->string)))
           _val_inc_stop(obj);
-        else if (!strcmp(ev->keyname, "Left") ||
-                 ((!strcmp(ev->keyname, "KP_Left")) && (!ev->string)) ||
-                 !strcmp(ev->keyname, "Down") ||
-                 ((!strcmp(ev->keyname, "KP_Down")) && (!ev->string)))
+        else if (!strcmp(ev->key, "Left") ||
+                 ((!strcmp(ev->key, "KP_Left")) && (!ev->string)) ||
+                 !strcmp(ev->key, "Down") ||
+                 ((!strcmp(ev->key, "KP_Down")) && (!ev->string)))
           _val_dec_stop(obj);
         else return;
 
diff --git a/legacy/elementary/src/lib/elm_toolbar.c b/legacy/elementary/src/lib/elm_toolbar.c
index 19e63b76f8..0a4913980f 100644
--- a/legacy/elementary/src/lib/elm_toolbar.c
+++ b/legacy/elementary/src/lib/elm_toolbar.c
@@ -665,8 +665,8 @@ _elm_toolbar_smart_event(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
    if (!sd->items) return;
    if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
 
-   if ((!strcmp(ev->keyname, "Return")) ||
-            ((!strcmp(ev->keyname, "KP_Enter")) && !ev->string))
+   if ((!strcmp(ev->key, "Return")) ||
+            ((!strcmp(ev->key, "KP_Enter")) && !ev->string))
      {
         if (sd->highlighted_item)
           _item_select(sd->highlighted_item);
@@ -674,8 +674,8 @@ _elm_toolbar_smart_event(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
         if (ret) *ret = EINA_TRUE;
         return;
      }
-   else if ((!strcmp(ev->keyname, "Left")) ||
-            ((!strcmp(ev->keyname, "KP_Left")) && !ev->string))
+   else if ((!strcmp(ev->key, "Left")) ||
+            ((!strcmp(ev->key, "KP_Left")) && !ev->string))
      {
         if (!sd->vertical)
           it = _highlight_next_item_get(obj, sd->bx, EINA_TRUE);
@@ -685,8 +685,8 @@ _elm_toolbar_smart_event(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
              return;
           }
      }
-   else if ((!strcmp(ev->keyname, "Right")) ||
-            ((!strcmp(ev->keyname, "KP_Right")) && !ev->string))
+   else if ((!strcmp(ev->key, "Right")) ||
+            ((!strcmp(ev->key, "KP_Right")) && !ev->string))
      {
         if (!sd->vertical)
           it = _highlight_next_item_get(obj, sd->bx, EINA_FALSE);
@@ -696,8 +696,8 @@ _elm_toolbar_smart_event(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
              return;
           }
      }
-   else if ((!strcmp(ev->keyname, "Up")) ||
-            ((!strcmp(ev->keyname, "KP_Up")) && !ev->string))
+   else if ((!strcmp(ev->key, "Up")) ||
+            ((!strcmp(ev->key, "KP_Up")) && !ev->string))
      {
         if (sd->vertical)
           it = _highlight_next_item_get(obj, sd->bx, EINA_TRUE);
@@ -707,8 +707,8 @@ _elm_toolbar_smart_event(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
              return;
           }
      }
-   else if ((!strcmp(ev->keyname, "Down")) ||
-            ((!strcmp(ev->keyname, "KP_Down")) && !ev->string))
+   else if ((!strcmp(ev->key, "Down")) ||
+            ((!strcmp(ev->key, "KP_Down")) && !ev->string))
      {
         if (sd->vertical)
           it = _highlight_next_item_get(obj, sd->bx, EINA_FALSE);
diff --git a/legacy/elementary/src/lib/elm_video.c b/legacy/elementary/src/lib/elm_video.c
index 5130dbbbca..445c6036b1 100644
--- a/legacy/elementary/src/lib/elm_video.c
+++ b/legacy/elementary/src/lib/elm_video.c
@@ -44,8 +44,8 @@ _elm_video_smart_event(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
    if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
    if (elm_widget_disabled_get(obj)) return;
 
-   if ((!strcmp(ev->keyname, "Left")) ||
-       ((!strcmp(ev->keyname, "KP_Left")) && (!ev->string)))
+   if ((!strcmp(ev->key, "Left")) ||
+       ((!strcmp(ev->key, "KP_Left")) && (!ev->string)))
      {
         double current, last;
 
@@ -64,8 +64,8 @@ _elm_video_smart_event(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
         return;
      }
 
-   if ((!strcmp(ev->keyname, "Right")) ||
-       ((!strcmp(ev->keyname, "KP_Right")) && (!ev->string)))
+   if ((!strcmp(ev->key, "Right")) ||
+       ((!strcmp(ev->key, "KP_Right")) && (!ev->string)))
      {
         double current, last;
 
@@ -85,7 +85,7 @@ _elm_video_smart_event(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
         return;
      }
 
-   if (!strcmp(ev->keyname, "space"))
+   if (!strcmp(ev->key, "space"))
      {
         if (elm_video_is_playing_get(obj))
           elm_video_pause(obj);
@@ -97,7 +97,7 @@ _elm_video_smart_event(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
         return;
      }
 
-   INF("keyname: '%s' not handled", ev->keyname);
+   INF("keyname: '%s' not handled", ev->key);
 
 #else
 
diff --git a/legacy/elementary/src/lib/elm_web.c b/legacy/elementary/src/lib/elm_web.c
index f834f820b4..2b956182f7 100644
--- a/legacy/elementary/src/lib/elm_web.c
+++ b/legacy/elementary/src/lib/elm_web.c
@@ -200,7 +200,7 @@ _elm_web_smart_event(Eo *obj, void *_pd, va_list *list)
    if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
    if (elm_widget_disabled_get(obj)) return;
 
-   if ((!strcmp(ev->keyname, "Tab")) && (!sd->tab_propagate))
+   if ((!strcmp(ev->key, "Tab")) && (!sd->tab_propagate))
      {
         ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
         if (ret) *ret = EINA_TRUE;
diff --git a/legacy/elementary/src/lib/elm_win.c b/legacy/elementary/src/lib/elm_win.c
index 4636b17556..dae160730e 100644
--- a/legacy/elementary/src/lib/elm_win.c
+++ b/legacy/elementary/src/lib/elm_win.c
@@ -1165,8 +1165,8 @@ _elm_win_smart_event(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
    if (type != EVAS_CALLBACK_KEY_DOWN)
      return;
 
-   if ((!strcmp(ev->keyname, "Tab")) ||
-       (!strcmp(ev->keyname, "ISO_Left_Tab")))
+   if ((!strcmp(ev->key, "Tab")) ||
+       (!strcmp(ev->key, "ISO_Left_Tab")))
      {
         if (evas_key_modifier_is_set(ev->modifiers, "Control") ||
             evas_key_modifier_is_set(ev->modifiers, "Alt"))
@@ -1178,29 +1178,29 @@ _elm_win_smart_event(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
 
         goto success;
      }
-   else if ((!strcmp(ev->keyname, "Left")) ||
-            ((!strcmp(ev->keyname, "KP_Left")) && (!ev->string)))
+   else if ((!strcmp(ev->key, "Left")) ||
+            ((!strcmp(ev->key, "KP_Left")) && (!ev->string)))
      {
         elm_widget_focus_cycle(obj, ELM_FOCUS_LEFT);
 
         goto success;
      }
-   else if ((!strcmp(ev->keyname, "Right")) ||
-            ((!strcmp(ev->keyname, "KP_Right")) && (!ev->string)))
+   else if ((!strcmp(ev->key, "Right")) ||
+            ((!strcmp(ev->key, "KP_Right")) && (!ev->string)))
      {
         elm_widget_focus_cycle(obj, ELM_FOCUS_RIGHT);
 
         goto success;
      }
-   else if ((!strcmp(ev->keyname, "Up")) ||
-            ((!strcmp(ev->keyname, "KP_Up")) && (!ev->string)))
+   else if ((!strcmp(ev->key, "Up")) ||
+            ((!strcmp(ev->key, "KP_Up")) && (!ev->string)))
      {
         elm_widget_focus_cycle(obj, ELM_FOCUS_UP);
 
         goto success;
      }
-   else if ((!strcmp(ev->keyname, "Down")) ||
-            ((!strcmp(ev->keyname, "KP_Down")) && (!ev->string)))
+   else if ((!strcmp(ev->key, "Down")) ||
+            ((!strcmp(ev->key, "KP_Down")) && (!ev->string)))
      {
         elm_widget_focus_cycle(obj, ELM_FOCUS_DOWN);
 
@@ -2432,7 +2432,7 @@ _debug_key_down(void *data __UNUSED__,
    if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD)
      return;
 
-   if ((strcmp(ev->keyname, "F12")) ||
+   if ((strcmp(ev->key, "F12")) ||
        (!evas_key_modifier_is_set(ev->modifiers, "Control")))
      return;