diff --git a/src/bin/elementary/test_part_bg.c b/src/bin/elementary/test_part_bg.c
index da50aae206..3f3c9db14a 100644
--- a/src/bin/elementary/test_part_bg.c
+++ b/src/bin/elementary/test_part_bg.c
@@ -15,7 +15,7 @@ _reset_cb(void *data, const Efl_Event *ev EINA_UNUSED)
    Efl_Ui_Radio_Group *radio = data;
    Evas_Object *target;
 
-   radio = efl_ui_single_selectable_last_selected_get(radio);
+   radio = efl_ui_selectable_last_selected_get(radio);
    target = evas_object_data_get(radio, "data");
 
    efl_gfx_color_set(efl_part(target, "background"), 0, 0, 0, 0);
@@ -29,7 +29,7 @@ _color_cb(void *data, const Efl_Event *ev EINA_UNUSED)
    Evas_Object *target;
    static Eina_Bool i;
 
-   radio = efl_ui_single_selectable_last_selected_get(radio);
+   radio = efl_ui_selectable_last_selected_get(radio);
    target = evas_object_data_get(radio, "data");
    i ^= EINA_TRUE;
    efl_gfx_color_set(efl_part(target, "background"), (i) ? 255 : 0, (i) ? 0 : 255, 0, 255);
@@ -43,7 +43,7 @@ _scale_type_cb(void *data, const Efl_Event *ev EINA_UNUSED)
    Efl_Gfx_Image_Scale_Method type;
    char buf[PATH_MAX];
 
-   radio = efl_ui_single_selectable_last_selected_get(radio);
+   radio = efl_ui_selectable_last_selected_get(radio);
    target = evas_object_data_get(radio, "data");
 
    snprintf(buf, sizeof(buf), "%s/images/plant_01.jpg", elm_app_data_dir_get());
diff --git a/src/bin/elementary/test_ui_collection.c b/src/bin/elementary/test_ui_collection.c
index f407a6988a..3d1b34e3cd 100644
--- a/src/bin/elementary/test_ui_collection.c
+++ b/src/bin/elementary/test_ui_collection.c
@@ -7,13 +7,13 @@
 static void
 _all_select(void *data, const Efl_Event *ev EINA_UNUSED)
 {
-   efl_ui_all_select(data);
+   efl_ui_selectable_all_select(data);
 }
 
 static void
 _all_unselect(void *data, const Efl_Event *ev EINA_UNUSED)
 {
-   efl_ui_all_unselect(data);
+   efl_ui_selectable_all_unselect(data);
 }
 
 static void
@@ -167,7 +167,7 @@ _select_value_cb(void *data, const Efl_Event *ev)
 {
    Efl_Ui_Collection *c = data;
 
-   efl_ui_select_mode_set(c, efl_ui_radio_group_selected_value_get(ev->object));
+   efl_ui_selectable_select_mode_set(c, efl_ui_radio_group_selected_value_get(ev->object));
 }
 
 void create_item_container_ui(const Efl_Class *collection_class, const Efl_Class *item, const char *name)
diff --git a/src/bin/elementary/test_ui_collection_view.c b/src/bin/elementary/test_ui_collection_view.c
index 4a3f2f7b7c..ba34d320b5 100644
--- a/src/bin/elementary/test_ui_collection_view.c
+++ b/src/bin/elementary/test_ui_collection_view.c
@@ -46,7 +46,7 @@ _item_constructing(void *data EINA_UNUSED, const Efl_Event *ev)
 static void
 _item_select(void *data, const Efl_Event *ev)
 {
-   Efl_Ui_Widget *w = efl_ui_single_selectable_last_selected_get(ev->object);
+   Efl_Ui_Widget *w = efl_ui_selectable_last_selected_get(ev->object);
    Efl_Model *m = efl_ui_view_model_get(w);
 
    if (m) efl_ui_view_model_set(data, m);
@@ -100,7 +100,7 @@ void test_efl_ui_collection_view(void *data EINA_UNUSED,
                efl_ui_frame_autocollapse_set(efl_added, EINA_FALSE));
    efl_provider_register(f, EFL_MODEL_PROVIDER_CLASS, provider);
    efl_pack_table(tbl, f, 1, 1, 1, 1);
-   efl_event_callback_add(lv, EFL_UI_SINGLE_SELECTABLE_EVENT_SELECTION_CHANGED, _item_select, provider);
+   efl_event_callback_add(lv, EFL_UI_SELECTABLE_EVENT_SELECTION_CHANGED, _item_select, provider);
 
    ib = efl_add(EFL_UI_BOX_CLASS, f,
                 efl_gfx_hint_align_set(efl_added, EVAS_HINT_FILL, EVAS_HINT_FILL),
diff --git a/src/bin/elementary/test_ui_radio.c b/src/bin/elementary/test_ui_radio.c
index e03dcf5ee0..8fa1f31229 100644
--- a/src/bin/elementary/test_ui_radio.c
+++ b/src/bin/elementary/test_ui_radio.c
@@ -79,10 +79,10 @@ _set_selected_btn_clicked(void *data, const Efl_Event *ev EINA_UNUSED)
 static void
 _set_fallback_radio_btn_clicked(void *data, const Efl_Event *ev EINA_UNUSED)
 {
-   if (!efl_ui_single_selectable_fallback_selection_get(data))
-     efl_ui_single_selectable_fallback_selection_set(data, efl_pack_content_get(data, 4));
+   if (!efl_ui_selectable_fallback_selection_get(data))
+     efl_ui_selectable_fallback_selection_set(data, efl_pack_content_get(data, 4));
    else
-     efl_ui_single_selectable_fallback_selection_set(data, NULL);
+     efl_ui_selectable_fallback_selection_set(data, NULL);
 }
 
 void test_efl_ui_radio(void *data EINA_UNUSED,
diff --git a/src/examples/elementary/efl_ui_list_example_1.c b/src/examples/elementary/efl_ui_list_example_1.c
index dab45ae261..5b808d0da8 100644
--- a/src/examples/elementary/efl_ui_list_example_1.c
+++ b/src/examples/elementary/efl_ui_list_example_1.c
@@ -30,7 +30,7 @@ _list_selected(void *data EINA_UNUSED, const Efl_Event *ev)
   Eo *item = ev->info, *tmp;
   printf("list item [%p:%d] is %s\n", item, efl_ui_item_index_get(item), (efl_ui_selectable_selected_get(item)? "selected" : "unselected"));
 
-  Eina_Iterator *selects = efl_ui_selected_iterator_new(list);
+  Eina_Iterator *selects = efl_ui_selectable_selected_iterator_new(list);
 
   EINA_ITERATOR_FOREACH(selects, tmp)
      printf("selected [%p:%d] ", tmp, efl_ui_item_index_get(tmp));
@@ -70,7 +70,7 @@ static void
 _select_radio_changed(void *data, const Efl_Event *ev)
 {
   Eo *list = data;
-  efl_ui_select_mode_set(list, efl_ui_radio_group_selected_value_get(ev->object));
+  efl_ui_selectable_select_mode_set(list, efl_ui_radio_group_selected_value_get(ev->object));
 }
 
 static void
@@ -82,7 +82,7 @@ _anim_radio_changed(void *data, const Efl_Event *ev EINA_UNUSED)
 static void
 _scrl_btn_clicked(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
 {
-  Efl_Ui_List_Default_Item *item = efl_ui_single_selectable_last_selected_get(priv_d.list);
+  Efl_Ui_List_Default_Item *item = efl_ui_selectable_last_selected_get(priv_d.list);
   printf("show [%d:%p] [%d]\n", efl_ui_item_index_get(item), item, priv_d.anim);
   efl_ui_collection_item_scroll(priv_d.list, item, priv_d.anim);
 }
@@ -90,7 +90,7 @@ _scrl_btn_clicked(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
 static void
 _scrl_align_btn_clicked(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
 {
-  Efl_Ui_List_Default_Item *item = efl_ui_single_selectable_last_selected_get(priv_d.list);
+  Efl_Ui_List_Default_Item *item = efl_ui_selectable_last_selected_get(priv_d.list);
   double align = efl_ui_range_value_get(priv_d.slider);
   printf("show [%d:%p] [%.2lf], [%d]\n", efl_ui_item_index_get(item), item, align, priv_d.anim);
   efl_ui_collection_item_scroll_align(priv_d.list, item, align, priv_d.anim);
diff --git a/src/examples/elementary/efl_ui_list_view_example_3.c b/src/examples/elementary/efl_ui_list_view_example_3.c
index ca839bcf59..c9f6b0db97 100644
--- a/src/examples/elementary/efl_ui_list_view_example_3.c
+++ b/src/examples/elementary/efl_ui_list_view_example_3.c
@@ -60,7 +60,7 @@ _selected(void *data, const Efl_Event *event)
 {
    Priv_Data *priv = (Priv_Data*)data;
 
-   priv->selected = efl_ui_single_selectable_last_selected_get(event->object);
+   priv->selected = efl_ui_selectable_last_selected_get(event->object);
 }
 
 static void
@@ -299,7 +299,7 @@ elm_main(int argc EINA_UNUSED, char **argv EINA_UNUSED)
    elm_box_pack_end(vbx, bt);
 
    elm_box_pack_end(bx, priv->list2);
-   efl_event_callback_add(priv->list2, EFL_UI_SINGLE_SELECTABLE_EVENT_SELECTION_CHANGED, _selected, priv);
+   efl_event_callback_add(priv->list2, EFL_UI_SELECTABLE_EVENT_SELECTION_CHANGED, _selected, priv);
 
    evas_object_event_callback_add(win, EVAS_CALLBACK_DEL, _cleanup_cb, priv);
 
diff --git a/src/lib/elementary/efl_ui_collection.c b/src/lib/elementary/efl_ui_collection.c
index 0dac5b0a60..a281997974 100644
--- a/src/lib/elementary/efl_ui_collection.c
+++ b/src/lib/elementary/efl_ui_collection.c
@@ -431,7 +431,7 @@ _efl_ui_collection_efl_object_invalidate(Eo *obj, Efl_Ui_Collection_Data *pd EIN
 {
    efl_ui_collection_position_manager_set(obj, NULL);
 
-   efl_ui_single_selectable_fallback_selection_set(obj, NULL);
+   efl_ui_selectable_fallback_selection_set(obj, NULL);
 
    deselect_all(pd);
 
@@ -514,7 +514,7 @@ _schedule_selection_job_cb(Eo *o, void *data EINA_UNUSED, const Eina_Value value
 
    pd->selection_changed_job = NULL;
 
-   efl_event_callback_call(o, EFL_UI_SINGLE_SELECTABLE_EVENT_SELECTION_CHANGED, NULL);
+   efl_event_callback_call(o, EFL_UI_SELECTABLE_EVENT_SELECTION_CHANGED, NULL);
 
    return EINA_VALUE_EMPTY;
 }
diff --git a/src/lib/elementary/efl_ui_collection_view.c b/src/lib/elementary/efl_ui_collection_view.c
index 608c31c059..400e80e7be 100644
--- a/src/lib/elementary/efl_ui_collection_view.c
+++ b/src/lib/elementary/efl_ui_collection_view.c
@@ -1885,7 +1885,7 @@ _efl_ui_collection_view_model_changed(void *data, const Efl_Event *event)
         if (pd->multi_selectable_async_model)
           {
              efl_event_callback_forwarder_del(pd->multi_selectable_async_model,
-                                              EFL_UI_SINGLE_SELECTABLE_EVENT_SELECTION_CHANGED,
+                                              EFL_UI_SELECTABLE_EVENT_SELECTION_CHANGED,
                                               data);
              efl_composite_detach(data, pd->multi_selectable_async_model);
              efl_replace(&pd->multi_selectable_async_model, NULL);
@@ -1934,14 +1934,14 @@ _efl_ui_collection_view_model_changed(void *data, const Efl_Event *event)
    if (pd->multi_selectable_async_model)
      {
         efl_event_callback_forwarder_del(pd->multi_selectable_async_model,
-                                         EFL_UI_SINGLE_SELECTABLE_EVENT_SELECTION_CHANGED,
+                                         EFL_UI_SELECTABLE_EVENT_SELECTION_CHANGED,
                                          data);
         efl_composite_detach(data, pd->multi_selectable_async_model);
      }
    efl_replace(&pd->multi_selectable_async_model, mselect);
    efl_composite_attach(data, pd->multi_selectable_async_model);
    efl_event_callback_forwarder_add(pd->multi_selectable_async_model,
-                                    EFL_UI_SINGLE_SELECTABLE_EVENT_SELECTION_CHANGED,
+                                    EFL_UI_SELECTABLE_EVENT_SELECTION_CHANGED,
                                     data);
 
    if (!sizing) model = efl_add(EFL_UI_HOMOGENEOUS_MODEL_CLASS, data,
diff --git a/src/lib/elementary/efl_ui_item.c b/src/lib/elementary/efl_ui_item.c
index 3dce9c3837..f3c35ac9cf 100644
--- a/src/lib/elementary/efl_ui_item.c
+++ b/src/lib/elementary/efl_ui_item.c
@@ -30,10 +30,10 @@ static Efl_Ui_Select_Mode
 _fetch_state(Eo *obj)
 {
    if (efl_isa(obj, EFL_UI_MULTI_SELECTABLE_INTERFACE))
-     return efl_ui_select_mode_get(obj);
+     return efl_ui_selectable_select_mode_get(obj);
    if (efl_isa(obj, EFL_UI_SINGLE_SELECTABLE_INTERFACE))
      return EFL_UI_SELECT_MODE_SINGLE;
-   ERR("Uncaught state");
+   ERR("Uncaught state %s", efl_debug_name_get(obj));
    return EFL_UI_SELECT_MODE_NONE;
 }
 
diff --git a/src/lib/elementary/efl_ui_multi_selectable.eo b/src/lib/elementary/efl_ui_multi_selectable.eo
index ea8e376ad2..251f640185 100644
--- a/src/lib/elementary/efl_ui_multi_selectable.eo
+++ b/src/lib/elementary/efl_ui_multi_selectable.eo
@@ -6,7 +6,7 @@ interface @beta Efl.Ui.Multi_Selectable extends Efl.Ui.Single_Selectable
 
      The implementor of this interface provides the possibility to select multiple Selectables.
      If not, only @Efl.Ui.Single_Selectable should be implemented.]]
-   c_prefix: efl_ui;
+   c_prefix: efl_ui_selectable;
    methods
    {
       @property select_mode {
diff --git a/src/lib/elementary/efl_ui_radio_box.c b/src/lib/elementary/efl_ui_radio_box.c
index 1e18f0f5fc..84f6733926 100644
--- a/src/lib/elementary/efl_ui_radio_box.c
+++ b/src/lib/elementary/efl_ui_radio_box.c
@@ -118,7 +118,7 @@ _efl_ui_radio_box_efl_object_constructor(Eo *obj, Efl_Ui_Radio_Box_Data *pd)
 {
    pd->group = efl_new(EFL_UI_RADIO_GROUP_IMPL_CLASS, NULL);
    efl_composite_attach(obj, pd->group);
-   efl_event_callback_forwarder_add(pd->group, EFL_UI_SINGLE_SELECTABLE_EVENT_SELECTION_CHANGED, obj);
+   efl_event_callback_forwarder_add(pd->group, EFL_UI_SELECTABLE_EVENT_SELECTION_CHANGED, obj);
    efl_event_callback_forwarder_add(pd->group, EFL_UI_RADIO_GROUP_EVENT_VALUE_CHANGED, obj);
    return efl_constructor(efl_super(obj, MY_CLASS));
 }
diff --git a/src/lib/elementary/efl_ui_radio_group_impl.c b/src/lib/elementary/efl_ui_radio_group_impl.c
index 6c20f96d00..6a14f37115 100644
--- a/src/lib/elementary/efl_ui_radio_group_impl.c
+++ b/src/lib/elementary/efl_ui_radio_group_impl.c
@@ -101,7 +101,7 @@ _selected_cb(void *data, const Efl_Event *ev)
         else
           value = -1;
         efl_event_callback_call(data, EFL_UI_RADIO_GROUP_EVENT_VALUE_CHANGED, &value);
-        efl_event_callback_call(data, EFL_UI_SINGLE_SELECTABLE_EVENT_SELECTION_CHANGED, NULL);
+        efl_event_callback_call(data, EFL_UI_SELECTABLE_EVENT_SELECTION_CHANGED, NULL);
      }
 }
 
diff --git a/src/lib/elementary/efl_ui_select_model.c b/src/lib/elementary/efl_ui_select_model.c
index c05d720667..c6092a50a6 100644
--- a/src/lib/elementary/efl_ui_select_model.c
+++ b/src/lib/elementary/efl_ui_select_model.c
@@ -90,7 +90,7 @@ _select_notification_cb(Eo *o, void *data EINA_UNUSED, const Eina_Value v)
 {
    Efl_Ui_Select_Model_Data *pd = efl_data_scope_get(o, EFL_UI_SELECT_MODEL_CLASS);
 
-   efl_event_callback_call(o, EFL_UI_SINGLE_SELECTABLE_EVENT_SELECTION_CHANGED, NULL);
+   efl_event_callback_call(o, EFL_UI_SELECTABLE_EVENT_SELECTION_CHANGED, NULL);
 
    pd->pending_selection_event = NULL;
 
diff --git a/src/lib/elementary/efl_ui_single_selectable.eo b/src/lib/elementary/efl_ui_single_selectable.eo
index 373cefa5c2..457bf6cc5d 100644
--- a/src/lib/elementary/efl_ui_single_selectable.eo
+++ b/src/lib/elementary/efl_ui_single_selectable.eo
@@ -4,6 +4,7 @@ interface @beta Efl.Ui.Single_Selectable {
      The implementor is free to allow a specific number of selectables being selected or not.
      This interface just covers always the latest selected selectable.
    ]]
+   c_prefix: efl_ui_selectable;
    methods {
       @property last_selected {
         [[The selectable that was selected most recently.]]
diff --git a/src/lib/elementary/efl_ui_tab_bar.c b/src/lib/elementary/efl_ui_tab_bar.c
index ff831f8c3d..34e37299e2 100644
--- a/src/lib/elementary/efl_ui_tab_bar.c
+++ b/src/lib/elementary/efl_ui_tab_bar.c
@@ -66,7 +66,7 @@ _selelction_change_cb(void *data, const Efl_Event *ev)
      }
    if (!pd->in_value_change)
      {
-        efl_event_callback_call(data, EFL_UI_SINGLE_SELECTABLE_EVENT_SELECTION_CHANGED, NULL);
+        efl_event_callback_call(data, EFL_UI_SELECTABLE_EVENT_SELECTION_CHANGED, NULL);
      }
 }
 
diff --git a/src/lib/elementary/efl_ui_tab_pager.c b/src/lib/elementary/efl_ui_tab_pager.c
index eb347ab99f..73e7d22c48 100644
--- a/src/lib/elementary/efl_ui_tab_pager.c
+++ b/src/lib/elementary/efl_ui_tab_pager.c
@@ -26,7 +26,7 @@ _tab_select_cb(void *data, const Efl_Event *event)
    Efl_Ui_Tab_Bar_Default_Item *selected;
    Efl_Ui_Tab_Page *page;
 
-   selected = efl_ui_single_selectable_last_selected_get(event->object);
+   selected = efl_ui_selectable_last_selected_get(event->object);
    page = efl_parent_get(selected);
    if (efl_ui_spotlight_active_element_get(data))
      efl_ui_spotlight_active_element_set(data, page);
diff --git a/src/tests/elementary/efl_ui_test_radio_group.c b/src/tests/elementary/efl_ui_test_radio_group.c
index 5b00b02318..cf017bdc24 100644
--- a/src/tests/elementary/efl_ui_test_radio_group.c
+++ b/src/tests/elementary/efl_ui_test_radio_group.c
@@ -65,12 +65,12 @@ EFL_START_TEST(active_selected_value_setting)
    efl_ui_radio_group_register(radio_group, r2);
 
    ck_assert_int_eq(efl_ui_radio_group_selected_value_get(radio_group), -1);
-   ck_assert_ptr_eq(efl_ui_single_selectable_last_selected_get(radio_group), NULL);
+   ck_assert_ptr_eq(efl_ui_selectable_last_selected_get(radio_group), NULL);
 
    RESET_EVT
    efl_ui_radio_group_selected_value_set(radio_group, 1);
    ck_assert_int_eq(efl_ui_radio_group_selected_value_get(radio_group), 1);
-   ck_assert_ptr_eq(efl_ui_single_selectable_last_selected_get(radio_group), r1);
+   ck_assert_ptr_eq(efl_ui_selectable_last_selected_get(radio_group), r1);
    ck_assert_int_eq(efl_ui_selectable_selected_get(r1), EINA_TRUE);
    ck_assert_int_eq(efl_ui_selectable_selected_get(r2), EINA_FALSE);
    EXPECT_EVT(1,1);
@@ -78,7 +78,7 @@ EFL_START_TEST(active_selected_value_setting)
    RESET_EVT
    efl_ui_selectable_selected_set(r2, EINA_TRUE);
    ck_assert_int_eq(efl_ui_radio_group_selected_value_get(radio_group), 2);
-   ck_assert_ptr_eq(efl_ui_single_selectable_last_selected_get(radio_group), r2);
+   ck_assert_ptr_eq(efl_ui_selectable_last_selected_get(radio_group), r2);
    ck_assert_int_eq(efl_ui_selectable_selected_get(r1), EINA_FALSE);
    ck_assert_int_eq(efl_ui_selectable_selected_get(r2), EINA_TRUE);
    EXPECT_EVT(1,2);
@@ -96,12 +96,12 @@ EFL_START_TEST(active_selection_setting)
    efl_ui_radio_group_register(radio_group, r2);
 
    ck_assert_int_eq(efl_ui_radio_group_selected_value_get(radio_group), -1);
-   ck_assert_ptr_eq(efl_ui_single_selectable_last_selected_get(radio_group), NULL);
+   ck_assert_ptr_eq(efl_ui_selectable_last_selected_get(radio_group), NULL);
 
    RESET_EVT
    efl_ui_selectable_selected_set(r1, EINA_TRUE);
    ck_assert_int_eq(efl_ui_radio_group_selected_value_get(radio_group), 1);
-   ck_assert_ptr_eq(efl_ui_single_selectable_last_selected_get(radio_group), r1);
+   ck_assert_ptr_eq(efl_ui_selectable_last_selected_get(radio_group), r1);
    ck_assert_int_eq(efl_ui_selectable_selected_get(r1), EINA_TRUE);
    ck_assert_int_eq(efl_ui_selectable_selected_get(r2), EINA_FALSE);
    EXPECT_EVT(1,1);
@@ -109,7 +109,7 @@ EFL_START_TEST(active_selection_setting)
    RESET_EVT
    efl_ui_selectable_selected_set(r2, EINA_TRUE);
    ck_assert_int_eq(efl_ui_radio_group_selected_value_get(radio_group), 2);
-   ck_assert_ptr_eq(efl_ui_single_selectable_last_selected_get(radio_group), r2);
+   ck_assert_ptr_eq(efl_ui_selectable_last_selected_get(radio_group), r2);
    ck_assert_int_eq(efl_ui_selectable_selected_get(r1), EINA_FALSE);
    ck_assert_int_eq(efl_ui_selectable_selected_get(r2), EINA_TRUE);
    EXPECT_EVT(1,2);
@@ -126,10 +126,10 @@ EFL_START_TEST(active_selection_object_setting)
 
    RESET_EVT
    ck_assert_int_eq(efl_ui_radio_group_selected_value_get(radio_group), -1);
-   ck_assert_ptr_eq(efl_ui_single_selectable_last_selected_get(radio_group), NULL);
+   ck_assert_ptr_eq(efl_ui_selectable_last_selected_get(radio_group), NULL);
    efl_ui_selectable_selected_set(r, EINA_TRUE);
    ck_assert_int_eq(efl_ui_radio_group_selected_value_get(radio_group), 1);
-   ck_assert_ptr_eq(efl_ui_single_selectable_last_selected_get(radio_group), r);
+   ck_assert_ptr_eq(efl_ui_selectable_last_selected_get(radio_group), r);
    EXPECT_EVT(1,1);
 }
 EFL_END_TEST
@@ -145,12 +145,12 @@ EFL_START_TEST(unregister_setted)
    RESET_EVT
    efl_ui_selectable_selected_set(r, EINA_TRUE);
    ck_assert_int_eq(efl_ui_radio_group_selected_value_get(radio_group), 1);
-   ck_assert_ptr_eq(efl_ui_single_selectable_last_selected_get(radio_group), r);
+   ck_assert_ptr_eq(efl_ui_selectable_last_selected_get(radio_group), r);
    EXPECT_EVT(1,1);
    RESET_EVT
    efl_ui_radio_group_unregister(radio_group, r);
    ck_assert_int_eq(efl_ui_radio_group_selected_value_get(radio_group), -1);
-   ck_assert_ptr_eq(efl_ui_single_selectable_last_selected_get(radio_group), NULL);
+   ck_assert_ptr_eq(efl_ui_selectable_last_selected_get(radio_group), NULL);
    EXPECT_EVT(1,-1);
 }
 EFL_END_TEST
@@ -165,12 +165,12 @@ EFL_START_TEST(delete_setted)
    RESET_EVT
    efl_ui_selectable_selected_set(r, EINA_TRUE);
    ck_assert_int_eq(efl_ui_radio_group_selected_value_get(radio_group), 1);
-   ck_assert_ptr_eq(efl_ui_single_selectable_last_selected_get(radio_group), r);
+   ck_assert_ptr_eq(efl_ui_selectable_last_selected_get(radio_group), r);
    EXPECT_EVT(1,1);
    RESET_EVT
    efl_del(r);
    ck_assert_int_eq(efl_ui_radio_group_selected_value_get(radio_group), -1);
-   ck_assert_ptr_eq(efl_ui_single_selectable_last_selected_get(radio_group), NULL);
+   ck_assert_ptr_eq(efl_ui_selectable_last_selected_get(radio_group), NULL);
    EXPECT_EVT(1,-1);
 }
 EFL_END_TEST
@@ -185,12 +185,12 @@ EFL_START_TEST(external_setting)
    RESET_EVT
    efl_ui_selectable_selected_set(r, EINA_TRUE);
    ck_assert_int_eq(efl_ui_radio_group_selected_value_get(radio_group), 1);
-   ck_assert_ptr_eq(efl_ui_single_selectable_last_selected_get(radio_group), r);
+   ck_assert_ptr_eq(efl_ui_selectable_last_selected_get(radio_group), r);
    EXPECT_EVT(1,1);
    RESET_EVT
    efl_ui_selectable_selected_set(r, EINA_FALSE);
    ck_assert_int_eq(efl_ui_radio_group_selected_value_get(radio_group), -1);
-   ck_assert_ptr_eq(efl_ui_single_selectable_last_selected_get(radio_group), NULL);
+   ck_assert_ptr_eq(efl_ui_selectable_last_selected_get(radio_group), NULL);
    EXPECT_EVT(1,-1);
 }
 EFL_END_TEST
diff --git a/src/tests/elementary/spec/efl_test_multi_selectable.c b/src/tests/elementary/spec/efl_test_multi_selectable.c
index 5e2c719d77..8f05ba1467 100644
--- a/src/tests/elementary/spec/efl_test_multi_selectable.c
+++ b/src/tests/elementary/spec/efl_test_multi_selectable.c
@@ -36,9 +36,9 @@ EFL_START_TEST(test_multi_select)
    int c = 0;
 
    Eina_Array *arr_selected;
-   efl_ui_select_mode_set(widget, EFL_UI_SELECT_MODE_MULTI);
-   efl_event_callback_add(widget, EFL_UI_SINGLE_SELECTABLE_EVENT_SELECTION_CHANGED, (void*) event_callback_single_call_int_data, &c);
-   efl_event_callback_add(widget, EFL_UI_SINGLE_SELECTABLE_EVENT_SELECTION_CHANGED, event_callback_that_quits_the_main_loop_when_called, NULL);
+   efl_ui_selectable_select_mode_set(widget, EFL_UI_SELECT_MODE_MULTI);
+   efl_event_callback_add(widget, EFL_UI_SELECTABLE_EVENT_SELECTION_CHANGED, (void*) event_callback_single_call_int_data, &c);
+   efl_event_callback_add(widget, EFL_UI_SELECTABLE_EVENT_SELECTION_CHANGED, event_callback_that_quits_the_main_loop_when_called, NULL);
 
    efl_ui_selectable_selected_set(efl_pack_content_get(widget, 0), EINA_TRUE);
    if (c == 0) efl_loop_begin(efl_main_loop_get());
@@ -51,8 +51,8 @@ EFL_START_TEST(test_multi_select)
    c = 0;
    ck_assert_int_eq(efl_ui_selectable_selected_get(efl_pack_content_get(widget, 0)), EINA_TRUE);
    ck_assert_int_eq(efl_ui_selectable_selected_get(efl_pack_content_get(widget, 2)), EINA_TRUE);
-   ck_assert_ptr_eq(efl_ui_single_selectable_last_selected_get(widget), efl_pack_content_get(widget, 2));
-   _iterator_to_array(&arr_selected, efl_ui_selected_iterator_new(widget));
+   ck_assert_ptr_eq(efl_ui_selectable_last_selected_get(widget), efl_pack_content_get(widget, 2));
+   _iterator_to_array(&arr_selected, efl_ui_selectable_selected_iterator_new(widget));
    ck_assert_int_eq(eina_array_count(arr_selected), 2);
    ck_assert_ptr_eq(eina_array_data_get(arr_selected, 0), efl_pack_content_get(widget, 0));
    ck_assert_ptr_eq(eina_array_data_get(arr_selected, 1), efl_pack_content_get(widget, 2));
@@ -60,8 +60,8 @@ EFL_START_TEST(test_multi_select)
    efl_ui_selectable_selected_set(efl_pack_content_get(widget, 2), EINA_TRUE);
    ck_assert_int_eq(c, 0);
 
-   efl_event_callback_del(widget, EFL_UI_SINGLE_SELECTABLE_EVENT_SELECTION_CHANGED, (void*) event_callback_single_call_int_data, &c);
-   efl_event_callback_del(widget, EFL_UI_SINGLE_SELECTABLE_EVENT_SELECTION_CHANGED, event_callback_that_quits_the_main_loop_when_called, NULL);
+   efl_event_callback_del(widget, EFL_UI_SELECTABLE_EVENT_SELECTION_CHANGED, (void*) event_callback_single_call_int_data, &c);
+   efl_event_callback_del(widget, EFL_UI_SELECTABLE_EVENT_SELECTION_CHANGED, event_callback_that_quits_the_main_loop_when_called, NULL);
 }
 EFL_END_TEST
 
@@ -69,9 +69,9 @@ EFL_START_TEST(test_multi_select_removal)
 {
    int c = 0;
    Eina_Array *arr_selected;
-   efl_ui_select_mode_set(widget, EFL_UI_SELECT_MODE_MULTI);
-   efl_event_callback_add(widget, EFL_UI_SINGLE_SELECTABLE_EVENT_SELECTION_CHANGED, (void*) event_callback_single_call_int_data, &c);
-   efl_event_callback_add(widget, EFL_UI_SINGLE_SELECTABLE_EVENT_SELECTION_CHANGED, event_callback_that_quits_the_main_loop_when_called, NULL);
+   efl_ui_selectable_select_mode_set(widget, EFL_UI_SELECT_MODE_MULTI);
+   efl_event_callback_add(widget, EFL_UI_SELECTABLE_EVENT_SELECTION_CHANGED, (void*) event_callback_single_call_int_data, &c);
+   efl_event_callback_add(widget, EFL_UI_SELECTABLE_EVENT_SELECTION_CHANGED, event_callback_that_quits_the_main_loop_when_called, NULL);
 
    efl_ui_selectable_selected_set(efl_pack_content_get(widget, 0), EINA_TRUE);
    c = 0;
@@ -86,11 +86,11 @@ EFL_START_TEST(test_multi_select_removal)
    ck_assert_int_eq(c, 1);
    c = 0;
 
-   ck_assert_ptr_eq(efl_ui_single_selectable_last_selected_get(widget), NULL);
-   _iterator_to_array(&arr_selected, efl_ui_selected_iterator_new(widget));
+   ck_assert_ptr_eq(efl_ui_selectable_last_selected_get(widget), NULL);
+   _iterator_to_array(&arr_selected, efl_ui_selectable_selected_iterator_new(widget));
    ck_assert_int_eq(eina_array_count(arr_selected), 0);
-   efl_event_callback_del(widget, EFL_UI_SINGLE_SELECTABLE_EVENT_SELECTION_CHANGED, (void*) event_callback_single_call_int_data, &c);
-   efl_event_callback_del(widget, EFL_UI_SINGLE_SELECTABLE_EVENT_SELECTION_CHANGED, event_callback_that_quits_the_main_loop_when_called, NULL);
+   efl_event_callback_del(widget, EFL_UI_SELECTABLE_EVENT_SELECTION_CHANGED, (void*) event_callback_single_call_int_data, &c);
+   efl_event_callback_del(widget, EFL_UI_SELECTABLE_EVENT_SELECTION_CHANGED, event_callback_that_quits_the_main_loop_when_called, NULL);
 }
 EFL_END_TEST
 
@@ -99,9 +99,9 @@ EFL_START_TEST(test_single_select)
    int c = 0;
    Eina_Array *arr_selected;
 
-   efl_ui_select_mode_set(widget, EFL_UI_SELECT_MODE_SINGLE);
-   efl_event_callback_add(widget, EFL_UI_SINGLE_SELECTABLE_EVENT_SELECTION_CHANGED, (void*) event_callback_single_call_int_data, &c);
-   efl_event_callback_add(widget, EFL_UI_SINGLE_SELECTABLE_EVENT_SELECTION_CHANGED, event_callback_that_quits_the_main_loop_when_called, NULL);
+   efl_ui_selectable_select_mode_set(widget, EFL_UI_SELECT_MODE_SINGLE);
+   efl_event_callback_add(widget, EFL_UI_SELECTABLE_EVENT_SELECTION_CHANGED, (void*) event_callback_single_call_int_data, &c);
+   efl_event_callback_add(widget, EFL_UI_SELECTABLE_EVENT_SELECTION_CHANGED, event_callback_that_quits_the_main_loop_when_called, NULL);
 
    efl_ui_selectable_selected_set(efl_pack_content_get(widget, 0), EINA_TRUE);
    if (c == 0) efl_loop_begin(efl_main_loop_get());
@@ -113,16 +113,16 @@ EFL_START_TEST(test_single_select)
    c = 0;
    ck_assert_int_eq(efl_ui_selectable_selected_get(efl_pack_content_get(widget, 0)), EINA_FALSE);
    ck_assert_int_eq(efl_ui_selectable_selected_get(efl_pack_content_get(widget, 2)), EINA_TRUE);
-   ck_assert_ptr_eq(efl_ui_single_selectable_last_selected_get(widget), efl_pack_content_get(widget, 2));
-   _iterator_to_array(&arr_selected, efl_ui_selected_iterator_new(widget));
+   ck_assert_ptr_eq(efl_ui_selectable_last_selected_get(widget), efl_pack_content_get(widget, 2));
+   _iterator_to_array(&arr_selected, efl_ui_selectable_selected_iterator_new(widget));
    ck_assert_int_eq(eina_array_count(arr_selected), 1);
    ck_assert_ptr_eq(eina_array_data_get(arr_selected, 0), efl_pack_content_get(widget, 2));
 
    efl_ui_selectable_selected_set(efl_pack_content_get(widget, 2), EINA_TRUE);
    ck_assert_int_eq(c, 0);
 
-   efl_event_callback_del(widget, EFL_UI_SINGLE_SELECTABLE_EVENT_SELECTION_CHANGED, (void*) event_callback_single_call_int_data, &c);
-   efl_event_callback_del(widget, EFL_UI_SINGLE_SELECTABLE_EVENT_SELECTION_CHANGED, event_callback_that_quits_the_main_loop_when_called, NULL);
+   efl_event_callback_del(widget, EFL_UI_SELECTABLE_EVENT_SELECTION_CHANGED, (void*) event_callback_single_call_int_data, &c);
+   efl_event_callback_del(widget, EFL_UI_SELECTABLE_EVENT_SELECTION_CHANGED, event_callback_that_quits_the_main_loop_when_called, NULL);
 }
 EFL_END_TEST
 
@@ -131,9 +131,9 @@ EFL_START_TEST(test_none_select)
    Eina_Array *arr_selected;
    int c = 0;
 
-   efl_ui_select_mode_set(widget, EFL_UI_SELECT_MODE_NONE);
-   efl_event_callback_add(widget, EFL_UI_SINGLE_SELECTABLE_EVENT_SELECTION_CHANGED, (void*) event_callback_single_call_int_data, &c);
-   efl_event_callback_add(widget, EFL_UI_SINGLE_SELECTABLE_EVENT_SELECTION_CHANGED, event_callback_that_quits_the_main_loop_when_called, NULL);
+   efl_ui_selectable_select_mode_set(widget, EFL_UI_SELECT_MODE_NONE);
+   efl_event_callback_add(widget, EFL_UI_SELECTABLE_EVENT_SELECTION_CHANGED, (void*) event_callback_single_call_int_data, &c);
+   efl_event_callback_add(widget, EFL_UI_SELECTABLE_EVENT_SELECTION_CHANGED, event_callback_that_quits_the_main_loop_when_called, NULL);
 
    efl_ui_selectable_selected_set(efl_pack_content_get(widget, 0), EINA_TRUE);
    get_me_to_those_events(widget);
@@ -143,11 +143,11 @@ EFL_START_TEST(test_none_select)
    ck_assert_int_eq(c, 0);
    ck_assert_int_eq(efl_ui_selectable_selected_get(efl_pack_content_get(widget, 0)), EINA_FALSE);
    ck_assert_int_eq(efl_ui_selectable_selected_get(efl_pack_content_get(widget, 2)), EINA_FALSE);
-   ck_assert_ptr_eq(efl_ui_single_selectable_last_selected_get(widget), NULL);
-   _iterator_to_array(&arr_selected, efl_ui_selected_iterator_new(widget));
+   ck_assert_ptr_eq(efl_ui_selectable_last_selected_get(widget), NULL);
+   _iterator_to_array(&arr_selected, efl_ui_selectable_selected_iterator_new(widget));
    ck_assert_int_eq(eina_array_count(arr_selected), 0);
-   efl_event_callback_del(widget, EFL_UI_SINGLE_SELECTABLE_EVENT_SELECTION_CHANGED, (void*) event_callback_single_call_int_data, &c);
-   efl_event_callback_del(widget, EFL_UI_SINGLE_SELECTABLE_EVENT_SELECTION_CHANGED, event_callback_that_quits_the_main_loop_when_called, NULL);
+   efl_event_callback_del(widget, EFL_UI_SELECTABLE_EVENT_SELECTION_CHANGED, (void*) event_callback_single_call_int_data, &c);
+   efl_event_callback_del(widget, EFL_UI_SELECTABLE_EVENT_SELECTION_CHANGED, event_callback_that_quits_the_main_loop_when_called, NULL);
 }
 EFL_END_TEST
 
@@ -155,9 +155,9 @@ EFL_START_TEST(all_select_api)
 {
    Eina_Array *arr_selected;
 
-   efl_ui_select_mode_set(widget, EFL_UI_SELECT_MODE_MULTI);
-   efl_ui_all_select(widget);
-   _iterator_to_array(&arr_selected, efl_ui_selected_iterator_new(widget));
+   efl_ui_selectable_select_mode_set(widget, EFL_UI_SELECT_MODE_MULTI);
+   efl_ui_selectable_all_select(widget);
+   _iterator_to_array(&arr_selected, efl_ui_selectable_selected_iterator_new(widget));
 
    ck_assert_int_eq(eina_array_count(arr_selected), 3);
 
@@ -171,11 +171,11 @@ EFL_START_TEST(all_unselect_api)
 {
    Eina_Array *arr_selected;
 
-   efl_ui_select_mode_set(widget, EFL_UI_SELECT_MODE_MULTI);
+   efl_ui_selectable_select_mode_set(widget, EFL_UI_SELECT_MODE_MULTI);
    efl_ui_selectable_selected_set(efl_pack_content_get(widget, 0), EINA_TRUE);
 
-   efl_ui_all_unselect(widget);
-   _iterator_to_array(&arr_selected, efl_ui_selected_iterator_new(widget));
+   efl_ui_selectable_all_unselect(widget);
+   _iterator_to_array(&arr_selected, efl_ui_selectable_selected_iterator_new(widget));
 
    ck_assert_int_eq(eina_array_count(arr_selected), 0);
    ck_assert_int_eq(efl_ui_selectable_selected_get(efl_pack_content_get(widget, 0)), EINA_FALSE);
@@ -186,11 +186,11 @@ EFL_START_TEST(range_unselect)
 {
    Eina_Array *arr_selected;
 
-   efl_ui_select_mode_set(widget, EFL_UI_SELECT_MODE_MULTI);
-   efl_ui_all_select(widget);
+   efl_ui_selectable_select_mode_set(widget, EFL_UI_SELECT_MODE_MULTI);
+   efl_ui_selectable_all_select(widget);
 
-   efl_ui_range_unselect(widget, efl_pack_content_get(widget, 1), efl_pack_content_get(widget, 2));
-   _iterator_to_array(&arr_selected, efl_ui_selected_iterator_new(widget));
+   efl_ui_selectable_range_unselect(widget, efl_pack_content_get(widget, 1), efl_pack_content_get(widget, 2));
+   _iterator_to_array(&arr_selected, efl_ui_selectable_selected_iterator_new(widget));
    ck_assert_int_eq(eina_array_count(arr_selected), 1);
    ck_assert_ptr_eq(eina_array_data_get(arr_selected, 0), efl_pack_content_get(widget, 0));
 }
@@ -200,11 +200,11 @@ EFL_START_TEST(range_unselect2)
 {
    Eina_Array *arr_selected;
 
-   efl_ui_select_mode_set(widget, EFL_UI_SELECT_MODE_MULTI);
-   efl_ui_all_select(widget);
+   efl_ui_selectable_select_mode_set(widget, EFL_UI_SELECT_MODE_MULTI);
+   efl_ui_selectable_all_select(widget);
 
-   efl_ui_range_unselect(widget, efl_pack_content_get(widget, 2), efl_pack_content_get(widget, 1));
-   _iterator_to_array(&arr_selected, efl_ui_selected_iterator_new(widget));
+   efl_ui_selectable_range_unselect(widget, efl_pack_content_get(widget, 2), efl_pack_content_get(widget, 1));
+   _iterator_to_array(&arr_selected, efl_ui_selectable_selected_iterator_new(widget));
    ck_assert_int_eq(eina_array_count(arr_selected), 1);
    ck_assert_ptr_eq(eina_array_data_get(arr_selected, 0), efl_pack_content_get(widget, 0));
 }
@@ -214,9 +214,9 @@ EFL_START_TEST(range_select)
 {
    Eina_Array *arr_selected;
 
-   efl_ui_select_mode_set(widget, EFL_UI_SELECT_MODE_MULTI);
-   efl_ui_range_select(widget, efl_pack_content_get(widget, 1), efl_pack_content_get(widget, 2));
-   _iterator_to_array(&arr_selected, efl_ui_selected_iterator_new(widget));
+   efl_ui_selectable_select_mode_set(widget, EFL_UI_SELECT_MODE_MULTI);
+   efl_ui_selectable_range_select(widget, efl_pack_content_get(widget, 1), efl_pack_content_get(widget, 2));
+   _iterator_to_array(&arr_selected, efl_ui_selectable_selected_iterator_new(widget));
    ck_assert_int_eq(eina_array_count(arr_selected), 2);
    ck_assert_ptr_eq(eina_array_data_get(arr_selected, 0), efl_pack_content_get(widget, 1));
    ck_assert_ptr_eq(eina_array_data_get(arr_selected, 1), efl_pack_content_get(widget, 2));
@@ -227,9 +227,9 @@ EFL_START_TEST(range_select2)
 {
    Eina_Array *arr_selected;
 
-   efl_ui_select_mode_set(widget, EFL_UI_SELECT_MODE_MULTI);
-   efl_ui_range_select(widget, efl_pack_content_get(widget, 2), efl_pack_content_get(widget, 1));
-   _iterator_to_array(&arr_selected, efl_ui_selected_iterator_new(widget));
+   efl_ui_selectable_select_mode_set(widget, EFL_UI_SELECT_MODE_MULTI);
+   efl_ui_selectable_range_select(widget, efl_pack_content_get(widget, 2), efl_pack_content_get(widget, 1));
+   _iterator_to_array(&arr_selected, efl_ui_selectable_selected_iterator_new(widget));
    ck_assert_int_eq(eina_array_count(arr_selected), 2);
    ck_assert_ptr_eq(eina_array_data_get(arr_selected, 0), efl_pack_content_get(widget, 1));
    ck_assert_ptr_eq(eina_array_data_get(arr_selected, 1), efl_pack_content_get(widget, 2));
@@ -239,7 +239,7 @@ EFL_END_TEST
 void
 efl_ui_multi_selectable_behavior_test(TCase *tc)
 {
-   //Items are getting added by the fixture added in efl_ui_single_selectable_behavior_test
+   //Items are getting added by the fixture added in efl_ui_selectable_behavior_test
    tcase_add_test(tc, test_multi_select);
    tcase_add_test(tc, test_multi_select_removal);
    tcase_add_test(tc, test_single_select);
diff --git a/src/tests/elementary/spec/efl_test_single_selectable.c b/src/tests/elementary/spec/efl_test_single_selectable.c
index 35cf343d24..b4873ae7cb 100644
--- a/src/tests/elementary/spec/efl_test_single_selectable.c
+++ b/src/tests/elementary/spec/efl_test_single_selectable.c
@@ -37,32 +37,32 @@ EFL_START_TEST(last_selectable_check)
 {
    int c = 0;
 
-   efl_event_callback_add(widget, EFL_UI_SINGLE_SELECTABLE_EVENT_SELECTION_CHANGED, (void*) event_callback_single_call_int_data, &c);
-   efl_event_callback_add(widget, EFL_UI_SINGLE_SELECTABLE_EVENT_SELECTION_CHANGED, event_callback_that_quits_the_main_loop_when_called, NULL);
+   efl_event_callback_add(widget, EFL_UI_SELECTABLE_EVENT_SELECTION_CHANGED, (void*) event_callback_single_call_int_data, &c);
+   efl_event_callback_add(widget, EFL_UI_SELECTABLE_EVENT_SELECTION_CHANGED, event_callback_that_quits_the_main_loop_when_called, NULL);
 
    Eo *c1 = efl_pack_content_get(widget, 0);
    Eo *c2 = efl_pack_content_get(widget, 2);
 
    efl_ui_selectable_selected_set(c1, EINA_TRUE);
-   ck_assert_ptr_eq(efl_ui_single_selectable_last_selected_get(widget), c1);
+   ck_assert_ptr_eq(efl_ui_selectable_last_selected_get(widget), c1);
    if (c == 0) efl_loop_begin(efl_main_loop_get());
    ck_assert_int_eq(c, 1);
    c = 0;
 
    efl_ui_selectable_selected_set(c2, EINA_TRUE);
-   ck_assert_ptr_eq(efl_ui_single_selectable_last_selected_get(widget), c2);
+   ck_assert_ptr_eq(efl_ui_selectable_last_selected_get(widget), c2);
    if (c == 0) efl_loop_begin(efl_main_loop_get());
    ck_assert_int_eq(c, 1);
    c = 0;
 
    efl_ui_selectable_selected_set(c1, EINA_FALSE);
-   ck_assert_ptr_eq(efl_ui_single_selectable_last_selected_get(widget), c2);
+   ck_assert_ptr_eq(efl_ui_selectable_last_selected_get(widget), c2);
    efl_ui_selectable_selected_set(c2, EINA_FALSE);
    if (c == 0) efl_loop_begin(efl_main_loop_get());
    ck_assert_int_eq(c, 1);
    c = 0;
 
-   ck_assert_ptr_eq(efl_ui_single_selectable_last_selected_get(widget), NULL);
+   ck_assert_ptr_eq(efl_ui_selectable_last_selected_get(widget), NULL);
 }
 EFL_END_TEST
 
@@ -71,7 +71,7 @@ EFL_START_TEST(fallback_selection)
    Eo *c1 = efl_pack_content_get(widget, 0);
    Eo *c2 = efl_pack_content_get(widget, 2);
 
-   efl_ui_single_selectable_fallback_selection_set(widget, c2);
+   efl_ui_selectable_fallback_selection_set(widget, c2);
    ck_assert_int_eq(efl_ui_selectable_selected_get(c2), EINA_TRUE);
    efl_ui_selectable_selected_set(c1, EINA_TRUE);
    ck_assert_int_eq(efl_ui_selectable_selected_get(c2), EINA_FALSE);