evas_textblock_legacy: change the name of efl_canvas_textblockdevs/woohyun/remove_canvas_text

19 files changed, 556 insertions, 556 deletions

diff --git a/src/bin/elementary/test_efl_ui_text.c b/src/bin/elementary/test_efl_ui_text.c
index d8c98da07a..a72e34d80d 100644
--- a/src/bin/elementary/test_efl_ui_text.c
+++ b/src/bin/elementary/test_efl_ui_text.c
@@ -103,7 +103,7 @@ _on_bt3_clicked(void *data, const Efl_Event *event EINA_UNUSED)
    Eo *en = data;
 
    efl_text_interactive_selection_cursors_get(data, &sel_start, &sel_end);
-   const char *s = efl_canvas_textblock_range_text_get(data, sel_start, sel_end);
+   const char *s = evas_textblock_legacy_range_text_get(data, sel_start, sel_end);
 
    printf("SELECTION REGION: %d - %d\n",
          efl_text_cursor_position_get(en, sel_start),
diff --git a/src/bin/elementary/test_gfx_filters.c b/src/bin/elementary/test_gfx_filters.c
index cca2f4d9c6..0c81516775 100644
--- a/src/bin/elementary/test_gfx_filters.c
+++ b/src/bin/elementary/test_gfx_filters.c
@@ -492,7 +492,7 @@ test_gfx_filters(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
 
       // Experimental textblock support
       o = tb = evas_object_textblock_add(evas_object_evas_get(win));
-      efl_event_callback_add(o, EFL_CANVAS_TEXTBLOCK_EVENT_STYLE_INSETS_CHANGED, _textblock_resize, NULL);
+      efl_event_callback_add(o, EVAS_TEXTBLOCK_LEGACY_EVENT_STYLE_INSETS_CHANGED, _textblock_resize, NULL);
       efl_event_callback_add(o, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED, _textblock_resize, NULL);
       Evas_Textblock_Style *st = evas_textblock_style_new();
       evas_textblock_style_set(st, "DEFAULT='font=Sans font_size=20 color=#FFF wrap=word'");
diff --git a/src/bin/elementary/test_photocam.c b/src/bin/elementary/test_photocam.c
index 2d051dcb08..a8f2319525 100644
--- a/src/bin/elementary/test_photocam.c
+++ b/src/bin/elementary/test_photocam.c
@@ -818,7 +818,7 @@ test_image_zoomable_animated(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSE
            efl_text_set(efl_added, "Clicking the image will play/pause animation."),
            efl_text_interactive_editable_set(efl_added, EINA_FALSE),
            efl_gfx_hint_weight_set(efl_added, 1, 0),
-           efl_canvas_textblock_style_set(efl_added, NULL, "DEFAULT='align=center font=Sans font_size=10 color=#fff wrap=word'"),
+           evas_textblock_legacy_style_set(efl_added, NULL, "DEFAULT='align=center font=Sans font_size=10 color=#fff wrap=word'"),
            efl_pack(bx, efl_added)
           );
 
diff --git a/src/lib/edje/edje_textblock.c b/src/lib/edje/edje_textblock.c
index 84b4f84808..9ed9e153b3 100644
--- a/src/lib/edje/edje_textblock.c
+++ b/src/lib/edje/edje_textblock.c
@@ -61,7 +61,7 @@ _edje_part_recalc_single_textblock_min_max_calc_legacy(Edje_Real_Part *ep,
         if (!minx2)
           {
              efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(TO_INT(params->eval.w),  TO_INT(params->eval.h)));
-             efl_canvas_textblock_size_formatted_get(ep->object, &tw, &th);
+             evas_textblock_legacy_size_formatted_get(ep->object, &tw, &th);
           }
         else
           evas_object_textblock_size_native_get(ep->object, &tw, &th);
@@ -87,7 +87,7 @@ _edje_part_recalc_single_textblock_min_max_calc_legacy(Edje_Real_Part *ep,
         if (!maxx2)
           {
              efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(TO_INT(params->eval.w),  TO_INT(params->eval.h)));
-             efl_canvas_textblock_size_formatted_get(ep->object, &tw, &th);
+             evas_textblock_legacy_size_formatted_get(ep->object, &tw, &th);
           }
         else
           evas_object_textblock_size_native_get(ep->object, &tw, &th);
@@ -178,14 +178,14 @@ _edje_part_recalc_single_textblock_min_max_calc(Edje_Real_Part *ep,
              if (temp_w > 0)
                {
                   efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(temp_w,  temp_h));
-                  efl_canvas_textblock_size_formatted_get(ep->object, &tw, &th);
+                  evas_textblock_legacy_size_formatted_get(ep->object, &tw, &th);
 
                   tw += ins_l + ins_r;
                   th += ins_t + ins_b;
                }
              else
                {
-                  efl_canvas_textblock_size_native_get(ep->object, NULL, &th);
+                  evas_textblock_legacy_size_native_get(ep->object, NULL, &th);
 
                   th += ins_t + ins_b;
                }
@@ -216,7 +216,7 @@ _edje_part_recalc_single_textblock_min_max_calc(Edje_Real_Part *ep,
                     }
 
                   efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(temp_w,  temp_h));
-                  efl_canvas_textblock_size_formatted_get(ep->object, &tw, &th);
+                  evas_textblock_legacy_size_formatted_get(ep->object, &tw, &th);
 
                   tw += ins_l + ins_r;
                   th += ins_t + ins_b;
@@ -225,7 +225,7 @@ _edje_part_recalc_single_textblock_min_max_calc(Edje_Real_Part *ep,
                    * don't get meaningless height for multiline */
                   if (temp_w <= 0)
                     {
-                       efl_canvas_textblock_size_native_get(ep->object, NULL, &th);
+                       evas_textblock_legacy_size_native_get(ep->object, NULL, &th);
 
                        th += ins_t + ins_b;
                     }
@@ -238,7 +238,7 @@ _edje_part_recalc_single_textblock_min_max_calc(Edje_Real_Part *ep,
                    * text.min: 1 X
                    * text.max: 0 X without max width.
                    * It is a singleline Textblock. */
-                  efl_canvas_textblock_size_native_get(ep->object, &tw, &th);
+                  evas_textblock_legacy_size_native_get(ep->object, &tw, &th);
 
                   tw += ins_l + ins_r;
                   th += ins_t + ins_b;
@@ -301,14 +301,14 @@ _edje_part_recalc_single_textblock_min_max_calc(Edje_Real_Part *ep,
                   if (temp_w > 0)
                     {
                        efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(temp_w,  temp_h));
-                       efl_canvas_textblock_size_formatted_get(ep->object, &tw, &th);
+                       evas_textblock_legacy_size_formatted_get(ep->object, &tw, &th);
 
                        tw += ins_l + ins_r;
                        th += ins_t + ins_b;
                     }
                   else
                     {
-                       efl_canvas_textblock_size_native_get(ep->object, NULL, &th);
+                       evas_textblock_legacy_size_native_get(ep->object, NULL, &th);
 
                        th += ins_t + ins_b;
                     }
@@ -322,7 +322,7 @@ _edje_part_recalc_single_textblock_min_max_calc(Edje_Real_Part *ep,
                   /* text.min: 1 X
                    * text.max: 1 X
                    * Singleline. */
-                  efl_canvas_textblock_size_native_get(ep->object, &tw, &th);
+                  evas_textblock_legacy_size_native_get(ep->object, &tw, &th);
 
                   tw += ins_l + ins_r;
                   th += ins_t + ins_b;
@@ -359,7 +359,7 @@ _edje_part_recalc_single_textblock_min_max_calc(Edje_Real_Part *ep,
                              * text.max: 1 1 */
 
                             efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(temp_w,  temp_h));
-                            efl_canvas_textblock_size_formatted_get(ep->object, &tw, &th);
+                            evas_textblock_legacy_size_formatted_get(ep->object, &tw, &th);
 
                             tw += ins_l + ins_r;
                             th += ins_t + ins_b;
@@ -368,7 +368,7 @@ _edje_part_recalc_single_textblock_min_max_calc(Edje_Real_Part *ep,
                              * don't get meaningless height for multiline */
                             if (temp_w <= 0)
                               {
-                                 efl_canvas_textblock_size_native_get(ep->object, NULL, &th);
+                                 evas_textblock_legacy_size_native_get(ep->object, NULL, &th);
 
                                  th += ins_t + ins_b;
                               }
@@ -386,7 +386,7 @@ _edje_part_recalc_single_textblock_min_max_calc(Edje_Real_Part *ep,
 
                        temp_h = efl_gfx_entity_size_get(ep->object).h;
                        efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(temp_w,  temp_h));
-                       efl_canvas_textblock_size_formatted_get(ep->object, &tw, &th);
+                       evas_textblock_legacy_size_formatted_get(ep->object, &tw, &th);
 
                        tw += ins_l + ins_r;
                        th += ins_t + ins_b;
@@ -395,7 +395,7 @@ _edje_part_recalc_single_textblock_min_max_calc(Edje_Real_Part *ep,
                         * don't get meaningless height for multiline */
                        if (temp_w <= 0)
                          {
-                            efl_canvas_textblock_size_native_get(ep->object, NULL, &th);
+                            evas_textblock_legacy_size_native_get(ep->object, NULL, &th);
 
                             th += ins_t + ins_b;
                          }
@@ -509,7 +509,7 @@ _edje_part_recalc_single_textblock(FLOAT_T sc,
 
                   if (ep->part->scale) base_s = TO_DOUBLE(sc);
                   efl_gfx_entity_scale_set(ep->object, base_s);
-                  efl_canvas_textblock_size_native_get(ep->object, &tw, &th);
+                  evas_textblock_legacy_size_native_get(ep->object, &tw, &th);
 
                   orig_s = base_s;
                   /* Now make it bigger so calculations will be more accurate
@@ -518,7 +518,7 @@ _edje_part_recalc_single_textblock(FLOAT_T sc,
                      orig_s = _edje_part_recalc_single_textblock_scale_range_adjust(chosen_desc, base_s,
                                                                                     orig_s * TO_INT(params->eval.w) / tw);
                      efl_gfx_entity_scale_set(ep->object, orig_s);
-                     efl_canvas_textblock_size_native_get(ep->object, &tw, &th);
+                     evas_textblock_legacy_size_native_get(ep->object, &tw, &th);
                   }
                   if (chosen_desc->text.fit_x)
                     {
@@ -527,7 +527,7 @@ _edje_part_recalc_single_textblock(FLOAT_T sc,
                             s = _edje_part_recalc_single_textblock_scale_range_adjust(chosen_desc, base_s,
                                                                                       orig_s * TO_INT(params->eval.w) / tw);
                             efl_gfx_entity_scale_set(ep->object, s);
-                            efl_canvas_textblock_size_native_get(ep->object, NULL, NULL);
+                            evas_textblock_legacy_size_native_get(ep->object, NULL, NULL);
                          }
                     }
                   if (chosen_desc->text.fit_y)
@@ -544,7 +544,7 @@ _edje_part_recalc_single_textblock(FLOAT_T sc,
                               }
 
                             efl_gfx_entity_scale_set(ep->object, s);
-                            efl_canvas_textblock_size_native_get(ep->object, NULL, NULL);
+                            evas_textblock_legacy_size_native_get(ep->object, NULL, NULL);
                          }
                     }
 
@@ -553,7 +553,7 @@ _edje_part_recalc_single_textblock(FLOAT_T sc,
                   {
                      int i = 5;   /* Tries before we give up. */
                      Evas_Coord fw, fh;
-                     efl_canvas_textblock_size_native_get(ep->object, &fw, &fh);
+                     evas_textblock_legacy_size_native_get(ep->object, &fw, &fh);
 
                      /* If we are still too big, try reducing the size to
                       * 95% each try. */
@@ -569,7 +569,7 @@ _edje_part_recalc_single_textblock(FLOAT_T sc,
                           s = tmp_s;
 
                           efl_gfx_entity_scale_set(ep->object, s);
-                          efl_canvas_textblock_size_native_get(ep->object, &fw, &fh);
+                          evas_textblock_legacy_size_native_get(ep->object, &fw, &fh);
                           i--;
                        }
                   }
diff --git a/src/lib/elementary/efl_ui_internal_text_interactive.c b/src/lib/elementary/efl_ui_internal_text_interactive.c
index a1c9bd4bd3..9ddf2332be 100644
--- a/src/lib/elementary/efl_ui_internal_text_interactive.c
+++ b/src/lib/elementary/efl_ui_internal_text_interactive.c
@@ -74,7 +74,7 @@ _preedit_del(Eo *obj, Efl_Ui_Internal_Text_Interactive_Data *en)
 static Eina_Bool
 _entry_imf_retrieve_surrounding_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, char **text, int *cursor_pos)
 {
-   Efl_Canvas_Textblock *obj = data;
+   Evas_Textblock_Legacy *obj = data;
    Efl_Text_Cursor_Cursor *cur = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_TYPE_MAIN);
    const char *str;
 
@@ -103,7 +103,7 @@ _entry_imf_retrieve_surrounding_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSE
 static void
 _entry_imf_event_commit_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, void *event_info)
 {
-   Efl_Canvas_Textblock *obj = data;
+   Evas_Textblock_Legacy *obj = data;
    Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS);
    char *commit_str = event_info;
 
@@ -176,7 +176,7 @@ _entry_imf_event_commit_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, void
 static void
 _entry_imf_event_preedit_changed_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, void *event_info EINA_UNUSED)
 {
-   Efl_Canvas_Textblock *obj = data;
+   Evas_Textblock_Legacy *obj = data;
    Efl_Text_Cursor_Cursor *cur = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_TYPE_MAIN);
    Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS);
    int cursor_pos;
@@ -329,7 +329,7 @@ _entry_imf_event_preedit_changed_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUS
 static void
 _entry_imf_event_delete_surrounding_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, void *event_info)
 {
-   Efl_Canvas_Textblock *obj = data;
+   Evas_Textblock_Legacy *obj = data;
    Efl_Text_Cursor_Cursor *cur = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_TYPE_MAIN);
    Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS);
    Ecore_IMF_Event_Delete_Surrounding *ev = event_info;
@@ -351,7 +351,7 @@ _entry_imf_event_delete_surrounding_cb(void *data, Ecore_IMF_Context *ctx EINA_U
    end = evas_textblock_cursor_pos_get(del_end);
    if (start == end) goto end;
 
-   tmp = efl_canvas_textblock_range_text_get(obj, del_start, del_end);
+   tmp = evas_textblock_legacy_range_text_get(obj, del_start, del_end);
 
    info.insert = EINA_FALSE;
    info.position = start;
@@ -373,7 +373,7 @@ end:
 static void
 _entry_imf_event_selection_set_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, void *event_info)
 {
-   Efl_Canvas_Textblock *obj = data;
+   Evas_Textblock_Legacy *obj = data;
    Efl_Text_Cursor_Cursor *cur = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_TYPE_MAIN);
    Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS);
    Ecore_IMF_Event_Selection *ev = event_info;
@@ -396,7 +396,7 @@ _entry_imf_event_selection_set_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED
 static Eina_Bool
 _entry_imf_retrieve_selection_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, char **text)
 {
-   Efl_Canvas_Textblock *obj = data;
+   Evas_Textblock_Legacy *obj = data;
    Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS);
    const char *selection_text = NULL;
 
@@ -500,7 +500,7 @@ static const char *
 _entry_selection_get(Efl_Ui_Internal_Text_Interactive *obj, Efl_Ui_Internal_Text_Interactive_Data *en)
 {
    if ((!en->selection) && (en->have_selection))
-     en->selection = efl_canvas_textblock_range_text_get(obj, en->sel_start, en->sel_end);
+     en->selection = evas_textblock_legacy_range_text_get(obj, en->sel_start, en->sel_end);
    return en->selection;
 }
 
@@ -601,7 +601,7 @@ _range_del_emit(Evas_Object *obj, Efl_Text_Cursor_Cursor *cur1, Efl_Text_Cursor_
    info.position = start;
    info.length = end - start;
 
-   tmp = efl_canvas_textblock_range_text_get(obj, cur1, cur2);
+   tmp = evas_textblock_legacy_range_text_get(obj, cur1, cur2);
    info.content = tmp;
 
    evas_textblock_cursor_range_delete(cur1, cur2);
@@ -752,7 +752,7 @@ _key_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void
      {
         if (multiline)
           {
-             if (shift || efl_canvas_textblock_legacy_newline_get(obj))
+             if (shift || evas_textblock_legacy_newline_get(obj))
                {
                   string = "\n";
                }
@@ -1070,7 +1070,7 @@ end:
 }
 
 static void
-_cursor_char_coord_set(Efl_Canvas_Textblock *obj, Efl_Text_Cursor_Cursor *cur, Evas_Coord canvasx, Evas_Coord canvasy, Evas_Coord *_cx, Evas_Coord *_cy)
+_cursor_char_coord_set(Evas_Textblock_Legacy *obj, Efl_Text_Cursor_Cursor *cur, Evas_Coord canvasx, Evas_Coord canvasy, Evas_Coord *_cx, Evas_Coord *_cy)
 {
    Evas_Coord cx, cy;
    Evas_Coord x, y, lh = 0, cly = 0;
@@ -1337,9 +1337,9 @@ _efl_ui_internal_text_interactive_efl_object_finalize(Eo *obj, Efl_Ui_Internal_T
    en->sel_start = evas_object_textblock_cursor_new(obj);
    en->sel_end = evas_object_textblock_cursor_new(obj);
 
-   efl_event_callback_add(obj, EFL_CANVAS_TEXTBLOCK_EVENT_CURSOR_CHANGED,
+   efl_event_callback_add(obj, EVAS_TEXTBLOCK_LEGACY_EVENT_CURSOR_CHANGED,
          _sel_cursor_changed, obj);
-   efl_event_callback_add(obj, EFL_CANVAS_TEXTBLOCK_EVENT_CURSOR_CHANGED,
+   efl_event_callback_add(obj, EVAS_TEXTBLOCK_LEGACY_EVENT_CURSOR_CHANGED,
          _sel_cursor_changed, obj);
 
    en->input_panel_enable = EINA_TRUE;
diff --git a/src/lib/elementary/efl_ui_internal_text_interactive.eo b/src/lib/elementary/efl_ui_internal_text_interactive.eo
index 1126cb81bf..d107c089bf 100644
--- a/src/lib/elementary/efl_ui_internal_text_interactive.eo
+++ b/src/lib/elementary/efl_ui_internal_text_interactive.eo
@@ -1,4 +1,4 @@
-class @beta Efl.Ui.Internal.Text.Interactive extends Efl.Canvas.Textblock implements Efl.Text_Interactive
+class @beta Efl.Ui.Internal.Text.Interactive extends Evas.Textblock.Legacy implements Efl.Text_Interactive
 {
    [[An internal object in charge of the interactive aspect of the text widget.
 
diff --git a/src/lib/elementary/efl_ui_internal_text_scroller.c b/src/lib/elementary/efl_ui_internal_text_scroller.c
index 455adb5ac2..b1870a3466 100644
--- a/src/lib/elementary/efl_ui_internal_text_scroller.c
+++ b/src/lib/elementary/efl_ui_internal_text_scroller.c
@@ -28,7 +28,7 @@
 
 typedef struct _Efl_Ui_Internal_Text_Scroller_Data
 {
-   Efl_Canvas_Textblock *text_obj;
+   Evas_Textblock_Legacy *text_obj;
    Efl_Ui_Table *text_table;
    Eo *smanager;
 
@@ -93,7 +93,7 @@ _efl_ui_internal_text_scroller_efl_canvas_group_group_calculate(Eo *obj,
         efl_event_freeze(sd->text_obj);
         efl_gfx_entity_size_set(sd->text_table, view.size);
         efl_gfx_entity_size_set(sd->text_obj, view.size);
-        efl_canvas_textblock_size_formatted_get(sd->text_obj, &fsz.w, &fsz.h);
+        evas_textblock_legacy_size_formatted_get(sd->text_obj, &fsz.w, &fsz.h);
         efl_gfx_entity_size_set(sd->text_table, sz);
         efl_gfx_entity_size_set(sd->text_obj, sz);
         efl_event_thaw(sd->text_obj);
@@ -144,7 +144,7 @@ _efl_ui_internal_text_scroller_efl_object_destructor(Eo *obj,
 EOLIAN static void
 _efl_ui_internal_text_scroller_initialize(Eo *obj,
                                        Efl_Ui_Internal_Text_Scroller_Data *sd,
-                                       Efl_Canvas_Textblock *text_obj,
+                                       Evas_Textblock_Legacy *text_obj,
                                        Efl_Ui_Table *text_table)
 {
    if (efl_finalized_get(obj))
diff --git a/src/lib/elementary/efl_ui_internal_text_scroller.eo b/src/lib/elementary/efl_ui_internal_text_scroller.eo
index 4b55bdfb15..d7ae9bf2fe 100644
--- a/src/lib/elementary/efl_ui_internal_text_scroller.eo
+++ b/src/lib/elementary/efl_ui_internal_text_scroller.eo
@@ -38,7 +38,7 @@ class @beta Efl.Ui.Internal_Text_Scroller extends Efl.Ui.Scroller
            This should be called upon constructing the object.
          ]]
          params {
-            text_obj: Efl.Canvas.Textblock; [[The text object to query]]
+            text_obj: Evas.Textblock.Legacy; [[The text object to query]]
             text_table: Efl.Ui.Table; [[The table container of
                the $text_obj]]
          }
diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c
index 9bd5e635bd..b00ce7f440 100644
--- a/src/lib/elementary/efl_ui_text.c
+++ b/src/lib/elementary/efl_ui_text.c
@@ -610,7 +610,7 @@ _selection_data_cb(void *data EINA_UNUSED, Eo *obj,
    efl_text_interactive_selection_cursors_get(obj, &start, &end);
    if (!efl_text_cursor_equal(obj, start, end))
      {
-        efl_canvas_textblock_range_delete(obj, start, end);
+        evas_textblock_legacy_range_delete(obj, start, end);
      }
    cur = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_TYPE_MAIN);
    info.insert = EINA_TRUE;
@@ -917,9 +917,9 @@ _efl_ui_text_efl_canvas_group_group_calculate(Eo *obj, Efl_Ui_Text_Data *sd)
         efl_gfx_entity_size_set(sd->text_obj, EINA_SIZE2D(sz.w, 0));
         /* ignore current object size for single-line since we always need to know the actual size */
         if (sd->single_line)
-          efl_canvas_textblock_size_native_get(sd->text_obj, &min.w, &min.h);
+          evas_textblock_legacy_size_native_get(sd->text_obj, &min.w, &min.h);
         else
-          efl_canvas_textblock_size_formatted_get(sd->text_obj, &min.w, &min.h);
+          evas_textblock_legacy_size_formatted_get(sd->text_obj, &min.w, &min.h);
         efl_gfx_entity_size_set(sd->text_obj, text_sz);
         efl_event_thaw(sd->text_obj);
         min.w += edmin.w;
@@ -937,7 +937,7 @@ _return_key_enabled_check(Evas_Object *obj)
 
    if (!sd->auto_return_key) return;
 
-   if (efl_canvas_textblock_is_empty_get(obj) == EINA_TRUE)
+   if (evas_textblock_legacy_is_empty_get(obj) == EINA_TRUE)
      return_key_disabled = EINA_TRUE;
 
    efl_ui_text_input_panel_return_key_disabled_set(obj, return_key_disabled);
@@ -1243,7 +1243,7 @@ _cut_cb(Eo *obj)
 
    _selection_store(EFL_UI_SELECTION_TYPE_CLIPBOARD, obj);
    efl_text_interactive_selection_cursors_get(obj, &start, &end);
-   efl_canvas_textblock_range_delete(obj, start, end);
+   evas_textblock_legacy_range_delete(obj, start, end);
    _efl_ui_text_select_none(obj, sd);
 }
 
@@ -2126,7 +2126,7 @@ _efl_ui_text_efl_object_constructor(Eo *obj, Efl_Ui_Text_Data *sd)
    efl_event_callback_forwarder_add(text_obj, EFL_UI_TEXT_EVENT_CHANGED, obj);
    efl_event_callback_forwarder_add(text_obj, EFL_TEXT_INTERACTIVE_EVENT_TEXT_SELECTION_CHANGED, obj);
    sd->text_obj = text_obj;
-   sd->text_guide_obj = efl_add(EFL_CANVAS_TEXTBLOCK_CLASS, obj);
+   sd->text_guide_obj = efl_add(EVAS_TEXTBLOCK_LEGACY_CLASS, obj);
    sd->text_table = efl_add(EFL_UI_TABLE_CLASS, obj);
    efl_composite_attach(obj, text_obj);
 
@@ -2190,11 +2190,11 @@ _efl_ui_text_efl_object_finalize(Eo *obj,
       (sd->entry_edje, EVAS_HINT_FILL, EVAS_HINT_FILL);
    efl_event_callback_add(sd->text_obj, EFL_UI_TEXT_EVENT_CHANGED_USER,
          _efl_ui_text_changed_user_cb, obj);
-   efl_event_callback_add(sd->text_obj, EFL_CANVAS_TEXTBLOCK_EVENT_CHANGED,
+   efl_event_callback_add(sd->text_obj, EVAS_TEXTBLOCK_LEGACY_EVENT_CHANGED,
          _efl_ui_text_changed_cb, obj);
    efl_event_callback_add(sd->text_obj, EFL_TEXT_INTERACTIVE_EVENT_TEXT_SELECTION_CHANGED,
          _efl_ui_text_selection_changed_cb, obj);
-   efl_event_callback_add(sd->text_obj, EFL_CANVAS_TEXTBLOCK_EVENT_CURSOR_CHANGED,
+   efl_event_callback_add(sd->text_obj, EVAS_TEXTBLOCK_LEGACY_EVENT_CURSOR_CHANGED,
          _efl_ui_text_cursor_changed_cb, obj);
    efl_event_callback_add(sd->text_obj, EFL_GFX_ENTITY_EVENT_POSITION_CHANGED,
          _text_position_changed_cb, obj);
@@ -2357,7 +2357,7 @@ _efl_ui_text_selection_get(const Eo *obj, Efl_Ui_Text_Data *sd)
    if ((sd->password)) return NULL;
 
    efl_text_interactive_selection_cursors_get(obj, &start_obj, &end_obj);
-   return efl_canvas_textblock_range_text_get(obj, start_obj, end_obj);
+   return evas_textblock_legacy_range_text_get(obj, start_obj, end_obj);
 }
 
 EOLIAN static void
@@ -3535,7 +3535,7 @@ _update_text_selection(Eo *obj, Eo *text_obj)
 
    efl_text_interactive_selection_cursors_get(text_obj, &sel_start, &sel_end);
 
-   range = efl_canvas_textblock_range_simple_geometry_get(text_obj,
+   range = evas_textblock_legacy_range_simple_geometry_get(text_obj,
          sel_start, sel_end);
 
    l = sd->sel;
@@ -3765,7 +3765,7 @@ _anchors_update(Eo *obj, Efl_Ui_Text_Data *sd)
                   efl_text_annotation_positions_get(obj, anc->annotation,
                         start, end);
 
-                  range = efl_canvas_textblock_range_geometry_get(obj, start, end);
+                  range = evas_textblock_legacy_range_geometry_get(obj, start, end);
                   count = eina_list_count(eina_iterator_container_get(range));
 
                   // Add additional rectangles if needed
@@ -3979,7 +3979,7 @@ _efl_ui_text_selection_changed_cb(void *data, const Efl_Event *event EINA_UNUSED
 
    efl_text_interactive_selection_cursors_get(obj, &start, &end);
 
-   text = efl_canvas_textblock_range_text_get(obj, start, end);
+   text = evas_textblock_legacy_range_text_get(obj, start, end);
    if (!text || (text[0] == '\0'))
      {
         _edje_signal_emit(sd, "selection,cleared", "efl.text");
diff --git a/src/lib/evas/Evas_Eo.h b/src/lib/evas/Evas_Eo.h
index cdec492829..79b62bfaba 100644
--- a/src/lib/evas/Evas_Eo.h
+++ b/src/lib/evas/Evas_Eo.h
@@ -150,12 +150,12 @@ struct _Efl_Canvas_Object_Animation_Event
  */
 
 /**
- * @ingroup Efl_Canvas_Textblock
+ * @ingroup Evas_Textblock_Legacy
  *
  * @{
  */
 //#include "canvas/efl_canvas_text_cursor.eo.h"
-#include "canvas/efl_canvas_textblock.eo.h"
+#include "canvas/evas_textblock_legacy.eo.h"
 #include "canvas/efl_canvas_text_factory.eo.h"
 /**
  * @}
diff --git a/src/lib/evas/canvas/efl_canvas_textblock_eo.legacy.c b/src/lib/evas/canvas/efl_canvas_textblock_eo.legacy.c
deleted file mode 100644
index 5ee2f8fd24..0000000000
--- a/src/lib/evas/canvas/efl_canvas_textblock_eo.legacy.c
+++ /dev/null
@@ -1,66 +0,0 @@
-
-EAPI Eina_Bool
-evas_object_textblock_visible_range_get(Efl_Canvas_Textblock *obj, Efl_Text_Cursor_Cursor *start, Efl_Text_Cursor_Cursor *end)
-{
-   return efl_canvas_textblock_visible_range_get(obj, start, end);
-}
-
-EAPI void
-evas_object_textblock_style_insets_get(const Efl_Canvas_Textblock *obj, int *l, int *r, int *t, int *b)
-{
-   efl_canvas_textblock_style_insets_get(obj, l, r, t, b);
-}
-
-EAPI void
-evas_object_textblock_bidi_delimiters_set(Efl_Canvas_Textblock *obj, const char *delim)
-{
-   efl_canvas_textblock_bidi_delimiters_set(obj, delim);
-}
-
-EAPI const char *
-evas_object_textblock_bidi_delimiters_get(const Efl_Canvas_Textblock *obj)
-{
-   return efl_canvas_textblock_bidi_delimiters_get(obj);
-}
-
-EAPI void
-evas_object_textblock_legacy_newline_set(Efl_Canvas_Textblock *obj, Eina_Bool mode)
-{
-   efl_canvas_textblock_legacy_newline_set(obj, mode);
-}
-
-EAPI Eina_Bool
-evas_object_textblock_legacy_newline_get(const Efl_Canvas_Textblock *obj)
-{
-   return efl_canvas_textblock_legacy_newline_get(obj);
-}
-
-EAPI void
-evas_object_textblock_size_formatted_get(const Efl_Canvas_Textblock *obj, int *w, int *h)
-{
-   efl_canvas_textblock_size_formatted_get(obj, w, h);
-}
-
-EAPI void
-evas_object_textblock_size_native_get(const Efl_Canvas_Textblock *obj, int *w, int *h)
-{
-   efl_canvas_textblock_size_native_get(obj, w, h);
-}
-
-EAPI Eina_Bool
-evas_object_textblock_obstacle_add(Efl_Canvas_Textblock *obj, Efl_Canvas_Object *eo_obs)
-{
-   return efl_canvas_textblock_obstacle_add(obj, eo_obs);
-}
-
-EAPI Eina_Bool
-evas_object_textblock_obstacle_del(Efl_Canvas_Textblock *obj, Efl_Canvas_Object *eo_obs)
-{
-   return efl_canvas_textblock_obstacle_del(obj, eo_obs);
-}
-
-EAPI void
-evas_object_textblock_obstacles_update(Efl_Canvas_Textblock *obj)
-{
-   efl_canvas_textblock_obstacles_update(obj);
-}
diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c
index 2adfeef39c..2f1b08f50c 100644
--- a/src/lib/evas/canvas/evas_object_textblock.c
+++ b/src/lib/evas/canvas/evas_object_textblock.c
@@ -70,9 +70,9 @@
 //#define LYDBG(f, args...) printf(f, ##args)
 #define LYDBG(f, args...)
 
-#define MY_CLASS EFL_CANVAS_TEXTBLOCK_CLASS
+#define MY_CLASS EVAS_TEXTBLOCK_LEGACY_CLASS
 
-#define MY_CLASS_NAME "Efl Canvas Textblock"
+#define MY_CLASS_NAME "Evas Textblock Legacy"
 
 #include "linebreak.h"
 #include "wordbreak.h"
@@ -143,10 +143,10 @@ static const char o_type[] = "textblock";
 /* private struct for textblock object internal data */
 /**
  * @internal
- * @typedef Efl_Canvas_Textblock_Data
+ * @typedef Evas_Textblock_Legacy_Data
  * The actual textblock object.
  */
-typedef struct _Evas_Object_Textblock             Efl_Canvas_Textblock_Data;
+typedef struct _Evas_Object_Textblock             Evas_Textblock_Legacy_Data;
 /**
  * @internal
  * @typedef Evas_Object_Style_Tag
@@ -221,22 +221,22 @@ typedef struct _Evas_Textblock_Selection_Iterator Evas_Textblock_Selection_Itera
 typedef struct _Efl_Text_Annotate_Annotation_Iterator Efl_Text_Annotate_Annotation_Iterator;
 /**
  * @internal
- * @typedef Efl_Canvas_Textblock_Filter
+ * @typedef Evas_Textblock_Legacy_Filter
  * A structure holding gfx filter information for a text item
  */
-typedef struct _Efl_Canvas_Textblock_Filter Efl_Canvas_Textblock_Filter;
+typedef struct _Evas_Textblock_Legacy_Filter Evas_Textblock_Legacy_Filter;
 /**
  * @internal
- * @typedef Efl_Canvas_Textblock_Filter_Post_Render
+ * @typedef Evas_Textblock_Legacy_Filter_Post_Render
  * Post-render data for async rendering of gfx filters
  */
-typedef struct _Efl_Canvas_Textblock_Filter_Post_Render Efl_Canvas_Textblock_Filter_Post_Render;
+typedef struct _Evas_Textblock_Legacy_Filter_Post_Render Evas_Textblock_Legacy_Filter_Post_Render;
 /**
  * @internal
- * @typedef Efl_Canvas_Textblock_Filter_Program
+ * @typedef Evas_Textblock_Legacy_Filter_Program
  * Filter name - code database
  */
-typedef struct _Efl_Canvas_Textblock_Filter_Program Efl_Canvas_Textblock_Filter_Program;
+typedef struct _Evas_Textblock_Legacy_Filter_Program Evas_Textblock_Legacy_Filter_Program;
 /**
  * @internal
  * @typedef Text_Item_Filter
@@ -468,7 +468,7 @@ struct _Evas_Object_Textblock_Format_Item
 struct _Text_Item_Filter
 {
    EINA_INLIST; /**< list on the tb object */
-   Efl_Canvas_Textblock_Data            *textblock;
+   Evas_Textblock_Legacy_Data            *textblock;
    Evas_Object_Textblock_Text_Item *ti; /**< associated text item. if null, it was deleted */
    Evas_Filter_Context             *ctx; /**< running context for the filter */
    Evas_Public_Data                *evas; /**< evas instance */
@@ -476,7 +476,7 @@ struct _Text_Item_Filter
    Eina_Bool                        do_async; /**< do_async flag when running the filter */
 };
 
-struct _Efl_Canvas_Textblock_Filter
+struct _Evas_Textblock_Legacy_Filter
 {
    Eina_Stringshare     *name;
    Evas_Object          *eo_obj;
@@ -487,13 +487,13 @@ struct _Efl_Canvas_Textblock_Filter
    Eina_Bool             redraw;
 };
 
-struct _Efl_Canvas_Textblock_Filter_Post_Render
+struct _Evas_Textblock_Legacy_Filter_Post_Render
 {
    Evas_Filter_Context    *ctx;
    Eina_Bool               success;
 };
 
-struct _Efl_Canvas_Textblock_Filter_Program
+struct _Evas_Textblock_Legacy_Filter_Program
 {
    EINA_INLIST;
    Eina_Stringshare    *name;
@@ -523,7 +523,7 @@ struct _Evas_Object_Textblock_Format
    struct {
       int               l, r;
    } margin;  /**< Left and right margin width. */
-   Efl_Canvas_Textblock_Filter *gfx_filter; /**< Gfx Filter to apply to the children text items */
+   Evas_Textblock_Legacy_Filter *gfx_filter; /**< Gfx Filter to apply to the children text items */
    int                  ref;  /**< Value of the ref. */
    int                  tabstops;  /**< Value of the size of the tab character. */
    int                  linesize;  /**< Value of the size of the line of the text. */
@@ -549,7 +549,7 @@ struct _Evas_Object_Textblock_Format
    Evas_Textblock_Align_Auto halign_auto : 2;  /**< Auto horizontal align mode */
 };
 
-struct _Efl_Canvas_Textblock_Style
+struct _Evas_Textblock_Legacy_Style
 {
    const char            *style_text;
    const char            *default_tag;
@@ -650,7 +650,7 @@ struct _Evas_Object_Textblock
       Eina_Bool                        valid : 1;
    } formatted, native;
    struct {
-      Efl_Canvas_Textblock_Filter_Program  *programs;
+      Evas_Textblock_Legacy_Filter_Program  *programs;
       Evas_Filter_Data_Binding        *data_bindings;
       Eina_Hash                       *sources;
       Text_Item_Filter                *text_items; // inlist
@@ -741,37 +741,37 @@ static const Evas_Object_Func object_func =
    MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); \
    return; \
    MAGIC_CHECK_END(); \
-   Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
+   Evas_Textblock_Legacy_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
 
 #define TB_HEAD_RETURN(x) \
    MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); \
    return (x); \
    MAGIC_CHECK_END();
 static Eina_Bool _evas_textblock_cursor_is_at_the_end(const Efl_Text_Cursor_Cursor *cur);
-static void _evas_textblock_node_text_remove(Efl_Canvas_Textblock_Data *o, Evas_Object_Textblock_Node_Text *n);
+static void _evas_textblock_node_text_remove(Evas_Textblock_Legacy_Data *o, Evas_Object_Textblock_Node_Text *n);
 static Evas_Object_Textblock_Node_Format *_evas_textblock_cursor_node_format_before_or_at_pos_get(const Efl_Text_Cursor_Cursor *cur);
 static size_t _evas_textblock_node_format_pos_get(const Evas_Object_Textblock_Node_Format *fmt);
-static void _evas_textblock_node_format_remove(Efl_Canvas_Textblock_Data *o, Evas_Object_Textblock_Node_Format *n, int visual_adjustment);
-static void _evas_textblock_node_format_free(Efl_Canvas_Textblock_Data *o, Evas_Object_Textblock_Node_Format *n);
+static void _evas_textblock_node_format_remove(Evas_Textblock_Legacy_Data *o, Evas_Object_Textblock_Node_Format *n, int visual_adjustment);
+static void _evas_textblock_node_format_free(Evas_Textblock_Legacy_Data *o, Evas_Object_Textblock_Node_Format *n);
 static void _evas_textblock_node_text_free(Evas_Object_Textblock_Node_Text *n);
-static void _evas_textblock_changed(Efl_Canvas_Textblock_Data *o, Evas_Object *eo_obj);
-static void _evas_textblock_invalidate_all(Efl_Canvas_Textblock_Data *o);
+static void _evas_textblock_changed(Evas_Textblock_Legacy_Data *o, Evas_Object *eo_obj);
+static void _evas_textblock_invalidate_all(Evas_Textblock_Legacy_Data *o);
 static void _evas_textblock_cursors_update_offset(const Efl_Text_Cursor_Cursor *cur, const Evas_Object_Textblock_Node_Text *n, size_t start, int offset);
-static void _evas_textblock_cursors_set_node(Efl_Canvas_Textblock_Data *o, const Evas_Object_Textblock_Node_Text *n, Evas_Object_Textblock_Node_Text *new_node);
-static void _evas_textblock_annotations_clear(Efl_Canvas_Textblock_Data *o);
-static void _evas_textblock_annotation_remove(Efl_Canvas_Textblock_Data *o, Efl_Text_Annotate_Annotation *an, Eina_Bool remove_nodes);
+static void _evas_textblock_cursors_set_node(Evas_Textblock_Legacy_Data *o, const Evas_Object_Textblock_Node_Text *n, Evas_Object_Textblock_Node_Text *new_node);
+static void _evas_textblock_annotations_clear(Evas_Textblock_Legacy_Data *o);
+static void _evas_textblock_annotation_remove(Evas_Textblock_Legacy_Data *o, Efl_Text_Annotate_Annotation *an, Eina_Bool remove_nodes);
 
 static Eina_Bool _evas_textblock_cursor_format_is_visible_get(const Efl_Text_Cursor_Cursor *cur);
 static void _evas_textblock_cursor_at_format_set(Efl_Text_Cursor_Cursor *cur, const Evas_Object_Textblock_Node_Format *fmt);
 static void _evas_textblock_cursor_init(Efl_Text_Cursor_Cursor *cur, const Evas_Object *tb);
-static Evas_Filter_Program *_format_filter_program_get(Efl_Canvas_Textblock_Data *o, Evas_Object_Textblock_Format *fmt);
-static const char *_textblock_format_node_from_style_tag(Efl_Canvas_Textblock_Data *o, Evas_Object_Textblock_Node_Format *fnode, const char *format, size_t format_len);
+static Evas_Filter_Program *_format_filter_program_get(Evas_Textblock_Legacy_Data *o, Evas_Object_Textblock_Format *fmt);
+static const char *_textblock_format_node_from_style_tag(Evas_Textblock_Legacy_Data *o, Evas_Object_Textblock_Node_Format *fnode, const char *format, size_t format_len);
 #ifdef HAVE_HYPHEN
 /* Hyphenation */
 #include "evas_textblock_hyphenation.x"
 #endif
 
-static int _efl_canvas_textblock_cursor_text_append(Efl_Text_Cursor_Cursor *cur, const char *text);
+static int _evas_textblock_legacy_cursor_text_append(Efl_Text_Cursor_Cursor *cur, const char *text);
 static Eina_Bool _evas_textblock_cursor_format_append(Efl_Text_Cursor_Cursor *cur, const char *format, Evas_Object_Textblock_Node_Format **_fnode, Eina_Bool is_item);
 EAPI Eina_Bool evas_textblock_cursor_eol_get(const Evas_Textblock_Cursor *cur);
 static void _evas_textblock_cursor_init(Efl_Text_Cursor_Cursor *cur, const Evas_Object *tb);
@@ -955,7 +955,7 @@ _style_match_tag(const Evas_Textblock_Style *ts, const char *s, size_t tag_len)
 static void
 _nodes_clear(const Evas_Object *eo_obj)
 {
-   Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
+   Evas_Textblock_Legacy_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
 
    /* First, clear all annotations that may have spawned format nodes. */
    _evas_textblock_annotations_clear(o);
@@ -1025,7 +1025,7 @@ _image_safe_unref(Evas_Public_Data *e, void *image, Eina_Bool async)
  */
 static void
 _item_free(Evas_Public_Data *evas,
-      Efl_Canvas_Textblock_Data *o,
+      Evas_Textblock_Legacy_Data *o,
       Evas_Object_Protected_Data *evas_o,
       Evas_Object_Textblock_Line *ln, Evas_Object_Textblock_Item *it)
 {
@@ -2305,7 +2305,7 @@ _format_command(Evas_Object *eo_obj, Evas_Object_Textblock_Format *fmt, const ch
      }
    else if (cmd == text_valignstr)
      {
-        Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
+        Evas_Textblock_Legacy_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
         char *endptr = NULL;
         double val = strtod(param, &endptr);
         o->valign = val;
@@ -2775,7 +2775,7 @@ _format_command(Evas_Object *eo_obj, Evas_Object_Textblock_Format *fmt, const ch
           fmt->ellipsis = -1.0;
         else
           {
-             Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
+             Evas_Textblock_Legacy_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
              o->have_ellipsis = 1;
           }
      }
@@ -2802,7 +2802,7 @@ _format_command(Evas_Object *eo_obj, Evas_Object_Textblock_Format *fmt, const ch
      }
    else if (cmd == replacement_charstr)
      {
-        Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
+        Evas_Textblock_Legacy_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
         eina_stringshare_replace(&o->repch, param);
      }
    else if (cmd == underline_dash_widthstr)
@@ -2863,7 +2863,7 @@ _format_command(Evas_Object *eo_obj, Evas_Object_Textblock_Format *fmt, const ch
          * @endcode
          */
         if (!fmt->gfx_filter)
-          fmt->gfx_filter = calloc(1, sizeof(Efl_Canvas_Textblock_Filter));
+          fmt->gfx_filter = calloc(1, sizeof(Evas_Textblock_Legacy_Filter));
         eina_stringshare_replace(&fmt->gfx_filter->name, param);
      }
 }
@@ -3187,7 +3187,7 @@ typedef struct _Ctxt Ctxt;
 struct _Ctxt
 {
    Evas_Object *obj;
-   Efl_Canvas_Textblock_Data *o;
+   Evas_Textblock_Legacy_Data *o;
    Evas_Object_Protected_Data *evas_o;
    Evas_Public_Data *evas;
 
@@ -3403,7 +3403,7 @@ _layout_line_new(Ctxt *c, Evas_Object_Textblock_Format *fmt)
 }
 
 static inline Evas_Object_Textblock_Paragraph *
-_layout_find_paragraph_by_y(Efl_Canvas_Textblock_Data *o, Evas_Coord y)
+_layout_find_paragraph_by_y(Evas_Textblock_Legacy_Data *o, Evas_Coord y)
 {
    Evas_Object_Textblock_Paragraph *start, *par;
    int i;
@@ -3429,7 +3429,7 @@ _layout_find_paragraph_by_y(Efl_Canvas_Textblock_Data *o, Evas_Coord y)
 }
 
 static inline Evas_Object_Textblock_Paragraph *
-_layout_find_paragraph_by_line_no(Efl_Canvas_Textblock_Data *o, int line_no)
+_layout_find_paragraph_by_line_no(Evas_Textblock_Legacy_Data *o, int line_no)
 {
    Evas_Object_Textblock_Paragraph *start, *par;
    int i;
@@ -3510,7 +3510,7 @@ _layout_paragraph_new(Ctxt *c, Evas_Object_Textblock_Node_Text *n,
  * @param par The paragraph to update
  */
 static inline void
-_layout_update_bidi_props(const Efl_Canvas_Textblock_Data *o,
+_layout_update_bidi_props(const Evas_Textblock_Legacy_Data *o,
       Evas_Object_Textblock_Paragraph *par)
 {
    if (par->text_node)
@@ -3560,7 +3560,7 @@ _layout_update_bidi_props(const Efl_Canvas_Textblock_Data *o,
  */
 static void
 _paragraph_clear(Evas_Public_Data *evas,
-      Efl_Canvas_Textblock_Data *o, Evas_Object_Protected_Data *obj,
+      Evas_Textblock_Legacy_Data *o, Evas_Object_Protected_Data *obj,
       Evas_Object_Textblock_Paragraph *par)
 {
    while (par->lines)
@@ -3597,7 +3597,7 @@ _paragraph_clear(Evas_Public_Data *evas,
  */
 static void
 _paragraph_free(Evas_Public_Data *evas,
-      Efl_Canvas_Textblock_Data *o, Evas_Object_Protected_Data *obj,
+      Evas_Textblock_Legacy_Data *o, Evas_Object_Protected_Data *obj,
       Evas_Object_Textblock_Paragraph *par)
 {
    _paragraph_clear(evas, o, obj, par);
@@ -3650,7 +3650,7 @@ _paragraphs_clear(Ctxt *c)
  */
 static void
 _paragraphs_free(Evas_Public_Data *evas,
-      Efl_Canvas_Textblock_Data *o, Evas_Object_Protected_Data *obj,
+      Evas_Textblock_Legacy_Data *o, Evas_Object_Protected_Data *obj,
       Evas_Object_Textblock_Paragraph *pars)
 {
    o->num_paragraphs = 0;
@@ -3677,7 +3677,7 @@ static Evas_Object_Textblock_Format *
 _layout_format_push(Ctxt *c, Evas_Object_Textblock_Format *fmt,
       Evas_Object_Textblock_Node_Format *fnode)
 {
-   Efl_Canvas_Textblock_Data *o = c->o;
+   Evas_Textblock_Legacy_Data *o = c->o;
 
    if (fmt)
      {
@@ -3726,7 +3726,7 @@ _layout_format_push(Ctxt *c, Evas_Object_Textblock_Format *fmt,
           {
              if (!fmt->gfx_filter)
                {
-                  fmt->gfx_filter = calloc(1, sizeof(Efl_Canvas_Textblock_Filter));
+                  fmt->gfx_filter = calloc(1, sizeof(Evas_Textblock_Legacy_Filter));
                   eina_stringshare_replace(&fmt->gfx_filter->name,
                         _FMT_INFO(gfx_filter_name));
                }
@@ -4898,10 +4898,10 @@ _format_finalize(Evas_Object *eo_obj, Evas_Object_Textblock_Format *fmt)
    evas_font_free(of);
 }
 
-static Efl_Canvas_Textblock_Filter_Program *
-_filter_program_find(Efl_Canvas_Textblock_Data *o, const char *name)
+static Evas_Textblock_Legacy_Filter_Program *
+_filter_program_find(Evas_Textblock_Legacy_Data *o, const char *name)
 {
-   Efl_Canvas_Textblock_Filter_Program *prg;
+   Evas_Textblock_Legacy_Filter_Program *prg;
 
    if (!name) return NULL;
    EINA_INLIST_FOREACH(o->gfx_filter.programs, prg)
@@ -4914,10 +4914,10 @@ _filter_program_find(Efl_Canvas_Textblock_Data *o, const char *name)
 }
 
 static Evas_Filter_Program *
-_format_filter_program_get(Efl_Canvas_Textblock_Data *o, Evas_Object_Textblock_Format *fmt)
+_format_filter_program_get(Evas_Textblock_Legacy_Data *o, Evas_Object_Textblock_Format *fmt)
 {
-   Efl_Canvas_Textblock_Filter_Program *program;
-   Efl_Canvas_Textblock_Filter *filter;
+   Evas_Textblock_Legacy_Filter_Program *program;
+   Evas_Textblock_Legacy_Filter *filter;
    Evas_Filter_Program *pgm;
 
    filter = fmt->gfx_filter;
@@ -5719,7 +5719,7 @@ _layout_handle_ellipsis(Ctxt *c, Evas_Object_Textblock_Item *it, Eina_List *i)
 
 /* Don't do much for the meanwhile. */
 static inline void
-_layout_paragraph_render(Efl_Canvas_Textblock_Data *o,
+_layout_paragraph_render(Evas_Textblock_Legacy_Data *o,
 			 Evas_Object_Textblock_Paragraph *par)
 {
    if (par->rendered)
@@ -6571,7 +6571,7 @@ _layout_pre(Ctxt *c)
 {
    int *style_pad_l, *style_pad_r, *style_pad_t, *style_pad_b;
    Evas_Object *eo_obj = c->obj;
-   Efl_Canvas_Textblock_Data *o = c->o;
+   Evas_Textblock_Legacy_Data *o = c->o;
 
    style_pad_l = &c->style_pad.l;
    style_pad_r = &c->style_pad.r;
@@ -6939,7 +6939,7 @@ _layout_done(Ctxt *c, Evas_Coord *w_ret, Evas_Coord *h_ret)
         LYDBG("ZZ: ... layout #2\n");
         c->o->content_changed = 0;
         _layout(c->obj, c->w, c->h, w_ret, h_ret);
-        efl_event_callback_call(c->obj, EFL_CANVAS_TEXTBLOCK_EVENT_STYLE_INSETS_CHANGED, NULL);
+        efl_event_callback_call(c->obj, EVAS_TEXTBLOCK_LEGACY_EVENT_STYLE_INSETS_CHANGED, NULL);
 
         c->o->obstacle_changed = EINA_FALSE;
      }
@@ -6948,7 +6948,7 @@ _layout_done(Ctxt *c, Evas_Coord *w_ret, Evas_Coord *h_ret)
 static Eina_Bool
 _layout_setup(Ctxt *c, const Eo *eo_obj, Evas_Coord w, Evas_Coord h)
 {
-   Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
+   Evas_Textblock_Legacy_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
    Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    Evas *eo_e;
    /* setup context */
@@ -7071,7 +7071,7 @@ static void
 _relayout(const Evas_Object *eo_obj)
 {
    Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
-   Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
+   Evas_Textblock_Legacy_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
    _layout(eo_obj, obj->cur->geometry.w, obj->cur->geometry.h,
          &o->formatted.w, &o->formatted.h);
    o->formatted.valid = 1;
@@ -7103,7 +7103,7 @@ _relayout(const Evas_Object *eo_obj)
  * Check if the object needs a relayout, and if so, execute it.
  */
 static Eina_Bool
-_relayout_if_needed(const Evas_Object *eo_obj, Efl_Canvas_Textblock_Data *o)
+_relayout_if_needed(const Evas_Object *eo_obj, Evas_Textblock_Legacy_Data *o)
 {
    ASYNC_BLOCK;
    Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
@@ -7137,7 +7137,7 @@ _find_layout_item_line_match(Evas_Object *eo_obj, Evas_Object_Textblock_Node_Tex
 {
    Evas_Object_Textblock_Paragraph *found_par;
    Evas_Object_Textblock_Line *ln;
-   Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
+   Evas_Textblock_Legacy_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
 
    _relayout_if_needed(eo_obj, o);
 
@@ -7194,7 +7194,7 @@ _find_layout_line_num(const Evas_Object *eo_obj, int line)
 {
    Evas_Object_Textblock_Paragraph *par;
    Evas_Object_Textblock_Line *ln;
-   Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
+   Evas_Textblock_Legacy_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
 
    par = _layout_find_paragraph_by_line_no(o, line);
    if (par)
@@ -7211,7 +7211,7 @@ _find_layout_line_num(const Evas_Object *eo_obj, int line)
 EAPI Evas_Object *
 evas_object_textblock_add(Evas *e)
 {
-   Efl_Canvas_Textblock_Data *o;
+   Evas_Textblock_Legacy_Data *o;
    MAGIC_CHECK(e, Evas, MAGIC_EVAS);
    return NULL;
    MAGIC_CHECK_END();
@@ -7225,10 +7225,10 @@ evas_object_textblock_add(Evas *e)
 }
 
 EOLIAN static Eo *
-_efl_canvas_textblock_efl_object_constructor(Eo *eo_obj, Efl_Canvas_Textblock_Data *class_data EINA_UNUSED)
+_evas_textblock_legacy_efl_object_constructor(Eo *eo_obj, Evas_Textblock_Legacy_Data *class_data EINA_UNUSED)
 {
    Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
-   Efl_Canvas_Textblock_Data *o;
+   Evas_Textblock_Legacy_Data *o;
 
    eo_obj = efl_constructor(efl_super(eo_obj, MY_CLASS));
 
@@ -7291,11 +7291,11 @@ evas_textblock_style_free(Evas_Textblock_Style *ts)
 }
 
 static void
-_evas_textblock_update_format_nodes_from_style_tag(Efl_Canvas_Textblock_Data *o)
+_evas_textblock_update_format_nodes_from_style_tag(Evas_Textblock_Legacy_Data *o)
 {
    if (!o)
      {
-        ERR("The given address Efl_Canvas_Textblock_Data is NULL");
+        ERR("The given address Evas_Textblock_Legacy_Data is NULL");
         return;
      }
 
@@ -7452,7 +7452,7 @@ evas_textblock_style_set(Evas_Textblock_Style *ts, const char *text)
 
    EINA_LIST_FOREACH(ts->objects, l, eo_obj)
      {
-        Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
+        Evas_Textblock_Legacy_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
         _evas_textblock_update_format_nodes_from_style_tag(o);
         _evas_textblock_invalidate_all(o);
         _evas_textblock_changed(o, eo_obj);
@@ -7467,7 +7467,7 @@ evas_textblock_style_get(const Evas_Textblock_Style *ts)
 }
 
 static const char *
-_textblock_format_node_from_style_tag(Efl_Canvas_Textblock_Data *o, Evas_Object_Textblock_Node_Format *fnode, const char *format, size_t format_len)
+_textblock_format_node_from_style_tag(Evas_Textblock_Legacy_Data *o, Evas_Object_Textblock_Node_Format *fnode, const char *format, size_t format_len)
 {
    Eina_List *itr;
    const char *match = NULL;
@@ -7594,7 +7594,7 @@ evas_object_textblock_style_set(Eo *eo_obj, const Evas_Textblock_Style *ts)
 }
 
 static Evas_Textblock_Style *
-_style_by_key_find(Efl_Canvas_Textblock_Data *o, const char *key)
+_style_by_key_find(Evas_Textblock_Legacy_Data *o, const char *key)
 {
    Eina_List *itr;
    User_Style_Entry *us;
@@ -7635,7 +7635,7 @@ _style_fetch(const char *style)
 }
 
 EOLIAN static void
-_efl_canvas_textblock_style_set(Eo *eo_obj, Efl_Canvas_Textblock_Data *o EINA_UNUSED, const char *key, const char *style)
+_evas_textblock_legacy_style_set(Eo *eo_obj, Evas_Textblock_Legacy_Data *o EINA_UNUSED, const char *key, const char *style)
 {
    // FIXME: Make key value behaviour.
    Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
@@ -7654,12 +7654,12 @@ evas_object_textblock_style_get(const Eo *eo_obj)
    EINA_SAFETY_ON_NULL_RETURN_VAL(eo_obj, NULL);
    Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
-   Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
+   Evas_Textblock_Legacy_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
    return o->style;
 }
 
 EOLIAN static const char *
-_efl_canvas_textblock_style_get(const Eo *eo_obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o, const char *key)
+_evas_textblock_legacy_style_get(const Eo *eo_obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o, const char *key)
 {
    Evas_Textblock_Style *ts = _style_by_key_find(o, key);
 
@@ -7683,7 +7683,7 @@ evas_object_textblock_style_user_peek(const Eo *eo_obj)
    EINA_SAFETY_ON_NULL_RETURN_VAL(eo_obj, NULL);
    Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
-   Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
+   Evas_Textblock_Legacy_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
    Evas_Textblock_Style *ts = _style_by_key_find(o, _STYLE_USER);
 
    return ts;
@@ -7699,10 +7699,10 @@ evas_object_textblock_style_user_pop(Eo *eo_obj)
 }
 
 EAPI void
-evas_object_textblock_replace_char_set(Efl_Canvas_Textblock *eo_obj, const char *ch)
+evas_object_textblock_replace_char_set(Evas_Textblock_Legacy *eo_obj, const char *ch)
 {
    EINA_SAFETY_ON_NULL_RETURN(eo_obj);
-   Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
+   Evas_Textblock_Legacy_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
    Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
    if (o->repch) eina_stringshare_del(o->repch);
@@ -7714,7 +7714,7 @@ evas_object_textblock_replace_char_set(Efl_Canvas_Textblock *eo_obj, const char
 
 
 EOLIAN static void
-_efl_canvas_textblock_legacy_newline_set(Eo *eo_obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o, Eina_Bool mode)
+_evas_textblock_legacy_legacy_newline_set(Eo *eo_obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o, Eina_Bool mode)
 {
    Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
@@ -7727,22 +7727,22 @@ _efl_canvas_textblock_legacy_newline_set(Eo *eo_obj EINA_UNUSED, Efl_Canvas_Text
 }
 
 EOLIAN static Eina_Bool
-_efl_canvas_textblock_legacy_newline_get(const Eo *eo_obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o)
+_evas_textblock_legacy_legacy_newline_get(const Eo *eo_obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o)
 {
    return o->legacy_newline;
 }
 
 EOLIAN static Eina_Bool
-_efl_canvas_textblock_is_empty_get(const Eo *eo_obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o)
+_evas_textblock_legacy_is_empty_get(const Eo *eo_obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o)
 {
    return !o->text_nodes || (eina_ustrbuf_length_get(o->text_nodes->unicode) == 0);
 }
 
 EAPI void
-evas_object_textblock_valign_set(Efl_Canvas_Textblock *eo_obj, double align)
+evas_object_textblock_valign_set(Evas_Textblock_Legacy *eo_obj, double align)
 {
    EINA_SAFETY_ON_NULL_RETURN(eo_obj);
-   Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
+   Evas_Textblock_Legacy_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
    Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
    if (align < 0.0) align = 0.0;
@@ -7753,15 +7753,15 @@ evas_object_textblock_valign_set(Efl_Canvas_Textblock *eo_obj, double align)
 }
 
 EAPI double
-evas_object_textblock_valign_get(const Efl_Canvas_Textblock *obj)
+evas_object_textblock_valign_get(const Evas_Textblock_Legacy *obj)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(obj, 0.0);
-   Efl_Canvas_Textblock_Data *o = efl_data_scope_get(obj, MY_CLASS);
+   Evas_Textblock_Legacy_Data *o = efl_data_scope_get(obj, MY_CLASS);
    return o->valign;
 }
 
 EOLIAN static void
-_efl_canvas_textblock_bidi_delimiters_set(Eo *eo_obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o, const char *delim)
+_evas_textblock_legacy_bidi_delimiters_set(Eo *eo_obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o, const char *delim)
 {
    Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
@@ -7769,16 +7769,16 @@ _efl_canvas_textblock_bidi_delimiters_set(Eo *eo_obj EINA_UNUSED, Efl_Canvas_Tex
 }
 
 EOLIAN static const char*
-_efl_canvas_textblock_bidi_delimiters_get(const Eo *eo_obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o)
+_evas_textblock_legacy_bidi_delimiters_get(const Eo *eo_obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o)
 {
    return o->bidi_delimiters;
 }
 
 EAPI const char *
-evas_object_textblock_replace_char_get(const Efl_Canvas_Textblock *obj)
+evas_object_textblock_replace_char_get(const Evas_Textblock_Legacy *obj)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(obj, NULL);
-   Efl_Canvas_Textblock_Data *o = efl_data_scope_get(obj, MY_CLASS);
+   Evas_Textblock_Legacy_Data *o = efl_data_scope_get(obj, MY_CLASS);
    return o->repch;
 }
 
@@ -8013,7 +8013,7 @@ _cursor_emit_if_changed(Efl_Text_Cursor_Cursor *cur)
    if (cur->changed)
      {
         cur->changed = EINA_FALSE;
-        efl_event_callback_legacy_call(cur->obj, EFL_CANVAS_TEXTBLOCK_EVENT_CURSOR_CHANGED, NULL);
+        efl_event_callback_legacy_call(cur->obj, EVAS_TEXTBLOCK_LEGACY_EVENT_CURSOR_CHANGED, NULL);
      }
 }
 
@@ -8040,7 +8040,7 @@ _prepend_escaped_char(Efl_Text_Cursor_Cursor *cur_obj, const char *s,
 
 
 static void
-_evas_object_textblock_text_markup_set(Eo *eo_obj, Efl_Canvas_Textblock_Data *o,
+_evas_object_textblock_text_markup_set(Eo *eo_obj, Evas_Textblock_Legacy_Data *o,
       const char *text)
 {
    Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
@@ -8086,7 +8086,7 @@ _evas_object_textblock_text_markup_set(Eo *eo_obj, Efl_Canvas_Textblock_Data *o,
 
      }
    efl_event_thaw(eo_obj);
-   efl_event_callback_legacy_call(eo_obj, EFL_CANVAS_TEXTBLOCK_EVENT_CURSOR_CHANGED, NULL);
+   efl_event_callback_legacy_call(eo_obj, EVAS_TEXTBLOCK_LEGACY_EVENT_CURSOR_CHANGED, NULL);
 
     o->markup_text = text;
 }
@@ -8095,17 +8095,17 @@ EAPI void
 evas_object_textblock_text_markup_set(Eo *eo_obj, const char *text)
 {
    EINA_SAFETY_ON_NULL_RETURN(eo_obj);
-   Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
+   Evas_Textblock_Legacy_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
    _evas_object_textblock_text_markup_set(eo_obj, o, text);
 }
 
 EOLIAN void
-_efl_canvas_textblock_efl_text_markup_markup_set(Eo *eo_obj, Efl_Canvas_Textblock_Data *o,
+_evas_textblock_legacy_efl_text_markup_markup_set(Eo *eo_obj, Evas_Textblock_Legacy_Data *o,
       const char *text)
 {
    ASYNC_BLOCK;
    _evas_object_textblock_text_markup_set(eo_obj, o, text);
-   efl_event_callback_call(eo_obj, EFL_CANVAS_TEXTBLOCK_EVENT_CHANGED, NULL);
+   efl_event_callback_call(eo_obj, EVAS_TEXTBLOCK_LEGACY_EVENT_CHANGED, NULL);
 }
 
 static void
@@ -8264,13 +8264,13 @@ evas_object_textblock_text_markup_prepend(Efl_Text_Cursor_Cursor *cur, const cha
 }
 
 EOLIAN static void
-_efl_canvas_textblock_efl_text_markup_interactive_cursor_markup_insert(Eo *eo_obj,
-      Efl_Canvas_Textblock_Data *o EINA_UNUSED,
+_evas_textblock_legacy_efl_text_markup_interactive_cursor_markup_insert(Eo *eo_obj,
+      Evas_Textblock_Legacy_Data *o EINA_UNUSED,
       Efl_Text_Cursor_Cursor *cur, const char *markup)
 {
    ASYNC_BLOCK;
    _evas_object_textblock_text_markup_prepend(eo_obj, cur, markup);
-   efl_event_callback_call(eo_obj, EFL_CANVAS_TEXTBLOCK_EVENT_CHANGED, NULL);
+   efl_event_callback_call(eo_obj, EVAS_TEXTBLOCK_LEGACY_EVENT_CHANGED, NULL);
 }
 
 /**
@@ -8355,7 +8355,7 @@ _markup_get_text_append(Eina_Strbuf *txt, const Eina_Unicode *text)
    free(base);
 }
 static const char*
-_evas_object_textblock_text_markup_get(const Eo *eo_obj, Efl_Canvas_Textblock_Data *o)
+_evas_object_textblock_text_markup_get(const Eo *eo_obj, Evas_Textblock_Legacy_Data *o)
 {
    Evas_Object_Textblock_Node_Text *n;
    Eina_Strbuf *txt = NULL;
@@ -8416,7 +8416,7 @@ _evas_object_textblock_text_markup_get(const Eo *eo_obj, Efl_Canvas_Textblock_Da
         free(text_base);
      }
 
-   (((Efl_Canvas_Textblock_Data *)o)->markup_text) = eina_stringshare_add(eina_strbuf_string_get(txt));
+   (((Evas_Textblock_Legacy_Data *)o)->markup_text) = eina_stringshare_add(eina_strbuf_string_get(txt));
    eina_strbuf_free(txt);
    markup = (o->markup_text);
 
@@ -8427,12 +8427,12 @@ EAPI const char*
 evas_object_textblock_text_markup_get(Eo *eo_obj)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(eo_obj, NULL);
-   Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
+   Evas_Textblock_Legacy_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
    return _evas_object_textblock_text_markup_get(eo_obj, o);
 }
 
 EOLIAN const char*
-_efl_canvas_textblock_efl_text_markup_markup_get(const Eo *eo_obj, Efl_Canvas_Textblock_Data *o)
+_evas_textblock_legacy_efl_text_markup_markup_get(const Eo *eo_obj, Evas_Textblock_Legacy_Data *o)
 {
    return _evas_object_textblock_text_markup_get(eo_obj, o);
 }
@@ -8644,7 +8644,7 @@ _layout_obstacles_update(Ctxt *c)
 }
 
 static Evas_Textblock_Obstacle *
-_obstacle_find(Efl_Canvas_Textblock_Data *o, Eo *eo_obs)
+_obstacle_find(Evas_Textblock_Legacy_Data *o, Eo *eo_obs)
 {
    Evas_Textblock_Obstacle *obs;
    Eina_List *i;
@@ -8661,7 +8661,7 @@ void
 _obstacle_del_cb(void *data, const Efl_Event *event)
 {
    Eo *eo_obj = data;
-   Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
+   Evas_Textblock_Legacy_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
    Eina_List *i;
    Evas_Textblock_Obstacle *obs;
 
@@ -8690,7 +8690,7 @@ _obstacle_free(Eo *eo_obj, Evas_Textblock_Obstacle *obs)
 }
 
 static void
-_obstacles_free(Eo *eo_obj, Efl_Canvas_Textblock_Data *o)
+_obstacles_free(Eo *eo_obj, Evas_Textblock_Legacy_Data *o)
 {
    Evas_Textblock_Obstacle *obs;
 
@@ -8701,8 +8701,8 @@ _obstacles_free(Eo *eo_obj, Efl_Canvas_Textblock_Data *o)
 }
 
 EOLIAN static Eina_Bool
-_efl_canvas_textblock_obstacle_add(Eo *eo_obj,
-      Efl_Canvas_Textblock_Data *o, Eo *eo_obs)
+_evas_textblock_legacy_obstacle_add(Eo *eo_obj,
+      Evas_Textblock_Legacy_Data *o, Eo *eo_obs)
 {
    Evas_Textblock_Obstacle *obs;
 
@@ -8725,7 +8725,7 @@ _efl_canvas_textblock_obstacle_add(Eo *eo_obj,
 }
 
 EOLIAN static Eina_Bool
-_efl_canvas_textblock_obstacle_del(Eo *eo_obj, Efl_Canvas_Textblock_Data *o,
+_evas_textblock_legacy_obstacle_del(Eo *eo_obj, Evas_Textblock_Legacy_Data *o,
       Eo *eo_obs EINA_UNUSED)
 {
    Evas_Textblock_Obstacle *obs;
@@ -8750,7 +8750,7 @@ _efl_canvas_textblock_obstacle_del(Eo *eo_obj, Efl_Canvas_Textblock_Data *o,
 }
 
 EOLIAN static void
-_efl_canvas_textblock_obstacles_update(Eo *eo_obj, Efl_Canvas_Textblock_Data *obj)
+_evas_textblock_legacy_obstacles_update(Eo *eo_obj, Evas_Textblock_Legacy_Data *obj)
 {
    _evas_textblock_changed(obj, eo_obj);
    obj->obstacle_changed = EINA_TRUE;
@@ -8836,7 +8836,7 @@ _layout_hyphen_item_new(Ctxt *c, const Evas_Object_Textblock_Text_Item *cur_ti)
  * @param to merge into to.
  */
 static void
-_evas_textblock_nodes_merge(Efl_Canvas_Textblock_Data *o, Evas_Object_Textblock_Node_Text *to)
+_evas_textblock_nodes_merge(Evas_Textblock_Legacy_Data *o, Evas_Object_Textblock_Node_Text *to)
 {
    Evas_Object_Textblock_Node_Format *itr;
    Evas_Object_Textblock_Node_Format *pnode;
@@ -8904,7 +8904,7 @@ _evas_textblock_cursor_nodes_merge(Efl_Text_Cursor_Cursor *cur)
 
    len = eina_ustrbuf_length_get(cur->node->unicode);
 
-   Efl_Canvas_Textblock_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
+   Evas_Textblock_Legacy_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
    nnode = _NODE_TEXT(EINA_INLIST_GET(cur->node)->next);
    _evas_textblock_nodes_merge(o, cur->node);
    _evas_textblock_cursors_update_offset(cur, nnode, 0, len);
@@ -9096,7 +9096,7 @@ _evas_textblock_cursor_init(Efl_Text_Cursor_Cursor *cur, const Evas_Object *tb)
 {
    cur->obj = (Eo *) tb;
 
-   Efl_Canvas_Textblock_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
+   Evas_Textblock_Legacy_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
    cur->node = o->text_nodes;
    cur->pos = 0;
 }
@@ -9112,7 +9112,7 @@ EAPI void
 evas_textblock_cursor_free(Evas_Textblock_Cursor *cur)
 {
    if (!cur) return;
-   Efl_Canvas_Textblock_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
+   Evas_Textblock_Legacy_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
    if (cur == o->cursor) return;
    o->cursors = eina_list_remove(o->cursors, cur);
    free(cur);
@@ -9140,7 +9140,7 @@ evas_textblock_node_format_list_get(const Eo *eo_obj, const char *anchor)
    EINA_SAFETY_ON_NULL_RETURN_VAL(eo_obj, NULL);
    Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
-   Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
+   Evas_Textblock_Legacy_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
    if (!strcmp(anchor, "a"))
      return o->anchors_a;
    else if (!strcmp(anchor, "item"))
@@ -9154,7 +9154,7 @@ evas_textblock_node_format_first_get(Evas_Object *eo_obj)
    EINA_SAFETY_ON_NULL_RETURN_VAL(eo_obj, NULL);
    Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
-   Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
+   Evas_Textblock_Legacy_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
    return o->format_nodes;
 }
 
@@ -9164,7 +9164,7 @@ evas_textblock_node_format_last_get(Evas_Object *eo_obj)
    EINA_SAFETY_ON_NULL_RETURN_VAL(eo_obj, NULL);
    Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
-   Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
+   Evas_Textblock_Legacy_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
    return o->format_nodes ? _NODE_FORMAT(EINA_INLIST_GET(o->format_nodes)->last) : NULL;
 }
 
@@ -9196,7 +9196,7 @@ evas_textblock_node_format_remove_pair(Eo *eo_obj, Evas_Object_Textblock_Node_Fo
 
    Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
-   Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
+   Evas_Textblock_Legacy_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
    do
      {
         const char *fstr = fmt->orig_format;
@@ -9298,17 +9298,17 @@ evas_textblock_cursor_paragraph_first(Efl_Text_Cursor_Cursor *cur)
    if (!cur) return;
    Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
-   Efl_Canvas_Textblock_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
+   Evas_Textblock_Legacy_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
    cur->node = o->text_nodes;
    cur->pos = 0;
 }
 
 EOLIAN static void
-_efl_canvas_textblock_efl_text_cursor_cursor_paragraph_first(Eo *eo_obj, Efl_Canvas_Textblock_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur)
+_evas_textblock_legacy_efl_text_cursor_cursor_paragraph_first(Eo *eo_obj, Evas_Textblock_Legacy_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur)
 {
    ASYNC_BLOCK;
    evas_textblock_cursor_paragraph_first(cur);
-   efl_event_callback_legacy_call(eo_obj, EFL_CANVAS_TEXTBLOCK_EVENT_CURSOR_CHANGED, NULL);
+   efl_event_callback_legacy_call(eo_obj, EVAS_TEXTBLOCK_LEGACY_EVENT_CURSOR_CHANGED, NULL);
 }
 
 EAPI void
@@ -9319,7 +9319,7 @@ evas_textblock_cursor_paragraph_last(Efl_Text_Cursor_Cursor *cur)
    if (!cur) return;
    Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
-   Efl_Canvas_Textblock_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
+   Evas_Textblock_Legacy_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
    node = o->text_nodes;
    if (node)
      {
@@ -9336,11 +9336,11 @@ evas_textblock_cursor_paragraph_last(Efl_Text_Cursor_Cursor *cur)
 }
 
 EOLIAN static void
-_efl_canvas_textblock_efl_text_cursor_cursor_paragraph_last(Eo *eo_obj, Efl_Canvas_Textblock_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur)
+_evas_textblock_legacy_efl_text_cursor_cursor_paragraph_last(Eo *eo_obj, Evas_Textblock_Legacy_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur)
 {
    ASYNC_BLOCK;
    evas_textblock_cursor_paragraph_last(cur);
-   efl_event_callback_legacy_call(eo_obj, EFL_CANVAS_TEXTBLOCK_EVENT_CURSOR_CHANGED, NULL);
+   efl_event_callback_legacy_call(eo_obj, EVAS_TEXTBLOCK_LEGACY_EVENT_CURSOR_CHANGED, NULL);
 }
 
 static Eina_Bool
@@ -9375,11 +9375,11 @@ evas_textblock_cursor_paragraph_next(Efl_Text_Cursor_Cursor *cur)
 }
 
 EOLIAN static void
-_efl_canvas_textblock_efl_text_cursor_cursor_paragraph_next(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, Evas_Textblock_Cursor *cur)
+_evas_textblock_legacy_efl_text_cursor_cursor_paragraph_next(Eo *obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED, Evas_Textblock_Cursor *cur)
 {
    ASYNC_BLOCK;
    evas_textblock_cursor_paragraph_next(cur);
-   efl_event_callback_legacy_call(obj, EFL_CANVAS_TEXTBLOCK_EVENT_CURSOR_CHANGED, NULL);
+   efl_event_callback_legacy_call(obj, EVAS_TEXTBLOCK_LEGACY_EVENT_CURSOR_CHANGED, NULL);
 }
 
 static Eina_Bool
@@ -9419,12 +9419,12 @@ evas_textblock_cursor_paragraph_prev(Efl_Text_Cursor_Cursor *cur)
 }
 
 EOLIAN static void
-_efl_canvas_textblock_efl_text_cursor_cursor_paragraph_prev(Eo *obj EINA_UNUSED,
-      Efl_Canvas_Textblock_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur)
+_evas_textblock_legacy_efl_text_cursor_cursor_paragraph_prev(Eo *obj EINA_UNUSED,
+      Evas_Textblock_Legacy_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur)
 {
    ASYNC_BLOCK;
    _evas_textblock_cursor_paragraph_prev(cur);
-   efl_event_callback_legacy_call(obj, EFL_CANVAS_TEXTBLOCK_EVENT_CURSOR_CHANGED, NULL);
+   efl_event_callback_legacy_call(obj, EVAS_TEXTBLOCK_LEGACY_EVENT_CURSOR_CHANGED, NULL);
 }
 
 EAPI void
@@ -9575,11 +9575,11 @@ evas_textblock_cursor_word_start(Efl_Text_Cursor_Cursor *cur)
 }
 
 EOLIAN static void
-_efl_canvas_textblock_efl_text_cursor_cursor_word_start(Eo *eo_obj, Efl_Canvas_Textblock_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur EINA_UNUSED)
+_evas_textblock_legacy_efl_text_cursor_cursor_word_start(Eo *eo_obj, Evas_Textblock_Legacy_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur EINA_UNUSED)
 {
    ASYNC_BLOCK;
    evas_textblock_cursor_word_start(cur);
-   efl_event_callback_legacy_call(eo_obj, EFL_CANVAS_TEXTBLOCK_EVENT_CURSOR_CHANGED, NULL);
+   efl_event_callback_legacy_call(eo_obj, EVAS_TEXTBLOCK_LEGACY_EVENT_CURSOR_CHANGED, NULL);
 }
 
 EAPI Eina_Bool
@@ -9637,11 +9637,11 @@ evas_textblock_cursor_word_end(Efl_Text_Cursor_Cursor *cur)
 }
 
 EOLIAN static void
-_efl_canvas_textblock_efl_text_cursor_cursor_word_end(Eo *eo_obj, Efl_Canvas_Textblock_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur EINA_UNUSED)
+_evas_textblock_legacy_efl_text_cursor_cursor_word_end(Eo *eo_obj, Evas_Textblock_Legacy_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur EINA_UNUSED)
 {
    ASYNC_BLOCK;
    evas_textblock_cursor_word_end(cur);
-   efl_event_callback_legacy_call(eo_obj, EFL_CANVAS_TEXTBLOCK_EVENT_CURSOR_CHANGED, NULL);
+   efl_event_callback_legacy_call(eo_obj, EVAS_TEXTBLOCK_LEGACY_EVENT_CURSOR_CHANGED, NULL);
 }
 
 static char *
@@ -9665,7 +9665,7 @@ static size_t
 _evas_textblock_cursor_cluster_pos_get(Evas_Textblock_Cursor *cur, Eina_Bool inc)
 {
    Evas_Object_Textblock_Paragraph *par;
-   Efl_Canvas_Textblock_Data *o;
+   Evas_Textblock_Legacy_Data *o;
    size_t cur_pos = cur->pos;
    size_t ret = cur->pos;
 
@@ -9823,11 +9823,11 @@ evas_textblock_cursor_char_next(Efl_Text_Cursor_Cursor *cur)
 }
 
 EOLIAN static void
-_efl_canvas_textblock_efl_text_cursor_cursor_char_next(Eo *eo_obj, Efl_Canvas_Textblock_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur)
+_evas_textblock_legacy_efl_text_cursor_cursor_char_next(Eo *eo_obj, Evas_Textblock_Legacy_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur)
 {
    ASYNC_BLOCK;
    if (_evas_textblock_cursor_next(cur, EINA_FALSE))
-     efl_event_callback_legacy_call(eo_obj, EFL_CANVAS_TEXTBLOCK_EVENT_CURSOR_CHANGED, NULL);
+     efl_event_callback_legacy_call(eo_obj, EVAS_TEXTBLOCK_LEGACY_EVENT_CURSOR_CHANGED, NULL);
 }
 
 EAPI Eina_Bool
@@ -9837,11 +9837,11 @@ evas_textblock_cursor_char_prev(Efl_Text_Cursor_Cursor *cur)
 }
 
 EOLIAN static void
-_efl_canvas_textblock_efl_text_cursor_cursor_char_prev(Eo *eo_obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur)
+_evas_textblock_legacy_efl_text_cursor_cursor_char_prev(Eo *eo_obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur)
 {
    ASYNC_BLOCK;
    if (_evas_textblock_cursor_prev(cur, EINA_FALSE))
-     efl_event_callback_legacy_call(eo_obj, EFL_CANVAS_TEXTBLOCK_EVENT_CURSOR_CHANGED, NULL);
+     efl_event_callback_legacy_call(eo_obj, EVAS_TEXTBLOCK_LEGACY_EVENT_CURSOR_CHANGED, NULL);
 }
 
 EAPI Eina_Bool
@@ -9851,11 +9851,11 @@ evas_textblock_cursor_cluster_next(Efl_Text_Cursor_Cursor *cur)
 }
 
 EOLIAN static void
-_efl_canvas_textblock_efl_text_cursor_cursor_cluster_next(Eo *eo_obj, Efl_Canvas_Textblock_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur)
+_evas_textblock_legacy_efl_text_cursor_cursor_cluster_next(Eo *eo_obj, Evas_Textblock_Legacy_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur)
 {
    ASYNC_BLOCK;
    if (_evas_textblock_cursor_next(cur, EINA_TRUE))
-     efl_event_callback_legacy_call(eo_obj, EFL_CANVAS_TEXTBLOCK_EVENT_CURSOR_CHANGED, NULL);
+     efl_event_callback_legacy_call(eo_obj, EVAS_TEXTBLOCK_LEGACY_EVENT_CURSOR_CHANGED, NULL);
 }
 
 EAPI Eina_Bool
@@ -9865,11 +9865,11 @@ evas_textblock_cursor_cluster_prev(Efl_Text_Cursor_Cursor *cur)
 }
 
 EOLIAN static void
-_efl_canvas_textblock_efl_text_cursor_cursor_cluster_prev(Eo *eo_obj, Efl_Canvas_Textblock_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur)
+_evas_textblock_legacy_efl_text_cursor_cursor_cluster_prev(Eo *eo_obj, Evas_Textblock_Legacy_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur)
 {
    ASYNC_BLOCK;
    if (_evas_textblock_cursor_prev(cur, EINA_TRUE))
-     efl_event_callback_legacy_call(eo_obj, EFL_CANVAS_TEXTBLOCK_EVENT_CURSOR_CHANGED, NULL);
+     efl_event_callback_legacy_call(eo_obj, EVAS_TEXTBLOCK_LEGACY_EVENT_CURSOR_CHANGED, NULL);
 }
 
 EAPI void
@@ -9882,11 +9882,11 @@ evas_textblock_cursor_paragraph_char_first(Efl_Text_Cursor_Cursor *cur)
 }
 
 EOLIAN static void
-_efl_canvas_textblock_efl_text_cursor_cursor_paragraph_char_first(Eo *eo_obj, Efl_Canvas_Textblock_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur)
+_evas_textblock_legacy_efl_text_cursor_cursor_paragraph_char_first(Eo *eo_obj, Evas_Textblock_Legacy_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur)
 {
    ASYNC_BLOCK;
    evas_textblock_cursor_paragraph_char_first(cur);
-   efl_event_callback_legacy_call(eo_obj, EFL_CANVAS_TEXTBLOCK_EVENT_CURSOR_CHANGED, NULL);
+   efl_event_callback_legacy_call(eo_obj, EVAS_TEXTBLOCK_LEGACY_EVENT_CURSOR_CHANGED, NULL);
 }
 
 EAPI void
@@ -9911,17 +9911,17 @@ evas_textblock_cursor_paragraph_char_last(Efl_Text_Cursor_Cursor *cur)
 }
 
 EOLIAN static void
-_efl_canvas_textblock_efl_text_cursor_cursor_paragraph_char_last(Eo *eo_obj, Efl_Canvas_Textblock_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur)
+_evas_textblock_legacy_efl_text_cursor_cursor_paragraph_char_last(Eo *eo_obj, Evas_Textblock_Legacy_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur)
 {
    ASYNC_BLOCK;
    evas_textblock_cursor_paragraph_char_last(cur);
-   efl_event_callback_legacy_call(eo_obj, EFL_CANVAS_TEXTBLOCK_EVENT_CURSOR_CHANGED, NULL);
+   efl_event_callback_legacy_call(eo_obj, EVAS_TEXTBLOCK_LEGACY_EVENT_CURSOR_CHANGED, NULL);
 }
 
 static void
 _cursor_line_first_char_get(Evas_Object_Textblock_Line *ln,
                             Efl_Text_Cursor_Cursor *cur,
-                            Efl_Canvas_Textblock_Data *o)
+                            Evas_Textblock_Legacy_Data *o)
 {
    if (ln->items)
      {
@@ -9956,7 +9956,7 @@ evas_textblock_cursor_line_char_first(Efl_Text_Cursor_Cursor *cur)
 
    evas_object_async_block(obj);
    TB_NULL_CHECK(cur->node);
-   Efl_Canvas_Textblock_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
+   Evas_Textblock_Legacy_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
 
    _relayout_if_needed(cur->obj, o);
 
@@ -9978,7 +9978,7 @@ evas_textblock_cursor_line_char_last(Efl_Text_Cursor_Cursor *cur)
    Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
    TB_NULL_CHECK(cur->node);
-   Efl_Canvas_Textblock_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
+   Evas_Textblock_Legacy_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
 
    _relayout_if_needed(cur->obj, o);
 
@@ -10017,19 +10017,19 @@ evas_textblock_cursor_line_char_last(Efl_Text_Cursor_Cursor *cur)
 }
 
 EOLIAN static void
-_efl_canvas_textblock_efl_text_cursor_cursor_line_char_last(Eo *eo_obj, Efl_Canvas_Textblock_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur)
+_evas_textblock_legacy_efl_text_cursor_cursor_line_char_last(Eo *eo_obj, Evas_Textblock_Legacy_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur)
 {
    ASYNC_BLOCK;
    evas_textblock_cursor_line_char_last(cur);
-   efl_event_callback_legacy_call(eo_obj, EFL_CANVAS_TEXTBLOCK_EVENT_CURSOR_CHANGED, NULL);
+   efl_event_callback_legacy_call(eo_obj, EVAS_TEXTBLOCK_LEGACY_EVENT_CURSOR_CHANGED, NULL);
 }
 
 EOLIAN static void
-_efl_canvas_textblock_efl_text_cursor_cursor_line_char_first(Eo *eo_obj, Efl_Canvas_Textblock_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur)
+_evas_textblock_legacy_efl_text_cursor_cursor_line_char_first(Eo *eo_obj, Evas_Textblock_Legacy_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur)
 {
    ASYNC_BLOCK;
    evas_textblock_cursor_line_char_first(cur);
-   efl_event_callback_legacy_call(eo_obj, EFL_CANVAS_TEXTBLOCK_EVENT_CURSOR_CHANGED, NULL);
+   efl_event_callback_legacy_call(eo_obj, EVAS_TEXTBLOCK_LEGACY_EVENT_CURSOR_CHANGED, NULL);
 }
 
 /**
@@ -10133,7 +10133,7 @@ _evas_textblock_cursor_node_text_at_format(Efl_Text_Cursor_Cursor *cur, Evas_Obj
  * @param fmt the current format.
  */
 static void
-_evas_textblock_node_format_remove_matching(Efl_Canvas_Textblock_Data *o,
+_evas_textblock_node_format_remove_matching(Evas_Textblock_Legacy_Data *o,
       Evas_Object_Textblock_Node_Format *fmt)
 {
    Evas_Object_Textblock_Node_Text *tnode;
@@ -10222,7 +10222,7 @@ _evas_textblock_node_format_remove_matching(Efl_Canvas_Textblock_Data *o,
  * @param offset the offset to add (may be negative).
  */
 static void
-_evas_textblock_node_format_adjust_offset(Efl_Canvas_Textblock_Data *o,
+_evas_textblock_node_format_adjust_offset(Evas_Textblock_Legacy_Data *o,
       Evas_Object_Textblock_Node_Text *tnode,
       Evas_Object_Textblock_Node_Format *fmt, int offset)
 {
@@ -10249,7 +10249,7 @@ _evas_textblock_node_format_adjust_offset(Efl_Canvas_Textblock_Data *o,
  * @param n the fromat node to remove
  */
 static void
-_evas_textblock_node_format_remove(Efl_Canvas_Textblock_Data *o, Evas_Object_Textblock_Node_Format *n, int visible_adjustment)
+_evas_textblock_node_format_remove(Evas_Textblock_Legacy_Data *o, Evas_Object_Textblock_Node_Format *n, int visible_adjustment)
 {
    /* Update the text nodes about the change */
      {
@@ -10304,7 +10304,7 @@ _evas_textblock_node_format_remove(Efl_Canvas_Textblock_Data *o, Evas_Object_Tex
  * @returns @c EINA_TRUE if removed a PS, @c EINA_FALSE otherwise.
  */
 static Eina_Bool
-_evas_textblock_node_text_adjust_offsets_to_start(Efl_Canvas_Textblock_Data *o,
+_evas_textblock_node_text_adjust_offsets_to_start(Evas_Textblock_Legacy_Data *o,
       Evas_Object_Textblock_Node_Text *n, size_t start, int end)
 {
    Evas_Object_Textblock_Node_Format *last_node, *itr;
@@ -10432,7 +10432,7 @@ _evas_textblock_node_text_get_first_format_between(
  * @param n the node to remove.
  */
 static void
-_evas_textblock_node_text_remove(Efl_Canvas_Textblock_Data *o, Evas_Object_Textblock_Node_Text *n)
+_evas_textblock_node_text_remove(Evas_Textblock_Legacy_Data *o, Evas_Object_Textblock_Node_Text *n)
 {
    _evas_textblock_node_text_adjust_offsets_to_start(o, n, 0, -1);
 
@@ -10472,7 +10472,7 @@ _evas_textblock_node_format_pos_get(const Evas_Object_Textblock_Node_Format *fmt
 }
 
 EOLIAN static int
-_efl_canvas_textblock_efl_text_cursor_cursor_position_get(const Eo *eo_obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur)
+_evas_textblock_legacy_efl_text_cursor_cursor_position_get(const Eo *eo_obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur)
 {
    ASYNC_BLOCK;
    Evas_Object_Textblock_Node_Text *n;
@@ -10508,7 +10508,7 @@ evas_textblock_cursor_pos_set(Efl_Text_Cursor_Cursor *cur, int _pos)
    if (!cur) return;
    Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
-   Efl_Canvas_Textblock_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
+   Evas_Textblock_Legacy_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
 
 
    if (_pos < 0)
@@ -10547,11 +10547,11 @@ evas_textblock_cursor_pos_set(Efl_Text_Cursor_Cursor *cur, int _pos)
 }
 
 EOLIAN static void
-_efl_canvas_textblock_efl_text_cursor_cursor_position_set(Eo *cur_obj, Efl_Canvas_Textblock_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur, int _pos)
+_evas_textblock_legacy_efl_text_cursor_cursor_position_set(Eo *cur_obj, Evas_Textblock_Legacy_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur, int _pos)
 {
    ASYNC_BLOCK;
    evas_textblock_cursor_pos_set(cur, _pos);
-   efl_event_callback_legacy_call(cur_obj, EFL_CANVAS_TEXTBLOCK_EVENT_CURSOR_CHANGED, NULL);
+   efl_event_callback_legacy_call(cur_obj, EVAS_TEXTBLOCK_LEGACY_EVENT_CURSOR_CHANGED, NULL);
 }
 
 EAPI Eina_Bool
@@ -10563,7 +10563,7 @@ evas_textblock_cursor_line_set(Evas_Textblock_Cursor *cur, int line)
    Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
 
-   Efl_Canvas_Textblock_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
+   Evas_Textblock_Legacy_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
 
    _relayout_if_needed(cur->obj, o);
 
@@ -10576,7 +10576,7 @@ evas_textblock_cursor_line_set(Evas_Textblock_Cursor *cur, int line)
 }
 
 EOLIAN static void
-_efl_canvas_textblock_efl_text_cursor_cursor_line_jump_by(Eo *eo_obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur EINA_UNUSED, int by)
+_evas_textblock_legacy_efl_text_cursor_cursor_line_jump_by(Eo *eo_obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur EINA_UNUSED, int by)
 {
    ASYNC_BLOCK;
    int ln;
@@ -10634,7 +10634,7 @@ _efl_canvas_textblock_efl_text_cursor_cursor_line_jump_by(Eo *eo_obj EINA_UNUSED
    if ((pnode != cur->node) || (ppos != cur->pos))
      {
         efl_event_callback_legacy_call(eo_obj,
-              EFL_CANVAS_TEXTBLOCK_EVENT_CURSOR_CHANGED, NULL);
+              EVAS_TEXTBLOCK_LEGACY_EVENT_CURSOR_CHANGED, NULL);
      }
 }
 
@@ -10668,7 +10668,7 @@ evas_textblock_cursor_compare(const Efl_Text_Cursor_Cursor *cur1,
 }
 
 EOLIAN static int
-_efl_canvas_textblock_efl_text_cursor_cursor_compare(Eo *eo_obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED,
+_evas_textblock_legacy_efl_text_cursor_cursor_compare(Eo *eo_obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED,
       const Efl_Text_Cursor_Cursor *cur1, const Efl_Text_Cursor_Cursor *cur2)
 {
    ASYNC_BLOCK;
@@ -10686,7 +10686,7 @@ evas_textblock_cursor_equal(const Evas_Textblock_Cursor *cur1,
 }
 
 EOLIAN static Eina_Bool
-_efl_canvas_textblock_efl_text_cursor_cursor_equal(Eo *eo_obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, const Efl_Text_Cursor_Cursor *cur, const Efl_Text_Cursor_Cursor *cur2)
+_evas_textblock_legacy_efl_text_cursor_cursor_equal(Eo *eo_obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED, const Efl_Text_Cursor_Cursor *cur, const Efl_Text_Cursor_Cursor *cur2)
 {
    ASYNC_BLOCK;
    Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
@@ -10719,14 +10719,14 @@ _evas_textblock_cursor_copy(Evas_Textblock_Cursor *dst, const Efl_Text_Cursor_Cu
 }
 
 EOLIAN static void
-_efl_canvas_textblock_efl_text_cursor_cursor_copy(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED,
+_evas_textblock_legacy_efl_text_cursor_cursor_copy(Eo *obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED,
       Efl_Text_Cursor_Cursor *dst, const Efl_Text_Cursor_Cursor *src)
 {
    ASYNC_BLOCK;
    if (!efl_text_cursor_equal(obj, dst, src))
      {
         _evas_textblock_cursor_copy(dst, src);
-        efl_event_callback_legacy_call(obj, EFL_CANVAS_TEXTBLOCK_EVENT_CURSOR_CHANGED, NULL);
+        efl_event_callback_legacy_call(obj, EVAS_TEXTBLOCK_LEGACY_EVENT_CURSOR_CHANGED, NULL);
      }
 }
 
@@ -10788,7 +10788,7 @@ _evas_textblock_cursor_break_paragraph(Efl_Text_Cursor_Cursor *cur,
    Evas_Object_Textblock_Node_Text *n;
 
    if (!cur) return;
-   Efl_Canvas_Textblock_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
+   Evas_Textblock_Legacy_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
 
    n = _evas_textblock_node_text_new();
    o->text_nodes = _NODE_TEXT(eina_inlist_append_relative(
@@ -10865,7 +10865,7 @@ _evas_textblock_cursor_break_paragraph(Efl_Text_Cursor_Cursor *cur,
  * @param new_node the new node to set.
  */
 static void
-_evas_textblock_cursors_set_node(Efl_Canvas_Textblock_Data *o,
+_evas_textblock_cursors_set_node(Evas_Textblock_Legacy_Data *o,
       const Evas_Object_Textblock_Node_Text *n,
       Evas_Object_Textblock_Node_Text *new_node)
 {
@@ -10891,7 +10891,7 @@ _evas_textblock_cursors_set_node(Efl_Canvas_Textblock_Data *o,
 }
 
 static inline void
-_cursor_update_offset(Efl_Text_Cursor_Cursor *cur, Efl_Canvas_Textblock_Data *o,
+_cursor_update_offset(Efl_Text_Cursor_Cursor *cur, Evas_Textblock_Legacy_Data *o,
       const Evas_Object_Textblock_Node_Text *n, size_t start, int offset)
 {
    if ((n == cur->node) &&
@@ -10931,7 +10931,7 @@ _evas_textblock_cursors_update_offset(const Efl_Text_Cursor_Cursor *cur,
 {
    Eina_List *l;
    Efl_Text_Cursor_Cursor *ocur;
-   Efl_Canvas_Textblock_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
+   Evas_Textblock_Legacy_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
 
    ocur = o->cursor;
    if (cur != ocur)
@@ -10956,7 +10956,7 @@ _evas_textblock_cursors_update_offset(const Efl_Text_Cursor_Cursor *cur,
  * @param obj the evas object.
  */
 static void
-_evas_textblock_changed(Efl_Canvas_Textblock_Data *o, Evas_Object *eo_obj)
+_evas_textblock_changed(Evas_Textblock_Legacy_Data *o, Evas_Object *eo_obj)
 {
    Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    Eina_List *l;
@@ -10982,7 +10982,7 @@ _evas_textblock_changed(Efl_Canvas_Textblock_Data *o, Evas_Object *eo_obj)
 }
 
 static void
-_evas_textblock_invalidate_all(Efl_Canvas_Textblock_Data *o)
+_evas_textblock_invalidate_all(Evas_Textblock_Legacy_Data *o)
 {
    Evas_Object_Textblock_Node_Text *n;
 
@@ -11005,7 +11005,7 @@ _evas_textblock_cursor_text_append(Efl_Text_Cursor_Cursor *cur, const char *_tex
    Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
    text = eina_unicode_utf8_to_unicode(_text, &len);
-   Efl_Canvas_Textblock_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
+   Evas_Textblock_Legacy_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
 
    n = cur->node;
    if (n)
@@ -11098,14 +11098,14 @@ evas_textblock_cursor_text_prepend(Efl_Text_Cursor_Cursor *cur, const char *_tex
 }
 
 EOLIAN static int
-_efl_canvas_textblock_efl_text_cursor_cursor_text_insert(Eo *eo_obj,
-      Efl_Canvas_Textblock_Data *o,
+_evas_textblock_legacy_efl_text_cursor_cursor_text_insert(Eo *eo_obj,
+      Evas_Textblock_Legacy_Data *o,
       Efl_Text_Cursor_Cursor *cur, const char *_text)
 {
    ASYNC_BLOCK;
-   int len = _efl_canvas_textblock_cursor_text_append(cur, _text);
+   int len = _evas_textblock_legacy_cursor_text_append(cur, _text);
    _evas_textblock_changed(o, eo_obj);
-   efl_event_callback_call(eo_obj, EFL_CANVAS_TEXTBLOCK_EVENT_CHANGED, NULL);
+   efl_event_callback_call(eo_obj, EVAS_TEXTBLOCK_LEGACY_EVENT_CHANGED, NULL);
    return len;
 }
 
@@ -11117,7 +11117,7 @@ _efl_canvas_textblock_efl_text_cursor_cursor_text_insert(Eo *eo_obj,
  * @param n the format node to free
  */
 static void
-_evas_textblock_node_format_free(Efl_Canvas_Textblock_Data *o,
+_evas_textblock_node_format_free(Evas_Textblock_Legacy_Data *o,
       Evas_Object_Textblock_Node_Format *n)
 {
    if (!n) return;
@@ -11139,7 +11139,7 @@ _evas_textblock_node_format_free(Efl_Canvas_Textblock_Data *o,
  * @return Returns the new format node
  */
 static Evas_Object_Textblock_Node_Format *
-_evas_textblock_node_format_new(Efl_Canvas_Textblock_Data *o, const char *_format,
+_evas_textblock_node_format_new(Evas_Textblock_Legacy_Data *o, const char *_format,
       Eina_Bool is_item)
 {
    Evas_Object_Textblock_Node_Format *n;
@@ -11288,7 +11288,7 @@ _evas_textblock_cursor_format_append(Efl_Text_Cursor_Cursor *cur,
    Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
    if ((!format) || (format[0] == 0)) return EINA_FALSE;
-   Efl_Canvas_Textblock_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
+   Evas_Textblock_Legacy_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
    /* We should always have at least one text node */
    if (!o->text_nodes)
      {
@@ -11459,7 +11459,7 @@ evas_textblock_cursor_char_delete(Efl_Text_Cursor_Cursor *cur)
    if (!cur || !cur->node) return;
    Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
-   Efl_Canvas_Textblock_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
+   Evas_Textblock_Legacy_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
    n = cur->node;
 
    text = eina_ustrbuf_string_get(n->unicode);
@@ -11528,22 +11528,22 @@ evas_textblock_cursor_char_delete(Efl_Text_Cursor_Cursor *cur)
 }
 
 EOLIAN static void
-_efl_canvas_textblock_efl_text_cursor_cursor_char_delete(Eo *eo_obj, Efl_Canvas_Textblock_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur)
+_evas_textblock_legacy_efl_text_cursor_cursor_char_delete(Eo *eo_obj, Evas_Textblock_Legacy_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur)
 {
    ASYNC_BLOCK;
    evas_textblock_cursor_char_delete(cur);
-   efl_event_callback_call(eo_obj, EFL_CANVAS_TEXTBLOCK_EVENT_CHANGED, NULL);
+   efl_event_callback_call(eo_obj, EVAS_TEXTBLOCK_LEGACY_EVENT_CHANGED, NULL);
 }
 
 EAPI void
 evas_textblock_cursor_range_delete(Efl_Text_Cursor_Cursor *cur1, Efl_Text_Cursor_Cursor *cur2)
 {
    if (!cur1) return;
-   efl_canvas_textblock_range_delete(cur1->obj, cur1, cur2);
+   evas_textblock_legacy_range_delete(cur1->obj, cur1, cur2);
 }
 
 EOLIAN static void
-_efl_canvas_textblock_range_delete(Eo *eo_obj EINA_UNUSED, Efl_Canvas_Textblock_Data *pd EINA_UNUSED,
+_evas_textblock_legacy_range_delete(Eo *eo_obj EINA_UNUSED, Evas_Textblock_Legacy_Data *pd EINA_UNUSED,
       Efl_Text_Cursor_Cursor *cur1, Evas_Textblock_Cursor *cur2)
 {
    Evas_Object_Textblock_Node_Format *fnode = NULL;
@@ -11555,7 +11555,7 @@ _efl_canvas_textblock_range_delete(Eo *eo_obj EINA_UNUSED, Efl_Canvas_Textblock_
    if (cur1->obj != cur2->obj) return;
    Evas_Object_Protected_Data *obj = efl_data_scope_get(cur1->obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
-   Efl_Canvas_Textblock_Data *o = efl_data_scope_get(cur1->obj, MY_CLASS);
+   Evas_Textblock_Legacy_Data *o = efl_data_scope_get(cur1->obj, MY_CLASS);
    if (evas_textblock_cursor_compare(cur1, cur2) > 0)
      {
         Efl_Text_Cursor_Cursor *tc;
@@ -11646,11 +11646,11 @@ _efl_canvas_textblock_range_delete(Eo *eo_obj EINA_UNUSED, Efl_Canvas_Textblock_
      evas_textblock_cursor_copy(cur1, o->cursor);
 
    _evas_textblock_changed(o, cur1->obj);
-   efl_event_callback_call(eo_obj, EFL_CANVAS_TEXTBLOCK_EVENT_CHANGED, NULL);
+   efl_event_callback_call(eo_obj, EVAS_TEXTBLOCK_LEGACY_EVENT_CHANGED, NULL);
 }
 
 EOLIAN static Eina_Unicode
-_efl_canvas_textblock_efl_text_cursor_cursor_content_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED,
+_evas_textblock_legacy_efl_text_cursor_cursor_content_get(const Eo *obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED,
       const Efl_Text_Cursor_Cursor *cur)
 {
    ASYNC_BLOCK;
@@ -11800,8 +11800,8 @@ _evas_textblock_cursor_range_text_markup_get(const Efl_Text_Cursor_Cursor *cur1,
 }
 
 EOLIAN char *
-_efl_canvas_textblock_efl_text_markup_interactive_markup_range_get(const Eo *eo_obj,
-      Efl_Canvas_Textblock_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *start,
+_evas_textblock_legacy_efl_text_markup_interactive_markup_range_get(const Eo *eo_obj,
+      Evas_Textblock_Legacy_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *start,
       Efl_Text_Cursor_Cursor *end)
 {
    if (!start || !start->node) return NULL;
@@ -11965,8 +11965,8 @@ evas_textblock_cursor_range_text_get(const Efl_Text_Cursor_Cursor *cur1, const E
 }
 
 EOLIAN static char *
-_efl_canvas_textblock_range_text_get(const Eo *eo_obj EINA_UNUSED,
-      Efl_Canvas_Textblock_Data *pd EINA_UNUSED,
+_evas_textblock_legacy_range_text_get(const Eo *eo_obj EINA_UNUSED,
+      Evas_Textblock_Legacy_Data *pd EINA_UNUSED,
       const Efl_Text_Cursor_Cursor *cur1,
       const Evas_Textblock_Cursor *cur2)
 {
@@ -12130,7 +12130,7 @@ evas_textblock_cursor_geometry_bidi_get(const Efl_Text_Cursor_Cursor *cur, Evas_
 }
 
 EOLIAN static Eina_Bool
-_efl_canvas_textblock_efl_text_cursor_cursor_geometry_get(const Eo *eo_obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, const Efl_Text_Cursor_Cursor *cur, Efl_Text_Cursor_Type ctype, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch, Evas_Coord *cx2, Evas_Coord *cy2, Evas_Coord *cw2, Evas_Coord *ch2)
+_evas_textblock_legacy_efl_text_cursor_cursor_geometry_get(const Eo *eo_obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED, const Efl_Text_Cursor_Cursor *cur, Efl_Text_Cursor_Type ctype, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch, Evas_Coord *cx2, Evas_Coord *cy2, Evas_Coord *cw2, Evas_Coord *ch2)
 {
    ASYNC_BLOCK;
    if (!cur) return EINA_FALSE;
@@ -12321,7 +12321,7 @@ evas_textblock_cursor_geometry_get(const Efl_Text_Cursor_Cursor *cur, Evas_Coord
    if (!cur) return -1;
    Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
-   Efl_Canvas_Textblock_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
+   Evas_Textblock_Legacy_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
 
    _relayout_if_needed(cur->obj, o);
 
@@ -12400,7 +12400,7 @@ _evas_textblock_cursor_char_pen_geometry_common_get(int (*query_func) (void *dat
    Eina_Bool previous_format;
 
    if (!cur) return -1;
-   Efl_Canvas_Textblock_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
+   Evas_Textblock_Legacy_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
 
    _relayout_if_needed(cur->obj, o);
 
@@ -12534,7 +12534,7 @@ evas_textblock_cursor_line_geometry_get(const Evas_Textblock_Cursor *cur, Evas_C
    if (!cur) return -1;
    Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
-   Efl_Canvas_Textblock_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
+   Evas_Textblock_Legacy_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
 
    _relayout_if_needed(cur->obj, o);
 
@@ -12561,12 +12561,12 @@ evas_textblock_cursor_line_geometry_get(const Evas_Textblock_Cursor *cur, Evas_C
 EAPI Eina_Bool
 evas_textblock_cursor_visible_range_get(Efl_Text_Cursor_Cursor *start, Evas_Textblock_Cursor *end)
 {
-   return efl_canvas_textblock_visible_range_get(start->obj, start, end);
+   return evas_textblock_legacy_visible_range_get(start->obj, start, end);
 }
 
 EOLIAN static Eina_Bool
-_efl_canvas_textblock_visible_range_get(Eo *eo_obj EINA_UNUSED,
-      Efl_Canvas_Textblock_Data *pd EINA_UNUSED,
+_evas_textblock_legacy_visible_range_get(Eo *eo_obj EINA_UNUSED,
+      Evas_Textblock_Legacy_Data *pd EINA_UNUSED,
       Efl_Text_Cursor_Cursor *start, Evas_Textblock_Cursor *end)
 {
    Evas *eo_e;
@@ -12597,7 +12597,7 @@ _evas_textblock_cursor_coord_set(Evas_Textblock_Cursor *cur, Evas_Coord x, Evas_
 
    Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
-   Efl_Canvas_Textblock_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
+   Evas_Textblock_Legacy_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
 
    _relayout_if_needed(cur->obj, o);
 
@@ -12774,7 +12774,7 @@ _evas_textblock_cursor_coord_set(Evas_Textblock_Cursor *cur, Evas_Coord x, Evas_
 end:
    if (ret)
      {
-        efl_event_callback_legacy_call(cur->obj, EFL_CANVAS_TEXTBLOCK_EVENT_CURSOR_CHANGED, NULL);
+        efl_event_callback_legacy_call(cur->obj, EVAS_TEXTBLOCK_LEGACY_EVENT_CURSOR_CHANGED, NULL);
      }
    return ret;
 }
@@ -12792,7 +12792,7 @@ evas_textblock_cursor_cluster_coord_set(Evas_Textblock_Cursor *cur,  Evas_Coord
 }
 
 EOLIAN static void
-_efl_canvas_textblock_efl_text_cursor_cursor_coord_set(Eo *eo_obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur EINA_UNUSED,
+_evas_textblock_legacy_efl_text_cursor_cursor_coord_set(Eo *eo_obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur EINA_UNUSED,
       Evas_Coord x, Evas_Coord y)
 {
    ASYNC_BLOCK;
@@ -12800,7 +12800,7 @@ _efl_canvas_textblock_efl_text_cursor_cursor_coord_set(Eo *eo_obj EINA_UNUSED, E
 }
 
 EOLIAN static void
-_efl_canvas_textblock_efl_text_cursor_cursor_cluster_coord_set(Eo *eo_obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur EINA_UNUSED,
+_evas_textblock_legacy_efl_text_cursor_cursor_cluster_coord_set(Eo *eo_obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur EINA_UNUSED,
       Evas_Coord x, Evas_Coord y)
 {
    ASYNC_BLOCK;
@@ -12816,7 +12816,7 @@ evas_textblock_cursor_line_coord_set(Evas_Textblock_Cursor *cur, Evas_Coord y)
    if (!cur) return -1;
    Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
-   Efl_Canvas_Textblock_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
+   Evas_Textblock_Legacy_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
 
    _relayout_if_needed(cur->obj, o);
 
@@ -13235,12 +13235,12 @@ EAPI Eina_Iterator *
 evas_textblock_cursor_range_simple_geometry_get(const Efl_Text_Cursor_Cursor *cur1, const Evas_Textblock_Cursor *cur2)
 {
    if (!cur1) return NULL;
-   return efl_canvas_textblock_range_simple_geometry_get(cur1->obj, cur1, cur2);
+   return evas_textblock_legacy_range_simple_geometry_get(cur1->obj, cur1, cur2);
 }
 
 EOLIAN static Eina_Iterator *
-_efl_canvas_textblock_range_simple_geometry_get(Eo *eo_obj EINA_UNUSED,
-      Efl_Canvas_Textblock_Data *o, const Efl_Text_Cursor_Cursor *cur1, const
+_evas_textblock_legacy_range_simple_geometry_get(Eo *eo_obj EINA_UNUSED,
+      Evas_Textblock_Legacy_Data *o, const Efl_Text_Cursor_Cursor *cur1, const
       Evas_Textblock_Cursor *cur2)
 {
    Evas_Object_Textblock_Line *ln1, *ln2;
@@ -13346,8 +13346,8 @@ _efl_canvas_textblock_range_simple_geometry_get(Eo *eo_obj EINA_UNUSED,
 }
 
 static Eina_List *
-_efl_canvas_textblock_range_geometry_list_get(Eo *eo_obj EINA_UNUSED,
-      Efl_Canvas_Textblock_Data *o, const Efl_Text_Cursor_Cursor *cur1, const
+_evas_textblock_legacy_range_geometry_list_get(Eo *eo_obj EINA_UNUSED,
+      Evas_Textblock_Legacy_Data *o, const Efl_Text_Cursor_Cursor *cur1, const
       Evas_Textblock_Cursor *cur2)
 {
    Evas_Object_Textblock_Line *ln1, *ln2;
@@ -13425,21 +13425,21 @@ _efl_canvas_textblock_range_geometry_list_get(Eo *eo_obj EINA_UNUSED,
 EAPI Eina_List *
 evas_textblock_cursor_range_geometry_get(const Efl_Text_Cursor_Cursor *cur1, const Evas_Textblock_Cursor *cur2_obj)
 {
-   Efl_Canvas_Textblock_Data *o;
+   Evas_Textblock_Legacy_Data *o;
 
    if (!cur1) return NULL;
 
    o = efl_data_scope_get(cur1->obj, MY_CLASS);
 
-   return _efl_canvas_textblock_range_geometry_list_get(cur1->obj, o, cur1, cur2_obj);
+   return _evas_textblock_legacy_range_geometry_list_get(cur1->obj, o, cur1, cur2_obj);
 }
 
 EOLIAN static Eina_Iterator *
-_efl_canvas_textblock_range_geometry_get(Eo *eo_obj EINA_UNUSED,
-      Efl_Canvas_Textblock_Data *o, const Efl_Text_Cursor_Cursor *cur1, const
+_evas_textblock_legacy_range_geometry_get(Eo *eo_obj EINA_UNUSED,
+      Evas_Textblock_Legacy_Data *o, const Efl_Text_Cursor_Cursor *cur1, const
       Evas_Textblock_Cursor *cur2)
 {
-   Eina_List *rects = _efl_canvas_textblock_range_geometry_list_get(eo_obj,
+   Eina_List *rects = _evas_textblock_legacy_range_geometry_list_get(eo_obj,
          o, cur1, cur2);
    return _evas_textblock_selection_iterator_new(rects);
 }
@@ -13455,7 +13455,7 @@ _evas_textblock_cursor_format_item_geometry_get(const Efl_Text_Cursor_Cursor *cu
    if (!cur) return EINA_FALSE;
    Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
-   Efl_Canvas_Textblock_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
+   Evas_Textblock_Legacy_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
 
    _relayout_if_needed(cur->obj, o);
 
@@ -13508,7 +13508,7 @@ evas_object_textblock_line_number_geometry_get(const Eo *eo_obj, int line, Evas_
    Evas_Object_Textblock_Line *ln;
    Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
-   Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
+   Evas_Textblock_Legacy_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
 
    _relayout_if_needed((Evas_Object *)eo_obj, o);
 
@@ -13534,7 +13534,7 @@ _evas_object_textblock_clear(Evas_Object *eo_obj)
    eo_e = evas_object_evas_get(eo_obj);
    evas = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
    evas_object_async_block(obj);
-   Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
+   Evas_Textblock_Legacy_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
    if (o->paragraphs)
      {
         _paragraphs_free(evas, o, obj, o->paragraphs);
@@ -13569,7 +13569,7 @@ evas_object_textblock_clear(Evas_Object *eo_obj)
 }
 
 EOLIAN static void
-_efl_canvas_textblock_size_formatted_get(const Eo *eo_obj, Efl_Canvas_Textblock_Data *o, Evas_Coord *w, Evas_Coord *h)
+_evas_textblock_legacy_size_formatted_get(const Eo *eo_obj, Evas_Textblock_Legacy_Data *o, Evas_Coord *w, Evas_Coord *h)
 {
    Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
@@ -13721,7 +13721,7 @@ loop_advance:
 /* FIXME: doc */
 static void
 _size_native_calc_paragraph_size(const Evas_Object *eo_obj,
-      const Efl_Canvas_Textblock_Data *o,
+      const Evas_Textblock_Legacy_Data *o,
       Evas_Object_Textblock_Paragraph *par,
       Textblock_Position *position,
       Evas_Coord *_w, Evas_Coord *_h)
@@ -13812,7 +13812,7 @@ _size_native_calc_paragraph_size(const Evas_Object *eo_obj,
 }
 
 EOLIAN static void
-_efl_canvas_textblock_size_native_get(const Eo *eo_obj, Efl_Canvas_Textblock_Data *o, Evas_Coord *w, Evas_Coord *h)
+_evas_textblock_legacy_size_native_get(const Eo *eo_obj, Evas_Textblock_Legacy_Data *o, Evas_Coord *w, Evas_Coord *h)
 {
    Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
@@ -13846,7 +13846,7 @@ _efl_canvas_textblock_size_native_get(const Eo *eo_obj, Efl_Canvas_Textblock_Dat
 }
 
 EOLIAN static void
-_efl_canvas_textblock_style_insets_get(const Eo *eo_obj, Efl_Canvas_Textblock_Data *o, Evas_Coord *l, Evas_Coord *r, Evas_Coord *t, Evas_Coord *b)
+_evas_textblock_legacy_style_insets_get(const Eo *eo_obj, Evas_Textblock_Legacy_Data *o, Evas_Coord *l, Evas_Coord *r, Evas_Coord *t, Evas_Coord *b)
 {
    Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
@@ -13859,7 +13859,7 @@ _efl_canvas_textblock_style_insets_get(const Eo *eo_obj, Efl_Canvas_Textblock_Da
 }
 
 EOLIAN static void
-_efl_canvas_textblock_efl_object_dbg_info_get(Eo *eo_obj, Efl_Canvas_Textblock_Data *o EINA_UNUSED, Efl_Dbg_Info *root)
+_evas_textblock_legacy_efl_object_dbg_info_get(Eo *eo_obj, Evas_Textblock_Legacy_Data *o EINA_UNUSED, Efl_Dbg_Info *root)
 {
    efl_dbg_info_get(efl_super(eo_obj, MY_CLASS), root);
    if (!root) return;
@@ -13883,7 +13883,7 @@ _efl_canvas_textblock_efl_object_dbg_info_get(Eo *eo_obj, Efl_Canvas_Textblock_D
 
      {
         int w, h;
-        efl_canvas_textblock_size_formatted_get(eo_obj, &w, &h);
+        evas_textblock_legacy_size_formatted_get(eo_obj, &w, &h);
         node = EFL_DBG_INFO_LIST_APPEND(group, "Formatted size");
         EFL_DBG_INFO_APPEND(node, "w", EINA_VALUE_TYPE_INT, w);
         EFL_DBG_INFO_APPEND(node, "h", EINA_VALUE_TYPE_INT, h);
@@ -13891,7 +13891,7 @@ _efl_canvas_textblock_efl_object_dbg_info_get(Eo *eo_obj, Efl_Canvas_Textblock_D
 
      {
         int w, h;
-        efl_canvas_textblock_size_native_get(eo_obj, &w, &h);
+        evas_textblock_legacy_size_native_get(eo_obj, &w, &h);
         node = EFL_DBG_INFO_LIST_APPEND(group, "Native size");
         EFL_DBG_INFO_APPEND(node, "w", EINA_VALUE_TYPE_INT, w);
         EFL_DBG_INFO_APPEND(node, "h", EINA_VALUE_TYPE_INT, h);
@@ -13903,7 +13903,7 @@ static void
 evas_object_textblock_init(Evas_Object *eo_obj)
 {
    Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
-   Efl_Canvas_Textblock_Data *o;
+   Evas_Textblock_Legacy_Data *o;
    static Eina_Bool linebreak_init = EINA_FALSE;
 
    if (!linebreak_init)
@@ -13926,7 +13926,7 @@ evas_object_textblock_init(Evas_Object *eo_obj)
 }
 
 EOLIAN static void
-_efl_canvas_textblock_efl_object_destructor(Eo *eo_obj, Efl_Canvas_Textblock_Data *o EINA_UNUSED)
+_evas_textblock_legacy_efl_object_destructor(Eo *eo_obj, Evas_Textblock_Legacy_Data *o EINA_UNUSED)
 {
    evas_object_textblock_free(eo_obj);
    efl_destructor(efl_super(eo_obj, MY_CLASS));
@@ -13935,9 +13935,9 @@ _efl_canvas_textblock_efl_object_destructor(Eo *eo_obj, Efl_Canvas_Textblock_Dat
 static void
 evas_object_textblock_free(Evas_Object *eo_obj)
 {
-   Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
+   Evas_Textblock_Legacy_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
    Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
-   Efl_Canvas_Textblock_Filter_Program *prg;
+   Evas_Textblock_Legacy_Filter_Program *prg;
    Evas_Filter_Data_Binding *db;
    User_Style_Entry *use;
 
@@ -14056,7 +14056,7 @@ _filter_sync_end(Evas_Filter_Context *ctx, Eina_Bool success)
 static void
 _filter_post_render_cb(void *data)
 {
-   Efl_Canvas_Textblock_Filter_Post_Render *post_data = data;
+   Evas_Textblock_Legacy_Filter_Post_Render *post_data = data;
 
    _filter_sync_end(post_data->ctx, post_data->success);
    free(post_data);
@@ -14065,7 +14065,7 @@ _filter_post_render_cb(void *data)
 static void
 _filter_cb(Evas_Filter_Context *ctx, void *data, Eina_Bool success)
 {
-   Efl_Canvas_Textblock_Filter_Post_Render *post_data;
+   Evas_Textblock_Legacy_Filter_Post_Render *post_data;
    Evas_Public_Data *evas = data;
 
    if (!evas_filter_context_async_get(ctx))
@@ -14101,7 +14101,7 @@ _filter_relative_bounding_box_get(const Text_Item_Filter *tif)
 }
 
 static void
-_filter_output_cache_prune(Evas_Object_Protected_Data *obj, Efl_Canvas_Textblock_Data *o)
+_filter_output_cache_prune(Evas_Object_Protected_Data *obj, Evas_Textblock_Legacy_Data *o)
 {
    Text_Item_Filter *tif;
    Eina_Inlist *il;
@@ -14144,7 +14144,7 @@ static inline Evas_Coord_Point
 _filter_target_position_calc(Evas_Object_Protected_Data *obj,
                              Evas_Object_Textblock_Text_Item *ti, int x, int y)
 {
-   Efl_Canvas_Textblock_Filter *filter = ti->parent.format->gfx_filter;
+   Evas_Textblock_Legacy_Filter *filter = ti->parent.format->gfx_filter;
    Evas_Object_Textblock_Line *ln = ti->parent.ln;
    Evas_Coord_Point pt;
 
@@ -14163,7 +14163,7 @@ evas_object_textblock_render(Evas_Object *eo_obj EINA_UNUSED,
    Evas_Object_Textblock_Paragraph *par, *start = NULL;
    Evas_Object_Textblock_Item *itr;
    Evas_Object_Textblock_Line *ln, *cur_ln = NULL;
-   Efl_Canvas_Textblock_Data *o = type_private_data;
+   Evas_Textblock_Legacy_Data *o = type_private_data;
    ASYNC_BLOCK;
 
    Eina_List *shadows = NULL;
@@ -14468,7 +14468,7 @@ evas_object_textblock_render(Evas_Object *eo_obj EINA_UNUSED,
      {
         Efl_Canvas_Filter_State state = EFL_CANVAS_FILTER_STATE_DEFAULT;
         Evas_Object_Textblock_Text_Item *ti = _ITEM_TEXT(itr);
-        Efl_Canvas_Textblock_Filter *filter;
+        Evas_Textblock_Legacy_Filter *filter;
         Evas_Filter_Program *pgm;
         Evas_Filter_Context *ctx;
         Evas_Coord_Point target;
@@ -14865,13 +14865,13 @@ evas_object_textblock_render(Evas_Object *eo_obj EINA_UNUSED,
 }
 
 EOLIAN static void
-_efl_canvas_textblock_efl_canvas_filter_internal_filter_state_prepare(
-      Eo *eo_obj, Efl_Canvas_Textblock_Data *pd EINA_UNUSED, Efl_Canvas_Filter_State *state, void *data)
+_evas_textblock_legacy_efl_canvas_filter_internal_filter_state_prepare(
+      Eo *eo_obj, Evas_Textblock_Legacy_Data *pd EINA_UNUSED, Efl_Canvas_Filter_State *state, void *data)
 {
    Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
-   Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_TEXTBLOCK_CLASS);
+   Evas_Textblock_Legacy_Data *o = efl_data_scope_get(eo_obj, EVAS_TEXTBLOCK_LEGACY_CLASS);
    Evas_Object_Textblock_Text_Item *ti = data;
-   Efl_Canvas_Textblock_Filter_Program *program;
+   Evas_Textblock_Legacy_Filter_Program *program;
    Evas_Filter_Padding pad = {};
 
 #define STATE_COLOR(dst, src) dst.r = src.r; dst.g = src.g; dst.b = src.b; dst.a = src.a
@@ -14890,8 +14890,8 @@ _efl_canvas_textblock_efl_canvas_filter_internal_filter_state_prepare(
 }
 
 EOLIAN static Eina_Bool
-_efl_canvas_textblock_efl_canvas_filter_internal_filter_input_render(
-      Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *pd EINA_UNUSED, void *filter,
+_evas_textblock_legacy_efl_canvas_filter_internal_filter_input_render(
+      Eo *obj EINA_UNUSED, Evas_Textblock_Legacy_Data *pd EINA_UNUSED, void *filter,
       void *engine, void *output, void *drawctx, void *data,
       int l, int r EINA_UNUSED, int t, int b EINA_UNUSED,
       int x, int y, Eina_Bool do_async)
@@ -14907,17 +14907,17 @@ _efl_canvas_textblock_efl_canvas_filter_internal_filter_input_render(
 }
 
 EOLIAN static void
-_efl_canvas_textblock_efl_canvas_filter_internal_filter_dirty(
-      Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *pd EINA_UNUSED)
+_evas_textblock_legacy_efl_canvas_filter_internal_filter_dirty(
+      Eo *obj EINA_UNUSED, Evas_Textblock_Legacy_Data *pd EINA_UNUSED)
 {
    WRN("Filter marked as dirty. NOT IMPLEMENTED!");
 }
 
 EOLIAN static void
-_efl_canvas_textblock_efl_gfx_filter_filter_program_set(Eo *eo_obj, Efl_Canvas_Textblock_Data *pd, const char *code, const char *name)
+_evas_textblock_legacy_efl_gfx_filter_filter_program_set(Eo *eo_obj, Evas_Textblock_Legacy_Data *pd, const char *code, const char *name)
 {
    Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
-   Efl_Canvas_Textblock_Filter_Program *prg;
+   Evas_Textblock_Legacy_Filter_Program *prg;
 
    prg = _filter_program_find(pd, name);
    if (prg)
@@ -14928,7 +14928,7 @@ _efl_canvas_textblock_efl_gfx_filter_filter_program_set(Eo *eo_obj, Efl_Canvas_T
      {
         prg = calloc(1, sizeof(*prg));
         prg->name = eina_stringshare_add(name);
-        pd->gfx_filter.programs = (Efl_Canvas_Textblock_Filter_Program *)
+        pd->gfx_filter.programs = (Evas_Textblock_Legacy_Filter_Program *)
               eina_inlist_append(EINA_INLIST_GET(pd->gfx_filter.programs), EINA_INLIST_GET(prg));
      }
    eina_stringshare_replace(&prg->code, code);
@@ -14941,7 +14941,7 @@ _efl_canvas_textblock_efl_gfx_filter_filter_program_set(Eo *eo_obj, Efl_Canvas_T
 }
 
 EOLIAN static void
-_efl_canvas_textblock_efl_gfx_filter_filter_program_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *pd EINA_UNUSED,
+_evas_textblock_legacy_efl_gfx_filter_filter_program_get(const Eo *obj EINA_UNUSED, Evas_Textblock_Legacy_Data *pd EINA_UNUSED,
                                                    const char **code EINA_UNUSED, const char **name EINA_UNUSED)
 {
    // FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME
@@ -14949,7 +14949,7 @@ _efl_canvas_textblock_efl_gfx_filter_filter_program_get(const Eo *obj EINA_UNUSE
 }
 
 static Evas_Filter_Data_Binding *
-_filter_data_binding_find(Efl_Canvas_Textblock_Data *pd, const char *name)
+_filter_data_binding_find(Evas_Textblock_Legacy_Data *pd, const char *name)
 {
    Evas_Filter_Data_Binding *db;
 
@@ -14962,9 +14962,9 @@ _filter_data_binding_find(Efl_Canvas_Textblock_Data *pd, const char *name)
 }
 
 EOLIAN static void
-_efl_canvas_textblock_efl_gfx_filter_filter_data_set(Eo *obj, Efl_Canvas_Textblock_Data *pd, const char *name, const char *value, Eina_Bool execute)
+_evas_textblock_legacy_efl_gfx_filter_filter_data_set(Eo *obj, Evas_Textblock_Legacy_Data *pd, const char *name, const char *value, Eina_Bool execute)
 {
-   Efl_Canvas_Textblock_Filter_Program *prg;
+   Evas_Textblock_Legacy_Filter_Program *prg;
    Evas_Filter_Data_Binding *db;
 
    if (!name) return;
@@ -15010,7 +15010,7 @@ _efl_canvas_textblock_efl_gfx_filter_filter_data_set(Eo *obj, Efl_Canvas_Textblo
 }
 
 EOLIAN static void
-_efl_canvas_textblock_efl_gfx_filter_filter_data_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *pd, const char *name, const char **value, Eina_Bool *execute)
+_evas_textblock_legacy_efl_gfx_filter_filter_data_get(const Eo *obj EINA_UNUSED, Evas_Textblock_Legacy_Data *pd, const char *name, const char **value, Eina_Bool *execute)
 {
    Evas_Filter_Data_Binding *db;
 
@@ -15027,7 +15027,7 @@ _efl_canvas_textblock_efl_gfx_filter_filter_data_get(const Eo *obj EINA_UNUSED,
 }
 
 EOLIAN static void
-_efl_canvas_textblock_efl_gfx_filter_filter_source_set(Eo *eo_obj, Efl_Canvas_Textblock_Data *pd, const char *name, Efl_Gfx_Entity *eo_source)
+_evas_textblock_legacy_efl_gfx_filter_filter_source_set(Eo *eo_obj, Evas_Textblock_Legacy_Data *pd, const char *name, Efl_Gfx_Entity *eo_source)
 {
    Evas_Object_Protected_Data *obj, *source;
    Evas_Filter_Proxy_Binding *pb;
@@ -15081,7 +15081,7 @@ _efl_canvas_textblock_efl_gfx_filter_filter_source_set(Eo *eo_obj, Efl_Canvas_Te
 }
 
 EOLIAN static Efl_Gfx_Entity *
-_efl_canvas_textblock_efl_gfx_filter_filter_source_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *pd, const char *name)
+_evas_textblock_legacy_efl_gfx_filter_filter_source_get(const Eo *obj EINA_UNUSED, Evas_Textblock_Legacy_Data *pd, const char *name)
 {
    return eina_hash_find(pd->gfx_filter.sources, name);
 }
@@ -15091,7 +15091,7 @@ evas_object_textblock_coords_recalc(Evas_Object *eo_obj,
                                     Evas_Object_Protected_Data *obj,
                                     void *type_private_data)
 {
-   Efl_Canvas_Textblock_Data *o = type_private_data;
+   Evas_Textblock_Legacy_Data *o = type_private_data;
 
 #ifdef BIDI_SUPPORT
    if (o->inherit_paragraph_direction)
@@ -15150,7 +15150,7 @@ evas_object_textblock_render_pre(Evas_Object *eo_obj,
 				 Evas_Object_Protected_Data *obj,
 				 void *type_private_data)
 {
-   Efl_Canvas_Textblock_Data *o = type_private_data;
+   Evas_Textblock_Legacy_Data *o = type_private_data;
    ASYNC_BLOCK;
 
    int is_v, was_v;
@@ -15275,13 +15275,13 @@ evas_object_textblock_render_post(Evas_Object *eo_obj EINA_UNUSED,
                                   Evas_Object_Protected_Data *obj,
                                   void *type_private_data)
 {
-   Efl_Canvas_Textblock_Data *o = type_private_data;
+   Evas_Textblock_Legacy_Data *o = type_private_data;
    ASYNC_BLOCK;
 
    /* this moves the current data to the previous state parts of the object */
    /* in whatever way is safest for the object. also if we don't need object */
    /* data anymore we can free it if the object deems this is a good idea */
-/*   o = (Efl_Canvas_Textblock_Data *)(obj->object_data); */
+/*   o = (Evas_Textblock_Legacy_Data *)(obj->object_data); */
    /* remove those pesky changes */
    evas_object_clip_changes_clean(obj);
    /* move cur to prev safely for object data */
@@ -15293,7 +15293,7 @@ evas_object_textblock_render_post(Evas_Object *eo_obj EINA_UNUSED,
 
 static void *evas_object_textblock_engine_data_get(Evas_Object *eo_obj)
 {
-   Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
+   Evas_Textblock_Legacy_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
    if (!o) return NULL;
    return o->engine_data;
 }
@@ -15319,8 +15319,8 @@ evas_object_textblock_was_opaque(Evas_Object *eo_obj EINA_UNUSED,
 }
 
 EOLIAN static void
-_efl_canvas_textblock_efl_gfx_entity_scale_set(Evas_Object *eo_obj,
-                                       Efl_Canvas_Textblock_Data *o,
+_evas_textblock_legacy_efl_gfx_entity_scale_set(Evas_Object *eo_obj,
+                                       Evas_Textblock_Legacy_Data *o,
                                        double scale)
 {
    if (EINA_DBL_EQ(efl_gfx_entity_scale_get(eo_obj), scale)) return;
@@ -15336,7 +15336,7 @@ void
 _evas_object_textblock_rehint(Evas_Object *eo_obj)
 {
    Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
-   Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
+   Evas_Textblock_Legacy_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
    Evas_Object_Textblock_Paragraph *par;
    Evas_Object_Textblock_Line *ln;
 
@@ -15365,8 +15365,8 @@ _evas_object_textblock_rehint(Evas_Object *eo_obj)
 }
 
 EOLIAN static void
-_efl_canvas_textblock_efl_canvas_object_paragraph_direction_set(Eo *eo_obj,
-                                                           Efl_Canvas_Textblock_Data *o,
+_evas_textblock_legacy_efl_canvas_object_paragraph_direction_set(Eo *eo_obj,
+                                                           Evas_Textblock_Legacy_Data *o,
                                                            Efl_Text_Bidirectional_Type dir)
 {
 #ifdef BIDI_SUPPORT
@@ -15408,8 +15408,8 @@ _efl_canvas_textblock_efl_canvas_object_paragraph_direction_set(Eo *eo_obj,
 }
 
 EOLIAN static Efl_Text_Bidirectional_Type
-_efl_canvas_textblock_efl_canvas_object_paragraph_direction_get(const Eo *eo_obj EINA_UNUSED,
-                                                           Efl_Canvas_Textblock_Data *o)
+_evas_textblock_legacy_efl_canvas_object_paragraph_direction_get(const Eo *eo_obj EINA_UNUSED,
+                                                           Evas_Textblock_Legacy_Data *o)
 {
    return (Efl_Text_Bidirectional_Type)o->paragraph_direction;
 }
@@ -15430,7 +15430,7 @@ _prepend_text_run2(Efl_Text_Cursor_Cursor *cur, const char *s, const char *p)
 }
 
 static int
-_efl_canvas_textblock_cursor_text_append(Efl_Text_Cursor_Cursor *cur,
+_evas_textblock_legacy_cursor_text_append(Efl_Text_Cursor_Cursor *cur,
       const char *text)
 {
    if (!text) return 0;
@@ -15478,17 +15478,17 @@ _efl_canvas_textblock_cursor_text_append(Efl_Text_Cursor_Cursor *cur,
 }
 
 EOLIAN static void
-_efl_canvas_textblock_efl_text_text_set(Eo *eo_obj, Efl_Canvas_Textblock_Data *o,
+_evas_textblock_legacy_efl_text_text_set(Eo *eo_obj, Evas_Textblock_Legacy_Data *o,
       const char *text)
 {
    ASYNC_BLOCK;
    evas_object_textblock_text_markup_set(eo_obj, "");
    efl_text_cursor_text_insert(eo_obj, o->cursor, text);
-   //efl_event_callback_call(eo_obj, EFL_CANVAS_TEXTBLOCK_EVENT_CHANGED, NULL);
+   //efl_event_callback_call(eo_obj, EVAS_TEXTBLOCK_LEGACY_EVENT_CHANGED, NULL);
 }
 
 static char *
-_canvas_text_get_all(const Eo *eo_obj, Efl_Canvas_Textblock_Data *o EINA_UNUSED)
+_canvas_text_get_all(const Eo *eo_obj, Evas_Textblock_Legacy_Data *o EINA_UNUSED)
 {
    Efl_Text_Cursor_Cursor start, end;
 
@@ -15502,7 +15502,7 @@ _canvas_text_get_all(const Eo *eo_obj, Efl_Canvas_Textblock_Data *o EINA_UNUSED)
 }
 
 EOLIAN static const char *
-_efl_canvas_textblock_efl_text_text_get(const Eo *eo_obj, Efl_Canvas_Textblock_Data *o)
+_evas_textblock_legacy_efl_text_text_get(const Eo *eo_obj, Evas_Textblock_Legacy_Data *o)
 {
    Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
@@ -15586,7 +15586,7 @@ _textblock_cursor_pos_at_fnode_set(const Eo *eo_obj EINA_UNUSED,
 }
 
 static Eina_Bool
-_textblock_annotation_set(Eo *eo_obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o,
+_textblock_annotation_set(Eo *eo_obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o,
       Efl_Text_Annotate_Annotation *an,
       Efl_Text_Cursor_Cursor *start, Efl_Text_Cursor_Cursor *end,
       const char *format, Eina_Bool is_item)
@@ -15626,7 +15626,7 @@ _textblock_annotation_set(Eo *eo_obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o,
 }
 
 EOLIAN static const char *
-_efl_canvas_textblock_efl_text_annotate_annotation_get(const Eo *eo_obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED,
+_evas_textblock_legacy_efl_text_annotate_annotation_get(const Eo *eo_obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED,
       Efl_Text_Annotate_Annotation *annotation)
 {
    if (!annotation || (annotation->obj != eo_obj))
@@ -15639,8 +15639,8 @@ _efl_canvas_textblock_efl_text_annotate_annotation_get(const Eo *eo_obj EINA_UNU
 }
 
 EOLIAN static Eina_Bool
-_efl_canvas_textblock_efl_text_annotate_annotation_set(Eo *eo_obj,
-      Efl_Canvas_Textblock_Data *o, Efl_Text_Annotate_Annotation *annotation,
+_evas_textblock_legacy_efl_text_annotate_annotation_set(Eo *eo_obj,
+      Evas_Textblock_Legacy_Data *o, Efl_Text_Annotate_Annotation *annotation,
       const char *format)
 {
    ASYNC_BLOCK;
@@ -15676,7 +15676,7 @@ _efl_canvas_textblock_efl_text_annotate_annotation_set(Eo *eo_obj,
 }
 
 static void
-_evas_textblock_annotation_remove(Efl_Canvas_Textblock_Data *o,
+_evas_textblock_annotation_remove(Evas_Textblock_Legacy_Data *o,
       Efl_Text_Annotate_Annotation *an, Eina_Bool remove_nodes)
 {
    if (remove_nodes)
@@ -15700,7 +15700,7 @@ _evas_textblock_annotation_remove(Efl_Canvas_Textblock_Data *o,
 }
 
 static void
-_evas_textblock_annotations_clear(Efl_Canvas_Textblock_Data *o)
+_evas_textblock_annotations_clear(Evas_Textblock_Legacy_Data *o)
 {
    Efl_Text_Annotate_Annotation *an;
 
@@ -15711,8 +15711,8 @@ _evas_textblock_annotations_clear(Efl_Canvas_Textblock_Data *o)
 }
 
 EOLIAN static Eina_Bool
-_efl_canvas_textblock_efl_text_annotate_annotation_del(Eo *eo_obj EINA_UNUSED,
-      Efl_Canvas_Textblock_Data *o, Efl_Text_Annotate_Annotation *annotation)
+_evas_textblock_legacy_efl_text_annotate_annotation_del(Eo *eo_obj EINA_UNUSED,
+      Evas_Textblock_Legacy_Data *o, Efl_Text_Annotate_Annotation *annotation)
 {
    ASYNC_BLOCK;
    if (!annotation || (annotation->obj != eo_obj))
@@ -15736,7 +15736,7 @@ _efl_canvas_textblock_efl_text_annotate_annotation_del(Eo *eo_obj EINA_UNUSED,
 }
 
 static Efl_Text_Annotate_Annotation *
-_textblock_annotation_insert(Eo *eo_obj, Efl_Canvas_Textblock_Data *o,
+_textblock_annotation_insert(Eo *eo_obj, Evas_Textblock_Legacy_Data *o,
       Efl_Text_Cursor_Cursor *start, Efl_Text_Cursor_Cursor *end,
       const char *format, Eina_Bool is_item)
 {
@@ -15801,7 +15801,7 @@ _textblock_annotation_insert(Eo *eo_obj, Efl_Canvas_Textblock_Data *o,
 }
 
 EOLIAN static Efl_Text_Annotate_Annotation *
-_efl_canvas_textblock_efl_text_annotate_annotation_insert(Eo *eo_obj, Efl_Canvas_Textblock_Data *o,
+_evas_textblock_legacy_efl_text_annotate_annotation_insert(Eo *eo_obj, Evas_Textblock_Legacy_Data *o,
       Efl_Text_Cursor_Cursor *start, Efl_Text_Cursor_Cursor *end,
       const char *format)
 {
@@ -15810,12 +15810,12 @@ _efl_canvas_textblock_efl_text_annotate_annotation_insert(Eo *eo_obj, Efl_Canvas
 
    ret = _textblock_annotation_insert(eo_obj, o, start, end, format,
          EINA_FALSE);
-   efl_event_callback_legacy_call(eo_obj, EFL_CANVAS_TEXTBLOCK_EVENT_CHANGED, NULL);
+   efl_event_callback_legacy_call(eo_obj, EVAS_TEXTBLOCK_LEGACY_EVENT_CHANGED, NULL);
    return ret;
 }
 
 EOLIAN static Eina_Iterator *
-_efl_canvas_textblock_efl_text_annotate_range_annotations_get(const Eo *eo_obj, Efl_Canvas_Textblock_Data *o EINA_UNUSED,
+_evas_textblock_legacy_efl_text_annotate_range_annotations_get(const Eo *eo_obj, Evas_Textblock_Legacy_Data *o EINA_UNUSED,
       const Evas_Textblock_Cursor *start, const Evas_Textblock_Cursor *end)
 {
    Eina_List *lst = NULL;
@@ -15841,8 +15841,8 @@ _efl_canvas_textblock_efl_text_annotate_range_annotations_get(const Eo *eo_obj,
 }
 
 EOLIAN static Efl_Text_Annotate_Annotation *
-_efl_canvas_textblock_efl_text_annotate_cursor_item_insert(Eo *eo_obj,
-      Efl_Canvas_Textblock_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur,
+_evas_textblock_legacy_efl_text_annotate_cursor_item_insert(Eo *eo_obj,
+      Evas_Textblock_Legacy_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur,
       const char *item, const char *format)
 {
    Eina_Strbuf *buf = eina_strbuf_new();
@@ -15853,13 +15853,13 @@ _efl_canvas_textblock_efl_text_annotate_cursor_item_insert(Eo *eo_obj,
       _textblock_annotation_insert(cur->obj, o, cur, cur,
             eina_strbuf_string_get(buf), EINA_TRUE);
    eina_strbuf_free(buf);
-   efl_event_callback_legacy_call(eo_obj, EFL_CANVAS_TEXTBLOCK_EVENT_CHANGED, NULL);
+   efl_event_callback_legacy_call(eo_obj, EVAS_TEXTBLOCK_LEGACY_EVENT_CHANGED, NULL);
    return ret;
 }
 
 EOLIAN static Efl_Text_Annotate_Annotation *
-_efl_canvas_textblock_efl_text_annotate_cursor_item_annotation_get(const Eo *eo_obj EINA_UNUSED,
-      Efl_Canvas_Textblock_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur)
+_evas_textblock_legacy_efl_text_annotate_cursor_item_annotation_get(const Eo *eo_obj EINA_UNUSED,
+      Evas_Textblock_Legacy_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur)
 {
    Eina_Iterator *it;
    Efl_Text_Annotate_Annotation *data, *ret = NULL;
@@ -15879,8 +15879,8 @@ _efl_canvas_textblock_efl_text_annotate_cursor_item_annotation_get(const Eo *eo_
 }
 
 EOLIAN static Eina_Bool
-_efl_canvas_textblock_efl_text_annotate_annotation_is_item(Eo *eo_obj EINA_UNUSED,
-      Efl_Canvas_Textblock_Data *o EINA_UNUSED,
+_evas_textblock_legacy_efl_text_annotate_annotation_is_item(Eo *eo_obj EINA_UNUSED,
+      Evas_Textblock_Legacy_Data *o EINA_UNUSED,
       Efl_Text_Annotate_Annotation *annotation)
 {
    if (!annotation || (annotation->obj != eo_obj))
@@ -15893,7 +15893,7 @@ _efl_canvas_textblock_efl_text_annotate_annotation_is_item(Eo *eo_obj EINA_UNUSE
 }
 
 EOLIAN static Eina_Bool
-_efl_canvas_textblock_efl_text_annotate_item_geometry_get(Eo *eo_obj, Efl_Canvas_Textblock_Data *o EINA_UNUSED,
+_evas_textblock_legacy_efl_text_annotate_item_geometry_get(Eo *eo_obj, Evas_Textblock_Legacy_Data *o EINA_UNUSED,
       const Efl_Text_Annotate_Annotation *an, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch)
 {
    Efl_Text_Cursor_Cursor cur;
@@ -15908,8 +15908,8 @@ _efl_canvas_textblock_efl_text_annotate_item_geometry_get(Eo *eo_obj, Efl_Canvas
 }
 
 EOLIAN static void
-_efl_canvas_textblock_efl_text_annotate_annotation_positions_get(Eo *eo_obj,
-      Efl_Canvas_Textblock_Data *o EINA_UNUSED,
+_evas_textblock_legacy_efl_text_annotate_annotation_positions_get(Eo *eo_obj,
+      Evas_Textblock_Legacy_Data *o EINA_UNUSED,
       const Efl_Text_Annotate_Annotation *annotation,
       Efl_Text_Cursor_Cursor *start, Efl_Text_Cursor_Cursor *end)
 {
@@ -15918,18 +15918,18 @@ _efl_canvas_textblock_efl_text_annotate_annotation_positions_get(Eo *eo_obj,
 }
 
 static void
-_canvas_text_format_changed(Eo *eo_obj, Efl_Canvas_Textblock_Data *o)
+_canvas_text_format_changed(Eo *eo_obj, Evas_Textblock_Legacy_Data *o)
 {
    o->format_changed = EINA_TRUE;
    _evas_textblock_invalidate_all(o);
    _evas_textblock_changed(o, eo_obj);
-   efl_event_callback_call(eo_obj, EFL_CANVAS_TEXTBLOCK_EVENT_CHANGED, NULL);
+   efl_event_callback_call(eo_obj, EVAS_TEXTBLOCK_LEGACY_EVENT_CHANGED, NULL);
 }
 
 /* Efl.Text.Font interface implementation */
 
 static void
-_efl_canvas_textblock_efl_text_font_font_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, const char *font EINA_UNUSED, int size EINA_UNUSED)
+_evas_textblock_legacy_efl_text_font_font_set(Eo *obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED, const char *font EINA_UNUSED, int size EINA_UNUSED)
 {
    ASYNC_BLOCK;
    Eina_Bool changed = EINA_FALSE;
@@ -15965,14 +15965,14 @@ _efl_canvas_textblock_efl_text_font_font_set(Eo *obj EINA_UNUSED, Efl_Canvas_Tex
 }
 
 static void
-_efl_canvas_textblock_efl_text_font_font_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, const char **font EINA_UNUSED, int *size EINA_UNUSED)
+_evas_textblock_legacy_efl_text_font_font_get(const Eo *obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED, const char **font EINA_UNUSED, int *size EINA_UNUSED)
 {
    if (font) *font = o->default_format.info.font;
    if (size) *size = o->default_format.info.size;
 }
 
 static void
-_efl_canvas_textblock_efl_text_font_font_source_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, const char *font_source EINA_UNUSED)
+_evas_textblock_legacy_efl_text_font_font_source_set(Eo *obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED, const char *font_source EINA_UNUSED)
 {
    Eina_Stringshare *nfont_source;
    if (o->default_format.info.font_source != font_source)
@@ -15993,13 +15993,13 @@ _efl_canvas_textblock_efl_text_font_font_source_set(Eo *obj EINA_UNUSED, Efl_Can
 }
 
 static const char*
-_efl_canvas_textblock_efl_text_font_font_source_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED)
+_evas_textblock_legacy_efl_text_font_font_source_get(const Eo *obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED)
 {
    return _FMT_INFO(font_source);
 }
 
 static void
-_efl_canvas_textblock_efl_text_font_font_fallbacks_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, const char *font_fallbacks EINA_UNUSED)
+_evas_textblock_legacy_efl_text_font_font_fallbacks_set(Eo *obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED, const char *font_fallbacks EINA_UNUSED)
 {
    Eina_Stringshare *nfont_fallbacks;
    if (o->default_format.info.font_fallbacks != font_fallbacks)
@@ -16020,13 +16020,13 @@ _efl_canvas_textblock_efl_text_font_font_fallbacks_set(Eo *obj EINA_UNUSED, Efl_
 }
 
 static const char*
-_efl_canvas_textblock_efl_text_font_font_fallbacks_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED)
+_evas_textblock_legacy_efl_text_font_font_fallbacks_get(const Eo *obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED)
 {
    return _FMT_INFO(font_fallbacks);
 }
 
 static void
-_efl_canvas_textblock_efl_text_font_font_lang_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, const char *font_lang EINA_UNUSED)
+_evas_textblock_legacy_efl_text_font_font_lang_set(Eo *obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED, const char *font_lang EINA_UNUSED)
 {
    Eina_Stringshare *nfont_lang;
    if (o->default_format.info.font_lang != font_lang)
@@ -16047,13 +16047,13 @@ _efl_canvas_textblock_efl_text_font_font_lang_set(Eo *obj EINA_UNUSED, Efl_Canva
 }
 
 static const char*
-_efl_canvas_textblock_efl_text_font_font_lang_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED)
+_evas_textblock_legacy_efl_text_font_font_lang_get(const Eo *obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED)
 {
    return _FMT_INFO(font_lang);
 }
 
 static void
-_efl_canvas_textblock_efl_text_font_font_weight_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, Efl_Text_Font_Weight font_weight EINA_UNUSED)
+_evas_textblock_legacy_efl_text_font_font_weight_set(Eo *obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED, Efl_Text_Font_Weight font_weight EINA_UNUSED)
 {
    if (_FMT_INFO(font_weight) == font_weight) return;
    _FMT_INFO(font_weight) = font_weight;
@@ -16061,13 +16061,13 @@ _efl_canvas_textblock_efl_text_font_font_weight_set(Eo *obj EINA_UNUSED, Efl_Can
 }
 
 static Efl_Text_Font_Weight
-_efl_canvas_textblock_efl_text_font_font_weight_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED)
+_evas_textblock_legacy_efl_text_font_font_weight_get(const Eo *obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED)
 {
    return _FMT_INFO(font_weight);
 }
 
 static void
-_efl_canvas_textblock_efl_text_font_font_slant_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, Efl_Text_Font_Slant font_slant EINA_UNUSED)
+_evas_textblock_legacy_efl_text_font_font_slant_set(Eo *obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED, Efl_Text_Font_Slant font_slant EINA_UNUSED)
 {
    ASYNC_BLOCK;
    if (_FMT_INFO(font_slant) == font_slant) return;
@@ -16076,13 +16076,13 @@ _efl_canvas_textblock_efl_text_font_font_slant_set(Eo *obj EINA_UNUSED, Efl_Canv
 }
 
 static Efl_Text_Font_Slant
-_efl_canvas_textblock_efl_text_font_font_slant_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED)
+_evas_textblock_legacy_efl_text_font_font_slant_get(const Eo *obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED)
 {
    return _FMT_INFO(font_slant);
 }
 
 static void
-_efl_canvas_textblock_efl_text_font_font_width_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, Efl_Text_Font_Width font_width EINA_UNUSED)
+_evas_textblock_legacy_efl_text_font_font_width_set(Eo *obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED, Efl_Text_Font_Width font_width EINA_UNUSED)
 {
    ASYNC_BLOCK;
    if (_FMT_INFO(font_width) == font_width) return;
@@ -16091,13 +16091,13 @@ _efl_canvas_textblock_efl_text_font_font_width_set(Eo *obj EINA_UNUSED, Efl_Canv
 }
 
 static Efl_Text_Font_Width
-_efl_canvas_textblock_efl_text_font_font_width_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED)
+_evas_textblock_legacy_efl_text_font_font_width_get(const Eo *obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED)
 {
    return _FMT_INFO(font_width);
 }
 
 EOLIAN static void
-_efl_canvas_textblock_efl_text_font_font_bitmap_scalable_set(Eo *obj, Efl_Canvas_Textblock_Data *o, Efl_Text_Font_Bitmap_Scalable bitmap_scalable)
+_evas_textblock_legacy_efl_text_font_font_bitmap_scalable_set(Eo *obj, Evas_Textblock_Legacy_Data *o, Efl_Text_Font_Bitmap_Scalable bitmap_scalable)
 {
    if (_FMT_INFO(bitmap_scalable) == bitmap_scalable) return;
    _FMT_INFO(bitmap_scalable) = bitmap_scalable;
@@ -16105,7 +16105,7 @@ _efl_canvas_textblock_efl_text_font_font_bitmap_scalable_set(Eo *obj, Efl_Canvas
 }
 
 EOLIAN static Efl_Text_Font_Bitmap_Scalable
-_efl_canvas_textblock_efl_text_font_font_bitmap_scalable_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o)
+_evas_textblock_legacy_efl_text_font_font_bitmap_scalable_get(const Eo *obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o)
 {
    return _FMT_INFO(bitmap_scalable);
 }
@@ -16146,40 +16146,40 @@ _efl_canvas_textblock_efl_text_font_font_bitmap_scalable_get(const Eo *obj EINA_
    if (changed) _canvas_text_format_changed(obj, o);
 
 static void
-_efl_canvas_textblock_efl_text_style_normal_color_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, unsigned char r EINA_UNUSED, unsigned char g EINA_UNUSED, unsigned char b EINA_UNUSED, unsigned char a EINA_UNUSED)
+_evas_textblock_legacy_efl_text_style_normal_color_set(Eo *obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED, unsigned char r EINA_UNUSED, unsigned char g EINA_UNUSED, unsigned char b EINA_UNUSED, unsigned char a EINA_UNUSED)
 {
    ASYNC_BLOCK;
    _FMT_COLOR_SET(normal);
 }
 
 static void
-_efl_canvas_textblock_efl_text_style_normal_color_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, unsigned char *r EINA_UNUSED, unsigned char *g EINA_UNUSED, unsigned char *b EINA_UNUSED, unsigned char *a EINA_UNUSED)
+_evas_textblock_legacy_efl_text_style_normal_color_get(const Eo *obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED, unsigned char *r EINA_UNUSED, unsigned char *g EINA_UNUSED, unsigned char *b EINA_UNUSED, unsigned char *a EINA_UNUSED)
 {
    _FMT_COLOR_RET(normal);
 }
 
 static void
-_efl_canvas_textblock_efl_text_style_backing_type_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, Efl_Text_Style_Backing_Type type EINA_UNUSED)
+_evas_textblock_legacy_efl_text_style_backing_type_set(Eo *obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED, Efl_Text_Style_Backing_Type type EINA_UNUSED)
 {
    ASYNC_BLOCK;
    _FMT_SET(backing, type);
 }
 
 static Efl_Text_Style_Backing_Type
-_efl_canvas_textblock_efl_text_style_backing_type_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED)
+_evas_textblock_legacy_efl_text_style_backing_type_get(const Eo *obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED)
 {
    return _FMT(backing);
 }
 
 static void
-_efl_canvas_textblock_efl_text_style_backing_color_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, unsigned char r EINA_UNUSED, unsigned char g EINA_UNUSED, unsigned char b EINA_UNUSED, unsigned char a EINA_UNUSED)
+_evas_textblock_legacy_efl_text_style_backing_color_set(Eo *obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED, unsigned char r EINA_UNUSED, unsigned char g EINA_UNUSED, unsigned char b EINA_UNUSED, unsigned char a EINA_UNUSED)
 {
    ASYNC_BLOCK;
    _FMT_COLOR_SET(backing);
 }
 
 static void
-_efl_canvas_textblock_efl_text_style_backing_color_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, unsigned char *r EINA_UNUSED, unsigned char *g EINA_UNUSED, unsigned char *b EINA_UNUSED, unsigned char *a EINA_UNUSED)
+_evas_textblock_legacy_efl_text_style_backing_color_get(const Eo *obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED, unsigned char *r EINA_UNUSED, unsigned char *g EINA_UNUSED, unsigned char *b EINA_UNUSED, unsigned char *a EINA_UNUSED)
 {
    _FMT_COLOR_RET(backing);
 }
@@ -16197,7 +16197,7 @@ static struct
 };
 
 static void
-_efl_canvas_textblock_efl_text_style_underline_type_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, Efl_Text_Style_Underline_Type type EINA_UNUSED)
+_evas_textblock_legacy_efl_text_style_underline_type_set(Eo *obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED, Efl_Text_Style_Underline_Type type EINA_UNUSED)
 {
    ASYNC_BLOCK;
    _FMT_SET(underline, _style_underline_map[type].underline_single);
@@ -16207,111 +16207,111 @@ _efl_canvas_textblock_efl_text_style_underline_type_set(Eo *obj EINA_UNUSED, Efl
 }
 
 static Efl_Text_Style_Underline_Type
-_efl_canvas_textblock_efl_text_style_underline_type_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED)
+_evas_textblock_legacy_efl_text_style_underline_type_get(const Eo *obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED)
 {
    return _FMT(underline);
 }
 
 static void
-_efl_canvas_textblock_efl_text_style_underline_color_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, unsigned char r EINA_UNUSED, unsigned char g EINA_UNUSED, unsigned char b EINA_UNUSED, unsigned char a EINA_UNUSED)
+_evas_textblock_legacy_efl_text_style_underline_color_set(Eo *obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED, unsigned char r EINA_UNUSED, unsigned char g EINA_UNUSED, unsigned char b EINA_UNUSED, unsigned char a EINA_UNUSED)
 {
    ASYNC_BLOCK;
    _FMT_COLOR_SET(underline);
 }
 
 static void
-_efl_canvas_textblock_efl_text_style_underline_color_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, unsigned char *r EINA_UNUSED, unsigned char *g EINA_UNUSED, unsigned char *b EINA_UNUSED, unsigned char *a EINA_UNUSED)
+_evas_textblock_legacy_efl_text_style_underline_color_get(const Eo *obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED, unsigned char *r EINA_UNUSED, unsigned char *g EINA_UNUSED, unsigned char *b EINA_UNUSED, unsigned char *a EINA_UNUSED)
 {
    _FMT_COLOR_RET(underline);
 }
 
 static void
-_efl_canvas_textblock_efl_text_style_underline_height_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, double height EINA_UNUSED)
+_evas_textblock_legacy_efl_text_style_underline_height_set(Eo *obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED, double height EINA_UNUSED)
 {
    ASYNC_BLOCK;
    _FMT_SET(underline_height, height);
 }
 
 static double
-_efl_canvas_textblock_efl_text_style_underline_height_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED)
+_evas_textblock_legacy_efl_text_style_underline_height_get(const Eo *obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED)
 {
    return _FMT(underline_height);
 }
 
 static void
-_efl_canvas_textblock_efl_text_style_underline_dashed_color_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, unsigned char r EINA_UNUSED, unsigned char g EINA_UNUSED, unsigned char b EINA_UNUSED, unsigned char a EINA_UNUSED)
+_evas_textblock_legacy_efl_text_style_underline_dashed_color_set(Eo *obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED, unsigned char r EINA_UNUSED, unsigned char g EINA_UNUSED, unsigned char b EINA_UNUSED, unsigned char a EINA_UNUSED)
 {
    ASYNC_BLOCK;
    _FMT_COLOR_SET(underline_dash);
 }
 
 static void
-_efl_canvas_textblock_efl_text_style_underline_dashed_color_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, unsigned char *r EINA_UNUSED, unsigned char *g EINA_UNUSED, unsigned char *b EINA_UNUSED, unsigned char *a EINA_UNUSED)
+_evas_textblock_legacy_efl_text_style_underline_dashed_color_get(const Eo *obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED, unsigned char *r EINA_UNUSED, unsigned char *g EINA_UNUSED, unsigned char *b EINA_UNUSED, unsigned char *a EINA_UNUSED)
 {
    _FMT_COLOR_RET(underline_dash);
 }
 
 static void
-_efl_canvas_textblock_efl_text_style_underline_dashed_width_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, int width EINA_UNUSED)
+_evas_textblock_legacy_efl_text_style_underline_dashed_width_set(Eo *obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED, int width EINA_UNUSED)
 {
    ASYNC_BLOCK;
    _FMT_SET(underline_dash_width, width);
 }
 
 static int
-_efl_canvas_textblock_efl_text_style_underline_dashed_width_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED)
+_evas_textblock_legacy_efl_text_style_underline_dashed_width_get(const Eo *obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED)
 {
    return _FMT(underline_dash_width);
 }
 
 static void
-_efl_canvas_textblock_efl_text_style_underline_dashed_gap_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, int gap EINA_UNUSED)
+_evas_textblock_legacy_efl_text_style_underline_dashed_gap_set(Eo *obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED, int gap EINA_UNUSED)
 {
    ASYNC_BLOCK;
    _FMT_SET(underline_dash_gap, gap);
 }
 
 static int
-_efl_canvas_textblock_efl_text_style_underline_dashed_gap_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED)
+_evas_textblock_legacy_efl_text_style_underline_dashed_gap_get(const Eo *obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED)
 {
    return _FMT(underline_dash_width);
 }
 
 static void
-_efl_canvas_textblock_efl_text_style_underline2_color_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, unsigned char r EINA_UNUSED, unsigned char g EINA_UNUSED, unsigned char b EINA_UNUSED, unsigned char a EINA_UNUSED)
+_evas_textblock_legacy_efl_text_style_underline2_color_set(Eo *obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED, unsigned char r EINA_UNUSED, unsigned char g EINA_UNUSED, unsigned char b EINA_UNUSED, unsigned char a EINA_UNUSED)
 {
    ASYNC_BLOCK;
    _FMT_COLOR_SET(underline2);
 }
 
 static void
-_efl_canvas_textblock_efl_text_style_underline2_color_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, unsigned char *r EINA_UNUSED, unsigned char *g EINA_UNUSED, unsigned char *b EINA_UNUSED, unsigned char *a EINA_UNUSED)
+_evas_textblock_legacy_efl_text_style_underline2_color_get(const Eo *obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED, unsigned char *r EINA_UNUSED, unsigned char *g EINA_UNUSED, unsigned char *b EINA_UNUSED, unsigned char *a EINA_UNUSED)
 {
    _FMT_COLOR_RET(underline2);
 }
 
 static void
-_efl_canvas_textblock_efl_text_style_strikethrough_type_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, Efl_Text_Style_Strikethrough_Type type EINA_UNUSED)
+_evas_textblock_legacy_efl_text_style_strikethrough_type_set(Eo *obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED, Efl_Text_Style_Strikethrough_Type type EINA_UNUSED)
 {
    ASYNC_BLOCK;
    _FMT_SET(strikethrough, type);
 }
 
 static Efl_Text_Style_Strikethrough_Type
-_efl_canvas_textblock_efl_text_style_strikethrough_type_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED)
+_evas_textblock_legacy_efl_text_style_strikethrough_type_get(const Eo *obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED)
 {
    return _FMT(strikethrough);
 }
 
 static void
-_efl_canvas_textblock_efl_text_style_strikethrough_color_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, unsigned char r EINA_UNUSED, unsigned char g EINA_UNUSED, unsigned char b EINA_UNUSED, unsigned char a EINA_UNUSED)
+_evas_textblock_legacy_efl_text_style_strikethrough_color_set(Eo *obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED, unsigned char r EINA_UNUSED, unsigned char g EINA_UNUSED, unsigned char b EINA_UNUSED, unsigned char a EINA_UNUSED)
 {
    ASYNC_BLOCK;
    _FMT_COLOR_SET(strikethrough);
 }
 
 static void
-_efl_canvas_textblock_efl_text_style_strikethrough_color_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, unsigned char *r EINA_UNUSED, unsigned char *g EINA_UNUSED, unsigned char *b EINA_UNUSED, unsigned char *a EINA_UNUSED)
+_evas_textblock_legacy_efl_text_style_strikethrough_color_get(const Eo *obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED, unsigned char *r EINA_UNUSED, unsigned char *g EINA_UNUSED, unsigned char *b EINA_UNUSED, unsigned char *a EINA_UNUSED)
 {
    _FMT_COLOR_RET(strikethrough);
 }
@@ -16379,7 +16379,7 @@ _get_dir_from_map(Efl_Text_Style_Shadow_Direction dir)
 }
 
 static void
-_efl_canvas_textblock_efl_text_style_effect_type_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, Efl_Text_Style_Effect_Type type EINA_UNUSED)
+_evas_textblock_legacy_efl_text_style_effect_type_set(Eo *obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED, Efl_Text_Style_Effect_Type type EINA_UNUSED)
 {
    ASYNC_BLOCK;
    _FMT_INFO_SET_START(effect, type);
@@ -16391,26 +16391,26 @@ _efl_canvas_textblock_efl_text_style_effect_type_set(Eo *obj EINA_UNUSED, Efl_Ca
 }
 
 static Efl_Text_Style_Effect_Type
-_efl_canvas_textblock_efl_text_style_effect_type_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED)
+_evas_textblock_legacy_efl_text_style_effect_type_get(const Eo *obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED)
 {
    return _FMT_INFO(effect);
 }
 
 static void
-_efl_canvas_textblock_efl_text_style_outline_color_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, unsigned char r EINA_UNUSED, unsigned char g EINA_UNUSED, unsigned char b EINA_UNUSED, unsigned char a EINA_UNUSED)
+_evas_textblock_legacy_efl_text_style_outline_color_set(Eo *obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED, unsigned char r EINA_UNUSED, unsigned char g EINA_UNUSED, unsigned char b EINA_UNUSED, unsigned char a EINA_UNUSED)
 {
    ASYNC_BLOCK;
    _FMT_COLOR_SET(outline);
 }
 
 static void
-_efl_canvas_textblock_efl_text_style_outline_color_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, unsigned char *r EINA_UNUSED, unsigned char *g EINA_UNUSED, unsigned char *b EINA_UNUSED, unsigned char *a EINA_UNUSED)
+_evas_textblock_legacy_efl_text_style_outline_color_get(const Eo *obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED, unsigned char *r EINA_UNUSED, unsigned char *g EINA_UNUSED, unsigned char *b EINA_UNUSED, unsigned char *a EINA_UNUSED)
 {
    _FMT_COLOR_RET(outline);
 }
 
 static void
-_efl_canvas_textblock_efl_text_style_shadow_direction_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, Efl_Text_Style_Shadow_Direction type EINA_UNUSED)
+_evas_textblock_legacy_efl_text_style_shadow_direction_set(Eo *obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED, Efl_Text_Style_Shadow_Direction type EINA_UNUSED)
 {
    ASYNC_BLOCK;
    _FMT_INFO_SET_START(shadow_direction, type);
@@ -16420,52 +16420,52 @@ _efl_canvas_textblock_efl_text_style_shadow_direction_set(Eo *obj EINA_UNUSED, E
 }
 
 static Efl_Text_Style_Shadow_Direction
-_efl_canvas_textblock_efl_text_style_shadow_direction_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED)
+_evas_textblock_legacy_efl_text_style_shadow_direction_get(const Eo *obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED)
 {
    return _FMT_INFO(shadow_direction);
 }
 
 static void
-_efl_canvas_textblock_efl_text_style_shadow_color_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, unsigned char r EINA_UNUSED, unsigned char g EINA_UNUSED, unsigned char b EINA_UNUSED, unsigned char a EINA_UNUSED)
+_evas_textblock_legacy_efl_text_style_shadow_color_set(Eo *obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED, unsigned char r EINA_UNUSED, unsigned char g EINA_UNUSED, unsigned char b EINA_UNUSED, unsigned char a EINA_UNUSED)
 {
    ASYNC_BLOCK;
    _FMT_COLOR_SET(shadow);
 }
 
 static void
-_efl_canvas_textblock_efl_text_style_shadow_color_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, unsigned char *r EINA_UNUSED, unsigned char *g EINA_UNUSED, unsigned char *b EINA_UNUSED, unsigned char *a EINA_UNUSED)
+_evas_textblock_legacy_efl_text_style_shadow_color_get(const Eo *obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED, unsigned char *r EINA_UNUSED, unsigned char *g EINA_UNUSED, unsigned char *b EINA_UNUSED, unsigned char *a EINA_UNUSED)
 {
    _FMT_COLOR_RET(shadow);
 }
 
 static void
-_efl_canvas_textblock_efl_text_style_glow_color_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, unsigned char r EINA_UNUSED, unsigned char g EINA_UNUSED, unsigned char b EINA_UNUSED, unsigned char a EINA_UNUSED)
+_evas_textblock_legacy_efl_text_style_glow_color_set(Eo *obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED, unsigned char r EINA_UNUSED, unsigned char g EINA_UNUSED, unsigned char b EINA_UNUSED, unsigned char a EINA_UNUSED)
 {
    ASYNC_BLOCK;
    _FMT_COLOR_SET(glow);
 }
 
 static void
-_efl_canvas_textblock_efl_text_style_glow_color_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, unsigned char *r EINA_UNUSED, unsigned char *g EINA_UNUSED, unsigned char *b EINA_UNUSED, unsigned char *a EINA_UNUSED)
+_evas_textblock_legacy_efl_text_style_glow_color_get(const Eo *obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED, unsigned char *r EINA_UNUSED, unsigned char *g EINA_UNUSED, unsigned char *b EINA_UNUSED, unsigned char *a EINA_UNUSED)
 {
    _FMT_COLOR_RET(glow);
 }
 
 static void
-_efl_canvas_textblock_efl_text_style_glow2_color_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, unsigned char r EINA_UNUSED, unsigned char g EINA_UNUSED, unsigned char b EINA_UNUSED, unsigned char a EINA_UNUSED)
+_evas_textblock_legacy_efl_text_style_glow2_color_set(Eo *obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED, unsigned char r EINA_UNUSED, unsigned char g EINA_UNUSED, unsigned char b EINA_UNUSED, unsigned char a EINA_UNUSED)
 {
    ASYNC_BLOCK;
    _FMT_COLOR_SET(glow2);
 }
 
 static void
-_efl_canvas_textblock_efl_text_style_glow2_color_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, unsigned char *r EINA_UNUSED, unsigned char *g EINA_UNUSED, unsigned char *b EINA_UNUSED, unsigned char *a EINA_UNUSED)
+_evas_textblock_legacy_efl_text_style_glow2_color_get(const Eo *obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED, unsigned char *r EINA_UNUSED, unsigned char *g EINA_UNUSED, unsigned char *b EINA_UNUSED, unsigned char *a EINA_UNUSED)
 {
    _FMT_COLOR_RET(glow2);
 }
 
 static void
-_efl_canvas_textblock_efl_text_style_gfx_filter_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED,
+_evas_textblock_legacy_efl_text_style_gfx_filter_set(Eo *obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED,
       const char *gfx_filter_name)
 {
    ASYNC_BLOCK;
@@ -16489,26 +16489,26 @@ _efl_canvas_textblock_efl_text_style_gfx_filter_set(Eo *obj EINA_UNUSED, Efl_Can
 }
 
 static const char *
-_efl_canvas_textblock_efl_text_style_gfx_filter_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED)
+_evas_textblock_legacy_efl_text_style_gfx_filter_get(const Eo *obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED)
 {
    return _FMT(gfx_filter)?_FMT(gfx_filter->name):NULL;
 }
 
 static void
-_efl_canvas_textblock_efl_text_format_ellipsis_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, double value EINA_UNUSED)
+_evas_textblock_legacy_efl_text_format_ellipsis_set(Eo *obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED, double value EINA_UNUSED)
 {
    ASYNC_BLOCK;
    _FMT_SET(ellipsis, value);
 }
 
 static double
-_efl_canvas_textblock_efl_text_format_ellipsis_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED)
+_evas_textblock_legacy_efl_text_format_ellipsis_get(const Eo *obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED)
 {
    return _FMT(ellipsis);
 }
 
 static void
-_efl_canvas_textblock_efl_text_format_wrap_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, Efl_Text_Format_Wrap wrap EINA_UNUSED)
+_evas_textblock_legacy_efl_text_format_wrap_set(Eo *obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED, Efl_Text_Format_Wrap wrap EINA_UNUSED)
 {
    ASYNC_BLOCK;
    _FMT_INFO_SET_START(wrap, wrap);
@@ -16520,13 +16520,13 @@ _efl_canvas_textblock_efl_text_format_wrap_set(Eo *obj EINA_UNUSED, Efl_Canvas_T
 }
 
 static Efl_Text_Format_Wrap
-_efl_canvas_textblock_efl_text_format_wrap_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED)
+_evas_textblock_legacy_efl_text_format_wrap_get(const Eo *obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED)
 {
    return _FMT_INFO(wrap);
 }
 
 static void
-_efl_canvas_textblock_efl_text_format_multiline_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, Eina_Bool enabled EINA_UNUSED)
+_evas_textblock_legacy_efl_text_format_multiline_set(Eo *obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED, Eina_Bool enabled EINA_UNUSED)
 {
    ASYNC_BLOCK;
    if (o->multiline == enabled) return;
@@ -16535,13 +16535,13 @@ _efl_canvas_textblock_efl_text_format_multiline_set(Eo *obj EINA_UNUSED, Efl_Can
 }
 
 static Eina_Bool
-_efl_canvas_textblock_efl_text_format_multiline_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED)
+_evas_textblock_legacy_efl_text_format_multiline_get(const Eo *obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED)
 {
    return o->multiline;
 }
 
 static void
-_efl_canvas_textblock_efl_text_format_halign_auto_type_set(Eo *obj, Efl_Canvas_Textblock_Data *o, Efl_Text_Format_Horizontal_Alignment_Auto_Type type)
+_evas_textblock_legacy_efl_text_format_halign_auto_type_set(Eo *obj, Evas_Textblock_Legacy_Data *o, Efl_Text_Format_Horizontal_Alignment_Auto_Type type)
 {
    ASYNC_BLOCK;
    if (type == EFL_TEXT_FORMAT_HORIZONTAL_ALIGNMENT_AUTO_TYPE_NONE)
@@ -16563,7 +16563,7 @@ _efl_canvas_textblock_efl_text_format_halign_auto_type_set(Eo *obj, Efl_Canvas_T
 }
 
 static Efl_Text_Format_Horizontal_Alignment_Auto_Type
-_efl_canvas_textblock_efl_text_format_halign_auto_type_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o)
+_evas_textblock_legacy_efl_text_format_halign_auto_type_get(const Eo *obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o)
 {
    Efl_Text_Format_Horizontal_Alignment_Auto_Type ret =
       EFL_TEXT_FORMAT_HORIZONTAL_ALIGNMENT_AUTO_TYPE_NONE;
@@ -16584,7 +16584,7 @@ _efl_canvas_textblock_efl_text_format_halign_auto_type_get(const Eo *obj EINA_UN
 }
 
 static void
-_efl_canvas_textblock_efl_text_format_halign_set(Eo *obj, Efl_Canvas_Textblock_Data *o,
+_evas_textblock_legacy_efl_text_format_halign_set(Eo *obj, Evas_Textblock_Legacy_Data *o,
       double value)
 {
    ASYNC_BLOCK;
@@ -16594,13 +16594,13 @@ _efl_canvas_textblock_efl_text_format_halign_set(Eo *obj, Efl_Canvas_Textblock_D
 }
 
 static double
-_efl_canvas_textblock_efl_text_format_halign_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED)
+_evas_textblock_legacy_efl_text_format_halign_get(const Eo *obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED)
 {
    return _FMT(halign);
 }
 
 static void
-_efl_canvas_textblock_efl_text_format_valign_set(Eo *obj, Efl_Canvas_Textblock_Data *o,
+_evas_textblock_legacy_efl_text_format_valign_set(Eo *obj, Evas_Textblock_Legacy_Data *o,
       double value)
 {
    ASYNC_BLOCK;
@@ -16612,13 +16612,13 @@ _efl_canvas_textblock_efl_text_format_valign_set(Eo *obj, Efl_Canvas_Textblock_D
 }
 
 static double
-_efl_canvas_textblock_efl_text_format_valign_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED)
+_evas_textblock_legacy_efl_text_format_valign_get(const Eo *obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED)
 {
    return o->valign;
 }
 
 static void
-_efl_canvas_textblock_efl_text_format_linegap_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, double value EINA_UNUSED)
+_evas_textblock_legacy_efl_text_format_linegap_set(Eo *obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED, double value EINA_UNUSED)
 {
    ASYNC_BLOCK;
    double linerelgap = _FMT(linerelgap);
@@ -16637,13 +16637,13 @@ _efl_canvas_textblock_efl_text_format_linegap_set(Eo *obj EINA_UNUSED, Efl_Canva
 }
 
 static double
-_efl_canvas_textblock_efl_text_format_linegap_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED)
+_evas_textblock_legacy_efl_text_format_linegap_get(const Eo *obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED)
 {
    return _FMT(linegap);
 }
 
 static void
-_efl_canvas_textblock_efl_text_format_linerelgap_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, double value EINA_UNUSED)
+_evas_textblock_legacy_efl_text_format_linerelgap_set(Eo *obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED, double value EINA_UNUSED)
 {
    ASYNC_BLOCK;
    double linegap = _FMT(linegap);
@@ -16661,39 +16661,39 @@ _efl_canvas_textblock_efl_text_format_linerelgap_set(Eo *obj EINA_UNUSED, Efl_Ca
 }
 
 static double
-_efl_canvas_textblock_efl_text_format_linerelgap_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED)
+_evas_textblock_legacy_efl_text_format_linerelgap_get(const Eo *obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED)
 {
    return _FMT(linerelgap);
 }
 
 static void
-_efl_canvas_textblock_efl_text_format_tabstops_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, int value EINA_UNUSED)
+_evas_textblock_legacy_efl_text_format_tabstops_set(Eo *obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED, int value EINA_UNUSED)
 {
    ASYNC_BLOCK;
    _FMT_SET(tabstops, value);
 }
 
 static int
-_efl_canvas_textblock_efl_text_format_tabstops_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED)
+_evas_textblock_legacy_efl_text_format_tabstops_get(const Eo *obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED)
 {
    return _FMT(tabstops);
 }
 
 static void
-_efl_canvas_textblock_efl_text_format_password_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, Eina_Bool enabled EINA_UNUSED)
+_evas_textblock_legacy_efl_text_format_password_set(Eo *obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED, Eina_Bool enabled EINA_UNUSED)
 {
    ASYNC_BLOCK;
    _FMT_SET(password, enabled);
 }
 
 static Eina_Bool
-_efl_canvas_textblock_efl_text_format_password_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED)
+_evas_textblock_legacy_efl_text_format_password_get(const Eo *obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED)
 {
    return _FMT(password);
 }
 
 static void
-_efl_canvas_textblock_efl_text_format_replacement_char_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, const char *repch EINA_UNUSED)
+_evas_textblock_legacy_efl_text_format_replacement_char_set(Eo *obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED, const char *repch EINA_UNUSED)
 {
    ASYNC_BLOCK;
    Eina_Stringshare *nrepch;
@@ -16715,7 +16715,7 @@ _efl_canvas_textblock_efl_text_format_replacement_char_set(Eo *obj EINA_UNUSED,
 }
 
 static const char *
-_efl_canvas_textblock_efl_text_format_replacement_char_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED)
+_evas_textblock_legacy_efl_text_format_replacement_char_get(const Eo *obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED)
 {
    return o->repch;
 }
@@ -16729,7 +16729,7 @@ _efl_canvas_textblock_efl_text_format_replacement_char_get(const Eo *obj EINA_UN
 EAPI Eina_Bool
 _evas_textblock_check_item_node_link(Evas_Object *eo_obj)
 {
-   Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
+   Evas_Textblock_Legacy_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
    Evas_Object_Textblock_Paragraph *par;
    Evas_Object_Textblock_Line *ln;
    Evas_Object_Textblock_Item *it;
@@ -16826,11 +16826,11 @@ ppar(Evas_Object_Textblock_Paragraph *par)
 
 #endif
 
-#define EFL_CANVAS_TEXTBLOCK_EXTRA_OPS \
-   EFL_OBJECT_OP_FUNC(efl_dbg_info_get, _efl_canvas_textblock_efl_object_dbg_info_get)
+#define EVAS_TEXTBLOCK_LEGACY_EXTRA_OPS \
+   EFL_OBJECT_OP_FUNC(efl_dbg_info_get, _evas_textblock_legacy_efl_object_dbg_info_get)
 
 EOLIAN static Efl_Text_Cursor_Cursor *
-_efl_canvas_textblock_efl_text_cursor_text_cursor_get(const Eo *eo_obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o, Efl_Text_Cursor_Get_Type get_type)
+_evas_textblock_legacy_efl_text_cursor_text_cursor_get(const Eo *eo_obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o, Efl_Text_Cursor_Get_Type get_type)
 {
    if (get_type > EFL_TEXT_CURSOR_GET_TYPE_MAIN)
      {
@@ -16846,7 +16846,7 @@ evas_object_textblock_cursor_get(const Evas_Object *eo_obj EINA_UNUSED)
 }
 
 EOLIAN static Efl_Text_Cursor_Cursor *
-_efl_canvas_textblock_efl_text_cursor_cursor_new(Eo *eo_obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o)
+_evas_textblock_legacy_efl_text_cursor_cursor_new(Eo *eo_obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o)
 {
    Efl_Text_Cursor_Cursor *cur;
    Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
@@ -16861,7 +16861,7 @@ _efl_canvas_textblock_efl_text_cursor_cursor_new(Eo *eo_obj EINA_UNUSED, Efl_Can
 }
 
 EOLIAN static void
-_efl_canvas_textblock_efl_text_cursor_cursor_free(Eo *eo_obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED,
+_evas_textblock_legacy_efl_text_cursor_cursor_free(Eo *eo_obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED,
       Efl_Text_Cursor_Cursor *cur)
 {
    evas_textblock_cursor_free(cur);
@@ -16904,7 +16904,7 @@ _text_layout_async_done(void *todo, Ecore_Thread *thread EINA_UNUSED)
    Text_Promise_Ctx *td = todo;
    Ctxt *c = td->c;
    Eo *obj = c->obj;
-   Efl_Canvas_Textblock_Data *o = c->o;
+   Evas_Textblock_Legacy_Data *o = c->o;
    Evas_Coord w_ret, h_ret;
    _layout_done(c, &w_ret, &h_ret);
 
@@ -16941,7 +16941,7 @@ _text_layout_async_done(void *todo, Ecore_Thread *thread EINA_UNUSED)
    o->layout_jobs--;
    if (o->layout_jobs > 0)
      {
-        efl_canvas_textblock_async_layout(obj);
+        evas_textblock_legacy_async_layout(obj);
      }
 }
 
@@ -16957,7 +16957,7 @@ _future_scheduler_get(void)
 }
 
 EOLIAN static Eina_Future *
-_efl_canvas_textblock_async_layout(Eo *eo_obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o)
+_evas_textblock_legacy_async_layout(Eo *eo_obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o)
 {
    Ctxt *c;
    Eina_Promise *p;
@@ -17001,6 +17001,6 @@ _efl_canvas_textblock_async_layout(Eo *eo_obj EINA_UNUSED, Efl_Canvas_Textblock_
    return f;
 }
 
-#include "canvas/efl_canvas_textblock.eo.c"
-#include "canvas/efl_canvas_textblock_eo.legacy.c"
+#include "canvas/evas_textblock_legacy.eo.c"
+#include "canvas/evas_textblock_legacy_eo.c"
 #include "canvas/efl_canvas_text_factory.eo.c" // interface
diff --git a/src/lib/evas/canvas/evas_textblock_hyphenation.x b/src/lib/evas/canvas/evas_textblock_hyphenation.x
index e434568abb..0cf413a377 100644
--- a/src/lib/evas/canvas/evas_textblock_hyphenation.x
+++ b/src/lib/evas/canvas/evas_textblock_hyphenation.x
@@ -17,7 +17,7 @@ static size_t     _hyphen_clients = 0;
 static void
 _dicts_hyphen_init(Eo *eo_obj)
 {
-   Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
+   Evas_Textblock_Legacy_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
 
    if (!o->hyphenating)
      {
@@ -98,7 +98,7 @@ _dicts_hyphen_free(void)
 static inline void
 _dicts_hyphen_detach(Eo *eo_obj)
 {
-   Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
+   Evas_Textblock_Legacy_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
 
    if (!o->hyphenating) return;
    o->hyphenating = EINA_FALSE;
diff --git a/src/lib/evas/canvas/efl_canvas_textblock.eo b/src/lib/evas/canvas/evas_textblock_legacy.eo
index 78a2a52749..7614a1cb24 100644
--- a/src/lib/evas/canvas/efl_canvas_textblock.eo
+++ b/src/lib/evas/canvas/evas_textblock_legacy.eo
@@ -1,6 +1,6 @@
 import efl_text_types;
 
-class @beta Efl.Canvas.Textblock extends Efl.Canvas.Object implements Efl.Text,
+class @beta Evas.Textblock.Legacy extends Efl.Canvas.Object implements Efl.Text,
                        Efl.Canvas.Filter.Internal, Efl.Text_Font,
                        Efl.Text_Style, Efl.Text_Format, Efl.Text_Cursor,
                        Efl.Text_Annotate, Efl.Text_Markup, Efl.Text_Markup_Interactive, Efl.Ui.I18n
diff --git a/src/lib/evas/canvas/evas_textblock_legacy.h b/src/lib/evas/canvas/evas_textblock_legacy.h
index d21f47a77e..01f6a6fd99 100644
--- a/src/lib/evas/canvas/evas_textblock_legacy.h
+++ b/src/lib/evas/canvas/evas_textblock_legacy.h
@@ -138,7 +138,7 @@ typedef Eo Evas_Textblock;
  * @see evas_textblock_style_set()
  */
 
-typedef struct _Efl_Canvas_Textblock_Style             Evas_Textblock_Style;
+typedef struct _Evas_Textblock_Legacy_Style             Evas_Textblock_Style;
 
 /**
  * @typedef Evas_Textblock_Cursor
@@ -921,7 +921,7 @@ EAPI int evas_textblock_cursor_text_prepend(Evas_Textblock_Cursor *cur, const ch
  *
  * @param[in] ch The charset name.
  *
- * @ingroup Efl_Canvas_Textblock
+ * @ingroup Evas_Textblock_Legacy
  */
 EAPI void evas_object_textblock_replace_char_set(Evas_Object *obj, const char *ch);
 
@@ -930,7 +930,7 @@ EAPI void evas_object_textblock_replace_char_set(Evas_Object *obj, const char *c
  *
  * @return The charset name.
  *
- * @ingroup Efl_Canvas_Textblock
+ * @ingroup Evas_Textblock_Legacy
  */
 EAPI const char *evas_object_textblock_replace_char_get(const Evas_Object *obj);
 
@@ -945,7 +945,7 @@ EAPI const char *evas_object_textblock_replace_char_get(const Evas_Object *obj);
  *
  * @since 1.1
  *
- * @ingroup Efl_Canvas_Textblock
+ * @ingroup Evas_Textblock_Legacy
  */
 EAPI void evas_object_textblock_valign_set(Evas_Object *obj, double align);
 
@@ -960,7 +960,7 @@ EAPI void evas_object_textblock_valign_set(Evas_Object *obj, double align);
  *
  * @since 1.1
  *
- * @ingroup Efl_Canvas_Textblock
+ * @ingroup Evas_Textblock_Legacy
  */
 EAPI double evas_object_textblock_valign_get(const Evas_Object *obj);
 
@@ -1056,7 +1056,7 @@ EAPI void evas_textblock_cursor_char_delete(Evas_Textblock_Cursor *cur);
  * @ingroup Evas_Textblock
  */
 EAPI Evas_Textblock_Cursor *evas_object_textblock_cursor_get(const Evas_Object *obj);
-#include "canvas/efl_canvas_textblock_eo.legacy.h"
+#include "canvas/evas_textblock_legacy_eo.h"
 /**
  * @}
  */
diff --git a/src/lib/evas/canvas/evas_textblock_legacy_eo.c b/src/lib/evas/canvas/evas_textblock_legacy_eo.c
new file mode 100644
index 0000000000..326e1ae0cf
--- /dev/null
+++ b/src/lib/evas/canvas/evas_textblock_legacy_eo.c
@@ -0,0 +1,66 @@
+
+EAPI Eina_Bool
+evas_object_textblock_visible_range_get(Evas_Textblock_Legacy *obj, Efl_Text_Cursor_Cursor *start, Efl_Text_Cursor_Cursor *end)
+{
+   return evas_textblock_legacy_visible_range_get(obj, start, end);
+}
+
+EAPI void
+evas_object_textblock_style_insets_get(const Evas_Textblock_Legacy *obj, int *l, int *r, int *t, int *b)
+{
+   evas_textblock_legacy_style_insets_get(obj, l, r, t, b);
+}
+
+EAPI void
+evas_object_textblock_bidi_delimiters_set(Evas_Textblock_Legacy *obj, const char *delim)
+{
+   evas_textblock_legacy_bidi_delimiters_set(obj, delim);
+}
+
+EAPI const char *
+evas_object_textblock_bidi_delimiters_get(const Evas_Textblock_Legacy *obj)
+{
+   return evas_textblock_legacy_bidi_delimiters_get(obj);
+}
+
+EAPI void
+evas_object_textblock_legacy_newline_set(Evas_Textblock_Legacy *obj, Eina_Bool mode)
+{
+   evas_textblock_legacy_newline_set(obj, mode);
+}
+
+EAPI Eina_Bool
+evas_object_textblock_legacy_newline_get(const Evas_Textblock_Legacy *obj)
+{
+   return evas_textblock_legacy_newline_get(obj);
+}
+
+EAPI void
+evas_object_textblock_size_formatted_get(const Evas_Textblock_Legacy *obj, int *w, int *h)
+{
+   evas_textblock_legacy_size_formatted_get(obj, w, h);
+}
+
+EAPI void
+evas_object_textblock_size_native_get(const Evas_Textblock_Legacy *obj, int *w, int *h)
+{
+   evas_textblock_legacy_size_native_get(obj, w, h);
+}
+
+EAPI Eina_Bool
+evas_object_textblock_obstacle_add(Evas_Textblock_Legacy *obj, Efl_Canvas_Object *eo_obs)
+{
+   return evas_textblock_legacy_obstacle_add(obj, eo_obs);
+}
+
+EAPI Eina_Bool
+evas_object_textblock_obstacle_del(Evas_Textblock_Legacy *obj, Efl_Canvas_Object *eo_obs)
+{
+   return evas_textblock_legacy_obstacle_del(obj, eo_obs);
+}
+
+EAPI void
+evas_object_textblock_obstacles_update(Evas_Textblock_Legacy *obj)
+{
+   evas_textblock_legacy_obstacles_update(obj);
+}
diff --git a/src/lib/evas/canvas/efl_canvas_textblock_eo.legacy.h b/src/lib/evas/canvas/evas_textblock_legacy_eo.h
index 536937b32b..55fe5e21b2 100644
--- a/src/lib/evas/canvas/efl_canvas_textblock_eo.legacy.h
+++ b/src/lib/evas/canvas/evas_textblock_legacy_eo.h
@@ -1,15 +1,15 @@
-#ifndef _EFL_CANVAS_TEXTBLOCK_EO_LEGACY_H_
-#define _EFL_CANVAS_TEXTBLOCK_EO_LEGACY_H_
+#ifndef _EVAS_TEXTBLOCK_LEGACY_EO_LEGACY_H_
+#define _EVAS_TEXTBLOCK_LEGACY_EO_LEGACY_H_
 
-#ifndef _EFL_CANVAS_TEXTBLOCK_EO_CLASS_TYPE
-#define _EFL_CANVAS_TEXTBLOCK_EO_CLASS_TYPE
+#ifndef _EVAS_TEXTBLOCK_LEGACY_EO_CLASS_TYPE
+#define _EVAS_TEXTBLOCK_LEGACY_EO_CLASS_TYPE
 
-typedef Eo Efl_Canvas_Textblock;
+typedef Eo Evas_Textblock_Legacy;
 
 #endif
 
-#ifndef _EFL_CANVAS_TEXTBLOCK_EO_TYPES
-#define _EFL_CANVAS_TEXTBLOCK_EO_TYPES
+#ifndef _EVAS_TEXTBLOCK_LEGACY_EO_TYPES
+#define _EVAS_TEXTBLOCK_LEGACY_EO_TYPES
 
 
 #endif
@@ -32,7 +32,7 @@ typedef Eo Efl_Canvas_Textblock;
  *
  * @ingroup Evas_Object_Textblock_Group
  */
-EAPI Eina_Bool evas_object_textblock_visible_range_get(Efl_Canvas_Textblock *obj, Efl_Text_Cursor_Cursor *start, Efl_Text_Cursor_Cursor *end);
+EAPI Eina_Bool evas_object_textblock_visible_range_get(Evas_Textblock_Legacy *obj, Efl_Text_Cursor_Cursor *start, Efl_Text_Cursor_Cursor *end);
 
 /**
  * @brief Gets the left, right, top and bottom insets of the text.
@@ -49,7 +49,7 @@ EAPI Eina_Bool evas_object_textblock_visible_range_get(Efl_Canvas_Textblock *obj
  *
  * @ingroup Evas_Object_Textblock_Group
  */
-EAPI void evas_object_textblock_style_insets_get(const Efl_Canvas_Textblock *obj, int *left, int *right, int *top, int *bottom);
+EAPI void evas_object_textblock_style_insets_get(const Evas_Textblock_Legacy *obj, int *left, int *right, int *top, int *bottom);
 
 /**
  * @brief BiDi delimiters are used for in-paragraph separation of bidi
@@ -64,7 +64,7 @@ EAPI void evas_object_textblock_style_insets_get(const Efl_Canvas_Textblock *obj
  *
  * @ingroup Evas_Object_Textblock_Group
  */
-EAPI void evas_object_textblock_bidi_delimiters_set(Efl_Canvas_Textblock *obj, const char *delim);
+EAPI void evas_object_textblock_bidi_delimiters_set(Evas_Textblock_Legacy *obj, const char *delim);
 
 /**
  * @brief BiDi delimiters are used for in-paragraph separation of bidi
@@ -79,7 +79,7 @@ EAPI void evas_object_textblock_bidi_delimiters_set(Efl_Canvas_Textblock *obj, c
  *
  * @ingroup Evas_Object_Textblock_Group
  */
-EAPI const char *evas_object_textblock_bidi_delimiters_get(const Efl_Canvas_Textblock *obj);
+EAPI const char *evas_object_textblock_bidi_delimiters_get(const Evas_Textblock_Legacy *obj);
 
 /**
  * @brief When @c true, newline character will behave as a paragraph separator.
@@ -91,7 +91,7 @@ EAPI const char *evas_object_textblock_bidi_delimiters_get(const Efl_Canvas_Text
  *
  * @ingroup Evas_Object_Textblock_Group
  */
-EAPI void evas_object_textblock_legacy_newline_set(Efl_Canvas_Textblock *obj, Eina_Bool mode);
+EAPI void evas_object_textblock_legacy_newline_set(Evas_Textblock_Legacy *obj, Eina_Bool mode);
 
 /**
  * @brief When @c true, newline character will behave as a paragraph separator.
@@ -104,7 +104,7 @@ EAPI void evas_object_textblock_legacy_newline_set(Efl_Canvas_Textblock *obj, Ei
  *
  * @ingroup Evas_Object_Textblock_Group
  */
-EAPI Eina_Bool evas_object_textblock_legacy_newline_get(const Efl_Canvas_Textblock *obj);
+EAPI Eina_Bool evas_object_textblock_legacy_newline_get(const Evas_Textblock_Legacy *obj);
 
 
 
@@ -133,7 +133,7 @@ EAPI Eina_Bool evas_object_textblock_legacy_newline_get(const Efl_Canvas_Textblo
  *
  * @ingroup Evas_Object_Textblock_Group
  */
-EAPI void evas_object_textblock_size_formatted_get(const Efl_Canvas_Textblock *obj, int *width, int *height);
+EAPI void evas_object_textblock_size_formatted_get(const Evas_Textblock_Legacy *obj, int *width, int *height);
 
 /**
  * @brief The native width and height.
@@ -161,7 +161,7 @@ EAPI void evas_object_textblock_size_formatted_get(const Efl_Canvas_Textblock *o
  *
  * @ingroup Evas_Object_Textblock_Group
  */
-EAPI void evas_object_textblock_size_native_get(const Efl_Canvas_Textblock *obj, int *width, int *height);
+EAPI void evas_object_textblock_size_native_get(const Evas_Textblock_Legacy *obj, int *width, int *height);
 
 
 
@@ -183,7 +183,7 @@ EAPI void evas_object_textblock_size_native_get(const Efl_Canvas_Textblock *obj,
  *
  * @ingroup Evas_Object_Textblock_Group
  */
-EAPI Eina_Bool evas_object_textblock_obstacle_add(Efl_Canvas_Textblock *obj, Efl_Canvas_Object *eo_obs);
+EAPI Eina_Bool evas_object_textblock_obstacle_add(Evas_Textblock_Legacy *obj, Efl_Canvas_Object *eo_obs);
 
 /**
  * @brief Removes @c eo_obs from observation during text layout.
@@ -197,7 +197,7 @@ EAPI Eina_Bool evas_object_textblock_obstacle_add(Efl_Canvas_Textblock *obj, Efl
  *
  * @ingroup Evas_Object_Textblock_Group
  */
-EAPI Eina_Bool evas_object_textblock_obstacle_del(Efl_Canvas_Textblock *obj, Efl_Canvas_Object *eo_obs);
+EAPI Eina_Bool evas_object_textblock_obstacle_del(Evas_Textblock_Legacy *obj, Efl_Canvas_Object *eo_obs);
 
 /**
  * @brief Triggers for relayout due to obstacles' state change.
@@ -216,7 +216,7 @@ EAPI Eina_Bool evas_object_textblock_obstacle_del(Efl_Canvas_Textblock *obj, Efl
  *
  * @ingroup Evas_Object_Textblock_Group
  */
-EAPI void evas_object_textblock_obstacles_update(Efl_Canvas_Textblock *obj);
+EAPI void evas_object_textblock_obstacles_update(Evas_Textblock_Legacy *obj);
 
 
 #endif
diff --git a/src/lib/evas/canvas/meson.build b/src/lib/evas/canvas/meson.build
index 754a4dd327..f9e2bdf8e0 100644
--- a/src/lib/evas/canvas/meson.build
+++ b/src/lib/evas/canvas/meson.build
@@ -51,7 +51,7 @@ pub_eo_files = [
   'efl_canvas_group.eo',
   'efl_gfx_mapping.eo',
   'efl_canvas_event_grabber.eo',
-  'efl_canvas_textblock.eo'
+  'evas_textblock_legacy.eo'
 ]
 
 evas_canvas_eo_files = pub_eo_files
@@ -99,7 +99,7 @@ evas_legacy_h = files([
   'efl_canvas_event_grabber_eo.legacy.h',
   'efl_canvas_group_eo.legacy.h',
   'efl_canvas_object_eo.legacy.h',
-  'efl_canvas_textblock_eo.legacy.h',
+  'evas_textblock_legacy_eo.h',
   'efl_canvas_vg_container_eo.legacy.h',
   'efl_canvas_vg_node_eo.legacy.h',
   'efl_canvas_vg_object_eo.legacy.h',
diff --git a/src/tests/evas/evas_test_textblock.c b/src/tests/evas/evas_test_textblock.c
index 9c82271220..998e64c9a2 100644
--- a/src/tests/evas/evas_test_textblock.c
+++ b/src/tests/evas/evas_test_textblock.c
@@ -4530,18 +4530,18 @@ EFL_START_TEST(evas_textblock_annotation)
 }
 EFL_END_TEST;
 
-#define START_EFL_CANVAS_TEXTBLOCK_TEST() \
+#define START_EVAS_TEXTBLOCK_LEGACY_TEST() \
    Evas *evas; \
    Eo *txt; \
    Efl_Text_Cursor_Cursor *cur; \
    evas = EVAS_TEST_INIT_EVAS(); \
    evas_font_hinting_set(evas, EVAS_FONT_HINTING_AUTO); \
-   txt = efl_add(EFL_CANVAS_TEXTBLOCK_CLASS, evas); \
+   txt = efl_add(EVAS_TEXTBLOCK_LEGACY_CLASS, evas); \
    fail_if(!txt); \
-   efl_canvas_textblock_legacy_newline_set(txt, EINA_FALSE); \
-   efl_canvas_textblock_style_set(txt, NULL, style_buf); \
-   fail_if(!efl_canvas_textblock_style_get(txt, NULL) || \
-		   strcmp(style_buf, efl_canvas_textblock_style_get(txt, NULL))); \
+   evas_textblock_legacy_newline_set(txt, EINA_FALSE); \
+   evas_textblock_legacy_style_set(txt, NULL, style_buf); \
+   fail_if(!evas_textblock_legacy_style_get(txt, NULL) || \
+		   strcmp(style_buf, evas_textblock_legacy_style_get(txt, NULL))); \
    cur = efl_text_cursor_new(txt); \
    fail_if(!cur); \
 do \
@@ -4549,7 +4549,7 @@ do \
 } \
 while (0)
 
-#define END_EFL_CANVAS_TEXTBLOCK_TEST() \
+#define END_EVAS_TEXTBLOCK_LEGACY_TEST() \
 do \
 { \
    efl_text_cursor_free(txt, cur); \
@@ -4558,17 +4558,17 @@ do \
 } \
 while (0)
 
-EFL_START_TEST(efl_canvas_textblock_simple)
+EFL_START_TEST(evas_textblock_legacy_simple)
 {
-   START_EFL_CANVAS_TEXTBLOCK_TEST();
+   START_EVAS_TEXTBLOCK_LEGACY_TEST();
 
-   /* It is simple test for Efl_Canvas_Textblock.
+   /* It is simple test for Evas_Textblock_Legacy.
     * The main object is "txt". */
    const char *buf = "Th<i>i</i>s is a <br/> te<b>s</b>t.";
    efl_text_set(txt, buf);
    fail_if(strcmp(efl_text_get(txt), buf));
 
-   END_EFL_CANVAS_TEXTBLOCK_TEST();
+   END_EVAS_TEXTBLOCK_LEGACY_TEST();
 }
 EFL_END_TEST
 
@@ -4585,7 +4585,7 @@ EFL_START_TEST(efl_text)
     * Russian 't' in the beginnning to create additional item.*/
                    /*01234    5 6789012345678  19  01234 */
    efl_text_set(tb, "тest \u202bנסיוןabcנסיון\u202c bang");
-   efl_canvas_textblock_size_native_get(tb, &nw, &nh);
+   evas_textblock_legacy_size_native_get(tb, &nw, &nh);
    efl_gfx_entity_size_set(tb, EINA_SIZE2D(nw,  nh));
 
    /* Logical cursor after "test " */
@@ -4605,9 +4605,9 @@ EFL_START_TEST(efl_text)
 }
 EFL_END_TEST
 
-EFL_START_TEST(efl_canvas_textblock_cursor)
+EFL_START_TEST(evas_textblock_legacy_cursor)
 {
-   START_EFL_CANVAS_TEXTBLOCK_TEST();
+   START_EVAS_TEXTBLOCK_LEGACY_TEST();
    int pos;
 
    const char *buf = "abcdefghij";
@@ -4621,14 +4621,14 @@ EFL_START_TEST(efl_canvas_textblock_cursor)
    pos = efl_text_cursor_position_get(txt, cur);
    ck_assert_int_eq(pos, 10);
 
-   END_EFL_CANVAS_TEXTBLOCK_TEST();
+   END_EVAS_TEXTBLOCK_LEGACY_TEST();
 }
 EFL_END_TEST
 
 
-EFL_START_TEST(efl_canvas_textblock_markup)
+EFL_START_TEST(evas_textblock_legacy_markup)
 {
-   START_EFL_CANVAS_TEXTBLOCK_TEST();
+   START_EVAS_TEXTBLOCK_LEGACY_TEST();
    Efl_Text_Cursor_Cursor *start, *end;
    char *res;
 
@@ -4650,13 +4650,13 @@ EFL_START_TEST(efl_canvas_textblock_markup)
    ck_assert_str_eq(res, "bc<br>");
    free(res);
 
-   END_EFL_CANVAS_TEXTBLOCK_TEST();
+   END_EVAS_TEXTBLOCK_LEGACY_TEST();
 }
 EFL_END_TEST
 
-EFL_START_TEST(efl_canvas_textblock_markup_invalid_escape)
+EFL_START_TEST(evas_textblock_legacy_markup_invalid_escape)
 {
-   START_EFL_CANVAS_TEXTBLOCK_TEST();
+   START_EVAS_TEXTBLOCK_LEGACY_TEST();
 
    char * text1 = "Hello";
    char * text2 = "Hello&123";
@@ -4664,22 +4664,22 @@ EFL_START_TEST(efl_canvas_textblock_markup_invalid_escape)
    Evas_Coord fw1, fw2, fw3;
 
    efl_text_markup_set(txt,text1);
-   efl_canvas_textblock_size_native_get(txt, &fw1, NULL);
+   evas_textblock_legacy_size_native_get(txt, &fw1, NULL);
    efl_text_markup_set(txt,text2);
-   efl_canvas_textblock_size_native_get(txt, &fw2, NULL);
+   evas_textblock_legacy_size_native_get(txt, &fw2, NULL);
    fail_if(fw2 <= fw1);
    efl_text_markup_set(txt,text3);
-   efl_canvas_textblock_size_native_get(txt, &fw3, NULL);
+   evas_textblock_legacy_size_native_get(txt, &fw3, NULL);
    fail_if(fw3 <= fw2);
 
-   END_EFL_CANVAS_TEXTBLOCK_TEST();
+   END_EVAS_TEXTBLOCK_LEGACY_TEST();
 }
 EFL_END_TEST
 
 
 EFL_START_TEST(efl_text_font)
 {
-   START_EFL_CANVAS_TEXTBLOCK_TEST();
+   START_EVAS_TEXTBLOCK_LEGACY_TEST();
 
    efl_text_set(txt, "\n\n\n");
 
@@ -4702,7 +4702,7 @@ EFL_START_TEST(efl_text_font)
    fail_if(30 != font_size);
    fail_if(strcmp(font,"arial"));
 
-   END_EFL_CANVAS_TEXTBLOCK_TEST();
+   END_EVAS_TEXTBLOCK_LEGACY_TEST();
 }
 EFL_END_TEST
 
@@ -4734,11 +4734,11 @@ void evas_test_textblock(TCase *tc)
 #endif
    tcase_add_test(tc, evas_textblock_text_iface);
    tcase_add_test(tc, evas_textblock_annotation);
-   tcase_add_test(tc, efl_canvas_textblock_simple);
+   tcase_add_test(tc, evas_textblock_legacy_simple);
    tcase_add_test(tc, efl_text);
-   tcase_add_test(tc, efl_canvas_textblock_cursor);
-   tcase_add_test(tc, efl_canvas_textblock_markup);
-   tcase_add_test(tc, efl_canvas_textblock_markup_invalid_escape);
+   tcase_add_test(tc, evas_textblock_legacy_cursor);
+   tcase_add_test(tc, evas_textblock_legacy_markup);
+   tcase_add_test(tc, evas_textblock_legacy_markup_invalid_escape);
    tcase_add_test(tc, efl_text_font);
 }