elm: rename Elm_Interface_Atspi_Accessible interface

Subscribers: cedric, jpeg Differential Revision: https://phab.enlightenment.org/D5341
author: Lukasz Stanislawski <lukasz.stanislawski@gmail.com> 2017-10-19 10:13:54 +0900
committer: Jean-Philippe Andre <jp.andre@samsung.com> 2017-10-19 10:13:54 +0900
commit: 57aefc53c18c14ada19dcd09d3e5b5612b277b16 (patch)
tree: 897745eb7c2d9ccbbde1bc0cf4dd2971c2e625f4 /src/tests
parent: 98622623a0865c525ede12ef5759ab6f5b3af407 (diff)
download: efl-57aefc53c18c14ada19dcd09d3e5b5612b277b16.tar.gz
64 files changed, 377 insertions, 379 deletions
diff --git a/src/tests/elementary/elm_test_actionslider.c b/src/tests/elementary/elm_test_actionslider.c
index a6d7137fb0..ef5f849d8f 100644
--- a/src/tests/elementary/elm_test_actionslider.c
+++ b/src/tests/elementary/elm_test_actionslider.c
@@ -2,22 +2,22 @@
 # include "elementary_config.h"
 #endif
 
-#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
+#define EFL_ACCESS_PROTECTED
 #include <Elementary.h>
 #include "elm_suite.h"
 
 START_TEST (elm_atspi_role_get)
 {
    Evas_Object *win, *actionslider;
-   Elm_Atspi_Role role;
+   Efl_Access_Role role;
 
    elm_init(1, NULL);
    win = elm_win_add(NULL, "actionslider", ELM_WIN_BASIC);
 
    actionslider = elm_actionslider_add(win);
-   role = elm_interface_atspi_accessible_role_get(actionslider);
+   role = efl_access_role_get(actionslider);
 
-   ck_assert(role == ELM_ATSPI_ROLE_SLIDER);
+   ck_assert(role == EFL_ACCESS_ROLE_SLIDER);
 
    elm_shutdown();
 }
diff --git a/src/tests/elementary/elm_test_atspi.c b/src/tests/elementary/elm_test_atspi.c
index 8f9e043870..1875fb24fc 100644
--- a/src/tests/elementary/elm_test_atspi.c
+++ b/src/tests/elementary/elm_test_atspi.c
@@ -3,7 +3,7 @@
 #endif
 
 #define ELM_INTERNAL_API_ARGESFSDFEFC
-#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
+#define EFL_ACCESS_PROTECTED
 
 #include <Elementary.h>
 #include "elm_priv.h"
@@ -25,7 +25,7 @@ void generate_app(void)
    evas_object_show(g_win);
 }
 
-START_TEST (elm_atspi_app_obj_name_get)
+START_TEST (test_efl_access_app_obj_name_get)
 {
    elm_init(0, NULL);
 
@@ -37,7 +37,7 @@ START_TEST (elm_atspi_app_obj_name_get)
 
    elm_app_name_set("Test name");
 
-   ret = elm_interface_atspi_accessible_name_get(root);
+   ret = efl_access_name_get(root);
 
    ck_assert_str_eq(ret, "Test name");
 
@@ -46,14 +46,14 @@ START_TEST (elm_atspi_app_obj_name_get)
 }
 END_TEST
 
-START_TEST (elm_atspi_name_get)
+START_TEST (test_efl_access_name_get)
 {
    elm_init(0, NULL);
    generate_app();
 
    const char *name;
 
-   name = elm_interface_atspi_accessible_name_get(g_btn);
+   name = efl_access_name_get(g_btn);
 
    if (name && name[0]) {
       ck_assert(0);
@@ -62,7 +62,7 @@ START_TEST (elm_atspi_name_get)
    // Set name with additional text tags
    elm_object_text_set(g_btn, "Some<br>text");
 
-   name = elm_interface_atspi_accessible_name_get(g_btn);
+   name = efl_access_name_get(g_btn);
 
    // Accessible name should have cleared tags
    ck_assert(name != NULL);
@@ -72,7 +72,7 @@ START_TEST (elm_atspi_name_get)
 }
 END_TEST
 
-START_TEST (elm_atspi_name_set)
+START_TEST (test_efl_access_name_set)
 {
    elm_init(0, NULL);
    generate_app();
@@ -80,15 +80,15 @@ START_TEST (elm_atspi_name_set)
    const char *name;
 
    elm_object_text_set(g_btn, "Other text");
-   elm_interface_atspi_accessible_name_set(g_btn, "Test name");
+   efl_access_name_set(g_btn, "Test name");
 
-   name = elm_interface_atspi_accessible_name_get(g_btn);
+   name = efl_access_name_get(g_btn);
 
    ck_assert(name != NULL);
    ck_assert_str_eq(name, "Test name");
 
-   elm_interface_atspi_accessible_name_set(g_btn, NULL);
-   name = elm_interface_atspi_accessible_name_get(g_btn);
+   efl_access_name_set(g_btn, NULL);
+   name = efl_access_name_get(g_btn);
 
    ck_assert(name != NULL);
    ck_assert_str_eq(name, "Other text");
@@ -97,48 +97,46 @@ START_TEST (elm_atspi_name_set)
 }
 END_TEST
 
-START_TEST (elm_atspi_role_get)
+START_TEST (test_efl_access_role_get)
 {
    elm_init(0, NULL);
 
    Eo* root = efl_add(ELM_ATSPI_APP_OBJECT_CLASS, NULL);
 
-   Elm_Atspi_Role role;
+   Efl_Access_Role role;
 
-   role = elm_interface_atspi_accessible_role_get(root);
+   role = efl_access_role_get(root);
 
-   ck_assert(role == ELM_ATSPI_ROLE_APPLICATION);
+   ck_assert(role == EFL_ACCESS_ROLE_APPLICATION);
 
    efl_unref(root);
    elm_shutdown();
 }
 END_TEST
 
-START_TEST (elm_atspi_role_set)
+START_TEST (test_efl_access_role_set)
 {
    elm_init(0, NULL);
    generate_app();
-   Elm_Atspi_Role role;
+   Efl_Access_Role role;
 
-   elm_interface_atspi_accessible_role_set(g_btn, ELM_ATSPI_ROLE_ACCELERATOR_LABEL);
-   role = elm_interface_atspi_accessible_role_get(g_btn);
+   efl_access_role_set(g_btn, EFL_ACCESS_ROLE_ACCELERATOR_LABEL);
+   role = efl_access_role_get(g_btn);
 
-   if (role != ELM_ATSPI_ROLE_ACCELERATOR_LABEL)
+   if (role != EFL_ACCESS_ROLE_ACCELERATOR_LABEL)
       ck_assert(0);
 
-   elm_interface_atspi_accessible_role_set(g_btn, ELM_ATSPI_ROLE_ENTRY);
-   role = elm_interface_atspi_accessible_role_get(g_btn);
+   efl_access_role_set(g_btn, EFL_ACCESS_ROLE_ENTRY);
+   role = efl_access_role_get(g_btn);
 
-   if (role != ELM_ATSPI_ROLE_ENTRY)
+   if (role != EFL_ACCESS_ROLE_ENTRY)
       ck_assert(0);
 
    elm_shutdown();
 }
 END_TEST
 
-
-
-START_TEST (elm_atspi_role_name_get)
+START_TEST (test_efl_access_role_name_get)
 {
    elm_init(0, NULL);
 
@@ -146,7 +144,7 @@ START_TEST (elm_atspi_role_name_get)
 
    const char *ret = NULL;
 
-   ret = elm_interface_atspi_accessible_role_name_get(root);
+   ret = efl_access_role_name_get(root);
 
    ck_assert(ret != NULL);
 
@@ -155,7 +153,7 @@ START_TEST (elm_atspi_role_name_get)
 }
 END_TEST
 
-START_TEST (elm_atspi_localized_role_name_get)
+START_TEST (test_efl_access_localized_role_name_get)
 {
    elm_init(0, NULL);
 
@@ -163,7 +161,7 @@ START_TEST (elm_atspi_localized_role_name_get)
 
    const char *ret = NULL;
 
-   ret = elm_interface_atspi_accessible_localized_role_name_get(root);
+   ret = efl_access_localized_role_name_get(root);
 
    ck_assert(ret != NULL);
 
@@ -172,7 +170,7 @@ START_TEST (elm_atspi_localized_role_name_get)
 }
 END_TEST
 
-START_TEST (elm_atspi_description_set)
+START_TEST (test_efl_access_description_set)
 {
    elm_init(0, NULL);
 
@@ -182,18 +180,18 @@ START_TEST (elm_atspi_description_set)
 
    const char *desc = "Test description";
 
-   ret = elm_interface_atspi_accessible_description_get(root);
+   ret = efl_access_description_get(root);
 
    ck_assert(ret == NULL);
 
-   elm_interface_atspi_accessible_description_set(root, desc);
-   ret = elm_interface_atspi_accessible_description_get(root);
+   efl_access_description_set(root, desc);
+   ret = efl_access_description_get(root);
 
    ck_assert(ret != NULL);
    ck_assert_str_eq(ret, "Test description");
 
-   elm_interface_atspi_accessible_description_set(root, NULL);
-   ret = elm_interface_atspi_accessible_description_get(root);
+   efl_access_description_set(root, NULL);
+   ret = efl_access_description_get(root);
 
    ck_assert(ret == NULL);
 
@@ -203,13 +201,13 @@ START_TEST (elm_atspi_description_set)
 END_TEST
 
 /* Test if initial description value is NULL */
-START_TEST (elm_atspi_description_get)
+START_TEST (test_efl_access_description_get)
 {
    elm_init(0, NULL);
    generate_app();
 
    const char *descr;
-   descr = elm_interface_atspi_accessible_description_get(g_bg);
+   descr = efl_access_description_get(g_bg);
 
    ck_assert(descr == NULL);
 
@@ -217,7 +215,7 @@ START_TEST (elm_atspi_description_get)
 }
 END_TEST
 
-START_TEST (elm_atspi_children_and_parent)
+START_TEST (test_efl_access_children_and_parent)
 {
    elm_init(0, NULL);
 
@@ -226,9 +224,9 @@ START_TEST (elm_atspi_children_and_parent)
 
    Eina_List *child_list = NULL;
 
-   child_list = elm_interface_atspi_accessible_children_get(root);
+   child_list = efl_access_children_get(root);
 
-   //bg_child_list = elm_interface_atspi_accessible_children_get(eina_list_nth(child_list, 0));
+   //bg_child_list = efl_access_children_get(eina_list_nth(child_list, 0));
 
    ck_assert(eina_list_count(child_list) == 1);
 
@@ -244,7 +242,7 @@ START_TEST (elm_atspi_children_and_parent)
 }
 END_TEST
 
-START_TEST (elm_atspi_children_and_parent2)
+START_TEST (test_efl_access_children_and_parent2)
 {
    elm_init(0, NULL);
 
@@ -254,11 +252,11 @@ START_TEST (elm_atspi_children_and_parent2)
    Eo *win = NULL;
 
    Eina_List *root_children;
-   root_children = elm_interface_atspi_accessible_children_get(root);
+   root_children = efl_access_children_get(root);
    win = eina_list_nth(root_children, 0);
 
    Eina_List *win_children;
-   win_children = elm_interface_atspi_accessible_children_get(win);
+   win_children = efl_access_children_get(win);
 
    ck_assert(eina_list_count(win_children) == 1);
 
@@ -274,14 +272,14 @@ START_TEST (elm_atspi_children_and_parent2)
 END_TEST
 
 /* Initial value of translation domain should be NULL */
-START_TEST (elm_atspi_translation_domain_get)
+START_TEST (test_efl_access_translation_domain_get)
 {
    elm_init(0, NULL);
    generate_app();
 
    const char *domain;
 
-   domain = elm_interface_atspi_accessible_translation_domain_get(g_btn);
+   domain = efl_access_translation_domain_get(g_btn);
 
    ck_assert(domain == NULL);
 
@@ -289,21 +287,21 @@ START_TEST (elm_atspi_translation_domain_get)
 }
 END_TEST
 
-START_TEST (elm_atspi_translation_domain_set)
+START_TEST (test_efl_access_translation_domain_set)
 {
    elm_init(0, NULL);
    generate_app();
 
    const char *domain;
 
-   elm_interface_atspi_accessible_translation_domain_set(g_btn, "Test translation_domain");
-   domain = elm_interface_atspi_accessible_translation_domain_get(g_btn);
+   efl_access_translation_domain_set(g_btn, "Test translation_domain");
+   domain = efl_access_translation_domain_get(g_btn);
 
    ck_assert(domain != NULL);
    ck_assert_str_eq(domain, "Test translation_domain");
 
-   elm_interface_atspi_accessible_translation_domain_set(g_btn, NULL);
-   domain = elm_interface_atspi_accessible_translation_domain_get(g_btn);
+   efl_access_translation_domain_set(g_btn, NULL);
+   domain = efl_access_translation_domain_get(g_btn);
 
    ck_assert(domain == NULL);
 
@@ -311,18 +309,18 @@ START_TEST (elm_atspi_translation_domain_set)
 }
 END_TEST
 
-START_TEST (elm_atspi_relationship_append)
+START_TEST (test_efl_access_relationship_append)
 {
    elm_init(0, NULL);
    generate_app();
 
-   Elm_Atspi_Relation_Set set;
-   Elm_Atspi_Relation *rel, *rel_to, *rel_from;
+   Efl_Access_Relation_Set set;
+   Efl_Access_Relation *rel, *rel_to, *rel_from;
    Eina_List *l;
 
-   elm_interface_atspi_accessible_relationship_append(g_btn, ELM_ATSPI_RELATION_FLOWS_TO, g_bg);
-   elm_interface_atspi_accessible_relationship_append(g_btn, ELM_ATSPI_RELATION_FLOWS_FROM, g_win);
-   set = elm_interface_atspi_accessible_relation_set_get(g_btn);
+   efl_access_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_TO, g_bg);
+   efl_access_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_FROM, g_win);
+   set = efl_access_relation_set_get(g_btn);
 
    ck_assert(set != NULL);
    ck_assert(eina_list_count(set) >= 2);
@@ -330,9 +328,9 @@ START_TEST (elm_atspi_relationship_append)
    rel_to = rel_from = NULL;
    EINA_LIST_FOREACH(set, l, rel)
    {
-      if (rel->type == ELM_ATSPI_RELATION_FLOWS_TO)
+      if (rel->type == EFL_ACCESS_RELATION_FLOWS_TO)
         rel_to = rel;
-      if (rel->type == ELM_ATSPI_RELATION_FLOWS_FROM)
+      if (rel->type == EFL_ACCESS_RELATION_FLOWS_FROM)
         rel_from = rel;
    }
 
@@ -342,19 +340,19 @@ START_TEST (elm_atspi_relationship_append)
    ck_assert(rel_from != NULL);
    ck_assert(eina_list_data_find(rel_from->objects, g_win) != NULL);
 
-   elm_atspi_relation_set_free(set);
+   efl_access_relation_set_free(set);
 
    /* Check if append do not procude duplicated relations */
-   elm_interface_atspi_accessible_relationship_append(g_btn, ELM_ATSPI_RELATION_FLOWS_TO, g_bg);
-   elm_interface_atspi_accessible_relationship_append(g_btn, ELM_ATSPI_RELATION_FLOWS_FROM, g_win);
-   set = elm_interface_atspi_accessible_relation_set_get(g_btn);
+   efl_access_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_TO, g_bg);
+   efl_access_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_FROM, g_win);
+   set = efl_access_relation_set_get(g_btn);
 
    rel_to = rel_from = NULL;
    EINA_LIST_FOREACH(set, l, rel)
    {
-      if (rel->type == ELM_ATSPI_RELATION_FLOWS_TO)
+      if (rel->type == EFL_ACCESS_RELATION_FLOWS_TO)
         rel_to = rel;
-      if (rel->type == ELM_ATSPI_RELATION_FLOWS_FROM)
+      if (rel->type == EFL_ACCESS_RELATION_FLOWS_FROM)
         rel_from = rel;
    }
 
@@ -368,26 +366,26 @@ START_TEST (elm_atspi_relationship_append)
    rel_from->objects = eina_list_remove(rel_from->objects, g_win);
    ck_assert(eina_list_data_find(rel_from->objects, g_win) == NULL);
 
-   elm_atspi_relation_set_free(set);
+   efl_access_relation_set_free(set);
 
    elm_shutdown();
 }
 END_TEST
 
-START_TEST (elm_atspi_relationship_remove)
+START_TEST (test_efl_access_relationship_remove)
 {
    elm_init(0, NULL);
    generate_app();
 
-   Elm_Atspi_Relation_Set set;
-   Elm_Atspi_Relation *rel, *rel_to, *rel_from;
+   Efl_Access_Relation_Set set;
+   Efl_Access_Relation *rel, *rel_to, *rel_from;
    Eina_List *l;
 
    /* Test if removal of single relationship works */
-   elm_interface_atspi_accessible_relationship_append(g_btn, ELM_ATSPI_RELATION_FLOWS_TO, g_bg);
-   elm_interface_atspi_accessible_relationship_append(g_btn, ELM_ATSPI_RELATION_FLOWS_FROM, g_win);
-   elm_interface_atspi_accessible_relationship_remove(g_btn, ELM_ATSPI_RELATION_FLOWS_TO, g_bg);
-   set = elm_interface_atspi_accessible_relation_set_get(g_btn);
+   efl_access_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_TO, g_bg);
+   efl_access_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_FROM, g_win);
+   efl_access_relationship_remove(g_btn, EFL_ACCESS_RELATION_FLOWS_TO, g_bg);
+   set = efl_access_relation_set_get(g_btn);
 
    ck_assert(set != NULL);
    ck_assert(eina_list_count(set) >= 1);
@@ -395,9 +393,9 @@ START_TEST (elm_atspi_relationship_remove)
    rel_to = rel_from = NULL;
    EINA_LIST_FOREACH(set, l, rel)
    {
-      if (rel->type == ELM_ATSPI_RELATION_FLOWS_TO)
+      if (rel->type == EFL_ACCESS_RELATION_FLOWS_TO)
         rel_to = rel;
-      if (rel->type == ELM_ATSPI_RELATION_FLOWS_FROM)
+      if (rel->type == EFL_ACCESS_RELATION_FLOWS_FROM)
         rel_from = rel;
    }
 
@@ -405,20 +403,20 @@ START_TEST (elm_atspi_relationship_remove)
    ck_assert(rel_from != NULL);
    ck_assert(eina_list_data_find(rel_from->objects, g_win) != NULL);
 
-   elm_atspi_relation_set_free(set);
+   efl_access_relation_set_free(set);
 
    /* Test if removal of type relationship works */
-   elm_interface_atspi_accessible_relationship_append(g_btn, ELM_ATSPI_RELATION_FLOWS_TO, g_bg);
-   elm_interface_atspi_accessible_relationship_append(g_btn, ELM_ATSPI_RELATION_FLOWS_TO, g_win);
-   elm_interface_atspi_accessible_relationship_remove(g_btn, ELM_ATSPI_RELATION_FLOWS_TO, NULL);
-   set = elm_interface_atspi_accessible_relation_set_get(g_btn);
+   efl_access_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_TO, g_bg);
+   efl_access_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_TO, g_win);
+   efl_access_relationship_remove(g_btn, EFL_ACCESS_RELATION_FLOWS_TO, NULL);
+   set = efl_access_relation_set_get(g_btn);
 
    rel_to = rel_from = NULL;
    EINA_LIST_FOREACH(set, l, rel)
    {
-      if (rel->type == ELM_ATSPI_RELATION_FLOWS_TO)
+      if (rel->type == EFL_ACCESS_RELATION_FLOWS_TO)
         rel_to = rel;
-      if (rel->type == ELM_ATSPI_RELATION_FLOWS_FROM)
+      if (rel->type == EFL_ACCESS_RELATION_FLOWS_FROM)
         rel_from = rel;
    }
 
@@ -426,77 +424,77 @@ START_TEST (elm_atspi_relationship_remove)
    ck_assert(rel_from != NULL);
    ck_assert(eina_list_data_find(rel_from->objects, g_win) != NULL);
 
-   elm_atspi_relation_set_free(set);
+   efl_access_relation_set_free(set);
 
    /* Test if relationship is implicity removed when object is deleted */
-   elm_interface_atspi_accessible_relationship_append(g_btn, ELM_ATSPI_RELATION_FLOWS_TO, g_bg);
-   elm_interface_atspi_accessible_relationship_append(g_btn, ELM_ATSPI_RELATION_FLOWS_FROM, g_bg);
+   efl_access_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_TO, g_bg);
+   efl_access_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_FROM, g_bg);
    efl_del(g_bg);
-   set = elm_interface_atspi_accessible_relation_set_get(g_btn);
+   set = efl_access_relation_set_get(g_btn);
 
    rel_to = rel_from = NULL;
    EINA_LIST_FOREACH(set, l, rel)
    {
-      if (rel->type == ELM_ATSPI_RELATION_FLOWS_TO)
+      if (rel->type == EFL_ACCESS_RELATION_FLOWS_TO)
         rel_to = rel;
-      if (rel->type == ELM_ATSPI_RELATION_FLOWS_FROM)
+      if (rel->type == EFL_ACCESS_RELATION_FLOWS_FROM)
         rel_from = rel;
    }
 
    if (rel_to) ck_assert(eina_list_data_find(rel_to->objects, g_bg) == NULL);
    if (rel_from) ck_assert(eina_list_data_find(rel_from->objects, g_bg) == NULL);
 
-   elm_atspi_relation_set_free(set);
+   efl_access_relation_set_free(set);
    elm_shutdown();
 }
 END_TEST
 
-START_TEST (elm_atspi_relationships_clear)
+START_TEST (test_efl_access_relationships_clear)
 {
-   Elm_Atspi_Relation_Set set;
-   Elm_Atspi_Relation *rel;
+   Efl_Access_Relation_Set set;
+   Efl_Access_Relation *rel;
    Eina_List *l;
 
    elm_init(0, NULL);
    generate_app();
 
-   elm_interface_atspi_accessible_relationship_append(g_btn, ELM_ATSPI_RELATION_FLOWS_TO, g_bg);
-   elm_interface_atspi_accessible_relationship_append(g_btn, ELM_ATSPI_RELATION_FLOWS_FROM, g_bg);
-   elm_interface_atspi_accessible_relationship_append(g_btn, ELM_ATSPI_RELATION_FLOWS_TO, g_win);
-   elm_interface_atspi_accessible_relationship_append(g_btn, ELM_ATSPI_RELATION_FLOWS_FROM, g_win);
+   efl_access_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_TO, g_bg);
+   efl_access_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_FROM, g_bg);
+   efl_access_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_TO, g_win);
+   efl_access_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_FROM, g_win);
 
-   elm_interface_atspi_accessible_relationships_clear(g_btn);
+   efl_access_relationships_clear(g_btn);
 
-   set = elm_interface_atspi_accessible_relation_set_get(g_btn);
+   set = efl_access_relation_set_get(g_btn);
    EINA_LIST_FOREACH(set, l, rel)
    {
-      ck_assert(!((rel->type == ELM_ATSPI_RELATION_FLOWS_TO) && eina_list_data_find(rel->objects, g_bg)));
-      ck_assert(!((rel->type == ELM_ATSPI_RELATION_FLOWS_FROM) && eina_list_data_find(rel->objects, g_bg)));
-      ck_assert(!((rel->type == ELM_ATSPI_RELATION_FLOWS_TO) && eina_list_data_find(rel->objects, g_win)));
-      ck_assert(!((rel->type == ELM_ATSPI_RELATION_FLOWS_FROM) && eina_list_data_find(rel->objects, g_win)));
+      ck_assert(!((rel->type == EFL_ACCESS_RELATION_FLOWS_TO) && eina_list_data_find(rel->objects, g_bg)));
+      ck_assert(!((rel->type == EFL_ACCESS_RELATION_FLOWS_FROM) && eina_list_data_find(rel->objects, g_bg)));
+      ck_assert(!((rel->type == EFL_ACCESS_RELATION_FLOWS_TO) && eina_list_data_find(rel->objects, g_win)));
+      ck_assert(!((rel->type == EFL_ACCESS_RELATION_FLOWS_FROM) && eina_list_data_find(rel->objects, g_win)));
    }
 
-   elm_atspi_relation_set_free(set);
+   efl_access_relation_set_free(set);
    elm_shutdown();
 }
 END_TEST
 
 void elm_test_atspi(TCase *tc)
 {
-   tcase_add_test(tc, elm_atspi_app_obj_name_get);
-   tcase_add_test(tc, elm_atspi_name_get);
-   tcase_add_test(tc, elm_atspi_name_set);
-   tcase_add_test(tc, elm_atspi_role_get);
-   tcase_add_test(tc, elm_atspi_role_set);
-   tcase_add_test(tc, elm_atspi_role_name_get);
-   tcase_add_test(tc, elm_atspi_localized_role_name_get);
-   tcase_add_test(tc, elm_atspi_description_set);
-   tcase_add_test(tc, elm_atspi_description_get);
-   tcase_add_test(tc, elm_atspi_children_and_parent);
-   tcase_add_test(tc, elm_atspi_children_and_parent2);
-   tcase_add_test(tc, elm_atspi_translation_domain_get);
-   tcase_add_test(tc, elm_atspi_translation_domain_set);
-   tcase_add_test(tc, elm_atspi_relationship_append);
-   tcase_add_test(tc, elm_atspi_relationship_remove);
-   tcase_add_test(tc, elm_atspi_relationships_clear);
+   tcase_add_test(tc, test_efl_access_app_obj_name_get);
+   tcase_add_test(tc, test_efl_access_name_get);
+   tcase_add_test(tc, test_efl_access_name_set);
+   tcase_add_test(tc, test_efl_access_role_get);
+   tcase_add_test(tc, test_efl_access_role_set);
+   tcase_add_test(tc, test_efl_access_role_name_get);
+   tcase_add_test(tc, test_efl_access_localized_role_name_get);
+   tcase_add_test(tc, test_efl_access_description_set);
+   tcase_add_test(tc, test_efl_access_description_get);
+   tcase_add_test(tc, test_efl_access_children_and_parent);
+   tcase_add_test(tc, test_efl_access_children_and_parent2);
+   tcase_add_test(tc, test_efl_access_translation_domain_get);
+   tcase_add_test(tc, test_efl_access_translation_domain_set);
+   tcase_add_test(tc, test_efl_access_relationship_append);
+   tcase_add_test(tc, test_efl_access_relationship_remove);
+   tcase_add_test(tc, test_efl_access_relationships_clear);
 }
diff --git a/src/tests/elementary/elm_test_box.c b/src/tests/elementary/elm_test_box.c
index eb14a53aa5..ca675f2f26 100644
--- a/src/tests/elementary/elm_test_box.c
+++ b/src/tests/elementary/elm_test_box.c
@@ -2,22 +2,22 @@
 # include "elementary_config.h"
 #endif
 
-#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
+#define EFL_ACCESS_PROTECTED
 #include <Elementary.h>
 #include "elm_suite.h"
 
 START_TEST (elm_atspi_role_get)
 {
    Evas_Object *win, *box;
-   Elm_Atspi_Role role;
+   Efl_Access_Role role;
 
    elm_init(1, NULL);
    win = elm_win_add(NULL, "box", ELM_WIN_BASIC);
 
    box = elm_box_add(win);
-   role = elm_interface_atspi_accessible_role_get(box);
+   role = efl_access_role_get(box);
 
-   ck_assert(role == ELM_ATSPI_ROLE_FILLER);
+   ck_assert(role == EFL_ACCESS_ROLE_FILLER);
 
    elm_shutdown();
 }
diff --git a/src/tests/elementary/elm_test_bubble.c b/src/tests/elementary/elm_test_bubble.c
index bbae3ce1d6..c227b4e133 100644
--- a/src/tests/elementary/elm_test_bubble.c
+++ b/src/tests/elementary/elm_test_bubble.c
@@ -2,22 +2,22 @@
 # include "elementary_config.h"
 #endif
 
-#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
+#define EFL_ACCESS_PROTECTED
 #include <Elementary.h>
 #include "elm_suite.h"
 
 START_TEST (elm_atspi_role_get)
 {
    Evas_Object *win, *bubble;
-   Elm_Atspi_Role role;
+   Efl_Access_Role role;
 
    elm_init(1, NULL);
    win = elm_win_add(NULL, "bubble", ELM_WIN_BASIC);
 
    bubble = elm_bubble_add(win);
-   role = elm_interface_atspi_accessible_role_get(bubble);
+   role = efl_access_role_get(bubble);
 
-   ck_assert(role == ELM_ATSPI_ROLE_FILLER);
+   ck_assert(role == EFL_ACCESS_ROLE_FILLER);
 
    elm_shutdown();
 }
diff --git a/src/tests/elementary/elm_test_button.c b/src/tests/elementary/elm_test_button.c
index a07abc41c2..ed3552455c 100644
--- a/src/tests/elementary/elm_test_button.c
+++ b/src/tests/elementary/elm_test_button.c
@@ -2,7 +2,7 @@
 # include "elementary_config.h"
 #endif
 
-#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
+#define EFL_ACCESS_PROTECTED
 #define EFL_ACCESS_COMPONENT_PROTECTED
 #define EFL_ACCESS_ACTION_PROTECTED
 #include <Elementary.h>
@@ -11,15 +11,15 @@
 START_TEST (elm_atspi_role_get)
 {
    Evas_Object *win, *button;
-   Elm_Atspi_Role role;
+   Efl_Access_Role role;
 
    elm_init(1, NULL);
    win = elm_win_add(NULL, "button", ELM_WIN_BASIC);
 
    button = elm_button_add(win);
-   role = elm_interface_atspi_accessible_role_get(button);
+   role = efl_access_role_get(button);
 
-   ck_assert(role == ELM_ATSPI_ROLE_PUSH_BUTTON);
+   ck_assert(role == EFL_ACCESS_ROLE_PUSH_BUTTON);
 
    elm_shutdown();
 }
@@ -34,7 +34,7 @@ START_TEST (elm_atspi_interfaces_check)
 
    button = elm_button_add(win);
 
-   ck_assert(efl_isa(button, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN));
+   ck_assert(efl_isa(button, EFL_ACCESS_MIXIN));
    ck_assert(efl_isa(button, EFL_ACCESS_COMPONENT_MIXIN));
    ck_assert(efl_isa(button, EFL_ACCESS_ACTION_MIXIN));
 
diff --git a/src/tests/elementary/elm_test_calendar.c b/src/tests/elementary/elm_test_calendar.c
index 433b5d14bc..866b60d9b8 100644
--- a/src/tests/elementary/elm_test_calendar.c
+++ b/src/tests/elementary/elm_test_calendar.c
@@ -2,22 +2,22 @@
 # include "elementary_config.h"
 #endif
 
-#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
+#define EFL_ACCESS_PROTECTED
 #include <Elementary.h>
 #include "elm_suite.h"
 
 START_TEST (elm_atspi_role_get)
 {
    Evas_Object *win, *calendar;
-   Elm_Atspi_Role role;
+   Efl_Access_Role role;
 
    elm_init(1, NULL);
    win = elm_win_add(NULL, "calendar", ELM_WIN_BASIC);
 
    calendar = elm_calendar_add(win);
-   role = elm_interface_atspi_accessible_role_get(calendar);
+   role = efl_access_role_get(calendar);
 
-   ck_assert(role == ELM_ATSPI_ROLE_CALENDAR);
+   ck_assert(role == EFL_ACCESS_ROLE_CALENDAR);
 
    elm_shutdown();
 }
diff --git a/src/tests/elementary/elm_test_check.c b/src/tests/elementary/elm_test_check.c
index 8abfe3a05c..b498ee9fc6 100644
--- a/src/tests/elementary/elm_test_check.c
+++ b/src/tests/elementary/elm_test_check.c
@@ -2,7 +2,7 @@
 # include "elementary_config.h"
 #endif
 
-#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
+#define EFL_ACCESS_PROTECTED
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -53,15 +53,15 @@ END_TEST
 START_TEST (elm_atspi_role_get)
 {
    Evas_Object *win, *check;
-   Elm_Atspi_Role role;
+   Efl_Access_Role role;
 
    elm_init(1, NULL);
    win = elm_win_add(NULL, "check", ELM_WIN_BASIC);
 
    check = elm_check_add(win);
-   role = elm_interface_atspi_accessible_role_get(check);
+   role = efl_access_role_get(check);
 
-   ck_assert(role == ELM_ATSPI_ROLE_CHECK_BOX);
+   ck_assert(role == EFL_ACCESS_ROLE_CHECK_BOX);
 
    elm_shutdown();
 }
diff --git a/src/tests/elementary/elm_test_clock.c b/src/tests/elementary/elm_test_clock.c
index 713858d718..34c5a9534d 100644
--- a/src/tests/elementary/elm_test_clock.c
+++ b/src/tests/elementary/elm_test_clock.c
@@ -2,22 +2,22 @@
 # include "elementary_config.h"
 #endif
 
-#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
+#define EFL_ACCESS_PROTECTED
 #include <Elementary.h>
 #include "elm_suite.h"
 
 START_TEST (elm_atspi_role_get)
 {
    Evas_Object *win, *clk;
-   Elm_Atspi_Role role;
+   Efl_Access_Role role;
 
    elm_init(1, NULL);
    win = elm_win_add(NULL, "clock", ELM_WIN_BASIC);
 
    clk = elm_clock_add(win);
-   role = elm_interface_atspi_accessible_role_get(clk);
+   role = efl_access_role_get(clk);
 
-   ck_assert(role == ELM_ATSPI_ROLE_TEXT);
+   ck_assert(role == EFL_ACCESS_ROLE_TEXT);
 
    elm_shutdown();
 }
diff --git a/src/tests/elementary/elm_test_colorselector.c b/src/tests/elementary/elm_test_colorselector.c
index 321f3df03d..472e61e608 100644
--- a/src/tests/elementary/elm_test_colorselector.c
+++ b/src/tests/elementary/elm_test_colorselector.c
@@ -2,7 +2,7 @@
 # include "elementary_config.h"
 #endif
 
-#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
+#define EFL_ACCESS_PROTECTED
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -36,15 +36,15 @@ END_TEST
 START_TEST (elm_atspi_role_get)
 {
    Evas_Object *win, *c;
-   Elm_Atspi_Role role;
+   Efl_Access_Role role;
 
    elm_init(1, NULL);
    win = elm_win_add(NULL, "colorselector", ELM_WIN_BASIC);
 
    c = elm_colorselector_add(win);
-   role = elm_interface_atspi_accessible_role_get(c);
+   role = efl_access_role_get(c);
 
-   ck_assert(role == ELM_ATSPI_ROLE_COLOR_CHOOSER);
+   ck_assert(role == EFL_ACCESS_ROLE_COLOR_CHOOSER);
 
    elm_shutdown();
 }
diff --git a/src/tests/elementary/elm_test_config.c b/src/tests/elementary/elm_test_config.c
index f1c6b14baf..d2d880e9cb 100644
--- a/src/tests/elementary/elm_test_config.c
+++ b/src/tests/elementary/elm_test_config.c
@@ -2,7 +2,7 @@
 # include "elementary_config.h"
 #endif
 
-#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
+#define EFL_ACCESS_PROTECTED
 #include <Elementary.h>
 #include "elm_suite.h"
 
diff --git a/src/tests/elementary/elm_test_conformant.c b/src/tests/elementary/elm_test_conformant.c
index a646e5ecb9..60e3087bb7 100644
--- a/src/tests/elementary/elm_test_conformant.c
+++ b/src/tests/elementary/elm_test_conformant.c
@@ -2,22 +2,22 @@
 # include "elementary_config.h"
 #endif
 
-#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
+#define EFL_ACCESS_PROTECTED
 #include <Elementary.h>
 #include "elm_suite.h"
 
 START_TEST (elm_atspi_role_get)
 {
    Evas_Object *win, *conformant;
-   Elm_Atspi_Role role;
+   Efl_Access_Role role;
 
    elm_init(1, NULL);
    win = elm_win_add(NULL, "conformant", ELM_WIN_BASIC);
 
    conformant = elm_conformant_add(win);
-   role = elm_interface_atspi_accessible_role_get(conformant);
+   role = efl_access_role_get(conformant);
 
-   ck_assert(role == ELM_ATSPI_ROLE_FILLER);
+   ck_assert(role == EFL_ACCESS_ROLE_FILLER);
 
    elm_shutdown();
 }
diff --git a/src/tests/elementary/elm_test_ctxpopup.c b/src/tests/elementary/elm_test_ctxpopup.c
index 5c5ed6f9cc..8db2564d72 100644
--- a/src/tests/elementary/elm_test_ctxpopup.c
+++ b/src/tests/elementary/elm_test_ctxpopup.c
@@ -2,22 +2,22 @@
 # include "elementary_config.h"
 #endif
 
-#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
+#define EFL_ACCESS_PROTECTED
 #include <Elementary.h>
 #include "elm_suite.h"
 
 START_TEST (elm_atspi_role_get)
 {
    Evas_Object *win, *ctxpopup;
-   Elm_Atspi_Role role;
+   Efl_Access_Role role;
 
    elm_init(1, NULL);
    win = elm_win_add(NULL, "icon", ELM_WIN_BASIC);
 
    ctxpopup = elm_ctxpopup_add(win);
-   role = elm_interface_atspi_accessible_role_get(ctxpopup);
+   role = efl_access_role_get(ctxpopup);
 
-   ck_assert(role == ELM_ATSPI_ROLE_POPUP_MENU);
+   ck_assert(role == EFL_ACCESS_ROLE_POPUP_MENU);
 
    elm_shutdown();
 }
diff --git a/src/tests/elementary/elm_test_datetime.c b/src/tests/elementary/elm_test_datetime.c
index 0935f88667..67cd56f639 100644
--- a/src/tests/elementary/elm_test_datetime.c
+++ b/src/tests/elementary/elm_test_datetime.c
@@ -2,22 +2,22 @@
 # include "elementary_config.h"
 #endif
 
-#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
+#define EFL_ACCESS_PROTECTED
 #include <Elementary.h>
 #include "elm_suite.h"
 
 START_TEST (elm_atspi_role_get)
 {
    Evas_Object *win, *datetime;
-   Elm_Atspi_Role role;
+   Efl_Access_Role role;
 
    elm_init(1, NULL);
    win = elm_win_add(NULL, "datetime", ELM_WIN_BASIC);
 
    datetime = elm_datetime_add(win);
-   role = elm_interface_atspi_accessible_role_get(datetime);
+   role = efl_access_role_get(datetime);
 
-   ck_assert(role == ELM_ATSPI_ROLE_DATE_EDITOR);
+   ck_assert(role == EFL_ACCESS_ROLE_DATE_EDITOR);
 
    elm_shutdown();
 }
diff --git a/src/tests/elementary/elm_test_dayselector.c b/src/tests/elementary/elm_test_dayselector.c
index d4f0288782..9c5fe717db 100644
--- a/src/tests/elementary/elm_test_dayselector.c
+++ b/src/tests/elementary/elm_test_dayselector.c
@@ -2,22 +2,22 @@
 # include "elementary_config.h"
 #endif
 
-#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
+#define EFL_ACCESS_PROTECTED
 #include <Elementary.h>
 #include "elm_suite.h"
 
 START_TEST (elm_atspi_role_get)
 {
    Evas_Object *win, *dayselector;
-   Elm_Atspi_Role role;
+   Efl_Access_Role role;
 
    elm_init(1, NULL);
    win = elm_win_add(NULL, "dayselector", ELM_WIN_BASIC);
 
    dayselector = elm_dayselector_add(win);
-   role = elm_interface_atspi_accessible_role_get(dayselector);
+   role = efl_access_role_get(dayselector);
 
-   ck_assert(role == ELM_ATSPI_ROLE_PANEL);
+   ck_assert(role == EFL_ACCESS_ROLE_PANEL);
 
    elm_shutdown();
 }
diff --git a/src/tests/elementary/elm_test_diskselector.c b/src/tests/elementary/elm_test_diskselector.c
index e902939d5a..ab9752d8dd 100644
--- a/src/tests/elementary/elm_test_diskselector.c
+++ b/src/tests/elementary/elm_test_diskselector.c
@@ -2,22 +2,22 @@
 # include "elementary_config.h"
 #endif
 
-#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
+#define EFL_ACCESS_PROTECTED
 #include <Elementary.h>
 #include "elm_suite.h"
 
 START_TEST (elm_atspi_role_get)
 {
    Evas_Object *win, *diskselector;
-   Elm_Atspi_Role role;
+   Efl_Access_Role role;
 
    elm_init(1, NULL);
    win = elm_win_add(NULL, "diskselector", ELM_WIN_BASIC);
 
    diskselector = elm_diskselector_add(win);
-   role = elm_interface_atspi_accessible_role_get(diskselector);
+   role = efl_access_role_get(diskselector);
 
-   ck_assert(role == ELM_ATSPI_ROLE_LIST);
+   ck_assert(role == EFL_ACCESS_ROLE_LIST);
 
    elm_shutdown();
 }
diff --git a/src/tests/elementary/elm_test_entry.c b/src/tests/elementary/elm_test_entry.c
index e2a9a5d386..fe412ccf08 100644
--- a/src/tests/elementary/elm_test_entry.c
+++ b/src/tests/elementary/elm_test_entry.c
@@ -3,7 +3,7 @@
 #endif
 
 #define EFL_ACCESS_TEXT_PROTECTED
-#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
+#define EFL_ACCESS_PROTECTED
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -380,15 +380,15 @@ END_TEST
 START_TEST (elm_atspi_role_get)
 {
    Evas_Object *win, *entry;
-   Elm_Atspi_Role role;
+   Efl_Access_Role role;
 
    elm_init(1, NULL);
    win = elm_win_add(NULL, "entry", ELM_WIN_BASIC);
 
    entry = elm_entry_add(win);
-   role = elm_interface_atspi_accessible_role_get(entry);
+   role = efl_access_role_get(entry);
 
-   ck_assert(role == ELM_ATSPI_ROLE_ENTRY);
+   ck_assert(role == EFL_ACCESS_ROLE_ENTRY);
 
    elm_shutdown();
 }
diff --git a/src/tests/elementary/elm_test_fileselector.c b/src/tests/elementary/elm_test_fileselector.c
index 880054324f..de78924fa4 100644
--- a/src/tests/elementary/elm_test_fileselector.c
+++ b/src/tests/elementary/elm_test_fileselector.c
@@ -2,7 +2,7 @@
 # include "elementary_config.h"
 #endif
 
-#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
+#define EFL_ACCESS_PROTECTED
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -10,15 +10,15 @@
 START_TEST (elm_atspi_role_get)
 {
    Evas_Object *win, *fileselector;
-   Elm_Atspi_Role role;
+   Efl_Access_Role role;
 
    elm_init(1, NULL);
    win = elm_win_add(NULL, "fileselector", ELM_WIN_BASIC);
 
    fileselector = elm_fileselector_add(win);
-   role = elm_interface_atspi_accessible_role_get(fileselector);
+   role = efl_access_role_get(fileselector);
 
-   ck_assert(role == ELM_ATSPI_ROLE_FILE_CHOOSER);
+   ck_assert(role == EFL_ACCESS_ROLE_FILE_CHOOSER);
 
    elm_shutdown();
 }
diff --git a/src/tests/elementary/elm_test_fileselector_button.c b/src/tests/elementary/elm_test_fileselector_button.c
index 653678d9dd..586c441077 100644
--- a/src/tests/elementary/elm_test_fileselector_button.c
+++ b/src/tests/elementary/elm_test_fileselector_button.c
@@ -2,22 +2,22 @@
 # include "elementary_config.h"
 #endif
 
-#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
+#define EFL_ACCESS_PROTECTED
 #include <Elementary.h>
 #include "elm_suite.h"
 
 START_TEST (elm_atspi_role_get)
 {
    Evas_Object *win, *fs_button;
-   Elm_Atspi_Role role;
+   Efl_Access_Role role;
 
    elm_init(1, NULL);
    win = elm_win_add(NULL, "fileselector_button", ELM_WIN_BASIC);
 
    fs_button = elm_fileselector_button_add(win);
-   role = elm_interface_atspi_accessible_role_get(fs_button);
+   role = efl_access_role_get(fs_button);
 
-   ck_assert(role == ELM_ATSPI_ROLE_PUSH_BUTTON);
+   ck_assert(role == EFL_ACCESS_ROLE_PUSH_BUTTON);
 
    elm_shutdown();
 }
diff --git a/src/tests/elementary/elm_test_fileselector_entry.c b/src/tests/elementary/elm_test_fileselector_entry.c
index d78cf1b239..86fae967d0 100644
--- a/src/tests/elementary/elm_test_fileselector_entry.c
+++ b/src/tests/elementary/elm_test_fileselector_entry.c
@@ -2,22 +2,22 @@
 # include "elementary_config.h"
 #endif
 
-#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
+#define EFL_ACCESS_PROTECTED
 #include <Elementary.h>
 #include "elm_suite.h"
 
 START_TEST (elm_atspi_role_get)
 {
    Evas_Object *win, *fs_entry;
-   Elm_Atspi_Role role;
+   Efl_Access_Role role;
 
    elm_init(1, NULL);
    win = elm_win_add(NULL, "fileselectorentry", ELM_WIN_BASIC);
 
    fs_entry = elm_fileselector_entry_add(win);
-   role = elm_interface_atspi_accessible_role_get(fs_entry);
+   role = efl_access_role_get(fs_entry);
 
-   ck_assert(role == ELM_ATSPI_ROLE_GROUPING);
+   ck_assert(role == EFL_ACCESS_ROLE_GROUPING);
 
    elm_shutdown();
 }
diff --git a/src/tests/elementary/elm_test_flip.c b/src/tests/elementary/elm_test_flip.c
index 947c020ddc..a5d74b3f97 100644
--- a/src/tests/elementary/elm_test_flip.c
+++ b/src/tests/elementary/elm_test_flip.c
@@ -2,7 +2,7 @@
 # include "elementary_config.h"
 #endif
 
-#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
+#define EFL_ACCESS_PROTECTED
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -10,15 +10,15 @@
 START_TEST (elm_atspi_role_get)
 {
    Evas_Object *win, *flip;
-   Elm_Atspi_Role role;
+   Efl_Access_Role role;
 
    elm_init(1, NULL);
    win = elm_win_add(NULL, "flip", ELM_WIN_BASIC);
 
    flip = elm_flip_add(win);
-   role = elm_interface_atspi_accessible_role_get(flip);
+   role = efl_access_role_get(flip);
 
-   ck_assert(role == ELM_ATSPI_ROLE_PAGE_TAB_LIST);
+   ck_assert(role == EFL_ACCESS_ROLE_PAGE_TAB_LIST);
 
    elm_shutdown();
 }
diff --git a/src/tests/elementary/elm_test_flipselector.c b/src/tests/elementary/elm_test_flipselector.c
index 2ede134a04..fbbf0b049d 100644
--- a/src/tests/elementary/elm_test_flipselector.c
+++ b/src/tests/elementary/elm_test_flipselector.c
@@ -2,7 +2,7 @@
 # include "elementary_config.h"
 #endif
 
-#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
+#define EFL_ACCESS_PROTECTED
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -10,15 +10,15 @@
 START_TEST (elm_atspi_role_get)
 {
    Evas_Object *win, *flipselector;
-   Elm_Atspi_Role role;
+   Efl_Access_Role role;
 
    elm_init(1, NULL);
    win = elm_win_add(NULL, "flipselector", ELM_WIN_BASIC);
 
    flipselector = elm_flipselector_add(win);
-   role = elm_interface_atspi_accessible_role_get(flipselector);
+   role = efl_access_role_get(flipselector);
 
-   ck_assert(role == ELM_ATSPI_ROLE_LIST);
+   ck_assert(role == EFL_ACCESS_ROLE_LIST);
 
    elm_shutdown();
 }
diff --git a/src/tests/elementary/elm_test_focus_common.h b/src/tests/elementary/elm_test_focus_common.h
index 13587ef0d4..7105d7f736 100644
--- a/src/tests/elementary/elm_test_focus_common.h
+++ b/src/tests/elementary/elm_test_focus_common.h
@@ -5,7 +5,7 @@
 # include "elementary_config.h"
 #endif
 
-#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
+#define EFL_ACCESS_PROTECTED
 #define ELM_INTERNAL_API_ARGESFSDFEFC
 #include <Elementary.h>
 #include "elm_suite.h"
diff --git a/src/tests/elementary/elm_test_frame.c b/src/tests/elementary/elm_test_frame.c
index 2527544a39..fe3cea724d 100644
--- a/src/tests/elementary/elm_test_frame.c
+++ b/src/tests/elementary/elm_test_frame.c
@@ -2,7 +2,7 @@
 # include "elementary_config.h"
 #endif
 
-#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
+#define EFL_ACCESS_PROTECTED
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -10,15 +10,15 @@
 START_TEST (elm_atspi_role_get)
 {
    Evas_Object *win, *frame;
-   Elm_Atspi_Role role;
+   Efl_Access_Role role;
 
    elm_init(1, NULL);
    win = elm_win_add(NULL, "frame", ELM_WIN_BASIC);
 
    frame = elm_frame_add(win);
-   role = elm_interface_atspi_accessible_role_get(frame);
+   role = efl_access_role_get(frame);
 
-   ck_assert(role == ELM_ATSPI_ROLE_FRAME);
+   ck_assert(role == EFL_ACCESS_ROLE_FRAME);
 
    elm_shutdown();
 }
diff --git a/src/tests/elementary/elm_test_gengrid.c b/src/tests/elementary/elm_test_gengrid.c
index 54e37e20c2..e83e419a67 100644
--- a/src/tests/elementary/elm_test_gengrid.c
+++ b/src/tests/elementary/elm_test_gengrid.c
@@ -2,7 +2,7 @@
 # include "elementary_config.h"
 #endif
 
-#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
+#define EFL_ACCESS_PROTECTED
 #include <Elementary.h>
 #include "elm_suite.h"
 #include "elm_test_helper.h"
@@ -11,15 +11,15 @@
 START_TEST (elm_atspi_role_get)
 {
    Evas_Object *win, *gengrid;
-   Elm_Atspi_Role role;
+   Efl_Access_Role role;
 
    elm_init(1, NULL);
    win = elm_win_add(NULL, "gengrid", ELM_WIN_BASIC);
 
    gengrid = elm_gengrid_add(win);
-   role = elm_interface_atspi_accessible_role_get(gengrid);
+   role = efl_access_role_get(gengrid);
 
-   ck_assert(role == ELM_ATSPI_ROLE_TREE_TABLE);
+   ck_assert(role == EFL_ACCESS_ROLE_TREE_TABLE);
 
    elm_shutdown();
 }
@@ -53,7 +53,7 @@ START_TEST(elm_atspi_children_parent)
    Evas_Object *gengrid = elm_gengrid_add(win);
    evas_object_resize(gengrid, 100, 100);
 
-   Elm_Interface_Atspi_Accessible *parent;
+   Efl_Access *parent;
    content = NULL;
 
    itc.item_style = "default";
@@ -66,7 +66,7 @@ START_TEST(elm_atspi_children_parent)
    elm_gengrid_item_fields_update(it, "*.", ELM_GENGRID_ITEM_FIELD_CONTENT);
 
    ck_assert(content != NULL);
-   parent = elm_interface_atspi_accessible_parent_get(content);
+   parent = efl_access_parent_get(content);
    ck_assert(it == parent);
 
    elm_shutdown();
diff --git a/src/tests/elementary/elm_test_genlist.c b/src/tests/elementary/elm_test_genlist.c
index dd43419dff..fd1fd40458 100644
--- a/src/tests/elementary/elm_test_genlist.c
+++ b/src/tests/elementary/elm_test_genlist.c
@@ -2,7 +2,7 @@
 # include "elementary_config.h"
 #endif
 
-#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
+#define EFL_ACCESS_PROTECTED
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -10,7 +10,7 @@ static Evas_Object *win, *genlist;
 static Elm_Gen_Item_Class itc;
 static Eo *current;
 static int counter;
-static Elm_Atspi_Event_Children_Changed_Data ev_data;
+static Efl_Access_Event_Children_Changed_Data ev_data;
 Evas_Object *content;
 
 
@@ -26,11 +26,11 @@ START_TEST (elm_atspi_role_get)
 {
    test_init();
 
-   Elm_Atspi_Role role;
+   Efl_Access_Role role;
 
-   role = elm_interface_atspi_accessible_role_get(genlist);
+   role = efl_access_role_get(genlist);
 
-   ck_assert(role == ELM_ATSPI_ROLE_LIST);
+   ck_assert(role == EFL_ACCESS_ROLE_LIST);
 
    elm_shutdown();
 }
@@ -42,14 +42,14 @@ START_TEST(elm_atspi_children_get1)
    Eina_List *children;
    Elm_Object_Item *it[3];
 
-   children = elm_interface_atspi_accessible_children_get(genlist);
+   children = efl_access_children_get(genlist);
    ck_assert(children == NULL);
 
    it[0] = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
    it[1] = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
    it[2] = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
 
-   children = elm_interface_atspi_accessible_children_get(genlist);
+   children = efl_access_children_get(genlist);
    ck_assert(eina_list_count(children) == 3);
    ck_assert(eina_list_nth(children, 0) == it[0]);
    ck_assert(eina_list_nth(children, 1) == it[1]);
@@ -71,7 +71,7 @@ START_TEST(elm_atspi_children_get2)
    it[1] = elm_genlist_item_prepend(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_GROUP, NULL, NULL);
    it[2] = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_TREE, NULL, NULL);
 
-   children = elm_interface_atspi_accessible_children_get(genlist);
+   children = efl_access_children_get(genlist);
    ck_assert(eina_list_nth(children, 1) == it[0]);
    ck_assert(eina_list_nth(children, 0) == it[1]);
    ck_assert(eina_list_nth(children, 2) == it[2]);
@@ -83,10 +83,10 @@ END_TEST
 static void
 _children_changed_cb(void *data EINA_UNUSED, const Efl_Event *event)
 {
-   if (event->desc != ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_CHILDREN_CHANGED)
+   if (event->desc != EFL_ACCESS_EVENT_CHILDREN_CHANGED)
      return;
 
-   ev_data = *(Elm_Atspi_Event_Children_Changed_Data*)event->info;
+   ev_data = *(Efl_Access_Event_Children_Changed_Data*)event->info;
    current = event->object;
    counter++;
 }
@@ -100,7 +100,7 @@ START_TEST(elm_atspi_children_events_add)
 
    Elm_Object_Item *it[3];
 
-   elm_interface_atspi_accessible_event_handler_add(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, _children_changed_cb, NULL);
+   efl_access_event_handler_add(EFL_ACCESS_MIXIN, _children_changed_cb, NULL);
 
    it[0] = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
    ck_assert(genlist == current);
@@ -137,7 +137,7 @@ START_TEST(elm_atspi_children_events_del1)
    it[1] = elm_genlist_item_prepend(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
    it[2] = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_TREE, NULL, NULL);
 
-   elm_interface_atspi_accessible_event_handler_add(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, _children_changed_cb, NULL);
+   efl_access_event_handler_add(EFL_ACCESS_MIXIN, _children_changed_cb, NULL);
 
    elm_object_item_del(it[0]);
    ck_assert(genlist == current);
@@ -165,7 +165,7 @@ START_TEST(elm_atspi_children_events_del2)
 
    it = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
 
-   elm_interface_atspi_accessible_event_handler_add(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, _children_changed_cb, NULL);
+   efl_access_event_handler_add(EFL_ACCESS_MIXIN, _children_changed_cb, NULL);
    elm_genlist_clear(genlist);
 
    ck_assert(genlist == current);
diff --git a/src/tests/elementary/elm_test_glview.c b/src/tests/elementary/elm_test_glview.c
index 556c22f6ee..09dc2cbfd6 100644
--- a/src/tests/elementary/elm_test_glview.c
+++ b/src/tests/elementary/elm_test_glview.c
@@ -2,7 +2,7 @@
 # include "elementary_config.h"
 #endif
 
-#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
+#define EFL_ACCESS_PROTECTED
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -10,7 +10,7 @@
 START_TEST (elm_atspi_role_get)
 {
    Evas_Object *win, *glview;
-   Elm_Atspi_Role role;
+   Efl_Access_Role role;
 
    elm_init(1, NULL);
    win = elm_win_add(NULL, "glview", ELM_WIN_BASIC);
@@ -20,8 +20,8 @@ START_TEST (elm_atspi_role_get)
    // if no gl backend skip test
    if (glview)
      {
-        role = elm_interface_atspi_accessible_role_get(glview);
-        ck_assert(role == ELM_ATSPI_ROLE_ANIMATION);
+        role = efl_access_role_get(glview);
+        ck_assert(role == EFL_ACCESS_ROLE_ANIMATION);
      }
 
    elm_shutdown();
diff --git a/src/tests/elementary/elm_test_grid.c b/src/tests/elementary/elm_test_grid.c
index f1350d49e6..dfd977c60f 100644
--- a/src/tests/elementary/elm_test_grid.c
+++ b/src/tests/elementary/elm_test_grid.c
@@ -2,7 +2,7 @@
 # include "elementary_config.h"
 #endif
 
-#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
+#define EFL_ACCESS_PROTECTED
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -10,15 +10,15 @@
 START_TEST (elm_atspi_role_get)
 {
    Evas_Object *win, *grid;
-   Elm_Atspi_Role role;
+   Efl_Access_Role role;
 
    elm_init(1, NULL);
    win = elm_win_add(NULL, "grid", ELM_WIN_BASIC);
 
    grid = elm_grid_add(win);
-   role = elm_interface_atspi_accessible_role_get(grid);
+   role = efl_access_role_get(grid);
 
-   ck_assert(role == ELM_ATSPI_ROLE_FILLER);
+   ck_assert(role == EFL_ACCESS_ROLE_FILLER);
 
    elm_shutdown();
 }
diff --git a/src/tests/elementary/elm_test_hover.c b/src/tests/elementary/elm_test_hover.c
index b23f892112..bbdc1114b7 100644
--- a/src/tests/elementary/elm_test_hover.c
+++ b/src/tests/elementary/elm_test_hover.c
@@ -2,7 +2,7 @@
 # include "elementary_config.h"
 #endif
 
-#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
+#define EFL_ACCESS_PROTECTED
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -10,15 +10,15 @@
 START_TEST (elm_atspi_role_get)
 {
    Evas_Object *win, *hover;
-   Elm_Atspi_Role role;
+   Efl_Access_Role role;
 
    elm_init(1, NULL);
    win = elm_win_add(NULL, "hover", ELM_WIN_BASIC);
 
    hover = elm_hover_add(win);
-   role = elm_interface_atspi_accessible_role_get(hover);
+   role = efl_access_role_get(hover);
 
-   ck_assert(role == ELM_ATSPI_ROLE_POPUP_MENU);
+   ck_assert(role == EFL_ACCESS_ROLE_POPUP_MENU);
 
    elm_shutdown();
 }
diff --git a/src/tests/elementary/elm_test_hoversel.c b/src/tests/elementary/elm_test_hoversel.c
index 14f1148b55..8693b21acf 100644
--- a/src/tests/elementary/elm_test_hoversel.c
+++ b/src/tests/elementary/elm_test_hoversel.c
@@ -2,7 +2,7 @@
 # include "elementary_config.h"
 #endif
 
-#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
+#define EFL_ACCESS_PROTECTED
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -10,15 +10,15 @@
 START_TEST (elm_atspi_role_get)
 {
    Evas_Object *win, *hoversel;
-   Elm_Atspi_Role role;
+   Efl_Access_Role role;
 
    elm_init(1, NULL);
    win = elm_win_add(NULL, "hoversel", ELM_WIN_BASIC);
 
    hoversel = elm_hoversel_add(win);
-   role = elm_interface_atspi_accessible_role_get(hoversel);
+   role = efl_access_role_get(hoversel);
 
-   ck_assert(role == ELM_ATSPI_ROLE_PUSH_BUTTON);
+   ck_assert(role == EFL_ACCESS_ROLE_PUSH_BUTTON);
 
    elm_shutdown();
 }
diff --git a/src/tests/elementary/elm_test_icon.c b/src/tests/elementary/elm_test_icon.c
index 7cc9469d81..46f830c7e7 100644
--- a/src/tests/elementary/elm_test_icon.c
+++ b/src/tests/elementary/elm_test_icon.c
@@ -2,7 +2,7 @@
 # include "elementary_config.h"
 #endif
 
-#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
+#define EFL_ACCESS_PROTECTED
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -10,15 +10,15 @@
 START_TEST (elm_atspi_role_get)
 {
    Evas_Object *win, *icon;
-   Elm_Atspi_Role role;
+   Efl_Access_Role role;
 
    elm_init(1, NULL);
    win = elm_win_add(NULL, "icon", ELM_WIN_BASIC);
 
    icon = elm_icon_add(win);
-   role = elm_interface_atspi_accessible_role_get(icon);
+   role = efl_access_role_get(icon);
 
-   ck_assert(role == ELM_ATSPI_ROLE_IMAGE);
+   ck_assert(role == EFL_ACCESS_ROLE_IMAGE);
 
    elm_shutdown();
 }
diff --git a/src/tests/elementary/elm_test_image.c b/src/tests/elementary/elm_test_image.c
index 290c23d973..5953f2c8ba 100644
--- a/src/tests/elementary/elm_test_image.c
+++ b/src/tests/elementary/elm_test_image.c
@@ -2,7 +2,7 @@
 # include "elementary_config.h"
 #endif
 
-#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
+#define EFL_ACCESS_PROTECTED
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -20,15 +20,15 @@ struct _Test_Data
 START_TEST (elm_atspi_role_get)
 {
    Evas_Object *win, *image;
-   Elm_Atspi_Role role;
+   Efl_Access_Role role;
 
    elm_init(1, NULL);
    win = elm_win_add(NULL, "image", ELM_WIN_BASIC);
 
    image = elm_image_add(win);
-   role = elm_interface_atspi_accessible_role_get(image);
+   role = efl_access_role_get(image);
 
-   ck_assert(role == ELM_ATSPI_ROLE_IMAGE);
+   ck_assert(role == EFL_ACCESS_ROLE_IMAGE);
 
    elm_shutdown();
 }
diff --git a/src/tests/elementary/elm_test_index.c b/src/tests/elementary/elm_test_index.c
index 1a34933cc1..7c4e7b5f10 100644
--- a/src/tests/elementary/elm_test_index.c
+++ b/src/tests/elementary/elm_test_index.c
@@ -2,7 +2,7 @@
 # include "elementary_config.h"
 #endif
 
-#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
+#define EFL_ACCESS_PROTECTED
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -10,15 +10,15 @@
 START_TEST (elm_atspi_role_get)
 {
    Evas_Object *win, *idx;
-   Elm_Atspi_Role role;
+   Efl_Access_Role role;
 
    elm_init(1, NULL);
    win = elm_win_add(NULL, "index", ELM_WIN_BASIC);
 
    idx = elm_index_add(win);
-   role = elm_interface_atspi_accessible_role_get(idx);
+   role = efl_access_role_get(idx);
 
-   ck_assert(role == ELM_ATSPI_ROLE_SCROLL_BAR);
+   ck_assert(role == EFL_ACCESS_ROLE_SCROLL_BAR);
 
    elm_shutdown();
 }
diff --git a/src/tests/elementary/elm_test_inwin.c b/src/tests/elementary/elm_test_inwin.c
index 942945dff5..1e9fdad897 100644
--- a/src/tests/elementary/elm_test_inwin.c
+++ b/src/tests/elementary/elm_test_inwin.c
@@ -2,7 +2,7 @@
 # include "elementary_config.h"
 #endif
 
-#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
+#define EFL_ACCESS_PROTECTED
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -10,15 +10,15 @@
 START_TEST (elm_atspi_role_get)
 {
    Evas_Object *win, *inwin;
-   Elm_Atspi_Role role;
+   Efl_Access_Role role;
 
    elm_init(1, NULL);
    win = elm_win_add(NULL, "inwin", ELM_WIN_BASIC);
 
    inwin = elm_win_inwin_add(win);
-   role = elm_interface_atspi_accessible_role_get(inwin);
+   role = efl_access_role_get(inwin);
 
-   ck_assert(role == ELM_ATSPI_ROLE_GLASS_PANE);
+   ck_assert(role == EFL_ACCESS_ROLE_GLASS_PANE);
 
    elm_shutdown();
 }
diff --git a/src/tests/elementary/elm_test_label.c b/src/tests/elementary/elm_test_label.c
index a81fdf4418..1518ac08e7 100644
--- a/src/tests/elementary/elm_test_label.c
+++ b/src/tests/elementary/elm_test_label.c
@@ -2,7 +2,7 @@
 # include "elementary_config.h"
 #endif
 
-#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
+#define EFL_ACCESS_PROTECTED
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -10,15 +10,15 @@
 START_TEST (elm_atspi_role_get)
 {
    Evas_Object *win, *label;
-   Elm_Atspi_Role role;
+   Efl_Access_Role role;
 
    elm_init(1, NULL);
    win = elm_win_add(NULL, "label", ELM_WIN_BASIC);
 
    label = elm_label_add(win);
-   role = elm_interface_atspi_accessible_role_get(label);
+   role = efl_access_role_get(label);
 
-   ck_assert(role == ELM_ATSPI_ROLE_LABEL);
+   ck_assert(role == EFL_ACCESS_ROLE_LABEL);
 
    elm_shutdown();
 }
diff --git a/src/tests/elementary/elm_test_layout.c b/src/tests/elementary/elm_test_layout.c
index 52e5dbee23..779b0adb14 100644
--- a/src/tests/elementary/elm_test_layout.c
+++ b/src/tests/elementary/elm_test_layout.c
@@ -2,7 +2,7 @@
 # include "elementary_config.h"
 #endif
 
-#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
+#define EFL_ACCESS_PROTECTED
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -10,15 +10,15 @@
 START_TEST(elm_atspi_role_get)
 {
    Evas_Object *win, *layout;
-   Elm_Atspi_Role role;
+   Efl_Access_Role role;
 
    elm_init(1, NULL);
    win = elm_win_add(NULL, "layout", ELM_WIN_BASIC);
 
    layout = elm_layout_add(win);
-   role = elm_interface_atspi_accessible_role_get(layout);
+   role = efl_access_role_get(layout);
 
-   ck_assert(role == ELM_ATSPI_ROLE_FILLER);
+   ck_assert(role == EFL_ACCESS_ROLE_FILLER);
 
    elm_shutdown();
 }
diff --git a/src/tests/elementary/elm_test_list.c b/src/tests/elementary/elm_test_list.c
index 3b3a8bfc9e..8346bc5b3f 100644
--- a/src/tests/elementary/elm_test_list.c
+++ b/src/tests/elementary/elm_test_list.c
@@ -3,7 +3,7 @@
 #endif
 
 #define EFL_ACCESS_SELECTION_PROTECTED
-#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
+#define EFL_ACCESS_PROTECTED
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -186,15 +186,15 @@ END_TEST
 START_TEST (elm_atspi_role_get)
 {
  Evas_Object *win, *list;
- Elm_Atspi_Role role;
+ Efl_Access_Role role;
 
  elm_init(1, NULL);
  win = elm_win_add(NULL, "list", ELM_WIN_BASIC);
 
  list = elm_list_add(win);
- role = elm_interface_atspi_accessible_role_get(list);
+ role = efl_access_role_get(list);
 
- ck_assert(role == ELM_ATSPI_ROLE_LIST);
+ ck_assert(role == EFL_ACCESS_ROLE_LIST);
 
  elm_shutdown();
 }
@@ -207,7 +207,7 @@ END_TEST
  */
 START_TEST(elm_atspi_children_parent)
 {
-   Elm_Interface_Atspi_Accessible *parent;
+   Efl_Access *parent;
 
    elm_init(1, NULL);
    Evas_Object *win = elm_win_add(NULL, "list", ELM_WIN_BASIC);
@@ -220,10 +220,10 @@ START_TEST(elm_atspi_children_parent)
 
    evas_object_show(list);
 
-   parent = elm_interface_atspi_accessible_parent_get(icon);
+   parent = efl_access_parent_get(icon);
    ck_assert(list == parent);
 
-   parent = elm_interface_atspi_accessible_parent_get(end);
+   parent = efl_access_parent_get(end);
    ck_assert(list == parent);
 
    elm_shutdown();
diff --git a/src/tests/elementary/elm_test_map.c b/src/tests/elementary/elm_test_map.c
index efaaa8f7f5..d054653896 100644
--- a/src/tests/elementary/elm_test_map.c
+++ b/src/tests/elementary/elm_test_map.c
@@ -2,7 +2,7 @@
 # include "elementary_config.h"
 #endif
 
-#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
+#define EFL_ACCESS_PROTECTED
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -10,15 +10,15 @@
 START_TEST (elm_atspi_role_get)
 {
    Evas_Object *win, *map;
-   Elm_Atspi_Role role;
+   Efl_Access_Role role;
 
    elm_init(1, NULL);
    win = elm_win_add(NULL, "map", ELM_WIN_BASIC);
 
    map = elm_map_add(win);
-   role = elm_interface_atspi_accessible_role_get(map);
+   role = efl_access_role_get(map);
 
-   ck_assert(role == ELM_ATSPI_ROLE_IMAGE_MAP);
+   ck_assert(role == EFL_ACCESS_ROLE_IMAGE_MAP);
 
    elm_shutdown();
 }
diff --git a/src/tests/elementary/elm_test_mapbuf.c b/src/tests/elementary/elm_test_mapbuf.c
index 570d37f4cd..8a496e3a1d 100644
--- a/src/tests/elementary/elm_test_mapbuf.c
+++ b/src/tests/elementary/elm_test_mapbuf.c
@@ -2,7 +2,7 @@
 # include "elementary_config.h"
 #endif
 
-#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
+#define EFL_ACCESS_PROTECTED
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -10,15 +10,15 @@
 START_TEST (elm_atspi_role_get)
 {
    Evas_Object *win, *mapbuf;
-   Elm_Atspi_Role role;
+   Efl_Access_Role role;
 
    elm_init(1, NULL);
    win = elm_win_add(NULL, "mapbuf", ELM_WIN_BASIC);
 
    mapbuf = elm_mapbuf_add(win);
-   role = elm_interface_atspi_accessible_role_get(mapbuf);
+   role = efl_access_role_get(mapbuf);
 
-   ck_assert(role == ELM_ATSPI_ROLE_IMAGE_MAP);
+   ck_assert(role == EFL_ACCESS_ROLE_IMAGE_MAP);
 
    elm_shutdown();
 }
diff --git a/src/tests/elementary/elm_test_menu.c b/src/tests/elementary/elm_test_menu.c
index 015bc89855..d2fe2538d1 100644
--- a/src/tests/elementary/elm_test_menu.c
+++ b/src/tests/elementary/elm_test_menu.c
@@ -2,7 +2,7 @@
 # include "elementary_config.h"
 #endif
 
-#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
+#define EFL_ACCESS_PROTECTED
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -10,15 +10,15 @@
 START_TEST (elm_atspi_role_get)
 {
    Evas_Object *win, *menu;
-   Elm_Atspi_Role role;
+   Efl_Access_Role role;
 
    elm_init(1, NULL);
    win = elm_win_add(NULL, "menu", ELM_WIN_BASIC);
 
    menu = elm_menu_add(win);
-   role = elm_interface_atspi_accessible_role_get(menu);
+   role = efl_access_role_get(menu);
 
-   ck_assert(role == ELM_ATSPI_ROLE_MENU);
+   ck_assert(role == EFL_ACCESS_ROLE_MENU);
 
    elm_shutdown();
 }
diff --git a/src/tests/elementary/elm_test_multibuttonentry.c b/src/tests/elementary/elm_test_multibuttonentry.c
index f476c25ee7..3252507839 100644
--- a/src/tests/elementary/elm_test_multibuttonentry.c
+++ b/src/tests/elementary/elm_test_multibuttonentry.c
@@ -2,7 +2,7 @@
 # include "elementary_config.h"
 #endif
 
-#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
+#define EFL_ACCESS_PROTECTED
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -10,15 +10,15 @@
 START_TEST (elm_atspi_role_get)
 {
    Evas_Object *win, *multibuttonentry;
-   Elm_Atspi_Role role;
+   Efl_Access_Role role;
 
    elm_init(1, NULL);
    win = elm_win_add(NULL, "multibuttonentry", ELM_WIN_BASIC);
 
    multibuttonentry = elm_multibuttonentry_add(win);
-   role = elm_interface_atspi_accessible_role_get(multibuttonentry);
+   role = efl_access_role_get(multibuttonentry);
 
-   ck_assert_int_eq(role, ELM_ATSPI_ROLE_PANEL);
+   ck_assert_int_eq(role, EFL_ACCESS_ROLE_PANEL);
 
    elm_shutdown();
 }
diff --git a/src/tests/elementary/elm_test_naviframe.c b/src/tests/elementary/elm_test_naviframe.c
index a34ce3e6ed..249dfdc1e8 100644
--- a/src/tests/elementary/elm_test_naviframe.c
+++ b/src/tests/elementary/elm_test_naviframe.c
@@ -2,7 +2,7 @@
 # include "elementary_config.h"
 #endif
 
-#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
+#define EFL_ACCESS_PROTECTED
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -10,15 +10,15 @@
 START_TEST (elm_atspi_role_get)
 {
    Evas_Object *win, *naviframe;
-   Elm_Atspi_Role role;
+   Efl_Access_Role role;
 
    elm_init(1, NULL);
    win = elm_win_add(NULL, "naviframe", ELM_WIN_BASIC);
 
    naviframe = elm_naviframe_add(win);
-   role = elm_interface_atspi_accessible_role_get(naviframe);
+   role = efl_access_role_get(naviframe);
 
-   ck_assert(role == ELM_ATSPI_ROLE_PAGE_TAB_LIST);
+   ck_assert(role == EFL_ACCESS_ROLE_PAGE_TAB_LIST);
 
    elm_shutdown();
 }
diff --git a/src/tests/elementary/elm_test_notify.c b/src/tests/elementary/elm_test_notify.c
index 9fe99cf01f..56be4c70da 100644
--- a/src/tests/elementary/elm_test_notify.c
+++ b/src/tests/elementary/elm_test_notify.c
@@ -2,7 +2,7 @@
 # include "elementary_config.h"
 #endif
 
-#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
+#define EFL_ACCESS_PROTECTED
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -10,15 +10,15 @@
 START_TEST (elm_atspi_role_get)
 {
    Evas_Object *win, *notify;
-   Elm_Atspi_Role role;
+   Efl_Access_Role role;
 
    elm_init(1, NULL);
    win = elm_win_add(NULL, "notify", ELM_WIN_BASIC);
 
    notify = elm_notify_add(win);
-   role = elm_interface_atspi_accessible_role_get(notify);
+   role = efl_access_role_get(notify);
 
-   ck_assert(role == ELM_ATSPI_ROLE_NOTIFICATION);
+   ck_assert(role == EFL_ACCESS_ROLE_NOTIFICATION);
 
    elm_shutdown();
 }
diff --git a/src/tests/elementary/elm_test_panel.c b/src/tests/elementary/elm_test_panel.c
index e98792ee6f..81ea083188 100644
--- a/src/tests/elementary/elm_test_panel.c
+++ b/src/tests/elementary/elm_test_panel.c
@@ -2,7 +2,7 @@
 # include "elementary_config.h"
 #endif
 
-#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
+#define EFL_ACCESS_PROTECTED
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -10,15 +10,15 @@
 START_TEST (elm_atspi_role_get)
 {
    Evas_Object *win, *panel;
-   Elm_Atspi_Role role;
+   Efl_Access_Role role;
 
    elm_init(1, NULL);
    win = elm_win_add(NULL, "panel", ELM_WIN_BASIC);
 
    panel = elm_panel_add(win);
-   role = elm_interface_atspi_accessible_role_get(panel);
+   role = efl_access_role_get(panel);
 
-   ck_assert(role == ELM_ATSPI_ROLE_PANEL);
+   ck_assert(role == EFL_ACCESS_ROLE_PANEL);
 
    elm_shutdown();
 }
diff --git a/src/tests/elementary/elm_test_panes.c b/src/tests/elementary/elm_test_panes.c
index fea0a02e27..cf66ae5c3a 100644
--- a/src/tests/elementary/elm_test_panes.c
+++ b/src/tests/elementary/elm_test_panes.c
@@ -2,7 +2,7 @@
 # include "elementary_config.h"
 #endif
 
-#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
+#define EFL_ACCESS_PROTECTED
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -10,15 +10,15 @@
 START_TEST (elm_atspi_role_get)
 {
    Evas_Object *win, *panes;
-   Elm_Atspi_Role role;
+   Efl_Access_Role role;
 
    elm_init(1, NULL);
    win = elm_win_add(NULL, "panes", ELM_WIN_BASIC);
 
    panes = elm_panes_add(win);
-   role = elm_interface_atspi_accessible_role_get(panes);
+   role = efl_access_role_get(panes);
 
-   ck_assert(role == ELM_ATSPI_ROLE_SPLIT_PANE);
+   ck_assert(role == EFL_ACCESS_ROLE_SPLIT_PANE);
 
    elm_shutdown();
 }
diff --git a/src/tests/elementary/elm_test_photo.c b/src/tests/elementary/elm_test_photo.c
index 3d8bc5fc45..5ddbc64346 100644
--- a/src/tests/elementary/elm_test_photo.c
+++ b/src/tests/elementary/elm_test_photo.c
@@ -2,7 +2,7 @@
 # include "elementary_config.h"
 #endif
 
-#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
+#define EFL_ACCESS_PROTECTED
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -10,15 +10,15 @@
 START_TEST (elm_atspi_role_get)
 {
    Evas_Object *win, *photo;
-   Elm_Atspi_Role role;
+   Efl_Access_Role role;
 
    elm_init(1, NULL);
    win = elm_win_add(NULL, "photo", ELM_WIN_BASIC);
 
    photo = elm_photo_add(win);
-   role = elm_interface_atspi_accessible_role_get(photo);
+   role = efl_access_role_get(photo);
 
-   ck_assert(role == ELM_ATSPI_ROLE_IMAGE);
+   ck_assert(role == EFL_ACCESS_ROLE_IMAGE);
 
    elm_shutdown();
 }
diff --git a/src/tests/elementary/elm_test_photocam.c b/src/tests/elementary/elm_test_photocam.c
index 8d9cff1158..34122723c7 100644
--- a/src/tests/elementary/elm_test_photocam.c
+++ b/src/tests/elementary/elm_test_photocam.c
@@ -2,7 +2,7 @@
 # include "elementary_config.h"
 #endif
 
-#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
+#define EFL_ACCESS_PROTECTED
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -10,15 +10,15 @@
 START_TEST (elm_atspi_role_get)
 {
    Evas_Object *win, *photocam;
-   Elm_Atspi_Role role;
+   Efl_Access_Role role;
 
    elm_init(1, NULL);
    win = elm_win_add(NULL, "photocam", ELM_WIN_BASIC);
 
    photocam = elm_photocam_add(win);
-   role = elm_interface_atspi_accessible_role_get(photocam);
+   role = efl_access_role_get(photocam);
 
-   ck_assert(role == ELM_ATSPI_ROLE_IMAGE);
+   ck_assert(role == EFL_ACCESS_ROLE_IMAGE);
 
    elm_shutdown();
 }
diff --git a/src/tests/elementary/elm_test_player.c b/src/tests/elementary/elm_test_player.c
index 863bfba009..a2b22c5e77 100644
--- a/src/tests/elementary/elm_test_player.c
+++ b/src/tests/elementary/elm_test_player.c
@@ -2,7 +2,7 @@
 # include "elementary_config.h"
 #endif
 
-#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
+#define EFL_ACCESS_PROTECTED
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -10,15 +10,15 @@
 START_TEST (elm_atspi_role_get)
 {
    Evas_Object *win, *player;
-   Elm_Atspi_Role role;
+   Efl_Access_Role role;
 
    elm_init(1, NULL);
    win = elm_win_add(NULL, "player", ELM_WIN_BASIC);
 
    player = elm_player_add(win);
-   role = elm_interface_atspi_accessible_role_get(player);
+   role = efl_access_role_get(player);
 
-   ck_assert(role == ELM_ATSPI_ROLE_ANIMATION);
+   ck_assert(role == EFL_ACCESS_ROLE_ANIMATION);
 
    elm_shutdown();
 }
diff --git a/src/tests/elementary/elm_test_plug.c b/src/tests/elementary/elm_test_plug.c
index 8139ae538a..6db1190cc2 100644
--- a/src/tests/elementary/elm_test_plug.c
+++ b/src/tests/elementary/elm_test_plug.c
@@ -2,7 +2,7 @@
 # include "elementary_config.h"
 #endif
 
-#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
+#define EFL_ACCESS_PROTECTED
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -10,15 +10,15 @@
 START_TEST (elm_atspi_role_get)
 {
    Evas_Object *win, *plug;
-   Elm_Atspi_Role role;
+   Efl_Access_Role role;
 
    elm_init(1, NULL);
    win = elm_win_add(NULL, "plug", ELM_WIN_BASIC);
 
    plug = elm_plug_add(win);
-   role = elm_interface_atspi_accessible_role_get(plug);
+   role = efl_access_role_get(plug);
 
-   ck_assert(role == ELM_ATSPI_ROLE_IMAGE);
+   ck_assert(role == EFL_ACCESS_ROLE_IMAGE);
 
    elm_shutdown();
 }
diff --git a/src/tests/elementary/elm_test_popup.c b/src/tests/elementary/elm_test_popup.c
index b284475441..abeb4fc8fa 100644
--- a/src/tests/elementary/elm_test_popup.c
+++ b/src/tests/elementary/elm_test_popup.c
@@ -2,7 +2,7 @@
 # include "elementary_config.h"
 #endif
 
-#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
+#define EFL_ACCESS_PROTECTED
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -10,15 +10,15 @@
 START_TEST (elm_atspi_role_get)
 {
    Evas_Object *win, *popup;
-   Elm_Atspi_Role role;
+   Efl_Access_Role role;
 
    elm_init(1, NULL);
    win = elm_win_add(NULL, "popup", ELM_WIN_BASIC);
 
    popup = elm_popup_add(win);
-   role = elm_interface_atspi_accessible_role_get(popup);
+   role = efl_access_role_get(popup);
 
-   ck_assert(role == ELM_ATSPI_ROLE_NOTIFICATION);
+   ck_assert(role == EFL_ACCESS_ROLE_NOTIFICATION);
 
    elm_shutdown();
 }
diff --git a/src/tests/elementary/elm_test_prefs.c b/src/tests/elementary/elm_test_prefs.c
index 091e69731d..e1f753db83 100644
--- a/src/tests/elementary/elm_test_prefs.c
+++ b/src/tests/elementary/elm_test_prefs.c
@@ -2,7 +2,7 @@
 # include "elementary_config.h"
 #endif
 
-#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
+#define EFL_ACCESS_PROTECTED
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -11,15 +11,15 @@ START_TEST (elm_atspi_role_get)
 {
 #if 0
    Evas_Object *win, *prefs;
-   Elm_Atspi_Role role;
+   Efl_Access_Role role;
 
    elm_init(1, NULL);
    win = elm_win_add(NULL, "prefs", ELM_WIN_BASIC);
 
    prefs = elm_prefs_add(win);
-   role = elm_interface_atspi_accessible_role_get(prefs);
+   role = efl_access_role_get(prefs);
 
-   ck_assert(role == ELM_ATSPI_ROLE_REDUNDANT_OBJECT);
+   ck_assert(role == EFL_ACCESS_ROLE_REDUNDANT_OBJECT);
 
    elm_shutdown();
 #endif
diff --git a/src/tests/elementary/elm_test_progressbar.c b/src/tests/elementary/elm_test_progressbar.c
index 53319d7fff..5e76b6cdcb 100644
--- a/src/tests/elementary/elm_test_progressbar.c
+++ b/src/tests/elementary/elm_test_progressbar.c
@@ -2,7 +2,7 @@
 # include "elementary_config.h"
 #endif
 
-#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
+#define EFL_ACCESS_PROTECTED
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -10,15 +10,15 @@
 START_TEST (elm_atspi_role_get)
 {
    Evas_Object *win, *progressbar;
-   Elm_Atspi_Role role;
+   Efl_Access_Role role;
 
    elm_init(1, NULL);
    win = elm_win_add(NULL, "progressbar", ELM_WIN_BASIC);
 
    progressbar = elm_progressbar_add(win);
-   role = elm_interface_atspi_accessible_role_get(progressbar);
+   role = efl_access_role_get(progressbar);
 
-   ck_assert(role == ELM_ATSPI_ROLE_PROGRESS_BAR);
+   ck_assert(role == EFL_ACCESS_ROLE_PROGRESS_BAR);
 
    elm_shutdown();
 }
diff --git a/src/tests/elementary/elm_test_radio.c b/src/tests/elementary/elm_test_radio.c
index 874dbe7d4b..bce91e644b 100644
--- a/src/tests/elementary/elm_test_radio.c
+++ b/src/tests/elementary/elm_test_radio.c
@@ -2,7 +2,7 @@
 # include "elementary_config.h"
 #endif
 
-#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
+#define EFL_ACCESS_PROTECTED
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -10,15 +10,15 @@
 START_TEST (elm_atspi_role_get)
 {
    Evas_Object *win, *radio;
-   Elm_Atspi_Role role;
+   Efl_Access_Role role;
 
    elm_init(1, NULL);
    win = elm_win_add(NULL, "radio", ELM_WIN_BASIC);
 
    radio = elm_radio_add(win);
-   role = elm_interface_atspi_accessible_role_get(radio);
+   role = efl_access_role_get(radio);
 
-   ck_assert(role == ELM_ATSPI_ROLE_RADIO_BUTTON);
+   ck_assert(role == EFL_ACCESS_ROLE_RADIO_BUTTON);
 
    elm_shutdown();
 }
diff --git a/src/tests/elementary/elm_test_scroller.c b/src/tests/elementary/elm_test_scroller.c
index 537710f4d5..5996e86019 100644
--- a/src/tests/elementary/elm_test_scroller.c
+++ b/src/tests/elementary/elm_test_scroller.c
@@ -2,7 +2,7 @@
 # include "elementary_config.h"
 #endif
 
-#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
+#define EFL_ACCESS_PROTECTED
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -10,15 +10,15 @@
 START_TEST (elm_atspi_role_get)
 {
    Evas_Object *win, *scroller;
-   Elm_Atspi_Role role;
+   Efl_Access_Role role;
 
    elm_init(1, NULL);
    win = elm_win_add(NULL, "scroller", ELM_WIN_BASIC);
 
    scroller = elm_scroller_add(win);
-   role = elm_interface_atspi_accessible_role_get(scroller);
+   role = efl_access_role_get(scroller);
 
-   ck_assert(role == ELM_ATSPI_ROLE_SCROLL_PANE);
+   ck_assert(role == EFL_ACCESS_ROLE_SCROLL_PANE);
 
    elm_shutdown();
 }
diff --git a/src/tests/elementary/elm_test_segmentcontrol.c b/src/tests/elementary/elm_test_segmentcontrol.c
index 31812e6fef..c4de3c8ea4 100644
--- a/src/tests/elementary/elm_test_segmentcontrol.c
+++ b/src/tests/elementary/elm_test_segmentcontrol.c
@@ -2,7 +2,7 @@
 # include "elementary_config.h"
 #endif
 
-#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
+#define EFL_ACCESS_PROTECTED
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -10,15 +10,15 @@
 START_TEST (elm_atspi_role_get)
 {
    Evas_Object *win, *segmentcontrol;
-   Elm_Atspi_Role role;
+   Efl_Access_Role role;
 
    elm_init(1, NULL);
    win = elm_win_add(NULL, "segmentcontrol", ELM_WIN_BASIC);
 
    segmentcontrol = elm_segment_control_add(win);
-   role = elm_interface_atspi_accessible_role_get(segmentcontrol);
+   role = efl_access_role_get(segmentcontrol);
 
-   ck_assert(role == ELM_ATSPI_ROLE_LIST);
+   ck_assert(role == EFL_ACCESS_ROLE_LIST);
 
    elm_shutdown();
 }
diff --git a/src/tests/elementary/elm_test_separator.c b/src/tests/elementary/elm_test_separator.c
index a786cd367b..2f24da66c7 100644
--- a/src/tests/elementary/elm_test_separator.c
+++ b/src/tests/elementary/elm_test_separator.c
@@ -2,7 +2,7 @@
 # include "elementary_config.h"
 #endif
 
-#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
+#define EFL_ACCESS_PROTECTED
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -10,15 +10,15 @@
 START_TEST (elm_atspi_role_get)
 {
    Evas_Object *win, *separator;
-   Elm_Atspi_Role role;
+   Efl_Access_Role role;
 
    elm_init(1, NULL);
    win = elm_win_add(NULL, "icon", ELM_WIN_BASIC);
 
    separator = elm_separator_add(win);
-   role = elm_interface_atspi_accessible_role_get(separator);
+   role = efl_access_role_get(separator);
 
-   ck_assert(role == ELM_ATSPI_ROLE_SEPARATOR);
+   ck_assert(role == EFL_ACCESS_ROLE_SEPARATOR);
 
    elm_shutdown();
 }
diff --git a/src/tests/elementary/elm_test_slider.c b/src/tests/elementary/elm_test_slider.c
index 59e359de53..75f08ead12 100644
--- a/src/tests/elementary/elm_test_slider.c
+++ b/src/tests/elementary/elm_test_slider.c
@@ -2,7 +2,7 @@
 # include "elementary_config.h"
 #endif
 
-#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
+#define EFL_ACCESS_PROTECTED
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -10,15 +10,15 @@
 START_TEST (elm_atspi_role_get)
 {
    Evas_Object *win, *slider;
-   Elm_Atspi_Role role;
+   Efl_Access_Role role;
 
    elm_init(1, NULL);
    win = elm_win_add(NULL, "slider", ELM_WIN_BASIC);
 
    slider = elm_slider_add(win);
-   role = elm_interface_atspi_accessible_role_get(slider);
+   role = efl_access_role_get(slider);
 
-   ck_assert(role == ELM_ATSPI_ROLE_SLIDER);
+   ck_assert(role == EFL_ACCESS_ROLE_SLIDER);
 
    elm_shutdown();
 }
diff --git a/src/tests/elementary/elm_test_slideshow.c b/src/tests/elementary/elm_test_slideshow.c
index 8edacc5e9f..5764ccd709 100644
--- a/src/tests/elementary/elm_test_slideshow.c
+++ b/src/tests/elementary/elm_test_slideshow.c
@@ -2,7 +2,7 @@
 # include "elementary_config.h"
 #endif
 
-#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
+#define EFL_ACCESS_PROTECTED
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -10,15 +10,15 @@
 START_TEST (elm_atspi_role_get)
 {
    Evas_Object *win, *slideshow;
-   Elm_Atspi_Role role;
+   Efl_Access_Role role;
 
    elm_init(1, NULL);
    win = elm_win_add(NULL, "slideshow", ELM_WIN_BASIC);
 
    slideshow = elm_slideshow_add(win);
-   role = elm_interface_atspi_accessible_role_get(slideshow);
+   role = efl_access_role_get(slideshow);
 
-   ck_assert(role == ELM_ATSPI_ROLE_DOCUMENT_PRESENTATION);
+   ck_assert(role == EFL_ACCESS_ROLE_DOCUMENT_PRESENTATION);
 
    elm_shutdown();
 }
diff --git a/src/tests/elementary/elm_test_spinner.c b/src/tests/elementary/elm_test_spinner.c
index bc77c97380..d9956539d8 100644
--- a/src/tests/elementary/elm_test_spinner.c
+++ b/src/tests/elementary/elm_test_spinner.c
@@ -2,7 +2,7 @@
 # include "elementary_config.h"
 #endif
 
-#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
+#define EFL_ACCESS_PROTECTED
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -10,15 +10,15 @@
 START_TEST (elm_atspi_role_get)
 {
    Evas_Object *win, *spinner;
-   Elm_Atspi_Role role;
+   Efl_Access_Role role;
 
    elm_init(1, NULL);
    win = elm_win_add(NULL, "spinner", ELM_WIN_BASIC);
 
    spinner = elm_spinner_add(win);
-   role = elm_interface_atspi_accessible_role_get(spinner);
+   role = efl_access_role_get(spinner);
 
-   ck_assert(role == ELM_ATSPI_ROLE_SPIN_BUTTON);
+   ck_assert(role == EFL_ACCESS_ROLE_SPIN_BUTTON);
 
    elm_shutdown();
 }
diff --git a/src/tests/elementary/elm_test_table.c b/src/tests/elementary/elm_test_table.c
index bb7edc5b19..7fa9323efb 100644
--- a/src/tests/elementary/elm_test_table.c
+++ b/src/tests/elementary/elm_test_table.c
@@ -2,7 +2,7 @@
 # include "elementary_config.h"
 #endif
 
-#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
+#define EFL_ACCESS_PROTECTED
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -10,15 +10,15 @@
 START_TEST (elm_atspi_role_get)
 {
    Evas_Object *win, *table;
-   Elm_Atspi_Role role;
+   Efl_Access_Role role;
 
    elm_init(1, NULL);
    win = elm_win_add(NULL, "table", ELM_WIN_BASIC);
 
    table = elm_table_add(win);
-   role = elm_interface_atspi_accessible_role_get(table);
+   role = efl_access_role_get(table);
 
-   ck_assert(role == ELM_ATSPI_ROLE_FILLER);
+   ck_assert(role == EFL_ACCESS_ROLE_FILLER);
 
    elm_shutdown();
 }
diff --git a/src/tests/elementary/elm_test_thumb.c b/src/tests/elementary/elm_test_thumb.c
index 3a06b0cd73..895a5f80a3 100644
--- a/src/tests/elementary/elm_test_thumb.c
+++ b/src/tests/elementary/elm_test_thumb.c
@@ -2,7 +2,7 @@
 # include "elementary_config.h"
 #endif
 
-#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
+#define EFL_ACCESS_PROTECTED
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -10,15 +10,15 @@
 START_TEST (elm_atspi_role_get)
 {
    Evas_Object *win, *thumb;
-   Elm_Atspi_Role role;
+   Efl_Access_Role role;
 
    elm_init(1, NULL);
    win = elm_win_add(NULL, "thumb", ELM_WIN_BASIC);
 
    thumb = elm_thumb_add(win);
-   role = elm_interface_atspi_accessible_role_get(thumb);
+   role = efl_access_role_get(thumb);
 
-   ck_assert(role == ELM_ATSPI_ROLE_IMAGE);
+   ck_assert(role == EFL_ACCESS_ROLE_IMAGE);
 
    elm_shutdown();
 }
diff --git a/src/tests/elementary/elm_test_toolbar.c b/src/tests/elementary/elm_test_toolbar.c
index d50f50b455..b1136f6c43 100644
--- a/src/tests/elementary/elm_test_toolbar.c
+++ b/src/tests/elementary/elm_test_toolbar.c
@@ -2,7 +2,7 @@
 # include "elementary_config.h"
 #endif
 
-#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
+#define EFL_ACCESS_PROTECTED
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -10,15 +10,15 @@
 START_TEST (elm_atspi_role_get)
 {
    Evas_Object *win, *toolbar;
-   Elm_Atspi_Role role;
+   Efl_Access_Role role;
 
    elm_init(1, NULL);
    win = elm_win_add(NULL, "toolbar", ELM_WIN_BASIC);
 
    toolbar = elm_toolbar_add(win);
-   role = elm_interface_atspi_accessible_role_get(toolbar);
+   role = efl_access_role_get(toolbar);
 
-   ck_assert(role == ELM_ATSPI_ROLE_TOOL_BAR);
+   ck_assert(role == EFL_ACCESS_ROLE_TOOL_BAR);
 
    elm_shutdown();
 }
diff --git a/src/tests/elementary/elm_test_video.c b/src/tests/elementary/elm_test_video.c
index f3b7fea2d2..444af9d48f 100644
--- a/src/tests/elementary/elm_test_video.c
+++ b/src/tests/elementary/elm_test_video.c
@@ -2,7 +2,7 @@
 # include "elementary_config.h"
 #endif
 
-#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
+#define EFL_ACCESS_PROTECTED
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -10,15 +10,15 @@
 START_TEST (elm_atspi_role_get)
 {
    Evas_Object *win, *video;
-   Elm_Atspi_Role role;
+   Efl_Access_Role role;
 
    elm_init(1, NULL);
    win = elm_win_add(NULL, "video", ELM_WIN_BASIC);
 
    video = elm_video_add(win);
-   role = elm_interface_atspi_accessible_role_get(video);
+   role = efl_access_role_get(video);
 
-   ck_assert(role == ELM_ATSPI_ROLE_ANIMATION);
+   ck_assert(role == EFL_ACCESS_ROLE_ANIMATION);
 
    elm_shutdown();
 }
diff --git a/src/tests/elementary/elm_test_web.c b/src/tests/elementary/elm_test_web.c
index e986e8c1ed..b094376ea9 100644
--- a/src/tests/elementary/elm_test_web.c
+++ b/src/tests/elementary/elm_test_web.c
@@ -2,7 +2,7 @@
 # include "elementary_config.h"
 #endif
 
-#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
+#define EFL_ACCESS_PROTECTED
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -11,15 +11,15 @@ START_TEST (elm_atspi_role_get)
 {
 #if 0
    Evas_Object *win, *web;
-   Elm_Atspi_Role role;
+   Efl_Access_Role role;
 
    elm_init(1, NULL);
    win = elm_win_add(NULL, "web", ELM_WIN_BASIC);
 
    web = elm_web_add(win);
-   role = elm_interface_atspi_accessible_role_get(web);
+   role = efl_access_role_get(web);
 
-   ck_assert(role == ELM_ATSPI_ROLE_HTML_CONTAINER);
+   ck_assert(role == EFL_ACCESS_ROLE_HTML_CONTAINER);
 
    elm_shutdown();
 #endif
diff --git a/src/tests/elementary/elm_test_win.c b/src/tests/elementary/elm_test_win.c
index b8524b323f..45855647ba 100644
--- a/src/tests/elementary/elm_test_win.c
+++ b/src/tests/elementary/elm_test_win.c
@@ -2,7 +2,7 @@
 # include "elementary_config.h"
 #endif
 
-#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
+#define EFL_ACCESS_PROTECTED
 #define EFL_ACCESS_COMPONENT_PROTECTED
 #include <Elementary.h>
 #ifdef HAVE_ELEMENTARY_X
@@ -64,14 +64,14 @@ _timer_fail_flag_cb(void *data)
 START_TEST (elm_atspi_role_get)
 {
    Evas_Object *win;
-   Elm_Atspi_Role role;
+   Efl_Access_Role role;
 
    elm_init(1, NULL);
    win = elm_win_add(NULL, "win", ELM_WIN_BASIC);
 
-   role = elm_interface_atspi_accessible_role_get(win);
+   role = efl_access_role_get(win);
 
-   ck_assert(role == ELM_ATSPI_ROLE_WINDOW);
+   ck_assert(role == EFL_ACCESS_ROLE_WINDOW);
 
    elm_shutdown();
 }
author	Lukasz Stanislawski <lukasz.stanislawski@gmail.com>	2017-10-19 10:13:54 +0900
committer	Jean-Philippe Andre <jp.andre@samsung.com>	2017-10-19 10:13:54 +0900
commit	57aefc53c18c14ada19dcd09d3e5b5612b277b16 (patch)
tree	897745eb7c2d9ccbbde1bc0cf4dd2971c2e625f4 /src/tests
parent	98622623a0865c525ede12ef5759ab6f5b3af407 (diff)
download	efl-57aefc53c18c14ada19dcd09d3e5b5612b277b16.tar.gz