diff --git a/src/bin/e_actions.c b/src/bin/e_actions.c
index b502d42f3..34431ad10 100644
--- a/src/bin/e_actions.c
+++ b/src/bin/e_actions.c
@@ -2570,7 +2570,7 @@ typedef struct _Delayed_Action Delayed_Action;
 struct _Delayed_Action
 {
    int          mouse, button;
-   const char  *keyname;
+   const char  *key;
    E_Object    *obj;
    Ecore_Timer *timer;
    struct
@@ -2585,7 +2585,7 @@ static void
 _delayed_action_free(Delayed_Action *da)
 {
    if (da->obj) e_object_unref(da->obj);
-   if (da->keyname) eina_stringshare_del(da->keyname);
+   if (da->key) eina_stringshare_del(da->key);
    if (da->timer) ecore_timer_del(da->timer);
    if (da->def.action) eina_stringshare_del(da->def.action);
    if (da->def.params) eina_stringshare_del(da->def.params);
@@ -2705,7 +2705,7 @@ _delayed_action_key_add(E_Object *obj, const char *params, Ecore_Event_Key *ev)
         e_object_ref(da->obj);
      }
    da->mouse = 0;
-   da->keyname = eina_stringshare_add(ev->keyname);
+   da->key = eina_stringshare_add(ev->key);
    if (params) _delayed_action_list_parse(da, params);
    _delayed_actions = eina_list_append(_delayed_actions, da);
 }
@@ -2719,7 +2719,7 @@ _delayed_action_key_del(E_Object *obj, const char *params __UNUSED__, Ecore_Even
    EINA_LIST_FOREACH(_delayed_actions, l, da)
      {
         if ((da->obj == obj) && (!da->mouse) &&
-            (!strcmp(da->keyname, ev->keyname)))
+            (!strcmp(da->key, ev->key)))
           {
              _delayed_action_do(da);
              _delayed_action_free(da);
diff --git a/src/bin/e_bindings.c b/src/bin/e_bindings.c
index a8e972539..cafb8eeb3 100644
--- a/src/bin/e_bindings.c
+++ b/src/bin/e_bindings.c
@@ -622,7 +622,7 @@ e_bindings_key_down_event_handle(E_Binding_Context ctxt, E_Object *obj, Ecore_Ev
    mod = _e_bindings_modifiers(ev->modifiers);
    EINA_LIST_FOREACH(key_bindings, l, binding)
      {
-        if ((binding->key) && (!strcmp(binding->key, ev->keyname)) &&
+        if ((binding->key) && (!strcmp(binding->key, ev->key)) &&
             ((binding->any_mod) || (binding->mod == mod)))
           {
              if (_e_bindings_context_match(binding->ctxt, ctxt))
@@ -655,7 +655,7 @@ e_bindings_key_up_event_handle(E_Binding_Context ctxt, E_Object *obj, Ecore_Even
    mod = _e_bindings_modifiers(ev->modifiers);
    EINA_LIST_FOREACH(key_bindings, l, binding)
      {
-        if ((binding->key) && (!strcmp(binding->key, ev->keyname)) &&
+        if ((binding->key) && (!strcmp(binding->key, ev->key)) &&
             ((binding->any_mod) || (binding->mod == mod)))
           {
              if (_e_bindings_context_match(binding->ctxt, ctxt))
@@ -688,7 +688,7 @@ e_bindings_key_down_event_find(E_Binding_Context ctxt, Ecore_Event_Key *ev)
    mod = _e_bindings_modifiers(ev->modifiers);
    EINA_LIST_FOREACH(key_bindings, l, binding)
      {
-        if ((binding->key) && (!strcmp(binding->key, ev->keyname)) &&
+        if ((binding->key) && (!strcmp(binding->key, ev->key)) &&
             ((binding->any_mod) || (binding->mod == mod)))
           {
              if (_e_bindings_context_match(binding->ctxt, ctxt))
@@ -713,7 +713,7 @@ e_bindings_key_up_event_find(E_Binding_Context ctxt, Ecore_Event_Key *ev)
    mod = _e_bindings_modifiers(ev->modifiers);
    EINA_LIST_FOREACH(key_bindings, l, binding)
      {
-        if ((binding->key) && (!strcmp(binding->key, ev->keyname)) &&
+        if ((binding->key) && (!strcmp(binding->key, ev->key)) &&
             ((binding->any_mod) || (binding->mod == mod)))
           {
              if (_e_bindings_context_match(binding->ctxt, ctxt))
diff --git a/src/bin/e_comp.c b/src/bin/e_comp.c
index 7c3d9a8a6..afb80c33f 100644
--- a/src/bin/e_comp.c
+++ b/src/bin/e_comp.c
@@ -743,7 +743,7 @@ _e_comp_shapes_update_job(E_Comp *c)
 static Eina_Bool
 _e_comp_key_down(void *data EINA_UNUSED, int type EINA_UNUSED, Ecore_Event_Key *ev)
 {
-   if ((!strcasecmp(ev->keyname, "f")) &&
+   if ((!strcasecmp(ev->key, "f")) &&
        (ev->modifiers & ECORE_EVENT_MODIFIER_SHIFT) &&
        (ev->modifiers & ECORE_EVENT_MODIFIER_CTRL) &&
        (ev->modifiers & ECORE_EVENT_MODIFIER_ALT))
diff --git a/src/bin/e_desklock.c b/src/bin/e_desklock.c
index 6c44a3995..b98aa2ae4 100644
--- a/src/bin/e_desklock.c
+++ b/src/bin/e_desklock.c
@@ -510,9 +510,9 @@ _e_desklock_ask_presentation_key_down(void *data, Evas *e __UNUSED__, Evas_Objec
    Evas_Event_Key_Down *ev = event;
    E_Dialog *dia = data;
 
-   if (strcmp(ev->keyname, "Return") == 0)
+   if (strcmp(ev->key, "Return") == 0)
      _e_desklock_ask_presentation_yes(NULL, dia);
-   else if (strcmp(ev->keyname, "Escape") == 0)
+   else if (strcmp(ev->key, "Escape") == 0)
      _e_desklock_ask_presentation_no(NULL, dia);
 }
 
diff --git a/src/bin/e_dialog.c b/src/bin/e_dialog.c
index f6609d5a4..91f4abe95 100644
--- a/src/bin/e_dialog.c
+++ b/src/bin/e_dialog.c
@@ -294,7 +294,7 @@ _e_dialog_cb_key_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED_
 
    ev = event;
    dia = data;
-   if (!strcmp(ev->keyname, "Tab"))
+   if (!strcmp(ev->key, "Tab"))
      {
         if (evas_key_modifier_is_set(evas_key_modifier_get(e_win_evas_get(dia->win)), "Shift"))
           {
@@ -341,8 +341,8 @@ _e_dialog_cb_key_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED_
                }
           }
      }
-   else if (((!strcmp(ev->keyname, "Return")) ||
-             (!strcmp(ev->keyname, "KP_Enter"))))
+   else if (((!strcmp(ev->key, "Return")) ||
+             (!strcmp(ev->key, "KP_Enter"))))
      {
         Evas_Object *o = NULL;
 
@@ -352,7 +352,7 @@ _e_dialog_cb_key_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED_
           o = e_widget_focused_object_get(dia->box_object);
         if (o) e_widget_activate(o);
      }
-   else if (!strcmp(ev->keyname, "Escape"))
+   else if (!strcmp(ev->key, "Escape"))
      e_object_del(E_OBJECT(dia));
 }
 
diff --git a/src/bin/e_entry_dialog.c b/src/bin/e_entry_dialog.c
index 5944f4285..fab7d5884 100644
--- a/src/bin/e_entry_dialog.c
+++ b/src/bin/e_entry_dialog.c
@@ -131,10 +131,10 @@ _e_entry_cb_key_down(void *data, Evas_Object *obj __UNUSED__, void *event_info)
 
    ev = event_info;
    if (!(ed = data)) return;
-   if (!strcmp(ev->keyname, "Return"))
+   if (!strcmp(ev->key, "Return"))
      _e_entry_dialog_ok(data, ed->dia);
    else
-   if (!strcmp(ev->keyname, "Escape"))
+   if (!strcmp(ev->key, "Escape"))
      _e_entry_dialog_cancel(data, ed->dia);
 }
 
diff --git a/src/bin/e_fm.c b/src/bin/e_fm.c
index 5f454a264..671745740 100644
--- a/src/bin/e_fm.c
+++ b/src/bin/e_fm.c
@@ -7404,13 +7404,13 @@ _e_fm2_cb_drag_finished(E_Drag *drag, int dropped __UNUSED__)
 static void
 _e_fm_drag_key_down_cb(E_Drag *drag, Ecore_Event_Key *e)
 {
-   if (!strncmp(e->keyname, "Alt", 3))
+   if (!strncmp(e->key, "Alt", 3))
      {
         ecore_x_dnd_source_action_set(ECORE_X_ATOM_XDND_ACTION_ASK);
         e_drop_handler_action_set(ECORE_X_ATOM_XDND_ACTION_ASK);
         edje_object_signal_emit(drag->object, "e,state,ask", "e");
      }
-   else if (!strncmp(e->keyname, "Shift", 5))
+   else if (!strncmp(e->key, "Shift", 5))
      {
         if (e->modifiers == ECORE_EVENT_MODIFIER_CTRL)
           {
@@ -7425,7 +7425,7 @@ _e_fm_drag_key_down_cb(E_Drag *drag, Ecore_Event_Key *e)
              edje_object_signal_emit(drag->object, "e,state,move", "e");
           }
      }
-   else if (!strncmp(e->keyname, "Control", 7))
+   else if (!strncmp(e->key, "Control", 7))
      {
         if (e->modifiers == ECORE_EVENT_MODIFIER_SHIFT)
           {
@@ -7448,11 +7448,11 @@ _e_fm_drag_key_up_cb(E_Drag *drag, Ecore_Event_Key *e)
    Ecore_X_Atom act = ECORE_X_ATOM_XDND_ACTION_MOVE;
    /* Default action would be move. ;) */
 
-   if (!strncmp(e->keyname, "Alt", 3))
+   if (!strncmp(e->key, "Alt", 3))
      act = ECORE_X_ATOM_XDND_ACTION_MOVE;
-   else if (!strncmp(e->keyname, "Shift", 5))
+   else if (!strncmp(e->key, "Shift", 5))
      act = ECORE_X_ATOM_XDND_ACTION_MOVE;
-   else if (!strncmp(e->keyname, "Control", 7))
+   else if (!strncmp(e->key, "Control", 7))
      act = ECORE_X_ATOM_XDND_ACTION_MOVE;
 
    ecore_x_dnd_source_action_set(act);
@@ -7840,7 +7840,7 @@ _e_fm2_cb_key_down(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event
         e_fm2_pan_set(obj, sd->pos.x, sd->pos.y - sd->h);
         evas_object_smart_callback_call(sd->obj, "pan_changed", NULL);
      }
-   else if (!strcmp(ev->keyname, "Next"))
+   else if (!strcmp(ev->key, "Next"))
      {
         /* down h * n pixels */
         e_fm2_pan_set(obj, sd->pos.x, sd->pos.y + sd->h);
diff --git a/src/bin/e_grab_dialog.c b/src/bin/e_grab_dialog.c
index 9bd5296f2..f851b2ae4 100644
--- a/src/bin/e_grab_dialog.c
+++ b/src/bin/e_grab_dialog.c
@@ -13,7 +13,7 @@ _e_grab_dialog_key_handler(void *data, int type __UNUSED__, Ecore_Event_Key *ev)
    E_Grab_Dialog *eg = data;
 
    if (ev->window != eg->grab_win) return ECORE_CALLBACK_RENEW;
-   if (!strcmp(ev->keyname, "Escape") &&
+   if (!strcmp(ev->key, "Escape") &&
        !(ev->modifiers & ECORE_EVENT_MODIFIER_SHIFT) &&
        !(ev->modifiers & ECORE_EVENT_MODIFIER_CTRL) &&
        !(ev->modifiers & ECORE_EVENT_MODIFIER_ALT) &&
diff --git a/src/bin/e_ilist.c b/src/bin/e_ilist.c
index 276b7fc1c..0654b9bcc 100644
--- a/src/bin/e_ilist.c
+++ b/src/bin/e_ilist.c
@@ -973,7 +973,7 @@ _e_smart_event_key_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj, voi
    if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) sd->on_hold = 1;
    else sd->on_hold = 0;
 
-   if ((!strcmp(ev->keyname, "Up")) || (!strcmp(ev->keyname, "KP_Up")))
+   if ((!strcmp(ev->key, "Up")) || (!strcmp(ev->key, "KP_Up")))
      {
         n = ns;
         do
@@ -999,7 +999,7 @@ _e_smart_event_key_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj, voi
                e_ilist_selected_set(sd->o_smart, n);
           }
      }
-   else if ((!strcmp(ev->keyname, "Down")) || (!strcmp(ev->keyname, "KP_Down")))
+   else if ((!strcmp(ev->key, "Down")) || (!strcmp(ev->key, "KP_Down")))
      {
         n = ns;
         do
@@ -1025,7 +1025,7 @@ _e_smart_event_key_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj, voi
                e_ilist_selected_set(sd->o_smart, n);
           }
      }
-   else if ((!strcmp(ev->keyname, "Home")) || (!strcmp(ev->keyname, "KP_Home")))
+   else if ((!strcmp(ev->key, "Home")) || (!strcmp(ev->key, "KP_Home")))
      {
         n = -1;
         do
@@ -1051,7 +1051,7 @@ _e_smart_event_key_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj, voi
                e_ilist_selected_set(sd->o_smart, n);
           }
      }
-   else if ((!strcmp(ev->keyname, "End")) || (!strcmp(ev->keyname, "KP_End")))
+   else if ((!strcmp(ev->key, "End")) || (!strcmp(ev->key, "KP_End")))
      {
         n = eina_list_count(sd->items);
         do
@@ -1077,9 +1077,9 @@ _e_smart_event_key_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj, voi
                e_ilist_selected_set(sd->o_smart, n);
           }
      }
-   else if ((!strcmp(ev->keyname, "Return")) ||
-            (!strcmp(ev->keyname, "KP_Enter")) ||
-            (!strcmp(ev->keyname, "space") && !sd->typebuf.buf))
+   else if ((!strcmp(ev->key, "Return")) ||
+            (!strcmp(ev->key, "KP_Enter")) ||
+            (!strcmp(ev->key, "space") && !sd->typebuf.buf))
      {
         if (!sd->on_hold)
           {
@@ -1090,9 +1090,9 @@ _e_smart_event_key_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj, voi
                }
           }
      }
-   else if (!strcmp(ev->keyname, "Escape"))
+   else if (!strcmp(ev->key, "Escape"))
      _e_typebuf_clean(obj);
-   else if (strcmp(ev->keyname, "BackSpace") && strcmp(ev->keyname, "Tab") && ev->string)
+   else if (strcmp(ev->key, "BackSpace") && strcmp(ev->key, "Tab") && ev->string)
      _e_typebuf_add(obj, ev->string);
 
    sd->on_hold = 0;
diff --git a/src/bin/e_obj_dialog.c b/src/bin/e_obj_dialog.c
index 600cfc8e6..4e85b8fca 100644
--- a/src/bin/e_obj_dialog.c
+++ b/src/bin/e_obj_dialog.c
@@ -15,7 +15,7 @@ _key_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *
 {
    Evas_Event_Key_Down *ev = event;
 
-   if (!strcmp(ev->keyname, "Escape") && data)
+   if (!strcmp(ev->key, "Escape") && data)
      _e_obj_dialog_cb_delete(data);
 }
 
diff --git a/src/bin/e_screensaver.c b/src/bin/e_screensaver.c
index 6843f4952..6bc1ee9c3 100644
--- a/src/bin/e_screensaver.c
+++ b/src/bin/e_screensaver.c
@@ -163,9 +163,9 @@ _e_screensaver_ask_presentation_key_down(void *data, Evas *e __UNUSED__, Evas_Ob
    Evas_Event_Key_Down *ev = event;
    E_Dialog *dia = data;
 
-   if (strcmp(ev->keyname, "Return") == 0)
+   if (strcmp(ev->key, "Return") == 0)
      _e_screensaver_ask_presentation_yes(NULL, dia);
-   else if (strcmp(ev->keyname, "Escape") == 0)
+   else if (strcmp(ev->key, "Escape") == 0)
      _e_screensaver_ask_presentation_no(NULL, dia);
 }
 
diff --git a/src/bin/e_scrollframe.c b/src/bin/e_scrollframe.c
index 976ab4ba9..fe2e9b61d 100644
--- a/src/bin/e_scrollframe.c
+++ b/src/bin/e_scrollframe.c
@@ -700,26 +700,26 @@ _e_smart_event_key_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSE
    if (!sd->pan_obj) return;
    sd->pan_func.max_get(sd->pan_obj, &mx, &my);
    edje_object_part_geometry_get(sd->edje_obj, "e.swallow.content", NULL, NULL, &vw, &vh);
-   if (!strcmp(ev->keyname, "Left"))
+   if (!strcmp(ev->key, "Left"))
      x -= sd->step.x;
-   else if (!strcmp(ev->keyname, "Right"))
+   else if (!strcmp(ev->key, "Right"))
      x += sd->step.x;
-   else if (!strcmp(ev->keyname, "Up"))
+   else if (!strcmp(ev->key, "Up"))
      y -= sd->step.y;
-   else if (!strcmp(ev->keyname, "Home"))
+   else if (!strcmp(ev->key, "Home"))
      y = 0;
-   else if (!strcmp(ev->keyname, "End"))
+   else if (!strcmp(ev->key, "End"))
      y = my;
-   else if (!strcmp(ev->keyname, "Down"))
+   else if (!strcmp(ev->key, "Down"))
      y += sd->step.y;
-   else if (!strcmp(ev->keyname, "Prior"))
+   else if (!strcmp(ev->key, "Prior"))
      {
         if (sd->page.y < 0)
           y -= -(sd->page.y * vh) / 100;
         else
           y -= sd->page.y;
      }
-   else if (!strcmp(ev->keyname, "Next"))
+   else if (!strcmp(ev->key, "Next"))
      {
         if (sd->page.y < 0)
           y += -(sd->page.y * vh) / 100;
diff --git a/src/bin/e_slider.c b/src/bin/e_slider.c
index 1cb917bf1..1da664e79 100644
--- a/src/bin/e_slider.c
+++ b/src/bin/e_slider.c
@@ -434,10 +434,10 @@ _e_smart_event_key_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSE
    E_Smart_Data *sd = data;
 
    if (sd->disabled) return;
-   if ((!strcmp(ev->keyname, "Down")) ||
-       (!strcmp(ev->keyname, "KP_Down")) ||
-       (!strcmp(ev->keyname, "Left")) ||
-       (!strcmp(ev->keyname, "KP_Left")))
+   if ((!strcmp(ev->key, "Down")) ||
+       (!strcmp(ev->key, "KP_Down")) ||
+       (!strcmp(ev->key, "Left")) ||
+       (!strcmp(ev->key, "KP_Left")))
      {
         if (sd->step_count > 0)
           {
@@ -448,10 +448,10 @@ _e_smart_event_key_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSE
           edje_object_part_drag_step(sd->edje_obj, "e.dragable.slider", -1, -1);
         sd->direction = -1;
      }
-   else if ((!strcmp(ev->keyname, "Up")) ||
-            (!strcmp(ev->keyname, "KP_Up")) ||
-            (!strcmp(ev->keyname, "Right")) ||
-            (!strcmp(ev->keyname, "KP_Right")))
+   else if ((!strcmp(ev->key, "Up")) ||
+            (!strcmp(ev->key, "KP_Up")) ||
+            (!strcmp(ev->key, "Right")) ||
+            (!strcmp(ev->key, "KP_Right")))
      {
         if (sd->step_count > 0)
           {
@@ -462,14 +462,14 @@ _e_smart_event_key_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSE
           edje_object_part_drag_step(sd->edje_obj, "e.dragable.slider", 1, 1);
         sd->direction = 1;
      }
-   else if ((!strcmp(ev->keyname, "Home")) ||
-            (!strcmp(ev->keyname, "KP_Home")))
+   else if ((!strcmp(ev->key, "Home")) ||
+            (!strcmp(ev->key, "KP_Home")))
      {
         edje_object_part_drag_value_set(sd->edje_obj, "e.dragable.slider", 0., 0.);
         sd->direction = 0;
      }
-   else if ((!strcmp(ev->keyname, "End")) ||
-            (!strcmp(ev->keyname, "KP_End")))
+   else if ((!strcmp(ev->key, "End")) ||
+            (!strcmp(ev->key, "KP_End")))
      {
         edje_object_part_drag_value_set(sd->edje_obj, "e.dragable.slider", 1., 1.);
         sd->direction = 0;
diff --git a/src/bin/e_slidesel.c b/src/bin/e_slidesel.c
index d2bfc6148..6387a7f4c 100644
--- a/src/bin/e_slidesel.c
+++ b/src/bin/e_slidesel.c
@@ -182,26 +182,26 @@ _e_smart_event_key_down(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *
 
    sd = data;
    ev = event_info;
-   if (!strcmp(ev->keyname, "Left"))
+   if (!strcmp(ev->key, "Left"))
      x -= sd->step.x;
-   else if (!strcmp(ev->keyname, "Right"))
+   else if (!strcmp(ev->key, "Right"))
      x += sd->step.x;
-   else if (!strcmp(ev->keyname, "Up"))
+   else if (!strcmp(ev->key, "Up"))
      y -= sd->step.y;
-   else if (!strcmp(ev->keyname, "Home"))
+   else if (!strcmp(ev->key, "Home"))
      y = 0;
-   else if (!strcmp(ev->keyname, "End"))
+   else if (!strcmp(ev->key, "End"))
      y = my;
-   else if (!strcmp(ev->keyname, "Down"))
+   else if (!strcmp(ev->key, "Down"))
      y += sd->step.y;
-   else if (!strcmp(ev->keyname, "Prior"))
+   else if (!strcmp(ev->key, "Prior"))
      {
         if (sd->page.y < 0)
           y -= -(sd->page.y * vh) / 100;
         else
           y -= sd->page.y;
      }
-   else if (!strcmp(ev->keyname, "Next"))
+   else if (!strcmp(ev->key, "Next"))
      {
         if (sd->page.y < 0)
           y += -(sd->page.y * vh) / 100;
diff --git a/src/bin/e_utils.c b/src/bin/e_utils.c
index 3171444ad..4f64ace2f 100644
--- a/src/bin/e_utils.c
+++ b/src/bin/e_utils.c
@@ -1361,7 +1361,7 @@ e_util_binding_match(const Eina_List *bindlist, Ecore_Event_Key *ev, unsigned in
      {
         if (bi != skip)
           {
-             if ((bi->modifiers == mod) && (!strcmp(bi->key, ev->keyname)))
+             if ((bi->modifiers == mod) && (!strcmp(bi->key, ev->key)))
                return bi;
           }
         if (num) (*num)++;
diff --git a/src/bin/e_widget_toolbar.c b/src/bin/e_widget_toolbar.c
index c43204410..612958c57 100644
--- a/src/bin/e_widget_toolbar.c
+++ b/src/bin/e_widget_toolbar.c
@@ -466,8 +466,8 @@ _e_wid_cb_key_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED_
    ev = event_info;
    if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
    wd = e_widget_data_get(data);
-   if ((!strcmp(ev->keyname, "Up")) || (!strcmp(ev->keyname, "KP_Up")) ||
-       (!strcmp(ev->keyname, "Left")) || (!strcmp(ev->keyname, "KP_Left")))
+   if ((!strcmp(ev->key, "Up")) || (!strcmp(ev->key, "KP_Up")) ||
+       (!strcmp(ev->key, "Left")) || (!strcmp(ev->key, "KP_Left")))
      {
         EINA_LIST_FOREACH(wd->items, l, it)
           {
@@ -479,10 +479,10 @@ _e_wid_cb_key_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED_
                }
           }
      }
-   else if ((!strcmp(ev->keyname, "Down")) ||
-            (!strcmp(ev->keyname, "KP_Down")) ||
-            (!strcmp(ev->keyname, "Right")) ||
-            (!strcmp(ev->keyname, "KP_Right")))
+   else if ((!strcmp(ev->key, "Down")) ||
+            (!strcmp(ev->key, "KP_Down")) ||
+            (!strcmp(ev->key, "Right")) ||
+            (!strcmp(ev->key, "KP_Right")))
      {
         EINA_LIST_FOREACH(wd->items, l, it)
           {
@@ -494,8 +494,8 @@ _e_wid_cb_key_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED_
                }
           }
      }
-   else if ((!strcmp(ev->keyname, "Home")) ||
-            (!strcmp(ev->keyname, "KP_Home")))
+   else if ((!strcmp(ev->key, "Home")) ||
+            (!strcmp(ev->key, "KP_Home")))
      {
         EINA_LIST_FOREACH(wd->items, l, it)
           {
@@ -506,7 +506,7 @@ _e_wid_cb_key_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED_
                }
           }
      }
-   else if ((!strcmp(ev->keyname, "End")) || (!strcmp(ev->keyname, "KP_End")))
+   else if ((!strcmp(ev->key, "End")) || (!strcmp(ev->key, "KP_End")))
      {
         EINA_LIST_FOREACH(wd->items, l, it)
           {
diff --git a/src/modules/backlight/e_mod_main.c b/src/modules/backlight/e_mod_main.c
index e7a5e4f6e..bbe1ef36f 100644
--- a/src/modules/backlight/e_mod_main.c
+++ b/src/modules/backlight/e_mod_main.c
@@ -148,7 +148,7 @@ _backlight_win_key_down_cb(void *data, Ecore_Event_Key *ev)
              if (ev->modifiers & ECORE_EVENT_MODIFIER_WIN)
                 mod |= E_BINDING_MODIFIER_WIN;
              
-             if (binding->key && (!strcmp(binding->key, ev->keyname)) &&
+             if (binding->key && (!strcmp(binding->key, ev->key)) &&
                  ((binding->modifiers == mod) || (binding->any_mod)))
                {
                   _backlight_popup_free(inst);
diff --git a/src/modules/conf/e_conf.c b/src/modules/conf/e_conf.c
index 11a4e3a7a..1576eba9b 100644
--- a/src/modules/conf/e_conf.c
+++ b/src/modules/conf/e_conf.c
@@ -406,7 +406,7 @@ _e_configure_keydown_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSE
    win = data;
    eco = win->data;
 
-   if (!strcmp(ev->keyname, "Tab"))
+   if (!strcmp(ev->key, "Tab"))
      {
         if (evas_key_modifier_is_set(evas_key_modifier_get(e_win_evas_get(win)), "Shift"))
           {
@@ -427,9 +427,9 @@ _e_configure_keydown_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSE
                e_widget_focus_set(eco->item_list, 0);
           }
      }
-   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"))))
      {
         Evas_Object *o = NULL;
 
@@ -446,7 +446,7 @@ _e_configure_keydown_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSE
              e_widget_activate(o);
           }
      }
-   else if (!strcmp(ev->keyname, "Escape"))
+   else if (!strcmp(ev->key, "Escape"))
      e_widget_activate(eco->close);
 }
 
diff --git a/src/modules/conf_bindings/e_int_config_acpibindings.c b/src/modules/conf_bindings/e_int_config_acpibindings.c
index 347504b95..449ea2663 100644
--- a/src/modules/conf_bindings/e_int_config_acpibindings.c
+++ b/src/modules/conf_bindings/e_int_config_acpibindings.c
@@ -623,7 +623,7 @@ _cb_grab_key_down(void *data,
    ev = event;
    if (ev->window != grab_win) return ECORE_CALLBACK_PASS_ON;
    if (!(cfdata = data)) return ECORE_CALLBACK_PASS_ON;
-   if (!strcmp(ev->keyname, "Escape"))
+   if (!strcmp(ev->key, "Escape"))
      {
         Ecore_Event_Handler *hdl;
 
diff --git a/src/modules/conf_bindings/e_int_config_keybindings.c b/src/modules/conf_bindings/e_int_config_keybindings.c
index 213dcfc94..c88b4baea 100644
--- a/src/modules/conf_bindings/e_int_config_keybindings.c
+++ b/src/modules/conf_bindings/e_int_config_keybindings.c
@@ -849,15 +849,15 @@ _grab_key_down_cb(void *data,
    cfdata = data;
 
    if ((ev->keyname) && (ev->key) && (ev->compose))
-     printf("'%s' '%s' '%s'\n", ev->keyname, ev->key, ev->compose);
+     printf("'%s' '%s' '%s'\n", ev->key, ev->key, ev->compose);
    else if ((ev->keyname) && (ev->key))
      printf("'%s' '%s'\n", ev->keyname, ev->key);
    else
      printf("unknown key!!!!\n");
-   if (!e_util_strcmp(ev->keyname, "Control_L") || !e_util_strcmp(ev->keyname, "Control_R") ||
-       !e_util_strcmp(ev->keyname, "Shift_L") || !e_util_strcmp(ev->keyname, "Shift_R") ||
-       !e_util_strcmp(ev->keyname, "Alt_L") || !e_util_strcmp(ev->keyname, "Alt_R") ||
-       !e_util_strcmp(ev->keyname, "Super_L") || !e_util_strcmp(ev->keyname, "Super_R"))
+   if (!e_util_strcmp(ev->key, "Control_L") || !e_util_strcmp(ev->key, "Control_R") ||
+       !e_util_strcmp(ev->key, "Shift_L") || !e_util_strcmp(ev->key, "Shift_R") ||
+       !e_util_strcmp(ev->key, "Alt_L") || !e_util_strcmp(ev->key, "Alt_R") ||
+       !e_util_strcmp(ev->key, "Super_L") || !e_util_strcmp(ev->key, "Super_R"))
      {
         /* Do nothing */
      }
@@ -868,7 +868,7 @@ _grab_key_down_cb(void *data,
         unsigned int mod = E_BINDING_MODIFIER_NONE;
         unsigned int n, found = 0;
 
-        if (!e_bindings_key_allowed(ev->keyname))
+        if (!e_bindings_key_allowed(ev->key))
           return ECORE_CALLBACK_PASS_ON;
 
         if (ev->modifiers & ECORE_EVENT_MODIFIER_SHIFT)
@@ -897,7 +897,7 @@ _grab_key_down_cb(void *data,
 
                   bi->context = E_BINDING_CONTEXT_ANY;
                   bi->modifiers = mod;
-                  bi->key = eina_stringshare_add(ev->keyname);
+                  bi->key = eina_stringshare_add(ev->key);
                   bi->action = NULL;
                   bi->params = NULL;
                   bi->any_mod = 0;
@@ -940,7 +940,7 @@ _grab_key_down_cb(void *data,
 
                   bi->modifiers = mod;
                   if (bi->key) eina_stringshare_del(bi->key);
-                  bi->key = eina_stringshare_add(ev->keyname);
+                  bi->key = eina_stringshare_add(ev->key);
                   printf("blub\n");
 
                   label = _key_binding_text_get(bi);
diff --git a/src/modules/conf_intl/e_int_config_imc_import.c b/src/modules/conf_intl/e_int_config_imc_import.c
index 005bd6e75..cad6448eb 100644
--- a/src/modules/conf_intl/e_int_config_imc_import.c
+++ b/src/modules/conf_intl/e_int_config_imc_import.c
@@ -326,7 +326,7 @@ _imc_import_cb_key_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSE
 
    ev = event;
    import = data;
-   if ((!e_widget_fsel_typebuf_visible_get(import->fsel_obj)) && (!strcmp(ev->keyname, "Tab")))
+   if ((!e_widget_fsel_typebuf_visible_get(import->fsel_obj)) && (!strcmp(ev->key, "Tab")))
      {
         if (evas_key_modifier_is_set(evas_key_modifier_get(e_win_evas_get(import->win)), "Shift"))
           {
@@ -363,9 +363,9 @@ _imc_import_cb_key_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSE
                }
           }
      }
-   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"))))
      {
         Evas_Object *o = NULL;
 
diff --git a/src/modules/conf_theme/e_int_config_theme_import.c b/src/modules/conf_theme/e_int_config_theme_import.c
index cbe8a833f..5a06153bd 100644
--- a/src/modules/conf_theme/e_int_config_theme_import.c
+++ b/src/modules/conf_theme/e_int_config_theme_import.c
@@ -309,7 +309,7 @@ _theme_import_cb_key_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNU
 
    ev = event;
    import = data;
-   if ((!e_widget_fsel_typebuf_visible_get(import->fsel_obj)) && (!strcmp(ev->keyname, "Tab")))
+   if ((!e_widget_fsel_typebuf_visible_get(import->fsel_obj)) && (!strcmp(ev->key, "Tab")))
      {
         if (evas_key_modifier_is_set(evas_key_modifier_get(e_win_evas_get(import->win)), "Shift"))
           {
@@ -346,9 +346,9 @@ _theme_import_cb_key_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNU
                }
           }
      }
-   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"))))
      {
         Evas_Object *o = NULL;
 
diff --git a/src/modules/connman/agent.c b/src/modules/connman/agent.c
index ea78c9445..04d25366f 100644
--- a/src/modules/connman/agent.c
+++ b/src/modules/connman/agent.c
@@ -109,9 +109,9 @@ _dialog_key_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *o __UNUSED__,
    Evas_Event_Key_Down *ev = event;
    E_Connman_Agent *agent = data;
 
-   if (!strcmp(ev->keyname, "Return"))
+   if (!strcmp(ev->key, "Return"))
      _dialog_ok_cb(agent, agent->dialog);
-   else if (strcmp(ev->keyname, "Escape") == 0)
+   else if (strcmp(ev->key, "Escape") == 0)
      _dialog_cancel_cb(agent, agent->dialog);
 }
 
diff --git a/src/modules/everything/evry.c b/src/modules/everything/evry.c
index caaf311b1..5cf151e6d 100644
--- a/src/modules/everything/evry.c
+++ b/src/modules/everything/evry.c
@@ -1955,7 +1955,7 @@ _evry_cb_key_down(void *data, int type __UNUSED__, void *event)
              if (ev->modifiers & ECORE_EVENT_MODIFIER_WIN)
                mod |= E_BINDING_MODIFIER_WIN;
 
-             if (!(binding->key && (!strcmp(binding->key, ev->keyname)) &&
+             if (!(binding->key && (!strcmp(binding->key, ev->key)) &&
                    (((unsigned int)binding->modifiers == mod) || (binding->any_mod))))
                continue;
 
diff --git a/src/modules/fileman/e_fwin.c b/src/modules/fileman/e_fwin.c
index cdb1b3679..7dfb37b06 100644
--- a/src/modules/fileman/e_fwin.c
+++ b/src/modules/fileman/e_fwin.c
@@ -2731,10 +2731,10 @@ _e_fwin_file_open_dialog_cb_key_down(void *data,
    E_Fwin_Page *page = data;
    E_Fwin *fwin = page->fwin;
 
-   if (!strcmp(ev->keyname, "Escape"))
+   if (!strcmp(ev->key, "Escape"))
      _e_fwin_cb_close(fwin->fad, fwin->fad->dia);
-   else if ((!strcmp(ev->keyname, "Return")) ||
-            (!strcmp(ev->keyname, "KP_Enter"))) 
+   else if ((!strcmp(ev->key, "Return")) ||
+            (!strcmp(ev->key, "KP_Enter"))) 
      _e_fwin_cb_open(fwin->fad, fwin->fad->dia);
 }
 
diff --git a/src/modules/mixer/e_mod_main.c b/src/modules/mixer/e_mod_main.c
index 67fbc2122..34f8d4800 100644
--- a/src/modules/mixer/e_mod_main.c
+++ b/src/modules/mixer/e_mod_main.c
@@ -431,7 +431,7 @@ _mixer_popup_key_down_cb(void *data, Ecore_Event_Key *ev)
              if (ev->modifiers & ECORE_EVENT_MODIFIER_WIN)
                mod |= E_BINDING_MODIFIER_WIN;
 
-             if (binding->key && (!strcmp(binding->key, ev->keyname)) &&
+             if (binding->key && (!strcmp(binding->key, ev->key)) &&
                  ((binding->modifiers == mod) || (binding->any_mod)))
                {
                   if (!(act = e_action_find(binding->action))) continue;
diff --git a/src/modules/pager/e_mod_config.c b/src/modules/pager/e_mod_config.c
index 389f41fb8..211ce70e3 100644
--- a/src/modules/pager/e_mod_config.c
+++ b/src/modules/pager/e_mod_config.c
@@ -494,7 +494,7 @@ _grab_cb_key_down(void *data, __UNUSED__ int type, void *event)
 
    ev = event;
    if (!(cfdata = data)) return ECORE_CALLBACK_PASS_ON;
-   if (!strcmp(ev->keyname, "Delete"))
+   if (!strcmp(ev->key, "Delete"))
      {
         if (cfdata->grab.btn == 1)
           cfdata->btn.drag = 0;
diff --git a/src/modules/pager/e_mod_main.c b/src/modules/pager/e_mod_main.c
index 26254d272..342e9349c 100644
--- a/src/modules/pager/e_mod_main.c
+++ b/src/modules/pager/e_mod_main.c
@@ -2705,7 +2705,7 @@ _pager_popup_cb_key_down(void *data __UNUSED__, int type __UNUSED__, void *event
              if (ev->modifiers & ECORE_EVENT_MODIFIER_WIN)
                mod |= E_BINDING_MODIFIER_WIN;
 
-             if (binding->key && (!strcmp(binding->key, ev->keyname)) &&
+             if (binding->key && (!strcmp(binding->key, ev->key)) &&
                  ((binding->modifiers == mod)))
                {
                   E_Action *act;
diff --git a/src/modules/pager16/e_mod_config.c b/src/modules/pager16/e_mod_config.c
index becfc1792..065fdc60d 100644
--- a/src/modules/pager16/e_mod_config.c
+++ b/src/modules/pager16/e_mod_config.c
@@ -483,7 +483,7 @@ _grab_cb_key_down(void *data, __UNUSED__ int type, void *event)
 
    ev = event;
    if (!(cfdata = data)) return ECORE_CALLBACK_PASS_ON;
-   if (!strcmp(ev->keyname, "Delete"))
+   if (!strcmp(ev->key, "Delete"))
      {
         if (cfdata->grab.btn == 1)
           cfdata->btn.drag = 0;
diff --git a/src/modules/pager16/e_mod_main.c b/src/modules/pager16/e_mod_main.c
index 69c05a5ff..e71fe3a86 100644
--- a/src/modules/pager16/e_mod_main.c
+++ b/src/modules/pager16/e_mod_main.c
@@ -1868,7 +1868,7 @@ _pager_popup_cb_key_down(void *data __UNUSED__, int type __UNUSED__, void *event
              if (ev->modifiers & ECORE_EVENT_MODIFIER_WIN)
                mod |= E_BINDING_MODIFIER_WIN;
 
-             if (binding->key && (!strcmp(binding->key, ev->keyname)) &&
+             if (binding->key && (!strcmp(binding->key, ev->key)) &&
                  ((binding->modifiers == mod)))
                {
                   E_Action *act;
diff --git a/src/modules/quickaccess/e_mod_quickaccess.c b/src/modules/quickaccess/e_mod_quickaccess.c
index ac898ebbb..aa1ae89e6 100644
--- a/src/modules/quickaccess/e_mod_quickaccess.c
+++ b/src/modules/quickaccess/e_mod_quickaccess.c
@@ -669,10 +669,10 @@ _grab_key_down_cb(void *data, int type __UNUSED__, void *event)
    E_Quick_Access_Entry *entry;
    unsigned int mod = E_BINDING_MODIFIER_NONE;
 
-   if (!strcmp(ev->keyname, "Control_L") || !strcmp(ev->keyname, "Control_R") ||
-       !strcmp(ev->keyname, "Shift_L") || !strcmp(ev->keyname, "Shift_R") ||
-       !strcmp(ev->keyname, "Alt_L") || !strcmp(ev->keyname, "Alt_R") ||
-       !strcmp(ev->keyname, "Super_L") || !strcmp(ev->keyname, "Super_R"))
+   if (!strcmp(ev->key, "Control_L") || !strcmp(ev->key, "Control_R") ||
+       !strcmp(ev->key, "Shift_L") || !strcmp(ev->key, "Shift_R") ||
+       !strcmp(ev->key, "Alt_L") || !strcmp(ev->key, "Alt_R") ||
+       !strcmp(ev->key, "Super_L") || !strcmp(ev->key, "Super_R"))
      return ECORE_CALLBACK_RENEW;
 
    if (ev->modifiers & ECORE_EVENT_MODIFIER_SHIFT)
@@ -696,7 +696,7 @@ _grab_key_down_cb(void *data, int type __UNUSED__, void *event)
 
    bi->context = E_BINDING_CONTEXT_ANY;
    bi->modifiers = mod;
-   bi->key = eina_stringshare_add(ev->keyname);
+   bi->key = eina_stringshare_add(ev->key);
    bi->action = eina_stringshare_ref(_act_toggle);
    bi->params = eina_stringshare_ref(entry->id);
 
diff --git a/src/modules/shot/e_mod_main.c b/src/modules/shot/e_mod_main.c
index 9a6abd398..4d34f2972 100644
--- a/src/modules/shot/e_mod_main.c
+++ b/src/modules/shot/e_mod_main.c
@@ -79,7 +79,7 @@ _key_down_cb(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj __UNUSE
 {
    Evas_Event_Key_Down *ev = event;
    
-   if (!strcmp(ev->keyname, "Tab"))
+   if (!strcmp(ev->key, "Tab"))
      {
         if (evas_key_modifier_is_set(evas_key_modifier_get(e_win_evas_get(win)), "Shift"))
           {
@@ -116,9 +116,9 @@ _key_down_cb(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj __UNUSE
                }
           }
      }
-   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"))))
      {
         Evas_Object *o = NULL;
         
@@ -128,7 +128,7 @@ _key_down_cb(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj __UNUSE
            o = e_widget_focused_object_get(o_box);
         if (o) e_widget_activate(o);
      }            
-   else if (!strcmp(ev->keyname, "Escape"))
+   else if (!strcmp(ev->key, "Escape"))
      _win_cancel_cb(NULL, NULL);
 }            
 
@@ -136,9 +136,9 @@ static void
 _save_key_down_cb(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event)
 {
    Evas_Event_Key_Down *ev = event;
-   if ((!strcmp(ev->keyname, "Return")) || (!strcmp(ev->keyname, "KP_Enter")))
+   if ((!strcmp(ev->key, "Return")) || (!strcmp(ev->key, "KP_Enter")))
      _file_select_ok_cb(NULL, fsel_dia);
-   else if (!strcmp(ev->keyname, "Escape"))
+   else if (!strcmp(ev->key, "Escape"))
      _file_select_cancel_cb(NULL, fsel_dia);
 }            
 
diff --git a/src/modules/syscon/e_syscon.c b/src/modules/syscon/e_syscon.c
index 3cadee174..e1bde1143 100644
--- a/src/modules/syscon/e_syscon.c
+++ b/src/modules/syscon/e_syscon.c
@@ -376,7 +376,7 @@ _cb_key_down(__UNUSED__ void *data, Ecore_Event_Key *ev)
           }
         edje_object_signal_emit(o_selected, "e,state,unfocused", "e");
      }
-   else if ((!strcmp(ev->keyname, "KP_Enter")) || (!strcmp(ev->keyname, "Return")))
+   else if ((!strcmp(ev->key, "KP_Enter")) || (!strcmp(ev->key, "Return")))
      {
         if (!o_selected) return ECORE_CALLBACK_RENEW;
         edje_object_signal_emit(o_selected, "e,state,focused", "e");
diff --git a/src/modules/winlist/e_winlist.c b/src/modules/winlist/e_winlist.c
index afb9303d8..e2be7d778 100644
--- a/src/modules/winlist/e_winlist.c
+++ b/src/modules/winlist/e_winlist.c
@@ -1153,7 +1153,7 @@ _e_winlist_cb_key_down(void *data __UNUSED__, int type __UNUSED__, void *event)
              if (ev->modifiers & ECORE_EVENT_MODIFIER_WIN)
                mod |= E_BINDING_MODIFIER_WIN;
 
-             if (binding->key && (!strcmp(binding->key, ev->keyname)) &&
+             if (binding->key && (!strcmp(binding->key, ev->key)) &&
                  ((binding->modifiers == mod) || (binding->any_mod)))
                {
                   if (!_act_winlist) continue;
@@ -1219,7 +1219,7 @@ _e_winlist_cb_key_up(void *data __UNUSED__, int type __UNUSED__, void *event)
         if (ev->modifiers & ECORE_EVENT_MODIFIER_WIN)
           mod |= E_BINDING_MODIFIER_WIN;
 
-        if (binding->key && (!strcmp(binding->key, ev->keyname)) &&
+        if (binding->key && (!strcmp(binding->key, ev->key)) &&
             ((binding->modifiers == mod) || (binding->any_mod)))
           {
              if (!_act_winlist) continue;
diff --git a/src/modules/wizard/e_wizard.c b/src/modules/wizard/e_wizard.c
index ed309f83d..f2926fba8 100644
--- a/src/modules/wizard/e_wizard.c
+++ b/src/modules/wizard/e_wizard.c
@@ -291,19 +291,19 @@ _e_wizard_cb_key_down(void *data EINA_UNUSED, int type EINA_UNUSED, void *event)
    Ecore_Event_Key *ev = event;
 
    if (!o_content) return ECORE_CALLBACK_RENEW;
-   if (!strcmp(ev->keyname, "Tab"))
+   if (!strcmp(ev->key, "Tab"))
      {
         if (ev->modifiers & ECORE_EVENT_MODIFIER_SHIFT)
           e_widget_focus_jump(o_content, 0);
         else
           e_widget_focus_jump(o_content, 1);
      }
-   else if ((!strcmp(ev->keyname, "Return")) || (!strcmp(ev->keyname, "KP_Enter")))
+   else if ((!strcmp(ev->key, "Return")) || (!strcmp(ev->key, "KP_Enter")))
      {
         if (next_can)
           e_wizard_next();
      }
-   else if (!strcmp(ev->keyname, "space"))
+   else if (!strcmp(ev->key, "space"))
      {
         Evas_Object *o;
 
diff --git a/src/modules/wl_desktop_shell/e_mod_main.c b/src/modules/wl_desktop_shell/e_mod_main.c
index eae8691e7..114a7c487 100644
--- a/src/modules/wl_desktop_shell/e_mod_main.c
+++ b/src/modules/wl_desktop_shell/e_mod_main.c
@@ -1339,7 +1339,7 @@ _e_wl_shell_shell_surface_cb_key_up(void *data, Evas *e EINA_UNUSED, Evas_Object
 #ifndef WAYLAND_ONLY
    if (_e_wl_comp->kbd_handler)
      /* get the keycode for this key from X, since we're definitely in X here */
-     key = ecore_x_keysym_keycode_get(ev->keyname) - 8;
+     key = ecore_x_keysym_keycode_get(ev->key) - 8;
    else
 #endif
      {
@@ -1405,7 +1405,7 @@ _e_wl_shell_shell_surface_cb_key_down(void *data, Evas *e EINA_UNUSED, Evas_Obje
 #ifndef WAYLAND_ONLY
    if (_e_wl_comp->kbd_handler)
      /* get the keycode for this key from X, since we're definitely in X here */
-     key = ecore_x_keysym_keycode_get(ev->keyname) - 8;
+     key = ecore_x_keysym_keycode_get(ev->key) - 8;
    else
 #endif
      {