Evas: Rename Clickable_Interface to Efl.Ui.Clickable

Event prefix is efl_ui:
 EFL_UI_EVENT_CLICKED
 EFL_UI_EVENT_CLICKED_DOUBLE
 ...

The event prefix could be reduced to efl but I personally
prefer with UI.

62 files changed, 130 insertions, 138 deletions

diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index da73b78bcf..e163b11d0a 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -11,7 +11,7 @@ evas_eolian_pub_files = \
 	lib/evas/canvas/evas_canvas.eo \
 	lib/evas/canvas/efl_canvas_image_internal.eo \
 	lib/evas/canvas/evas_draggable_interface.eo \
-	lib/evas/canvas/evas_clickable_interface.eo \
+	lib/evas/canvas/efl_ui_clickable.eo \
 	lib/evas/canvas/evas_scrollable_interface.eo \
 	lib/evas/canvas/evas_selectable_interface.eo \
 	lib/evas/canvas/evas_zoomable_interface.eo \
diff --git a/src/bin/elementary/test_events.c b/src/bin/elementary/test_events.c
index ef1eefcf53..dafdeef381 100644
--- a/src/bin/elementary/test_events.c
+++ b/src/bin/elementary/test_events.c
@@ -234,8 +234,8 @@ test_events(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
    efl_pack(bx, o);
    evas_object_show(o);
 
-   eo_event_callback_add(td->button, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _clicked_button1, td);
-   eo_event_callback_add(bt, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _clicked_button2, td);
+   eo_event_callback_add(td->button, EFL_UI_EVENT_CLICKED, _clicked_button1, td);
+   eo_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _clicked_button2, td);
    eo_event_callback_add(win, EO_EVENT_DEL, _win_del, td);
    eo_event_callback_array_add(o, rect_pointer_callbacks(), td);
    eo_event_callback_array_add(win, win_key_callbacks(), td);
diff --git a/src/bin/elementary/test_grid_static.c b/src/bin/elementary/test_grid_static.c
index 55b2c5d9bf..0cb89360c7 100644
--- a/src/bin/elementary/test_grid_static.c
+++ b/src/bin/elementary/test_grid_static.c
@@ -147,7 +147,7 @@ test_grid_static(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
 
    bt = elm_button_add(win);
    elm_object_text_set(bt, "Next API function");
-   eo_event_callback_add(bt, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _api_bt_clicked, api);
+   eo_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _api_bt_clicked, api);
    efl_pack_grid(gd, bt, 30, 0, 40, 10);
    elm_object_disabled_set(bt, api->state == API_STATE_LAST);
    efl_gfx_visible_set(bt, 1);
@@ -176,7 +176,7 @@ test_grid_static(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
    bt = elm_button_add(win);
    elm_object_text_set(bt, "Change");
    efl_pack_grid(gd, bt, 40, 40, 20, 20);
-   eo_event_callback_add(bt, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _ch_grid, gd);
+   eo_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _ch_grid, gd);
    efl_gfx_visible_set(bt, 1);
 
    rc = eo_add(EFL_CANVAS_RECTANGLE_CLASS, win);
diff --git a/src/bin/elementary/test_ui_grid.c b/src/bin/elementary/test_ui_grid.c
index 2c002f2030..99e263dc78 100644
--- a/src/bin/elementary/test_ui_grid.c
+++ b/src/bin/elementary/test_ui_grid.c
@@ -511,7 +511,7 @@ append_cb(void *data, const Eo_Event *ev EINA_UNUSED)
    Eo *grid = data;
    Eo *o = elm_button_add(grid);
    elm_object_text_set(o, btn_text("appended"));
-   eo_event_callback_add(o, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, remove_cb, NULL);
+   eo_event_callback_add(o, EFL_UI_EVENT_CLICKED, remove_cb, NULL);
    elm_object_tooltip_text_set(o, "Click to unpack");
    efl_pack_end(grid, o);
    efl_gfx_visible_set(o, 1);
@@ -567,7 +567,7 @@ test_ui_grid_linear(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
    o = elm_button_add(win);
    elm_object_content_set(o, ico);
    elm_object_text_set(o, "Append");
-   eo_event_callback_add(o, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, append_cb, grid);
+   eo_event_callback_add(o, EFL_UI_EVENT_CLICKED, append_cb, grid);
    efl_pack(hbox, o);
    efl_gfx_visible_set(o, 1);
 
@@ -576,7 +576,7 @@ test_ui_grid_linear(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
    o = elm_button_add(win);
    elm_object_content_set(o, ico);
    elm_object_text_set(o, "Clear");
-   eo_event_callback_add(o, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, clear_cb, grid);
+   eo_event_callback_add(o, EFL_UI_EVENT_CLICKED, clear_cb, grid);
    efl_pack(hbox, o);
    efl_gfx_visible_set(o, 1);
 
@@ -624,19 +624,19 @@ test_ui_grid_linear(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
 
    o = elm_button_add(win);
    elm_object_text_set(o, btn_text(NULL));
-   eo_event_callback_add(o, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, remove_cb, NULL);
+   eo_event_callback_add(o, EFL_UI_EVENT_CLICKED, remove_cb, NULL);
    efl_pack(grid, o);
    efl_gfx_visible_set(o, 1);
 
    o = elm_button_add(win);
    elm_object_text_set(o, btn_text(NULL));
-   eo_event_callback_add(o, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, remove_cb, NULL);
+   eo_event_callback_add(o, EFL_UI_EVENT_CLICKED, remove_cb, NULL);
    efl_pack(grid, o);
    efl_gfx_visible_set(o, 1);
 
    o = elm_button_add(win);
    elm_object_text_set(o, btn_text(NULL));
-   eo_event_callback_add(o, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, remove_cb, NULL);
+   eo_event_callback_add(o, EFL_UI_EVENT_CLICKED, remove_cb, NULL);
    efl_pack(grid, o);
    efl_gfx_visible_set(o, 1);
 
diff --git a/src/lib/elementary/efl_ui_image.c b/src/lib/elementary/efl_ui_image.c
index ebb974b09f..13f4cc5fdc 100644
--- a/src/lib/elementary/efl_ui_image.c
+++ b/src/lib/elementary/efl_ui_image.c
@@ -79,7 +79,7 @@ _on_mouse_up(void *data,
    if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
    if (!wd->still_in) return;
 
-   eo_event_callback_call(data, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL);
+   eo_event_callback_call(data, EFL_UI_EVENT_CLICKED, NULL);
 }
 
 static Eina_Bool
@@ -749,7 +749,7 @@ _efl_ui_image_elm_widget_theme_apply(Eo *obj, Efl_Ui_Image_Data *sd EINA_UNUSED)
 static Eina_Bool
 _key_action_activate(Evas_Object *obj, const char *params EINA_UNUSED)
 {
-   eo_event_callback_call(obj, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL);
+   eo_event_callback_call(obj, EFL_UI_EVENT_CLICKED, NULL);
    return EINA_TRUE;
 }
 
diff --git a/src/lib/elementary/efl_ui_image.eo b/src/lib/elementary/efl_ui_image.eo
index 4c87fe2ab1..ae176db4fc 100644
--- a/src/lib/elementary/efl_ui_image.eo
+++ b/src/lib/elementary/efl_ui_image.eo
@@ -44,7 +44,7 @@ struct Efl.Ui.Image.Error
    open_error: bool;
 }
 
-class Efl.Ui.Image (Elm.Widget, Evas.Clickable_Interface, Evas.Draggable_Interface,
+class Efl.Ui.Image (Elm.Widget, Efl.Ui.Clickable, Evas.Draggable_Interface,
                  Efl.File, Efl.Image, Efl.Image.Load, Efl.Player, Efl.Gfx.View, 
                  Elm.Interface.Atspi_Image, Elm.Interface.Atspi_Widget_Action,
                  Edje.Object, Efl.Orientation, Efl.Flipable)
diff --git a/src/lib/elementary/elc_combobox.c b/src/lib/elementary/elc_combobox.c
index d955fdc909..7fdf783fb9 100644
--- a/src/lib/elementary/elc_combobox.c
+++ b/src/lib/elementary/elc_combobox.c
@@ -278,7 +278,7 @@ _elm_combobox_evas_object_smart_add(Eo *obj, Elm_Combobox_Data *sd EINA_UNUSED)
 
    elm_widget_mirrored_automatic_set(obj, EINA_FALSE);
 
-   eo_event_callback_add(obj, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _on_clicked, obj);
+   eo_event_callback_add(obj, EFL_UI_EVENT_CLICKED, _on_clicked, obj);
 
    //What are you doing here?
    elm_obj_widget_theme_apply(obj);
@@ -349,7 +349,7 @@ _mbe_item_added(void *data, const Eo_Event *event EINA_UNUSED)
 }
 
 EO_CALLBACKS_ARRAY_DEFINE(mbe_callbacks,
-       { EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _mbe_clicked_cb },
+       { EFL_UI_EVENT_CLICKED, _mbe_clicked_cb },
        { ELM_WIDGET_EVENT_FOCUSED, _mbe_focused_cb },
        { ELM_WIDGET_EVENT_UNFOCUSED, _mbe_unfocused_cb },
        { ELM_MULTIBUTTONENTRY_EVENT_ITEM_ADDED , _mbe_item_added });
@@ -443,7 +443,7 @@ _elm_combobox_eo_base_constructor(Eo *obj, Elm_Combobox_Data *sd)
    elm_object_style_set(sd->hover, buf);
 
    eo_event_callback_add
-     (sd->hover, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _on_hover_clicked, obj);
+     (sd->hover, EFL_UI_EVENT_CLICKED, _on_hover_clicked, obj);
    elm_layout_signal_callback_add
      (sd->hover, "elm,action,hide,finished", "elm", _hover_end_finished, obj);
 
@@ -563,7 +563,7 @@ _key_action_activate(Evas_Object *obj, const char *params EINA_UNUSED)
      elm_combobox_hover_begin(obj);
    else
      {
-        eo_event_callback_call(sd->genlist, EVAS_CLICKABLE_INTERFACE_EVENT_PRESSED, sd->item);
+        eo_event_callback_call(sd->genlist, EFL_UI_EVENT_PRESSED, sd->item);
         elm_entry_cursor_end_set(sd->entry);
      }
    return EINA_TRUE;
diff --git a/src/lib/elementary/elc_fileselector.c b/src/lib/elementary/elc_fileselector.c
index b15b99de16..1a088a014e 100644
--- a/src/lib/elementary/elc_fileselector.c
+++ b/src/lib/elementary/elc_fileselector.c
@@ -1877,7 +1877,7 @@ _elm_fileselector_evas_object_smart_add(Eo *obj, Elm_Fileselector_Data *priv)
    elm_object_part_content_set(bt, "icon", ic);
    elm_object_domain_translatable_text_set(bt, PACKAGE, N_("Up"));
    eo_event_callback_add
-     (bt, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _on_dir_up, obj);
+     (bt, EFL_UI_EVENT_CLICKED, _on_dir_up, obj);
 
    priv->up_button = bt;
    elm_object_style_set(priv->up_button, buf);
@@ -1891,7 +1891,7 @@ _elm_fileselector_evas_object_smart_add(Eo *obj, Elm_Fileselector_Data *priv)
    elm_object_part_content_set(bt, "icon", ic);
    elm_object_domain_translatable_text_set(bt, PACKAGE, N_("Home"));
    eo_event_callback_add
-     (bt, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _home, obj);
+     (bt, EFL_UI_EVENT_CLICKED, _home, obj);
 
    priv->home_button = bt;
    elm_object_style_set(priv->home_button, buf);
@@ -2112,8 +2112,7 @@ _elm_fileselector_buttons_ok_cancel_set(Eo *obj, Elm_Fileselector_Data *sd, Eina
         elm_widget_mirrored_automatic_set(bt, EINA_FALSE);
         elm_object_domain_translatable_text_set(bt, PACKAGE, N_("Cancel"));
 
-        eo_event_callback_add
-          (bt, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _canc, obj);
+        eo_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _canc, obj);
 
         sd->cancel_button = bt;
         elm_object_part_content_set(obj, "elm.swallow.cancel", sd->cancel_button);
@@ -2123,8 +2122,7 @@ _elm_fileselector_buttons_ok_cancel_set(Eo *obj, Elm_Fileselector_Data *sd, Eina
         elm_widget_mirrored_automatic_set(bt, EINA_FALSE);
         elm_object_domain_translatable_text_set(bt, PACKAGE, N_("OK"));
 
-        eo_event_callback_add
-          (bt, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _ok, obj);
+        eo_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _ok, obj);
 
         sd->ok_button = bt;
         elm_object_part_content_set(obj, "elm.swallow.ok", sd->ok_button);
diff --git a/src/lib/elementary/elc_fileselector_button.c b/src/lib/elementary/elc_fileselector_button.c
index 5cfdcfd314..f32a3ae14a 100644
--- a/src/lib/elementary/elc_fileselector_button.c
+++ b/src/lib/elementary/elc_fileselector_button.c
@@ -239,8 +239,7 @@ _elm_fileselector_button_evas_object_smart_add(Eo *obj, Elm_Fileselector_Button_
 
    elm_widget_mirrored_automatic_set(obj, EINA_FALSE);
 
-   eo_event_callback_add
-         (obj, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _button_clicked, priv);
+   eo_event_callback_add(obj, EFL_UI_EVENT_CLICKED, _button_clicked, priv);
 
    elm_obj_widget_theme_apply(obj);
    elm_widget_can_focus_set(obj, EINA_TRUE);
diff --git a/src/lib/elementary/elc_fileselector_entry.c b/src/lib/elementary/elc_fileselector_entry.c
index f0bdb2b456..6d680635fb 100644
--- a/src/lib/elementary/elc_fileselector_entry.c
+++ b/src/lib/elementary/elc_fileselector_entry.c
@@ -55,15 +55,15 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] =
   }
 SIG_FWD(CHANGED, ELM_FILESELECTOR_ENTRY_EVENT_CHANGED)
 SIG_FWD(PRESS, ELM_FILESELECTOR_ENTRY_EVENT_PRESS)
-SIG_FWD(LONGPRESSED, EVAS_CLICKABLE_INTERFACE_EVENT_LONGPRESSED)
-SIG_FWD(CLICKED, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED)
-SIG_FWD(CLICKED_DOUBLE, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED_DOUBLE)
+SIG_FWD(LONGPRESSED, EFL_UI_EVENT_LONGPRESSED)
+SIG_FWD(CLICKED, EFL_UI_EVENT_CLICKED)
+SIG_FWD(CLICKED_DOUBLE, EFL_UI_EVENT_CLICKED_DOUBLE)
 SIG_FWD(FOCUSED, ELM_WIDGET_EVENT_FOCUSED)
 SIG_FWD(UNFOCUSED, ELM_WIDGET_EVENT_UNFOCUSED)
 SIG_FWD(SELECTION_PASTE, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTION_PASTE)
 SIG_FWD(SELECTION_COPY, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTION_COPY)
 SIG_FWD(SELECTION_CUT, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTION_CUT)
-SIG_FWD(UNPRESSED, EVAS_CLICKABLE_INTERFACE_EVENT_UNPRESSED)
+SIG_FWD(UNPRESSED, EFL_UI_EVENT_UNPRESSED)
 #undef SIG_FWD
 
 static void
@@ -332,8 +332,8 @@ _elm_fileselector_entry_evas_object_smart_add(Eo *obj, Elm_Fileselector_Entry_Da
 
 #define SIG_FWD(name, event) \
   eo_event_callback_add(priv->button, event, _##name##_fwd, obj)
-   SIG_FWD(CLICKED, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED);
-   SIG_FWD(UNPRESSED, EVAS_CLICKABLE_INTERFACE_EVENT_UNPRESSED);
+   SIG_FWD(CLICKED, EFL_UI_EVENT_CLICKED);
+   SIG_FWD(UNPRESSED, EFL_UI_EVENT_UNPRESSED);
    // EVENTS: should not call legacy
    //SIG_FWD(FILE_CHOSEN, ELM_FILESELECTOR_BUTTON_EVENT_FILE_CHOSEN);
 #undef SIG_FWD
@@ -352,9 +352,9 @@ _elm_fileselector_entry_evas_object_smart_add(Eo *obj, Elm_Fileselector_Entry_Da
    SIG_FWD(CHANGED, ELM_ENTRY_EVENT_CHANGED);
    SIG_FWD(ACTIVATED, ELM_ENTRY_EVENT_ACTIVATED);
    SIG_FWD(PRESS, ELM_ENTRY_EVENT_PRESS);
-   SIG_FWD(LONGPRESSED, EVAS_CLICKABLE_INTERFACE_EVENT_LONGPRESSED);
-   SIG_FWD(CLICKED, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED);
-   SIG_FWD(CLICKED_DOUBLE, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED_DOUBLE);
+   SIG_FWD(LONGPRESSED, EFL_UI_EVENT_LONGPRESSED);
+   SIG_FWD(CLICKED, EFL_UI_EVENT_CLICKED);
+   SIG_FWD(CLICKED_DOUBLE, EFL_UI_EVENT_CLICKED_DOUBLE);
    SIG_FWD(FOCUSED, ELM_WIDGET_EVENT_FOCUSED);
    SIG_FWD(UNFOCUSED, ELM_WIDGET_EVENT_UNFOCUSED);
    SIG_FWD(SELECTION_PASTE, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTION_PASTE);
diff --git a/src/lib/elementary/elc_hoversel.c b/src/lib/elementary/elc_hoversel.c
index 915b965ca2..8e851c189d 100644
--- a/src/lib/elementary/elc_hoversel.c
+++ b/src/lib/elementary/elc_hoversel.c
@@ -411,7 +411,7 @@ _activate(Evas_Object *obj)
    elm_object_style_set(sd->hover, buf);
 
    eo_event_callback_add
-     (sd->hover, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _on_hover_clicked, obj);
+     (sd->hover, EFL_UI_EVENT_CLICKED, _on_hover_clicked, obj);
    elm_layout_signal_callback_add
      (sd->hover, "elm,action,hide,finished", "elm", _hover_end_finished, obj);
    elm_hover_target_set(sd->hover, obj);
@@ -566,7 +566,7 @@ _elm_hoversel_evas_object_smart_add(Eo *obj, Elm_Hoversel_Data *priv)
    evas_obj_smart_add(eo_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
-   eo_event_callback_add(obj, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _on_clicked, obj);
+   eo_event_callback_add(obj, EFL_UI_EVENT_CLICKED, _on_clicked, obj);
 
    //What are you doing here?
    elm_obj_widget_theme_apply(obj);
@@ -800,7 +800,7 @@ _elm_hoversel_item_add(Eo *obj, Elm_Hoversel_Data *sd, const char *label, const
 
     evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
     evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
-    eo_event_callback_add(bt, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _on_item_clicked, item);
+    eo_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _on_item_clicked, item);
     eo_event_callback_add(bt, ELM_WIDGET_EVENT_FOCUSED, _item_focused_cb, item);
     eo_event_callback_add(bt, ELM_WIDGET_EVENT_UNFOCUSED, _item_unfocused_cb, item);
 
diff --git a/src/lib/elementary/elc_multibuttonentry.c b/src/lib/elementary/elc_multibuttonentry.c
index 6679f7b8be..5210a09d66 100644
--- a/src/lib/elementary/elc_multibuttonentry.c
+++ b/src/lib/elementary/elc_multibuttonentry.c
@@ -58,7 +58,7 @@ EO_CALLBACKS_ARRAY_DEFINE(_multi_buttonentry_cb,
    { ELM_MULTIBUTTONENTRY_EVENT_CHANGED, _entry_changed_cb },
    { ELM_WIDGET_EVENT_FOCUSED, _entry_focus_in_cb },
    { ELM_WIDGET_EVENT_UNFOCUSED, _entry_focus_out_cb },
-   { EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _entry_clicked_cb }
+   { EFL_UI_EVENT_CLICKED, _entry_clicked_cb }
 );
 
 EOLIAN static Eina_Bool
@@ -969,7 +969,7 @@ _mouse_clicked_signal_cb(void *data EINA_UNUSED,
                          const char *emission EINA_UNUSED,
                          const char *source EINA_UNUSED)
 {
-   eo_event_callback_call(obj, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL);
+   eo_event_callback_call(obj, EFL_UI_EVENT_CLICKED, NULL);
 }
 
 static void
diff --git a/src/lib/elementary/elc_naviframe.c b/src/lib/elementary/elc_naviframe.c
index 3dd1bb172c..0022fb6145 100644
--- a/src/lib/elementary/elc_naviframe.c
+++ b/src/lib/elementary/elc_naviframe.c
@@ -696,7 +696,7 @@ _item_title_prev_btn_unset(Elm_Naviframe_Item_Data *it)
    evas_object_event_callback_del
      (content, EVAS_CALLBACK_DEL, _item_title_prev_btn_del_cb);
    Eo* parent = eo_parent_get(content);
-   eo_event_callback_del(content, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _on_item_back_btn_clicked, parent);
+   eo_event_callback_del(content, EFL_UI_EVENT_CLICKED, _on_item_back_btn_clicked, parent);
    it->title_prev_btn = NULL;
    if (it->auto_pushed_btn) it->auto_pushed_btn = NULL;
    return content;
@@ -960,7 +960,7 @@ _on_item_back_btn_clicked(void *data, const Eo_Event *event)
       multiple times on some heavy environment. This callback del will
       prevent those scenario and guarantee only one clicked for it's own
       page. */
-   eo_event_callback_del(event->object, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _on_item_back_btn_clicked, data);
+   eo_event_callback_del(event->object, EFL_UI_EVENT_CLICKED, _on_item_back_btn_clicked, data);
    elm_naviframe_item_pop(data);
 
    return EINA_TRUE;
@@ -976,7 +976,7 @@ _back_btn_new(Evas_Object *obj, const char *title_label)
 
    if (!btn) return NULL;
    eo_event_callback_add
-         (btn, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _on_item_back_btn_clicked, obj);
+         (btn, EFL_UI_EVENT_CLICKED, _on_item_back_btn_clicked, obj);
    snprintf
      (buf, sizeof(buf), "naviframe/back_btn/%s", elm_widget_style_get(obj));
    elm_object_style_set(btn, buf);
@@ -1494,7 +1494,7 @@ _key_action_top_item_get(Evas_Object *obj, const char *params EINA_UNUSED)
    ///Leave for compatibility.
    ELM_NAVIFRAME_ITEM_DATA_GET(eo_item, it);
    if (it->title_prev_btn)
-     eo_event_callback_call(it->title_prev_btn, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL);
+     eo_event_callback_call(it->title_prev_btn, EFL_UI_EVENT_CLICKED, NULL);
 
    return EINA_TRUE;
 }
@@ -1730,7 +1730,7 @@ _elm_naviframe_item_pop(Eo *obj, Elm_Naviframe_Data *sd)
                      callback of the auto pushed button should be restored. */
                   if (it->auto_pushed_btn)
                     eo_event_callback_add
-                          (it->auto_pushed_btn, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _on_item_back_btn_clicked, obj);
+                          (it->auto_pushed_btn, EFL_UI_EVENT_CLICKED, _on_item_back_btn_clicked, obj);
                   it->popping = EINA_FALSE;
                }
              evas_object_unref(obj);
diff --git a/src/lib/elementary/elc_player.c b/src/lib/elementary/elc_player.c
index 16e3dfc2bc..cf0adbf536 100644
--- a/src/lib/elementary/elc_player.c
+++ b/src/lib/elementary/elc_player.c
@@ -535,7 +535,7 @@ _player_button_add(Evas_Object *obj,
             elm_widget_style_get(obj));
    elm_object_style_set(bt, buf);
    eo_event_callback_add
-            (bt, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, func, obj);
+            (bt, EFL_UI_EVENT_CLICKED, func, obj);
    snprintf(buf, sizeof(buf), "elm.swallow.media_player.%s", name);
    if (!elm_layout_content_set(obj, buf, bt))
      {
diff --git a/src/lib/elementary/elm_bubble.c b/src/lib/elementary/elm_bubble.c
index b3e4dbd339..659e9c6330 100644
--- a/src/lib/elementary/elm_bubble.c
+++ b/src/lib/elementary/elm_bubble.c
@@ -71,7 +71,7 @@ _on_mouse_up(void *data,
    if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD)
      return;
 
-   eo_event_callback_call(data, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL);
+   eo_event_callback_call(data, EFL_UI_EVENT_CLICKED, NULL);
 }
 
 /* overriding layout's focus_next() in order to just cycle through the
diff --git a/src/lib/elementary/elm_bubble.eo b/src/lib/elementary/elm_bubble.eo
index 22b02620bd..1b2b307fb3 100644
--- a/src/lib/elementary/elm_bubble.eo
+++ b/src/lib/elementary/elm_bubble.eo
@@ -12,7 +12,7 @@ enum Elm.Bubble.Pos
   bottom_right [[The arrow of the bubble points to the bottom right corner.]]
 }
 
-class Elm.Bubble (Elm.Layout, Evas.Clickable_Interface)
+class Elm.Bubble (Elm.Layout, Efl.Ui.Clickable)
 {
    [[Speech bubble widget used in messaging applications]]
 
diff --git a/src/lib/elementary/elm_button.c b/src/lib/elementary/elm_button.c
index 24334b6a20..39f863ec1b 100644
--- a/src/lib/elementary/elm_button.c
+++ b/src/lib/elementary/elm_button.c
@@ -70,7 +70,7 @@ _activate(Evas_Object *obj)
         if (!elm_widget_disabled_get(obj) &&
             !evas_object_freeze_events_get(obj))
           eo_event_callback_call
-            (obj, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL);
+            (obj, EFL_UI_EVENT_CLICKED, NULL);
      }
 }
 
@@ -94,7 +94,7 @@ _elm_button_elm_widget_activate(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED, Elm_A
    if (evas_object_freeze_events_get(obj)) return EINA_FALSE;
 
    eo_event_callback_call
-     (obj, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL);
+     (obj, EFL_UI_EVENT_CLICKED, NULL);
    elm_layout_signal_emit(obj, "elm,anim,activate", "elm");
 
    return EINA_TRUE;
@@ -202,7 +202,7 @@ _autorepeat_send(void *data)
    ELM_BUTTON_DATA_GET_OR_RETURN_VAL(data, sd, ECORE_CALLBACK_CANCEL);
 
    eo_event_callback_call
-     (data, EVAS_CLICKABLE_INTERFACE_EVENT_REPEATED, NULL);
+     (data, EFL_UI_EVENT_REPEATED, NULL);
    if (!sd->repeating)
      {
         sd->timer = NULL;
@@ -243,7 +243,7 @@ _on_pressed_signal(void *data,
      }
 
    eo_event_callback_call
-     (data, EVAS_CLICKABLE_INTERFACE_EVENT_PRESSED, NULL);
+     (data, EFL_UI_EVENT_PRESSED, NULL);
 }
 
 static void
@@ -257,7 +257,7 @@ _on_unpressed_signal(void *data,
    ELM_SAFE_FREE(sd->timer, ecore_timer_del);
    sd->repeating = EINA_FALSE;
    eo_event_callback_call
-     (data, EVAS_CLICKABLE_INTERFACE_EVENT_UNPRESSED, NULL);
+     (data, EFL_UI_EVENT_UNPRESSED, NULL);
 }
 
 static char *
diff --git a/src/lib/elementary/elm_button.eo b/src/lib/elementary/elm_button.eo
index a4c3fc265e..51251c4541 100644
--- a/src/lib/elementary/elm_button.eo
+++ b/src/lib/elementary/elm_button.eo
@@ -1,4 +1,4 @@
-class Elm.Button (Elm.Layout, Evas.Clickable_Interface,
+class Elm.Button (Elm.Layout, Efl.Ui.Clickable,
                   Elm.Interface.Atspi_Widget_Action)
 {
    [[Push-button widget
diff --git a/src/lib/elementary/elm_color_class.c b/src/lib/elementary/elm_color_class.c
index 41bd65ea0c..b49dcab348 100644
--- a/src/lib/elementary/elm_color_class.c
+++ b/src/lib/elementary/elm_color_class.c
@@ -744,7 +744,7 @@ elm_color_class_editor_add(Evas_Object *obj)
    elm_object_text_set(bt, "Reset");
    elm_object_part_content_set(ly, "elm.swallow.reset", bt);
    eo_event_callback_add
-     (bt, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _colorclass_reset, cc);
+     (bt, EFL_UI_EVENT_CLICKED, _colorclass_reset, cc);
 
    cc->cs = cs = elm_colorselector_add(ly);
    elm_colorselector_mode_set(cs, ELM_COLORSELECTOR_COMPONENTS);
diff --git a/src/lib/elementary/elm_colorselector.c b/src/lib/elementary/elm_colorselector.c
index 3ec5277bd8..61190c5d71 100644
--- a/src/lib/elementary/elm_colorselector.c
+++ b/src/lib/elementary/elm_colorselector.c
@@ -897,7 +897,7 @@ _create_colorpicker(Evas_Object *obj)
         elm_object_style_set(sd->button, style);
         elm_object_text_set(sd->button, E_("Pick a color"));
         eo_event_callback_add
-              (sd->button, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _start_grab_pick_cb, obj);
+              (sd->button, EFL_UI_EVENT_CLICKED, _start_grab_pick_cb, obj);
         elm_box_pack_end(bx, sd->button);
         evas_object_show(sd->button);
      }
@@ -1246,14 +1246,14 @@ _color_bars_add(Evas_Object *obj)
         edje_object_part_swallow
           (sd->cb_data[i]->colorbar, "elm.l_button", sd->cb_data[i]->lbt);
         eo_event_callback_add
-          (sd->cb_data[i]->lbt, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _button_clicked_cb, sd->cb_data[i]);
+          (sd->cb_data[i]->lbt, EFL_UI_EVENT_CLICKED, _button_clicked_cb, sd->cb_data[i]);
         elm_button_autorepeat_set(sd->cb_data[i]->lbt, EINA_TRUE);
         elm_button_autorepeat_initial_timeout_set
           (sd->cb_data[i]->lbt, _elm_config->longpress_timeout);
         elm_button_autorepeat_gap_timeout_set
           (sd->cb_data[i]->lbt, (1.0 / _elm_config->fps));
         eo_event_callback_add
-          (sd->cb_data[i]->lbt, EVAS_CLICKABLE_INTERFACE_EVENT_REPEATED, _button_repeat_cb, sd->cb_data[i]);
+          (sd->cb_data[i]->lbt, EFL_UI_EVENT_REPEATED, _button_repeat_cb, sd->cb_data[i]);
 
         /* load right button */
         if (!sd->cb_data[i]->rbt) sd->cb_data[i]->rbt = elm_button_add(sd->col_bars_area);
@@ -1264,14 +1264,14 @@ _color_bars_add(Evas_Object *obj)
         edje_object_part_swallow
           (sd->cb_data[i]->colorbar, "elm.r_button", sd->cb_data[i]->rbt);
         eo_event_callback_add
-          (sd->cb_data[i]->rbt, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _button_clicked_cb, sd->cb_data[i]);
+          (sd->cb_data[i]->rbt, EFL_UI_EVENT_CLICKED, _button_clicked_cb, sd->cb_data[i]);
         elm_button_autorepeat_set(sd->cb_data[i]->rbt, EINA_TRUE);
         elm_button_autorepeat_initial_timeout_set
           (sd->cb_data[i]->rbt, _elm_config->longpress_timeout);
         elm_button_autorepeat_gap_timeout_set
           (sd->cb_data[i]->rbt, (1.0 / _elm_config->fps));
         eo_event_callback_add
-          (sd->cb_data[i]->rbt, EVAS_CLICKABLE_INTERFACE_EVENT_REPEATED, _button_repeat_cb, sd->cb_data[i]);
+          (sd->cb_data[i]->rbt, EFL_UI_EVENT_REPEATED, _button_repeat_cb, sd->cb_data[i]);
      }
 }
 
diff --git a/src/lib/elementary/elm_colorselector.eo b/src/lib/elementary/elm_colorselector.eo
index b36f083f24..12dec40bb3 100644
--- a/src/lib/elementary/elm_colorselector.eo
+++ b/src/lib/elementary/elm_colorselector.eo
@@ -13,7 +13,7 @@ enum Elm.Colorselector.Mode
 }
 
 class Elm.Colorselector (Elm.Layout, Elm.Interface.Atspi_Widget_Action,
-                         Evas.Clickable_Interface)
+                         Efl.Ui.Clickable)
 {
    legacy_prefix: elm_colorselector;
    eo_prefix: elm_obj_colorselector;
diff --git a/src/lib/elementary/elm_diskselector.c b/src/lib/elementary/elm_diskselector.c
index ed79eeb007..cbe13cb041 100644
--- a/src/lib/elementary/elm_diskselector.c
+++ b/src/lib/elementary/elm_diskselector.c
@@ -612,7 +612,7 @@ _item_click_cb(void *data,
 
    if (it->func) it->func((void *)WIDGET_ITEM_DATA_GET(eo_it), WIDGET(it), eo_it);
    eo_event_callback_call
-     (WIDGET(it), EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, eo_it);
+     (WIDGET(it), EFL_UI_EVENT_CLICKED, eo_it);
 }
 
 static char *
diff --git a/src/lib/elementary/elm_diskselector.eo b/src/lib/elementary/elm_diskselector.eo
index b60764ee38..7c37cff4ff 100644
--- a/src/lib/elementary/elm_diskselector.eo
+++ b/src/lib/elementary/elm_diskselector.eo
@@ -1,6 +1,6 @@
 class Elm.Diskselector (Elm.Widget, Elm.Interface_Scrollable,
                         Elm.Interface.Atspi_Widget_Action,
-                        Evas.Clickable_Interface, Evas.Scrollable_Interface,
+                        Efl.Ui.Clickable, Evas.Scrollable_Interface,
                         Evas.Selectable_Interface)
 {
    legacy_prefix: elm_diskselector;
diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c
index 72687c4fe4..b9f61a9f2e 100644
--- a/src/lib/elementary/elm_entry.c
+++ b/src/lib/elementary/elm_entry.c
@@ -1910,7 +1910,7 @@ _long_press_cb(void *data)
 
    sd->longpress_timer = NULL;
    eo_event_callback_call
-     (data, EVAS_CLICKABLE_INTERFACE_EVENT_LONGPRESSED, NULL);
+     (data, EFL_UI_EVENT_LONGPRESSED, NULL);
 
    return ECORE_CALLBACK_CANCEL;
 }
@@ -2526,7 +2526,7 @@ _entry_hover_anchor_clicked_do(Evas_Object *obj,
 
    eo_event_callback_call(obj, ELM_ENTRY_EVENT_ANCHOR_HOVER_OPENED, &ei);
    eo_event_callback_add
-     (sd->anchor_hover.hover, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _anchor_hover_clicked_cb, obj);
+     (sd->anchor_hover.hover, EFL_UI_EVENT_CLICKED, _anchor_hover_clicked_cb, obj);
 
    /* FIXME: Should just check if there's any callback registered to
     * the smart events instead.  This is used to determine if anyone
@@ -2651,7 +2651,7 @@ _entry_mouse_clicked_signal_cb(void *data,
                                const char *source EINA_UNUSED)
 {
    eo_event_callback_call
-     (data, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL);
+     (data, EFL_UI_EVENT_CLICKED, NULL);
 }
 
 static void
@@ -2661,7 +2661,7 @@ _entry_mouse_double_signal_cb(void *data,
                               const char *source EINA_UNUSED)
 {
    eo_event_callback_call
-     (data, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED_DOUBLE, NULL);
+     (data, EFL_UI_EVENT_CLICKED_DOUBLE, NULL);
 }
 
 static void
@@ -2671,7 +2671,7 @@ _entry_mouse_triple_signal_cb(void *data,
                               const char *source EINA_UNUSED)
 {
    eo_event_callback_call
-     (data, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED_TRIPLE, NULL);
+     (data, EFL_UI_EVENT_CLICKED_TRIPLE, NULL);
 }
 
 static Evas_Object *
@@ -5313,7 +5313,7 @@ _elm_entry_elm_widget_activate(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, Elm_Act
        !evas_object_freeze_events_get(obj))
      {
         eo_event_callback_call
-          (obj, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL);
+          (obj, EFL_UI_EVENT_CLICKED, NULL);
         if (sd->editable && sd->input_panel_enable)
           edje_object_part_text_input_panel_show(sd->entry_edje, "elm.text");
      }
diff --git a/src/lib/elementary/elm_entry.eo b/src/lib/elementary/elm_entry.eo
index f7ab96f542..a9dc70643b 100644
--- a/src/lib/elementary/elm_entry.eo
+++ b/src/lib/elementary/elm_entry.eo
@@ -114,7 +114,7 @@ enum Elm.Cnp_Mode
    plaintext, [[ copy & paste text without markup tag ]]
 }
 
-class Elm.Entry (Elm.Layout, Elm.Interface_Scrollable, Evas.Clickable_Interface,
+class Elm.Entry (Elm.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable,
                  Elm.Interface.Atspi.Text, Elm.Interface.Atspi.Text.Editable, Efl.File,
                  Evas.Selectable_Interface, Evas.Scrollable_Interface)
 {
diff --git a/src/lib/elementary/elm_fileselector.eo b/src/lib/elementary/elm_fileselector.eo
index 5d111b377a..c668148ba5 100644
--- a/src/lib/elementary/elm_fileselector.eo
+++ b/src/lib/elementary/elm_fileselector.eo
@@ -1,6 +1,6 @@
 class Elm.Fileselector (Elm.Layout, Elm.Interface.Fileselector,
                         Elm.Interface.Atspi_Widget_Action,
-                        Evas.Clickable_Interface, Evas.Selectable_Interface)
+                        Efl.Ui.Clickable, Evas.Selectable_Interface)
 {
    legacy_prefix: elm_fileselector;
    eo_prefix: elm_obj_fileselector;
diff --git a/src/lib/elementary/elm_fileselector_entry.eo b/src/lib/elementary/elm_fileselector_entry.eo
index a1561b8dd6..4f61088d6b 100644
--- a/src/lib/elementary/elm_fileselector_entry.eo
+++ b/src/lib/elementary/elm_fileselector_entry.eo
@@ -1,5 +1,5 @@
 class Elm.Fileselector_Entry (Elm.Layout, Elm.Interface.Fileselector,
-                              Evas.Clickable_Interface, Evas.Selectable_Interface)
+                              Efl.Ui.Clickable, Evas.Selectable_Interface)
 {
    [[Not an EO API.]]
    event_prefix: elm_fileselector_entry;
diff --git a/src/lib/elementary/elm_frame.c b/src/lib/elementary/elm_frame.c
index 3d38ae90a1..80dfbcea8d 100644
--- a/src/lib/elementary/elm_frame.c
+++ b/src/lib/elementary/elm_frame.c
@@ -140,7 +140,7 @@ _on_frame_clicked(void *data,
         sd->anim = EINA_TRUE;
      }
    eo_event_callback_call
-     (data, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL);
+     (data, EFL_UI_EVENT_CLICKED, NULL);
 }
 
 /* using deferred sizing evaluation, just like the parent */
diff --git a/src/lib/elementary/elm_frame.eo b/src/lib/elementary/elm_frame.eo
index 714cf124fe..d08fb7e408 100644
--- a/src/lib/elementary/elm_frame.eo
+++ b/src/lib/elementary/elm_frame.eo
@@ -1,4 +1,4 @@
-class Elm.Frame (Elm.Layout, Evas.Clickable_Interface)
+class Elm.Frame (Elm.Layout, Efl.Ui.Clickable)
 {
    legacy_prefix: elm_frame;
    eo_prefix: elm_obj_frame;
diff --git a/src/lib/elementary/elm_gengrid.c b/src/lib/elementary/elm_gengrid.c
index ef49a484e7..49ea633e4e 100644
--- a/src/lib/elementary/elm_gengrid.c
+++ b/src/lib/elementary/elm_gengrid.c
@@ -680,7 +680,7 @@ _long_press_cb(void *data)
      return ECORE_CALLBACK_CANCEL;
    sd->longpressed = EINA_TRUE;
    eo_event_callback_call
-     (WIDGET(it), EVAS_CLICKABLE_INTERFACE_EVENT_LONGPRESSED, EO_OBJ(it));
+     (WIDGET(it), EFL_UI_EVENT_LONGPRESSED, EO_OBJ(it));
 
    if (sd->reorder_mode)
      {
@@ -776,11 +776,11 @@ _item_mouse_down_cb(void *data,
    it->highlight_cb(it);
    if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK)
      {
-        eo_event_callback_call(WIDGET(it), EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED_DOUBLE, EO_OBJ(it));
+        eo_event_callback_call(WIDGET(it), EFL_UI_EVENT_CLICKED_DOUBLE, EO_OBJ(it));
         eo_event_callback_call(WIDGET(it), ELM_GENGRID_EVENT_ACTIVATED, EO_OBJ(it));
      }
 
-   eo_event_callback_call(WIDGET(it), EVAS_CLICKABLE_INTERFACE_EVENT_PRESSED, EO_OBJ(it));
+   eo_event_callback_call(WIDGET(it), EFL_UI_EVENT_PRESSED, EO_OBJ(it));
    ELM_SAFE_FREE(it->long_timer, ecore_timer_del);
    if (it->realized)
      it->long_timer = ecore_timer_add
@@ -1041,7 +1041,7 @@ _item_mouse_up_cb(void *data,
         if (dy < 0) dy = -dy;
         if ((dx < 5) && (dy < 5))
           eo_event_callback_call
-            (WIDGET(it), EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED_RIGHT, EO_OBJ(it));
+            (WIDGET(it), EFL_UI_EVENT_CLICKED_RIGHT, EO_OBJ(it));
         return;
      }
 
diff --git a/src/lib/elementary/elm_gengrid.eo b/src/lib/elementary/elm_gengrid.eo
index e3fae4b58f..fd4df55fd4 100644
--- a/src/lib/elementary/elm_gengrid.eo
+++ b/src/lib/elementary/elm_gengrid.eo
@@ -8,7 +8,7 @@ enum Elm.Gengrid.Reorder_Type
 }
 
 class Elm.Gengrid (Elm.Layout, Elm.Interface_Scrollable,
-                   Evas.Clickable_Interface, Elm.Interface.Atspi_Widget_Action,
+                   Efl.Ui.Clickable, Elm.Interface.Atspi_Widget_Action,
                    Elm.Interface.Atspi.Selection)
 {
    legacy_prefix: elm_gengrid;
diff --git a/src/lib/elementary/elm_genlist.c b/src/lib/elementary/elm_genlist.c
index 998f18f2bc..c77dcec13a 100644
--- a/src/lib/elementary/elm_genlist.c
+++ b/src/lib/elementary/elm_genlist.c
@@ -3984,7 +3984,7 @@ _long_press_cb(void *data)
 
    sd->longpressed = EINA_TRUE;
    eo_event_callback_call
-         (WIDGET(it), EVAS_CLICKABLE_INTERFACE_EVENT_LONGPRESSED, EO_OBJ(it));
+         (WIDGET(it), EFL_UI_EVENT_LONGPRESSED, EO_OBJ(it));
    if ((sd->reorder_mode) && !(GL_IT(it)->type & ELM_GENLIST_ITEM_GROUP))
      {
         sd->reorder_it = it;
@@ -4268,12 +4268,12 @@ _item_mouse_down_cb(void *data,
    if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK)
      {
         eo_event_callback_call
-              (WIDGET(it), EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED_DOUBLE, eo_it);
+              (WIDGET(it), EFL_UI_EVENT_CLICKED_DOUBLE, eo_it);
         eo_event_callback_call
               (WIDGET(it), ELM_GENLIST_EVENT_ACTIVATED, eo_it);
      }
    eo_event_callback_call
-         (WIDGET(it), EVAS_CLICKABLE_INTERFACE_EVENT_PRESSED, eo_it);
+         (WIDGET(it), EFL_UI_EVENT_PRESSED, eo_it);
 }
 
 static Item_Block *
@@ -4852,7 +4852,7 @@ _item_mouse_up_cb(void *data,
         if (dy < 0) dy = -dy;
         if ((dx < 5) && (dy < 5))
           eo_event_callback_call
-                (WIDGET(it), EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED_RIGHT, EO_OBJ(it));
+                (WIDGET(it), EFL_UI_EVENT_CLICKED_RIGHT, EO_OBJ(it));
         return;
      }
 
diff --git a/src/lib/elementary/elm_genlist.eo b/src/lib/elementary/elm_genlist.eo
index 67c65ddc46..dd5f2b423e 100644
--- a/src/lib/elementary/elm_genlist.eo
+++ b/src/lib/elementary/elm_genlist.eo
@@ -2,7 +2,7 @@ import elm_general;
 import elm_list;
 import elm_genlist_item;
 
-class Elm.Genlist (Elm.Layout, Elm.Interface_Scrollable, Evas.Clickable_Interface,
+class Elm.Genlist (Elm.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable,
                    Elm.Interface.Atspi_Widget_Action, Elm.Interface.Atspi.Selection,
                    Evas.Selectable_Interface)
 {
diff --git a/src/lib/elementary/elm_hover.c b/src/lib/elementary/elm_hover.c
index f5f43ee43d..9b9d610f4c 100644
--- a/src/lib/elementary/elm_hover.c
+++ b/src/lib/elementary/elm_hover.c
@@ -552,13 +552,13 @@ _hov_dismiss_cb(void *data,
      {
         _hide_signals_emit(data);
         eo_event_callback_call
-          (data, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL);
+          (data, EFL_UI_EVENT_CLICKED, NULL);
      }
    else
      {
         evas_object_hide(data);
         eo_event_callback_call
-          (data, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL);
+          (data, EFL_UI_EVENT_CLICKED, NULL);
         eo_event_callback_call(data, ELM_HOVER_EVENT_DISMISSED, NULL);
      } // for backward compatibility
 }
@@ -603,7 +603,7 @@ _elm_hover_evas_object_smart_del(Eo *obj, Elm_Hover_Data *sd)
    if (evas_object_visible_get(obj))
      {
         eo_event_callback_call
-          (obj, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL);
+          (obj, EFL_UI_EVENT_CLICKED, NULL);
         eo_event_callback_call(obj, ELM_HOVER_EVENT_DISMISSED, NULL);
      }
 
diff --git a/src/lib/elementary/elm_hover.eo b/src/lib/elementary/elm_hover.eo
index 9abec305d2..64fa0850a4 100644
--- a/src/lib/elementary/elm_hover.eo
+++ b/src/lib/elementary/elm_hover.eo
@@ -7,7 +7,7 @@ enum Elm.Hover.Axis
    both [[ELM_HOVER_AXIS_BOTH -- both.]]
 }
 
-class Elm.Hover (Elm.Layout, Evas.Clickable_Interface, Elm.Interface.Atspi_Widget_Action)
+class Elm.Hover (Elm.Layout, Efl.Ui.Clickable, Elm.Interface.Atspi_Widget_Action)
 {
    legacy_prefix: elm_hover;
    eo_prefix: elm_obj_hover;
diff --git a/src/lib/elementary/elm_hoversel.eo b/src/lib/elementary/elm_hoversel.eo
index 0eb2c7b94e..d8a02e9426 100644
--- a/src/lib/elementary/elm_hoversel.eo
+++ b/src/lib/elementary/elm_hoversel.eo
@@ -1,6 +1,6 @@
 import elm_icon;
 class Elm.Hoversel (Elm.Button, Evas.Selectable_Interface,
-                    Evas.Clickable_Interface,
+                    Efl.Ui.Clickable,
                     Elm.Interface.Atspi_Widget_Action)
 {
    legacy_prefix: elm_hoversel;
diff --git a/src/lib/elementary/elm_index.c b/src/lib/elementary/elm_index.c
index f7a4ab2e76..c35282ecc3 100644
--- a/src/lib/elementary/elm_index.c
+++ b/src/lib/elementary/elm_index.c
@@ -856,7 +856,7 @@ _on_mouse_up(void *data,
    if (eo_item)
      {
         eo_event_callback_call
-          (data, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, eo_item);
+          (data, EFL_UI_EVENT_CLICKED, eo_item);
         eo_event_callback_call
           (data, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, eo_item);
         eo_id_item = eo_item;
diff --git a/src/lib/elementary/elm_index.eo b/src/lib/elementary/elm_index.eo
index 236f4f82d2..2ae62d9b46 100644
--- a/src/lib/elementary/elm_index.eo
+++ b/src/lib/elementary/elm_index.eo
@@ -1,5 +1,5 @@
 class Elm.Index (Elm.Layout, Efl.Orientation,
-                 Evas.Clickable_Interface, Evas.Selectable_Interface)
+                 Efl.Ui.Clickable, Evas.Selectable_Interface)
 {
    legacy_prefix: elm_index;
    eo_prefix: elm_obj_index;
diff --git a/src/lib/elementary/elm_list.c b/src/lib/elementary/elm_list.c
index 506ddded3c..2629710072 100644
--- a/src/lib/elementary/elm_list.c
+++ b/src/lib/elementary/elm_list.c
@@ -1549,7 +1549,7 @@ _long_press_cb(void *data)
 
    sd->longpressed = EINA_TRUE;
    eo_event_callback_call
-     (WIDGET(it), EVAS_CLICKABLE_INTERFACE_EVENT_LONGPRESSED, EO_OBJ(it));
+     (WIDGET(it), EFL_UI_EVENT_LONGPRESSED, EO_OBJ(it));
 
 end:
    return ECORE_CALLBACK_CANCEL;
@@ -1700,7 +1700,7 @@ _mouse_down_cb(void *data,
    if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK)
      {
         eo_event_callback_call
-          (WIDGET(it), EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED_DOUBLE, EO_OBJ(it));
+          (WIDGET(it), EFL_UI_EVENT_CLICKED_DOUBLE, EO_OBJ(it));
         eo_event_callback_call
           (WIDGET(it), ELM_LIST_EVENT_ACTIVATED, EO_OBJ(it));
      }
@@ -1736,7 +1736,7 @@ _mouse_up_cb(void *data,
         if (dy < 0) dy = -dy;
         if ((dx < 5) && (dy < 5))
           eo_event_callback_call
-            (obj, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED_RIGHT, EO_OBJ(it));
+            (obj, EFL_UI_EVENT_CLICKED_RIGHT, EO_OBJ(it));
         return;
      }
 
diff --git a/src/lib/elementary/elm_list.eo b/src/lib/elementary/elm_list.eo
index 2f3215cdd6..0bf9d032fe 100644
--- a/src/lib/elementary/elm_list.eo
+++ b/src/lib/elementary/elm_list.eo
@@ -38,7 +38,7 @@ enum Elm.List.Mode
 
 class Elm.List (Elm.Layout, Elm.Interface_Scrollable,
                 Elm.Interface.Atspi_Widget_Action, Elm.Interface.Atspi.Selection,
-                Evas.Clickable_Interface, Evas.Selectable_Interface)
+                Efl.Ui.Clickable, Evas.Selectable_Interface)
 {
    legacy_prefix: elm_list;
    eo_prefix: elm_obj_list;
diff --git a/src/lib/elementary/elm_map.c b/src/lib/elementary/elm_map.c
index 231cf45c3f..91f8d9839b 100644
--- a/src/lib/elementary/elm_map.c
+++ b/src/lib/elementary/elm_map.c
@@ -1332,7 +1332,7 @@ _long_press_cb(void *data)
 
    sd->long_timer = NULL;
    eo_event_callback_call
-     (sd->obj, EVAS_CLICKABLE_INTERFACE_EVENT_LONGPRESSED, &sd->ev);
+     (sd->obj, EFL_UI_EVENT_LONGPRESSED, &sd->ev);
 
    return ECORE_CALLBACK_CANCEL;
 }
@@ -1352,7 +1352,7 @@ _mouse_down_cb(void *data,
 
    if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK)
      eo_event_callback_call
-       (sd->obj, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED_DOUBLE, ev);
+       (sd->obj, EFL_UI_EVENT_CLICKED_DOUBLE, ev);
    else
      eo_event_callback_call
        (sd->obj, ELM_MAP_EVENT_PRESS, ev);
@@ -1383,7 +1383,7 @@ _mouse_up_cb(void *data,
 
    if (!sd->on_hold)
    eo_event_callback_call
-     (sd->obj, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, ev);
+     (sd->obj, EFL_UI_EVENT_CLICKED, ev);
    sd->on_hold = EINA_FALSE;
 }
 
diff --git a/src/lib/elementary/elm_map.eo b/src/lib/elementary/elm_map.eo
index 20d3253ea8..eae739e836 100644
--- a/src/lib/elementary/elm_map.eo
+++ b/src/lib/elementary/elm_map.eo
@@ -71,7 +71,7 @@ enum Elm.Map.Route_Method
 
 class Elm.Map (Elm.Widget, Elm.Interface_Scrollable,
                Elm.Interface.Atspi_Widget_Action,
-               Evas.Clickable_Interface)
+               Efl.Ui.Clickable)
 {
    legacy_prefix: elm_map;
    eo_prefix: elm_obj_map;
diff --git a/src/lib/elementary/elm_menu.c b/src/lib/elementary/elm_menu.c
index b2f3346011..b05196def1 100644
--- a/src/lib/elementary/elm_menu.c
+++ b/src/lib/elementary/elm_menu.c
@@ -428,7 +428,7 @@ _hover_dismissed_cb(void *data, const Eo_Event *event)
 {
    _menu_hide(data, event->object, event->info);
    eo_event_callback_call
-     (data, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL);
+     (data, EFL_UI_EVENT_CLICKED, NULL);
    eo_event_callback_call(data, ELM_MENU_EVENT_DISMISSED, NULL);
 
    return EINA_TRUE;
@@ -763,13 +763,13 @@ _elm_menu_menu_bar_set(Eo *obj, Eina_Bool menu_bar)
         if (menu_bar)
           {
              eo_event_callback_add
-               (item->submenu.hv, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _hover_dismissed_cb, WIDGET(item));
+               (item->submenu.hv, EFL_UI_EVENT_CLICKED, _hover_dismissed_cb, WIDGET(item));
              snprintf(style, sizeof(style), "main_menu_submenu//%s", elm_widget_style_get(obj));
              elm_object_style_set(item->submenu.hv, style);
           }
         else
           {
-             eo_event_callback_del(item->submenu.hv, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _hover_dismissed_cb, WIDGET(item));
+             eo_event_callback_del(item->submenu.hv, EFL_UI_EVENT_CLICKED, _hover_dismissed_cb, WIDGET(item));
              snprintf(style, sizeof(style), "submenu/%s", elm_widget_style_get(obj));
              elm_object_style_set(item->submenu.hv, style);
           }
diff --git a/src/lib/elementary/elm_menu.eo b/src/lib/elementary/elm_menu.eo
index 60a570e7a2..d2a6688b4d 100644
--- a/src/lib/elementary/elm_menu.eo
+++ b/src/lib/elementary/elm_menu.eo
@@ -1,4 +1,4 @@
-class Elm.Menu (Elm.Widget, Evas.Clickable_Interface, Elm.Interface.Atspi.Selection)
+class Elm.Menu (Elm.Widget, Efl.Ui.Clickable, Elm.Interface.Atspi.Selection)
 {
    legacy_prefix: elm_menu;
    eo_prefix: elm_obj_menu;
diff --git a/src/lib/elementary/elm_panes.c b/src/lib/elementary/elm_panes.c
index 1c322235ff..ecfa856290 100644
--- a/src/lib/elementary/elm_panes.c
+++ b/src/lib/elementary/elm_panes.c
@@ -141,7 +141,7 @@ _on_clicked(void *data,
             const char *emission EINA_UNUSED,
             const char *source EINA_UNUSED)
 {
-   eo_event_callback_call(data, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL);
+   eo_event_callback_call(data, EFL_UI_EVENT_CLICKED, NULL);
 }
 
 static void
@@ -175,7 +175,7 @@ _on_unpressed(void *data,
 
    if (sd->double_clicked)
      {
-        eo_event_callback_call(data, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED_DOUBLE, NULL);
+        eo_event_callback_call(data, EFL_UI_EVENT_CLICKED_DOUBLE, NULL);
         sd->double_clicked = EINA_FALSE;
      }
 }
diff --git a/src/lib/elementary/elm_panes.eo b/src/lib/elementary/elm_panes.eo
index b245c49063..3e4b88e741 100644
--- a/src/lib/elementary/elm_panes.eo
+++ b/src/lib/elementary/elm_panes.eo
@@ -1,5 +1,5 @@
 class Elm.Panes (Elm.Layout, Efl.Orientation,
-                 Evas.Clickable_Interface)
+                 Efl.Ui.Clickable)
 {
    legacy_prefix: elm_panes;
    eo_prefix: elm_obj_panes;
diff --git a/src/lib/elementary/elm_photo.c b/src/lib/elementary/elm_photo.c
index 9752007465..a00d60ea1a 100644
--- a/src/lib/elementary/elm_photo.c
+++ b/src/lib/elementary/elm_photo.c
@@ -216,7 +216,7 @@ _mouse_up(void *data,
    ELM_SAFE_FREE(sd->long_press_timer, ecore_timer_del);
 
    if (!sd->drag_started)
-     eo_event_callback_call(data, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL);
+     eo_event_callback_call(data, EFL_UI_EVENT_CLICKED, NULL);
 }
 
 static void
diff --git a/src/lib/elementary/elm_photo.eo b/src/lib/elementary/elm_photo.eo
index 31feae5512..a8c7fa9284 100644
--- a/src/lib/elementary/elm_photo.eo
+++ b/src/lib/elementary/elm_photo.eo
@@ -1,4 +1,4 @@
-class Elm.Photo (Elm.Widget, Efl.File, Evas.Clickable_Interface, Evas.Draggable_Interface)
+class Elm.Photo (Elm.Widget, Efl.File, Efl.Ui.Clickable, Evas.Draggable_Interface)
 {
    legacy_prefix: elm_photo;
    eo_prefix: elm_obj_photo;
diff --git a/src/lib/elementary/elm_photocam.c b/src/lib/elementary/elm_photocam.c
index 876d2f4b24..6858bb8796 100644
--- a/src/lib/elementary/elm_photocam.c
+++ b/src/lib/elementary/elm_photocam.c
@@ -801,7 +801,7 @@ _long_press_cb(void *data)
    sd->long_timer = NULL;
    sd->longpressed = EINA_TRUE;
    eo_event_callback_call
-     (data, EVAS_CLICKABLE_INTERFACE_EVENT_LONGPRESSED, NULL);
+     (data, EFL_UI_EVENT_LONGPRESSED, NULL);
 
    return ECORE_CALLBACK_CANCEL;
 }
@@ -821,7 +821,7 @@ _mouse_down_cb(void *data,
    else sd->on_hold = EINA_FALSE;
    if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK)
      eo_event_callback_call
-       (data, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED_DOUBLE, NULL);
+       (data, EFL_UI_EVENT_CLICKED_DOUBLE, NULL);
    else
      eo_event_callback_call(data, ELM_PHOTOCAM_EVENT_PRESS, NULL);
    sd->longpressed = EINA_FALSE;
@@ -846,7 +846,7 @@ _mouse_up_cb(void *data,
    ELM_SAFE_FREE(sd->long_timer, ecore_timer_del);
    if (!sd->on_hold)
      eo_event_callback_call
-       (data, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL);
+       (data, EFL_UI_EVENT_CLICKED, NULL);
    sd->on_hold = EINA_FALSE;
 }
 
diff --git a/src/lib/elementary/elm_photocam.eo b/src/lib/elementary/elm_photocam.eo
index ff82bc4b0a..b1ed834338 100644
--- a/src/lib/elementary/elm_photocam.eo
+++ b/src/lib/elementary/elm_photocam.eo
@@ -12,7 +12,7 @@ enum Elm.Photocam.Zoom_Mode
 
 class Elm.Photocam (Elm.Widget, Elm.Interface_Scrollable,
                     Elm.Interface.Atspi_Widget_Action, Efl.File,
-                    Evas.Clickable_Interface, Evas.Scrollable_Interface,
+                    Efl.Ui.Clickable, Evas.Scrollable_Interface,
                     Evas.Zoomable_Interface)
 {
    legacy_prefix: elm_photocam;
diff --git a/src/lib/elementary/elm_plug.c b/src/lib/elementary/elm_plug.c
index a567d63502..24205d4ced 100644
--- a/src/lib/elementary/elm_plug.c
+++ b/src/lib/elementary/elm_plug.c
@@ -103,7 +103,7 @@ _on_mouse_up(void *data,
    if (ev->button != 1) return;
    if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
 
-   eo_event_callback_call(data, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL);
+   eo_event_callback_call(data, EFL_UI_EVENT_CLICKED, NULL);
 }
 
 EOLIAN static void
diff --git a/src/lib/elementary/elm_plug.eo b/src/lib/elementary/elm_plug.eo
index 2fa1b78de1..1f7eecff59 100644
--- a/src/lib/elementary/elm_plug.eo
+++ b/src/lib/elementary/elm_plug.eo
@@ -1,4 +1,4 @@
-class Elm.Plug (Elm.Widget, Evas.Clickable_Interface)
+class Elm.Plug (Elm.Widget, Efl.Ui.Clickable)
 {
    legacy_prefix: elm_plug;
    eo_prefix: elm_obj_plug;
diff --git a/src/lib/elementary/elm_spinner.c b/src/lib/elementary/elm_spinner.c
index ab187a1f9c..ca6924b8a7 100644
--- a/src/lib/elementary/elm_spinner.c
+++ b/src/lib/elementary/elm_spinner.c
@@ -57,9 +57,9 @@ static const Elm_Action key_actions[] = {
 };
 
 EO_CALLBACKS_ARRAY_DEFINE(_inc_dec_button_cb,
-   { EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _inc_dec_button_clicked_cb},
-   { EVAS_CLICKABLE_INTERFACE_EVENT_PRESSED, _inc_dec_button_pressed_cb},
-   { EVAS_CLICKABLE_INTERFACE_EVENT_UNPRESSED, _inc_dec_button_unpressed_cb},
+   { EFL_UI_EVENT_CLICKED, _inc_dec_button_clicked_cb},
+   { EFL_UI_EVENT_PRESSED, _inc_dec_button_pressed_cb},
+   { EFL_UI_EVENT_UNPRESSED, _inc_dec_button_unpressed_cb},
    { EVAS_OBJECT_EVENT_MOUSE_MOVE, _inc_dec_button_mouse_move_cb }
 );
 
@@ -1195,7 +1195,7 @@ _elm_spinner_evas_object_smart_add(Eo *obj, Elm_Spinner_Data *priv)
         elm_object_style_set(priv->text_button, "spinner/default");
 
         eo_event_callback_add
-          (priv->text_button, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _text_button_clicked_cb, obj);
+          (priv->text_button, EFL_UI_EVENT_CLICKED, _text_button_clicked_cb, obj);
 
         elm_layout_content_set(obj, "elm.swallow.text_button", priv->text_button);
         elm_widget_sub_object_add(obj, priv->text_button);
diff --git a/src/lib/elementary/elm_thumb.c b/src/lib/elementary/elm_thumb.c
index 8df3a13314..cf09e10941 100644
--- a/src/lib/elementary/elm_thumb.c
+++ b/src/lib/elementary/elm_thumb.c
@@ -62,7 +62,7 @@ _mouse_down_cb(void *data,
    else sd->on_hold = EINA_FALSE;
 
    if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK)
-     eo_event_callback_call(obj, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED_DOUBLE, NULL);
+     eo_event_callback_call(obj, EFL_UI_EVENT_CLICKED_DOUBLE, NULL);
    else
      eo_event_callback_call(obj, ELM_THUMB_EVENT_PRESS, NULL);
 }
@@ -81,7 +81,7 @@ _mouse_up_cb(void *data,
    else sd->on_hold = EINA_FALSE;
 
    if (!sd->on_hold)
-     eo_event_callback_call(obj, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL);
+     eo_event_callback_call(obj, EFL_UI_EVENT_CLICKED, NULL);
 
    sd->on_hold = EINA_FALSE;
 }
diff --git a/src/lib/elementary/elm_thumb.eo b/src/lib/elementary/elm_thumb.eo
index adf491d3e2..9b447b05b7 100644
--- a/src/lib/elementary/elm_thumb.eo
+++ b/src/lib/elementary/elm_thumb.eo
@@ -1,5 +1,5 @@
 
-class Elm.Thumb (Elm.Layout, Efl.File, Evas.Clickable_Interface,
+class Elm.Thumb (Elm.Layout, Efl.File, Efl.Ui.Clickable,
                  Evas.Draggable_Interface)
 {
    legacy_prefix: elm_thumb;
diff --git a/src/lib/elementary/elm_toolbar.c b/src/lib/elementary/elm_toolbar.c
index 69a9a66a12..dd9f1068f0 100644
--- a/src/lib/elementary/elm_toolbar.c
+++ b/src/lib/elementary/elm_toolbar.c
@@ -1813,7 +1813,7 @@ _mouse_clicked_cb(Elm_Toolbar_Item_Data *it,
    if (button == 1)
      {
         /* regular left click event */
-        eo_event_callback_call(WIDGET(it), EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, EO_OBJ(it));
+        eo_event_callback_call(WIDGET(it), EFL_UI_EVENT_CLICKED, EO_OBJ(it));
         return;
      }
    snprintf(buf, sizeof(buf), "elm,action,click,%d", button);
@@ -2205,7 +2205,7 @@ _long_press_cb(void *data)
    if (sd->reorder_mode)
      _item_reorder_start(it);
 
-   eo_event_callback_call(WIDGET(it), EVAS_CLICKABLE_INTERFACE_EVENT_LONGPRESSED, EO_OBJ(it));
+   eo_event_callback_call(WIDGET(it), EFL_UI_EVENT_LONGPRESSED, EO_OBJ(it));
 
    return ECORE_CALLBACK_CANCEL;
 }
@@ -2238,7 +2238,7 @@ _mouse_down_cb(Elm_Toolbar_Item_Data *it,
 
    if (ev->button != 1) return;
    if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK)
-     eo_event_callback_call(WIDGET(it), EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED_DOUBLE, EO_OBJ(it));
+     eo_event_callback_call(WIDGET(it), EFL_UI_EVENT_CLICKED_DOUBLE, EO_OBJ(it));
    sd->mouse_down = EINA_TRUE;
    sd->long_press = EINA_FALSE;
    if (sd->long_timer)
diff --git a/src/lib/elementary/elm_toolbar.eo b/src/lib/elementary/elm_toolbar.eo
index ea23a5a7df..961ff4a23c 100644
--- a/src/lib/elementary/elm_toolbar.eo
+++ b/src/lib/elementary/elm_toolbar.eo
@@ -26,7 +26,7 @@ enum Elm.Toolbar.Shrink_Mode
 
 class Elm.Toolbar (Elm.Widget, Elm.Interface_Scrollable, Efl.Orientation,
                    Elm.Interface.Atspi_Widget_Action, Elm.Interface.Atspi.Selection,
-                   Evas.Clickable_Interface, Evas.Selectable_Interface)
+                   Efl.Ui.Clickable, Evas.Selectable_Interface)
 {
    legacy_prefix: elm_toolbar;
    eo_prefix: elm_obj_toolbar;
diff --git a/src/lib/evas/Evas_Eo.h b/src/lib/evas/Evas_Eo.h
index eff2dcbfe5..b4681af0e5 100644
--- a/src/lib/evas/Evas_Eo.h
+++ b/src/lib/evas/Evas_Eo.h
@@ -3,7 +3,7 @@
 #endif
 
 #include "canvas/evas_draggable_interface.eo.h"
-#include "canvas/evas_clickable_interface.eo.h"
+#include "canvas/efl_ui_clickable.eo.h"
 #include "canvas/evas_scrollable_interface.eo.h"
 #include "canvas/evas_selectable_interface.eo.h"
 #include "canvas/evas_zoomable_interface.eo.h"
diff --git a/src/lib/evas/canvas/common_interfaces.c b/src/lib/evas/canvas/common_interfaces.c
index 0e1988781a..582a474671 100644
--- a/src/lib/evas/canvas/common_interfaces.c
+++ b/src/lib/evas/canvas/common_interfaces.c
@@ -1,14 +1,8 @@
 #include "evas_common_private.h"
 #include "evas_private.h"
 
-static const Eo_Event_Description *_evas_clickable_interface_event_desc[];
-static const Eo_Event_Description *_evas_draggable_interface_event_desc[];
-static const Eo_Event_Description *_evas_scrollable_interface_event_desc[];
-static const Eo_Event_Description *_evas_selectable_interface_event_desc[];
-static const Eo_Event_Description *_evas_zoomable_interface_event_desc[];
-
 #include "canvas/evas_draggable_interface.eo.c"
-#include "canvas/evas_clickable_interface.eo.c"
+#include "canvas/efl_ui_clickable.eo.c"
 #include "canvas/evas_scrollable_interface.eo.c"
 #include "canvas/evas_selectable_interface.eo.c"
 #include "canvas/evas_zoomable_interface.eo.c"
diff --git a/src/lib/evas/canvas/evas_clickable_interface.eo b/src/lib/evas/canvas/efl_ui_clickable.eo
index e89c373ca7..1d977012a6 100644
--- a/src/lib/evas/canvas/evas_clickable_interface.eo
+++ b/src/lib/evas/canvas/efl_ui_clickable.eo
@@ -1,5 +1,6 @@
-interface Evas.Clickable_Interface ()
+interface Efl.Ui.Clickable ()
 {
+   event_prefix: efl_ui;
    events {
       clicked;
       clicked,double;
diff --git a/src/modules/elementary/datetime_input_ctxpopup/datetime_input_ctxpopup.c b/src/modules/elementary/datetime_input_ctxpopup/datetime_input_ctxpopup.c
index caff642b52..ae57d27696 100644
--- a/src/modules/elementary/datetime_input_ctxpopup/datetime_input_ctxpopup.c
+++ b/src/modules/elementary/datetime_input_ctxpopup/datetime_input_ctxpopup.c
@@ -159,7 +159,7 @@ _field_clicked_cb(void *data, const Eo_Event *event)
 
    diskselector = elm_diskselector_add(elm_widget_top_get(ctx_mod->mod_data.base));
    eo_event_callback_add
-     (diskselector, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _diskselector_cb, NULL);
+     (diskselector, EFL_UI_EVENT_CLICKED, _diskselector_cb, NULL);
    elm_object_style_set(diskselector, buf);
    elm_object_content_set(ctx_mod->ctxpopup, diskselector);
 
@@ -310,7 +310,7 @@ field_create(Elm_Datetime_Module_Data *module_data, Elm_Datetime_Field_Type  fie
      {
         field_obj = elm_button_add(ctx_mod->mod_data.base);
         eo_event_callback_add
-          (field_obj, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _ampm_clicked_cb, ctx_mod);
+          (field_obj, EFL_UI_EVENT_CLICKED, _ampm_clicked_cb, ctx_mod);
      }
    else
      {
@@ -320,7 +320,7 @@ field_create(Elm_Datetime_Module_Data *module_data, Elm_Datetime_Field_Type  fie
         elm_entry_input_panel_enabled_set(field_obj, EINA_FALSE);
         elm_entry_context_menu_disabled_set(field_obj, EINA_TRUE);
         eo_event_callback_add
-          (field_obj, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _field_clicked_cb, ctx_mod);
+          (field_obj, EFL_UI_EVENT_CLICKED, _field_clicked_cb, ctx_mod);
      }
    evas_object_data_set(field_obj, "_field_type", (void *)field_type);
 
diff --git a/src/modules/elementary/prefs/elm_button.c b/src/modules/elementary/prefs/elm_button.c
index 8922c5743a..4c6af6a562 100644
--- a/src/modules/elementary/prefs/elm_button.c
+++ b/src/modules/elementary/prefs/elm_button.c
@@ -27,7 +27,7 @@ elm_prefs_button_add(const Elm_Prefs_Item_Iface *iface EINA_UNUSED,
    Evas_Object *obj = elm_button_add(prefs);
 
    eo_event_callback_add
-     (obj, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _item_changed_cb, cb);
+     (obj, EFL_UI_EVENT_CLICKED, _item_changed_cb, cb);
 
    return obj;
 }