Efl text: replace all usages of cursor handle to same type

Changes cursor handle name from 'Efl.Text.Cursor.Cursor_Data' to
'Efl.Text.Cursor.Cursor'.
Also, replace all usages of Efl_Canvas_Text_Cursor
with Efl_Text_Cursor_Cursor as the handle for the cursor.

16 files changed, 291 insertions, 298 deletions

diff --git a/src/bin/elementary/test_efl_ui_text.c b/src/bin/elementary/test_efl_ui_text.c
index 4ce782e661..27ff8799c6 100644
--- a/src/bin/elementary/test_efl_ui_text.c
+++ b/src/bin/elementary/test_efl_ui_text.c
@@ -9,7 +9,7 @@
 static void
 _apply_style(Eo *obj, size_t start_pos, size_t end_pos, const char *style)
 {
-   Efl_Canvas_Text_Cursor *start, *end;
+   Efl_Text_Cursor_Cursor *start, *end;
 
    start = efl_text_cursor_new(obj);
    end = efl_text_cursor_new(obj);
@@ -104,7 +104,7 @@ typedef struct
 static void
 my_efl_ui_text_bt_3(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
 {
-   Efl_Canvas_Text_Cursor *sel_start, *sel_end;
+   Efl_Text_Cursor_Cursor *sel_start, *sel_end;
 
    efl_ui_text_interactive_selection_cursors_get(data, &sel_start, &sel_end);
    const char *s = efl_canvas_text_range_text_get(data, sel_start, sel_end);
@@ -162,7 +162,7 @@ void
 test_efl_ui_text(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
 {
    Evas_Object *win, *bx, *bx2, *bx3, *bt, *en;
-   Efl_Canvas_Text_Cursor *main_cur, *cur;
+   Efl_Text_Cursor_Cursor *main_cur, *cur;
 
    win = elm_win_util_standard_add("entry", "Entry");
    elm_win_autodel_set(win, EINA_TRUE);
diff --git a/src/lib/edje/edje_entry.c b/src/lib/edje/edje_entry.c
index 2b3d6449fb..15053795b6 100644
--- a/src/lib/edje/edje_entry.c
+++ b/src/lib/edje/edje_entry.c
@@ -4017,7 +4017,7 @@ _cursor_get(Edje_Real_Part *rp, Edje_Cursor cur)
 }
 
 Eina_Bool
-_edje_text_cursor_next(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor_Data *c)
+_edje_text_cursor_next(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor *c)
 {
    Entry *en;
 
@@ -4051,7 +4051,7 @@ _edje_entry_cursor_next(Edje_Real_Part *rp, Edje_Cursor cur)
 
 
 Eina_Bool
-_edje_text_cursor_prev(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor_Data *c)
+_edje_text_cursor_prev(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor *c)
 {
    Entry *en;
 
@@ -4086,7 +4086,7 @@ _edje_entry_cursor_prev(Edje_Real_Part *rp, Edje_Cursor cur)
 }
 
 Eina_Bool
-_edje_text_cursor_up(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor_Data *c)
+_edje_text_cursor_up(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor *c)
 {
    Entry *en;
    Evas_Coord lx, ly, lw, lh, cx, cy, cw, ch;
@@ -4126,7 +4126,7 @@ _edje_entry_cursor_up(Edje_Real_Part *rp, Edje_Cursor cur)
 }
 
 Eina_Bool
-_edje_text_cursor_down(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor_Data *c)
+_edje_text_cursor_down(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor *c)
 {
    Entry *en;
    Evas_Coord lx, ly, lw, lh, cx, cy, cw, ch;
@@ -4165,7 +4165,7 @@ _edje_entry_cursor_down(Edje_Real_Part *rp, Edje_Cursor cur)
 }
 
 void
-_edje_text_cursor_begin(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor_Data *c)
+_edje_text_cursor_begin(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor *c)
 {
    Entry *en;
    int old_cur_pos;
@@ -4200,7 +4200,7 @@ _edje_entry_cursor_begin(Edje_Real_Part *rp, Edje_Cursor cur)
 }
 
 void
-_edje_text_cursor_end(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor_Data *c)
+_edje_text_cursor_end(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor *c)
 {
    Entry *en;
    int old_cur_pos;
@@ -4234,7 +4234,7 @@ _edje_entry_cursor_end(Edje_Real_Part *rp, Edje_Cursor cur)
 }
 
 void
-_edje_text_cursor_copy(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor_Data *d, Efl_Text_Cursor_Cursor_Data *c)
+_edje_text_cursor_copy(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor *d, Efl_Text_Cursor_Cursor *c)
 {
    Entry *en;
 
@@ -4264,7 +4264,7 @@ _edje_entry_cursor_copy(Edje_Real_Part *rp, Edje_Cursor cur, Edje_Cursor dst)
 }
 
 void
-_edje_text_cursor_line_begin(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor_Data *c)
+_edje_text_cursor_line_begin(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor *c)
 {
    Entry *en;
    int old_cur_pos;
@@ -4298,7 +4298,7 @@ _edje_entry_cursor_line_begin(Edje_Real_Part *rp, Edje_Cursor cur)
 }
 
 void
-_edje_text_cursor_line_end(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor_Data *c)
+_edje_text_cursor_line_end(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor *c)
 {
    Entry *en;
    int old_cur_pos;
@@ -4331,7 +4331,7 @@ _edje_entry_cursor_line_end(Edje_Real_Part *rp, Edje_Cursor cur)
 }
 
 Eina_Bool
-_edje_text_cursor_coord_set(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor_Data *c,
+_edje_text_cursor_coord_set(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor *c,
                              Evas_Coord x, Evas_Coord y)
 {
    Entry *en = rp->typedata.text->entry_data;
@@ -4378,7 +4378,7 @@ _edje_entry_cursor_is_visible_format_get(Edje_Real_Part *rp, Edje_Cursor cur)
 }
 
 char *
-_edje_text_cursor_content_get(Edje_Real_Part *rp EINA_UNUSED, Efl_Text_Cursor_Cursor_Data *c)
+_edje_text_cursor_content_get(Edje_Real_Part *rp EINA_UNUSED, Efl_Text_Cursor_Cursor *c)
 {
    return evas_textblock_cursor_content_get(c);
 }
@@ -4394,7 +4394,7 @@ _edje_entry_cursor_content_get(Edje_Real_Part *rp, Edje_Cursor cur)
 }
 
 void
-_edje_text_cursor_pos_set(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor_Data *c, int pos)
+_edje_text_cursor_pos_set(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor *c, int pos)
 {
    if ((rp->type != EDJE_RP_TYPE_TEXT) ||
        (!rp->typedata.text)) return;
@@ -4423,7 +4423,7 @@ _edje_entry_cursor_pos_set(Edje_Real_Part *rp, Edje_Cursor cur, int pos)
 }
 
 int
-_edje_text_cursor_pos_get(Edje_Real_Part *rp EINA_UNUSED, Efl_Text_Cursor_Cursor_Data *c)
+_edje_text_cursor_pos_get(Edje_Real_Part *rp EINA_UNUSED, Efl_Text_Cursor_Cursor *c)
 {
    return evas_textblock_cursor_pos_get(c);
 }
diff --git a/src/lib/edje/edje_part_text.c b/src/lib/edje/edje_part_text.c
index bc848fca12..5db8c453c6 100644
--- a/src/lib/edje/edje_part_text.c
+++ b/src/lib/edje/edje_part_text.c
@@ -23,7 +23,7 @@ _efl_canvas_layout_internal_text_efl_text_text_get(Eo *obj,
    RETURN_VAL(_edje_efl_text_get(obj, pd->ed, pd->part));
 }
 
-EOLIAN static Efl_Text_Cursor_Cursor_Data *
+EOLIAN static Efl_Text_Cursor_Cursor *
 _efl_canvas_layout_internal_text_efl_text_cursor_cursor_get(Eo *obj,
       void *_pd EINA_UNUSED, Efl_Text_Cursor_Cursor_Get_Type get_type)
 {
@@ -33,7 +33,7 @@ _efl_canvas_layout_internal_text_efl_text_cursor_cursor_get(Eo *obj,
 
 EOLIAN static void
 _efl_canvas_layout_internal_text_efl_text_cursor_cursor_paragraph_first(Eo *obj,
-      void *_pd EINA_UNUSED, Efl_Text_Cursor_Cursor_Data *cur)
+      void *_pd EINA_UNUSED, Efl_Text_Cursor_Cursor *cur)
 {
    PROXY_DATA_GET(obj, pd);
    _edje_text_cursor_begin(pd->rp, cur);
@@ -42,7 +42,7 @@ _efl_canvas_layout_internal_text_efl_text_cursor_cursor_paragraph_first(Eo *obj,
 
 EOLIAN static void
 _efl_canvas_layout_internal_text_efl_text_cursor_cursor_paragraph_last(Eo *obj,
-      void *_pd EINA_UNUSED, Efl_Text_Cursor_Cursor_Data *cur)
+      void *_pd EINA_UNUSED, Efl_Text_Cursor_Cursor *cur)
 {
    PROXY_DATA_GET(obj, pd);
    _edje_text_cursor_end(pd->rp, cur);
@@ -51,7 +51,7 @@ _efl_canvas_layout_internal_text_efl_text_cursor_cursor_paragraph_last(Eo *obj,
 
 EOLIAN static void
 _efl_canvas_layout_internal_text_efl_text_cursor_cursor_position_set(Eo *obj,
-      void *_pd EINA_UNUSED, Efl_Text_Cursor_Cursor_Data *cur, int pos)
+      void *_pd EINA_UNUSED, Efl_Text_Cursor_Cursor *cur, int pos)
 {
    PROXY_DATA_GET(obj, pd);
    _edje_text_cursor_pos_set(pd->rp, cur, pos);
@@ -60,7 +60,7 @@ _efl_canvas_layout_internal_text_efl_text_cursor_cursor_position_set(Eo *obj,
 
 EOLIAN static int
 _efl_canvas_layout_internal_text_efl_text_cursor_cursor_position_get(Eo *obj,
-      void *_pd EINA_UNUSED, Efl_Text_Cursor_Cursor_Data *cur)
+      void *_pd EINA_UNUSED, Efl_Text_Cursor_Cursor *cur)
 {
    PROXY_DATA_GET(obj, pd);
    RETURN_VAL(_edje_text_cursor_pos_get(pd->rp, cur));
@@ -68,7 +68,7 @@ _efl_canvas_layout_internal_text_efl_text_cursor_cursor_position_get(Eo *obj,
 
 EOLIAN static void
 _efl_canvas_layout_internal_text_efl_text_cursor_cursor_coord_set(Eo *obj,
-      void *_pd EINA_UNUSED, Efl_Text_Cursor_Cursor_Data *cur,
+      void *_pd EINA_UNUSED, Efl_Text_Cursor_Cursor *cur,
       int x, int y)
 {
    PROXY_DATA_GET(obj, pd);
@@ -78,7 +78,7 @@ _efl_canvas_layout_internal_text_efl_text_cursor_cursor_coord_set(Eo *obj,
 
 EOLIAN static void
 _efl_canvas_layout_internal_text_efl_text_cursor_cursor_line_char_first(Eo *obj,
-      void *_pd EINA_UNUSED, Efl_Text_Cursor_Cursor_Data *cur)
+      void *_pd EINA_UNUSED, Efl_Text_Cursor_Cursor *cur)
 {
    PROXY_DATA_GET(obj, pd);
    _edje_text_cursor_line_begin(pd->rp, cur);
@@ -87,7 +87,7 @@ _efl_canvas_layout_internal_text_efl_text_cursor_cursor_line_char_first(Eo *obj,
 
 EOLIAN static void
 _efl_canvas_layout_internal_text_efl_text_cursor_cursor_line_char_last(Eo *obj,
-      void *_pd EINA_UNUSED, Efl_Text_Cursor_Cursor_Data *cur)
+      void *_pd EINA_UNUSED, Efl_Text_Cursor_Cursor *cur)
 {
    PROXY_DATA_GET(obj, pd);
    _edje_text_cursor_line_end(pd->rp, cur);
@@ -96,7 +96,7 @@ _efl_canvas_layout_internal_text_efl_text_cursor_cursor_line_char_last(Eo *obj,
 
 EOLIAN static void
 _efl_canvas_layout_internal_text_efl_text_cursor_cursor_char_prev(Eo *obj,
-      void *_pd EINA_UNUSED, Efl_Text_Cursor_Cursor_Data *cur)
+      void *_pd EINA_UNUSED, Efl_Text_Cursor_Cursor *cur)
 {
    PROXY_DATA_GET(obj, pd);
    _edje_text_cursor_prev(pd->rp, cur);
@@ -105,7 +105,7 @@ _efl_canvas_layout_internal_text_efl_text_cursor_cursor_char_prev(Eo *obj,
 
 EOLIAN static void
 _efl_canvas_layout_internal_text_efl_text_cursor_cursor_char_next(Eo *obj,
-      void *_pd EINA_UNUSED, Efl_Text_Cursor_Cursor_Data *cur)
+      void *_pd EINA_UNUSED, Efl_Text_Cursor_Cursor *cur)
 {
    PROXY_DATA_GET(obj, pd);
    _edje_text_cursor_next(pd->rp, cur);
@@ -114,7 +114,7 @@ _efl_canvas_layout_internal_text_efl_text_cursor_cursor_char_next(Eo *obj,
 
 EOLIAN static void
 _efl_canvas_layout_internal_text_efl_text_cursor_cursor_line_jump_by(Eo *obj,
-      void *_pd EINA_UNUSED, Efl_Text_Cursor_Cursor_Data *cur, int by)
+      void *_pd EINA_UNUSED, Efl_Text_Cursor_Cursor *cur, int by)
 {
    PROXY_DATA_GET(obj, pd);
    if (by == 1)
@@ -131,18 +131,18 @@ _efl_canvas_layout_internal_text_efl_text_cursor_cursor_line_jump_by(Eo *obj,
 EOLIAN static void
 _efl_canvas_layout_internal_text_efl_text_cursor_cursor_copy(Eo *obj,
       void *_pd EINA_UNUSED,
-      Efl_Text_Cursor_Cursor_Data *dst,
-      const Efl_Text_Cursor_Cursor_Data *cur)
+      Efl_Text_Cursor_Cursor *dst,
+      const Efl_Text_Cursor_Cursor *cur)
 {
    PROXY_DATA_GET(obj, pd);
-   _edje_text_cursor_copy(pd->rp, (Efl_Text_Cursor_Cursor_Data *) cur, dst);
+   _edje_text_cursor_copy(pd->rp, (Efl_Text_Cursor_Cursor *) cur, dst);
    RETURN_VOID;
 }
 
 EOLIAN static Eina_Unicode
 _efl_canvas_layout_internal_text_efl_text_cursor_cursor_content_get(Eo *obj,
       void *_pd EINA_UNUSED,
-      const Efl_Text_Cursor_Cursor_Data *cur)
+      const Efl_Text_Cursor_Cursor *cur)
 {
    Eina_Unicode *ustr;
    Eina_Unicode uc = { 0 };
@@ -150,7 +150,7 @@ _efl_canvas_layout_internal_text_efl_text_cursor_cursor_content_get(Eo *obj,
    int len;
 
    PROXY_DATA_GET(obj, pd);
-   c = _edje_text_cursor_content_get(pd->rp, (Efl_Text_Cursor_Cursor_Data *) cur);
+   c = _edje_text_cursor_content_get(pd->rp, (Efl_Text_Cursor_Cursor *) cur);
    ustr = eina_unicode_utf8_to_unicode(c, &len);
    free(c);
    if (ustr)
@@ -164,7 +164,7 @@ _efl_canvas_layout_internal_text_efl_text_cursor_cursor_content_get(Eo *obj,
 EOLIAN static Eina_Bool
 _efl_canvas_layout_internal_text_efl_text_cursor_cursor_geometry_get(Eo *obj,
       void *_pd EINA_UNUSED,
-      const Efl_Text_Cursor_Cursor_Data *cur EINA_UNUSED,
+      const Efl_Text_Cursor_Cursor *cur EINA_UNUSED,
       Efl_Text_Cursor_Cursor_Type ctype EINA_UNUSED,
       Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch,
       Evas_Coord *cx2 EINA_UNUSED, Evas_Coord *cy2 EINA_UNUSED,
@@ -182,7 +182,7 @@ _efl_canvas_layout_internal_text_efl_text_cursor_cursor_geometry_get(Eo *obj,
 
 EOLIAN static int
 _efl_canvas_layout_internal_text_efl_text_cursor_cursor_text_insert(Eo *obj,
-      void *_pd EINA_UNUSED, Efl_Text_Cursor_Cursor_Data *cur EINA_UNUSED,
+      void *_pd EINA_UNUSED, Efl_Text_Cursor_Cursor *cur EINA_UNUSED,
       const char *text)
 {
    PROXY_DATA_GET(obj, pd);
diff --git a/src/lib/edje/edje_private.h b/src/lib/edje/edje_private.h
index f7c5d46f8e..af7075208f 100644
--- a/src/lib/edje/edje_private.h
+++ b/src/lib/edje/edje_private.h
@@ -3159,19 +3159,19 @@ Eo *_edje_text_internal_proxy_get(Edje_Object *obj, Edje *ed, Edje_Real_Part *rp
 Eina_Bool   _edje_efl_text_set(Eo *obj, Edje *ed, const char *part, const char *text);
 const char *_edje_efl_text_get(Eo *obj, Edje *ed, const char *part);
 Evas_Textblock_Cursor *_edje_text_cursor_get(Edje_Real_Part *rp, Edje_Cursor cur);
-void _edje_text_cursor_begin(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor_Data *cur);
-void _edje_text_cursor_end(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor_Data *cur);
-void _edje_text_cursor_pos_set(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor_Data *cur, int pos);
-int _edje_text_cursor_pos_get(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor_Data *cur);
-Eina_Bool _edje_text_cursor_coord_set(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor_Data *cur, int x, int y);
-void _edje_text_cursor_line_begin(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor_Data *cur);
-void _edje_text_cursor_line_end(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor_Data *cur);
-Eina_Bool _edje_text_cursor_next(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor_Data *cur);
-Eina_Bool _edje_text_cursor_prev(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor_Data *cur);
-Eina_Bool _edje_text_cursor_up(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor_Data *cur);
-Eina_Bool _edje_text_cursor_down(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor_Data *cur);
-void _edje_text_cursor_copy(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor_Data *dst, Efl_Text_Cursor_Cursor_Data *cur);
-char * _edje_text_cursor_content_get(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor_Data *cur);
+void _edje_text_cursor_begin(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor *cur);
+void _edje_text_cursor_end(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor *cur);
+void _edje_text_cursor_pos_set(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor *cur, int pos);
+int _edje_text_cursor_pos_get(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor *cur);
+Eina_Bool _edje_text_cursor_coord_set(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor *cur, int x, int y);
+void _edje_text_cursor_line_begin(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor *cur);
+void _edje_text_cursor_line_end(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor *cur);
+Eina_Bool _edje_text_cursor_next(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor *cur);
+Eina_Bool _edje_text_cursor_prev(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor *cur);
+Eina_Bool _edje_text_cursor_up(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor *cur);
+Eina_Bool _edje_text_cursor_down(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor *cur);
+void _edje_text_cursor_copy(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor *dst, Efl_Text_Cursor_Cursor *cur);
+char * _edje_text_cursor_content_get(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor *cur);
 void _edje_object_part_text_insert(Edje *ed, Edje_Real_Part *rp, const char *text);
 
 void _edje_internal_proxy_shutdown(void);
diff --git a/src/lib/efl/Efl.h b/src/lib/efl/Efl.h
index 66e9a978bc..0b9c481532 100644
--- a/src/lib/efl/Efl.h
+++ b/src/lib/efl/Efl.h
@@ -52,7 +52,7 @@ extern "C" {
  */
 typedef struct tm Efl_Time;
 
-typedef struct _Efl_Text_Cursor_Cursor_Data Efl_Text_Cursor_Cursor_Data;
+typedef struct _Efl_Text_Cursor_Cursor Efl_Text_Cursor_Cursor;
 typedef struct _Efl_Canvas_Text_Annotation Efl_Canvas_Text_Annotation;
 
 #ifdef EFL_BETA_API_SUPPORT
diff --git a/src/lib/efl/interfaces/efl_text_annotate.eo b/src/lib/efl/interfaces/efl_text_annotate.eo
index dec3dbae76..82921b8e72 100644
--- a/src/lib/efl/interfaces/efl_text_annotate.eo
+++ b/src/lib/efl/interfaces/efl_text_annotate.eo
@@ -40,8 +40,8 @@ interface Efl.Text.Annotate {
          ]]
          legacy: null;
          params {
-              @in start: ptr(const(Efl.Text.Cursor.Cursor_Data)); [[Start of range]]
-              @in end:   ptr(const(Efl.Text.Cursor.Cursor_Data)); [[End of range]]
+              @in start: ptr(const(Efl.Text.Cursor.Cursor)); [[Start of range]]
+              @in end:   ptr(const(Efl.Text.Cursor.Cursor)); [[End of range]]
          }
          return: free(own(iterator<ptr(Efl.Canvas.Text.Annotation)>),
                  eina_iterator_free); [[Handle of the Annotation]]
@@ -56,8 +56,8 @@ interface Efl.Text.Annotate {
          ]]
          legacy: null;
          params {
-              @in start: ptr(Efl.Text.Cursor.Cursor_Data); [[Start of range]]
-              @in end:   ptr(Efl.Text.Cursor.Cursor_Data); [[End of range]]
+              @in start: ptr(Efl.Text.Cursor.Cursor); [[Start of range]]
+              @in end:   ptr(Efl.Text.Cursor.Cursor); [[End of range]]
               @in format: string; [[Annotation format]]
          }
          return: ptr(Efl.Canvas.Text.Annotation); [[Handle of inserted annotation]]
@@ -106,9 +106,9 @@ interface Efl.Text.Annotate {
          params {
              @in annotation: ptr(const(Efl.Canvas.Text.Annotation)); [[Annotation
                  handle to query]]
-             @in start: ptr(Efl.Text.Cursor.Cursor_Data); [[Cursor to be set to the start
+             @in start: ptr(Efl.Text.Cursor.Cursor); [[Cursor to be set to the start
              position of the annotation in the text]]
-             @in end: ptr(Efl.Text.Cursor.Cursor_Data); [[Cursor to be set to the end
+             @in end: ptr(Efl.Text.Cursor.Cursor); [[Cursor to be set to the end
              position of the annotation in the text]]
          }
       }
@@ -122,7 +122,7 @@ interface Efl.Text.Annotate {
             annotation: ptr(Efl.Canvas.Text.Annotation); [[Annotation]]
          }
          keys {
-            cur: ptr(Efl.Text.Cursor.Cursor_Data);
+            cur: ptr(Efl.Text.Cursor.Cursor);
          }
       }
       cursor_object_item_insert {
@@ -134,7 +134,7 @@ interface Efl.Text.Annotate {
          ]]
          legacy: null;
          params {
-            cur: ptr(Efl.Text.Cursor.Cursor_Data);
+            cur: ptr(Efl.Text.Cursor.Cursor);
             @in format: string; [[Format of the inserted item.
             See Format styles.]]
          }
diff --git a/src/lib/efl/interfaces/efl_text_cursor.eo b/src/lib/efl/interfaces/efl_text_cursor.eo
index ad9db0d100..c138769a68 100644
--- a/src/lib/efl/interfaces/efl_text_cursor.eo
+++ b/src/lib/efl/interfaces/efl_text_cursor.eo
@@ -36,7 +36,7 @@ interface Efl.Text.Cursor {
          ]]
          get {
             legacy: null;
-            return: ptr(Efl.Text.Cursor.Cursor_Data); [[Text cursor object]]
+            return: ptr(Efl.Text.Cursor.Cursor); [[Text cursor object]]
          }
          keys {
             get_type: Efl.Text.Cursor.Cursor_Get_Type;
@@ -49,7 +49,7 @@ interface Efl.Text.Cursor {
             position: int;
          }
          keys {
-            cur: ptr(Efl.Text.Cursor.Cursor_Data);
+            cur: ptr(Efl.Text.Cursor.Cursor);
          }
       }
       @property cursor_content {
@@ -61,7 +61,7 @@ interface Efl.Text.Cursor {
             content: Eina.Unicode; [[The unicode codepoint of the character]]
          }
          keys {
-            cur: ptr(const(Efl.Text.Cursor.Cursor_Data));
+            cur: ptr(const(Efl.Text.Cursor.Cursor));
          }
       }
       @property cursor_geometry {
@@ -78,7 +78,7 @@ interface Efl.Text.Cursor {
             return: bool; [[ $true if split cursor, $false otherwise.]]
          }
          keys {
-            cur: ptr(const(Efl.Text.Cursor.Cursor_Data));
+            cur: ptr(const(Efl.Text.Cursor.Cursor));
             ctype: Efl.Text.Cursor.Cursor_Type; [[The type of the cursor.]]
          }
          values {
@@ -94,122 +94,122 @@ interface Efl.Text.Cursor {
       }
       cursor_new {
          legacy: null;
-         return: ptr(Efl.Text.Cursor.Cursor_Data);
+         return: ptr(Efl.Text.Cursor.Cursor);
       }
       cursor_free {
          legacy: null;
          params {
-            cur: ptr(Efl.Text.Cursor.Cursor_Data);
+            cur: ptr(Efl.Text.Cursor.Cursor);
          }
       }
       cursor_equal {
          legacy: null;
          params {
-            cur1: ptr(const(Efl.Text.Cursor.Cursor_Data));
-            cur2: ptr(const(Efl.Text.Cursor.Cursor_Data));
+            cur1: ptr(const(Efl.Text.Cursor.Cursor));
+            cur2: ptr(const(Efl.Text.Cursor.Cursor));
          }
          return: bool;
       }
       cursor_compare {
          legacy: null;
          params {
-            cur1: ptr(const(Efl.Text.Cursor.Cursor_Data));
-            cur2: ptr(const(Efl.Text.Cursor.Cursor_Data));
+            cur1: ptr(const(Efl.Text.Cursor.Cursor));
+            cur2: ptr(const(Efl.Text.Cursor.Cursor));
          }
          return: int;
       }
       cursor_copy {
          legacy: null;
          params {
-            dst: ptr(Efl.Text.Cursor.Cursor_Data);
-            src: ptr(const(Efl.Text.Cursor.Cursor_Data));
+            dst: ptr(Efl.Text.Cursor.Cursor);
+            src: ptr(const(Efl.Text.Cursor.Cursor));
          }
       }
       cursor_char_next {
          legacy: null;
          params {
-            cur: ptr(Efl.Text.Cursor.Cursor_Data);
+            cur: ptr(Efl.Text.Cursor.Cursor);
          }
       }
       cursor_char_prev {
          legacy: null;
          params {
-            cur: ptr(Efl.Text.Cursor.Cursor_Data);
+            cur: ptr(Efl.Text.Cursor.Cursor);
          }
       }
       cursor_paragraph_char_first {
          legacy: null;
          params {
-            cur: ptr(Efl.Text.Cursor.Cursor_Data);
+            cur: ptr(Efl.Text.Cursor.Cursor);
          }
       }
       cursor_paragraph_char_last {
          legacy: null;
          params {
-            cur: ptr(Efl.Text.Cursor.Cursor_Data);
+            cur: ptr(Efl.Text.Cursor.Cursor);
          }
       }
       cursor_word_start {
          legacy: null;
          params {
-            cur: ptr(Efl.Text.Cursor.Cursor_Data);
+            cur: ptr(Efl.Text.Cursor.Cursor);
          }
       }
       cursor_word_end {
          legacy: null;
          params {
-            cur: ptr(Efl.Text.Cursor.Cursor_Data);
+            cur: ptr(Efl.Text.Cursor.Cursor);
          }
       }
       cursor_line_char_first {
          legacy: null;
          params {
-            cur: ptr(Efl.Text.Cursor.Cursor_Data);
+            cur: ptr(Efl.Text.Cursor.Cursor);
          }
       }
       cursor_line_char_last {
          legacy: null;
          params {
-            cur: ptr(Efl.Text.Cursor.Cursor_Data);
+            cur: ptr(Efl.Text.Cursor.Cursor);
          }
       }
       cursor_paragraph_first {
          legacy: null;
          params {
-            cur: ptr(Efl.Text.Cursor.Cursor_Data);
+            cur: ptr(Efl.Text.Cursor.Cursor);
          }
       }
       cursor_paragraph_last {
          legacy: null;
          params {
-            cur: ptr(Efl.Text.Cursor.Cursor_Data);
+            cur: ptr(Efl.Text.Cursor.Cursor);
          }
       }
       cursor_paragraph_next {
          [[Advances to the start of the next text node]]
          legacy: null;
          params {
-            cur: ptr(Efl.Text.Cursor.Cursor_Data);
+            cur: ptr(Efl.Text.Cursor.Cursor);
          }
       }
       cursor_paragraph_prev {
          [[Advances to the end of the previous text node]]
          legacy: null;
          params {
-            cur: ptr(Efl.Text.Cursor.Cursor_Data);
+            cur: ptr(Efl.Text.Cursor.Cursor);
          }
       }
       cursor_line_jump_by {
          legacy: null;
          params {
-            cur: ptr(Efl.Text.Cursor.Cursor_Data);
+            cur: ptr(Efl.Text.Cursor.Cursor);
             by: int;
          }
       }
       cursor_coord_set {
          legacy: null;
          params {
-            cur: ptr(Efl.Text.Cursor.Cursor_Data);
+            cur: ptr(Efl.Text.Cursor.Cursor);
             @in x: int; [[X coord to set by.]]
             @in y: int; [[Y coord to set by.]]
          }
@@ -220,7 +220,7 @@ interface Efl.Text.Cursor {
          ]]
          legacy: null;
          params {
-            cur: ptr(Efl.Text.Cursor.Cursor_Data);
+            cur: ptr(Efl.Text.Cursor.Cursor);
             @in text: string; [[Text to append (UTF-8 format).]]
          }
          return: int; [[Length of the appended text.]]
@@ -229,7 +229,7 @@ interface Efl.Text.Cursor {
          [[Deletes a single character from position pointed by given cursor.]]
          legacy: null;
          params {
-            cur: ptr(Efl.Text.Cursor.Cursor_Data);
+            cur: ptr(Efl.Text.Cursor.Cursor);
          }
       }
    }
diff --git a/src/lib/efl/interfaces/efl_text_types.eot b/src/lib/efl/interfaces/efl_text_types.eot
index 23686cbf1e..d83ee1fc72 100644
--- a/src/lib/efl/interfaces/efl_text_types.eot
+++ b/src/lib/efl/interfaces/efl_text_types.eot
@@ -9,5 +9,5 @@ enum Efl.Text.Bidirectional_Type {
 
 type @extern Efl.Canvas.Text.Annotation: __undefined_type; [[EFL text annotations data structure]]
 
-type @extern Efl.Text.Cursor.Cursor_Data: __undefined_type; [[Text cursor data structure]]
+type @extern Efl.Text.Cursor.Cursor: __undefined_type; [[Text cursor data structure]]
 
diff --git a/src/lib/elementary/efl_ui_internal_text_interactive.c b/src/lib/elementary/efl_ui_internal_text_interactive.c
index d9c1ad68ec..b6a99c4a0d 100644
--- a/src/lib/elementary/efl_ui_internal_text_interactive.c
+++ b/src/lib/elementary/efl_ui_internal_text_interactive.c
@@ -75,7 +75,7 @@ static Eina_Bool
 _entry_imf_retrieve_surrounding_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, char **text, int *cursor_pos)
 {
    Efl_Canvas_Text *obj = data;
-   Efl_Canvas_Text_Cursor *cur = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_MAIN);
+   Efl_Text_Cursor_Cursor *cur = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_MAIN);
    const char *str;
 
    if (text)
@@ -177,7 +177,7 @@ static void
 _entry_imf_event_preedit_changed_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, void *event_info EINA_UNUSED)
 {
    Efl_Canvas_Text *obj = data;
-   Efl_Canvas_Text_Cursor *cur = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_MAIN);
+   Efl_Text_Cursor_Cursor *cur = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_MAIN);
    Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS);
    int cursor_pos;
    int preedit_start_pos, preedit_end_pos;
@@ -330,7 +330,7 @@ static void
 _entry_imf_event_delete_surrounding_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, void *event_info)
 {
    Efl_Canvas_Text *obj = data;
-   Efl_Canvas_Text_Cursor *cur = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_MAIN);
+   Efl_Text_Cursor_Cursor *cur = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_MAIN);
    Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS);
    Ecore_IMF_Event_Delete_Surrounding *ev = event_info;
    Evas_Textblock_Cursor *del_start, *del_end;
@@ -373,7 +373,7 @@ static void
 _entry_imf_event_selection_set_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, void *event_info)
 {
    Efl_Canvas_Text *obj = data;
-   Efl_Canvas_Text_Cursor *cur = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_MAIN);
+   Efl_Text_Cursor_Cursor *cur = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_MAIN);
    Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS);
    Ecore_IMF_Event_Selection *ev = event_info;
 
@@ -415,7 +415,7 @@ _entry_imf_retrieve_selection_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED,
 #endif
 
 static void
-_entry_imf_cursor_location_set(Eo *obj, Efl_Canvas_Text_Cursor *cur, Efl_Ui_Internal_Text_Interactive_Data *en)
+_entry_imf_cursor_location_set(Eo *obj, Efl_Text_Cursor_Cursor *cur, Efl_Ui_Internal_Text_Interactive_Data *en)
 {
 #ifdef HAVE_ECORE_IMF
    Evas_Coord cx = 0, cy = 0, cw = 0, ch = 0;
@@ -460,7 +460,7 @@ _focus_in_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void
 {
 #ifdef HAVE_ECORE_IMF
    Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS);
-   Efl_Canvas_Text_Cursor *cur;
+   Efl_Text_Cursor_Cursor *cur;
 
    if (!en->imf_context) return;
 
@@ -581,7 +581,7 @@ _sel_clear(Evas_Object *o EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *en
 }
 
 static void
-_range_del_emit(Evas_Object *obj, Efl_Canvas_Text_Cursor *cur1, Efl_Canvas_Text_Cursor *cur2)
+_range_del_emit(Evas_Object *obj, Efl_Text_Cursor_Cursor *cur1, Efl_Text_Cursor_Cursor *cur2)
 {
    size_t start, end;
    char *tmp;
@@ -668,7 +668,7 @@ _compose_seq_reset(Efl_Ui_Internal_Text_Interactive_Data *en)
  * movement_forward: if the movement we are going to do is forward (towards the end of the textblock)
  */
 static void
-_key_down_sel_pre(Efl_Ui_Internal_Text_Interactive *obj, Efl_Canvas_Text_Cursor *cur, Efl_Ui_Internal_Text_Interactive_Data *en, Eina_Bool shift, Eina_Bool movement_forward)
+_key_down_sel_pre(Efl_Ui_Internal_Text_Interactive *obj, Efl_Text_Cursor_Cursor *cur, Efl_Ui_Internal_Text_Interactive_Data *en, Eina_Bool shift, Eina_Bool movement_forward)
 {
    if (en->select_allow)
      {
@@ -689,7 +689,7 @@ _key_down_sel_pre(Efl_Ui_Internal_Text_Interactive *obj, Efl_Canvas_Text_Cursor
 }
 
 static void
-_key_down_sel_post(Efl_Ui_Internal_Text_Interactive *obj, Efl_Canvas_Text_Cursor *cur, Efl_Ui_Internal_Text_Interactive_Data *en, Eina_Bool shift)
+_key_down_sel_post(Efl_Ui_Internal_Text_Interactive *obj, Efl_Text_Cursor_Cursor *cur, Efl_Ui_Internal_Text_Interactive_Data *en, Eina_Bool shift)
 {
    if (en->select_allow)
      {
@@ -702,7 +702,7 @@ static void
 _key_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info)
 {
    Evas_Event_Key_Down *ev = event_info;
-   Efl_Canvas_Text_Cursor *cur;
+   Efl_Text_Cursor_Cursor *cur;
    Eina_Bool control, alt, shift;
 #if defined(__APPLE__) && defined(__MACH__)
    Eina_Bool super, altgr;
@@ -1057,7 +1057,7 @@ end:
 }
 
 static void
-_cursor_char_coord_set(Efl_Canvas_Text *obj, Efl_Canvas_Text_Cursor *cur, Evas_Coord canvasx, Evas_Coord canvasy, Evas_Coord *_cx, Evas_Coord *_cy)
+_cursor_char_coord_set(Efl_Canvas_Text *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;
@@ -1099,7 +1099,7 @@ _mouse_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj EIN
    Evas_Coord cx, cy;
    Evas_Event_Mouse_Down *ev = event_info;
    Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS);
-   Efl_Canvas_Text_Cursor *cur = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_MAIN);
+   Efl_Text_Cursor_Cursor *cur = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_MAIN);
    Evas_Textblock_Cursor *tc = NULL;
    Eina_Bool dosel = EINA_FALSE;
    Eina_Bool shift;
@@ -1210,7 +1210,7 @@ _mouse_up_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void
 {
    Evas_Coord cx, cy;
    Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS);
-   Efl_Canvas_Text_Cursor *cur = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_MAIN);
+   Efl_Text_Cursor_Cursor *cur = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_MAIN);
    Evas_Event_Mouse_Up *ev = event_info;
 
    if ((!ev) || (ev->button != 1)) return;
@@ -1251,7 +1251,7 @@ _mouse_move_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, vo
 {
    Evas_Coord cx, cy;
    Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS);
-   Efl_Canvas_Text_Cursor *cur = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_MAIN);
+   Efl_Text_Cursor_Cursor *cur = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_MAIN);
    Evas_Event_Mouse_Move *ev = event_info;
    Evas_Coord x, y, w, h;
    Evas_Textblock_Cursor *tc;
@@ -1408,7 +1408,7 @@ _efl_ui_internal_text_interactive_efl_ui_text_interactive_selection_allowed_get(
 }
 
 EOLIAN static void
-_efl_ui_internal_text_interactive_efl_ui_text_interactive_selection_cursors_get(Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *pd, Efl_Canvas_Text_Cursor **start, Evas_Textblock_Cursor **end)
+_efl_ui_internal_text_interactive_efl_ui_text_interactive_selection_cursors_get(Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *pd, Efl_Text_Cursor_Cursor **start, Evas_Textblock_Cursor **end)
 {
    if (start) *start = pd->sel_start;
    if (end) *end = pd->sel_end;
diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c
index d1c7e61f90..f712324a70 100644
--- a/src/lib/elementary/efl_ui_text.c
+++ b/src/lib/elementary/efl_ui_text.c
@@ -76,7 +76,7 @@ struct _Efl_Ui_Text_Data
    Elm_Input_Panel_Lang                  input_panel_lang;
    Elm_Input_Panel_Return_Key_Type       input_panel_return_key_type;
    Elm_Input_Hints                       input_hints;
-   Efl_Canvas_Text_Cursor               *sel_handler_cursor;
+   Efl_Text_Cursor_Cursor               *sel_handler_cursor;
    void                                 *input_panel_imdata;
    int                                   input_panel_imdata_len;
    int                                   input_panel_layout_variation;
@@ -564,7 +564,7 @@ _update_selection_handler(Eo *obj)
         Eina_Rectangle *rect;
         Evas_Coord hx, hy;
         Eina_Bool hidden = EINA_FALSE;
-        Efl_Canvas_Text_Cursor *sel_start, *sel_end;
+        Efl_Text_Cursor_Cursor *sel_start, *sel_end;
 
         efl_ui_text_interactive_selection_cursors_get(obj, &sel_start, &sel_end);
 
@@ -757,7 +757,7 @@ _selection_data_cb(void *data EINA_UNUSED,
      }
    else
      {
-        Efl_Canvas_Text_Cursor *cur, *start, *end;
+        Efl_Text_Cursor_Cursor *cur, *start, *end;
         efl_ui_text_interactive_selection_cursors_get(obj, &start, &end);
         if (!efl_text_cursor_equal(obj, start, end))
           {
@@ -1048,7 +1048,7 @@ _cursor_geometry_recalc(Evas_Object *obj)
    x2 = y2 = w2 = h2 = 0;
    x = y = w = h = 0;
 
-   Efl_Canvas_Text_Cursor *main_cur =
+   Efl_Text_Cursor_Cursor *main_cur =
       efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_MAIN);
 
    efl_text_cursor_geometry_get(obj, main_cur,
@@ -1466,7 +1466,7 @@ _selection_store(Elm_Sel_Type seltype,
                  Evas_Object *obj)
 {
    char *sel;
-   Efl_Canvas_Text_Cursor *start, *end;
+   Efl_Text_Cursor_Cursor *start, *end;
    Elm_Sel_Format format = ELM_SEL_FORMAT_TEXT;
 
    EFL_UI_TEXT_DATA_GET(obj, sd);
@@ -1488,7 +1488,7 @@ _selection_store(Elm_Sel_Type seltype,
 static void
 _cut_cb(Eo *obj)
 {
-   Efl_Canvas_Text_Cursor *start, *end;
+   Efl_Text_Cursor_Cursor *start, *end;
    EFL_UI_TEXT_DATA_GET(obj, sd);
 
    efl_event_callback_legacy_call
@@ -2807,8 +2807,8 @@ _start_handler_mouse_down_cb(void *data,
 
    Evas_Event_Mouse_Down *ev = event_info;
    int start_pos, end_pos, pos;
-   Efl_Canvas_Text_Cursor *sel_start, *sel_end;
-   Efl_Canvas_Text_Cursor *main_cur;
+   Efl_Text_Cursor_Cursor *sel_start, *sel_end;
+   Efl_Text_Cursor_Cursor *main_cur;
 
    Eo *text_obj = edje_object_part_swallow_get(sd->entry_edje, "elm.text");
 
@@ -2893,8 +2893,8 @@ _end_handler_mouse_down_cb(void *data,
    EFL_UI_TEXT_DATA_GET(data, sd);
 
    Evas_Event_Mouse_Down *ev = event_info;
-   Efl_Canvas_Text_Cursor *sel_start, *sel_end;
-   Efl_Canvas_Text_Cursor *main_cur;
+   Efl_Text_Cursor_Cursor *sel_start, *sel_end;
+   Efl_Text_Cursor_Cursor *main_cur;
    int pos, start_pos, end_pos;
 
    sd->end_handler_down = EINA_TRUE;
@@ -3435,7 +3435,7 @@ _efl_ui_text_calc_force(Eo *obj, Efl_Ui_Text_Data *sd)
 static const char*
 _efl_ui_text_selection_get(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd)
 {
-   Efl_Canvas_Text_Cursor *start_obj, *end_obj;
+   Efl_Text_Cursor_Cursor *start_obj, *end_obj;
 
    if ((sd->password)) return NULL;
 
@@ -3459,7 +3459,7 @@ _efl_ui_text_selection_handler_disabled_get(Eo *obj EINA_UNUSED, Efl_Ui_Text_Dat
 static void
 _efl_ui_text_entry_insert(Eo *obj, Efl_Ui_Text_Data *sd, const char *entry)
 {
-   Efl_Canvas_Text_Cursor *cur_obj = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_MAIN);
+   Efl_Text_Cursor_Cursor *cur_obj = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_MAIN);
    efl_text_cursor_text_insert(obj, cur_obj, entry);
    sd->changed = EINA_TRUE;
    elm_layout_sizing_eval(obj);
@@ -3524,7 +3524,7 @@ _efl_ui_text_select_none(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd)
 static void
 _efl_ui_text_select_region_set(Eo *obj, Efl_Ui_Text_Data *sd, int start, int end)
 {
-   Efl_Canvas_Text_Cursor *sel_start, *sel_end;
+   Efl_Text_Cursor_Cursor *sel_start, *sel_end;
 
    if ((sd->password)) return;
 
@@ -4503,7 +4503,7 @@ _efl_ui_text_elm_interface_atspi_text_default_attributes_get(Eo *obj, Efl_Ui_Tex
 {
    Eina_List *ret = NULL;
    Elm_Atspi_Text_Attribute *attr;
-   Efl_Canvas_Text_Cursor *start, *end;
+   Efl_Text_Cursor_Cursor *start, *end;
    Eina_Iterator *annotations;
    Efl_Canvas_Text_Annotation *an;
 
@@ -4537,7 +4537,7 @@ _efl_ui_text_elm_interface_atspi_text_editable_content_set(Eo *obj, Efl_Ui_Text_
 EOLIAN static Eina_Bool
 _efl_ui_text_elm_interface_atspi_text_editable_insert(Eo *obj, Efl_Ui_Text_Data *pd, const char *string, int position)
 {
-   Efl_Canvas_Text_Cursor *cur_obj = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_MAIN);
+   Efl_Text_Cursor_Cursor *cur_obj = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_MAIN);
    efl_text_cursor_position_set(obj, cur_obj, position);
    _efl_ui_text_entry_insert(obj, pd, string);
 
@@ -4587,7 +4587,7 @@ _efl_ui_text_elm_interface_atspi_text_editable_delete(Eo *obj, Efl_Ui_Text_Data
 EOLIAN static Eina_Bool
 _efl_ui_text_elm_interface_atspi_text_editable_paste(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED, int position)
 {
-   Efl_Canvas_Text_Cursor *cur_obj = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_MAIN);
+   Efl_Text_Cursor_Cursor *cur_obj = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_MAIN);
    efl_text_cursor_position_set(obj, cur_obj, position);
    efl_ui_text_selection_paste(obj);
    return EINA_TRUE;
@@ -4623,7 +4623,7 @@ _efl_ui_text_elm_interface_atspi_accessible_name_get(Eo *obj, Efl_Ui_Text_Data *
    return ret;
 }
 
-EOLIAN static Efl_Canvas_Text_Cursor *
+EOLIAN static Efl_Text_Cursor_Cursor *
 _efl_ui_text_cursor_new(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd EINA_UNUSED)
 {
    Eo *text_obj = edje_object_part_swallow_get(sd->entry_edje, "elm.text");
@@ -4750,7 +4750,7 @@ static void
 _update_text_selection(Eo *obj, Eo *text_obj)
 {
    Evas_Coord x, y;
-   Efl_Canvas_Text_Cursor *sel_start, *sel_end;
+   Efl_Text_Cursor_Cursor *sel_start, *sel_end;
 
    Eina_List *l;
    Eina_Iterator *range;
@@ -4982,7 +4982,7 @@ _anchors_create(Eo *obj, Efl_Ui_Text_Data *sd)
 {
    Eina_Iterator *it;
    Anchor *an = NULL;
-   Efl_Canvas_Text_Cursor *start, *end;
+   Efl_Text_Cursor_Cursor *start, *end;
    Efl_Canvas_Text_Annotation *anchor;
 
    Eo *text_obj = edje_object_part_swallow_get(sd->entry_edje, "elm.text");
@@ -5135,7 +5135,7 @@ _anchors_update(Eo *o, Efl_Ui_Text_Data *sd)
         else
           {
              Eina_Iterator *range;
-             Efl_Canvas_Text_Cursor *start, *end;
+             Efl_Text_Cursor_Cursor *start, *end;
              Eina_List *range_list;
              Eina_Rectangle *r;
 
@@ -5326,7 +5326,7 @@ static void
 _efl_ui_text_selection_changed_cb(void *data, const Efl_Event *event EINA_UNUSED)
 {
    Eo *obj = data;
-   Efl_Canvas_Text_Cursor *start, *end;
+   Efl_Text_Cursor_Cursor *start, *end;
    char *text;
    EFL_UI_TEXT_DATA_GET(obj, sd);
 
diff --git a/src/lib/elementary/efl_ui_text.eo b/src/lib/elementary/efl_ui_text.eo
index f5b7ac6ad7..cf9c8ece0d 100644
--- a/src/lib/elementary/efl_ui_text.eo
+++ b/src/lib/elementary/efl_ui_text.eo
@@ -393,7 +393,7 @@ class Efl.Ui.Text (Elm.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable,
       }
       cursor_new {
          [[Creates and returns a new cursor for the text.]]
-         return: ptr(Efl.Text.Cursor.Cursor_Data); [[Text cursor]]
+         return: ptr(Efl.Text.Cursor.Cursor); [[Text cursor]]
       }
    }
    implements {
diff --git a/src/lib/elementary/efl_ui_text_interactive.eo b/src/lib/elementary/efl_ui_text_interactive.eo
index a77270b464..f13e668857 100644
--- a/src/lib/elementary/efl_ui_text_interactive.eo
+++ b/src/lib/elementary/efl_ui_text_interactive.eo
@@ -36,8 +36,8 @@ interface Efl.Ui.Text.Interactive (Efl.Text, Efl.Text.Font,
          ]]
          get {}
          values {
-            start: ptr(Efl.Text.Cursor.Cursor_Data); [[The start of the selection]]
-            end: ptr(Efl.Text.Cursor.Cursor_Data); [[The end of the selection]]
+            start: ptr(Efl.Text.Cursor.Cursor); [[The start of the selection]]
+            end: ptr(Efl.Text.Cursor.Cursor); [[The end of the selection]]
          }
       }
       @property editable {
diff --git a/src/lib/evas/canvas/efl_canvas_text.eo b/src/lib/evas/canvas/efl_canvas_text.eo
index 8abbd45702..bd14798e6a 100644
--- a/src/lib/evas/canvas/efl_canvas_text.eo
+++ b/src/lib/evas/canvas/efl_canvas_text.eo
@@ -31,8 +31,8 @@ Efl.Text.Font, Efl.Text.Style, Efl.Text.Format, Efl.Text.Cursor, Efl.Text.Annota
          ]]
          return: bool; [[$true on success, $false otherwise]]
          params {
-            @in start: ptr(Efl.Text.Cursor.Cursor_Data); [[Range start position]]
-            @in end: ptr(Efl.Text.Cursor.Cursor_Data); [[Range end position]]
+            @in start: ptr(Efl.Text.Cursor.Cursor); [[Range start position]]
+            @in end: ptr(Efl.Text.Cursor.Cursor); [[Range end position]]
          }
       }
       @property style_insets {
@@ -161,8 +161,8 @@ Efl.Text.Font, Efl.Text.Style, Efl.Text.Format, Efl.Text.Cursor, Efl.Text.Annota
          legacy: null;
          return: own(ptr(char)); [[The text in the given range]]
          params {
-            @in cur1: const(ptr(Efl.Text.Cursor.Cursor_Data)); [[Start of range]]
-            @in cur2: const(ptr(Efl.Text.Cursor.Cursor_Data)); [[End of range]]
+            @in cur1: const(ptr(Efl.Text.Cursor.Cursor)); [[Start of range]]
+            @in cur2: const(ptr(Efl.Text.Cursor.Cursor)); [[End of range]]
          }
       }
       range_geometry_get {
@@ -175,8 +175,8 @@ Efl.Text.Font, Efl.Text.Style, Efl.Text.Format, Efl.Text.Cursor, Efl.Text.Annota
          ]]
          legacy: null;
          params {
-             @in cur1: const(ptr(Efl.Text.Cursor.Cursor_Data)); [[Start of range]]
-             @in cur2: const(ptr(Efl.Text.Cursor.Cursor_Data)); [[End of range]]
+             @in cur1: const(ptr(Efl.Text.Cursor.Cursor)); [[Start of range]]
+             @in cur2: const(ptr(Efl.Text.Cursor.Cursor)); [[End of range]]
          }
          return: free(own(iterator<Eina.Rectangle>),
                          eina_iterator_free); [[Iterator on all geoemtries of
@@ -193,8 +193,8 @@ Efl.Text.Font, Efl.Text.Style, Efl.Text.Format, Efl.Text.Cursor, Efl.Text.Annota
          ]]
          legacy: null;
          params {
-             @in cur1: ptr(const(Efl.Text.Cursor.Cursor_Data)); [[Start of range]]
-             @in cur2: ptr(const(Efl.Text.Cursor.Cursor_Data)); [[End of range]]
+             @in cur1: ptr(const(Efl.Text.Cursor.Cursor)); [[Start of range]]
+             @in cur2: ptr(const(Efl.Text.Cursor.Cursor)); [[End of range]]
          }
          return: free(own(iterator<Eina.Rectangle>),
                          eina_iterator_free); [[Iterator on all simple
@@ -207,8 +207,8 @@ Efl.Text.Font, Efl.Text.Style, Efl.Text.Format, Efl.Text.Cursor, Efl.Text.Annota
          ]]
          legacy: null;
          params {
-            @in cur1: ptr(Efl.Text.Cursor.Cursor_Data); [[Range start position]]
-            @in cur2: ptr(Efl.Text.Cursor.Cursor_Data); [[Range end position]]
+            @in cur1: ptr(Efl.Text.Cursor.Cursor); [[Range start position]]
+            @in cur2: ptr(Efl.Text.Cursor.Cursor); [[Range end position]]
          }
       }
       // Obstacles
diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c
index e897607e41..f0b53da6ab 100644
--- a/src/lib/evas/canvas/evas_object_textblock.c
+++ b/src/lib/evas/canvas/evas_object_textblock.c
@@ -558,7 +558,7 @@ struct _Efl_Canvas_Text_Style
    Eina_Bool              delete_me : 1;
 };
 
-struct _Efl_Text_Cursor_Cursor_Data
+struct _Efl_Text_Cursor_Cursor
 {
    Evas_Object                     *obj;
    size_t                           pos;
@@ -583,7 +583,7 @@ struct _Evas_Object_Textblock
 {
    Evas_Textblock_Style               *style;
    Eina_List                          *styles;
-   Efl_Text_Cursor_Cursor_Data        *cursor;
+   Efl_Text_Cursor_Cursor        *cursor;
    Eina_List                          *cursors;
    Evas_Object_Textblock_Node_Text    *text_nodes;
    Evas_Object_Textblock_Node_Format  *format_nodes;
@@ -738,38 +738,38 @@ static const Evas_Object_Func object_func =
    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_Data *cur);
+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_Text_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_Data *cur);
+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_Text_Data *o, Evas_Object_Textblock_Node_Format *n, int visual_adjustment);
 static void _evas_textblock_node_format_free(Efl_Canvas_Text_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_Text_Data *o, Evas_Object *eo_obj);
 static void _evas_textblock_invalidate_all(Efl_Canvas_Text_Data *o);
-static void _evas_textblock_cursors_update_offset(const Efl_Text_Cursor_Cursor_Data *cur, const Evas_Object_Textblock_Node_Text *n, size_t start, int offset);
+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_Text_Data *o, const Evas_Object_Textblock_Node_Text *n, Evas_Object_Textblock_Node_Text *new_node);
 static void _evas_textblock_annotations_clear(Efl_Canvas_Text_Data *o);
 static void _evas_textblock_annotation_remove(Efl_Canvas_Text_Data *o, Efl_Canvas_Text_Annotation *an, Eina_Bool remove_nodes);
 
-static Eina_Bool _evas_textblock_cursor_format_is_visible_get(const Efl_Text_Cursor_Cursor_Data *cur);
-static void _evas_textblock_cursor_at_format_set(Efl_Text_Cursor_Cursor_Data *cur, const Evas_Object_Textblock_Node_Format *fmt);
-static void _evas_textblock_cursor_init(Efl_Text_Cursor_Cursor_Data *cur, const Evas_Object *tb);
+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_Text_Data *o, Evas_Object_Textblock_Format *fmt);
 #ifdef HAVE_HYPHEN
 /* Hyphenation */
 #include "evas_textblock_hyphenation.x"
 #endif
 
-static int _efl_canvas_text_cursor_text_append(Efl_Text_Cursor_Cursor_Data *cur, const char *text);
-static Eina_Bool _evas_textblock_cursor_format_append(Efl_Text_Cursor_Cursor_Data *cur, const char *format, Evas_Object_Textblock_Node_Format **_fnode, Eina_Bool is_item);
+static int _efl_canvas_text_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_Data *cur, const Evas_Object *tb);
-static Eina_Bool _evas_textblock_cursor_format_is_visible_get(const Efl_Text_Cursor_Cursor_Data *cur);
+static void _evas_textblock_cursor_init(Efl_Text_Cursor_Cursor *cur, const Evas_Object *tb);
+static Eina_Bool _evas_textblock_cursor_format_is_visible_get(const Efl_Text_Cursor_Cursor *cur);
 static void _find_layout_item_line_match(Evas_Object *eo_obj, Evas_Object_Textblock_Node_Text *n, size_t pos, Evas_Object_Textblock_Line **lnr, Evas_Object_Textblock_Item **itr);
-static Evas_Object_Textblock_Node_Format *_evas_textblock_cursor_node_format_at_pos_get(const Efl_Text_Cursor_Cursor_Data *cur);
-static int _evas_textblock_cursor_text_prepend(Efl_Text_Cursor_Cursor_Data *cur, const char *_text);
-static void _evas_textblock_cursor_copy(Efl_Text_Cursor_Cursor_Data *dst, const Efl_Canvas_Text_Cursor *src);
+static Evas_Object_Textblock_Node_Format *_evas_textblock_cursor_node_format_at_pos_get(const Efl_Text_Cursor_Cursor *cur);
+static int _evas_textblock_cursor_text_prepend(Efl_Text_Cursor_Cursor *cur, const char *_text);
+static void _evas_textblock_cursor_copy(Efl_Text_Cursor_Cursor *dst, const Efl_Text_Cursor_Cursor *src);
 
 /** selection iterator */
 /**
@@ -1291,7 +1291,7 @@ _is_white(Eina_Unicode c)
  * @param[in] p end of the string
  */
 static void
-_prepend_text_run(Efl_Text_Cursor_Cursor_Data *cur, const char *s, const char *p)
+_prepend_text_run(Efl_Text_Cursor_Cursor *cur, const char *s, const char *p)
 {
    if ((s) && (p > s))
      {
@@ -7367,7 +7367,7 @@ evas_textblock_string_escape_get(const char *string, int *len_ret)
 }
 
 static void
-_cursor_emit_if_changed(Efl_Text_Cursor_Cursor_Data *cur)
+_cursor_emit_if_changed(Efl_Text_Cursor_Cursor *cur)
 {
    if (cur->changed)
      {
@@ -7385,7 +7385,7 @@ _cursor_emit_if_changed(Efl_Text_Cursor_Cursor_Data *cur)
  * @param s_end the end of the string.
  */
 static inline void
-_prepend_escaped_char(Efl_Text_Cursor_Cursor_Data *cur_obj, const char *s,
+_prepend_escaped_char(Efl_Text_Cursor_Cursor *cur_obj, const char *s,
       const char *s_end)
 {
    const char *escape;
@@ -7420,7 +7420,7 @@ evas_object_textblock_text_markup_set(Eo *eo_obj, const char *text)
 
    _nodes_clear(eo_obj);
 
-   Efl_Text_Cursor_Cursor_Data *co = o->cursor;
+   Efl_Text_Cursor_Cursor *co = o->cursor;
    co->node = _evas_textblock_node_text_new();
    o->text_nodes = _NODE_TEXT(eina_inlist_append(
             EINA_INLIST_GET(o->text_nodes),
@@ -7433,7 +7433,7 @@ evas_object_textblock_text_markup_set(Eo *eo_obj, const char *text)
    /* Point all the cursors to the starrt */
      {
         Eina_List *l;
-        Efl_Text_Cursor_Cursor_Data *data;
+        Efl_Text_Cursor_Cursor *data;
 
         evas_textblock_cursor_paragraph_first(o->cursor);
         EINA_LIST_FOREACH(o->cursors, l, data)
@@ -7449,7 +7449,7 @@ evas_object_textblock_text_markup_set(Eo *eo_obj, const char *text)
 }
 
 EAPI void
-evas_object_textblock_text_markup_prepend(Efl_Text_Cursor_Cursor_Data *cur, const char *text)
+evas_object_textblock_text_markup_prepend(Efl_Text_Cursor_Cursor *cur, const char *text)
 {
    if (!cur) return;
    Evas_Object *eo_obj = cur->obj;
@@ -8188,7 +8188,7 @@ _evas_textblock_nodes_merge(Efl_Canvas_Text_Data *o, Evas_Object_Textblock_Node_
  * @param cur the cursor that points to the current node
  */
 static void
-_evas_textblock_cursor_nodes_merge(Efl_Text_Cursor_Cursor_Data *cur)
+_evas_textblock_cursor_nodes_merge(Efl_Text_Cursor_Cursor *cur)
 {
    Evas_Object_Textblock_Node_Text *nnode;
    int len;
@@ -8201,7 +8201,7 @@ _evas_textblock_cursor_nodes_merge(Efl_Text_Cursor_Cursor_Data *cur)
    _evas_textblock_nodes_merge(o, cur->node);
    _evas_textblock_cursors_update_offset(cur, nnode, 0, len);
    _evas_textblock_cursors_set_node(o, nnode, cur->node);
-   Efl_Text_Cursor_Cursor_Data *co = o->cursor;
+   Efl_Text_Cursor_Cursor *co = o->cursor;
    if (nnode == co->node)
      {
         co->node = cur->node;
@@ -8217,7 +8217,7 @@ _evas_textblock_cursor_nodes_merge(Efl_Text_Cursor_Cursor_Data *cur)
  * @return the format node at the specific position or NULL if not found.
  */
 static Evas_Object_Textblock_Node_Format *
-_evas_textblock_cursor_node_format_at_pos_get(const Efl_Text_Cursor_Cursor_Data *cur)
+_evas_textblock_cursor_node_format_at_pos_get(const Efl_Text_Cursor_Cursor *cur)
 {
    Evas_Object_Textblock_Node_Format *node;
    Evas_Object_Textblock_Node_Format *itr;
@@ -8308,7 +8308,7 @@ _evas_textblock_node_visible_at_pos_get(const Evas_Object_Textblock_Node_Format
  * @return the format node found.
  */
 static Evas_Object_Textblock_Node_Format *
-_evas_textblock_cursor_node_format_before_or_at_pos_get(const Efl_Text_Cursor_Cursor_Data *cur)
+_evas_textblock_cursor_node_format_before_or_at_pos_get(const Efl_Text_Cursor_Cursor *cur)
 {
    Evas_Object_Textblock_Node_Format *node, *pitr = NULL;
    Evas_Object_Textblock_Node_Format *itr;
@@ -8358,9 +8358,9 @@ _evas_textblock_cursor_node_format_before_or_at_pos_get(const Efl_Text_Cursor_Cu
  * otherwise.
  */
 static Eina_Bool
-_find_layout_item_match(const Efl_Text_Cursor_Cursor_Data *cur, Evas_Object_Textblock_Line **lnr, Evas_Object_Textblock_Item **itr)
+_find_layout_item_match(const Efl_Text_Cursor_Cursor *cur, Evas_Object_Textblock_Line **lnr, Evas_Object_Textblock_Item **itr)
 {
-   Efl_Text_Cursor_Cursor_Data cur2;
+   Efl_Text_Cursor_Cursor cur2;
    Eina_Bool previous_format = EINA_FALSE;
 
    _evas_textblock_cursor_init(&cur2, cur->obj);
@@ -8384,7 +8384,7 @@ _find_layout_item_match(const Efl_Text_Cursor_Cursor_Data *cur, Evas_Object_Text
 }
 
 static void
-_evas_textblock_cursor_init(Efl_Text_Cursor_Cursor_Data *cur, const Evas_Object *tb)
+_evas_textblock_cursor_init(Efl_Text_Cursor_Cursor *cur, const Evas_Object *tb)
 {
    cur->obj = (Eo *) tb;
 
@@ -8393,7 +8393,7 @@ _evas_textblock_cursor_init(Efl_Text_Cursor_Cursor_Data *cur, const Evas_Object
    cur->pos = 0;
 }
 
-EAPI Efl_Text_Cursor_Cursor_Data *
+EAPI Efl_Text_Cursor_Cursor *
 evas_object_textblock_cursor_new(const Evas_Object *eo_obj)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(eo_obj, NULL);
@@ -8411,7 +8411,7 @@ evas_textblock_cursor_free(Evas_Textblock_Cursor *cur)
 }
 
 EAPI Eina_Bool
-_evas_textblock_cursor_is_format(const Efl_Text_Cursor_Cursor_Data *cur)
+_evas_textblock_cursor_is_format(const Efl_Text_Cursor_Cursor *cur)
 {
    if ((!cur) || (!cur->node)) return EINA_FALSE;
    Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
@@ -8543,7 +8543,7 @@ found:
      {
         size_t ind = _evas_textblock_node_format_pos_get(n);
         const char *format = n->format;
-        Efl_Text_Cursor_Cursor_Data cur;
+        Efl_Text_Cursor_Cursor cur;
         _evas_textblock_cursor_init(&cur, eo_obj);
 
         eina_ustrbuf_remove(n->text_node->unicode, ind, ind + 1);
@@ -8581,7 +8581,7 @@ found:
 }
 
 EAPI void
-evas_textblock_cursor_paragraph_first(Efl_Text_Cursor_Cursor_Data *cur)
+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);
@@ -8592,14 +8592,14 @@ evas_textblock_cursor_paragraph_first(Efl_Text_Cursor_Cursor_Data *cur)
 }
 
 EOLIAN static void
-_efl_canvas_text_efl_text_cursor_cursor_paragraph_first(Eo *eo_obj, Efl_Canvas_Text_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor_Data *cur)
+_efl_canvas_text_efl_text_cursor_cursor_paragraph_first(Eo *eo_obj, Efl_Canvas_Text_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur)
 {
    evas_textblock_cursor_paragraph_first(cur);
    efl_event_callback_legacy_call(eo_obj, EFL_CANVAS_TEXT_EVENT_CURSOR_CHANGED, NULL);
 }
 
 EAPI void
-evas_textblock_cursor_paragraph_last(Efl_Text_Cursor_Cursor_Data *cur)
+evas_textblock_cursor_paragraph_last(Efl_Text_Cursor_Cursor *cur)
 {
    Evas_Object_Textblock_Node_Text *node;
 
@@ -8623,14 +8623,14 @@ evas_textblock_cursor_paragraph_last(Efl_Text_Cursor_Cursor_Data *cur)
 }
 
 EOLIAN static void
-_efl_canvas_text_efl_text_cursor_cursor_paragraph_last(Eo *eo_obj, Efl_Canvas_Text_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor_Data *cur)
+_efl_canvas_text_efl_text_cursor_cursor_paragraph_last(Eo *eo_obj, Efl_Canvas_Text_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur)
 {
    evas_textblock_cursor_paragraph_last(cur);
    efl_event_callback_legacy_call(eo_obj, EFL_CANVAS_TEXT_EVENT_CURSOR_CHANGED, NULL);
 }
 
 static Eina_Bool
-_evas_textblock_cursor_paragraph_next(Efl_Text_Cursor_Cursor_Data *cur)
+_evas_textblock_cursor_paragraph_next(Efl_Text_Cursor_Cursor *cur)
 {
    if (!cur) return EINA_FALSE;
    Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
@@ -8654,7 +8654,7 @@ _evas_textblock_cursor_paragraph_next(Efl_Text_Cursor_Cursor_Data *cur)
 }
 
 EAPI Eina_Bool
-evas_textblock_cursor_paragraph_next(Efl_Text_Cursor_Cursor_Data *cur)
+evas_textblock_cursor_paragraph_next(Efl_Text_Cursor_Cursor *cur)
 {
    if (!cur) return EINA_FALSE;
    return _evas_textblock_cursor_paragraph_next(cur);
@@ -8668,7 +8668,7 @@ _efl_canvas_text_efl_text_cursor_cursor_paragraph_next(Eo *obj EINA_UNUSED, Efl_
 }
 
 static Eina_Bool
-_evas_textblock_cursor_paragraph_prev(Efl_Text_Cursor_Cursor_Data *cur)
+_evas_textblock_cursor_paragraph_prev(Efl_Text_Cursor_Cursor *cur)
 {
    Evas_Object_Textblock_Node_Text *node;
    if (!cur) return EINA_FALSE;
@@ -8697,7 +8697,7 @@ _evas_textblock_cursor_paragraph_prev(Efl_Text_Cursor_Cursor_Data *cur)
 
 
 EAPI Eina_Bool
-evas_textblock_cursor_paragraph_prev(Efl_Text_Cursor_Cursor_Data *cur)
+evas_textblock_cursor_paragraph_prev(Efl_Text_Cursor_Cursor *cur)
 {
    if (!cur) return EINA_FALSE;
    return _evas_textblock_cursor_paragraph_prev(cur);
@@ -8705,7 +8705,7 @@ evas_textblock_cursor_paragraph_prev(Efl_Text_Cursor_Cursor_Data *cur)
 
 EOLIAN static void
 _efl_canvas_text_efl_text_cursor_cursor_paragraph_prev(Eo *obj EINA_UNUSED,
-      Efl_Canvas_Text_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor_Data *cur)
+      Efl_Canvas_Text_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur)
 {
    _evas_textblock_cursor_paragraph_prev(cur);
    efl_event_callback_legacy_call(obj, EFL_CANVAS_TEXT_EVENT_CURSOR_CHANGED, NULL);
@@ -8799,7 +8799,7 @@ evas_textblock_cursor_format_prev(Evas_Textblock_Cursor *cur)
    (breaks[i] == WORDBREAK_BREAK)
 
 EAPI Eina_Bool
-evas_textblock_cursor_word_start(Efl_Text_Cursor_Cursor_Data *cur)
+evas_textblock_cursor_word_start(Efl_Text_Cursor_Cursor *cur)
 {
    if (!cur) return EINA_FALSE;
    const Eina_Unicode *text;
@@ -8859,14 +8859,14 @@ evas_textblock_cursor_word_start(Efl_Text_Cursor_Cursor_Data *cur)
 }
 
 EOLIAN static void
-_efl_canvas_text_efl_text_cursor_cursor_word_start(Eo *eo_obj, Efl_Canvas_Text_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor_Data *cur EINA_UNUSED)
+_efl_canvas_text_efl_text_cursor_cursor_word_start(Eo *eo_obj, Efl_Canvas_Text_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur EINA_UNUSED)
 {
    evas_textblock_cursor_word_start(cur);
    efl_event_callback_legacy_call(eo_obj, EFL_CANVAS_TEXT_EVENT_CURSOR_CHANGED, NULL);
 }
 
 EAPI Eina_Bool
-evas_textblock_cursor_word_end(Efl_Text_Cursor_Cursor_Data *cur)
+evas_textblock_cursor_word_end(Efl_Text_Cursor_Cursor *cur)
 {
    if (!cur) return EINA_FALSE;
    const Eina_Unicode *text;
@@ -8920,14 +8920,14 @@ evas_textblock_cursor_word_end(Efl_Text_Cursor_Cursor_Data *cur)
 }
 
 EOLIAN static void
-_efl_canvas_text_efl_text_cursor_cursor_word_end(Eo *eo_obj, Efl_Canvas_Text_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor_Data *cur EINA_UNUSED)
+_efl_canvas_text_efl_text_cursor_cursor_word_end(Eo *eo_obj, Efl_Canvas_Text_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur EINA_UNUSED)
 {
    evas_textblock_cursor_word_end(cur);
    efl_event_callback_legacy_call(eo_obj, EFL_CANVAS_TEXT_EVENT_CURSOR_CHANGED, NULL);
 }
 
 EAPI Eina_Bool
-evas_textblock_cursor_char_next(Efl_Text_Cursor_Cursor_Data *cur)
+evas_textblock_cursor_char_next(Efl_Text_Cursor_Cursor *cur)
 {
    int ind;
    const Eina_Unicode *text;
@@ -8967,14 +8967,14 @@ evas_textblock_cursor_char_next(Efl_Text_Cursor_Cursor_Data *cur)
 }
 
 EOLIAN static void
-_efl_canvas_text_efl_text_cursor_cursor_char_next(Eo *eo_obj, Efl_Canvas_Text_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor_Data *cur)
+_efl_canvas_text_efl_text_cursor_cursor_char_next(Eo *eo_obj, Efl_Canvas_Text_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur)
 {
    evas_textblock_cursor_char_next(cur);
    efl_event_callback_legacy_call(eo_obj, EFL_CANVAS_TEXT_EVENT_CURSOR_CHANGED, NULL);
 }
 
 static Eina_Bool
-_evas_textblock_cursor_char_prev(Efl_Text_Cursor_Cursor_Data *cur)
+_evas_textblock_cursor_char_prev(Efl_Text_Cursor_Cursor *cur)
 {
 
    if (!cur) return EINA_FALSE;
@@ -8989,21 +8989,21 @@ _evas_textblock_cursor_char_prev(Efl_Text_Cursor_Cursor_Data *cur)
 }
 
 EAPI Eina_Bool
-evas_textblock_cursor_char_prev(Efl_Text_Cursor_Cursor_Data *cur)
+evas_textblock_cursor_char_prev(Efl_Text_Cursor_Cursor *cur)
 {
    if (!cur) return EINA_FALSE;
    return _evas_textblock_cursor_char_prev(cur);
 }
 
 EOLIAN static void
-_efl_canvas_text_efl_text_cursor_cursor_char_prev(Eo *eo_obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor_Data *cur)
+_efl_canvas_text_efl_text_cursor_cursor_char_prev(Eo *eo_obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur)
 {
    _evas_textblock_cursor_char_prev(cur);
    efl_event_callback_legacy_call(eo_obj, EFL_CANVAS_TEXT_EVENT_CURSOR_CHANGED, NULL);
 }
 
 EAPI void
-evas_textblock_cursor_paragraph_char_first(Efl_Text_Cursor_Cursor_Data *cur)
+evas_textblock_cursor_paragraph_char_first(Efl_Text_Cursor_Cursor *cur)
 {
    if (!cur) return;
    Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
@@ -9012,14 +9012,14 @@ evas_textblock_cursor_paragraph_char_first(Efl_Text_Cursor_Cursor_Data *cur)
 }
 
 EOLIAN static void
-_efl_canvas_text_efl_text_cursor_cursor_paragraph_char_first(Eo *eo_obj, Efl_Canvas_Text_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor_Data *cur)
+_efl_canvas_text_efl_text_cursor_cursor_paragraph_char_first(Eo *eo_obj, Efl_Canvas_Text_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur)
 {
    evas_textblock_cursor_paragraph_char_first(cur);
    efl_event_callback_legacy_call(eo_obj, EFL_CANVAS_TEXT_EVENT_CURSOR_CHANGED, NULL);
 }
 
 EAPI void
-evas_textblock_cursor_paragraph_char_last(Efl_Text_Cursor_Cursor_Data *cur)
+evas_textblock_cursor_paragraph_char_last(Efl_Text_Cursor_Cursor *cur)
 {
    int ind;
 
@@ -9040,7 +9040,7 @@ evas_textblock_cursor_paragraph_char_last(Efl_Text_Cursor_Cursor_Data *cur)
 }
 
 EOLIAN static void
-_efl_canvas_text_efl_text_cursor_cursor_paragraph_char_last(Eo *eo_obj, Efl_Canvas_Text_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor_Data *cur)
+_efl_canvas_text_efl_text_cursor_cursor_paragraph_char_last(Eo *eo_obj, Efl_Canvas_Text_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur)
 {
    evas_textblock_cursor_paragraph_char_last(cur);
    efl_event_callback_legacy_call(eo_obj, EFL_CANVAS_TEXT_EVENT_CURSOR_CHANGED, NULL);
@@ -9048,7 +9048,7 @@ _efl_canvas_text_efl_text_cursor_cursor_paragraph_char_last(Eo *eo_obj, Efl_Canv
 
 static void
 _cursor_line_first_char_get(Evas_Object_Textblock_Line *ln,
-                            Efl_Text_Cursor_Cursor_Data *cur,
+                            Efl_Text_Cursor_Cursor *cur,
                             Efl_Canvas_Text_Data *o)
 {
    if (ln->items)
@@ -9074,7 +9074,7 @@ _cursor_line_first_char_get(Evas_Object_Textblock_Line *ln,
 }
 
 EAPI void
-evas_textblock_cursor_line_char_first(Efl_Text_Cursor_Cursor_Data *cur)
+evas_textblock_cursor_line_char_first(Efl_Text_Cursor_Cursor *cur)
 {
    Evas_Object_Textblock_Line *ln = NULL;
    Evas_Object_Textblock_Item *it = NULL;
@@ -9097,7 +9097,7 @@ evas_textblock_cursor_line_char_first(Efl_Text_Cursor_Cursor_Data *cur)
 }
 
 EAPI void
-evas_textblock_cursor_line_char_last(Efl_Text_Cursor_Cursor_Data *cur)
+evas_textblock_cursor_line_char_last(Efl_Text_Cursor_Cursor *cur)
 {
    Evas_Object_Textblock_Line *ln = NULL;
    Evas_Object_Textblock_Item *it = NULL;
@@ -9145,14 +9145,14 @@ evas_textblock_cursor_line_char_last(Efl_Text_Cursor_Cursor_Data *cur)
 }
 
 EOLIAN static void
-_efl_canvas_text_efl_text_cursor_cursor_line_char_last(Eo *eo_obj, Efl_Canvas_Text_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor_Data *cur)
+_efl_canvas_text_efl_text_cursor_cursor_line_char_last(Eo *eo_obj, Efl_Canvas_Text_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur)
 {
    evas_textblock_cursor_line_char_last(cur);
    efl_event_callback_legacy_call(eo_obj, EFL_CANVAS_TEXT_EVENT_CURSOR_CHANGED, NULL);
 }
 
 EOLIAN static void
-_efl_canvas_text_efl_text_cursor_cursor_line_char_first(Eo *eo_obj, Efl_Canvas_Text_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor_Data *cur)
+_efl_canvas_text_efl_text_cursor_cursor_line_char_first(Eo *eo_obj, Efl_Canvas_Text_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur)
 {
    evas_textblock_cursor_line_char_first(cur);
    efl_event_callback_legacy_call(eo_obj, EFL_CANVAS_TEXT_EVENT_CURSOR_CHANGED, NULL);
@@ -9223,7 +9223,7 @@ _evas_textblock_format_is_visible(Evas_Object_Textblock_Node_Format *fnode,
  * @return nothing.
  */
 static void EINA_UNUSED
-_evas_textblock_cursor_node_text_at_format(Efl_Text_Cursor_Cursor_Data *cur, Evas_Object_Textblock_Node_Format *fmt)
+_evas_textblock_cursor_node_text_at_format(Efl_Text_Cursor_Cursor *cur, Evas_Object_Textblock_Node_Format *fmt)
 {
    Evas_Object_Textblock_Node_Text *text;
    Evas_Object_Textblock_Node_Format *base_format;
@@ -9598,7 +9598,7 @@ _evas_textblock_node_format_pos_get(const Evas_Object_Textblock_Node_Format *fmt
 }
 
 EOLIAN static int
-_efl_canvas_text_efl_text_cursor_cursor_position_get(Eo *eo_obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor_Data *cur)
+_efl_canvas_text_efl_text_cursor_cursor_position_get(Eo *eo_obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur)
 {
    Evas_Object_Textblock_Node_Text *n;
    size_t npos = 0;
@@ -9618,15 +9618,15 @@ _efl_canvas_text_efl_text_cursor_cursor_position_get(Eo *eo_obj EINA_UNUSED, Efl
 }
 
 EAPI int
-evas_textblock_cursor_pos_get(const Efl_Text_Cursor_Cursor_Data *cur)
+evas_textblock_cursor_pos_get(const Efl_Text_Cursor_Cursor *cur)
 {
    if (!cur) return -1;
    return efl_text_cursor_position_get(cur->obj,
-         (Efl_Text_Cursor_Cursor_Data *) cur);
+         (Efl_Text_Cursor_Cursor *) cur);
 }
 
 EAPI void
-evas_textblock_cursor_pos_set(Efl_Text_Cursor_Cursor_Data *cur, int _pos)
+evas_textblock_cursor_pos_set(Efl_Text_Cursor_Cursor *cur, int _pos)
 {
    Evas_Object_Textblock_Node_Text *n;
    size_t pos;
@@ -9672,7 +9672,7 @@ evas_textblock_cursor_pos_set(Efl_Text_Cursor_Cursor_Data *cur, int _pos)
 }
 
 EOLIAN static void
-_efl_canvas_text_efl_text_cursor_cursor_position_set(Eo *cur_obj, Efl_Canvas_Text_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor_Data *cur, int _pos)
+_efl_canvas_text_efl_text_cursor_cursor_position_set(Eo *cur_obj, Efl_Canvas_Text_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur, int _pos)
 {
    evas_textblock_cursor_pos_set(cur, _pos);
    efl_event_callback_legacy_call(cur_obj, EFL_CANVAS_TEXT_EVENT_CURSOR_CHANGED, NULL);
@@ -9700,7 +9700,7 @@ evas_textblock_cursor_line_set(Evas_Textblock_Cursor *cur, int line)
 }
 
 EOLIAN static void
-_efl_canvas_text_efl_text_cursor_cursor_line_jump_by(Eo *eo_obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor_Data *cur EINA_UNUSED, int by)
+_efl_canvas_text_efl_text_cursor_cursor_line_jump_by(Eo *eo_obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur EINA_UNUSED, int by)
 {
    int ln;
 
@@ -9747,8 +9747,8 @@ _efl_canvas_text_efl_text_cursor_cursor_line_jump_by(Eo *eo_obj EINA_UNUSED, Efl
 }
 
 EAPI int
-evas_textblock_cursor_compare(const Efl_Text_Cursor_Cursor_Data *cur1,
-      const Efl_Text_Cursor_Cursor_Data *cur2)
+evas_textblock_cursor_compare(const Efl_Text_Cursor_Cursor *cur1,
+      const Efl_Text_Cursor_Cursor *cur2)
 {
    Eina_Inlist *l1, *l2;
 
@@ -9777,7 +9777,7 @@ evas_textblock_cursor_compare(const Efl_Text_Cursor_Cursor_Data *cur1,
 
 EOLIAN static int
 _efl_canvas_text_efl_text_cursor_cursor_compare(Eo *eo_obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED,
-      const Efl_Text_Cursor_Cursor_Data *cur1, const Efl_Canvas_Text_Cursor *cur2)
+      const Efl_Text_Cursor_Cursor *cur1, const Efl_Text_Cursor_Cursor *cur2)
 {
    Evas_Object_Protected_Data *obj = efl_data_scope_get(cur1->obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
@@ -9785,7 +9785,7 @@ _efl_canvas_text_efl_text_cursor_cursor_compare(Eo *eo_obj EINA_UNUSED, Efl_Canv
 }
 
 EOLIAN static Eina_Bool
-_efl_canvas_text_efl_text_cursor_cursor_equal(Eo *eo_obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED, const Efl_Text_Cursor_Cursor_Data *cur, const Efl_Canvas_Text_Cursor *cur2)
+_efl_canvas_text_efl_text_cursor_cursor_equal(Eo *eo_obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED, const Efl_Text_Cursor_Cursor *cur, const Efl_Text_Cursor_Cursor *cur2)
 {
    Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
@@ -9793,14 +9793,14 @@ _efl_canvas_text_efl_text_cursor_cursor_equal(Eo *eo_obj EINA_UNUSED, Efl_Canvas
 }
 
 EAPI void
-evas_textblock_cursor_copy(const Evas_Textblock_Cursor *cur_src, Efl_Text_Cursor_Cursor_Data *cur_dest)
+evas_textblock_cursor_copy(const Evas_Textblock_Cursor *cur_src, Efl_Text_Cursor_Cursor *cur_dest)
 {
    if (!cur_src || !cur_dest) return;
    efl_text_cursor_copy(cur_src->obj, cur_dest, cur_src);
 }
 
 static void
-_evas_textblock_cursor_copy(Evas_Textblock_Cursor *dst, const Efl_Text_Cursor_Cursor_Data *src)
+_evas_textblock_cursor_copy(Evas_Textblock_Cursor *dst, const Efl_Text_Cursor_Cursor *src)
 {
    if (!src) return;
    if (!dst) return;
@@ -9815,7 +9815,7 @@ _evas_textblock_cursor_copy(Evas_Textblock_Cursor *dst, const Efl_Text_Cursor_Cu
 
 static EOLIAN void
 _efl_canvas_text_efl_text_cursor_cursor_copy(Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED,
-      Efl_Text_Cursor_Cursor_Data *dst, const Efl_Canvas_Text_Cursor *src)
+      Efl_Text_Cursor_Cursor *dst, const Efl_Text_Cursor_Cursor *src)
 {
    if (!efl_text_cursor_equal(obj, dst, src))
      {
@@ -9875,7 +9875,7 @@ _evas_textblock_node_text_new(void)
  * @return Returns no value.
  */
 static void
-_evas_textblock_cursor_break_paragraph(Efl_Text_Cursor_Cursor_Data *cur,
+_evas_textblock_cursor_break_paragraph(Efl_Text_Cursor_Cursor *cur,
                               Evas_Object_Textblock_Node_Format *fnode,
                               Eina_Bool legacy)
 {
@@ -9964,8 +9964,8 @@ _evas_textblock_cursors_set_node(Efl_Canvas_Text_Data *o,
       Evas_Object_Textblock_Node_Text *new_node)
 {
    Eina_List *l;
-   Efl_Text_Cursor_Cursor_Data *cur = o->cursor;
-   Efl_Text_Cursor_Cursor_Data *data;
+   Efl_Text_Cursor_Cursor *cur = o->cursor;
+   Efl_Text_Cursor_Cursor *data;
 
    if (n == cur->node)
      {
@@ -9985,7 +9985,7 @@ _evas_textblock_cursors_set_node(Efl_Canvas_Text_Data *o,
 }
 
 static inline void
-_cursor_update_offset(Efl_Text_Cursor_Cursor_Data *cur, Efl_Canvas_Text_Data *o,
+_cursor_update_offset(Efl_Text_Cursor_Cursor *cur, Efl_Canvas_Text_Data *o,
       const Evas_Object_Textblock_Node_Text *n, size_t start, int offset)
 {
    if ((n == cur->node) &&
@@ -10019,12 +10019,12 @@ _cursor_update_offset(Efl_Text_Cursor_Cursor_Data *cur, Efl_Canvas_Text_Data *o,
  * @param offset how much to adjust (can be negative).
  */
 static void
-_evas_textblock_cursors_update_offset(const Efl_Text_Cursor_Cursor_Data *cur,
+_evas_textblock_cursors_update_offset(const Efl_Text_Cursor_Cursor *cur,
       const Evas_Object_Textblock_Node_Text *n,
       size_t start, int offset)
 {
    Eina_List *l;
-   Efl_Text_Cursor_Cursor_Data *ocur;
+   Efl_Text_Cursor_Cursor *ocur;
    Efl_Canvas_Text_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
 
    ocur = o->cursor;
@@ -10054,7 +10054,7 @@ _evas_textblock_changed(Efl_Canvas_Text_Data *o, Evas_Object *eo_obj)
 {
    Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    Eina_List *l;
-   Efl_Text_Cursor_Cursor_Data *data_obj;
+   Efl_Text_Cursor_Cursor *data_obj;
    LYDBG("ZZ: invalidate 1 %p\n", eo_obj);
    o->formatted.valid = 0;
    o->native.valid = 0;
@@ -10087,12 +10087,12 @@ _evas_textblock_invalidate_all(Efl_Canvas_Text_Data *o)
 }
 
 static int
-_evas_textblock_cursor_text_append(Efl_Text_Cursor_Cursor_Data *cur, const char *_text)
+_evas_textblock_cursor_text_append(Efl_Text_Cursor_Cursor *cur, const char *_text)
 {
    Evas_Object_Textblock_Node_Text *n;
    Evas_Object_Textblock_Node_Format *fnode = NULL;
    Eina_Unicode *text;
-   Efl_Text_Cursor_Cursor_Data *main_cur;
+   Efl_Text_Cursor_Cursor *main_cur;
    int len = 0;
 
    if (!cur) return 0;
@@ -10171,7 +10171,7 @@ evas_textblock_cursor_text_append(Evas_Textblock_Cursor *cur, const char *_text)
 }
 
 static int
-_evas_textblock_cursor_text_prepend(Efl_Text_Cursor_Cursor_Data *cur, const char *_text)
+_evas_textblock_cursor_text_prepend(Efl_Text_Cursor_Cursor *cur, const char *_text)
 {
    int len;
    /*append is essentially prepend without advancing */
@@ -10185,7 +10185,7 @@ _evas_textblock_cursor_text_prepend(Efl_Text_Cursor_Cursor_Data *cur, const char
 }
 
 EAPI int
-evas_textblock_cursor_text_prepend(Efl_Text_Cursor_Cursor_Data *cur, const char *_text)
+evas_textblock_cursor_text_prepend(Efl_Text_Cursor_Cursor *cur, const char *_text)
 {
    return _evas_textblock_cursor_text_prepend(cur, _text);
 }
@@ -10193,7 +10193,7 @@ evas_textblock_cursor_text_prepend(Efl_Text_Cursor_Cursor_Data *cur, const char
 EOLIAN static int
 _efl_canvas_text_efl_text_cursor_cursor_text_insert(Eo *eo_obj,
       Efl_Canvas_Text_Data *o,
-      Efl_Text_Cursor_Cursor_Data *cur, const char *_text)
+      Efl_Text_Cursor_Cursor *cur, const char *_text)
 {
    int len = _efl_canvas_text_cursor_text_append(cur, _text);
    _evas_textblock_changed(o, eo_obj);
@@ -10356,7 +10356,7 @@ _evas_textblock_node_format_new(Efl_Canvas_Text_Data *o, const char *_format,
 }
 
 static Eina_Bool
-_evas_textblock_cursor_is_at_the_end(const Efl_Text_Cursor_Cursor_Data *cur)
+_evas_textblock_cursor_is_at_the_end(const Efl_Text_Cursor_Cursor *cur)
 {
    const Eina_Unicode *text;
 
@@ -10369,7 +10369,7 @@ _evas_textblock_cursor_is_at_the_end(const Efl_Text_Cursor_Cursor_Data *cur)
 }
 
 static Eina_Bool
-_evas_textblock_cursor_format_append(Efl_Text_Cursor_Cursor_Data *cur,
+_evas_textblock_cursor_format_append(Efl_Text_Cursor_Cursor *cur,
       const char *format, Evas_Object_Textblock_Node_Format **_fnode,
       Eina_Bool is_item)
 {
@@ -10501,7 +10501,7 @@ _evas_textblock_cursor_format_append(Efl_Text_Cursor_Cursor_Data *cur,
 
    _evas_textblock_changed(o, cur->obj);
 
-   Efl_Text_Cursor_Cursor_Data *ocur = o->cursor;
+   Efl_Text_Cursor_Cursor *ocur = o->cursor;
    if (!ocur->node)
       ocur->node = o->text_nodes;
 
@@ -10516,7 +10516,7 @@ evas_textblock_cursor_format_append(Evas_Textblock_Cursor *cur, const char *form
 }
 
 static Eina_Bool
-_evas_textblock_cursor_format_prepend(Efl_Text_Cursor_Cursor_Data *cur, const char *format)
+_evas_textblock_cursor_format_prepend(Efl_Text_Cursor_Cursor *cur, const char *format)
 {
    Eina_Bool is_visible;
 
@@ -10541,7 +10541,7 @@ evas_textblock_cursor_format_prepend(Evas_Textblock_Cursor *cur, const char *for
 }
 
 EAPI void
-evas_textblock_cursor_char_delete(Efl_Text_Cursor_Cursor_Data *cur)
+evas_textblock_cursor_char_delete(Efl_Text_Cursor_Cursor *cur)
 {
    Evas_Object_Textblock_Node_Text *n, *n2;
    const Eina_Unicode *text;
@@ -10619,14 +10619,14 @@ evas_textblock_cursor_char_delete(Efl_Text_Cursor_Cursor_Data *cur)
 }
 
 EOLIAN static void
-_efl_canvas_text_efl_text_cursor_cursor_char_delete(Eo *eo_obj, Efl_Canvas_Text_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor_Data *cur)
+_efl_canvas_text_efl_text_cursor_cursor_char_delete(Eo *eo_obj, Efl_Canvas_Text_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur)
 {
    evas_textblock_cursor_char_delete(cur);
    efl_event_callback_legacy_call(eo_obj, EFL_CANVAS_TEXT_EVENT_CURSOR_CHANGED, NULL);
 }
 
 EAPI void
-evas_textblock_cursor_range_delete(Efl_Text_Cursor_Cursor_Data *cur1, Efl_Canvas_Text_Cursor *cur2)
+evas_textblock_cursor_range_delete(Efl_Text_Cursor_Cursor *cur1, Efl_Text_Cursor_Cursor *cur2)
 {
    if (!cur1) return;
    efl_canvas_text_range_delete(cur1->obj, cur1, cur2);
@@ -10634,7 +10634,7 @@ evas_textblock_cursor_range_delete(Efl_Text_Cursor_Cursor_Data *cur1, Efl_Canvas
 
 EOLIAN static void
 _efl_canvas_text_range_delete(Eo *eo_obj EINA_UNUSED, Efl_Canvas_Text_Data *pd EINA_UNUSED,
-      Efl_Text_Cursor_Cursor_Data *cur1, Evas_Textblock_Cursor *cur2)
+      Efl_Text_Cursor_Cursor *cur1, Evas_Textblock_Cursor *cur2)
 {
    Evas_Object_Textblock_Node_Format *fnode = NULL;
    Evas_Object_Textblock_Node_Text *n1, *n2;
@@ -10648,7 +10648,7 @@ _efl_canvas_text_range_delete(Eo *eo_obj EINA_UNUSED, Efl_Canvas_Text_Data *pd E
    Efl_Canvas_Text_Data *o = efl_data_scope_get(cur1->obj, MY_CLASS);
    if (evas_textblock_cursor_compare(cur1, cur2) > 0)
      {
-        Efl_Text_Cursor_Cursor_Data *tc;
+        Efl_Text_Cursor_Cursor *tc;
 
         tc = cur1;
         cur1 = cur2;
@@ -10740,7 +10740,7 @@ _efl_canvas_text_range_delete(Eo *eo_obj EINA_UNUSED, Efl_Canvas_Text_Data *pd E
 
 EOLIAN static Eina_Unicode
 _efl_canvas_text_efl_text_cursor_cursor_content_get(Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *pd EINA_UNUSED,
-      const Efl_Text_Cursor_Cursor_Data *cur)
+      const Efl_Text_Cursor_Cursor *cur)
 {
    return eina_ustrbuf_string_get(cur->node->unicode)[cur->pos];
 }
@@ -10780,24 +10780,24 @@ evas_textblock_cursor_content_get(const Evas_Textblock_Cursor *cur)
 }
 
 static char *
-_evas_textblock_cursor_range_text_markup_get(const Efl_Text_Cursor_Cursor_Data *cur1, const Efl_Text_Cursor_Cursor_Data *_cur2)
+_evas_textblock_cursor_range_text_markup_get(const Efl_Text_Cursor_Cursor *cur1, const Efl_Text_Cursor_Cursor *_cur2)
 {
    Evas_Object_Textblock_Node_Text *tnode;
    Eina_Strbuf *buf;
-   Efl_Text_Cursor_Cursor_Data *cur2;
+   Efl_Text_Cursor_Cursor *cur2;
 
    buf = eina_strbuf_new();
 
    if (evas_textblock_cursor_compare(cur1, _cur2) > 0)
      {
-        const Efl_Text_Cursor_Cursor_Data *tc;
+        const Efl_Text_Cursor_Cursor *tc;
 
         tc = cur1;
         cur1 = _cur2;
         _cur2 = tc;
      }
    /* Work on a local copy of the cur */
-   cur2 = alloca(sizeof(Efl_Text_Cursor_Cursor_Data));
+   cur2 = alloca(sizeof(Efl_Text_Cursor_Cursor));
    cur2->obj = _cur2->obj;
    _evas_textblock_cursor_copy(cur2, _cur2);
 
@@ -10888,17 +10888,17 @@ _evas_textblock_cursor_range_text_markup_get(const Efl_Text_Cursor_Cursor_Data *
 }
 
 static char *
-_evas_textblock_cursor_range_text_plain_get(const Efl_Text_Cursor_Cursor_Data *cur1, const Efl_Text_Cursor_Cursor_Data *_cur2)
+_evas_textblock_cursor_range_text_plain_get(const Efl_Text_Cursor_Cursor *cur1, const Efl_Text_Cursor_Cursor *_cur2)
 {
    Eina_UStrbuf *buf;
    Evas_Object_Textblock_Node_Text *n1, *n2;
-   Efl_Text_Cursor_Cursor_Data *cur2;
+   Efl_Text_Cursor_Cursor *cur2;
 
    buf = eina_ustrbuf_new();
 
    if (evas_textblock_cursor_compare(cur1, _cur2) > 0)
      {
-        const Efl_Text_Cursor_Cursor_Data *tc;
+        const Efl_Text_Cursor_Cursor *tc;
 
         tc = cur1;
         cur1 = _cur2;
@@ -10907,7 +10907,7 @@ _evas_textblock_cursor_range_text_plain_get(const Efl_Text_Cursor_Cursor_Data *c
    n1 = cur1->node;
    n2 = _cur2->node;
    /* Work on a local copy of the cur */
-   cur2 = alloca(sizeof(Efl_Text_Cursor_Cursor_Data));
+   cur2 = alloca(sizeof(Efl_Text_Cursor_Cursor));
    cur2->obj = _cur2->obj;
    _evas_textblock_cursor_copy(cur2, _cur2);
 
@@ -10944,7 +10944,7 @@ _evas_textblock_cursor_range_text_plain_get(const Efl_Text_Cursor_Cursor_Data *c
 }
 
 EAPI Eina_List *
-evas_textblock_cursor_range_formats_get(const Efl_Text_Cursor_Cursor_Data *cur1, const Evas_Textblock_Cursor *cur2)
+evas_textblock_cursor_range_formats_get(const Efl_Text_Cursor_Cursor *cur1, const Evas_Textblock_Cursor *cur2)
 {
    Evas_Object *eo_obj;
    Eina_List *ret = NULL;
@@ -10961,7 +10961,7 @@ evas_textblock_cursor_range_formats_get(const Efl_Text_Cursor_Cursor_Data *cur1,
 
    if (evas_textblock_cursor_compare(cur1, cur2) > 0)
      {
-        const Efl_Text_Cursor_Cursor_Data *tc;
+        const Efl_Text_Cursor_Cursor *tc;
 
         tc = cur1;
         cur1 = cur2;
@@ -11015,7 +11015,7 @@ evas_textblock_cursor_range_formats_get(const Efl_Text_Cursor_Cursor_Data *cur1,
 }
 
 static char *
-_evas_textblock_cursor_range_text_get(const Efl_Text_Cursor_Cursor_Data *cur1, const Efl_Text_Cursor_Cursor_Data *cur2, Evas_Textblock_Text_Type format)
+_evas_textblock_cursor_range_text_get(const Efl_Text_Cursor_Cursor *cur1, const Efl_Text_Cursor_Cursor *cur2, Evas_Textblock_Text_Type format)
 {
    if (!cur1 || !cur1->node) return NULL;
    if (!cur2 || !cur2->node) return NULL;
@@ -11036,7 +11036,7 @@ _evas_textblock_cursor_range_text_get(const Efl_Text_Cursor_Cursor_Data *cur1, c
 
 // Add to legacy api
 EAPI char *
-evas_textblock_cursor_range_text_get(const Efl_Text_Cursor_Cursor_Data *cur1, const Evas_Textblock_Cursor *cur2, Evas_Textblock_Text_Type format)
+evas_textblock_cursor_range_text_get(const Efl_Text_Cursor_Cursor *cur1, const Evas_Textblock_Cursor *cur2, Evas_Textblock_Text_Type format)
 {
    return _evas_textblock_cursor_range_text_get(cur1, cur2, format);
 }
@@ -11044,7 +11044,7 @@ evas_textblock_cursor_range_text_get(const Efl_Text_Cursor_Cursor_Data *cur1, co
 static EOLIAN char *
 _efl_canvas_text_range_text_get(Eo *eo_obj EINA_UNUSED,
       Efl_Canvas_Text_Data *pd EINA_UNUSED,
-      const Efl_Text_Cursor_Cursor_Data *cur1,
+      const Efl_Text_Cursor_Cursor *cur1,
       const Evas_Textblock_Cursor *cur2)
 {
    return _evas_textblock_cursor_range_text_get(cur1, cur2, EVAS_TEXTBLOCK_TEXT_PLAIN);
@@ -11053,7 +11053,7 @@ _efl_canvas_text_range_text_get(Eo *eo_obj EINA_UNUSED,
 EAPI const char *
 evas_textblock_cursor_paragraph_text_get(const Evas_Textblock_Cursor *cur)
 {
-   Efl_Text_Cursor_Cursor_Data cur1, cur2;
+   Efl_Text_Cursor_Cursor cur1, cur2;
    if (!cur) return NULL;
    Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
@@ -11140,7 +11140,7 @@ evas_textblock_node_format_text_get(const Evas_Object_Textblock_Node_Format *fmt
 }
 
 static void
-_evas_textblock_cursor_at_format_set(Efl_Text_Cursor_Cursor_Data *cur,
+_evas_textblock_cursor_at_format_set(Efl_Text_Cursor_Cursor *cur,
       const Evas_Object_Textblock_Node_Format *fmt)
 {
    if (!fmt || !cur) return;
@@ -11157,7 +11157,7 @@ evas_textblock_cursor_at_format_set(Evas_Textblock_Cursor *cur, const Evas_Objec
 }
 
 static Eina_Bool
-_evas_textblock_cursor_format_is_visible_get(const Efl_Text_Cursor_Cursor_Data *cur)
+_evas_textblock_cursor_format_is_visible_get(const Efl_Text_Cursor_Cursor *cur)
 {
    const Eina_Unicode *text;
 
@@ -11197,7 +11197,7 @@ _find_layout_line_by_item(Evas_Object_Textblock_Paragraph *par, Evas_Object_Text
 #endif
 
 EAPI Eina_Bool
-evas_textblock_cursor_geometry_bidi_get(const Efl_Text_Cursor_Cursor_Data *cur, 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_Cursor_Type ctype)
+evas_textblock_cursor_geometry_bidi_get(const Efl_Text_Cursor_Cursor *cur, 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_Cursor_Type ctype)
 {
    if (!cur) return EINA_FALSE;
    return efl_text_cursor_geometry_get(cur->obj, cur,
@@ -11207,7 +11207,7 @@ evas_textblock_cursor_geometry_bidi_get(const Efl_Text_Cursor_Cursor_Data *cur,
 }
 
 EOLIAN static Eina_Bool
-_efl_canvas_text_efl_text_cursor_cursor_geometry_get(Eo *eo_obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED, const Efl_Text_Cursor_Cursor_Data *cur, Efl_Text_Cursor_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)
+_efl_canvas_text_efl_text_cursor_cursor_geometry_get(Eo *eo_obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED, const Efl_Text_Cursor_Cursor *cur, Efl_Text_Cursor_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)
 {
    if (!cur) return EINA_FALSE;
    Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
@@ -11391,7 +11391,7 @@ _efl_canvas_text_efl_text_cursor_cursor_geometry_get(Eo *eo_obj EINA_UNUSED, Efl
 }
 
 EAPI int
-evas_textblock_cursor_geometry_get(const Efl_Text_Cursor_Cursor_Data *cur, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch, Evas_BiDi_Direction *dir, Evas_Textblock_Cursor_Type ctype)
+evas_textblock_cursor_geometry_get(const Efl_Text_Cursor_Cursor *cur, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch, Evas_BiDi_Direction *dir, Evas_Textblock_Cursor_Type ctype)
 {
    int ret = -1;
    if (!cur) return -1;
@@ -11635,7 +11635,7 @@ 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_Data *start, Evas_Textblock_Cursor *end)
+evas_textblock_cursor_visible_range_get(Efl_Text_Cursor_Cursor *start, Evas_Textblock_Cursor *end)
 {
    return efl_canvas_text_visible_range_get(start->obj, start, end);
 }
@@ -11643,7 +11643,7 @@ evas_textblock_cursor_visible_range_get(Efl_Text_Cursor_Cursor_Data *start, Evas
 EOLIAN static Eina_Bool
 _efl_canvas_text_visible_range_get(Eo *eo_obj EINA_UNUSED,
       Efl_Canvas_Text_Data *pd EINA_UNUSED,
-      Efl_Text_Cursor_Cursor_Data *start, Evas_Textblock_Cursor *end)
+      Efl_Text_Cursor_Cursor *start, Evas_Textblock_Cursor *end)
 {
    Evas *eo_e;
    Evas_Coord cy, ch;
@@ -11798,7 +11798,7 @@ end:
 }
 
 EOLIAN static void
-_efl_canvas_text_efl_text_cursor_cursor_coord_set(Eo *eo_obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor_Data *cur EINA_UNUSED,
+_efl_canvas_text_efl_text_cursor_cursor_coord_set(Eo *eo_obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur EINA_UNUSED,
       Evas_Coord x, Evas_Coord y)
 {
    evas_textblock_cursor_char_coord_set(cur, x, y);
@@ -11940,8 +11940,8 @@ _evas_textblock_range_calc_x_w(const Evas_Object_Textblock_Item *it,
  */
 static Eina_List *
 _evas_textblock_cursor_range_in_line_geometry_get(
-      const Evas_Object_Textblock_Line *ln, const Efl_Text_Cursor_Cursor_Data *cur1,
-      const Efl_Text_Cursor_Cursor_Data *cur2)
+      const Evas_Object_Textblock_Line *ln, const Efl_Text_Cursor_Cursor *cur1,
+      const Efl_Text_Cursor_Cursor *cur2)
 {
    Evas_Object_Textblock_Item *it;
    Evas_Object_Textblock_Item *it1, *it2;
@@ -11949,7 +11949,7 @@ _evas_textblock_cursor_range_in_line_geometry_get(
    Evas_Textblock_Rectangle *tr;
    size_t start, end;
    Eina_Bool switch_items;
-   const Efl_Text_Cursor_Cursor_Data *cur;
+   const Efl_Text_Cursor_Cursor *cur;
 
    cur = (cur1) ? cur1 : cur2;
 
@@ -12229,7 +12229,7 @@ _line_fill_rect_get(const Evas_Object_Textblock_Line *ln,
 }
 
 EAPI Eina_Iterator *
-evas_textblock_cursor_range_simple_geometry_get(const Efl_Text_Cursor_Cursor_Data *cur1, const Evas_Textblock_Cursor *cur2)
+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_text_range_simple_geometry_get(cur1->obj, cur1, cur2);
@@ -12237,7 +12237,7 @@ evas_textblock_cursor_range_simple_geometry_get(const Efl_Text_Cursor_Cursor_Dat
 
 static EOLIAN Eina_Iterator *
 _efl_canvas_text_range_simple_geometry_get(Eo *eo_obj EINA_UNUSED,
-      Efl_Canvas_Text_Data *o, const Efl_Text_Cursor_Cursor_Data *cur1, const
+      Efl_Canvas_Text_Data *o, const Efl_Text_Cursor_Cursor *cur1, const
       Evas_Textblock_Cursor *cur2)
 {
    Evas_Object_Textblock_Line *ln1, *ln2;
@@ -12255,7 +12255,7 @@ _efl_canvas_text_range_simple_geometry_get(Eo *eo_obj EINA_UNUSED,
 
    if (evas_textblock_cursor_compare(cur1, cur2) > 0)
      {
-        const Efl_Text_Cursor_Cursor_Data *tc;
+        const Efl_Text_Cursor_Cursor *tc;
 
         tc = cur1;
         cur1 = cur2;
@@ -12344,7 +12344,7 @@ _efl_canvas_text_range_simple_geometry_get(Eo *eo_obj EINA_UNUSED,
 
 static Eina_List *
 _efl_canvas_text_range_geometry_list_get(Eo *eo_obj EINA_UNUSED,
-      Efl_Canvas_Text_Data *o, const Efl_Text_Cursor_Cursor_Data *cur1, const
+      Efl_Canvas_Text_Data *o, const Efl_Text_Cursor_Cursor *cur1, const
       Evas_Textblock_Cursor *cur2)
 {
    Evas_Object_Textblock_Line *ln1, *ln2;
@@ -12362,7 +12362,7 @@ _efl_canvas_text_range_geometry_list_get(Eo *eo_obj EINA_UNUSED,
 
    if (evas_textblock_cursor_compare(cur1, cur2) > 0)
      {
-        const Efl_Text_Cursor_Cursor_Data *tc;
+        const Efl_Text_Cursor_Cursor *tc;
 
         tc = cur1;
         cur1 = cur2;
@@ -12420,7 +12420,7 @@ _efl_canvas_text_range_geometry_list_get(Eo *eo_obj EINA_UNUSED,
 }
 
 EAPI Eina_List *
-evas_textblock_cursor_range_geometry_get(const Efl_Text_Cursor_Cursor_Data *cur1, const Evas_Textblock_Cursor *cur2_obj)
+evas_textblock_cursor_range_geometry_get(const Efl_Text_Cursor_Cursor *cur1, const Evas_Textblock_Cursor *cur2_obj)
 {
    Efl_Canvas_Text_Data *o;
 
@@ -12433,7 +12433,7 @@ evas_textblock_cursor_range_geometry_get(const Efl_Text_Cursor_Cursor_Data *cur1
 
 static EOLIAN Eina_Iterator *
 _efl_canvas_text_range_geometry_get(Eo *eo_obj EINA_UNUSED,
-      Efl_Canvas_Text_Data *o, const Efl_Text_Cursor_Cursor_Data *cur1, const
+      Efl_Canvas_Text_Data *o, const Efl_Text_Cursor_Cursor *cur1, const
       Evas_Textblock_Cursor *cur2)
 {
    Eina_List *rects = _efl_canvas_text_range_geometry_list_get(eo_obj,
@@ -12442,7 +12442,7 @@ _efl_canvas_text_range_geometry_get(Eo *eo_obj EINA_UNUSED,
 }
 
 static Eina_Bool
-_evas_textblock_cursor_format_item_geometry_get(const Efl_Text_Cursor_Cursor_Data *cur, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch)
+_evas_textblock_cursor_format_item_geometry_get(const Efl_Text_Cursor_Cursor *cur, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch)
 {
    Evas_Object_Textblock_Line *ln = NULL;
    Evas_Object_Textblock_Format_Item *fi;
@@ -12482,7 +12482,7 @@ EAPI Eina_Bool
 evas_textblock_cursor_eol_get(const Evas_Textblock_Cursor *cur)
 {
    Eina_Bool ret = EINA_FALSE;
-   Efl_Text_Cursor_Cursor_Data cur2;
+   Efl_Text_Cursor_Cursor cur2;
    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);
@@ -12523,8 +12523,8 @@ static void
 _evas_object_textblock_clear(Evas_Object *eo_obj)
 {
    Eina_List *l;
-   Efl_Text_Cursor_Cursor_Data *cur;
-   Efl_Text_Cursor_Cursor_Data *co;
+   Efl_Text_Cursor_Cursor *cur;
+   Efl_Text_Cursor_Cursor *co;
 
    Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
@@ -12904,7 +12904,7 @@ evas_object_textblock_init(Evas_Object *eo_obj)
      }
 
    o = obj->private_data;
-   Efl_Text_Cursor_Cursor_Data *co = o->cursor;
+   Efl_Text_Cursor_Cursor *co = o->cursor;
    co->obj = eo_obj;
    evas_object_textblock_text_markup_set(eo_obj, "");
 
@@ -12954,9 +12954,9 @@ evas_object_textblock_free(Evas_Object *eo_obj)
    free(o->cursor);
    while (o->cursors)
      {
-        Efl_Text_Cursor_Cursor_Data *cur;
+        Efl_Text_Cursor_Cursor *cur;
 
-        cur = (Efl_Text_Cursor_Cursor_Data *)o->cursors->data;
+        cur = (Efl_Text_Cursor_Cursor *)o->cursors->data;
         o->cursors = eina_list_remove_list(o->cursors, o->cursors);
         free(cur);
      }
@@ -14363,7 +14363,7 @@ _efl_canvas_text_efl_canvas_object_paragraph_direction_get(Eo *eo_obj EINA_UNUSE
 }
 
 static int
-_prepend_text_run2(Efl_Text_Cursor_Cursor_Data *cur, const char *s, const char *p)
+_prepend_text_run2(Efl_Text_Cursor_Cursor *cur, const char *s, const char *p)
 {
    if ((s) && (p > s))
      {
@@ -14378,7 +14378,7 @@ _prepend_text_run2(Efl_Text_Cursor_Cursor_Data *cur, const char *s, const char *
 }
 
 static int
-_efl_canvas_text_cursor_text_append(Efl_Text_Cursor_Cursor_Data *cur,
+_efl_canvas_text_cursor_text_append(Efl_Text_Cursor_Cursor *cur,
       const char *text)
 {
    if (!text) return 0;
@@ -14437,7 +14437,7 @@ _efl_canvas_text_efl_text_text_set(Eo *eo_obj, Efl_Canvas_Text_Data *o EINA_UNUS
 static char *
 _canvas_text_get_all(Eo *eo_obj, Efl_Canvas_Text_Data *o EINA_UNUSED)
 {
-   Efl_Text_Cursor_Cursor_Data start, end;
+   Efl_Text_Cursor_Cursor start, end;
 
    _evas_textblock_cursor_init(&start, eo_obj);
    _evas_textblock_cursor_init(&end, eo_obj);
@@ -14526,7 +14526,7 @@ _evas_textblock_annotation_iterator_new(Eina_List *list)
 
 static void
 _textblock_cursor_pos_at_fnode_set(Eo *eo_obj EINA_UNUSED,
-      Efl_Text_Cursor_Cursor_Data *cur,
+      Efl_Text_Cursor_Cursor *cur,
       Evas_Object_Textblock_Node_Format *fnode)
 {
    cur->node = fnode->text_node;
@@ -14536,7 +14536,7 @@ _textblock_cursor_pos_at_fnode_set(Eo *eo_obj EINA_UNUSED,
 static Eina_Bool
 _textblock_annotation_set(Eo *eo_obj EINA_UNUSED, Efl_Canvas_Text_Data *o,
       Efl_Canvas_Text_Annotation *an,
-      Efl_Text_Cursor_Cursor_Data *start, Efl_Text_Cursor_Cursor_Data *end,
+      Efl_Text_Cursor_Cursor *start, Efl_Text_Cursor_Cursor *end,
       const char *format, Eina_Bool is_item)
 {
    int len;
@@ -14591,7 +14591,7 @@ _efl_canvas_text_efl_text_annotate_annotation_set(Eo *eo_obj,
       Efl_Canvas_Text_Data *o, Efl_Canvas_Text_Annotation *annotation,
       const char *format)
 {
-   Efl_Text_Cursor_Cursor_Data start, end;
+   Efl_Text_Cursor_Cursor start, end;
    Eina_Bool ret = EINA_TRUE;
 
    if (!annotation || (annotation->obj != eo_obj))
@@ -14631,7 +14631,7 @@ _evas_textblock_annotation_remove(Efl_Canvas_Text_Data *o,
         if (an->is_item)
           {
              /* Remove the OBJ character along with the cursor. */
-             Efl_Text_Cursor_Cursor_Data cur;
+             Efl_Text_Cursor_Cursor cur;
              _evas_textblock_cursor_init(&cur, an->obj);
              _textblock_cursor_pos_at_fnode_set(an->obj, &cur, an->start_node);
              evas_textblock_cursor_char_delete(&cur);
@@ -14683,7 +14683,7 @@ _efl_canvas_text_efl_text_annotate_annotation_del(Eo *eo_obj EINA_UNUSED,
 
 static Efl_Canvas_Text_Annotation *
 _textblock_annotation_insert(Eo *eo_obj, Efl_Canvas_Text_Data *o,
-      Efl_Text_Cursor_Cursor_Data *start, Efl_Text_Cursor_Cursor_Data *end,
+      Efl_Text_Cursor_Cursor *start, Efl_Text_Cursor_Cursor *end,
       const char *format, Eina_Bool is_item)
 {
    Efl_Canvas_Text_Annotation *ret = NULL;
@@ -14748,7 +14748,7 @@ _textblock_annotation_insert(Eo *eo_obj, Efl_Canvas_Text_Data *o,
 
 EOLIAN static Efl_Canvas_Text_Annotation *
 _efl_canvas_text_efl_text_annotate_annotation_insert(Eo *eo_obj, Efl_Canvas_Text_Data *o,
-      Efl_Text_Cursor_Cursor_Data *start, Efl_Canvas_Text_Cursor *end,
+      Efl_Text_Cursor_Cursor *start, Efl_Text_Cursor_Cursor *end,
       const char *format)
 {
    Efl_Canvas_Text_Annotation *ret;
@@ -14768,7 +14768,7 @@ _efl_canvas_text_efl_text_annotate_range_annotations_get(Eo *eo_obj EINA_UNUSED,
 
    EINA_INLIST_FOREACH(o->annotations, it)
      {
-        Efl_Text_Cursor_Cursor_Data start2, end2;
+        Efl_Text_Cursor_Cursor start2, end2;
         _evas_textblock_cursor_init(&start2, eo_obj);
         _evas_textblock_cursor_init(&end2, eo_obj);
 
@@ -14786,7 +14786,7 @@ _efl_canvas_text_efl_text_annotate_range_annotations_get(Eo *eo_obj EINA_UNUSED,
 }
 
 EOLIAN static Efl_Canvas_Text_Annotation *
-_efl_canvas_text_efl_text_annotate_cursor_object_item_insert(Eo *eo_obj, Efl_Canvas_Text_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor_Data *cur, const char *format)
+_efl_canvas_text_efl_text_annotate_cursor_object_item_insert(Eo *eo_obj, Efl_Canvas_Text_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur, const char *format)
 {
    Efl_Canvas_Text_Annotation *ret =
       _textblock_annotation_insert(cur->obj, o, cur, cur, format, EINA_TRUE);
@@ -14796,7 +14796,7 @@ _efl_canvas_text_efl_text_annotate_cursor_object_item_insert(Eo *eo_obj, Efl_Can
 
 EOLIAN static Efl_Canvas_Text_Annotation *
 _efl_canvas_text_efl_text_annotate_cursor_object_item_annotation_get(Eo *eo_obj EINA_UNUSED,
-      Efl_Canvas_Text_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor_Data *cur)
+      Efl_Canvas_Text_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur)
 {
    Eina_Iterator *it;
    Efl_Canvas_Text_Annotation *data, *ret = NULL;
@@ -14819,7 +14819,7 @@ EOLIAN static Eina_Bool
 _efl_canvas_text_efl_text_annotate_object_item_geometry_get(Eo *eo_obj, Efl_Canvas_Text_Data *o EINA_UNUSED,
       const Efl_Canvas_Text_Annotation *an, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch)
 {
-   Efl_Text_Cursor_Cursor_Data cur;
+   Efl_Text_Cursor_Cursor cur;
 
    Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
@@ -14834,7 +14834,7 @@ EOLIAN static void
 _efl_canvas_text_efl_text_annotate_annotation_positions_get(Eo *eo_obj,
       Efl_Canvas_Text_Data *o EINA_UNUSED,
       const Efl_Canvas_Text_Annotation *annotation,
-      Efl_Text_Cursor_Cursor_Data *start, Efl_Canvas_Text_Cursor *end)
+      Efl_Text_Cursor_Cursor *start, Efl_Text_Cursor_Cursor *end)
 {
    _textblock_cursor_pos_at_fnode_set(eo_obj, start, annotation->start_node);
    _textblock_cursor_pos_at_fnode_set(eo_obj, end, annotation->end_node);
@@ -15675,7 +15675,7 @@ ppar(Evas_Object_Textblock_Paragraph *par)
 #define EFL_CANVAS_TEXT_EXTRA_OPS \
    EFL_OBJECT_OP_FUNC(efl_dbg_info_get, _efl_canvas_text_efl_object_dbg_info_get)
 
-EOLIAN static Efl_Text_Cursor_Cursor_Data *
+EOLIAN static Efl_Text_Cursor_Cursor *
 _efl_canvas_text_efl_text_cursor_cursor_get(Eo *eo_obj EINA_UNUSED, Efl_Canvas_Text_Data *o, Efl_Text_Cursor_Cursor_Get_Type get_type)
 {
    if (get_type > EFL_TEXT_CURSOR_GET_MAIN)
@@ -15685,20 +15685,20 @@ _efl_canvas_text_efl_text_cursor_cursor_get(Eo *eo_obj EINA_UNUSED, Efl_Canvas_T
    return o->cursor;
 }
 
-EAPI Efl_Text_Cursor_Cursor_Data *
+EAPI Efl_Text_Cursor_Cursor *
 evas_object_textblock_cursor_get(const Evas_Object *eo_obj EINA_UNUSED)
 {
    return efl_text_cursor_get(eo_obj, EFL_TEXT_CURSOR_GET_MAIN);
 }
 
-EOLIAN static Efl_Text_Cursor_Cursor_Data *
+EOLIAN static Efl_Text_Cursor_Cursor *
 _efl_canvas_text_efl_text_cursor_cursor_new(Eo *eo_obj EINA_UNUSED, Efl_Canvas_Text_Data *o)
 {
-   Efl_Text_Cursor_Cursor_Data *cur;
+   Efl_Text_Cursor_Cursor *cur;
    Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    evas_object_async_block(obj);
 
-   cur = calloc(1, sizeof(Efl_Text_Cursor_Cursor_Data));
+   cur = calloc(1, sizeof(Efl_Text_Cursor_Cursor));
    if (!cur) return NULL;
    _evas_textblock_cursor_init(cur, eo_obj);
 
@@ -15708,7 +15708,7 @@ _efl_canvas_text_efl_text_cursor_cursor_new(Eo *eo_obj EINA_UNUSED, Efl_Canvas_T
 
 EOLIAN static void
 _efl_canvas_text_efl_text_cursor_cursor_free(Eo *eo_obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED,
-      Efl_Text_Cursor_Cursor_Data *cur)
+      Efl_Text_Cursor_Cursor *cur)
 {
    evas_textblock_cursor_free(cur);
 }
diff --git a/src/lib/evas/canvas/evas_textblock_legacy.h b/src/lib/evas/canvas/evas_textblock_legacy.h
index 664a2a7a74..f55691d48b 100644
--- a/src/lib/evas/canvas/evas_textblock_legacy.h
+++ b/src/lib/evas/canvas/evas_textblock_legacy.h
@@ -146,8 +146,7 @@ typedef struct _Efl_Canvas_Text_Style             Evas_Textblock_Style;
  * @see evas_object_textblock_cursor_new
  *
  */
-typedef struct _Efl_Text_Cursor_Cursor_Data       Evas_Textblock_Cursor;
-typedef struct _Efl_Text_Cursor_Cursor_Data       Efl_Canvas_Text_Cursor;
+typedef struct _Efl_Text_Cursor_Cursor       Evas_Textblock_Cursor;
 
 /**
  * @typedef Evas_Object_Textblock_Node_Format
@@ -584,8 +583,6 @@ EAPI Eina_Bool                                evas_textblock_cursor_eol_get(cons
  * @brief Advances the cursor one char backwards.
  *
  * @return @c true on success, @c false otherwise.
- *
- * @ingroup Efl_Canvas_Text_Cursor
  */
 EAPI Eina_Bool evas_textblock_cursor_char_prev(Evas_Textblock_Cursor *obj);
 
@@ -850,8 +847,6 @@ EAPI Evas_Textblock_Cursor *evas_object_textblock_cursor_new(const Evas_Object *
  * @param[in] y y coord to set by.
  *
  * @return @c true on success, @c false otherwise.
- *
- * @ingroup Efl_Canvas_Text_Cursor
  */
 EAPI Eina_Bool evas_textblock_cursor_char_coord_set(Evas_Textblock_Cursor *obj, Evas_Coord x, Evas_Coord y);
 
@@ -970,10 +965,8 @@ EAPI int evas_textblock_cursor_compare(const Evas_Textblock_Cursor *cur1, const
  * @return @c true if equal
  *
  * @since 1.18
- *
- * @ingroup Efl_Canvas_Text_Cursor
  */
-EAPI Eina_Bool evas_textblock_cursor_equal(const Efl_Canvas_Text_Cursor *obj, const Efl_Canvas_Text_Cursor *cur);
+EAPI Eina_Bool evas_textblock_cursor_equal(const Evas_Textblock_Cursor *obj, const Evas_Textblock_Cursor *cur);
 
 /**
  * Go to the start of the current line
diff --git a/src/tests/evas/evas_test_textblock.c b/src/tests/evas/evas_test_textblock.c
index 827cda8569..50ce8b54d7 100644
--- a/src/tests/evas/evas_test_textblock.c
+++ b/src/tests/evas/evas_test_textblock.c
@@ -4157,7 +4157,7 @@ _test_check_annotation(Evas_Object *tb,
       size_t len, const char **formats)
 {
    Efl_Canvas_Text_Annotation *an;
-   Efl_Canvas_Text_Cursor *start, *end;
+   Efl_Text_Cursor_Cursor *start, *end;
 
    start = evas_object_textblock_cursor_new(tb);
    end = evas_object_textblock_cursor_new(tb);
@@ -4197,7 +4197,7 @@ START_TEST(evas_textblock_annotation)
 {
    START_TB_TEST();
    Efl_Canvas_Text_Annotation *an, *an2;
-   Efl_Canvas_Text_Cursor *start, *end;
+   Efl_Text_Cursor_Cursor *start, *end;
 
    start = evas_object_textblock_cursor_new(tb);
    end   = evas_object_textblock_cursor_new(tb);