diff --git a/src/lib/elementary/efl_ui_layout.c b/src/lib/elementary/efl_ui_layout.c
index 60e9aa468c..55035d5eb4 100644
--- a/src/lib/elementary/efl_ui_layout.c
+++ b/src/lib/elementary/efl_ui_layout.c
@@ -396,7 +396,7 @@ _efl_ui_layout_elm_widget_on_focus_update(Eo *obj, Efl_Ui_Layout_Data *_pd EINA_
      {
         elm_layout_signal_emit(obj, "elm,action,focus", "elm");
         evas_object_focus_set(wd->resize_obj, EINA_TRUE);
-        efl_event_callback_legacy_call(obj, ELM_WIDGET_EVENT_FOCUSED, NULL);
+        efl_event_callback_legacy_call(obj, EFL_UI_WIDGET_EVENT_FOCUSED, NULL);
         if (_elm_config->atspi_mode && !elm_widget_child_can_focus_get(obj))
           efl_access_state_changed_signal_emit(obj, EFL_ACCESS_STATE_FOCUSED, EINA_TRUE);
      }
@@ -404,7 +404,7 @@ _efl_ui_layout_elm_widget_on_focus_update(Eo *obj, Efl_Ui_Layout_Data *_pd EINA_
      {
         elm_layout_signal_emit(obj, "elm,action,unfocus", "elm");
         evas_object_focus_set(wd->resize_obj, EINA_FALSE);
-        efl_event_callback_legacy_call(obj, ELM_WIDGET_EVENT_UNFOCUSED, NULL);
+        efl_event_callback_legacy_call(obj, EFL_UI_WIDGET_EVENT_UNFOCUSED, NULL);
         if (_elm_config->atspi_mode && !elm_widget_child_can_focus_get(obj))
           efl_access_state_changed_signal_emit(obj, EFL_ACCESS_STATE_FOCUSED, EINA_FALSE);
      }
diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c
index 3fe012986b..505181a9ee 100644
--- a/src/lib/elementary/efl_ui_text.c
+++ b/src/lib/elementary/efl_ui_text.c
@@ -1211,7 +1211,7 @@ _efl_ui_text_elm_widget_on_focus_update(Eo *obj, Efl_Ui_Text_Data *sd, Elm_Objec
 
         if (top && top_is_win && sd->input_panel_enable && !sd->input_panel_show_on_demand)
           elm_win_keyboard_mode_set(top, ELM_WIN_KEYBOARD_ON);
-        efl_event_callback_legacy_call(obj, ELM_WIDGET_EVENT_FOCUSED, NULL);
+        efl_event_callback_legacy_call(obj, EFL_UI_WIDGET_EVENT_FOCUSED, NULL);
         if (_elm_config->atspi_mode)
           efl_access_state_changed_signal_emit(obj, EFL_ACCESS_STATE_FOCUSED, EINA_TRUE);
         _return_key_enabled_check(obj);
@@ -1228,7 +1228,7 @@ _efl_ui_text_elm_widget_on_focus_update(Eo *obj, Efl_Ui_Text_Data *sd, Elm_Objec
 
         if (top && top_is_win && sd->input_panel_enable)
           elm_win_keyboard_mode_set(top, ELM_WIN_KEYBOARD_OFF);
-        efl_event_callback_legacy_call(obj, ELM_WIDGET_EVENT_UNFOCUSED, NULL);
+        efl_event_callback_legacy_call(obj, EFL_UI_WIDGET_EVENT_UNFOCUSED, NULL);
         if (_elm_config->atspi_mode)
           efl_access_state_changed_signal_emit(obj, EFL_ACCESS_STATE_FOCUSED, EINA_FALSE);
 
diff --git a/src/lib/elementary/elc_fileselector.c b/src/lib/elementary/elc_fileselector.c
index 29fc64768e..5e4e93a9da 100644
--- a/src/lib/elementary/elc_fileselector.c
+++ b/src/lib/elementary/elc_fileselector.c
@@ -1967,9 +1967,9 @@ _elm_fileselector_efl_canvas_group_group_add(Eo *obj, Elm_Fileselector_Data *pri
    efl_event_callback_add
      (en, ELM_ENTRY_EVENT_ANCHOR_CLICKED, _anchor_clicked, obj);
    efl_event_callback_add
-     (en, ELM_WIDGET_EVENT_FOCUSED, _on_text_focused, obj);
+     (en, EFL_UI_WIDGET_EVENT_FOCUSED, _on_text_focused, obj);
    efl_event_callback_add
-     (en, ELM_WIDGET_EVENT_UNFOCUSED, _on_text_unfocused, obj);
+     (en, EFL_UI_WIDGET_EVENT_UNFOCUSED, _on_text_unfocused, obj);
    efl_event_callback_add
      (en, ELM_ENTRY_EVENT_ACTIVATED, _on_text_activated, obj);
 
diff --git a/src/lib/elementary/elc_fileselector_entry.c b/src/lib/elementary/elc_fileselector_entry.c
index 361872ce88..f6c6fec54c 100644
--- a/src/lib/elementary/elc_fileselector_entry.c
+++ b/src/lib/elementary/elc_fileselector_entry.c
@@ -57,8 +57,8 @@ SIG_FWD(PRESS, ELM_FILESELECTOR_ENTRY_EVENT_PRESS)
 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(FOCUSED, EFL_UI_WIDGET_EVENT_FOCUSED)
+SIG_FWD(UNFOCUSED, EFL_UI_WIDGET_EVENT_UNFOCUSED)
 SIG_FWD(SELECTION_PASTE, EFL_UI_EVENT_SELECTION_PASTE)
 SIG_FWD(SELECTION_COPY, EFL_UI_EVENT_SELECTION_COPY)
 SIG_FWD(SELECTION_CUT, EFL_UI_EVENT_SELECTION_CUT)
@@ -298,8 +298,8 @@ _elm_fileselector_entry_efl_canvas_group_group_add(Eo *obj, Elm_Fileselector_Ent
    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(FOCUSED, EFL_UI_WIDGET_EVENT_FOCUSED);
+   SIG_FWD(UNFOCUSED, EFL_UI_WIDGET_EVENT_UNFOCUSED);
    SIG_FWD(SELECTION_PASTE, EFL_UI_EVENT_SELECTION_PASTE);
    SIG_FWD(SELECTION_COPY, EFL_UI_EVENT_SELECTION_COPY);
    SIG_FWD(SELECTION_CUT, EFL_UI_EVENT_SELECTION_CUT);
diff --git a/src/lib/elementary/elc_hoversel.c b/src/lib/elementary/elc_hoversel.c
index 510a12b8a1..a81212ccbe 100644
--- a/src/lib/elementary/elc_hoversel.c
+++ b/src/lib/elementary/elc_hoversel.c
@@ -865,8 +865,8 @@ _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);
     efl_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _on_item_clicked, item);
-    efl_event_callback_add(bt, ELM_WIDGET_EVENT_FOCUSED, _item_focused_cb, item);
-    efl_event_callback_add(bt, ELM_WIDGET_EVENT_UNFOCUSED, _item_unfocused_cb, item);
+    efl_event_callback_add(bt, EFL_UI_WIDGET_EVENT_FOCUSED, _item_focused_cb, item);
+    efl_event_callback_add(bt, EFL_UI_WIDGET_EVENT_UNFOCUSED, _item_unfocused_cb, item);
 
    sd->items = eina_list_append(sd->items, eo_item);
 
diff --git a/src/lib/elementary/elc_multibuttonentry.c b/src/lib/elementary/elc_multibuttonentry.c
index bb82ed6c12..019b96aa6a 100644
--- a/src/lib/elementary/elc_multibuttonentry.c
+++ b/src/lib/elementary/elc_multibuttonentry.c
@@ -59,8 +59,8 @@ static void _entry_clicked_cb(void *data, const Efl_Event *event);
 
 EFL_CALLBACKS_ARRAY_DEFINE(_multi_buttonentry_cb,
    { ELM_ENTRY_EVENT_CHANGED, _entry_changed_cb },
-   { ELM_WIDGET_EVENT_FOCUSED, _entry_focus_in_cb },
-   { ELM_WIDGET_EVENT_UNFOCUSED, _entry_focus_out_cb },
+   { EFL_UI_WIDGET_EVENT_FOCUSED, _entry_focus_in_cb },
+   { EFL_UI_WIDGET_EVENT_UNFOCUSED, _entry_focus_out_cb },
    { EFL_UI_EVENT_CLICKED, _entry_clicked_cb }
 );
 
@@ -370,7 +370,7 @@ _elm_multibuttonentry_elm_widget_on_focus_update(Eo *obj, Elm_Multibuttonentry_D
                }
           }
         efl_event_callback_legacy_call
-          (obj, ELM_WIDGET_EVENT_FOCUSED, NULL);
+          (obj, EFL_UI_WIDGET_EVENT_FOCUSED, NULL);
      }
    else
      {
@@ -387,7 +387,7 @@ _elm_multibuttonentry_elm_widget_on_focus_update(Eo *obj, Elm_Multibuttonentry_D
           elm_layout_signal_emit(VIEW(sd->selected_it), "elm,state,unfocused", "elm");
 
         efl_event_callback_legacy_call
-          (obj, ELM_WIDGET_EVENT_UNFOCUSED, NULL);
+          (obj, EFL_UI_WIDGET_EVENT_UNFOCUSED, NULL);
      }
 
 end:
diff --git a/src/lib/elementary/elc_popup.c b/src/lib/elementary/elc_popup.c
index bd88611b38..fa2a625184 100644
--- a/src/lib/elementary/elc_popup.c
+++ b/src/lib/elementary/elc_popup.c
@@ -939,9 +939,9 @@ _item_new(Elm_Popup_Item_Data *it)
                                        _item_select_cb, it);
         evas_object_size_hint_align_set(VIEW(it), EVAS_HINT_FILL, EVAS_HINT_FILL);
         efl_event_callback_add
-              (VIEW(it), ELM_WIDGET_EVENT_FOCUSED, _item_focused_cb, it);
+              (VIEW(it), EFL_UI_WIDGET_EVENT_FOCUSED, _item_focused_cb, it);
         efl_event_callback_add
-              (VIEW(it), ELM_WIDGET_EVENT_UNFOCUSED, _item_unfocused_cb, it);
+              (VIEW(it), EFL_UI_WIDGET_EVENT_UNFOCUSED, _item_unfocused_cb, it);
         evas_object_show(VIEW(it));
      }
 }
diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c
index 3ebe26cf20..da8782a3ed 100644
--- a/src/lib/elementary/elm_entry.c
+++ b/src/lib/elementary/elm_entry.c
@@ -1265,7 +1265,7 @@ _elm_entry_focus_update(Eo *obj, Elm_Entry_Data *sd)
         if (top && top_is_win && sd->input_panel_enable && !sd->input_panel_show_on_demand &&
             !edje_object_part_text_imf_context_get(sd->entry_edje, "elm.text"))
           elm_win_keyboard_mode_set(top, ELM_WIN_KEYBOARD_ON);
-        efl_event_callback_legacy_call(obj, ELM_WIDGET_EVENT_FOCUSED, NULL);
+        efl_event_callback_legacy_call(obj, EFL_UI_WIDGET_EVENT_FOCUSED, NULL);
         if (_elm_config->atspi_mode)
           efl_access_state_changed_signal_emit(obj, EFL_ACCESS_STATE_FOCUSED, EINA_TRUE);
         _return_key_enabled_check(obj);
@@ -1280,7 +1280,7 @@ _elm_entry_focus_update(Eo *obj, Elm_Entry_Data *sd)
         if (top && top_is_win && sd->input_panel_enable &&
             !edje_object_part_text_imf_context_get(sd->entry_edje, "elm.text"))
           elm_win_keyboard_mode_set(top, ELM_WIN_KEYBOARD_OFF);
-        efl_event_callback_legacy_call(obj, ELM_WIDGET_EVENT_UNFOCUSED, NULL);
+        efl_event_callback_legacy_call(obj, EFL_UI_WIDGET_EVENT_UNFOCUSED, NULL);
         if (_elm_config->atspi_mode)
           efl_access_state_changed_signal_emit(obj, EFL_ACCESS_STATE_FOCUSED, EINA_FALSE);
 
diff --git a/src/lib/elementary/elm_gengrid.c b/src/lib/elementary/elm_gengrid.c
index 7caad5170f..a60cea8c90 100644
--- a/src/lib/elementary/elm_gengrid.c
+++ b/src/lib/elementary/elm_gengrid.c
@@ -1273,7 +1273,7 @@ _item_mouse_up_cb(void *data,
        (sd->reorder_it))
      {
         efl_event_callback_legacy_call
-          (WIDGET(it), ELM_WIDGET_EVENT_MOVED, EO_OBJ(sd->reorder_it));
+          (WIDGET(it), EFL_UI_WIDGET_EVENT_MOVED, EO_OBJ(sd->reorder_it));
         sd->reorder_it = NULL;
         sd->move_effect_enabled = EINA_FALSE;
         ecore_job_del(sd->calc_job);
@@ -2835,7 +2835,7 @@ _item_move_cb(void *data, double pos)
         efl_event_callback_legacy_call
           (sd->obj, ELM_GENGRID_EVENT_ITEM_REORDER_ANIM_STOP, EO_OBJ(sd->reorder.it1));
         efl_event_callback_legacy_call
-          (sd->obj, ELM_WIDGET_EVENT_MOVED, EO_OBJ(sd->reorder.it1));
+          (sd->obj, EFL_UI_WIDGET_EVENT_MOVED, EO_OBJ(sd->reorder.it1));
         sd->reorder.running = EINA_FALSE;
      }
    _elm_widget_focus_highlight_start(sd->obj);
diff --git a/src/lib/elementary/elm_spinner.c b/src/lib/elementary/elm_spinner.c
index 8df4b3db95..69f8244cda 100644
--- a/src/lib/elementary/elm_spinner.c
+++ b/src/lib/elementary/elm_spinner.c
@@ -408,7 +408,7 @@ _entry_value_apply(Evas_Object *obj)
    if (!sd->entry_visible) return;
 
    efl_event_callback_del
-    (sd->ent, ELM_WIDGET_EVENT_UNFOCUSED, _entry_unfocused_cb, obj);
+    (sd->ent, EFL_UI_WIDGET_EVENT_UNFOCUSED, _entry_unfocused_cb, obj);
    _entry_hide(obj);
    str = elm_object_text_get(sd->ent);
    if (!str) return;
@@ -647,7 +647,7 @@ _toggle_entry(Evas_Object *obj)
           }
 
         efl_event_callback_add
-           (sd->ent, ELM_WIDGET_EVENT_UNFOCUSED, _entry_unfocused_cb, obj);
+           (sd->ent, EFL_UI_WIDGET_EVENT_UNFOCUSED, _entry_unfocused_cb, obj);
         sd->entry_visible = EINA_TRUE;
         elm_layout_signal_emit(obj, "elm,state,entry,active", "elm");
         evas_object_show(sd->ent);
@@ -1214,7 +1214,7 @@ _elm_spinner_efl_canvas_group_group_add(Eo *obj, Elm_Spinner_Data *priv)
         efl_event_callback_add
           (priv->text_button, EFL_UI_EVENT_CLICKED, _text_button_clicked_cb, obj);
         efl_event_callback_add
-          (priv->text_button, ELM_WIDGET_EVENT_FOCUSED, _text_button_focused_cb, obj);
+          (priv->text_button, EFL_UI_WIDGET_EVENT_FOCUSED, _text_button_focused_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_widget.c b/src/lib/elementary/elm_widget.c
index fae4803982..bea9f132ce 100644
--- a/src/lib/elementary/elm_widget.c
+++ b/src/lib/elementary/elm_widget.c
@@ -1174,7 +1174,7 @@ elm_widget_access(Evas_Object *obj,
      }
 
    efl_ui_widget_on_access_update(obj, is_access);
-   efl_event_callback_legacy_call(obj, ELM_WIDGET_EVENT_ACCESS_CHANGED, NULL);
+   efl_event_callback_legacy_call(obj, EFL_UI_WIDGET_EVENT_ACCESS_CHANGED, NULL);
 
    return ret;
 }
@@ -2930,7 +2930,7 @@ _elm_widget_efl_ui_translatable_translation_update(Eo *obj EINA_UNUSED, Elm_Widg
         sd->on_translate = EINA_FALSE;
      }
 #endif
-   efl_event_callback_legacy_call(obj, ELM_WIDGET_EVENT_LANGUAGE_CHANGED, NULL);
+   efl_event_callback_legacy_call(obj, EFL_UI_WIDGET_EVENT_LANGUAGE_CHANGED, NULL);
 }
 
 EOLIAN static void
@@ -5191,7 +5191,7 @@ _elm_widget_on_focus_update(Eo *obj, Elm_Widget_Smart_Data *sd, Elm_Object_Item
      return EINA_FALSE;
 
    focused = elm_widget_focus_get(obj);
-   desc = focused ? ELM_WIDGET_EVENT_FOCUSED : ELM_WIDGET_EVENT_UNFOCUSED;
+   desc = focused ? EFL_UI_WIDGET_EVENT_FOCUSED : EFL_UI_WIDGET_EVENT_UNFOCUSED;
 
    if (!sd->resize_obj)
      evas_object_focus_set(obj, focused);
diff --git a/src/lib/elementary/elm_widget.eo b/src/lib/elementary/elm_widget.eo
index b46c4f5801..33c74cc8d0 100644
--- a/src/lib/elementary/elm_widget.eo
+++ b/src/lib/elementary/elm_widget.eo
@@ -17,6 +17,7 @@ struct Elm.Widget.Focus_State {
    logical : bool; [[$true if this is registered as logical currently]]
 }
 
+/* ATTENTION: Rename to Efl.Ui.Widget is imminent. */
 abstract Elm.Widget (Efl.Canvas.Group, Efl.Access,
                      Efl.Access.Component, Efl.Ui.Focus.User, Efl.Part,
                      Efl.Ui.Focus.Object, Efl.Ui.Base, Efl.Ui.Cursor,
@@ -25,8 +26,8 @@ abstract Elm.Widget (Efl.Canvas.Group, Efl.Access,
    [[Elementary widget abstract class]]
    legacy_prefix: elm_widget;
    eo_prefix: efl_ui_widget;
-   event_prefix: elm_widget;
-   data: Elm_Widget_Smart_Data;
+   event_prefix: efl_ui_widget;
+   data: Efl_Ui_Widget_Data;
    methods {
       @property resize_object @protected {
          [[This is the internal canvas object managed by a widget.
diff --git a/src/lib/elementary/elm_widget.h b/src/lib/elementary/elm_widget.h
index fd607c7995..82e17bc76d 100644
--- a/src/lib/elementary/elm_widget.h
+++ b/src/lib/elementary/elm_widget.h
@@ -462,6 +462,8 @@ typedef struct _Elm_Widget_Smart_Data
    Eina_Bool                     legacy : 1; /**< Widget was created with a legacy API, not efl_add() */
 } Elm_Widget_Smart_Data;
 
+typedef Elm_Widget_Smart_Data Efl_Ui_Widget_Data;
+
 /**
  * @}
  */
diff --git a/src/modules/elementary/prefs/elm_entry.c b/src/modules/elementary/prefs/elm_entry.c
index a146ecbb9c..e87fe33e73 100644
--- a/src/modules/elementary/prefs/elm_entry.c
+++ b/src/modules/elementary/prefs/elm_entry.c
@@ -159,7 +159,7 @@ elm_prefs_entry_add(const Elm_Prefs_Item_Iface *iface EINA_UNUSED,
    efl_event_callback_add
      (obj, ELM_ENTRY_EVENT_ACTIVATED, _item_changed_cb, cb);
    efl_event_callback_add
-     (obj, ELM_WIDGET_EVENT_UNFOCUSED, _item_changed_cb, cb);
+     (obj, EFL_UI_WIDGET_EVENT_UNFOCUSED, _item_changed_cb, cb);
    if (spec.s.accept)
      {
         int ret;