diff --git a/src/lib/elementary/efl_ui_multibuttonentry.c b/src/lib/elementary/efl_ui_multibuttonentry.c
index d39d68c470..7c253d1c43 100644
--- a/src/lib/elementary/efl_ui_multibuttonentry.c
+++ b/src/lib/elementary/efl_ui_multibuttonentry.c
@@ -146,11 +146,11 @@ _visual_guide_text_set(Evas_Object *obj)
    elm_box_unpack(sd->box, sd->entry);
    if (sd->view_state == MULTIBUTTONENTRY_VIEW_SHRINK) return;
 
-   if (!efl_ui_focus_object_focus_get(obj))
+   if (!elm_object_focus_get(obj))
      elm_object_focus_set(sd->entry, EINA_FALSE);
 
    if ((!eina_list_count(sd->items)) && sd->guide_text
-       && (!efl_ui_focus_object_focus_get(obj)) && (!sd->n_str))
+       && (!elm_object_focus_get(obj)) && (!sd->n_str))
      {
         evas_object_hide(sd->entry);
         elm_box_pack_end(sd->box, sd->guide_text);
@@ -165,7 +165,7 @@ _visual_guide_text_set(Evas_Object *obj)
           {
              elm_box_pack_end(sd->box, sd->entry);
              evas_object_show(sd->entry);
-             if (efl_ui_focus_object_focus_get(obj))
+             if (elm_object_focus_get(obj))
                {
                   if (!sd->selected_it)
                     elm_object_focus_set(sd->entry, EINA_TRUE);
@@ -448,7 +448,7 @@ _item_select(Evas_Object *obj,
 
         if (it->func) it->func((void *)(WIDGET_ITEM_DATA_GET(EO_OBJ(it))), WIDGET(it), EO_OBJ(it));
 
-        if (efl_ui_focus_object_focus_get(obj))
+        if (elm_object_focus_get(obj))
           {
              elm_object_focus_set(sd->entry, EINA_FALSE);
              elm_object_focus_set(VIEW(it), EINA_TRUE);
@@ -479,7 +479,7 @@ _item_select(Evas_Object *obj,
      {
         _current_item_state_change
           (obj, MULTIBUTTONENTRY_BUTTON_STATE_DEFAULT);
-        if (efl_ui_focus_object_focus_get(obj) && sd->editable)
+        if (elm_object_focus_get(obj) && sd->editable)
           elm_object_focus_set(sd->entry, EINA_TRUE);
      }
 }
@@ -1039,7 +1039,7 @@ _entry_resize_cb(void *data,
 {
    EFL_UI_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(data, sd);
 
-   if (efl_ui_focus_object_focus_get(sd->parent))
+   if (elm_object_focus_get(sd->parent))
      elm_widget_show_region_set(sd->entry, efl_gfx_geometry_get(sd->entry), EINA_TRUE);
 }
 
@@ -1058,7 +1058,7 @@ _entry_focus_changed_cb(void *data, const Efl_Event *event)
 {
    EFL_UI_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(data, sd);
 
-   if (efl_ui_focus_object_focus_get(event->object))
+   if (elm_object_focus_get(event->object))
      {
         Elm_Multibuttonentry_Item_Data *item = NULL;
 
diff --git a/src/lib/elementary/elm_gengrid.c b/src/lib/elementary/elm_gengrid.c
index 8f5615fbd7..42548bc877 100644
--- a/src/lib/elementary/elm_gengrid.c
+++ b/src/lib/elementary/elm_gengrid.c
@@ -3805,7 +3805,7 @@ _elm_gengrid_item_elm_widget_item_focus_set(Eo *eo_it, Elm_Gen_Item *it, Eina_Bo
      }
    else
      {
-        if (!efl_ui_focus_object_focus_get(obj))
+        if (!elm_object_focus_get(obj))
           return;
         _elm_gengrid_item_unfocused(eo_it);
      }
diff --git a/src/lib/elementary/elm_list.c b/src/lib/elementary/elm_list.c
index 1b7f239abf..7efe9e5610 100644
--- a/src/lib/elementary/elm_list.c
+++ b/src/lib/elementary/elm_list.c
@@ -1245,7 +1245,7 @@ _elm_list_elm_widget_on_focus_update(Eo *obj, Elm_List_Data *sd, Elm_Object_Item
    int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL);
    if (!int_ret) return EINA_FALSE;
 
-   if (efl_ui_focus_object_focus_get(obj) && sd->selected && !sd->last_selected_item)
+   if (elm_object_focus_get(obj) && sd->selected && !sd->last_selected_item)
      {
         Elm_Object_Item *sel = eina_list_data_get(sd->selected);
         sd->last_selected_item = efl_data_scope_get(sel, ELM_LIST_ITEM_CLASS);
@@ -1253,7 +1253,7 @@ _elm_list_elm_widget_on_focus_update(Eo *obj, Elm_List_Data *sd, Elm_Object_Item
 
    if (!sd->items) return EINA_FALSE;
 
-   if (efl_ui_focus_object_focus_get(obj) && !sd->mouse_down)
+   if (elm_object_focus_get(obj) && !sd->mouse_down)
      {
         if (sd->last_focused_item)
           eo_it = sd->last_focused_item;
@@ -2070,7 +2070,7 @@ _elm_list_item_elm_widget_item_focus_set(Eo *eo_it, Elm_List_Item_Data *it, Eina
         if (!elm_object_focus_get(obj))
           elm_object_focus_set(obj, EINA_TRUE);
 
-        if (!efl_ui_focus_object_focus_get(obj))
+        if (!elm_object_focus_get(obj))
           return;
 
         if (eo_it != sd->focused_item)
@@ -2082,7 +2082,7 @@ _elm_list_item_elm_widget_item_focus_set(Eo *eo_it, Elm_List_Item_Data *it, Eina
      }
    else
      {
-        if (!efl_ui_focus_object_focus_get(obj))
+        if (!elm_object_focus_get(obj))
           return;
         if (eo_it)
           _elm_list_item_unfocused(eo_it);