diff --git a/src/lib/efl/interfaces/efl_text_types.eot b/src/lib/efl/interfaces/efl_text_types.eot
index d32ab8d2d3..956a8085c1 100644
--- a/src/lib/efl/interfaces/efl_text_types.eot
+++ b/src/lib/efl/interfaces/efl_text_types.eot
@@ -21,10 +21,3 @@ struct @beta Efl.Text_Change_Info {
    insertion: bool; [[$true if the content was inserted, $false if removed]]
    mergeable: bool; [[$true if can be merged with the previous one. Used for example with insertion when something is already selected]]
 }
-
-struct @beta Efl.Text_Range {
-   [[This structure includes text position range (from/to).
-   ]]
-   start: int; [[The start postion.]]
-   end: int; [[The end position.]]
-}
diff --git a/src/lib/elementary/efl_text_interactive.eo b/src/lib/elementary/efl_text_interactive.eo
index 933aad0cb1..f090648bf3 100644
--- a/src/lib/elementary/efl_text_interactive.eo
+++ b/src/lib/elementary/efl_text_interactive.eo
@@ -75,7 +75,7 @@ interface @beta Efl.Text_Interactive extends Efl.Text, Efl.Text_Font_Properties,
                                event but only the last one will emit a @[.changed,user] event.
                              ]]
       have_selection,changed: bool; [[Emitted when the @.have_selection property value changes.]]
-      selection,changed: Efl.Text_Range; [[Emitted when selection has changed. Query using @.selection_cursors.]]
+      selection,changed: Eina.Range; [[Emitted when selection has changed. Query using @.selection_cursors.]]
       redo,request: void; [[Emitted when a redo operation is requested.]]
       undo,request: void; [[Emitted when a undo operation is requested.]]
       changed,user: Efl.Text_Change_Info; [[Emitted when the text content has changed due to user interaction.]]
diff --git a/src/lib/elementary/efl_ui_internal_text_interactive.c b/src/lib/elementary/efl_ui_internal_text_interactive.c
index 8c39ed6287..dd9f8a41f8 100644
--- a/src/lib/elementary/efl_ui_internal_text_interactive.c
+++ b/src/lib/elementary/efl_ui_internal_text_interactive.c
@@ -796,9 +796,8 @@ _emit_sel_state( Eo *o, Efl_Ui_Internal_Text_Interactive_Data *en)
      }
    else
      {
-        Efl_Text_Range range = {0};
-        range.start = efl_text_cursor_position_get(en->sel_start);
-        range.end = efl_text_cursor_position_get(en->sel_end);
+        Eina_Range range = eina_range_from_to(efl_text_cursor_position_get(en->sel_start),
+                                              efl_text_cursor_position_get(en->sel_end));
         efl_event_callback_call(o, EFL_TEXT_INTERACTIVE_EVENT_SELECTION_CHANGED, &range);
      }
 }
diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c
index 826e2e0c91..ab1f11544b 100644
--- a/src/lib/elementary/elm_entry.c
+++ b/src/lib/elementary/elm_entry.c
@@ -2384,10 +2384,8 @@ _entry_selection_changed_signal_cb(void *data,
 
    if (!sd) return;
    sd->have_selection = EINA_TRUE;
-   Efl_Text_Range range = {0};
    //FIXME how to get selection range in legacy !?
-   range.start = 0;
-   range.end = 0;
+   Eina_Range range = EINA_RANGE_EMPTY();
    efl_event_callback_legacy_call
      (data, EFL_TEXT_INTERACTIVE_EVENT_SELECTION_CHANGED, &range);
    // XXX: still try primary selection even if on wl in case it's