diff --git a/src/bin/test_hoversel.c b/src/bin/test_hoversel.c
index 1f1d3ca..832ee0f 100644
--- a/src/bin/test_hoversel.c
+++ b/src/bin/test_hoversel.c
@@ -38,7 +38,7 @@ set_api_state(api_data *api)
 
       case HOVERSEL_ICON_UNSET: /* 3 */
          elm_object_text_set(eina_list_nth(items, 5), "Label only");
-         elm_hoversel_icon_unset(eina_list_nth(items, 5));
+         elm_object_part_content_unset(eina_list_nth(items, 5), "icon");
          break;
 
       case HOVERSEL_CLEAR_OPEN: /* 4 */
@@ -171,7 +171,7 @@ TEST_START(test_hoversel)
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/sky_03.jpg", elm_app_data_dir_get());
    elm_icon_file_set(ic, buf, NULL);
-   elm_hoversel_icon_set(bt, ic);
+   elm_object_part_content_set(bt, "icon", ic);
    evas_object_show(ic);
 
    elm_hoversel_item_add(bt, "Item 1", "apps", ELM_ICON_STANDARD, NULL, NULL);
diff --git a/src/bin/test_toolbar.c b/src/bin/test_toolbar.c
index 86be1e7..7dc47a7 100644
--- a/src/bin/test_toolbar.c
+++ b/src/bin/test_toolbar.c
@@ -88,7 +88,7 @@ TEST_START(test_toolbar)
    ph4 = elm_photo_add(win);
 
    tb_it = elm_toolbar_item_append(tb, "document-print", "Hello", tb_1, ph1);
-   elm_toolbar_item_disabled_set(tb_it, EINA_TRUE);
+   elm_object_item_disabled_set(tb_it, EINA_TRUE);
    elm_toolbar_item_priority_set(tb_it, 100);
 
    tb_it = elm_toolbar_item_append(tb, "folder-new", "World", tb_2, ph1);
@@ -194,7 +194,7 @@ TEST_START(test_toolbar2)
    ph4 = elm_photo_add(win);
 
    item = elm_toolbar_item_append(tb, "document-print", "Hello", tb_1, ph1);
-   elm_toolbar_item_disabled_set(item, EINA_TRUE);
+   elm_object_item_disabled_set(item, EINA_TRUE);
    elm_toolbar_item_priority_set(item, -100);
 
    item = elm_toolbar_item_append(tb, "folder-new", "World", tb_2, ph1);
@@ -300,7 +300,7 @@ TEST_START(test_toolbar3)
    ph4 = elm_photo_add(win);
 
    tb_it = elm_toolbar_item_append(tb, "document-print", "Hello", tb_1, ph1);
-   elm_toolbar_item_disabled_set(tb_it, EINA_TRUE);
+   elm_object_item_disabled_set(tb_it, EINA_TRUE);
    elm_toolbar_item_priority_set(tb_it, 0);
 
    tb_it = elm_toolbar_item_append(tb, "folder-new", "World", tb_2, ph1);
@@ -406,7 +406,7 @@ TEST_START(test_toolbar4)
    ph4 = elm_photo_add(win);
 
    tb_it = elm_toolbar_item_append(tb, "document-print", "Hello", tb_1, ph1);
-   elm_toolbar_item_disabled_set(tb_it, EINA_TRUE);
+   elm_object_item_disabled_set(tb_it, EINA_TRUE);
    elm_toolbar_item_priority_set(tb_it, 100);
 
    tb_it = elm_toolbar_item_append(tb, "folder-new", "World", tb_2, ph1);
@@ -513,7 +513,7 @@ TEST_START(test_toolbar5)
    ph4 = elm_photo_add(win);
 
    tb_it = elm_toolbar_item_append(tb, "document-print", "Hello", tb_1, ph1);
-   elm_toolbar_item_disabled_set(tb_it, EINA_TRUE);
+   elm_object_item_disabled_set(tb_it, EINA_TRUE);
    elm_toolbar_item_priority_set(tb_it, 100);
 
    snprintf(buf, sizeof(buf), "%s/images/icon_04.pngj", elm_app_data_dir_get());
@@ -623,7 +623,7 @@ TEST_START(test_toolbar6)
    ph4 = elm_photo_add(win);
 
    tb_it = elm_toolbar_item_append(tb, "document-print", "Hello", tb_1, ph1);
-   elm_toolbar_item_disabled_set(tb_it, EINA_TRUE);
+   elm_object_item_disabled_set(tb_it, EINA_TRUE);
    elm_toolbar_item_priority_set(tb_it, 100);
 
    tb_it = elm_toolbar_item_append(tb, "folder-new", "World", tb_2, ph1);