elm: rename Elm.Interface.Atspi.Text => Efl.Access.Text

Reviewers: cedric, jpeg

Differential Revision: https://phab.enlightenment.org/D5167

15 files changed, 294 insertions, 296 deletions

diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am
index e6a079555b..269b7104dc 100644
--- a/src/Makefile_Elementary.am
+++ b/src/Makefile_Elementary.am
@@ -31,10 +31,10 @@ elm_public_eolian_files = \
 	lib/elementary/elm_interface_atspi_accessible.eo \
 	lib/elementary/efl_access_action.eo \
 	lib/elementary/efl_access_component.eo \
-	lib/elementary/elm_interface_atspi_text_editable.eo \
+	lib/elementary/efl_access_editable_text.eo \
 	lib/elementary/efl_access_image.eo \
 	lib/elementary/efl_access_selection.eo \
-	lib/elementary/elm_interface_atspi_text.eo \
+	lib/elementary/efl_access_text.eo \
 	lib/elementary/efl_access_value.eo \
 	lib/elementary/elm_interface_atspi_widget_action.eo \
 	lib/elementary/efl_access_window.eo \
@@ -224,7 +224,7 @@ includesunstable_HEADERS = \
 	lib/elementary/elm_gen_common.h \
 	lib/elementary/elm_atspi_bridge.h \
 	lib/elementary/elm_interface_atspi_accessible.h \
-	lib/elementary/elm_interface_atspi_text.h \
+	lib/elementary/efl_access_text.h \
 	lib/elementary/elm_interface_atspi_widget_action.h \
 	lib/elementary/efl_access_window.h \
 	lib/elementary/elm_interface_fileselector.h \
@@ -618,10 +618,10 @@ lib_elementary_libelementary_la_SOURCES = \
 	lib/elementary/elm_interface_atspi_accessible.c \
 	lib/elementary/efl_access_action.c \
 	lib/elementary/efl_access_component.c \
-	lib/elementary/elm_interface_atspi_text_editable.c \
+	lib/elementary/efl_access_editable_text.c \
 	lib/elementary/efl_access_image.c \
 	lib/elementary/efl_access_selection.c \
-	lib/elementary/elm_interface_atspi_text.c \
+	lib/elementary/efl_access_text.c \
 	lib/elementary/efl_access_value.c \
 	lib/elementary/elm_interface_atspi_widget_action.c \
 	lib/elementary/efl_access_window.c \
diff --git a/src/lib/elementary/elm_interface_atspi_text_editable.c b/src/lib/elementary/efl_access_editable_text.c
index 6f7ec68075..bd03d6613e 100644
--- a/src/lib/elementary/elm_interface_atspi_text_editable.c
+++ b/src/lib/elementary/efl_access_editable_text.c
@@ -2,10 +2,10 @@
   #include "elementary_config.h"
 #endif
 
-#define ELM_INTERFACE_ATSPI_TEXT_EDITABLE_PROTECTED
+#define EFL_ACCESS_EDITABLE_TEXT_PROTECTED
 
 #include <Elementary.h>
 #include "elm_widget.h"
 #include "elm_priv.h"
 
-#include "elm_interface_atspi_text_editable.eo.c"
+#include "efl_access_editable_text.eo.c"
diff --git a/src/lib/elementary/elm_interface_atspi_text_editable.eo b/src/lib/elementary/efl_access_editable_text.eo
index 7bed45bee7..21c823b3f0 100644
--- a/src/lib/elementary/elm_interface_atspi_text_editable.eo
+++ b/src/lib/elementary/efl_access_editable_text.eo
@@ -1,7 +1,6 @@
-interface Elm.Interface.Atspi.Text.Editable ()
+interface Efl.Access.Editable.Text ()
 {
-   [[Elementary AT-SPI text editable interface]]
-   eo_prefix: elm_interface_atspi_text_editable;
+   [[Elementary editable text interface]]
    methods {
       @property content @protected {
          [[Editable content property]]
diff --git a/src/lib/elementary/elm_interface_atspi_text.c b/src/lib/elementary/efl_access_text.c
index 792d27c4c8..5f3f339f60 100644
--- a/src/lib/elementary/elm_interface_atspi_text.c
+++ b/src/lib/elementary/efl_access_text.c
@@ -2,14 +2,14 @@
   #include "elementary_config.h"
 #endif
 
-#define ELM_INTERFACE_ATSPI_TEXT_PROTECTED
+#define EFL_ACCESS_TEXT_PROTECTED
 
 #include <Elementary.h>
 #include "elm_widget.h"
 #include "elm_priv.h"
 
 void
-EAPI elm_atspi_text_text_attribute_free(Elm_Atspi_Text_Attribute *attr)
+EAPI elm_atspi_text_text_attribute_free(Efl_Access_Text_Attribute *attr)
 {
    if (!attr) return;
    if (attr->name) eina_stringshare_del(attr->name);
@@ -17,4 +17,4 @@ EAPI elm_atspi_text_text_attribute_free(Elm_Atspi_Text_Attribute *attr)
    free(attr);
 }
 
-#include "elm_interface_atspi_text.eo.c"
+#include "efl_access_text.eo.c"
diff --git a/src/lib/elementary/elm_interface_atspi_text.eo b/src/lib/elementary/efl_access_text.eo
index 3cd2ddcaaa..871cb68fc2 100644
--- a/src/lib/elementary/elm_interface_atspi_text.eo
+++ b/src/lib/elementary/efl_access_text.eo
@@ -1,6 +1,6 @@
 import eina_types;
 
-enum Elm.Atspi_Text.Granularity
+enum Efl.Access.Text.Granularity
 {
    [[Text accessibility granularity]]
    char, [[Character granularity]]
@@ -10,7 +10,7 @@ enum Elm.Atspi_Text.Granularity
    paragraph [[Paragraph granularity]]
 }
 
-enum Elm.Atspi_Text.Clip_Type
+enum Efl.Access.Text.Clip_Type
 {
    [[Text clip type]]
    legacy: elm_atspi_text_clip;
@@ -20,14 +20,14 @@ enum Elm.Atspi_Text.Clip_Type
    both [[Both clip types]]
 }
 
-struct Elm.Atspi_Text.Attribute
+struct Efl.Access.Text.Attribute
 {
    [[Text attribute]]
    name:  string; [[Text attribute name]]
    value: string; [[Text attribute value]]
 }
 
-struct Elm.Atspi_Text.Range
+struct Efl.Access.Text.Range
 {
    [[Text range]]
    start_offset: int; [[Range start offset]]
@@ -35,7 +35,7 @@ struct Elm.Atspi_Text.Range
    content: ptr(char); [[Range content]]
 }
 
-struct Elm.Atspi_Text.Change_Info
+struct Efl.Access.Text.Change_Info
 {
    [[Text change information]]
    content: string; [[Change content]]
@@ -44,10 +44,9 @@ struct Elm.Atspi_Text.Change_Info
    len: size; [[Change length]]
 }
 
-interface Elm.Interface.Atspi.Text ()
+interface Efl.Access.Text ()
 {
-   [[Elementary AT-SPI text interface]]
-   eo_prefix: elm_interface_atspi_text;
+   [[Elementary accessible text interface]]
    methods {
       @property character @protected {
          get {
@@ -65,7 +64,7 @@ interface Elm.Interface.Atspi.Text ()
             [[Gets string, start and end offset in text according to given initial offset and granularity.]]
          }
          keys {
-            granularity: Elm.Atspi_Text.Granularity; [[Text granularity]]
+            granularity: Efl.Access.Text.Granularity; [[Text granularity]]
             start_offset: ptr(int) @nonull; [[Offset indicating start of string according to given granularity.  -1 in case of error.]]
             end_offset: ptr(int); [[Offset indicating end of string according to given granularity. -1 in case of error.]]
          }
@@ -120,7 +119,7 @@ interface Elm.Interface.Atspi.Text ()
             end_offset: ptr(int); [[End offset]]
          }
          values {
-            attributes: list<ptr(Elm.Atspi_Text.Attribute) @owned> @owned; [[List of text attributes]]
+            attributes: list<ptr(Efl.Access.Text.Attribute) @owned> @owned; [[List of text attributes]]
          }
       }
       @property default_attributes @protected {
@@ -128,7 +127,7 @@ interface Elm.Interface.Atspi.Text ()
          get {
          }
          values {
-            attributes: list<ptr(Elm.Atspi_Text.Attribute) @owned> @owned; [[List of default attributes]]
+            attributes: list<ptr(Efl.Access.Text.Attribute) @owned> @owned; [[List of default attributes]]
          }
       }
       @property character_extents @protected {
@@ -172,11 +171,11 @@ interface Elm.Interface.Atspi.Text ()
          keys {
             screen_coords: bool; [[If $true, x and y values will be relative to screen origin, otherwise relative to canvas]]
             rect: Eina.Rect; [[Bounding box]]
-            xclip: Elm.Atspi_Text.Clip_Type; [[AT-SPI xclip]]
-            yclip: Elm.Atspi_Text.Clip_Type; [[AT-SPI yclip]]
+            xclip: Efl.Access.Text.Clip_Type; [[xclip]]
+            yclip: Efl.Access.Text.Clip_Type; [[yclip]]
          }
          values {
-            ranges: list<ptr(Elm.Atspi_Text.Range) @owned> @owned; [[List of ranges]]
+            ranges: list<ptr(Efl.Access.Text.Range) @owned> @owned; [[List of ranges]]
          }
       }
       @property range_extents @protected {
diff --git a/src/lib/elementary/efl_access_text.h b/src/lib/elementary/efl_access_text.h
new file mode 100644
index 0000000000..edbb6e10f9
--- /dev/null
+++ b/src/lib/elementary/efl_access_text.h
@@ -0,0 +1,19 @@
+#ifndef ELM_INTERFACE_ATSPI_TEXT_H
+#define ELM_INTERFACE_ATSPI_TEXT_H
+
+#ifdef EFL_BETA_API_SUPPORT
+
+#ifdef EFL_EO_API_SUPPORT
+#include "efl_access_text.eo.h"
+#endif
+#ifndef EFL_NOLEGACY_API_SUPPORT
+#include "efl_access_text.eo.legacy.h"
+#endif
+
+/**
+ * @brief Free Efl_Access_Text_Attribute structure
+ */
+EAPI void elm_atspi_text_text_attribute_free(Efl_Access_Text_Attribute *attr);
+
+#endif
+#endif
diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c
index 8e94762da8..77b022a5d7 100644
--- a/src/lib/elementary/efl_ui_text.c
+++ b/src/lib/elementary/efl_ui_text.c
@@ -3,8 +3,8 @@
 #endif
 
 #define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
-#define ELM_INTERFACE_ATSPI_TEXT_PROTECTED
-#define ELM_INTERFACE_ATSPI_TEXT_EDITABLE_PROTECTED
+#define EFL_ACCESS_TEXT_PROTECTED
+#define EFL_ACCESS_EDITABLE_TEXT_PROTECTED
 #define ELM_LAYOUT_PROTECTED
 
 #include <Elementary.h>
@@ -2190,20 +2190,20 @@ _entry_changed_user_signal_cb(void *data,
      }
    if (_elm_config->atspi_mode)
      {
-        Elm_Atspi_Text_Change_Info atspi_info;
+        Efl_Access_Text_Change_Info atspi_info;
         if (edje_info && edje_info->insert)
           {
              atspi_info.content = edje_info->change.insert.content;
              atspi_info.pos = edje_info->change.insert.pos;
              atspi_info.len = edje_info->change.insert.plain_length;
-             elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, data, ELM_INTERFACE_ATSPI_TEXT_EVENT_ACCESS_TEXT_INSERTED, &atspi_info);
+             elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_INSERTED, &atspi_info);
           }
         else if (edje_info && !edje_info->insert)
           {
              atspi_info.content = edje_info->change.del.content;
              atspi_info.pos = MIN(edje_info->change.del.start, edje_info->change.del.end);
              atspi_info.len = MAX(edje_info->change.del.start, edje_info->change.del.end) - atspi_info.pos;
-             elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, data, ELM_INTERFACE_ATSPI_TEXT_EVENT_ACCESS_TEXT_REMOVED, &atspi_info);
+             elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_REMOVED, &atspi_info);
           }
      }
 }
@@ -2258,7 +2258,7 @@ _entry_cursor_changed_signal_cb(void *data,
    _decoration_defer(obj);
 
    if (_elm_config->atspi_mode)
-     elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, data, ELM_INTERFACE_ATSPI_TEXT_EVENT_ACCESS_TEXT_CARET_MOVED, NULL);
+     elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_CARET_MOVED, NULL);
 }
 
 static void
@@ -2270,7 +2270,7 @@ _entry_cursor_changed_manual_signal_cb(void *data,
    efl_event_callback_legacy_call
      (data, EFL_UI_TEXT_EVENT_CURSOR_CHANGED_MANUAL, NULL);
    if (_elm_config->atspi_mode)
-     elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, data, ELM_INTERFACE_ATSPI_TEXT_EVENT_ACCESS_TEXT_CARET_MOVED, NULL);
+     elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_CARET_MOVED, NULL);
 }
 
 static void
@@ -4089,7 +4089,7 @@ _efl_ui_text_class_constructor(Efl_Class *klass)
 // ATSPI Accessibility
 
 EOLIAN static Eina_Unicode
-_efl_ui_text_elm_interface_atspi_text_character_get(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED, int offset)
+_efl_ui_text_efl_access_text_character_get(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED, int offset)
 {
    const char *txt;
    int idx = 0;
@@ -4108,7 +4108,7 @@ _efl_ui_text_elm_interface_atspi_text_character_get(Eo *obj, Efl_Ui_Text_Data *_
 }
 
 EOLIAN static int
-_efl_ui_text_elm_interface_atspi_text_character_count_get(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED)
+_efl_ui_text_efl_access_text_character_count_get(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED)
 {
    const char *txt;
 
@@ -4118,7 +4118,7 @@ _efl_ui_text_elm_interface_atspi_text_character_count_get(Eo *obj, Efl_Ui_Text_D
 }
 
 EOLIAN static char*
-_efl_ui_text_elm_interface_atspi_text_string_get(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *pd, Elm_Atspi_Text_Granularity granularity, int *start_offset, int *end_offset)
+_efl_ui_text_efl_access_text_string_get(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *pd, Efl_Access_Text_Granularity granularity, int *start_offset, int *end_offset)
 {
    Evas_Textblock_Cursor *cur = NULL, *cur2 = NULL;
    char *ret = NULL;
@@ -4133,18 +4133,18 @@ _efl_ui_text_elm_interface_atspi_text_string_get(Eo *obj EINA_UNUSED, Efl_Ui_Tex
 
    switch (granularity)
      {
-      case ELM_ATSPI_TEXT_GRANULARITY_CHAR:
+      case EFL_ACCESS_TEXT_GRANULARITY_CHAR:
          break;
-      case ELM_ATSPI_TEXT_GRANULARITY_WORD:
+      case EFL_ACCESS_TEXT_GRANULARITY_WORD:
          evas_textblock_cursor_word_start(cur);
          break;
-      case ELM_ATSPI_TEXT_GRANULARITY_SENTENCE:
+      case EFL_ACCESS_TEXT_GRANULARITY_SENTENCE:
          // TODO - add sentence support in textblock first
          break;
-      case ELM_ATSPI_TEXT_GRANULARITY_LINE:
+      case EFL_ACCESS_TEXT_GRANULARITY_LINE:
          evas_textblock_cursor_line_char_first(cur);
          break;
-      case ELM_ATSPI_TEXT_GRANULARITY_PARAGRAPH:
+      case EFL_ACCESS_TEXT_GRANULARITY_PARAGRAPH:
          evas_textblock_cursor_paragraph_char_first(cur);
          break;
      }
@@ -4154,23 +4154,23 @@ _efl_ui_text_elm_interface_atspi_text_string_get(Eo *obj EINA_UNUSED, Efl_Ui_Tex
 
    switch (granularity)
      {
-      case ELM_ATSPI_TEXT_GRANULARITY_CHAR:
+      case EFL_ACCESS_TEXT_GRANULARITY_CHAR:
          evas_textblock_cursor_char_next(cur2);
          break;
-      case ELM_ATSPI_TEXT_GRANULARITY_WORD:
+      case EFL_ACCESS_TEXT_GRANULARITY_WORD:
          evas_textblock_cursor_word_end(cur2);
          // since word_end sets cursor position ON (before) last
          // char of word, we need to manually advance cursor to get
          // proper string from function range_text_get
          evas_textblock_cursor_char_next(cur2);
          break;
-      case ELM_ATSPI_TEXT_GRANULARITY_SENTENCE:
+      case EFL_ACCESS_TEXT_GRANULARITY_SENTENCE:
          // TODO - add sentence support in textblock first
          break;
-      case ELM_ATSPI_TEXT_GRANULARITY_LINE:
+      case EFL_ACCESS_TEXT_GRANULARITY_LINE:
          evas_textblock_cursor_line_char_last(cur2);
          break;
-      case ELM_ATSPI_TEXT_GRANULARITY_PARAGRAPH:
+      case EFL_ACCESS_TEXT_GRANULARITY_PARAGRAPH:
          evas_textblock_cursor_paragraph_char_last(cur2);
          break;
      }
@@ -4200,7 +4200,7 @@ fail:
 }
 
 EOLIAN static char*
-_efl_ui_text_elm_interface_atspi_text_text_get(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *pd EINA_UNUSED, int start_offset, int end_offset)
+_efl_ui_text_efl_access_text_text_get(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *pd EINA_UNUSED, int start_offset, int end_offset)
 {
    Evas_Textblock_Cursor *cur = NULL, *cur2 = NULL;
    char *ret = NULL;
@@ -4237,26 +4237,26 @@ fail:
 }
 
 EOLIAN static int
-_efl_ui_text_elm_interface_atspi_text_caret_offset_get(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED)
+_efl_ui_text_efl_access_text_caret_offset_get(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED)
 {
    return efl_text_cursor_position_get(obj, efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_MAIN));
 }
 
 EOLIAN static Eina_Bool
-_efl_ui_text_elm_interface_atspi_text_caret_offset_set(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED, int offset)
+_efl_ui_text_efl_access_text_caret_offset_set(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED, int offset)
 {
    efl_text_cursor_position_set(obj, efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_MAIN), offset);
    return EINA_TRUE;
 }
 
 EOLIAN static int
-_efl_ui_text_elm_interface_atspi_text_selections_count_get(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED)
+_efl_ui_text_efl_access_text_selections_count_get(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED)
 {
    return _efl_ui_text_selection_get(obj, _pd) ? 1 : 0;
 }
 
 EOLIAN static void
-_efl_ui_text_elm_interface_atspi_text_selection_get(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED, int selection_number, int *start_offset, int *end_offset)
+_efl_ui_text_efl_access_text_selection_get(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED, int selection_number, int *start_offset, int *end_offset)
 {
    if (selection_number != 0) return;
 
@@ -4264,7 +4264,7 @@ _efl_ui_text_elm_interface_atspi_text_selection_get(Eo *obj, Efl_Ui_Text_Data *_
 }
 
 EOLIAN static Eina_Bool
-_efl_ui_text_elm_interface_atspi_text_selection_set(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED, int selection_number, int start_offset, int end_offset)
+_efl_ui_text_efl_access_text_selection_set(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED, int selection_number, int start_offset, int end_offset)
 {
    if (selection_number != 0) return EINA_FALSE;
 
@@ -4274,7 +4274,7 @@ _efl_ui_text_elm_interface_atspi_text_selection_set(Eo *obj, Efl_Ui_Text_Data *_
 }
 
 EOLIAN static Eina_Bool
-_efl_ui_text_elm_interface_atspi_text_selection_remove(Eo *obj, Efl_Ui_Text_Data *pd EINA_UNUSED, int selection_number)
+_efl_ui_text_efl_access_text_selection_remove(Eo *obj, Efl_Ui_Text_Data *pd EINA_UNUSED, int selection_number)
 {
    if (selection_number != 0) return EINA_FALSE;
    _efl_ui_text_select_none(obj, pd);
@@ -4282,7 +4282,7 @@ _efl_ui_text_elm_interface_atspi_text_selection_remove(Eo *obj, Efl_Ui_Text_Data
 }
 
 EOLIAN static Eina_Bool
-_efl_ui_text_elm_interface_atspi_text_selection_add(Eo *obj, Efl_Ui_Text_Data *pd EINA_UNUSED, int start_offset, int end_offset)
+_efl_ui_text_efl_access_text_selection_add(Eo *obj, Efl_Ui_Text_Data *pd EINA_UNUSED, int start_offset, int end_offset)
 {
    _efl_ui_text_select_region_set(obj, pd, start_offset, end_offset);
 
@@ -4290,13 +4290,13 @@ _efl_ui_text_elm_interface_atspi_text_selection_add(Eo *obj, Efl_Ui_Text_Data *p
 }
 
 EOLIAN static Eina_List*
-_efl_ui_text_elm_interface_atspi_text_bounded_ranges_get(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *_pd EINA_UNUSED, Eina_Bool screen_coods EINA_UNUSED, Eina_Rect rect EINA_UNUSED, Elm_Atspi_Text_Clip_Type xclip EINA_UNUSED, Elm_Atspi_Text_Clip_Type yclip EINA_UNUSED)
+_efl_ui_text_efl_access_text_bounded_ranges_get(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *_pd EINA_UNUSED, Eina_Bool screen_coods EINA_UNUSED, Eina_Rect rect EINA_UNUSED, Efl_Access_Text_Clip_Type xclip EINA_UNUSED, Efl_Access_Text_Clip_Type yclip EINA_UNUSED)
 {
    return NULL;
 }
 
 EOLIAN static int
-_efl_ui_text_elm_interface_atspi_text_offset_at_point_get(Eo *obj, Efl_Ui_Text_Data *pd EINA_UNUSED, Eina_Bool screen_coods, int x, int y)
+_efl_ui_text_efl_access_text_offset_at_point_get(Eo *obj, Efl_Ui_Text_Data *pd EINA_UNUSED, Eina_Bool screen_coods, int x, int y)
 {
    Evas_Textblock_Cursor *cur;
    int ret;
@@ -4329,7 +4329,7 @@ _efl_ui_text_elm_interface_atspi_text_offset_at_point_get(Eo *obj, Efl_Ui_Text_D
 }
 
 EOLIAN static Eina_Bool
-_efl_ui_text_elm_interface_atspi_text_character_extents_get(Eo *obj, Efl_Ui_Text_Data *pd EINA_UNUSED, int offset, Eina_Bool screen_coods, Eina_Rect *rect)
+_efl_ui_text_efl_access_text_character_extents_get(Eo *obj, Efl_Ui_Text_Data *pd EINA_UNUSED, int offset, Eina_Bool screen_coods, Eina_Rect *rect)
 {
    Evas_Textblock_Cursor *cur;
    int ret;
@@ -4360,7 +4360,7 @@ _efl_ui_text_elm_interface_atspi_text_character_extents_get(Eo *obj, Efl_Ui_Text
 }
 
 EOLIAN static Eina_Bool
-_efl_ui_text_elm_interface_atspi_text_range_extents_get(Eo *obj, Efl_Ui_Text_Data *pd EINA_UNUSED, Eina_Bool screen_coods, int start_offset, int end_offset, Eina_Rect *rect)
+_efl_ui_text_efl_access_text_range_extents_get(Eo *obj, Efl_Ui_Text_Data *pd EINA_UNUSED, Eina_Bool screen_coods, int start_offset, int end_offset, Eina_Rect *rect)
 {
    Evas_Textblock_Cursor *cur1, *cur2;
    int ret;
@@ -4407,17 +4407,17 @@ _efl_ui_text_elm_interface_atspi_text_range_extents_get(Eo *obj, Efl_Ui_Text_Dat
    return EINA_TRUE;
 }
 
-static Elm_Atspi_Text_Attribute*
+static Efl_Access_Text_Attribute*
 _textblock_node_format_to_atspi_text_attr(Eo *obj,
       Efl_Text_Annotate_Annotation *annotation)
 {
-   Elm_Atspi_Text_Attribute *ret;
+   Efl_Access_Text_Attribute *ret;
    const char *txt;
 
    txt = efl_text_annotation_get(obj, annotation);
    if (!txt) return NULL;
 
-   ret = calloc(1, sizeof(Elm_Atspi_Text_Attribute));
+   ret = calloc(1, sizeof(Efl_Access_Text_Attribute));
    if (!ret) return NULL;
 
    ret->value = eina_stringshare_add(txt);
@@ -4428,10 +4428,10 @@ _textblock_node_format_to_atspi_text_attr(Eo *obj,
 }
 
 EOLIAN static Eina_Bool
-_efl_ui_text_elm_interface_atspi_text_attribute_get(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED, const char *attr_name EINA_UNUSED, int *start_offset, int *end_offset, char **value)
+_efl_ui_text_efl_access_text_attribute_get(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED, const char *attr_name EINA_UNUSED, int *start_offset, int *end_offset, char **value)
 {
    Evas_Textblock_Cursor *cur1, *cur2;
-   Elm_Atspi_Text_Attribute *attr;
+   Efl_Access_Text_Attribute *attr;
    Eina_Iterator *annotations;
    Efl_Text_Annotate_Annotation *an;
 
@@ -4473,11 +4473,11 @@ _efl_ui_text_elm_interface_atspi_text_attribute_get(Eo *obj, Efl_Ui_Text_Data *_
 }
 
 EOLIAN static Eina_List*
-_efl_ui_text_elm_interface_atspi_text_attributes_get(Eo *obj, Efl_Ui_Text_Data *pd EINA_UNUSED, int *start_offset, int *end_offset)
+_efl_ui_text_efl_access_text_attributes_get(Eo *obj, Efl_Ui_Text_Data *pd EINA_UNUSED, int *start_offset, int *end_offset)
 {
    Evas_Textblock_Cursor *cur1, *cur2;
    Eina_List *ret = NULL;
-   Elm_Atspi_Text_Attribute *attr;
+   Efl_Access_Text_Attribute *attr;
    Eina_Iterator *annotations;
    Efl_Text_Annotate_Annotation *an;
 
@@ -4513,10 +4513,10 @@ _efl_ui_text_elm_interface_atspi_text_attributes_get(Eo *obj, Efl_Ui_Text_Data *
 }
 
 EOLIAN static Eina_List*
-_efl_ui_text_elm_interface_atspi_text_default_attributes_get(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED)
+_efl_ui_text_efl_access_text_default_attributes_get(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED)
 {
    Eina_List *ret = NULL;
-   Elm_Atspi_Text_Attribute *attr;
+   Efl_Access_Text_Attribute *attr;
    Efl_Text_Cursor_Cursor *start, *end;
    Eina_Iterator *annotations;
    Efl_Text_Annotate_Annotation *an;
@@ -4542,14 +4542,14 @@ _efl_ui_text_elm_interface_atspi_text_default_attributes_get(Eo *obj, Efl_Ui_Tex
 }
 
 EOLIAN static Eina_Bool
-_efl_ui_text_elm_interface_atspi_text_editable_content_set(Eo *obj, Efl_Ui_Text_Data *pd EINA_UNUSED, const char *content)
+_efl_ui_text_efl_access_editable_text_content_set(Eo *obj, Efl_Ui_Text_Data *pd EINA_UNUSED, const char *content)
 {
    efl_text_set(obj, content);
    return EINA_TRUE;
 }
 
 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_ui_text_efl_access_editable_text_insert(Eo *obj, Efl_Ui_Text_Data *pd, const char *string, int position)
 {
    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);
@@ -4559,7 +4559,7 @@ _efl_ui_text_elm_interface_atspi_text_editable_insert(Eo *obj, Efl_Ui_Text_Data
 }
 
 EOLIAN static Eina_Bool
-_efl_ui_text_elm_interface_atspi_text_editable_copy(Eo *obj, Efl_Ui_Text_Data *pd, int start, int end)
+_efl_ui_text_efl_access_editable_text_copy(Eo *obj, Efl_Ui_Text_Data *pd, int start, int end)
 {
    _efl_ui_text_select_region_set(obj, pd, start, end);
    efl_ui_text_selection_copy(obj);
@@ -4568,7 +4568,7 @@ _efl_ui_text_elm_interface_atspi_text_editable_copy(Eo *obj, Efl_Ui_Text_Data *p
 }
 
 EOLIAN static Eina_Bool
-_efl_ui_text_elm_interface_atspi_text_editable_delete(Eo *obj, Efl_Ui_Text_Data *pd, int start_offset, int end_offset)
+_efl_ui_text_efl_access_editable_text_delete(Eo *obj, Efl_Ui_Text_Data *pd, int start_offset, int end_offset)
 {
    Evas_Textblock_Cursor *cur1, *cur2;
    Eo *text_obj = edje_object_part_swallow_get(pd->entry_edje, "elm.text");
@@ -4599,7 +4599,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_ui_text_efl_access_editable_text_paste(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED, int position)
 {
    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);
@@ -4608,7 +4608,7 @@ _efl_ui_text_elm_interface_atspi_text_editable_paste(Eo *obj, Efl_Ui_Text_Data *
 }
 
 EOLIAN static Eina_Bool
-_efl_ui_text_elm_interface_atspi_text_editable_cut(Eo *obj, Efl_Ui_Text_Data *pd EINA_UNUSED, int start, int end)
+_efl_ui_text_efl_access_editable_text_cut(Eo *obj, Efl_Ui_Text_Data *pd EINA_UNUSED, int start, int end)
 {
    _efl_ui_text_select_region_set(obj, pd, start, end);
    efl_ui_text_selection_cut(obj);
diff --git a/src/lib/elementary/efl_ui_text.eo b/src/lib/elementary/efl_ui_text.eo
index 6119d30cfd..27314bbb19 100644
--- a/src/lib/elementary/efl_ui_text.eo
+++ b/src/lib/elementary/efl_ui_text.eo
@@ -2,7 +2,7 @@ import elm_general;
 import elm_entry;
 
 class Efl.Ui.Text (Efl.Ui.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable,
-                 Elm.Interface.Atspi.Text, Elm.Interface.Atspi.Text.Editable, Efl.File,
+                 Efl.Access.Text, Efl.Access.Editable.Text, Efl.File,
                  Efl.Ui.Selectable, Efl.Ui.Scrollable, Efl.Ui.Text.Interactive)
 {
    [[Efl UI text class]]
@@ -370,28 +370,28 @@ class Efl.Ui.Text (Efl.Ui.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable,
       Elm.Interface_Scrollable.bounce_allow { set; }
       Elm.Interface.Atspi_Accessible.state_set { get; }
       Elm.Interface.Atspi_Accessible.name { get; }
-      Elm.Interface.Atspi.Text.text { get; }
-      Elm.Interface.Atspi.Text.string { get; }
-      Elm.Interface.Atspi.Text.attribute { get; }
-      Elm.Interface.Atspi.Text.attributes { get; }
-      Elm.Interface.Atspi.Text.default_attributes { get; }
-      Elm.Interface.Atspi.Text.caret_offset { get; set; }
-      Elm.Interface.Atspi.Text.character { get; }
-      Elm.Interface.Atspi.Text.character_extents { get; }
-      Elm.Interface.Atspi.Text.character_count { get; }
-      Elm.Interface.Atspi.Text.offset_at_point { get; }
-      Elm.Interface.Atspi.Text.bounded_ranges { get; }
-      Elm.Interface.Atspi.Text.range_extents { get; }
-      Elm.Interface.Atspi.Text.selection { get; set; }
-      Elm.Interface.Atspi.Text.selections_count { get; }
-      Elm.Interface.Atspi.Text.selection_add;
-      Elm.Interface.Atspi.Text.selection_remove;
-      Elm.Interface.Atspi.Text.Editable.content { set; }
-      Elm.Interface.Atspi.Text.Editable.insert;
-      Elm.Interface.Atspi.Text.Editable.copy;
-      Elm.Interface.Atspi.Text.Editable.cut;
-      Elm.Interface.Atspi.Text.Editable.delete;
-      Elm.Interface.Atspi.Text.Editable.paste;
+      Efl.Access.Text.text { get; }
+      Efl.Access.Text.string { get; }
+      Efl.Access.Text.attribute { get; }
+      Efl.Access.Text.attributes { get; }
+      Efl.Access.Text.default_attributes { get; }
+      Efl.Access.Text.caret_offset { get; set; }
+      Efl.Access.Text.character { get; }
+      Efl.Access.Text.character_extents { get; }
+      Efl.Access.Text.character_count { get; }
+      Efl.Access.Text.offset_at_point { get; }
+      Efl.Access.Text.bounded_ranges { get; }
+      Efl.Access.Text.range_extents { get; }
+      Efl.Access.Text.selection { get; set; }
+      Efl.Access.Text.selections_count { get; }
+      Efl.Access.Text.selection_add;
+      Efl.Access.Text.selection_remove;
+      Efl.Access.Editable.Text.content { set; }
+      Efl.Access.Editable.Text.insert;
+      Efl.Access.Editable.Text.copy;
+      Efl.Access.Editable.Text.cut;
+      Efl.Access.Editable.Text.delete;
+      Efl.Access.Editable.Text.paste;
       Efl.File.file { get; set; }
       Efl.Ui.Text.Interactive.editable { set; }
    }
diff --git a/src/lib/elementary/elm_atspi_bridge.c b/src/lib/elementary/elm_atspi_bridge.c
index 56b27c24f2..8ff4f1231b 100644
--- a/src/lib/elementary/elm_atspi_bridge.c
+++ b/src/lib/elementary/elm_atspi_bridge.c
@@ -8,8 +8,8 @@
 #define EFL_ACCESS_VALUE_PROTECTED
 #define EFL_ACCESS_IMAGE_PROTECTED
 #define EFL_ACCESS_SELECTION_PROTECTED
-#define ELM_INTERFACE_ATSPI_TEXT_PROTECTED
-#define ELM_INTERFACE_ATSPI_TEXT_EDITABLE_PROTECTED
+#define EFL_ACCESS_TEXT_PROTECTED
+#define EFL_ACCESS_EDITABLE_TEXT_PROTECTED
 
 #include "atspi/atspi-constants.h"
 
@@ -165,10 +165,10 @@ static const Elm_Atspi_Bridge_Event_Handler event_handlers[] = {
    { EFL_ACCESS_WINDOW_EVENT_WINDOW_MINIMIZED, _window_signal_send},
    { EFL_ACCESS_WINDOW_EVENT_WINDOW_RESTORED, _window_signal_send},
    { EFL_ACCESS_SELECTION_EVENT_SELECTION_CHANGED, _selection_signal_send},
-   { ELM_INTERFACE_ATSPI_TEXT_EVENT_ACCESS_TEXT_CARET_MOVED, _text_caret_moved_send },
-   { ELM_INTERFACE_ATSPI_TEXT_EVENT_ACCESS_TEXT_INSERTED, _text_text_inserted_send },
-   { ELM_INTERFACE_ATSPI_TEXT_EVENT_ACCESS_TEXT_REMOVED, _text_text_removed_send },
-   { ELM_INTERFACE_ATSPI_TEXT_EVENT_ACCESS_TEXT_SELECTION_CHANGED, _text_selection_changed_send }
+   { EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_CARET_MOVED, _text_caret_moved_send },
+   { EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_INSERTED, _text_text_inserted_send },
+   { EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_REMOVED, _text_text_removed_send },
+   { EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_SELECTION_CHANGED, _text_selection_changed_send }
 };
 
 enum _Atspi_Object_Child_Event_Type
@@ -1296,13 +1296,13 @@ _text_string_at_offset_get(const Eldbus_Service_Interface *iface, const Eldbus_M
 {
    const char *obj_path = eldbus_message_path_get(msg);
    char *str;
-   Elm_Atspi_Text_Granularity gran;
+   Efl_Access_Text_Granularity gran;
    int start, end;
    Eldbus_Message *ret;
    Eo *bridge = eldbus_service_object_data_get(iface, ELM_ATSPI_BRIDGE_CLASS_NAME);
    Eo *obj = _bridge_object_from_path(bridge, obj_path);
 
-   ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_TEXT_INTERFACE, msg);
+   ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_TEXT_INTERFACE, msg);
 
    if (!eldbus_message_arguments_get(msg, "iu", &start, &gran))
      return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Offset and granularity expected.");
@@ -1310,7 +1310,7 @@ _text_string_at_offset_get(const Eldbus_Service_Interface *iface, const Eldbus_M
    ret = eldbus_message_method_return_new(msg);
    EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
 
-   str = elm_interface_atspi_text_string_get(obj, gran, &start, &end);
+   str = efl_access_text_string_get(obj, gran, &start, &end);
    str = str ? str : strdup("");
 
    eldbus_message_arguments_append(ret, "sii", str, start, end);
@@ -1328,7 +1328,7 @@ _text_text_get(const Eldbus_Service_Interface *iface, const Eldbus_Message *msg)
    Eo *obj = _bridge_object_from_path(bridge, obj_path);
    int start, end;
 
-   ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_TEXT_INTERFACE, msg);
+   ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_TEXT_INTERFACE, msg);
 
    if (!eldbus_message_arguments_get(msg, "ii", &start, &end))
      return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Offset and granularity expected.");
@@ -1336,7 +1336,7 @@ _text_text_get(const Eldbus_Service_Interface *iface, const Eldbus_Message *msg)
    Eldbus_Message *ret = eldbus_message_method_return_new(msg);
    EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
 
-   str = elm_interface_atspi_text_get(obj, start, end);
+   str = efl_access_text_get(obj, start, end);
    str = str ? str : strdup("");
 
    eldbus_message_arguments_append(ret, "s", str);
@@ -1355,7 +1355,7 @@ _text_caret_offset_set(const Eldbus_Service_Interface *iface, const Eldbus_Messa
    Eldbus_Message *ret;
    Eina_Bool res;
 
-   ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_TEXT_INTERFACE, msg);
+   ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_TEXT_INTERFACE, msg);
 
    if (!eldbus_message_arguments_get(msg, "i", &offset))
      return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Offset expected.");
@@ -1363,7 +1363,7 @@ _text_caret_offset_set(const Eldbus_Service_Interface *iface, const Eldbus_Messa
    ret = eldbus_message_method_return_new(msg);
    EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
 
-   res = elm_interface_atspi_text_caret_offset_set(obj, offset);
+   res = efl_access_text_caret_offset_set(obj, offset);
 
    eldbus_message_arguments_append(ret, "b", res);
 
@@ -1380,7 +1380,7 @@ _text_character_at_offset_get(const Eldbus_Service_Interface *iface, const Eldbu
    Eldbus_Message *ret;
    Eina_Unicode res;
 
-   ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_TEXT_INTERFACE, msg);
+   ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_TEXT_INTERFACE, msg);
 
    if (!eldbus_message_arguments_get(msg, "i", &offset))
      return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Offset expected.");
@@ -1388,7 +1388,7 @@ _text_character_at_offset_get(const Eldbus_Service_Interface *iface, const Eldbu
    ret = eldbus_message_method_return_new(msg);
    EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
 
-   res = elm_interface_atspi_text_character_get(obj, offset);
+   res = efl_access_text_character_get(obj, offset);
 
    eldbus_message_arguments_append(ret, "i", res);
 
@@ -1406,7 +1406,7 @@ _text_attribute_value_get(const Eldbus_Service_Interface *iface, const Eldbus_Me
    Eldbus_Message *ret;
    Eina_Bool res;
 
-   ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_TEXT_INTERFACE, msg);
+   ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_TEXT_INTERFACE, msg);
 
    if (!eldbus_message_arguments_get(msg, "is", &start, &name))
      return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Offset and attribute name expected.");
@@ -1414,7 +1414,7 @@ _text_attribute_value_get(const Eldbus_Service_Interface *iface, const Eldbus_Me
    ret = eldbus_message_method_return_new(msg);
    EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
 
-   res = elm_interface_atspi_text_attribute_get(obj, name, &start, &end, &value);
+   res = efl_access_text_attribute_get(obj, name, &start, &end, &value);
    eldbus_message_arguments_append(ret, "siib", value ? value : "", start, end, res);
 
    if (value) free(value);
@@ -1431,9 +1431,9 @@ _text_attributes_get(const Eldbus_Service_Interface *iface, const Eldbus_Message
    Eldbus_Message *ret;
    Eldbus_Message_Iter *iter, *iter_array;
    Eina_List *attrs;
-   Elm_Atspi_Text_Attribute *attr;
+   Efl_Access_Text_Attribute *attr;
 
-   ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_TEXT_INTERFACE, msg);
+   ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_TEXT_INTERFACE, msg);
 
    if (!eldbus_message_arguments_get(msg, "i", &start))
      return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Offset expected.");
@@ -1445,7 +1445,7 @@ _text_attributes_get(const Eldbus_Service_Interface *iface, const Eldbus_Message
    iter_array = eldbus_message_iter_container_new(iter, 'a', "{ss}");
    EINA_SAFETY_ON_NULL_GOTO(iter_array, fail);
 
-   attrs = elm_interface_atspi_text_attributes_get(obj, &start, &end);
+   attrs = efl_access_text_attributes_get(obj, &start, &end);
 
    EINA_LIST_FREE(attrs, attr)
     {
@@ -1472,9 +1472,9 @@ _text_default_attributes_get(const Eldbus_Service_Interface *iface, const Eldbus
    Eldbus_Message *ret;
    Eldbus_Message_Iter *iter, *iter_array;
    Eina_List *attrs;
-   Elm_Atspi_Text_Attribute *attr;
+   Efl_Access_Text_Attribute *attr;
 
-   ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_TEXT_INTERFACE, msg);
+   ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_TEXT_INTERFACE, msg);
 
    ret = eldbus_message_method_return_new(msg);
    EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
@@ -1483,7 +1483,7 @@ _text_default_attributes_get(const Eldbus_Service_Interface *iface, const Eldbus
    iter_array = eldbus_message_iter_container_new(iter, 'a', "{ss}");
    EINA_SAFETY_ON_NULL_GOTO(iter_array, fail);
 
-   attrs = elm_interface_atspi_text_default_attributes_get(obj);
+   attrs = efl_access_text_default_attributes_get(obj);
 
    EINA_LIST_FREE(attrs, attr)
     {
@@ -1512,7 +1512,7 @@ _text_character_extents_get(const Eldbus_Service_Interface *iface, const Eldbus_
    Eina_Bool screen_coords, res;
    Eldbus_Message *ret;
 
-   ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_TEXT_INTERFACE, msg);
+   ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_TEXT_INTERFACE, msg);
 
    if (!eldbus_message_arguments_get(msg, "iu", &offset, &type))
      return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Offset and coordinates type expected.");
@@ -1522,7 +1522,7 @@ _text_character_extents_get(const Eldbus_Service_Interface *iface, const Eldbus_
 
    screen_coords = type == ATSPI_COORD_TYPE_SCREEN ? EINA_TRUE : EINA_FALSE;
 
-   res = elm_interface_atspi_text_character_extents_get(obj, offset, screen_coords, &rect);
+   res = efl_access_text_character_extents_get(obj, offset, screen_coords, &rect);
 
    if (!res)
      {
@@ -1545,7 +1545,7 @@ _text_offset_at_point_get(const Eldbus_Service_Interface *iface, const Eldbus_Me
    Eina_Bool screen_coords;
    Eldbus_Message *ret;
 
-   ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_TEXT_INTERFACE, msg);
+   ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_TEXT_INTERFACE, msg);
 
    if (!eldbus_message_arguments_get(msg, "iiu", &x, &y, &type))
      return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Offset and coordinates type expected.");
@@ -1556,7 +1556,7 @@ _text_offset_at_point_get(const Eldbus_Service_Interface *iface, const Eldbus_Me
    x = y = -1;
    screen_coords = type == ATSPI_COORD_TYPE_SCREEN ? EINA_TRUE : EINA_FALSE;
 
-   offset = elm_interface_atspi_text_offset_at_point_get(obj, screen_coords, x, y);
+   offset = efl_access_text_offset_at_point_get(obj, screen_coords, x, y);
 
    eldbus_message_arguments_append(ret, "i", offset);
 
@@ -1572,12 +1572,12 @@ _text_n_selections_get(const Eldbus_Service_Interface *iface, const Eldbus_Messa
    int n;
    Eldbus_Message *ret;
 
-   ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_TEXT_INTERFACE, msg);
+   ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_TEXT_INTERFACE, msg);
 
    ret = eldbus_message_method_return_new(msg);
    EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
 
-   n = elm_interface_atspi_text_selections_count_get(obj);
+   n = efl_access_text_selections_count_get(obj);
 
    eldbus_message_arguments_append(ret, "i", n);
 
@@ -1593,7 +1593,7 @@ _text_selection_get(const Eldbus_Service_Interface *iface, const Eldbus_Message
    int sel_num, start, end;
    Eldbus_Message *ret;
 
-   ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_TEXT_INTERFACE, msg);
+   ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_TEXT_INTERFACE, msg);
 
    if (!eldbus_message_arguments_get(msg, "i", &sel_num))
      return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Selection number expected.");
@@ -1601,7 +1601,7 @@ _text_selection_get(const Eldbus_Service_Interface *iface, const Eldbus_Message
    ret = eldbus_message_method_return_new(msg);
    EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
 
-   elm_interface_atspi_text_selection_get(obj, sel_num, &start, &end);
+   efl_access_text_selection_get(obj, sel_num, &start, &end);
 
    eldbus_message_arguments_append(ret, "ii", start, end);
 
@@ -1618,7 +1618,7 @@ _text_selection_add(const Eldbus_Service_Interface *iface, const Eldbus_Message
    Eina_Bool res;
    Eldbus_Message *ret;
 
-   ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_TEXT_INTERFACE, msg);
+   ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_TEXT_INTERFACE, msg);
 
    if (!eldbus_message_arguments_get(msg, "ii", &start, &end))
      return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Start and end text offset expected.");
@@ -1626,7 +1626,7 @@ _text_selection_add(const Eldbus_Service_Interface *iface, const Eldbus_Message
    ret = eldbus_message_method_return_new(msg);
    EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
 
-   res = elm_interface_atspi_text_selection_add(obj, start, end);
+   res = efl_access_text_selection_add(obj, start, end);
 
    eldbus_message_arguments_append(ret, "b", res);
 
@@ -1643,7 +1643,7 @@ _text_selection_remove(const Eldbus_Service_Interface *iface, const Eldbus_Messa
    Eina_Bool res;
    Eldbus_Message *ret;
 
-   ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_TEXT_INTERFACE, msg);
+   ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_TEXT_INTERFACE, msg);
 
    if (!eldbus_message_arguments_get(msg, "i", &sel_num))
      return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Selection number expected.");
@@ -1651,7 +1651,7 @@ _text_selection_remove(const Eldbus_Service_Interface *iface, const Eldbus_Messa
    ret = eldbus_message_method_return_new(msg);
    EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
 
-   res = elm_interface_atspi_text_selection_remove(obj, sel_num);
+   res = efl_access_text_selection_remove(obj, sel_num);
 
    eldbus_message_arguments_append(ret, "b", res);
 
@@ -1668,7 +1668,7 @@ _text_selection_set(const Eldbus_Service_Interface *iface, const Eldbus_Message
    Eina_Bool res;
    Eldbus_Message *ret;
 
-   ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_TEXT_INTERFACE, msg);
+   ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_TEXT_INTERFACE, msg);
 
    if (!eldbus_message_arguments_get(msg, "iii", &sel_num, &start, &end))
      return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Selection number expected.");
@@ -1676,7 +1676,7 @@ _text_selection_set(const Eldbus_Service_Interface *iface, const Eldbus_Message
    ret = eldbus_message_method_return_new(msg);
    EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
 
-   res = elm_interface_atspi_text_selection_set(obj, sel_num, start, end);
+   res = efl_access_text_selection_set(obj, sel_num, start, end);
 
    eldbus_message_arguments_append(ret, "b", res);
 
@@ -1695,7 +1695,7 @@ _text_range_extents_get(const Eldbus_Service_Interface *iface, const Eldbus_Mess
    AtspiCoordType type;
    Eldbus_Message *ret;
 
-   ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_TEXT_INTERFACE, msg);
+   ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_TEXT_INTERFACE, msg);
 
    if (!eldbus_message_arguments_get(msg, "iiu", &start, &end, &type))
      return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Selection number expected.");
@@ -1704,7 +1704,7 @@ _text_range_extents_get(const Eldbus_Service_Interface *iface, const Eldbus_Mess
    EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
 
    screen_coords = type == ATSPI_COORD_TYPE_SCREEN ? EINA_TRUE : EINA_FALSE;
-   res = elm_interface_atspi_text_range_extents_get(obj, screen_coords, start, end, &rect);
+   res = efl_access_text_range_extents_get(obj, screen_coords, start, end, &rect);
    if (!res)
      {
         eldbus_message_unref(ret);
@@ -1725,13 +1725,13 @@ _text_bounded_ranges_get(const Eldbus_Service_Interface *iface, const Eldbus_Mes
    Eina_Rect rect;
    Eina_Bool screen_coords;
    AtspiCoordType type;
-   Elm_Atspi_Text_Clip_Type xclip, yclip;
+   Efl_Access_Text_Clip_Type xclip, yclip;
    Eina_List *ranges;
    Eldbus_Message *ret;
-   Elm_Atspi_Text_Range *range;
+   Efl_Access_Text_Range *range;
    Eldbus_Message_Iter *iter, *iter_array, *iter_struct, *iter_var;
 
-   ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_TEXT_INTERFACE, msg);
+   ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_TEXT_INTERFACE, msg);
 
    if (!eldbus_message_arguments_get(msg, "iiiiuuu", &rect.x, &rect.y, &rect.w, &rect.h, &type, &xclip, &yclip))
      return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Expected (x,y,w,h) of bounding box, screen coord type and x, y text clip types.");
@@ -1744,7 +1744,7 @@ _text_bounded_ranges_get(const Eldbus_Service_Interface *iface, const Eldbus_Mes
    EINA_SAFETY_ON_NULL_GOTO(iter_array, fail);
 
    screen_coords = type == ATSPI_COORD_TYPE_SCREEN ? EINA_TRUE : EINA_FALSE;
-   ranges = elm_interface_atspi_text_bounded_ranges_get(obj, screen_coords, rect, xclip, yclip);
+   ranges = efl_access_text_bounded_ranges_get(obj, screen_coords, rect, xclip, yclip);
 
    EINA_LIST_FREE(ranges, range)
      {
@@ -1789,10 +1789,10 @@ _text_run_attributes_get(const Eldbus_Service_Interface *iface, const Eldbus_Mes
    Eldbus_Message *ret;
    Eldbus_Message_Iter *iter, *iter_array;
    Eina_List *attrs, *defaults;
-   Elm_Atspi_Text_Attribute *attr;
+   Efl_Access_Text_Attribute *attr;
    Eina_Bool incl_def;
 
-   ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_TEXT_INTERFACE, msg);
+   ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_TEXT_INTERFACE, msg);
 
    if (!eldbus_message_arguments_get(msg, "ib", &start, &incl_def))
      return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Offset and include defaults flag expected.");
@@ -1804,11 +1804,11 @@ _text_run_attributes_get(const Eldbus_Service_Interface *iface, const Eldbus_Mes
    iter_array = eldbus_message_iter_container_new(iter, 'a', "{ss}");
    EINA_SAFETY_ON_NULL_GOTO(iter_array, fail);
 
-   attrs = elm_interface_atspi_text_attributes_get(obj, &start, &end);
+   attrs = efl_access_text_attributes_get(obj, &start, &end);
 
    if (incl_def)
      {
-        defaults = elm_interface_atspi_text_default_attributes_get(obj);
+        defaults = efl_access_text_default_attributes_get(obj);
         attrs = eina_list_merge(attrs, defaults);
      }
 
@@ -1859,7 +1859,7 @@ _editable_text_text_content_set(const Eldbus_Service_Interface *iface, const Eld
    Eldbus_Message *ret;
    Eina_Bool res;
 
-   ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_TEXT_EDITABLE_INTERFACE, msg);
+   ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_EDITABLE_TEXT_INTERFACE, msg);
 
    if (!eldbus_message_arguments_get(msg, "s", &content))
      return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "String expected.");
@@ -1867,7 +1867,7 @@ _editable_text_text_content_set(const Eldbus_Service_Interface *iface, const Eld
    ret = eldbus_message_method_return_new(msg);
    EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
 
-   res = elm_interface_atspi_text_editable_content_set(obj, content);
+   res = efl_access_editable_text_content_set(obj, content);
 
    eldbus_message_arguments_append(ret, "b", res);
 
@@ -1885,7 +1885,7 @@ _editable_text_text_insert(const Eldbus_Service_Interface *iface, const Eldbus_M
    int pos, len;
    Eina_Bool res;
 
-   ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_TEXT_EDITABLE_INTERFACE, msg);
+   ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_EDITABLE_TEXT_INTERFACE, msg);
 
    if (!eldbus_message_arguments_get(msg, "isi", &pos, &text, &len))
      return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Postion, string, length expected.");
@@ -1893,7 +1893,7 @@ _editable_text_text_insert(const Eldbus_Service_Interface *iface, const Eldbus_M
    ret = eldbus_message_method_return_new(msg);
    EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
 
-   res = elm_interface_atspi_text_editable_insert(obj, text, pos);
+   res = efl_access_editable_text_insert(obj, text, pos);
 
    eldbus_message_arguments_append(ret, "b", res);
 
@@ -1910,7 +1910,7 @@ _editable_text_text_copy(const Eldbus_Service_Interface *iface, const Eldbus_Mes
    int start, end;
    Eina_Bool res;
 
-   ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_TEXT_EDITABLE_INTERFACE, msg);
+   ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_EDITABLE_TEXT_INTERFACE, msg);
 
    if (!eldbus_message_arguments_get(msg, "ii", &start, &end))
      return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Start and end index expected.");
@@ -1918,7 +1918,7 @@ _editable_text_text_copy(const Eldbus_Service_Interface *iface, const Eldbus_Mes
    ret = eldbus_message_method_return_new(msg);
    EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
 
-   res = elm_interface_atspi_text_editable_copy(obj, start, end);
+   res = efl_access_editable_text_copy(obj, start, end);
 
    eldbus_message_arguments_append(ret, "b", res);
 
@@ -1935,7 +1935,7 @@ _editable_text_text_cut(const Eldbus_Service_Interface *iface, const Eldbus_Mess
    int start, end;
    Eina_Bool res;
 
-   ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_TEXT_EDITABLE_INTERFACE, msg);
+   ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_EDITABLE_TEXT_INTERFACE, msg);
 
    if (!eldbus_message_arguments_get(msg, "ii", &start, &end))
      return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Start and end index expected.");
@@ -1943,7 +1943,7 @@ _editable_text_text_cut(const Eldbus_Service_Interface *iface, const Eldbus_Mess
    ret = eldbus_message_method_return_new(msg);
    EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
 
-   res = elm_interface_atspi_text_editable_cut(obj, start, end);
+   res = efl_access_editable_text_cut(obj, start, end);
 
    eldbus_message_arguments_append(ret, "b", res);
 
@@ -1960,7 +1960,7 @@ _editable_text_text_delete(const Eldbus_Service_Interface *iface, const Eldbus_M
    int start, end;
    Eina_Bool res;
 
-   ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_TEXT_EDITABLE_INTERFACE, msg);
+   ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_EDITABLE_TEXT_INTERFACE, msg);
 
    if (!eldbus_message_arguments_get(msg, "ii", &start, &end))
      return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Start and end index expected.");
@@ -1968,7 +1968,7 @@ _editable_text_text_delete(const Eldbus_Service_Interface *iface, const Eldbus_M
    ret = eldbus_message_method_return_new(msg);
    EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
 
-   res = elm_interface_atspi_text_editable_delete(obj, start, end);
+   res = efl_access_editable_text_delete(obj, start, end);
 
    eldbus_message_arguments_append(ret, "b", res);
 
@@ -1985,7 +1985,7 @@ _editable_text_text_paste(const Eldbus_Service_Interface *iface, const Eldbus_Me
    int pos;
    Eina_Bool res;
 
-   ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_TEXT_EDITABLE_INTERFACE, msg);
+   ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_EDITABLE_TEXT_INTERFACE, msg);
 
    if (!eldbus_message_arguments_get(msg, "i", &pos))
      return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Start and end index expected.");
@@ -1993,7 +1993,7 @@ _editable_text_text_paste(const Eldbus_Service_Interface *iface, const Eldbus_Me
    ret = eldbus_message_method_return_new(msg);
    EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
 
-   res = elm_interface_atspi_text_editable_paste(obj, pos);
+   res = efl_access_editable_text_paste(obj, pos);
 
    eldbus_message_arguments_append(ret, "b", res);
 
@@ -2260,17 +2260,17 @@ _text_properties_get(const Eldbus_Service_Interface *interface, const char *prop
    Eo *obj = _bridge_object_from_path(bridge, obj_path);
    int val;
 
-   ELM_ATSPI_PROPERTY_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_TEXT_INTERFACE, request_msg, error);
+   ELM_ATSPI_PROPERTY_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_TEXT_INTERFACE, request_msg, error);
 
    if (!strcmp(property, "CharacterCount"))
      {
-        val = elm_interface_atspi_text_character_count_get(obj);
+        val = efl_access_text_character_count_get(obj);
         eldbus_message_iter_basic_append(iter, 'i', val);
         return EINA_TRUE;
      }
    if (!strcmp(property, "CaretOffset"))
      {
-        val = elm_interface_atspi_text_caret_offset_get(obj);
+        val = efl_access_text_caret_offset_get(obj);
         eldbus_message_iter_basic_append(iter, 'i', val);
         return EINA_TRUE;
      }
@@ -2504,9 +2504,9 @@ _collection_iter_match_rule_get(Eldbus_Message_Iter *iter, struct collection_mat
         else if (!strcmp(ifc_name, "component"))
           class = EFL_ACCESS_COMPONENT_MIXIN;
         else if (!strcmp(ifc_name, "editabletext"))
-          class = ELM_INTERFACE_ATSPI_TEXT_EDITABLE_INTERFACE;
+          class = EFL_ACCESS_EDITABLE_TEXT_INTERFACE;
         else if (!strcmp(ifc_name, "text"))
-          class = ELM_INTERFACE_ATSPI_TEXT_INTERFACE;
+          class = EFL_ACCESS_TEXT_INTERFACE;
         else if (!strcmp(ifc_name, "image"))
           class = EFL_ACCESS_SELECTION_INTERFACE;
         else if (!strcmp(ifc_name, "value"))
@@ -3126,13 +3126,13 @@ _iter_interfaces_append(Eldbus_Message_Iter *iter, const Eo *obj)
     eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_APPLICATION);
   if (efl_isa(obj, EFL_ACCESS_COMPONENT_MIXIN))
     eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_COMPONENT);
-  if (efl_isa(obj, ELM_INTERFACE_ATSPI_TEXT_EDITABLE_INTERFACE))
+  if (efl_isa(obj, EFL_ACCESS_EDITABLE_TEXT_INTERFACE))
     eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_EDITABLE_TEXT);
   if (efl_isa(obj, EFL_ACCESS_IMAGE_MIXIN))
     eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_IMAGE);
   if (efl_isa(obj, EFL_ACCESS_SELECTION_INTERFACE))
     eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_SELECTION);
-  if (efl_isa(obj, ELM_INTERFACE_ATSPI_TEXT_INTERFACE))
+  if (efl_isa(obj, EFL_ACCESS_TEXT_INTERFACE))
     eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_TEXT);
   if (efl_isa(obj, EFL_ACCESS_VALUE_INTERFACE))
     eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_VALUE);
@@ -4119,7 +4119,7 @@ _text_caret_moved_send(void *data, const Efl_Event *event)
    if (!STATE_TYPE_GET(pd->object_broadcast_mask, ATSPI_OBJECT_EVENT_TEXT_CARET_MOVED))
      return;
 
-   cursor_pos = elm_interface_atspi_text_caret_offset_get(event->object);
+   cursor_pos = efl_access_text_caret_offset_get(event->object);
 
    _bridge_signal_send(data, event->object, ATSPI_DBUS_INTERFACE_EVENT_OBJECT,
                        &_event_obj_signals[ATSPI_OBJECT_EVENT_TEXT_CARET_MOVED], "", cursor_pos, 0, NULL, NULL);
@@ -4128,7 +4128,7 @@ _text_caret_moved_send(void *data, const Efl_Event *event)
 static void
 _text_text_inserted_send(void *data, const Efl_Event *event)
 {
-   Elm_Atspi_Text_Change_Info *info = event->info;
+   Efl_Access_Text_Change_Info *info = event->info;
 
    ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN(data, pd);
 
@@ -4142,7 +4142,7 @@ _text_text_inserted_send(void *data, const Efl_Event *event)
 static void
 _text_text_removed_send(void *data, const Efl_Event *event)
 {
-   Elm_Atspi_Text_Change_Info *info = event->info;
+   Efl_Access_Text_Change_Info *info = event->info;
 
    ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN(data, pd);
 
diff --git a/src/lib/elementary/elm_code_widget.eo b/src/lib/elementary/elm_code_widget.eo
index 33863213a9..871f75c4c5 100644
--- a/src/lib/elementary/elm_code_widget.eo
+++ b/src/lib/elementary/elm_code_widget.eo
@@ -5,7 +5,7 @@ import elm_general;
 struct @extern Elm_Code; [[Elementary code main data structure]] /* The main interface currently defined in code */
 struct @extern Elm_Code_Line; [[Elementary code line data structure]] /* Parts of the interface currently defined in code */
 
-class Elm.Code_Widget (Efl.Ui.Layout, Elm.Interface.Atspi.Text)
+class Elm.Code_Widget (Efl.Ui.Layout, Efl.Access.Text)
 {
    [[Elementary code widget]]
    eo_prefix: elm_obj_code_widget;
diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c
index 0dbe98b9a5..ebdb844ee4 100644
--- a/src/lib/elementary/elm_entry.c
+++ b/src/lib/elementary/elm_entry.c
@@ -3,8 +3,8 @@
 #endif
 
 #define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
-#define ELM_INTERFACE_ATSPI_TEXT_PROTECTED
-#define ELM_INTERFACE_ATSPI_TEXT_EDITABLE_PROTECTED
+#define EFL_ACCESS_TEXT_PROTECTED
+#define EFL_ACCESS_EDITABLE_TEXT_PROTECTED
 #define ELM_LAYOUT_PROTECTED
 
 #include <Elementary.h>
@@ -2191,20 +2191,20 @@ _entry_changed_user_signal_cb(void *data,
      }
    if (_elm_config->atspi_mode)
      {
-        Elm_Atspi_Text_Change_Info atspi_info;
+        Efl_Access_Text_Change_Info atspi_info;
         if (edje_info && edje_info->insert)
           {
              atspi_info.content = edje_info->change.insert.content;
              atspi_info.pos = edje_info->change.insert.pos;
              atspi_info.len = edje_info->change.insert.plain_length;
-             elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, data, ELM_INTERFACE_ATSPI_TEXT_EVENT_ACCESS_TEXT_INSERTED, &atspi_info);
+             elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_INSERTED, &atspi_info);
           }
         else if (edje_info && !edje_info->insert)
           {
              atspi_info.content = edje_info->change.del.content;
              atspi_info.pos = MIN(edje_info->change.del.start, edje_info->change.del.end);
              atspi_info.len = MAX(edje_info->change.del.start, edje_info->change.del.end) - atspi_info.pos;
-             elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, data, ELM_INTERFACE_ATSPI_TEXT_EVENT_ACCESS_TEXT_REMOVED, &atspi_info);
+             elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_REMOVED, &atspi_info);
           }
      }
 }
@@ -2222,7 +2222,7 @@ _entry_preedit_changed_signal_cb(void *data,
 
    if (_elm_config->atspi_mode)
      {
-        Elm_Atspi_Text_Change_Info atspi_info;
+        Efl_Access_Text_Change_Info atspi_info;
         if (edje_info && edje_info->insert)
           {
              text = elm_entry_markup_to_utf8(edje_info->change.insert.content);
@@ -2231,7 +2231,7 @@ _entry_preedit_changed_signal_cb(void *data,
              atspi_info.len = edje_info->change.insert.plain_length;
              elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN,
                                                        data,
-                                                       ELM_INTERFACE_ATSPI_TEXT_EVENT_ACCESS_TEXT_INSERTED,
+                                                       EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_INSERTED,
                                                        &atspi_info);
              free(text);
           }
@@ -2316,7 +2316,7 @@ _entry_selection_changed_signal_cb(void *data,
      _selection_store(ELM_SEL_TYPE_PRIMARY, data);
    _update_selection_handler(data);
    if (_elm_config->atspi_mode)
-     elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, data, ELM_INTERFACE_ATSPI_TEXT_EVENT_ACCESS_TEXT_SELECTION_CHANGED, NULL);
+     elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_SELECTION_CHANGED, NULL);
 }
 
 static void
@@ -2420,7 +2420,7 @@ _entry_cursor_changed_signal_cb(void *data,
    efl_event_callback_legacy_call(data, ELM_ENTRY_EVENT_CURSOR_CHANGED, NULL);
 
    if (_elm_config->atspi_mode)
-     elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, data, ELM_INTERFACE_ATSPI_TEXT_EVENT_ACCESS_TEXT_CARET_MOVED, NULL);
+     elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_CARET_MOVED, NULL);
 }
 
 static void
@@ -2432,7 +2432,7 @@ _entry_cursor_changed_manual_signal_cb(void *data,
    efl_event_callback_legacy_call
      (data, ELM_ENTRY_EVENT_CURSOR_CHANGED_MANUAL, NULL);
    if (_elm_config->atspi_mode)
-     elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, data, ELM_INTERFACE_ATSPI_TEXT_EVENT_ACCESS_TEXT_CARET_MOVED, NULL);
+     elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_CARET_MOVED, NULL);
 }
 
 static void
@@ -5467,7 +5467,7 @@ _elm_entry_class_constructor(Efl_Class *klass)
 // ATSPI Accessibility
 
 EOLIAN static Eina_Unicode
-_elm_entry_elm_interface_atspi_text_character_get(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, int offset)
+_elm_entry_efl_access_text_character_get(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, int offset)
 {
    char *txt;
    int idx = 0;
@@ -5489,7 +5489,7 @@ _elm_entry_elm_interface_atspi_text_character_get(Eo *obj, Elm_Entry_Data *_pd E
 }
 
 EOLIAN static int
-_elm_entry_elm_interface_atspi_text_character_count_get(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED)
+_elm_entry_efl_access_text_character_count_get(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED)
 {
    char *txt;
    int ret = -1;
@@ -5504,7 +5504,7 @@ _elm_entry_elm_interface_atspi_text_character_count_get(Eo *obj, Elm_Entry_Data
 }
 
 EOLIAN static char*
-_elm_entry_elm_interface_atspi_text_string_get(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, Elm_Atspi_Text_Granularity granularity, int *start_offset, int *end_offset)
+_elm_entry_efl_access_text_string_get(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, Efl_Access_Text_Granularity granularity, int *start_offset, int *end_offset)
 {
    Evas_Textblock_Cursor *cur = NULL, *cur2 = NULL;
    Evas_Object *tblk;
@@ -5522,18 +5522,18 @@ _elm_entry_elm_interface_atspi_text_string_get(Eo *obj, Elm_Entry_Data *_pd EINA
 
    switch (granularity)
      {
-      case ELM_ATSPI_TEXT_GRANULARITY_CHAR:
+      case EFL_ACCESS_TEXT_GRANULARITY_CHAR:
          break;
-      case ELM_ATSPI_TEXT_GRANULARITY_WORD:
+      case EFL_ACCESS_TEXT_GRANULARITY_WORD:
          evas_textblock_cursor_word_start(cur);
          break;
-      case ELM_ATSPI_TEXT_GRANULARITY_SENTENCE:
+      case EFL_ACCESS_TEXT_GRANULARITY_SENTENCE:
          // TODO - add sentence support in textblock first
          break;
-      case ELM_ATSPI_TEXT_GRANULARITY_LINE:
+      case EFL_ACCESS_TEXT_GRANULARITY_LINE:
          evas_textblock_cursor_line_char_first(cur);
          break;
-      case ELM_ATSPI_TEXT_GRANULARITY_PARAGRAPH:
+      case EFL_ACCESS_TEXT_GRANULARITY_PARAGRAPH:
          evas_textblock_cursor_paragraph_char_first(cur);
          break;
      }
@@ -5543,23 +5543,23 @@ _elm_entry_elm_interface_atspi_text_string_get(Eo *obj, Elm_Entry_Data *_pd EINA
 
    switch (granularity)
      {
-      case ELM_ATSPI_TEXT_GRANULARITY_CHAR:
+      case EFL_ACCESS_TEXT_GRANULARITY_CHAR:
          evas_textblock_cursor_char_next(cur2);
          break;
-      case ELM_ATSPI_TEXT_GRANULARITY_WORD:
+      case EFL_ACCESS_TEXT_GRANULARITY_WORD:
          evas_textblock_cursor_word_end(cur2);
          // since word_end sets cursor position ON (before) last
          // char of word, we need to manually advance cursor to get
          // proper string from function range_text_get
          evas_textblock_cursor_char_next(cur2);
          break;
-      case ELM_ATSPI_TEXT_GRANULARITY_SENTENCE:
+      case EFL_ACCESS_TEXT_GRANULARITY_SENTENCE:
          // TODO - add sentence support in textblock first
          break;
-      case ELM_ATSPI_TEXT_GRANULARITY_LINE:
+      case EFL_ACCESS_TEXT_GRANULARITY_LINE:
          evas_textblock_cursor_line_char_last(cur2);
          break;
-      case ELM_ATSPI_TEXT_GRANULARITY_PARAGRAPH:
+      case EFL_ACCESS_TEXT_GRANULARITY_PARAGRAPH:
          evas_textblock_cursor_paragraph_char_last(cur2);
          break;
      }
@@ -5589,7 +5589,7 @@ fail:
 }
 
 EOLIAN static char*
-_elm_entry_elm_interface_atspi_text_text_get(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, int start_offset, int end_offset)
+_elm_entry_efl_access_text_text_get(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, int start_offset, int end_offset)
 {
    Evas_Textblock_Cursor *cur = NULL, *cur2 = NULL;
    Evas_Object *tblk;
@@ -5629,26 +5629,26 @@ fail:
 }
 
 EOLIAN static int
-_elm_entry_elm_interface_atspi_text_caret_offset_get(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED)
+_elm_entry_efl_access_text_caret_offset_get(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED)
 {
    return elm_entry_cursor_pos_get(obj);
 }
 
 EOLIAN static Eina_Bool
-_elm_entry_elm_interface_atspi_text_caret_offset_set(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, int offset)
+_elm_entry_efl_access_text_caret_offset_set(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, int offset)
 {
    elm_entry_cursor_pos_set(obj, offset);
    return EINA_TRUE;
 }
 
 EOLIAN static int
-_elm_entry_elm_interface_atspi_text_selections_count_get(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED)
+_elm_entry_efl_access_text_selections_count_get(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED)
 {
    return elm_entry_selection_get(obj) ? 1 : 0;
 }
 
 EOLIAN static void
-_elm_entry_elm_interface_atspi_text_selection_get(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, int selection_number, int *start_offset, int *end_offset)
+_elm_entry_efl_access_text_selection_get(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, int selection_number, int *start_offset, int *end_offset)
 {
    if (selection_number != 0) return;
 
@@ -5656,7 +5656,7 @@ _elm_entry_elm_interface_atspi_text_selection_get(Eo *obj, Elm_Entry_Data *_pd E
 }
 
 EOLIAN static Eina_Bool
-_elm_entry_elm_interface_atspi_text_selection_set(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, int selection_number, int start_offset, int end_offset)
+_elm_entry_efl_access_text_selection_set(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, int selection_number, int start_offset, int end_offset)
 {
    if (selection_number != 0) return EINA_FALSE;
 
@@ -5666,7 +5666,7 @@ _elm_entry_elm_interface_atspi_text_selection_set(Eo *obj, Elm_Entry_Data *_pd E
 }
 
 EOLIAN static Eina_Bool
-_elm_entry_elm_interface_atspi_text_selection_remove(Eo *obj, Elm_Entry_Data *pd EINA_UNUSED, int selection_number)
+_elm_entry_efl_access_text_selection_remove(Eo *obj, Elm_Entry_Data *pd EINA_UNUSED, int selection_number)
 {
    if (selection_number != 0) return EINA_FALSE;
    elm_entry_select_none(obj);
@@ -5674,7 +5674,7 @@ _elm_entry_elm_interface_atspi_text_selection_remove(Eo *obj, Elm_Entry_Data *pd
 }
 
 EOLIAN static Eina_Bool
-_elm_entry_elm_interface_atspi_text_selection_add(Eo *obj, Elm_Entry_Data *pd EINA_UNUSED, int start_offset, int end_offset)
+_elm_entry_efl_access_text_selection_add(Eo *obj, Elm_Entry_Data *pd EINA_UNUSED, int start_offset, int end_offset)
 {
    elm_entry_select_region_set(obj, start_offset, end_offset);
 
@@ -5682,13 +5682,13 @@ _elm_entry_elm_interface_atspi_text_selection_add(Eo *obj, Elm_Entry_Data *pd EI
 }
 
 EOLIAN static Eina_List*
-_elm_entry_elm_interface_atspi_text_bounded_ranges_get(Eo *obj EINA_UNUSED, Elm_Entry_Data *_pd EINA_UNUSED, Eina_Bool screen_coods EINA_UNUSED, Eina_Rect rect EINA_UNUSED, Elm_Atspi_Text_Clip_Type xclip EINA_UNUSED, Elm_Atspi_Text_Clip_Type yclip EINA_UNUSED)
+_elm_entry_efl_access_text_bounded_ranges_get(Eo *obj EINA_UNUSED, Elm_Entry_Data *_pd EINA_UNUSED, Eina_Bool screen_coods EINA_UNUSED, Eina_Rect rect EINA_UNUSED, Efl_Access_Text_Clip_Type xclip EINA_UNUSED, Efl_Access_Text_Clip_Type yclip EINA_UNUSED)
 {
    return NULL;
 }
 
 EOLIAN static int
-_elm_entry_elm_interface_atspi_text_offset_at_point_get(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, Eina_Bool screen_coods, int x, int y)
+_elm_entry_efl_access_text_offset_at_point_get(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, Eina_Bool screen_coods, int x, int y)
 {
    Evas_Object *txtblk;
    Evas_Textblock_Cursor *cur;
@@ -5722,7 +5722,7 @@ _elm_entry_elm_interface_atspi_text_offset_at_point_get(Eo *obj, Elm_Entry_Data
 }
 
 EOLIAN static Eina_Bool
-_elm_entry_elm_interface_atspi_text_character_extents_get(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, int offset, Eina_Bool screen_coods, Eina_Rect *rect)
+_elm_entry_efl_access_text_character_extents_get(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, int offset, Eina_Bool screen_coods, Eina_Rect *rect)
 {
    Evas_Object *txtblk;
    Evas_Textblock_Cursor *cur;
@@ -5754,7 +5754,7 @@ _elm_entry_elm_interface_atspi_text_character_extents_get(Eo *obj, Elm_Entry_Dat
 }
 
 EOLIAN static Eina_Bool
-_elm_entry_elm_interface_atspi_text_range_extents_get(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, Eina_Bool screen_coods, int start_offset, int end_offset, Eina_Rect *rect)
+_elm_entry_efl_access_text_range_extents_get(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, Eina_Bool screen_coods, int start_offset, int end_offset, Eina_Rect *rect)
 {
    Evas_Object *txtblk;
    Evas_Textblock_Cursor *cur1, *cur2;
@@ -5802,10 +5802,10 @@ _elm_entry_elm_interface_atspi_text_range_extents_get(Eo *obj, Elm_Entry_Data *_
    return EINA_TRUE;
 }
 
-static Elm_Atspi_Text_Attribute*
+static Efl_Access_Text_Attribute*
 _textblock_node_format_to_atspi_text_attr(const Evas_Object_Textblock_Node_Format *format)
 {
-   Elm_Atspi_Text_Attribute *ret = NULL;
+   Efl_Access_Text_Attribute *ret = NULL;
    const char *txt;
 
    txt = evas_textblock_node_format_text_get(format);
@@ -5820,7 +5820,7 @@ _textblock_node_format_to_atspi_text_attr(const Evas_Object_Textblock_Node_Forma
         while (*tmp != '\0' && *tmp != '=') tmp++;
         if (*tmp++ != '=') return NULL;
 
-        ret = calloc(1, sizeof(Elm_Atspi_Text_Attribute));
+        ret = calloc(1, sizeof(Efl_Access_Text_Attribute));
         if (!ret) return NULL;
 
         ret->value = eina_stringshare_add(tmp);
@@ -5832,13 +5832,13 @@ _textblock_node_format_to_atspi_text_attr(const Evas_Object_Textblock_Node_Forma
 }
 
 EOLIAN static Eina_Bool
-_elm_entry_elm_interface_atspi_text_attribute_get(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, const char *attr_name EINA_UNUSED, int *start_offset, int *end_offset, char **value)
+_elm_entry_efl_access_text_attribute_get(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, const char *attr_name EINA_UNUSED, int *start_offset, int *end_offset, char **value)
 {
    Evas_Object *txtblk;
    Evas_Textblock_Cursor *cur1, *cur2;
    Eina_List *formats, *l;
    Evas_Object_Textblock_Node_Format *format;
-   Elm_Atspi_Text_Attribute *attr;
+   Efl_Access_Text_Attribute *attr;
 
    txtblk = elm_entry_textblock_get(obj);
    if (!txtblk) return EINA_FALSE;
@@ -5880,13 +5880,13 @@ _elm_entry_elm_interface_atspi_text_attribute_get(Eo *obj, Elm_Entry_Data *_pd E
 }
 
 EOLIAN static Eina_List*
-_elm_entry_elm_interface_atspi_text_attributes_get(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, int *start_offset, int *end_offset)
+_elm_entry_efl_access_text_attributes_get(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, int *start_offset, int *end_offset)
 {
    Evas_Object *txtblk;
    Evas_Textblock_Cursor *cur1, *cur2;
    Eina_List *formats, *ret = NULL, *l;
    Evas_Object_Textblock_Node_Format *format;
-   Elm_Atspi_Text_Attribute *attr;
+   Efl_Access_Text_Attribute *attr;
 
    txtblk = elm_entry_textblock_get(obj);
    if (!txtblk) return NULL;
@@ -5922,12 +5922,12 @@ _elm_entry_elm_interface_atspi_text_attributes_get(Eo *obj, Elm_Entry_Data *_pd
 }
 
 EOLIAN static Eina_List*
-_elm_entry_elm_interface_atspi_text_default_attributes_get(Eo *obj EINA_UNUSED, Elm_Entry_Data *_pd EINA_UNUSED)
+_elm_entry_efl_access_text_default_attributes_get(Eo *obj EINA_UNUSED, Elm_Entry_Data *_pd EINA_UNUSED)
 {
    Evas_Object *txtblk;
    Eina_List *ret = NULL;
    const Evas_Object_Textblock_Node_Format *format;
-   Elm_Atspi_Text_Attribute *attr;
+   Efl_Access_Text_Attribute *attr;
 
    txtblk = elm_entry_textblock_get(obj);
    if (!txtblk) return NULL;
@@ -5947,14 +5947,14 @@ _elm_entry_elm_interface_atspi_text_default_attributes_get(Eo *obj EINA_UNUSED,
 }
 
 EOLIAN static Eina_Bool
-_elm_entry_elm_interface_atspi_text_editable_content_set(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, const char *content)
+_elm_entry_efl_access_editable_text_content_set(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, const char *content)
 {
    elm_entry_entry_set(obj, content);
    return EINA_TRUE;
 }
 
 EOLIAN static Eina_Bool
-_elm_entry_elm_interface_atspi_text_editable_insert(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, const char *string, int position)
+_elm_entry_efl_access_editable_text_insert(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, const char *string, int position)
 {
    elm_entry_cursor_pos_set(obj, position);
    elm_entry_entry_insert(obj, string);
@@ -5963,7 +5963,7 @@ _elm_entry_elm_interface_atspi_text_editable_insert(Eo *obj, Elm_Entry_Data *_pd
 }
 
 EOLIAN static Eina_Bool
-_elm_entry_elm_interface_atspi_text_editable_copy(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, int start, int end)
+_elm_entry_efl_access_editable_text_copy(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, int start, int end)
 {
    elm_entry_select_region_set(obj, start, end);
    elm_entry_selection_copy(obj);
@@ -5972,7 +5972,7 @@ _elm_entry_elm_interface_atspi_text_editable_copy(Eo *obj, Elm_Entry_Data *_pd E
 }
 
 EOLIAN static Eina_Bool
-_elm_entry_elm_interface_atspi_text_editable_delete(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, int start_offset, int end_offset)
+_elm_entry_efl_access_editable_text_delete(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, int start_offset, int end_offset)
 {
    Evas_Object *txtblk;
    Evas_Textblock_Cursor *cur1, *cur2;
@@ -6004,7 +6004,7 @@ _elm_entry_elm_interface_atspi_text_editable_delete(Eo *obj, Elm_Entry_Data *_pd
 }
 
 EOLIAN static Eina_Bool
-_elm_entry_elm_interface_atspi_text_editable_paste(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, int position)
+_elm_entry_efl_access_editable_text_paste(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, int position)
 {
    elm_entry_cursor_pos_set(obj, position);
    elm_entry_selection_paste(obj);
@@ -6012,7 +6012,7 @@ _elm_entry_elm_interface_atspi_text_editable_paste(Eo *obj, Elm_Entry_Data *_pd
 }
 
 EOLIAN static Eina_Bool
-_elm_entry_elm_interface_atspi_text_editable_cut(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, int start, int end)
+_elm_entry_efl_access_editable_text_cut(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, int start, int end)
 {
    elm_entry_select_region_set(obj, start, end);
    elm_entry_selection_cut(obj);
diff --git a/src/lib/elementary/elm_entry.eo b/src/lib/elementary/elm_entry.eo
index a76fda2356..22e8ece171 100644
--- a/src/lib/elementary/elm_entry.eo
+++ b/src/lib/elementary/elm_entry.eo
@@ -116,7 +116,7 @@ enum Elm.Cnp_Mode
 }
 
 class Elm.Entry (Efl.Ui.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable,
-                 Elm.Interface.Atspi.Text, Elm.Interface.Atspi.Text.Editable, Efl.File,
+                 Efl.Access.Text, Efl.Access.Editable.Text, Efl.File,
                  Efl.Ui.Selectable, Efl.Ui.Scrollable)
 {
    [[Elementary entry class]]
@@ -969,28 +969,28 @@ class Elm.Entry (Efl.Ui.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable,
       Elm.Interface_Scrollable.bounce_allow { set; }
       Elm.Interface.Atspi_Accessible.state_set { get; }
       Elm.Interface.Atspi_Accessible.name { get; }
-      Elm.Interface.Atspi.Text.text { get; }
-      Elm.Interface.Atspi.Text.string { get; }
-      Elm.Interface.Atspi.Text.attribute { get; }
-      Elm.Interface.Atspi.Text.attributes { get; }
-      Elm.Interface.Atspi.Text.default_attributes { get; }
-      Elm.Interface.Atspi.Text.caret_offset { get; set; }
-      Elm.Interface.Atspi.Text.character { get; }
-      Elm.Interface.Atspi.Text.character_extents { get; }
-      Elm.Interface.Atspi.Text.character_count { get; }
-      Elm.Interface.Atspi.Text.offset_at_point { get; }
-      Elm.Interface.Atspi.Text.bounded_ranges { get; }
-      Elm.Interface.Atspi.Text.range_extents { get; }
-      Elm.Interface.Atspi.Text.selection { get; set; }
-      Elm.Interface.Atspi.Text.selections_count { get; }
-      Elm.Interface.Atspi.Text.selection_add;
-      Elm.Interface.Atspi.Text.selection_remove;
-      Elm.Interface.Atspi.Text.Editable.content { set; }
-      Elm.Interface.Atspi.Text.Editable.insert;
-      Elm.Interface.Atspi.Text.Editable.copy;
-      Elm.Interface.Atspi.Text.Editable.cut;
-      Elm.Interface.Atspi.Text.Editable.delete;
-      Elm.Interface.Atspi.Text.Editable.paste;
+      Efl.Access.Text.text { get; }
+      Efl.Access.Text.string { get; }
+      Efl.Access.Text.attribute { get; }
+      Efl.Access.Text.attributes { get; }
+      Efl.Access.Text.default_attributes { get; }
+      Efl.Access.Text.caret_offset { get; set; }
+      Efl.Access.Text.character { get; }
+      Efl.Access.Text.character_extents { get; }
+      Efl.Access.Text.character_count { get; }
+      Efl.Access.Text.offset_at_point { get; }
+      Efl.Access.Text.bounded_ranges { get; }
+      Efl.Access.Text.range_extents { get; }
+      Efl.Access.Text.selection { get; set; }
+      Efl.Access.Text.selections_count { get; }
+      Efl.Access.Text.selection_add;
+      Efl.Access.Text.selection_remove;
+      Efl.Access.Editable.Text.content { set; }
+      Efl.Access.Editable.Text.insert;
+      Efl.Access.Editable.Text.copy;
+      Efl.Access.Editable.Text.cut;
+      Efl.Access.Editable.Text.delete;
+      Efl.Access.Editable.Text.paste;
       Efl.File.file { get; set; }
       Efl.Part.part;
    }
diff --git a/src/lib/elementary/elm_interface_atspi_text.h b/src/lib/elementary/elm_interface_atspi_text.h
deleted file mode 100644
index 3b65d0e92a..0000000000
--- a/src/lib/elementary/elm_interface_atspi_text.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef ELM_INTERFACE_ATSPI_TEXT_H
-#define ELM_INTERFACE_ATSPI_TEXT_H
-
-#ifdef EFL_BETA_API_SUPPORT
-
-#ifdef EFL_EO_API_SUPPORT
-#include "elm_interface_atspi_text.eo.h"
-#endif
-#ifndef EFL_NOLEGACY_API_SUPPORT
-#include "elm_interface_atspi_text.eo.legacy.h"
-#endif
-
-/**
- * @brief Free Elm_Atspi_Text_Attribute structure
- */
-EAPI void elm_atspi_text_text_attribute_free(Elm_Atspi_Text_Attribute *attr);
-
-#endif
-#endif
diff --git a/src/lib/elementary/elm_interfaces.h b/src/lib/elementary/elm_interfaces.h
index 32ae95ea5d..09696a4008 100644
--- a/src/lib/elementary/elm_interfaces.h
+++ b/src/lib/elementary/elm_interfaces.h
@@ -1,5 +1,5 @@
 #include "elm_interface_atspi_accessible.h"
-#include "elm_interface_atspi_text.h"
+#include "efl_access_text.h"
 #include "elm_interface_atspi_widget_action.h"
 #include "efl_access_window.h"
 
@@ -8,7 +8,7 @@
 #ifdef EFL_BETA_API_SUPPORT
 #include "efl_access_action.eo.h"
 #include "efl_access_component.eo.h"
-#include "elm_interface_atspi_text_editable.eo.h"
+#include "efl_access_editable_text.eo.h"
 #include "efl_access_image.eo.h"
 #include "efl_access_selection.eo.h"
 #include "efl_access_value.eo.h"
@@ -18,7 +18,7 @@
 #ifdef EFL_BETA_API_SUPPORT
 #include "efl_access_action.eo.legacy.h"
 #include "efl_access_component.eo.legacy.h"
-#include "elm_interface_atspi_text_editable.eo.legacy.h"
+#include "efl_access_editable_text.eo.legacy.h"
 #include "efl_access_image.eo.legacy.h"
 #include "efl_access_selection.eo.legacy.h"
 #include "efl_access_value.eo.legacy.h"
diff --git a/src/tests/elementary/elm_test_entry.c b/src/tests/elementary/elm_test_entry.c
index d6bcd86110..e2a9a5d386 100644
--- a/src/tests/elementary/elm_test_entry.c
+++ b/src/tests/elementary/elm_test_entry.c
@@ -2,7 +2,7 @@
 # include "elementary_config.h"
 #endif
 
-#define ELM_INTERFACE_ATSPI_TEXT_PROTECTED
+#define EFL_ACCESS_TEXT_PROTECTED
 #define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
 #include <Elementary.h>
 #include "elm_suite.h"
@@ -85,22 +85,22 @@ START_TEST (elm_entry_atspi_text_char_get)
 
    expected = eina_unicode_utf8_to_unicode(txt, NULL);
 
-   val = elm_interface_atspi_text_character_get(entry, -1);
+   val = efl_access_text_character_get(entry, -1);
    ck_assert(val == 0);
 
-   val = elm_interface_atspi_text_character_get(entry, 0);
+   val = efl_access_text_character_get(entry, 0);
    ck_assert(val == expected[0]);
 
-   val = elm_interface_atspi_text_character_get(entry, 1);
+   val = efl_access_text_character_get(entry, 1);
    ck_assert(val == expected[1]);
 
-   val = elm_interface_atspi_text_character_get(entry, 2);
+   val = efl_access_text_character_get(entry, 2);
    ck_assert(val == expected[2]);
 
-   val = elm_interface_atspi_text_character_get(entry, 6);
+   val = efl_access_text_character_get(entry, 6);
    ck_assert(val == expected[6]);
 
-   val = elm_interface_atspi_text_character_get(entry, 26);
+   val = efl_access_text_character_get(entry, 26);
    ck_assert(val == 0);
 
    free(expected);
@@ -121,7 +121,7 @@ START_TEST (elm_entry_atspi_text_char_count)
    entry = elm_entry_add(win);
    elm_object_text_set(entry, mtxt);
 
-   val = elm_interface_atspi_text_character_count_get(entry);
+   val = efl_access_text_character_count_get(entry);
    ck_assert(val == 12);
 
    elm_shutdown();
@@ -143,28 +143,28 @@ START_TEST (elm_entry_atspi_text_string_get_char)
    elm_object_text_set(entry, txt);
 
    start = 1;
-   val = elm_interface_atspi_text_string_get(entry, ELM_ATSPI_TEXT_GRANULARITY_CHAR, &start, &end);
+   val = efl_access_text_string_get(entry, EFL_ACCESS_TEXT_GRANULARITY_CHAR, &start, &end);
    ck_assert_str_eq(val, "o");
    ck_assert(start == 1);
    ck_assert(end == 2);
    if (val) free(val);
 
    start = 8;
-   val = elm_interface_atspi_text_string_get(entry, ELM_ATSPI_TEXT_GRANULARITY_CHAR, &start, &end);
+   val = efl_access_text_string_get(entry, EFL_ACCESS_TEXT_GRANULARITY_CHAR, &start, &end);
    ck_assert_str_eq(val, "ś");
    ck_assert(start == 8);
    ck_assert(end == 9);
    if (val) free(val);
 
    start = 11;
-   val = elm_interface_atspi_text_string_get(entry, ELM_ATSPI_TEXT_GRANULARITY_CHAR, &start, &end);
+   val = efl_access_text_string_get(entry, EFL_ACCESS_TEXT_GRANULARITY_CHAR, &start, &end);
    ck_assert_str_eq(val, " ");
    ck_assert(start == 11);
    ck_assert(end == 12);
    if (val) free(val);
 
    start = 111;
-   val = elm_interface_atspi_text_string_get(entry, ELM_ATSPI_TEXT_GRANULARITY_CHAR, &start, &end);
+   val = efl_access_text_string_get(entry, EFL_ACCESS_TEXT_GRANULARITY_CHAR, &start, &end);
    ck_assert(start == -1);
    ck_assert(end == -1);
    ck_assert(val == NULL);
@@ -188,28 +188,28 @@ START_TEST (elm_entry_atspi_text_string_get_word)
    elm_object_text_set(entry, txt);
 
    start = 1;
-   val = elm_interface_atspi_text_string_get(entry, ELM_ATSPI_TEXT_GRANULARITY_WORD, &start, &end);
+   val = efl_access_text_string_get(entry, EFL_ACCESS_TEXT_GRANULARITY_WORD, &start, &end);
    ck_assert_str_eq(val, "Lorem");
    ck_assert(start == 0);
    ck_assert(end == 5);
    if (val) free(val);
 
    start = 6;
-   val = elm_interface_atspi_text_string_get(entry, ELM_ATSPI_TEXT_GRANULARITY_WORD, &start, &end);
+   val = efl_access_text_string_get(entry, EFL_ACCESS_TEXT_GRANULARITY_WORD, &start, &end);
    ck_assert_str_eq(val, "ipśum");
    ck_assert(start == 6);
    ck_assert(end == 11);
    if (val) free(val);
 
    start = 19;
-   val = elm_interface_atspi_text_string_get(entry, ELM_ATSPI_TEXT_GRANULARITY_WORD, &start, &end);
+   val = efl_access_text_string_get(entry, EFL_ACCESS_TEXT_GRANULARITY_WORD, &start, &end);
    ck_assert_str_eq(val, "dolor");
    ck_assert(start == 14);
    ck_assert(end == 19);
    if (val) free(val);
 
    start = 111;
-   val = elm_interface_atspi_text_string_get(entry, ELM_ATSPI_TEXT_GRANULARITY_WORD, &start, &end);
+   val = efl_access_text_string_get(entry, EFL_ACCESS_TEXT_GRANULARITY_WORD, &start, &end);
    ck_assert(start == -1);
    ck_assert(end == -1);
    ck_assert(val == NULL);
@@ -234,28 +234,28 @@ START_TEST (elm_entry_atspi_text_string_get_paragraph)
    elm_object_text_set(entry, txt);
 
    start = 1;
-   val = elm_interface_atspi_text_string_get(entry, ELM_ATSPI_TEXT_GRANULARITY_PARAGRAPH, &start, &end);
+   val = efl_access_text_string_get(entry, EFL_ACCESS_TEXT_GRANULARITY_PARAGRAPH, &start, &end);
    ck_assert_str_eq(val, "Lorem ipśum");
    ck_assert(start == 0);
    ck_assert(end == 11);
    if (val) free(val);
 
    start = 20;
-   val = elm_interface_atspi_text_string_get(entry, ELM_ATSPI_TEXT_GRANULARITY_PARAGRAPH, &start, &end);
+   val = efl_access_text_string_get(entry, EFL_ACCESS_TEXT_GRANULARITY_PARAGRAPH, &start, &end);
    ck_assert_str_eq(val, "   dolor sit");
    ck_assert(start == 12);
    ck_assert(end == 24);
    if (val) free(val);
 
    start = 25;
-   val = elm_interface_atspi_text_string_get(entry, ELM_ATSPI_TEXT_GRANULARITY_PARAGRAPH, &start, &end);
+   val = efl_access_text_string_get(entry, EFL_ACCESS_TEXT_GRANULARITY_PARAGRAPH, &start, &end);
    ck_assert_str_eq(val, " amęt");
    ck_assert(start == 25);
    ck_assert(end == 30);
    if (val) free(val);
 
    start = 111;
-   val = elm_interface_atspi_text_string_get(entry, ELM_ATSPI_TEXT_GRANULARITY_WORD, &start, &end);
+   val = efl_access_text_string_get(entry, EFL_ACCESS_TEXT_GRANULARITY_WORD, &start, &end);
    ck_assert(start == -1);
    ck_assert(end == -1);
    ck_assert(val == NULL);
@@ -282,7 +282,7 @@ START_TEST (elm_entry_atspi_text_string_get_line)
    elm_object_text_set(entry, txt);
 
    start = 1;
-   val = elm_interface_atspi_text_string_get(entry, ELM_ATSPI_TEXT_GRANULARITY_LINE, &start, &end);
+   val = efl_access_text_string_get(entry, EFL_ACCESS_TEXT_GRANULARITY_LINE, &start, &end);
 
    ck_assert_str_eq(val, "Lorem ipśum");
    ck_assert(start == 0);
@@ -290,7 +290,7 @@ START_TEST (elm_entry_atspi_text_string_get_line)
    if (val) free(val);
 
    start = 13;
-   val = elm_interface_atspi_text_string_get(entry, ELM_ATSPI_TEXT_GRANULARITY_LINE, &start, &end);
+   val = efl_access_text_string_get(entry, EFL_ACCESS_TEXT_GRANULARITY_LINE, &start, &end);
    ck_assert_str_eq(val, "   dolor sit amęt");
    ck_assert(start == 12);
    ck_assert(end == 29);
@@ -313,17 +313,17 @@ START_TEST (elm_entry_atspi_text_text_get)
    elm_object_text_set(entry, txt);
 
    // invalid ranges
-   val = elm_interface_atspi_text_get(entry, 6, 100);
+   val = efl_access_text_get(entry, 6, 100);
    ck_assert(val == NULL);
-   val = elm_interface_atspi_text_get(entry, -6, 10);
+   val = efl_access_text_get(entry, -6, 10);
    ck_assert(val == NULL);
-   val = elm_interface_atspi_text_get(entry, -6, -10);
+   val = efl_access_text_get(entry, -6, -10);
    ck_assert(val == NULL);
-   val = elm_interface_atspi_text_get(entry, 60, 100);
+   val = efl_access_text_get(entry, 60, 100);
    ck_assert(val == NULL);
 
    // proper range
-   val = elm_interface_atspi_text_get(entry, 6, 17);
+   val = efl_access_text_get(entry, 6, 17);
    ck_assert_str_eq(val, "Xpśum dolor");
 
    if (val) free(val);
@@ -345,30 +345,30 @@ START_TEST (elm_entry_atspi_text_selections)
    entry = elm_entry_add(win);
    elm_object_text_set(entry, txt);
 
-   val = elm_interface_atspi_text_selections_count_get(entry);
+   val = efl_access_text_selections_count_get(entry);
    ck_assert(val == 0);
 
    elm_entry_select_region_set(entry, 2, 4);
-   val = elm_interface_atspi_text_selections_count_get(entry);
+   val = efl_access_text_selections_count_get(entry);
    ck_assert(val == 1);
-   elm_interface_atspi_text_selection_get(entry, 0, &start, &end);
+   efl_access_text_selection_get(entry, 0, &start, &end);
    ck_assert(start == 2);
    ck_assert(end == 4);
 
    elm_entry_select_region_set(entry, 6, 10);
-   val = elm_interface_atspi_text_selections_count_get(entry);
+   val = efl_access_text_selections_count_get(entry);
    ck_assert(val == 1);
-   elm_interface_atspi_text_selection_get(entry, 0, &start, &end);
+   efl_access_text_selection_get(entry, 0, &start, &end);
    ck_assert(start == 6);
    ck_assert(end == 10);
 
    elm_entry_select_none(entry);
-   ret = elm_interface_atspi_text_selection_add(entry, 2, 5);
+   ret = efl_access_text_selection_add(entry, 2, 5);
    ck_assert(ret == EINA_TRUE);
    str = elm_entry_selection_get(entry);
    ck_assert_str_eq(str, "rem");
 
-   ret = elm_interface_atspi_text_selection_remove(entry, 0);
+   ret = efl_access_text_selection_remove(entry, 0);
    ck_assert(ret == EINA_TRUE);
    str = elm_entry_selection_get(entry);
    ck_assert(str == NULL);