diff --git a/legacy/elementary/doc/widgets/widget_preview_conformant.c b/legacy/elementary/doc/widgets/widget_preview_conformant.c
index 904047bc23..bcae68f558 100644
--- a/legacy/elementary/doc/widgets/widget_preview_conformant.c
+++ b/legacy/elementary/doc/widgets/widget_preview_conformant.c
@@ -21,7 +21,7 @@ elm_box_pack_end(bx, btn);
 
 Evas_Object *en = elm_entry_add(win);
 elm_entry_scrollable_set(en, EINA_TRUE);
-elm_entry_entry_set(en,
+elm_object_text_set(en,
                     "This is a multi-line entry<br>"
                     "This can contain more than 1 line of text and be "
                     "scrolled around to allow for entering of lots of "
diff --git a/legacy/elementary/src/bin/config.c b/legacy/elementary/src/bin/config.c
index 865aa00f83..7ef90c7e74 100644
--- a/legacy/elementary/src/bin/config.c
+++ b/legacy/elementary/src/bin/config.c
@@ -2182,10 +2182,10 @@ _profiles_list_selected_cb(void            *data,
 
    en = evas_object_data_get(obj, "prof_desc_entry");
 #ifdef ELM_EFREET
-   if (desk) elm_entry_entry_set(en, desk->comment);
+   if (desk) elm_object_text_set(en, desk->comment);
    else
 #endif
-   elm_entry_entry_set(en, "Unknown");
+   elm_object_text_set(en, "Unknown");
 
 #ifdef ELM_EFREET
    if (desk) efreet_desktop_free(desk);
diff --git a/legacy/elementary/src/bin/test_calendar.c b/legacy/elementary/src/bin/test_calendar.c
index bf09470a69..7d235c8713 100644
--- a/legacy/elementary/src/bin/test_calendar.c
+++ b/legacy/elementary/src/bin/test_calendar.c
@@ -53,7 +53,7 @@ _print_cal_info(Evas_Object *cal, Evas_Object *en)
 	 interval, year_min, year_max, sel_enabled,
 	 wds[0], wds[1], wds[2], wds[3], wds[4], wds[5], wds[6]);
 
-   elm_entry_entry_set(en, info);
+   elm_object_text_set(en, info);
 }
 
 static void
diff --git a/legacy/elementary/src/bin/test_cnp.c b/legacy/elementary/src/bin/test_cnp.c
index f0408c1b26..a8374de5d9 100644
--- a/legacy/elementary/src/bin/test_cnp.c
+++ b/legacy/elementary/src/bin/test_cnp.c
@@ -47,7 +47,7 @@ test_cnp(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __
    elm_entry_line_wrap_set(en, ELM_WRAP_CHAR);
    evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(en, EVAS_HINT_FILL, EVAS_HINT_FILL);
-   elm_entry_entry_set(en,
+   elm_object_text_set(en,
 				"Elementary provides "
                                 );
    elm_grid_pack(gd, en, 10, 10, 60, 40);
@@ -64,7 +64,7 @@ test_cnp(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __
    elm_entry_line_wrap_set(en, ELM_WRAP_CHAR);
    evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(en, EVAS_HINT_FILL, EVAS_HINT_FILL);
-   elm_entry_entry_set(en,
+   elm_object_text_set(en,
 				"rich copying and pasting functionality,"
                                 );
    elm_grid_pack(gd, en, 10, 50, 60, 40);
diff --git a/legacy/elementary/src/bin/test_conform.c b/legacy/elementary/src/bin/test_conform.c
index a0dd3f684a..899aaf2947 100644
--- a/legacy/elementary/src/bin/test_conform.c
+++ b/legacy/elementary/src/bin/test_conform.c
@@ -32,7 +32,7 @@ test_conformant(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event
    elm_entry_scrollable_set(en, EINA_TRUE);
    elm_entry_single_line_set(en, 1);
    elm_entry_bounce_set(en, 1, 0);
-   elm_entry_entry_set(en, "This is the top entry here");
+   elm_object_text_set(en, "This is the top entry here");
    evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, 0.0);
    evas_object_size_hint_align_set(en, EVAS_HINT_FILL, 0.5);
    evas_object_show(en);
@@ -49,7 +49,7 @@ test_conformant(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event
    elm_entry_scrollable_set(en, EINA_TRUE);
    elm_entry_single_line_set(en, 1);
    elm_entry_bounce_set(en, 1, 0);
-   elm_entry_entry_set(en, "This is the middle entry here");
+   elm_object_text_set(en, "This is the middle entry here");
    evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, 0.0);
    evas_object_size_hint_align_set(en, EVAS_HINT_FILL, 0.5);
    evas_object_show(en);
@@ -65,7 +65,7 @@ test_conformant(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event
    en = elm_entry_add(win);
    elm_entry_scrollable_set(en, EINA_TRUE);
    elm_entry_bounce_set(en, 0, 1);
-   elm_entry_entry_set(en,
+   elm_object_text_set(en,
                        "This is a multi-line entry at the bottom<br/>"
                        "This can contain more than 1 line of text and be "
                        "scrolled around to allow for entering of lots of "
@@ -118,7 +118,7 @@ test_conformant2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event
    elm_entry_scrollable_set(en, EINA_TRUE);
    elm_entry_single_line_set(en, 1);
    elm_entry_bounce_set(en, 1, 0);
-   elm_entry_entry_set(en, "This is the top entry here");
+   elm_object_text_set(en, "This is the top entry here");
    evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, 0.0);
    evas_object_size_hint_align_set(en, EVAS_HINT_FILL, 0.5);
    elm_box_pack_end(bx, en);
@@ -153,7 +153,7 @@ test_conformant2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event
    en = elm_entry_add(win);
    elm_entry_scrollable_set(en, EINA_TRUE);
    elm_entry_bounce_set(en, 0, 1);
-   elm_entry_entry_set(en, "This entry and button below get deleted.");
+   elm_object_text_set(en, "This entry and button below get deleted.");
    evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(en, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_show(en);
@@ -185,7 +185,7 @@ test_conformant2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event
    en = elm_entry_add(win);
    elm_entry_scrollable_set(en, EINA_TRUE);
    elm_entry_bounce_set(en, 0, 1);
-   elm_entry_entry_set(en, "This entry and button below get deleted.");
+   elm_object_text_set(en, "This entry and button below get deleted.");
    evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(en, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_show(en);
diff --git a/legacy/elementary/src/bin/test_cursor.c b/legacy/elementary/src/bin/test_cursor.c
index 19a6c06df5..b3b9102c4c 100644
--- a/legacy/elementary/src/bin/test_cursor.c
+++ b/legacy/elementary/src/bin/test_cursor.c
@@ -148,7 +148,7 @@ test_cursor(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
 
    entry = elm_entry_add(win);
    elm_entry_scrollable_set(entry, EINA_TRUE);
-   elm_entry_entry_set(entry, "Xterm cursor");
+   elm_object_text_set(entry, "Xterm cursor");
    elm_entry_single_line_set(entry, EINA_TRUE);
    evas_object_size_hint_weight_set(entry, EVAS_HINT_EXPAND, 0);
    evas_object_size_hint_fill_set(entry, EVAS_HINT_FILL, EVAS_HINT_FILL);
diff --git a/legacy/elementary/src/bin/test_entry.c b/legacy/elementary/src/bin/test_entry.c
index 5266fde17e..03070aba77 100644
--- a/legacy/elementary/src/bin/test_entry.c
+++ b/legacy/elementary/src/bin/test_entry.c
@@ -7,14 +7,14 @@ static void
 my_entry_bt_1(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
    Evas_Object *en = data;
-   elm_entry_entry_set(en, "");
+   elm_object_text_set(en, "");
 }
 
 static void
 my_entry_bt_2(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
    Evas_Object *en = data;
-   const char *s = elm_entry_entry_get(en);
+   const char *s = elm_object_text_get(en);
    printf("ENTRY:\n");
    if (s) printf("%s\n", s);
    printf("ENTRY PLAIN UTF8:\n");
@@ -127,7 +127,7 @@ test_entry(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
             " ... end."
             , elm_app_data_dir_get()
             );
-   elm_entry_entry_set(en, buf);
+   elm_object_text_set(en, buf);
    evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(en, EVAS_HINT_FILL, EVAS_HINT_FILL);
    elm_box_pack_end(bx, en);
@@ -209,14 +209,14 @@ static void
 my_scrolled_entry_bt_1(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
    Evas_Object *en = data;
-   elm_entry_entry_set(en, "");
+   elm_object_text_set(en, "");
 }
 
 static void
 my_scrolled_entry_bt_2(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
    Evas_Object *en = data;
-   const char *s = elm_entry_entry_get(en);
+   const char *s = elm_object_text_get(en);
    printf("ENTRY:\n");
    if (s) printf("%s\n", s);
    printf("ENTRY PLAIN UTF8:\n");
@@ -261,7 +261,7 @@ static void
 my_scrolled_entry_bt_5(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
    Evas_Object *en = data;
-   const char *s = elm_entry_entry_get(en);
+   const char *s = elm_object_text_get(en);
    printf("PASSWORD: '%s'\n", s ? s : "");
 }
 
@@ -299,7 +299,7 @@ test_entry_scrolled(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *ev
    evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, 0.0);
    evas_object_size_hint_align_set(en, EVAS_HINT_FILL, 0.5);
    elm_entry_scrollbar_policy_set(en, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
-   elm_entry_entry_set(en, "Disabled entry");
+   elm_object_text_set(en, "Disabled entry");
    elm_entry_single_line_set(en, 1);
    elm_object_disabled_set(en, 1);
    evas_object_show(en);
@@ -313,7 +313,7 @@ test_entry_scrolled(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *ev
    elm_entry_scrollbar_policy_set(en, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
    elm_entry_password_set(en, 1);
    elm_entry_single_line_set(en, 1);
-   elm_entry_entry_set(en, "Access denied, give up!");
+   elm_object_text_set(en, "Access denied, give up!");
    elm_object_disabled_set(en, 1);
    evas_object_show(en);
    elm_box_pack_end(bx, en);
@@ -327,7 +327,7 @@ test_entry_scrolled(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *ev
    elm_object_disabled_set(en, 1);
    elm_entry_context_menu_item_add(en, "Hello", NULL, ELM_ICON_NONE, NULL, NULL);
    elm_entry_context_menu_item_add(en, "World", NULL, ELM_ICON_NONE, NULL, NULL);
-   elm_entry_entry_set(en,
+   elm_object_text_set(en,
 				"Multi-line disabled entry widget :)<br/>"
 				"We can use markup <b>like this</> for styling and<br/>"
 				"formatting <em>like this</>, as well as<br/>"
@@ -346,7 +346,7 @@ test_entry_scrolled(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *ev
    elm_entry_scrollable_set(en, EINA_TRUE);
    evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, 0.0);
    evas_object_size_hint_align_set(en, EVAS_HINT_FILL, 0.5);
-   elm_entry_entry_set(en, "This is a single line");
+   elm_object_text_set(en, "This is a single line");
    elm_entry_scrollbar_policy_set(en, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
    elm_entry_single_line_set(en, 1);
    elm_entry_select_all(en);
@@ -358,7 +358,7 @@ test_entry_scrolled(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *ev
    elm_entry_scrollable_set(en, EINA_TRUE);
    evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, 0.0);
    evas_object_size_hint_align_set(en, EVAS_HINT_FILL, 0.5);
-   elm_entry_entry_set(en, "01234");
+   elm_object_text_set(en, "01234");
    elm_entry_scrollbar_policy_set(en, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
    elm_entry_single_line_set(en, 1);
    evas_object_show(en);
@@ -373,7 +373,7 @@ test_entry_scrolled(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *ev
    elm_entry_scrollable_set(en, EINA_TRUE);
    evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, 0.0);
    evas_object_size_hint_align_set(en, EVAS_HINT_FILL, 0.5);
-   elm_entry_entry_set(en, "No numbers here");
+   elm_object_text_set(en, "No numbers here");
    elm_entry_scrollbar_policy_set(en, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
    elm_entry_single_line_set(en, 1);
    evas_object_show(en);
@@ -388,7 +388,7 @@ test_entry_scrolled(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *ev
    elm_entry_scrollable_set(en, EINA_TRUE);
    evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, 0.0);
    evas_object_size_hint_align_set(en, EVAS_HINT_FILL, 0.5);
-   elm_entry_entry_set(en, "Just 20 chars");
+   elm_object_text_set(en, "Just 20 chars");
    elm_entry_scrollbar_policy_set(en, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
    elm_entry_single_line_set(en, 1);
    evas_object_show(en);
@@ -403,7 +403,7 @@ test_entry_scrolled(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *ev
    elm_entry_scrollable_set(en, EINA_TRUE);
    evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, 0.0);
    evas_object_size_hint_align_set(en, EVAS_HINT_FILL, 0.5);
-   elm_entry_entry_set(en, "And now only 30 bytes");
+   elm_object_text_set(en, "And now only 30 bytes");
    elm_entry_scrollbar_policy_set(en, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
    elm_entry_single_line_set(en, 1);
    evas_object_show(en);
@@ -419,7 +419,7 @@ test_entry_scrolled(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *ev
    evas_object_size_hint_weight_set(en_p, EVAS_HINT_EXPAND, 0.0);
    evas_object_size_hint_align_set(en_p, EVAS_HINT_FILL, 0.5);
    elm_entry_scrollbar_policy_set(en_p, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
-   elm_entry_entry_set(en_p, "Password here");
+   elm_object_text_set(en_p, "Password here");
    elm_entry_single_line_set(en_p, 1);
    elm_entry_password_set(en_p, 1);
    evas_object_show(en_p);
@@ -444,7 +444,7 @@ test_entry_scrolled(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *ev
    evas_object_size_hint_min_set(bt, 48, 48);
    evas_object_show(bt);
    elm_entry_end_set(en, bt);
-   elm_entry_entry_set(en, "scrolled entry with icon and end objects");
+   elm_object_text_set(en, "scrolled entry with icon and end objects");
    evas_object_show(en);
    elm_box_pack_end(bx, en);
 
@@ -454,7 +454,7 @@ test_entry_scrolled(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *ev
    evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(en, EVAS_HINT_FILL, EVAS_HINT_FILL);
    elm_entry_scrollbar_policy_set(en, ELM_SCROLLER_POLICY_ON, ELM_SCROLLER_POLICY_ON);
-   elm_entry_entry_set(en,
+   elm_object_text_set(en,
 				"This is an entry widget in this window that<br/>"
 				"uses markup <b>like this</> for styling and<br/>"
 				"formatting <em>like this</>, as well as<br/>"
@@ -538,14 +538,14 @@ static void
 my_ent_bt_clr(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
    Evas_Object *en = data;
-   elm_entry_entry_set(en, "");
+   elm_object_text_set(en, "");
 }
 
 static void
 my_ent_bt_pri(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
    Evas_Object *en = data;
-   const char *s = elm_entry_entry_get(en);
+   const char *s = elm_object_text_get(en);
    printf("ENTRY:\n");
    if (s) printf("%s\n", s);
    printf("ENTRY PLAIN UTF8:\n");
@@ -739,7 +739,7 @@ test_entry3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, 0.0);
    evas_object_size_hint_align_set(en, EVAS_HINT_FILL, 0.5);
    elm_entry_scrollbar_policy_set(en, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
-   elm_entry_entry_set(en, "This is a single line");
+   elm_object_text_set(en, "This is a single line");
    elm_entry_single_line_set(en, 1);
    elm_box_pack_end(bx, en);
    evas_object_show(en);
@@ -1001,7 +1001,7 @@ test_entry3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    elm_entry_scrollable_set(en, EINA_TRUE);
    evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(en, EVAS_HINT_FILL, EVAS_HINT_FILL);
-   elm_entry_entry_set(en,
+   elm_object_text_set(en,
 				"This is an entry widget in this window that<br/>"
 				"uses markup <b>like this</> for styling and<br/>"
 				"formatting <em>like this</>, as well as<br/>"
@@ -1303,14 +1303,14 @@ test_entry4(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, 0.0);
    evas_object_size_hint_align_set(en, EVAS_HINT_FILL, 0.5);
    elm_entry_scrollbar_policy_set(en, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
-   elm_entry_entry_set(en, "This is a single line");
+   elm_object_text_set(en, "This is a single line");
    elm_entry_single_line_set(en, 1);
    elm_object_part_content_set(ly, "element1", en);
    evas_object_show(en);
 
    en = elm_entry_add(win);
    elm_entry_line_wrap_set(en, ELM_WRAP_NONE);
-   elm_entry_entry_set(en,
+   elm_object_text_set(en,
 		       "This is an entry widget<br/>"
 		       "that uses markup<br/>"
                        "<b>like this</> and has<br/>"
@@ -1325,7 +1325,7 @@ test_entry4(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    elm_entry_scrollable_set(en, EINA_TRUE);
    evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(en, EVAS_HINT_FILL, EVAS_HINT_FILL);
-   elm_entry_entry_set(en,
+   elm_object_text_set(en,
 				"This is an entry widget in this window that<br/>"
 				"uses markup <b>like this</> for styling and<br/>"
 				"formatting <em>like this</>, as well as<br/>"
@@ -1369,7 +1369,7 @@ test_entry5(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    elm_entry_line_wrap_set(en, ELM_WRAP_CHAR);
    evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(en, EVAS_HINT_FILL, EVAS_HINT_FILL);
-   elm_entry_entry_set(en,
+   elm_object_text_set(en,
 				"This is an entry widget in this window that "
 				"uses markup like this for styling and "
 				"formatting like this, as well as "
@@ -1645,7 +1645,7 @@ static void
 _scrolled_entry_clear(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
    Evas_Object *en = data;
-   elm_entry_entry_set(en, "");
+   elm_object_text_set(en, "");
 }
 
 void
diff --git a/legacy/elementary/src/bin/test_fileselector_button.c b/legacy/elementary/src/bin/test_fileselector_button.c
index 90775655c5..24f881bb47 100644
--- a/legacy/elementary/src/bin/test_fileselector_button.c
+++ b/legacy/elementary/src/bin/test_fileselector_button.c
@@ -13,7 +13,7 @@ _file_chosen(void            *data,
    const char *file = event_info;
    if (file)
      {
-        elm_entry_entry_set(entry, file);
+        elm_object_text_set(entry, file);
         printf("File chosen: %s\n", file);
      }
    else
diff --git a/legacy/elementary/src/bin/test_fileselector_entry.c b/legacy/elementary/src/bin/test_fileselector_entry.c
index ff21a5da98..d340668f3f 100644
--- a/legacy/elementary/src/bin/test_fileselector_entry.c
+++ b/legacy/elementary/src/bin/test_fileselector_entry.c
@@ -11,7 +11,7 @@ _file_chosen(void            *data,
 {
    Evas_Object *entry = data;
    char *file = event_info;
-   elm_entry_entry_set(entry, file);
+   elm_object_text_set(entry, file);
    printf("File chosen: %s\n", file);
 }
 
diff --git a/legacy/elementary/src/bin/test_flip.c b/legacy/elementary/src/bin/test_flip.c
index 980a327616..bbf130b6c3 100644
--- a/legacy/elementary/src/bin/test_flip.c
+++ b/legacy/elementary/src/bin/test_flip.c
@@ -301,7 +301,7 @@ test_flip2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
             " ... end."
             , elm_app_data_dir_get()
            );
-   elm_entry_entry_set(en, buf);
+   elm_object_text_set(en, buf);
    evas_object_size_hint_align_set(en, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
 
diff --git a/legacy/elementary/src/bin/test_focus.c b/legacy/elementary/src/bin/test_focus.c
index ad4ca967cb..14da12d1b0 100644
--- a/legacy/elementary/src/bin/test_focus.c
+++ b/legacy/elementary/src/bin/test_focus.c
@@ -115,7 +115,7 @@ test_focus(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
              elm_entry_scrollable_set(en, EINA_TRUE);
              evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, 0.0);
              evas_object_size_hint_align_set(en, EVAS_HINT_FILL, 0.5);
-             elm_entry_entry_set(en, "This is a single line");
+             elm_object_text_set(en, "This is a single line");
              elm_entry_single_line_set(en, 1);
              elm_box_pack_end(bx, en);
              my_show(en);
diff --git a/legacy/elementary/src/bin/test_focus2.c b/legacy/elementary/src/bin/test_focus2.c
index 401067dc2d..5d9d6b562b 100644
--- a/legacy/elementary/src/bin/test_focus2.c
+++ b/legacy/elementary/src/bin/test_focus2.c
@@ -81,7 +81,7 @@ test_focus2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, 0.0);
    evas_object_size_hint_align_set(en, EVAS_HINT_FILL, 0.5);
    elm_entry_scrollbar_policy_set(en, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
-   elm_entry_entry_set(en, "Scrolled Entry that should get focus");
+   elm_object_text_set(en, "Scrolled Entry that should get focus");
    elm_entry_single_line_set(en, 1);
    evas_object_show(en);
    elm_box_pack_end(bx, en);
@@ -109,7 +109,7 @@ test_focus2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, 0.0);
    evas_object_size_hint_align_set(en, EVAS_HINT_FILL, 0.5);
    elm_entry_scrollbar_policy_set(en, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
-   elm_entry_entry_set(en, "Scrolled Entry that should get focus");
+   elm_object_text_set(en, "Scrolled Entry that should get focus");
    elm_entry_single_line_set(en, 1);
    elm_object_part_content_set(ly, "element2", en);
 
diff --git a/legacy/elementary/src/bin/test_focus3.c b/legacy/elementary/src/bin/test_focus3.c
index 8318718676..fcce984831 100644
--- a/legacy/elementary/src/bin/test_focus3.c
+++ b/legacy/elementary/src/bin/test_focus3.c
@@ -28,7 +28,7 @@ _add(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 
    en = elm_entry_add(elm_object_top_widget_get(bx));
    elm_entry_scrollable_set(en, EINA_TRUE);
-   elm_entry_entry_set(en, "An entry");
+   elm_object_text_set(en, "An entry");
    evas_object_smart_callback_add(en, "focused", _foc, NULL);
    evas_object_smart_callback_add(en, "unfocused", _unfoc, NULL);
    evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, 0.0);
@@ -73,7 +73,7 @@ test_focus3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
 
    en = elm_entry_add(win);
    elm_entry_scrollable_set(en, EINA_TRUE);
-   elm_entry_entry_set(en, "An entry");
+   elm_object_text_set(en, "An entry");
    evas_object_smart_callback_add(en, "focused", _foc, NULL);
    evas_object_smart_callback_add(en, "unfocused", _unfoc, NULL);
    evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, 0.0);
diff --git a/legacy/elementary/src/bin/test_genlist.c b/legacy/elementary/src/bin/test_genlist.c
index fe50117c09..2a3cd74586 100644
--- a/legacy/elementary/src/bin/test_genlist.c
+++ b/legacy/elementary/src/bin/test_genlist.c
@@ -1252,7 +1252,7 @@ test_genlist7_swipe(void *data, Evas_Object *obj __UNUSED__, void *event_info)
    entry = elm_entry_add(info->win);
    elm_entry_scrollable_set(entry, EINA_TRUE);
    elm_entry_editable_set(entry, EINA_FALSE);
-   elm_entry_entry_set(entry, item_data);
+   elm_object_text_set(entry, item_data);
    evas_object_size_hint_weight_set(entry, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(entry, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_show(entry);
diff --git a/legacy/elementary/src/bin/test_gesture_layer.c b/legacy/elementary/src/bin/test_gesture_layer.c
index f72b415250..9bcff04294 100644
--- a/legacy/elementary/src/bin/test_gesture_layer.c
+++ b/legacy/elementary/src/bin/test_gesture_layer.c
@@ -385,7 +385,7 @@ test_gesture_layer(void *data __UNUSED__, Evas_Object *obj __UNUSED__,
    photo_array[ind++] = photo_object_add(win, NULL, buf, 40, 300, 365, 400, 45);
 
    Evas_Object *en = elm_entry_add(win);
-   elm_entry_entry_set(en, "You can use whatever object you want, "
+   elm_object_text_set(en, "You can use whatever object you want, "
          "even entries like this.");
    elm_entry_line_wrap_set(en, ELM_WRAP_MIXED);
 
diff --git a/legacy/elementary/src/bin/test_grid.c b/legacy/elementary/src/bin/test_grid.c
index c1f838bb7a..07dde6039a 100644
--- a/legacy/elementary/src/bin/test_grid.c
+++ b/legacy/elementary/src/bin/test_grid.c
@@ -34,14 +34,14 @@ test_grid(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info _
 
    en = elm_entry_add(win);
    elm_entry_scrollable_set(en, EINA_TRUE);
-   elm_entry_entry_set(en, "Entry text");
+   elm_object_text_set(en, "Entry text");
    elm_entry_single_line_set(en, 1);
    elm_grid_pack(gd, en, 50, 10, 40, 10);
    evas_object_show(en);
 
    en = elm_entry_add(win);
    elm_entry_scrollable_set(en, EINA_TRUE);
-   elm_entry_entry_set(en, "Entry text 2");
+   elm_object_text_set(en, "Entry text 2");
    elm_entry_single_line_set(en, 1);
    elm_grid_pack(gd, en, 60, 20, 30, 10);
    evas_object_show(en);
diff --git a/legacy/elementary/src/bin/test_index.c b/legacy/elementary/src/bin/test_index.c
index 9c428f8276..1b5bbee917 100644
--- a/legacy/elementary/src/bin/test_index.c
+++ b/legacy/elementary/src/bin/test_index.c
@@ -143,7 +143,7 @@ test_index2_it_add(void *data, Evas_Object *obj __UNUSED__, void *event_info __U
    const char *label;
    char letter[2];
 
-   label = elm_entry_entry_get(gui->entry);
+   label = elm_object_text_get(gui->entry);
    snprintf(letter, sizeof(letter), "%c", label[0]);
    it = elm_list_item_sorted_insert(gui->lst, label, NULL, NULL, NULL, NULL,
                                     test_index2_cmp);
@@ -224,7 +224,7 @@ test_index2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
 
    gui->entry = elm_entry_add(win);
    elm_entry_scrollable_set(gui->entry, EINA_TRUE);
-   elm_entry_entry_set(gui->entry, "Label");
+   elm_object_text_set(gui->entry, "Label");
    elm_entry_single_line_set(gui->entry, EINA_TRUE);
    evas_object_size_hint_weight_set(gui->entry, EVAS_HINT_EXPAND, 0);
    evas_object_size_hint_fill_set(gui->entry, EVAS_HINT_FILL, EVAS_HINT_FILL);
diff --git a/legacy/elementary/src/bin/test_list.c b/legacy/elementary/src/bin/test_list.c
index dca0565df5..2399df3ac8 100644
--- a/legacy/elementary/src/bin/test_list.c
+++ b/legacy/elementary/src/bin/test_list.c
@@ -613,7 +613,7 @@ test_list4_swipe(void        *data,
    entry = elm_entry_add(info->win);
    elm_entry_scrollable_set(entry, EINA_TRUE);
    elm_entry_editable_set(entry, EINA_FALSE);
-   elm_entry_entry_set(entry, item_data);
+   elm_object_text_set(entry, item_data);
    evas_object_size_hint_weight_set(entry, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(entry, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_show(entry);
diff --git a/legacy/elementary/src/bin/test_tooltip.c b/legacy/elementary/src/bin/test_tooltip.c
index 38565aacf9..be1d2f41db 100644
--- a/legacy/elementary/src/bin/test_tooltip.c
+++ b/legacy/elementary/src/bin/test_tooltip.c
@@ -479,7 +479,7 @@ test_tooltip(void *data       __UNUSED__,
    evas_object_size_hint_align_set(se, EVAS_HINT_FILL, 0.5);
    elm_entry_scrollbar_policy_set(se, ELM_SCROLLER_POLICY_OFF,
                                            ELM_SCROLLER_POLICY_OFF);
-   elm_entry_entry_set(se, "Hello, some scrolled entry here!");
+   elm_object_text_set(se, "Hello, some scrolled entry here!");
    elm_object_tooltip_text_set(se, "Type something here!");
    elm_entry_single_line_set(se, 1);
    elm_box_pack_end(bx, se);
diff --git a/legacy/elementary/src/bin/test_weather.c b/legacy/elementary/src/bin/test_weather.c
index 9d86b7c2a3..873a1a7531 100644
--- a/legacy/elementary/src/bin/test_weather.c
+++ b/legacy/elementary/src/bin/test_weather.c
@@ -36,7 +36,7 @@ static void _apply_cb(void *data __UNUSED__, Evas_Object *o __UNUSED__, void *ev
 
    if (module[current])
      eweather_plugin_set(eweather, module[current]);
-   eweather_code_set(eweather, elm_entry_entry_get(en));
+   eweather_code_set(eweather, elm_object_text_get(en));
    printf("CURRENT %d %p %p\n", current, module[current], eweather);
 }
 
@@ -147,7 +147,7 @@ test_weather(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_inf
    en = elm_entry_add(win);
    elm_entry_line_wrap_set(en, ELM_WRAP_NONE);
    elm_entry_single_line_set(en, EINA_TRUE);
-   elm_entry_entry_set(en, "Paris");
+   elm_object_text_set(en, "Paris");
    evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(en, EVAS_HINT_FILL, EVAS_HINT_FILL);
    elm_box_pack_end(bx0, en);
diff --git a/legacy/elementary/src/bin/test_web.c b/legacy/elementary/src/bin/test_web.c
index 613402f5aa..85294987aa 100644
--- a/legacy/elementary/src/bin/test_web.c
+++ b/legacy/elementary/src/bin/test_web.c
@@ -66,7 +66,7 @@ _uri_changed_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info)
 {
    Web_Test *wt = data;
 
-   elm_entry_entry_set(wt->url_entry, event_info);
+   elm_object_text_set(wt->url_entry, event_info);
 
    elm_object_disabled_set(wt->btn_back, !elm_web_back_possible(wt->web));
    elm_object_disabled_set(wt->btn_fwd, !elm_web_forward_possible(wt->web));
diff --git a/legacy/elementary/src/bin/test_win_inline.c b/legacy/elementary/src/bin/test_win_inline.c
index 0a3b5cb8e2..8de02667a5 100644
--- a/legacy/elementary/src/bin/test_win_inline.c
+++ b/legacy/elementary/src/bin/test_win_inline.c
@@ -30,7 +30,7 @@ fill(Evas_Object *win, Eina_Bool do_bg)
    elm_entry_scrollable_set(en, EINA_TRUE);
    evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, 0.0);
    evas_object_size_hint_align_set(en, EVAS_HINT_FILL, 0.5);
-   elm_entry_entry_set(en, "This is a single line");
+   elm_object_text_set(en, "This is a single line");
    elm_entry_scrollbar_policy_set(en, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
    elm_entry_single_line_set(en, 1);
    evas_object_show(en);
@@ -40,7 +40,7 @@ fill(Evas_Object *win, Eina_Bool do_bg)
    elm_entry_scrollable_set(en, EINA_TRUE);
    evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, 0.0);
    evas_object_size_hint_align_set(en, EVAS_HINT_FILL, 0.5);
-   elm_entry_entry_set(en, "Entry 2");
+   elm_object_text_set(en, "Entry 2");
    elm_entry_scrollbar_policy_set(en, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
    elm_entry_single_line_set(en, 1);
    evas_object_show(en);
diff --git a/legacy/elementary/src/edje_externals/elm_entry.c b/legacy/elementary/src/edje_externals/elm_entry.c
index 7998f81700..46056969b1 100644
--- a/legacy/elementary/src/edje_externals/elm_entry.c
+++ b/legacy/elementary/src/edje_externals/elm_entry.c
@@ -58,7 +58,7 @@ external_entry_state_set(void *data __UNUSED__, Evas_Object *obj, const void *fr
    if (p->icon)
      elm_entry_icon_set(obj, p->icon);
    if (p->entry)
-     elm_entry_entry_set(obj, p->entry);
+     elm_object_text_set(obj, p->entry);
    if (p->scrollable_exists)
      elm_entry_scrollable_set(obj, p->scrollable);
    if (p->single_line_exists)
@@ -108,7 +108,7 @@ external_entry_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_Ext
      {
         if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
           {
-             elm_entry_entry_set(obj, param->s);
+             elm_object_text_set(obj, param->s);
              return EINA_TRUE;
           }
      }
@@ -204,7 +204,7 @@ external_entry_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_Ext
      {
         if (param->type ==  EDJE_EXTERNAL_PARAM_TYPE_STRING)
           {
-             param->s = elm_entry_entry_get(obj);
+             param->s = elm_object_text_get(obj);
              return EINA_TRUE;
           }
      }
diff --git a/legacy/elementary/src/examples/conformant_example_01.c b/legacy/elementary/src/examples/conformant_example_01.c
index e6528840a1..0ec34fbd0a 100644
--- a/legacy/elementary/src/examples/conformant_example_01.c
+++ b/legacy/elementary/src/examples/conformant_example_01.c
@@ -44,7 +44,7 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__)
 
    en = elm_entry_add(win);
    elm_entry_scrollable_set(en, EINA_TRUE);
-   elm_entry_entry_set(en,
+   elm_object_text_set(en,
                        "This is a multi-line entry at the bottom<br>"
                        "This can contain more than 1 line of text and be "
                        "scrolled around to allow for entering of lots of "
diff --git a/legacy/elementary/src/examples/conformant_example_02.c b/legacy/elementary/src/examples/conformant_example_02.c
index 80d401ad36..0c05b0500a 100644
--- a/legacy/elementary/src/examples/conformant_example_02.c
+++ b/legacy/elementary/src/examples/conformant_example_02.c
@@ -50,7 +50,7 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__)
 
    en = elm_entry_add(win);
    elm_entry_scrollable_set(en, EINA_TRUE);
-   elm_entry_entry_set(en,
+   elm_object_text_set(en,
                        "This is a multi-line entry at the bottom<br>"
                        "This can contain more than 1 line of text and be "
                        "scrolled around to allow for entering of lots of "
diff --git a/legacy/elementary/src/examples/fileselector_button_example.c b/legacy/elementary/src/examples/fileselector_button_example.c
index f9be84a0b4..a76cede44f 100644
--- a/legacy/elementary/src/examples/fileselector_button_example.c
+++ b/legacy/elementary/src/examples/fileselector_button_example.c
@@ -33,7 +33,7 @@ _file_chosen(void            *data,
    const char *file = event_info;
    if (file)
      {
-        elm_entry_entry_set(entry, file);
+        elm_object_text_set(entry, file);
         printf("File chosen: %s\n", file);
      }
    else
diff --git a/legacy/elementary/src/lib/elc_anchorblock.c b/legacy/elementary/src/lib/elc_anchorblock.c
index cfeab470b0..d37e939fe1 100644
--- a/legacy/elementary/src/lib/elc_anchorblock.c
+++ b/legacy/elementary/src/lib/elc_anchorblock.c
@@ -188,7 +188,7 @@ _elm_anchorblock_text_set(Evas_Object *obj, const char *item, const char *text)
    Widget_Data *wd = elm_widget_data_get(obj);
    if (item && strcmp(item, "default")) return;
    if (!wd) return;
-   elm_entry_entry_set(wd->entry, text);
+   elm_object_text_set(wd->entry, text);
    if (wd->hover) evas_object_del(wd->hover);
    if (wd->pop) evas_object_del(wd->pop);
    wd->hover = NULL;
@@ -203,7 +203,7 @@ _elm_anchorblock_text_get(const Evas_Object *obj, const char *item)
    Widget_Data *wd = elm_widget_data_get(obj);
    if (item && strcmp(item, "default")) return NULL;
    if (!wd) return NULL;
-   return elm_entry_entry_get(wd->entry);
+   return elm_object_text_get(wd->entry);
 }
 
 EAPI Evas_Object *
@@ -236,7 +236,7 @@ elm_anchorblock_add(Evas_Object *parent)
    evas_object_event_callback_add(wd->entry, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
                                   _changed_size_hints, obj);
 
-   elm_entry_entry_set(wd->entry, "");
+   elm_object_text_set(wd->entry, "");
 
    evas_object_smart_callback_add(wd->entry, "anchor,clicked",
                                   _anchor_clicked, obj);
diff --git a/legacy/elementary/src/lib/elc_anchorview.c b/legacy/elementary/src/lib/elc_anchorview.c
index 16994c76d4..1245d9559c 100644
--- a/legacy/elementary/src/lib/elc_anchorview.c
+++ b/legacy/elementary/src/lib/elc_anchorview.c
@@ -182,7 +182,7 @@ _elm_anchorview_text_set(Evas_Object *obj, const char *item, const char *text)
    Widget_Data *wd = elm_widget_data_get(obj);
    if (item && strcmp(item, "default")) return;
    if (!wd) return;
-   elm_entry_entry_set(wd->entry, text);
+   elm_object_text_set(wd->entry, text);
    if (wd->hover) evas_object_del(wd->hover);
    if (wd->pop) evas_object_del(wd->pop);
    wd->hover = NULL;
@@ -197,7 +197,7 @@ _elm_anchorview_text_get(const Evas_Object *obj, const char *item)
    Widget_Data *wd = elm_widget_data_get(obj);
    if (item && strcmp(item, "default")) return NULL;
    if (!wd) return NULL;
-   return elm_entry_entry_get(wd->entry);
+   return elm_object_text_get(wd->entry);
 }
 
 EAPI Evas_Object *
@@ -233,7 +233,7 @@ elm_anchorview_add(Evas_Object *parent)
    evas_object_event_callback_add(wd->entry, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
                                   _changed_size_hints, obj);
 
-   elm_entry_entry_set(wd->entry, "");
+   elm_object_text_set(wd->entry, "");
 
    evas_object_smart_callback_add(wd->entry, "anchor,clicked",
                                   _anchor_clicked, obj);
diff --git a/legacy/elementary/src/lib/elc_fileselector.c b/legacy/elementary/src/lib/elc_fileselector.c
index 0380f7a3d1..7c7269930b 100644
--- a/legacy/elementary/src/lib/elc_fileselector.c
+++ b/legacy/elementary/src/lib/elc_fileselector.c
@@ -376,7 +376,7 @@ _sel_do(void *data)
         if (wd->expand && wd->mode == ELM_FILESELECTOR_LIST)
           {
              _do_anchors(sd->fs, path);
-             elm_entry_entry_set(wd->filename_entry, "");
+             elm_object_text_set(wd->filename_entry, "");
           }
         else
           {
@@ -398,7 +398,7 @@ _sel_do(void *data)
              _populate(sd->fs, p, NULL);
              eina_stringshare_del(p);
           }
-        elm_entry_entry_set(wd->filename_entry,
+        elm_object_text_set(wd->filename_entry,
                                      ecore_file_file_get(path));
      }
 
@@ -544,7 +544,7 @@ _do_anchors(Evas_Object *obj,
    free(tok[0]);
    free(tok);
 
-   elm_entry_entry_set(wd->path_entry, buf);
+   elm_object_text_set(wd->path_entry, buf);
 }
 
 #ifdef HAVE_EIO
@@ -636,7 +636,7 @@ _signal_first(Widget_Request *wr)
         _do_anchors(wr->obj, wr->path);
      }
 
-   if (wr->wd->filename_entry) elm_entry_entry_set(wr->wd->filename_entry, "");
+   if (wr->wd->filename_entry) elm_object_text_set(wr->wd->filename_entry, "");
 
    wr->first = EINA_FALSE;
 }
@@ -733,7 +733,7 @@ _populate(Evas_Object      *obj,
         _do_anchors(obj, path);
      }
 
-   if (wd->filename_entry) elm_entry_entry_set(wd->filename_entry, "");
+   if (wd->filename_entry) elm_object_text_set(wd->filename_entry, "");
    EINA_ITERATOR_FOREACH(it, file)
      {
         const char *filename;
@@ -1141,7 +1141,7 @@ elm_fileselector_selected_get(const Evas_Object *obj)
         char *dir;
 
         dir = wd->only_folder ? ecore_file_dir_get(wd->path) : strdup(wd->path);
-        name = elm_entry_entry_get(wd->filename_entry);
+        name = elm_object_text_get(wd->filename_entry);
         snprintf(buf, sizeof(buf), "%s/%s",
                  dir, name);
         if (wd->only_folder && !ecore_file_is_dir(buf))
@@ -1186,7 +1186,7 @@ elm_fileselector_selected_set(Evas_Object *obj,
         _populate(obj, ecore_file_dir_get(path), NULL);
         if (wd->filename_entry)
           {
-             elm_entry_entry_set(wd->filename_entry,
+             elm_object_text_set(wd->filename_entry,
                                           ecore_file_file_get(path));
              eina_stringshare_replace(&wd->selection, path);
           }
diff --git a/legacy/elementary/src/lib/elc_fileselector_entry.c b/legacy/elementary/src/lib/elc_fileselector_entry.c
index bad2cafd58..96769d0fbd 100644
--- a/legacy/elementary/src/lib/elc_fileselector_entry.c
+++ b/legacy/elementary/src/lib/elc_fileselector_entry.c
@@ -71,7 +71,7 @@ _FILE_CHOSEN_fwd(void *data, Evas_Object *obj __UNUSED__, void *event_info)
 {
    Widget_Data *wd = elm_widget_data_get(data);
    const char *file = event_info;
-   elm_entry_entry_set(wd->entry, file);
+   elm_object_text_set(wd->entry, file);
    evas_object_smart_callback_call(data, SIG_FILE_CHOSEN, event_info);
 }
 
@@ -79,7 +79,7 @@ static void
 _ACTIVATED_fwd(void *data, Evas_Object *obj __UNUSED__, void *event_info)
 {
    Widget_Data *wd = elm_widget_data_get(data);
-   const char *file = elm_entry_entry_get(wd->entry);
+   const char *file = elm_object_text_get(wd->entry);
    elm_fileselector_button_path_set(wd->button, file);
    evas_object_smart_callback_call(data, SIG_ACTIVATED, event_info);
 }
@@ -385,7 +385,7 @@ elm_fileselector_entry_path_set(Evas_Object *obj, const char *path)
    Widget_Data *wd = elm_widget_data_get(obj);
    if (!wd) return;
    elm_fileselector_button_path_set(wd->button, path);
-   elm_entry_entry_set(wd->entry, path);
+   elm_object_text_set(wd->entry, path);
 }
 
 EAPI const char *
@@ -394,7 +394,7 @@ elm_fileselector_entry_path_get(const Evas_Object *obj)
    ELM_CHECK_WIDTYPE(obj, widtype) NULL;
    Widget_Data *wd = elm_widget_data_get(obj);
    if (!wd) return NULL;
-   return elm_entry_entry_get(wd->entry);
+   return elm_object_text_get(wd->entry);
 }
 
 EAPI void
diff --git a/legacy/elementary/src/lib/elc_multibuttonentry.c b/legacy/elementary/src/lib/elc_multibuttonentry.c
index cb7a01ce1b..411d1d4812 100644
--- a/legacy/elementary/src/lib/elc_multibuttonentry.c
+++ b/legacy/elementary/src/lib/elc_multibuttonentry.c
@@ -777,7 +777,7 @@ _add_button_item(Evas_Object *obj, const char *str, Multibuttonentry_Pos pos, co
    str_utf8 = elm_entry_markup_to_utf8(str);
 
    //entry is cleared when text is made to button
-   elm_entry_entry_set(wd->entry, "");
+   elm_object_text_set(wd->entry, "");
 
    _elm_theme_object_set(obj, btn, "multibuttonentry", "btn", elm_widget_style_get(obj));
    edje_object_part_text_set(btn, "elm.btn.text", str_utf8);
@@ -984,7 +984,7 @@ _entry_key_up_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, vo
 
    if (!wd || !wd->base || !wd->box) return;
 
-   str = elm_entry_entry_get(wd->entry);
+   str = elm_object_text_get(wd->entry);
 
    if ((strcmp(str, "") != 0) && (strcmp(ev->keyname, "KP_Enter") == 0 || strcmp(ev->keyname, "Return") == 0 ))
      {
@@ -1027,7 +1027,7 @@ _entry_focus_out_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info __
 
    if (!wd) return;
 
-   str = elm_entry_entry_get(wd->entry);
+   str = elm_object_text_get(wd->entry);
    if (strlen(str))
      _add_button(data, str);
 }
@@ -1040,7 +1040,7 @@ _entry_changed_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info __UN
 
    if (!wd) return;
 
-   str = elm_entry_entry_get(wd->entry);
+   str = elm_object_text_get(wd->entry);
    wd->n_str = strlen(str);
 }
 
@@ -1089,7 +1089,7 @@ _view_init(Evas_Object *obj)
         wd->entry = elm_entry_add (obj);
         if (!wd->entry) return;
         elm_entry_single_line_set(wd->entry, EINA_TRUE);
-        elm_entry_entry_set(wd->entry, "");
+        elm_object_text_set(wd->entry, "");
         elm_entry_cursor_end_set(wd->entry);
         evas_object_size_hint_min_set(wd->entry, MIN_W_ENTRY, 0);
         evas_object_size_hint_weight_set(wd->entry, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
diff --git a/legacy/elementary/src/lib/elc_scrolled_entry.c b/legacy/elementary/src/lib/elc_scrolled_entry.c
index c1de28e439..f47e0aab51 100644
--- a/legacy/elementary/src/lib/elc_scrolled_entry.c
+++ b/legacy/elementary/src/lib/elc_scrolled_entry.c
@@ -46,13 +46,13 @@ elm_scrolled_entry_password_get(const Evas_Object *obj)
 {return elm_entry_password_get(obj);}
 EINA_DEPRECATED EAPI void
 elm_scrolled_entry_entry_set(Evas_Object *obj, const char *entry)
-{elm_entry_entry_set(obj, entry);}
+{elm_object_text_set(obj, entry);}
 EINA_DEPRECATED EAPI void
 elm_scrolled_entry_entry_append(Evas_Object *obj, const char *entry)
 {elm_entry_entry_append(obj, entry);}
 EINA_DEPRECATED EAPI const char *
 elm_scrolled_entry_entry_get(const Evas_Object *obj)
-{return elm_entry_entry_get(obj);}
+{return elm_object_text_get(obj);}
 EINA_DEPRECATED EAPI Eina_Bool
 elm_scrolled_entry_is_empty(const Evas_Object *obj)
 {return elm_entry_is_empty(obj);}
diff --git a/legacy/elementary/src/lib/elm_entry.c b/legacy/elementary/src/lib/elm_entry.c
index 94c89218da..9dd3ce5f33 100644
--- a/legacy/elementary/src/lib/elm_entry.c
+++ b/legacy/elementary/src/lib/elm_entry.c
@@ -273,7 +273,7 @@ _load(Evas_Object *obj)
    if (!wd) return;
    if (!wd->file)
      {
-        elm_entry_entry_set(obj, "");
+        elm_object_text_set(obj, "");
         return;
      }
    switch (wd->format)
@@ -290,11 +290,11 @@ _load(Evas_Object *obj)
      }
    if (text)
      {
-        elm_entry_entry_set(obj, text);
+        elm_object_text_set(obj, text);
         free(text);
      }
    else
-     elm_entry_entry_set(obj, "");
+     elm_object_text_set(obj, "");
 }
 
 static void
@@ -338,10 +338,10 @@ _save(Evas_Object *obj)
    switch (wd->format)
      {
       case ELM_TEXT_FORMAT_PLAIN_UTF8:
-         _save_plain_utf8(wd->file, elm_entry_entry_get(obj));
+         _save_plain_utf8(wd->file, elm_object_text_get(obj));
          break;
       case ELM_TEXT_FORMAT_MARKUP_UTF8:
-         _save_markup_utf8(wd->file, elm_entry_entry_get(obj));
+         _save_markup_utf8(wd->file, elm_object_text_get(obj));
          break;
       default:
          break;
@@ -519,11 +519,11 @@ _theme_hook(Evas_Object *obj)
    _elm_widget_mirrored_reload(obj);
    _mirrored_set(obj, elm_widget_mirrored_get(obj));
 
-   t = eina_stringshare_add(elm_entry_entry_get(obj));
+   t = eina_stringshare_add(elm_object_text_get(obj));
    _elm_theme_object_set(obj, wd->ent, "entry", _getbase(obj), elm_widget_style_get(obj));
    if (_elm_config->desktop_entry)
      edje_object_part_text_select_allow_set(wd->ent, "elm.text", EINA_TRUE);
-   elm_entry_entry_set(obj, t);
+   elm_object_text_set(obj, t);
    eina_stringshare_del(t);
    if (elm_widget_disabled_get(obj))
      edje_object_signal_emit(wd->ent, "elm,state,disabled", "elm");
@@ -2475,7 +2475,7 @@ elm_entry_password_get(const Evas_Object *obj)
    return wd->password;
 }
 
-EAPI void
+EINA_DEPRECATED EAPI void
 elm_entry_entry_set(Evas_Object *obj, const char *entry)
 {
    _elm_entry_text_set(obj, NULL, entry);
@@ -2512,7 +2512,7 @@ elm_entry_entry_append(Evas_Object *obj, const char *entry)
      }
 }
 
-EAPI const char *
+EINA_DEPRECATED EAPI const char *
 elm_entry_entry_get(const Evas_Object *obj)
 {
    return _elm_entry_text_get(obj, NULL);
@@ -3021,6 +3021,12 @@ elm_entry_utf8_to_markup(const char *s)
    return ss;
 }
 
+static const char *
+_text_get(const Evas_Object *obj)
+{
+   return elm_object_text_get(obj);
+}
+
 EAPI void
 elm_entry_filter_limit_size(void *data, Evas_Object *entry, char **text)
 {
@@ -3037,10 +3043,7 @@ elm_entry_filter_limit_size(void *data, Evas_Object *entry, char **text)
    /* hack. I don't want to copy the entire function to work with
     * scrolled_entry */
    widget_type = elm_widget_type_get(entry);
-   if (!strcmp(widget_type, "entry"))
-     text_get = elm_entry_entry_get;
-   else /* huh? */
-     return;
+   text_get = _text_get;
 
    current = elm_entry_markup_to_utf8(text_get(entry));
    utfstr = elm_entry_markup_to_utf8(*text);
diff --git a/legacy/elementary/src/lib/elm_spinner.c b/legacy/elementary/src/lib/elm_spinner.c
index 5db909ddf3..fb6a310647 100644
--- a/legacy/elementary/src/lib/elm_spinner.c
+++ b/legacy/elementary/src/lib/elm_spinner.c
@@ -200,7 +200,7 @@ _entry_show(Widget_Data *wd)
           }
      }
    snprintf(buf, sizeof(buf), fmt, wd->val);
-   elm_entry_entry_set(wd->ent, buf);
+   elm_object_text_set(wd->ent, buf);
 }
 
 static void
@@ -364,7 +364,7 @@ _apply_entry_value(Evas_Object *obj)
 
    if (!wd) return;
    _hide_entry(obj);
-   str = elm_entry_entry_get(wd->ent);
+   str = elm_object_text_get(wd->ent);
    if (!str) return;
    val = strtod(str, &end);
    if ((*end != '\0') && (!isspace(*end))) return;