Efl.Access.Object (from Efl.Access)

Ref https://phab.enlightenment.org/T6847

Reviewed-by: Cedric Bail <cedric@osg.samsung.com>

64 files changed, 219 insertions, 219 deletions

diff --git a/src/tests/elementary/elm_test_actionslider.c b/src/tests/elementary/elm_test_actionslider.c
index 38a09e5749..6adf7afc3d 100644
--- a/src/tests/elementary/elm_test_actionslider.c
+++ b/src/tests/elementary/elm_test_actionslider.c
@@ -2,7 +2,7 @@
 # include "elementary_config.h"
 #endif
 
-#define EFL_ACCESS_BETA
+#define EFL_ACCESS_OBJECT_BETA
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "actionslider", ELM_WIN_BASIC);
 
    actionslider = elm_actionslider_add(win);
-   role = efl_access_role_get(actionslider);
+   role = efl_access_object_role_get(actionslider);
 
    ck_assert(role == EFL_ACCESS_ROLE_SLIDER);
 
diff --git a/src/tests/elementary/elm_test_atspi.c b/src/tests/elementary/elm_test_atspi.c
index 607045bb9a..97524f4970 100644
--- a/src/tests/elementary/elm_test_atspi.c
+++ b/src/tests/elementary/elm_test_atspi.c
@@ -3,8 +3,8 @@
 #endif
 
 #define ELM_INTERNAL_API_ARGESFSDFEFC
-#define EFL_ACCESS_BETA
-#define EFL_ACCESS_PROTECTED
+#define EFL_ACCESS_OBJECT_BETA
+#define EFL_ACCESS_OBJECT_PROTECTED
 
 #include <Elementary.h>
 #include "elm_priv.h"
@@ -36,7 +36,7 @@ EFL_START_TEST (test_efl_access_app_obj_name_get)
 
    elm_app_name_set("Test name");
 
-   ret = efl_access_i18n_name_get(root);
+   ret = efl_access_object_i18n_name_get(root);
 
    ck_assert_str_eq(ret, "Test name");
 
@@ -44,13 +44,13 @@ EFL_START_TEST (test_efl_access_app_obj_name_get)
 }
 EFL_END_TEST
 
-EFL_START_TEST (test_efl_access_i18n_name_get)
+EFL_START_TEST (test_efl_access_object_i18n_name_get)
 {
    generate_app();
 
    const char *name;
 
-   name = efl_access_i18n_name_get(g_btn);
+   name = efl_access_object_i18n_name_get(g_btn);
 
    if (name && name[0]) {
       ck_assert(0);
@@ -59,7 +59,7 @@ EFL_START_TEST (test_efl_access_i18n_name_get)
    // Set name with additional text tags
    elm_object_text_set(g_btn, "Some<br>text");
 
-   name = efl_access_i18n_name_get(g_btn);
+   name = efl_access_object_i18n_name_get(g_btn);
 
    // Accessible name should have cleared tags
    ck_assert(name != NULL);
@@ -68,22 +68,22 @@ EFL_START_TEST (test_efl_access_i18n_name_get)
 }
 EFL_END_TEST
 
-EFL_START_TEST (test_efl_access_i18n_name_set)
+EFL_START_TEST (test_efl_access_object_i18n_name_set)
 {
    generate_app();
 
    const char *name;
 
    elm_object_text_set(g_btn, "Other text");
-   efl_access_i18n_name_set(g_btn, "Test name");
+   efl_access_object_i18n_name_set(g_btn, "Test name");
 
-   name = efl_access_i18n_name_get(g_btn);
+   name = efl_access_object_i18n_name_get(g_btn);
 
    ck_assert(name != NULL);
    ck_assert_str_eq(name, "Test name");
 
-   efl_access_i18n_name_set(g_btn, NULL);
-   name = efl_access_i18n_name_get(g_btn);
+   efl_access_object_i18n_name_set(g_btn, NULL);
+   name = efl_access_object_i18n_name_get(g_btn);
 
    ck_assert(name != NULL);
    ck_assert_str_eq(name, "Other text");
@@ -91,13 +91,13 @@ EFL_START_TEST (test_efl_access_i18n_name_set)
 }
 EFL_END_TEST
 
-EFL_START_TEST (test_efl_access_role_get)
+EFL_START_TEST (test_efl_access_object_role_get)
 {
    Eo* root = efl_add(ELM_ATSPI_APP_OBJECT_CLASS, efl_main_loop_get());
 
    Efl_Access_Role role;
 
-   role = efl_access_role_get(root);
+   role = efl_access_object_role_get(root);
 
    ck_assert(role == EFL_ACCESS_ROLE_APPLICATION);
 
@@ -105,19 +105,19 @@ EFL_START_TEST (test_efl_access_role_get)
 }
 EFL_END_TEST
 
-EFL_START_TEST (test_efl_access_role_set)
+EFL_START_TEST (test_efl_access_object_role_set)
 {
    generate_app();
    Efl_Access_Role role;
 
-   efl_access_role_set(g_btn, EFL_ACCESS_ROLE_ACCELERATOR_LABEL);
-   role = efl_access_role_get(g_btn);
+   efl_access_object_role_set(g_btn, EFL_ACCESS_ROLE_ACCELERATOR_LABEL);
+   role = efl_access_object_role_get(g_btn);
 
    if (role != EFL_ACCESS_ROLE_ACCELERATOR_LABEL)
       ck_assert(0);
 
-   efl_access_role_set(g_btn, EFL_ACCESS_ROLE_ENTRY);
-   role = efl_access_role_get(g_btn);
+   efl_access_object_role_set(g_btn, EFL_ACCESS_ROLE_ENTRY);
+   role = efl_access_object_role_get(g_btn);
 
    if (role != EFL_ACCESS_ROLE_ENTRY)
       ck_assert(0);
@@ -125,13 +125,13 @@ EFL_START_TEST (test_efl_access_role_set)
 }
 EFL_END_TEST
 
-EFL_START_TEST (test_efl_access_role_name_get)
+EFL_START_TEST (test_efl_access_object_role_name_get)
 {
    Eo* root = efl_add(ELM_ATSPI_APP_OBJECT_CLASS, efl_main_loop_get());
 
    const char *ret = NULL;
 
-   ret = efl_access_role_name_get(root);
+   ret = efl_access_object_role_name_get(root);
 
    ck_assert(ret != NULL);
 
@@ -139,13 +139,13 @@ EFL_START_TEST (test_efl_access_role_name_get)
 }
 EFL_END_TEST
 
-EFL_START_TEST (test_efl_access_localized_role_name_get)
+EFL_START_TEST (test_efl_access_object_localized_role_name_get)
 {
    Eo* root = efl_add(ELM_ATSPI_APP_OBJECT_CLASS, efl_main_loop_get());
 
    const char *ret = NULL;
 
-   ret = efl_access_localized_role_name_get(root);
+   ret = efl_access_object_localized_role_name_get(root);
 
    ck_assert(ret != NULL);
 
@@ -153,7 +153,7 @@ EFL_START_TEST (test_efl_access_localized_role_name_get)
 }
 EFL_END_TEST
 
-EFL_START_TEST (test_efl_access_description_set)
+EFL_START_TEST (test_efl_access_object_description_set)
 {
    Eo* root = efl_add(ELM_ATSPI_APP_OBJECT_CLASS, efl_main_loop_get());
 
@@ -161,18 +161,18 @@ EFL_START_TEST (test_efl_access_description_set)
 
    const char *desc = "Test description";
 
-   ret = efl_access_description_get(root);
+   ret = efl_access_object_description_get(root);
 
    ck_assert(ret == NULL);
 
-   efl_access_description_set(root, desc);
-   ret = efl_access_description_get(root);
+   efl_access_object_description_set(root, desc);
+   ret = efl_access_object_description_get(root);
 
    ck_assert(ret != NULL);
    ck_assert_str_eq(ret, "Test description");
 
-   efl_access_description_set(root, NULL);
-   ret = efl_access_description_get(root);
+   efl_access_object_description_set(root, NULL);
+   ret = efl_access_object_description_get(root);
 
    ck_assert(ret == NULL);
 
@@ -181,12 +181,12 @@ EFL_START_TEST (test_efl_access_description_set)
 EFL_END_TEST
 
 /* Test if initial description value is NULL */
-EFL_START_TEST (test_efl_access_description_get)
+EFL_START_TEST (test_efl_access_object_description_get)
 {
    generate_app();
 
    const char *descr;
-   descr = efl_access_description_get(g_bg);
+   descr = efl_access_object_description_get(g_bg);
 
    ck_assert(descr == NULL);
 
@@ -200,9 +200,9 @@ EFL_START_TEST (test_efl_access_children_and_parent)
 
    Eina_List *child_list = NULL;
 
-   child_list = efl_access_children_get(root);
+   child_list = efl_access_object_access_children_get(root);
 
-   //bg_child_list = efl_access_children_get(eina_list_nth(child_list, 0));
+   //bg_child_list = efl_access_object_access_children_get(eina_list_nth(child_list, 0));
 
    ck_assert(eina_list_count(child_list) == 1);
 
@@ -225,11 +225,11 @@ EFL_START_TEST (test_efl_access_children_and_parent2)
    Eo *win = NULL;
 
    Eina_List *root_children;
-   root_children = efl_access_children_get(root);
+   root_children = efl_access_object_access_children_get(root);
    win = eina_list_nth(root_children, 0);
 
    Eina_List *win_children;
-   win_children = efl_access_children_get(win);
+   win_children = efl_access_object_access_children_get(win);
 
    ck_assert(eina_list_count(win_children) == 1);
 
@@ -244,40 +244,40 @@ EFL_START_TEST (test_efl_access_children_and_parent2)
 EFL_END_TEST
 
 /* Initial value of translation domain should be NULL */
-EFL_START_TEST (test_efl_access_translation_domain_get)
+EFL_START_TEST (test_efl_access_object_translation_domain_get)
 {
    generate_app();
 
    const char *domain;
 
-   domain = efl_access_translation_domain_get(g_btn);
+   domain = efl_access_object_translation_domain_get(g_btn);
 
    ck_assert(domain == NULL);
 
 }
 EFL_END_TEST
 
-EFL_START_TEST (test_efl_access_translation_domain_set)
+EFL_START_TEST (test_efl_access_object_translation_domain_set)
 {
    generate_app();
 
    const char *domain;
 
-   efl_access_translation_domain_set(g_btn, "Test translation_domain");
-   domain = efl_access_translation_domain_get(g_btn);
+   efl_access_object_translation_domain_set(g_btn, "Test translation_domain");
+   domain = efl_access_object_translation_domain_get(g_btn);
 
    ck_assert(domain != NULL);
    ck_assert_str_eq(domain, "Test translation_domain");
 
-   efl_access_translation_domain_set(g_btn, NULL);
-   domain = efl_access_translation_domain_get(g_btn);
+   efl_access_object_translation_domain_set(g_btn, NULL);
+   domain = efl_access_object_translation_domain_get(g_btn);
 
    ck_assert(domain == NULL);
 
 }
 EFL_END_TEST
 
-EFL_START_TEST (test_efl_access_relationship_append)
+EFL_START_TEST (test_efl_access_object_relationship_append)
 {
    generate_app();
 
@@ -285,9 +285,9 @@ EFL_START_TEST (test_efl_access_relationship_append)
    Efl_Access_Relation *rel, *rel_to, *rel_from;
    Eina_List *l;
 
-   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);
+   efl_access_object_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_TO, g_bg);
+   efl_access_object_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_FROM, g_win);
+   set = efl_access_object_relation_set_get(g_btn);
 
    ck_assert(set != NULL);
    ck_assert(eina_list_count(set) >= 2);
@@ -310,9 +310,9 @@ EFL_START_TEST (test_efl_access_relationship_append)
    efl_access_relation_set_free(set);
 
    /* Check if append do not procude duplicated relations */
-   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);
+   efl_access_object_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_TO, g_bg);
+   efl_access_object_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_FROM, g_win);
+   set = efl_access_object_relation_set_get(g_btn);
 
    rel_to = rel_from = NULL;
    EINA_LIST_FOREACH(set, l, rel)
@@ -338,7 +338,7 @@ EFL_START_TEST (test_efl_access_relationship_append)
 }
 EFL_END_TEST
 
-EFL_START_TEST (test_efl_access_relationship_remove)
+EFL_START_TEST (test_efl_access_object_relationship_remove)
 {
    generate_app();
 
@@ -347,10 +347,10 @@ EFL_START_TEST (test_efl_access_relationship_remove)
    Eina_List *l;
 
    /* Test if removal of single relationship works */
-   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);
+   efl_access_object_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_TO, g_bg);
+   efl_access_object_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_FROM, g_win);
+   efl_access_object_relationship_remove(g_btn, EFL_ACCESS_RELATION_FLOWS_TO, g_bg);
+   set = efl_access_object_relation_set_get(g_btn);
 
    ck_assert(set != NULL);
    ck_assert(eina_list_count(set) >= 1);
@@ -371,10 +371,10 @@ EFL_START_TEST (test_efl_access_relationship_remove)
    efl_access_relation_set_free(set);
 
    /* Test if removal of type relationship works */
-   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);
+   efl_access_object_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_TO, g_bg);
+   efl_access_object_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_TO, g_win);
+   efl_access_object_relationship_remove(g_btn, EFL_ACCESS_RELATION_FLOWS_TO, NULL);
+   set = efl_access_object_relation_set_get(g_btn);
 
    rel_to = rel_from = NULL;
    EINA_LIST_FOREACH(set, l, rel)
@@ -392,10 +392,10 @@ EFL_START_TEST (test_efl_access_relationship_remove)
    efl_access_relation_set_free(set);
 
    /* Test if relationship is implicity removed when object is deleted */
-   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_object_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_TO, g_bg);
+   efl_access_object_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_FROM, g_bg);
    efl_del(g_bg);
-   set = efl_access_relation_set_get(g_btn);
+   set = efl_access_object_relation_set_get(g_btn);
 
    rel_to = rel_from = NULL;
    EINA_LIST_FOREACH(set, l, rel)
@@ -413,7 +413,7 @@ EFL_START_TEST (test_efl_access_relationship_remove)
 }
 EFL_END_TEST
 
-EFL_START_TEST (test_efl_access_relationships_clear)
+EFL_START_TEST (test_efl_access_object_relationships_clear)
 {
    Efl_Access_Relation_Set set;
    Efl_Access_Relation *rel;
@@ -421,14 +421,14 @@ EFL_START_TEST (test_efl_access_relationships_clear)
 
    generate_app();
 
-   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);
+   efl_access_object_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_TO, g_bg);
+   efl_access_object_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_FROM, g_bg);
+   efl_access_object_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_TO, g_win);
+   efl_access_object_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_FROM, g_win);
 
-   efl_access_relationships_clear(g_btn);
+   efl_access_object_relationships_clear(g_btn);
 
-   set = efl_access_relation_set_get(g_btn);
+   set = efl_access_object_relation_set_get(g_btn);
    EINA_LIST_FOREACH(set, l, rel)
    {
       ck_assert(!((rel->type == EFL_ACCESS_RELATION_FLOWS_TO) && eina_list_data_find(rel->objects, g_bg)));
@@ -444,19 +444,19 @@ EFL_END_TEST
 void elm_test_atspi(TCase *tc)
 {
    tcase_add_test(tc, test_efl_access_app_obj_name_get);
-   tcase_add_test(tc, test_efl_access_i18n_name_get);
-   tcase_add_test(tc, test_efl_access_i18n_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_object_i18n_name_get);
+   tcase_add_test(tc, test_efl_access_object_i18n_name_set);
+   tcase_add_test(tc, test_efl_access_object_role_get);
+   tcase_add_test(tc, test_efl_access_object_role_set);
+   tcase_add_test(tc, test_efl_access_object_role_name_get);
+   tcase_add_test(tc, test_efl_access_object_localized_role_name_get);
+   tcase_add_test(tc, test_efl_access_object_description_set);
+   tcase_add_test(tc, test_efl_access_object_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);
+   tcase_add_test(tc, test_efl_access_object_translation_domain_get);
+   tcase_add_test(tc, test_efl_access_object_translation_domain_set);
+   tcase_add_test(tc, test_efl_access_object_relationship_append);
+   tcase_add_test(tc, test_efl_access_object_relationship_remove);
+   tcase_add_test(tc, test_efl_access_object_relationships_clear);
 }
diff --git a/src/tests/elementary/elm_test_box.c b/src/tests/elementary/elm_test_box.c
index becfb98f7b..86e27c8862 100644
--- a/src/tests/elementary/elm_test_box.c
+++ b/src/tests/elementary/elm_test_box.c
@@ -2,7 +2,7 @@
 # include "elementary_config.h"
 #endif
 
-#define EFL_ACCESS_BETA
+#define EFL_ACCESS_OBJECT_BETA
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "box", ELM_WIN_BASIC);
 
    box = elm_box_add(win);
-   role = efl_access_role_get(box);
+   role = efl_access_object_role_get(box);
 
    ck_assert(role == EFL_ACCESS_ROLE_FILLER);
 
diff --git a/src/tests/elementary/elm_test_bubble.c b/src/tests/elementary/elm_test_bubble.c
index 485ac91ef9..dea1552c9c 100644
--- a/src/tests/elementary/elm_test_bubble.c
+++ b/src/tests/elementary/elm_test_bubble.c
@@ -2,7 +2,7 @@
 # include "elementary_config.h"
 #endif
 
-#define EFL_ACCESS_BETA
+#define EFL_ACCESS_OBJECT_BETA
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "bubble", ELM_WIN_BASIC);
 
    bubble = elm_bubble_add(win);
-   role = efl_access_role_get(bubble);
+   role = efl_access_object_role_get(bubble);
 
    ck_assert(role == EFL_ACCESS_ROLE_FILLER);
 
diff --git a/src/tests/elementary/elm_test_button.c b/src/tests/elementary/elm_test_button.c
index ee49bb98f1..99f15ef90b 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 EFL_ACCESS_BETA
+#define EFL_ACCESS_OBJECT_BETA
 #define EFL_ACCESS_COMPONENT_PROTECTED
 #define EFL_ACCESS_ACTION_PROTECTED
 #include <Elementary.h>
@@ -36,7 +36,7 @@ EFL_START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "button", ELM_WIN_BASIC);
 
    button = elm_button_add(win);
-   role = efl_access_role_get(button);
+   role = efl_access_object_role_get(button);
 
    ck_assert(role == EFL_ACCESS_ROLE_PUSH_BUTTON);
 
@@ -51,7 +51,7 @@ EFL_START_TEST (elm_atspi_interfaces_check)
 
    button = elm_button_add(win);
 
-   ck_assert(efl_isa(button, EFL_ACCESS_MIXIN));
+   ck_assert(efl_isa(button, EFL_ACCESS_OBJECT_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 90da2ffac8..8ac4d3d937 100644
--- a/src/tests/elementary/elm_test_calendar.c
+++ b/src/tests/elementary/elm_test_calendar.c
@@ -2,7 +2,7 @@
 # include "elementary_config.h"
 #endif
 
-#define EFL_ACCESS_BETA
+#define EFL_ACCESS_OBJECT_BETA
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "calendar", ELM_WIN_BASIC);
 
    calendar = elm_calendar_add(win);
-   role = efl_access_role_get(calendar);
+   role = efl_access_object_role_get(calendar);
 
    ck_assert(role == EFL_ACCESS_ROLE_CALENDAR);
 
diff --git a/src/tests/elementary/elm_test_check.c b/src/tests/elementary/elm_test_check.c
index 486475f79b..243c38e591 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 EFL_ACCESS_BETA
+#define EFL_ACCESS_OBJECT_BETA
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -74,7 +74,7 @@ EFL_START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "check", ELM_WIN_BASIC);
 
    check = elm_check_add(win);
-   role = efl_access_role_get(check);
+   role = efl_access_object_role_get(check);
 
    ck_assert(role == EFL_ACCESS_ROLE_CHECK_BOX);
 
diff --git a/src/tests/elementary/elm_test_clock.c b/src/tests/elementary/elm_test_clock.c
index e1827a9830..568cb5b883 100644
--- a/src/tests/elementary/elm_test_clock.c
+++ b/src/tests/elementary/elm_test_clock.c
@@ -2,7 +2,7 @@
 # include "elementary_config.h"
 #endif
 
-#define EFL_ACCESS_BETA
+#define EFL_ACCESS_OBJECT_BETA
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "clock", ELM_WIN_BASIC);
 
    clk = elm_clock_add(win);
-   role = efl_access_role_get(clk);
+   role = efl_access_object_role_get(clk);
 
    ck_assert(role == EFL_ACCESS_ROLE_TEXT);
 
diff --git a/src/tests/elementary/elm_test_colorselector.c b/src/tests/elementary/elm_test_colorselector.c
index 5e4c78151e..bc7a055934 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 EFL_ACCESS_BETA
+#define EFL_ACCESS_OBJECT_BETA
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -59,7 +59,7 @@ EFL_START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "colorselector", ELM_WIN_BASIC);
 
    c = elm_colorselector_add(win);
-   role = efl_access_role_get(c);
+   role = efl_access_object_role_get(c);
 
    ck_assert(role == EFL_ACCESS_ROLE_COLOR_CHOOSER);
 
diff --git a/src/tests/elementary/elm_test_config.c b/src/tests/elementary/elm_test_config.c
index c69b53340c..2edab80b51 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 EFL_ACCESS_PROTECTED
+#define EFL_ACCESS_OBJECT_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 befb99727e..5bd0454c03 100644
--- a/src/tests/elementary/elm_test_conformant.c
+++ b/src/tests/elementary/elm_test_conformant.c
@@ -2,7 +2,7 @@
 # include "elementary_config.h"
 #endif
 
-#define EFL_ACCESS_BETA
+#define EFL_ACCESS_OBJECT_BETA
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "conformant", ELM_WIN_BASIC);
 
    conformant = elm_conformant_add(win);
-   role = efl_access_role_get(conformant);
+   role = efl_access_object_role_get(conformant);
 
    ck_assert(role == EFL_ACCESS_ROLE_FILLER);
 
diff --git a/src/tests/elementary/elm_test_ctxpopup.c b/src/tests/elementary/elm_test_ctxpopup.c
index 053a5ad2ac..7d482b8f8d 100644
--- a/src/tests/elementary/elm_test_ctxpopup.c
+++ b/src/tests/elementary/elm_test_ctxpopup.c
@@ -2,7 +2,7 @@
 # include "elementary_config.h"
 #endif
 
-#define EFL_ACCESS_BETA
+#define EFL_ACCESS_OBJECT_BETA
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "icon", ELM_WIN_BASIC);
 
    ctxpopup = elm_ctxpopup_add(win);
-   role = efl_access_role_get(ctxpopup);
+   role = efl_access_object_role_get(ctxpopup);
 
    ck_assert(role == EFL_ACCESS_ROLE_POPUP_MENU);
 
diff --git a/src/tests/elementary/elm_test_datetime.c b/src/tests/elementary/elm_test_datetime.c
index 3c614c9a59..3f35de79d2 100644
--- a/src/tests/elementary/elm_test_datetime.c
+++ b/src/tests/elementary/elm_test_datetime.c
@@ -2,7 +2,7 @@
 # include "elementary_config.h"
 #endif
 
-#define EFL_ACCESS_BETA
+#define EFL_ACCESS_OBJECT_BETA
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "datetime", ELM_WIN_BASIC);
 
    datetime = elm_datetime_add(win);
-   role = efl_access_role_get(datetime);
+   role = efl_access_object_role_get(datetime);
 
    ck_assert(role == EFL_ACCESS_ROLE_DATE_EDITOR);
 
diff --git a/src/tests/elementary/elm_test_dayselector.c b/src/tests/elementary/elm_test_dayselector.c
index 1c3b480c02..c92eb8fe28 100644
--- a/src/tests/elementary/elm_test_dayselector.c
+++ b/src/tests/elementary/elm_test_dayselector.c
@@ -2,7 +2,7 @@
 # include "elementary_config.h"
 #endif
 
-#define EFL_ACCESS_BETA
+#define EFL_ACCESS_OBJECT_BETA
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "dayselector", ELM_WIN_BASIC);
 
    dayselector = elm_dayselector_add(win);
-   role = efl_access_role_get(dayselector);
+   role = efl_access_object_role_get(dayselector);
 
    ck_assert(role == EFL_ACCESS_ROLE_PANEL);
 
diff --git a/src/tests/elementary/elm_test_diskselector.c b/src/tests/elementary/elm_test_diskselector.c
index fcf95ef4b8..19162cd0aa 100644
--- a/src/tests/elementary/elm_test_diskselector.c
+++ b/src/tests/elementary/elm_test_diskselector.c
@@ -2,7 +2,7 @@
 # include "elementary_config.h"
 #endif
 
-#define EFL_ACCESS_BETA
+#define EFL_ACCESS_OBJECT_BETA
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "diskselector", ELM_WIN_BASIC);
 
    diskselector = elm_diskselector_add(win);
-   role = efl_access_role_get(diskselector);
+   role = efl_access_object_role_get(diskselector);
 
    ck_assert(role == EFL_ACCESS_ROLE_LIST);
 
diff --git a/src/tests/elementary/elm_test_entry.c b/src/tests/elementary/elm_test_entry.c
index 9be9da6686..3fde6b9a7a 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 EFL_ACCESS_BETA
+#define EFL_ACCESS_OBJECT_BETA
 #define EFL_ACCESS_TEXT_BETA
 #define EFL_ACCESS_TEXT_PROTECTED
 #include <Elementary.h>
@@ -386,7 +386,7 @@ EFL_START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "entry", ELM_WIN_BASIC);
 
    entry = elm_entry_add(win);
-   role = efl_access_role_get(entry);
+   role = efl_access_object_role_get(entry);
 
    ck_assert(role == EFL_ACCESS_ROLE_ENTRY);
 
diff --git a/src/tests/elementary/elm_test_fileselector.c b/src/tests/elementary/elm_test_fileselector.c
index 096cf368d7..d62ee349f4 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 EFL_ACCESS_BETA
+#define EFL_ACCESS_OBJECT_BETA
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "fileselector", ELM_WIN_BASIC);
 
    fileselector = elm_fileselector_add(win);
-   role = efl_access_role_get(fileselector);
+   role = efl_access_object_role_get(fileselector);
 
    ck_assert(role == EFL_ACCESS_ROLE_FILE_CHOOSER);
 
diff --git a/src/tests/elementary/elm_test_fileselector_button.c b/src/tests/elementary/elm_test_fileselector_button.c
index 9079860569..5d315d903b 100644
--- a/src/tests/elementary/elm_test_fileselector_button.c
+++ b/src/tests/elementary/elm_test_fileselector_button.c
@@ -2,7 +2,7 @@
 # include "elementary_config.h"
 #endif
 
-#define EFL_ACCESS_BETA
+#define EFL_ACCESS_OBJECT_BETA
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "fileselector_button", ELM_WIN_BASIC);
 
    fs_button = elm_fileselector_button_add(win);
-   role = efl_access_role_get(fs_button);
+   role = efl_access_object_role_get(fs_button);
 
    ck_assert(role == EFL_ACCESS_ROLE_PUSH_BUTTON);
 
diff --git a/src/tests/elementary/elm_test_fileselector_entry.c b/src/tests/elementary/elm_test_fileselector_entry.c
index 42af79700b..9d7cfc40e2 100644
--- a/src/tests/elementary/elm_test_fileselector_entry.c
+++ b/src/tests/elementary/elm_test_fileselector_entry.c
@@ -2,7 +2,7 @@
 # include "elementary_config.h"
 #endif
 
-#define EFL_ACCESS_BETA
+#define EFL_ACCESS_OBJECT_BETA
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "fileselectorentry", ELM_WIN_BASIC);
 
    fs_entry = elm_fileselector_entry_add(win);
-   role = efl_access_role_get(fs_entry);
+   role = efl_access_object_role_get(fs_entry);
 
    ck_assert(role == EFL_ACCESS_ROLE_GROUPING);
 
diff --git a/src/tests/elementary/elm_test_flip.c b/src/tests/elementary/elm_test_flip.c
index 4d87dfa00d..661105d0bc 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 EFL_ACCESS_BETA
+#define EFL_ACCESS_OBJECT_BETA
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "flip", ELM_WIN_BASIC);
 
    flip = elm_flip_add(win);
-   role = efl_access_role_get(flip);
+   role = efl_access_object_role_get(flip);
 
    ck_assert(role == EFL_ACCESS_ROLE_PAGE_TAB_LIST);
 
diff --git a/src/tests/elementary/elm_test_flipselector.c b/src/tests/elementary/elm_test_flipselector.c
index 40523b73bc..ba15290f50 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 EFL_ACCESS_BETA
+#define EFL_ACCESS_OBJECT_BETA
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "flipselector", ELM_WIN_BASIC);
 
    flipselector = elm_flipselector_add(win);
-   role = efl_access_role_get(flipselector);
+   role = efl_access_object_role_get(flipselector);
 
    ck_assert(role == EFL_ACCESS_ROLE_LIST);
 
diff --git a/src/tests/elementary/elm_test_focus_common.h b/src/tests/elementary/elm_test_focus_common.h
index 7105d7f736..bfce152cc3 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 EFL_ACCESS_PROTECTED
+#define EFL_ACCESS_OBJECT_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 d6ca3fedf9..0d0492a99d 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 EFL_ACCESS_BETA
+#define EFL_ACCESS_OBJECT_BETA
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "frame", ELM_WIN_BASIC);
 
    frame = elm_frame_add(win);
-   role = efl_access_role_get(frame);
+   role = efl_access_object_role_get(frame);
 
    ck_assert(role == EFL_ACCESS_ROLE_FRAME);
 
diff --git a/src/tests/elementary/elm_test_gengrid.c b/src/tests/elementary/elm_test_gengrid.c
index 85fe9af940..9134b2fe67 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 EFL_ACCESS_BETA
+#define EFL_ACCESS_OBJECT_BETA
 #include <Elementary.h>
 #include "elm_suite.h"
 #include "elm_test_helper.h"
@@ -35,7 +35,7 @@ EFL_START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "gengrid", ELM_WIN_BASIC);
 
    gengrid = elm_gengrid_add(win);
-   role = efl_access_role_get(gengrid);
+   role = efl_access_object_role_get(gengrid);
 
    ck_assert(role == EFL_ACCESS_ROLE_TREE_TABLE);
 
@@ -69,7 +69,7 @@ EFL_START_TEST(elm_atspi_children_parent)
    Evas_Object *gengrid = elm_gengrid_add(win);
    evas_object_resize(gengrid, 100, 100);
 
-   Efl_Access *parent;
+   Efl_Access_Object *parent;
    content = NULL;
 
    itc.item_style = "default";
@@ -82,7 +82,7 @@ EFL_START_TEST(elm_atspi_children_parent)
    elm_gengrid_item_fields_update(it, "*.", ELM_GENGRID_ITEM_FIELD_CONTENT);
 
    ck_assert(content != NULL);
-   parent = efl_provider_find(efl_parent_get(content), EFL_ACCESS_MIXIN);
+   parent = efl_provider_find(efl_parent_get(content), EFL_ACCESS_OBJECT_MIXIN);
    ck_assert(it == parent);
 
 }
diff --git a/src/tests/elementary/elm_test_genlist.c b/src/tests/elementary/elm_test_genlist.c
index fd346364e8..74b7575c5b 100644
--- a/src/tests/elementary/elm_test_genlist.c
+++ b/src/tests/elementary/elm_test_genlist.c
@@ -2,8 +2,8 @@
 # include "elementary_config.h"
 #endif
 
-#define EFL_ACCESS_BETA
-#define EFL_ACCESS_PROTECTED
+#define EFL_ACCESS_OBJECT_BETA
+#define EFL_ACCESS_OBJECT_PROTECTED
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -103,7 +103,7 @@ EFL_START_TEST (elm_atspi_role_get)
 
    Efl_Access_Role role;
 
-   role = efl_access_role_get(genlist);
+   role = efl_access_object_role_get(genlist);
 
    ck_assert(role == EFL_ACCESS_ROLE_LIST);
 
@@ -116,14 +116,14 @@ EFL_START_TEST(elm_atspi_children_get1)
    Eina_List *children;
    Elm_Object_Item *it[3];
 
-   children = efl_access_children_get(genlist);
+   children = efl_access_object_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 = efl_access_children_get(genlist);
+   children = efl_access_object_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]);
@@ -144,7 +144,7 @@ EFL_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 = efl_access_children_get(genlist);
+   children = efl_access_object_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]);
@@ -155,7 +155,7 @@ EFL_END_TEST
 static void
 _children_changed_cb(void *data EINA_UNUSED, const Efl_Event *event)
 {
-   if (event->desc != EFL_ACCESS_EVENT_CHILDREN_CHANGED)
+   if (event->desc != EFL_ACCESS_OBJECT_EVENT_CHILDREN_CHANGED)
      return;
 
    ev_data = *(Efl_Access_Event_Children_Changed_Data*)event->info;
@@ -172,7 +172,7 @@ EFL_START_TEST(elm_atspi_children_events_add)
 
    Elm_Object_Item *it[3];
 
-   efl_access_event_handler_add(EFL_ACCESS_MIXIN, _children_changed_cb, NULL);
+   efl_access_object_event_handler_add(EFL_ACCESS_OBJECT_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);
@@ -208,7 +208,7 @@ EFL_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);
 
-   efl_access_event_handler_add(EFL_ACCESS_MIXIN, _children_changed_cb, NULL);
+   efl_access_object_event_handler_add(EFL_ACCESS_OBJECT_MIXIN, _children_changed_cb, NULL);
 
    elm_object_item_del(it[0]);
    ck_assert(genlist == current);
@@ -235,7 +235,7 @@ EFL_START_TEST(elm_atspi_children_events_del2)
 
    it = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
 
-   efl_access_event_handler_add(EFL_ACCESS_MIXIN, _children_changed_cb, NULL);
+   efl_access_object_event_handler_add(EFL_ACCESS_OBJECT_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 4d8525c234..7c38e4584c 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 EFL_ACCESS_BETA
+#define EFL_ACCESS_OBJECT_BETA
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -41,7 +41,7 @@ EFL_START_TEST (elm_atspi_role_get)
    // if no gl backend skip test
    if (glview)
      {
-        role = efl_access_role_get(glview);
+        role = efl_access_object_role_get(glview);
         ck_assert(role == EFL_ACCESS_ROLE_ANIMATION);
      }
 
diff --git a/src/tests/elementary/elm_test_grid.c b/src/tests/elementary/elm_test_grid.c
index ec08a3659b..f7c74e020a 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 EFL_ACCESS_BETA
+#define EFL_ACCESS_OBJECT_BETA
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "grid", ELM_WIN_BASIC);
 
    grid = elm_grid_add(win);
-   role = efl_access_role_get(grid);
+   role = efl_access_object_role_get(grid);
 
    ck_assert(role == EFL_ACCESS_ROLE_FILLER);
 
diff --git a/src/tests/elementary/elm_test_hover.c b/src/tests/elementary/elm_test_hover.c
index b3660ff5b8..4455f87692 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 EFL_ACCESS_BETA
+#define EFL_ACCESS_OBJECT_BETA
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "hover", ELM_WIN_BASIC);
 
    hover = elm_hover_add(win);
-   role = efl_access_role_get(hover);
+   role = efl_access_object_role_get(hover);
 
    ck_assert(role == EFL_ACCESS_ROLE_POPUP_MENU);
 
diff --git a/src/tests/elementary/elm_test_hoversel.c b/src/tests/elementary/elm_test_hoversel.c
index 1e22955d53..cf27c0abda 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 EFL_ACCESS_BETA
+#define EFL_ACCESS_OBJECT_BETA
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "hoversel", ELM_WIN_BASIC);
 
    hoversel = elm_hoversel_add(win);
-   role = efl_access_role_get(hoversel);
+   role = efl_access_object_role_get(hoversel);
 
    ck_assert(role == EFL_ACCESS_ROLE_PUSH_BUTTON);
 
diff --git a/src/tests/elementary/elm_test_icon.c b/src/tests/elementary/elm_test_icon.c
index afd747a9aa..1b9aa33a3e 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 EFL_ACCESS_BETA
+#define EFL_ACCESS_OBJECT_BETA
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "icon", ELM_WIN_BASIC);
 
    icon = elm_icon_add(win);
-   role = efl_access_role_get(icon);
+   role = efl_access_object_role_get(icon);
 
    ck_assert(role == EFL_ACCESS_ROLE_ICON);
 
diff --git a/src/tests/elementary/elm_test_image.c b/src/tests/elementary/elm_test_image.c
index 8e4c791ba3..0efb0e4a76 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 EFL_ACCESS_BETA
+#define EFL_ACCESS_OBJECT_BETA
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -45,7 +45,7 @@ EFL_START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "image", ELM_WIN_BASIC);
 
    image = elm_image_add(win);
-   role = efl_access_role_get(image);
+   role = efl_access_object_role_get(image);
 
    ck_assert(role == EFL_ACCESS_ROLE_IMAGE);
 
diff --git a/src/tests/elementary/elm_test_index.c b/src/tests/elementary/elm_test_index.c
index e8ea3ecff1..75d365ead7 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 EFL_ACCESS_BETA
+#define EFL_ACCESS_OBJECT_BETA
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "index", ELM_WIN_BASIC);
 
    idx = elm_index_add(win);
-   role = efl_access_role_get(idx);
+   role = efl_access_object_role_get(idx);
 
    ck_assert(role == EFL_ACCESS_ROLE_SCROLL_BAR);
 
diff --git a/src/tests/elementary/elm_test_inwin.c b/src/tests/elementary/elm_test_inwin.c
index 33141b4f6a..c330a63cf4 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 EFL_ACCESS_BETA
+#define EFL_ACCESS_OBJECT_BETA
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "inwin", ELM_WIN_BASIC);
 
    inwin = elm_win_inwin_add(win);
-   role = efl_access_role_get(inwin);
+   role = efl_access_object_role_get(inwin);
 
    ck_assert(role == EFL_ACCESS_ROLE_GLASS_PANE);
 
diff --git a/src/tests/elementary/elm_test_label.c b/src/tests/elementary/elm_test_label.c
index e580ec4c4c..a79ae73711 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 EFL_ACCESS_BETA
+#define EFL_ACCESS_OBJECT_BETA
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "label", ELM_WIN_BASIC);
 
    label = elm_label_add(win);
-   role = efl_access_role_get(label);
+   role = efl_access_object_role_get(label);
 
    ck_assert(role == EFL_ACCESS_ROLE_LABEL);
 
diff --git a/src/tests/elementary/elm_test_layout.c b/src/tests/elementary/elm_test_layout.c
index cf7badeb91..a62e2c79e2 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 EFL_ACCESS_BETA
+#define EFL_ACCESS_OBJECT_BETA
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -34,7 +34,7 @@ EFL_START_TEST(elm_atspi_role_get)
    win = elm_win_add(NULL, "layout", ELM_WIN_BASIC);
 
    layout = elm_layout_add(win);
-   role = efl_access_role_get(layout);
+   role = efl_access_object_role_get(layout);
 
    ck_assert(role == EFL_ACCESS_ROLE_FILLER);
 
diff --git a/src/tests/elementary/elm_test_list.c b/src/tests/elementary/elm_test_list.c
index e5e27e6888..67a4663f80 100644
--- a/src/tests/elementary/elm_test_list.c
+++ b/src/tests/elementary/elm_test_list.c
@@ -3,8 +3,8 @@
 #endif
 
 #define EFL_ACCESS_SELECTION_PROTECTED
-#define EFL_ACCESS_BETA
-#define EFL_ACCESS_PROTECTED
+#define EFL_ACCESS_OBJECT_BETA
+#define EFL_ACCESS_OBJECT_PROTECTED
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -206,7 +206,7 @@ EFL_START_TEST (elm_atspi_role_get)
  win = elm_win_add(NULL, "list", ELM_WIN_BASIC);
 
  list = elm_list_add(win);
- role = efl_access_role_get(list);
+ role = efl_access_object_role_get(list);
 
  ck_assert(role == EFL_ACCESS_ROLE_LIST);
 
@@ -220,7 +220,7 @@ EFL_END_TEST
  */
 EFL_START_TEST(elm_atspi_children_parent)
 {
-   Efl_Access *parent;
+   Efl_Access_Object *parent;
    Elm_Object_Item *it;
 
    Evas_Object *win = elm_win_add(NULL, "list", ELM_WIN_BASIC);
@@ -233,10 +233,10 @@ EFL_START_TEST(elm_atspi_children_parent)
 
    evas_object_show(list);
 
-   parent = efl_provider_find(efl_parent_get(icon), EFL_ACCESS_MIXIN);
+   parent = efl_provider_find(efl_parent_get(icon), EFL_ACCESS_OBJECT_MIXIN);
    ck_assert(it == parent);
 
-   parent = efl_provider_find(efl_parent_get(end), EFL_ACCESS_MIXIN);
+   parent = efl_provider_find(efl_parent_get(end), EFL_ACCESS_OBJECT_MIXIN);
    ck_assert(it == parent);
 
 }
diff --git a/src/tests/elementary/elm_test_map.c b/src/tests/elementary/elm_test_map.c
index b127027057..5e5b07c7b0 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 EFL_ACCESS_BETA
+#define EFL_ACCESS_OBJECT_BETA
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "map", ELM_WIN_BASIC);
 
    map = elm_map_add(win);
-   role = efl_access_role_get(map);
+   role = efl_access_object_role_get(map);
 
    ck_assert(role == EFL_ACCESS_ROLE_IMAGE_MAP);
 
diff --git a/src/tests/elementary/elm_test_mapbuf.c b/src/tests/elementary/elm_test_mapbuf.c
index 7f86c901be..bf4c1e6a7b 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 EFL_ACCESS_BETA
+#define EFL_ACCESS_OBJECT_BETA
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "mapbuf", ELM_WIN_BASIC);
 
    mapbuf = elm_mapbuf_add(win);
-   role = efl_access_role_get(mapbuf);
+   role = efl_access_object_role_get(mapbuf);
 
    ck_assert(role == EFL_ACCESS_ROLE_IMAGE_MAP);
 
diff --git a/src/tests/elementary/elm_test_menu.c b/src/tests/elementary/elm_test_menu.c
index 3477a6044b..16ce607aec 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 EFL_ACCESS_BETA
+#define EFL_ACCESS_OBJECT_BETA
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "menu", ELM_WIN_BASIC);
 
    menu = elm_menu_add(win);
-   role = efl_access_role_get(menu);
+   role = efl_access_object_role_get(menu);
 
    ck_assert(role == EFL_ACCESS_ROLE_MENU);
 
diff --git a/src/tests/elementary/elm_test_multibuttonentry.c b/src/tests/elementary/elm_test_multibuttonentry.c
index 8d988a5fc5..501a79eeeb 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 EFL_ACCESS_BETA
+#define EFL_ACCESS_OBJECT_BETA
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "multibuttonentry", ELM_WIN_BASIC);
 
    multibuttonentry = elm_multibuttonentry_add(win);
-   role = efl_access_role_get(multibuttonentry);
+   role = efl_access_object_role_get(multibuttonentry);
 
    ck_assert_int_eq(role, EFL_ACCESS_ROLE_PANEL);
 
diff --git a/src/tests/elementary/elm_test_naviframe.c b/src/tests/elementary/elm_test_naviframe.c
index fcabc194e0..4e34ba5819 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 EFL_ACCESS_BETA
+#define EFL_ACCESS_OBJECT_BETA
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "naviframe", ELM_WIN_BASIC);
 
    naviframe = elm_naviframe_add(win);
-   role = efl_access_role_get(naviframe);
+   role = efl_access_object_role_get(naviframe);
 
    ck_assert(role == EFL_ACCESS_ROLE_PAGE_TAB_LIST);
 
diff --git a/src/tests/elementary/elm_test_notify.c b/src/tests/elementary/elm_test_notify.c
index 41156306ab..a7e890ab9f 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 EFL_ACCESS_BETA
+#define EFL_ACCESS_OBJECT_BETA
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "notify", ELM_WIN_BASIC);
 
    notify = elm_notify_add(win);
-   role = efl_access_role_get(notify);
+   role = efl_access_object_role_get(notify);
 
    ck_assert(role == EFL_ACCESS_ROLE_NOTIFICATION);
 
diff --git a/src/tests/elementary/elm_test_panel.c b/src/tests/elementary/elm_test_panel.c
index 8a52b75bf0..e10995f4b4 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 EFL_ACCESS_BETA
+#define EFL_ACCESS_OBJECT_BETA
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "panel", ELM_WIN_BASIC);
 
    panel = elm_panel_add(win);
-   role = efl_access_role_get(panel);
+   role = efl_access_object_role_get(panel);
 
    ck_assert(role == EFL_ACCESS_ROLE_PANEL);
 
diff --git a/src/tests/elementary/elm_test_panes.c b/src/tests/elementary/elm_test_panes.c
index f6796ee81c..f084ee67e4 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 EFL_ACCESS_BETA
+#define EFL_ACCESS_OBJECT_BETA
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "panes", ELM_WIN_BASIC);
 
    panes = elm_panes_add(win);
-   role = efl_access_role_get(panes);
+   role = efl_access_object_role_get(panes);
 
    ck_assert(role == EFL_ACCESS_ROLE_SPLIT_PANE);
 
diff --git a/src/tests/elementary/elm_test_photo.c b/src/tests/elementary/elm_test_photo.c
index 454affc283..29ddcdba2b 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 EFL_ACCESS_BETA
+#define EFL_ACCESS_OBJECT_BETA
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "photo", ELM_WIN_BASIC);
 
    photo = elm_photo_add(win);
-   role = efl_access_role_get(photo);
+   role = efl_access_object_role_get(photo);
 
    ck_assert(role == EFL_ACCESS_ROLE_IMAGE);
 
diff --git a/src/tests/elementary/elm_test_photocam.c b/src/tests/elementary/elm_test_photocam.c
index 3de90e75d3..d374cbd983 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 EFL_ACCESS_BETA
+#define EFL_ACCESS_OBJECT_BETA
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "photocam", ELM_WIN_BASIC);
 
    photocam = elm_photocam_add(win);
-   role = efl_access_role_get(photocam);
+   role = efl_access_object_role_get(photocam);
 
    ck_assert(role == EFL_ACCESS_ROLE_IMAGE);
 
diff --git a/src/tests/elementary/elm_test_player.c b/src/tests/elementary/elm_test_player.c
index 332895c445..c300a27284 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 EFL_ACCESS_BETA
+#define EFL_ACCESS_OBJECT_BETA
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "player", ELM_WIN_BASIC);
 
    player = elm_player_add(win);
-   role = efl_access_role_get(player);
+   role = efl_access_object_role_get(player);
 
    ck_assert(role == EFL_ACCESS_ROLE_ANIMATION);
 
diff --git a/src/tests/elementary/elm_test_plug.c b/src/tests/elementary/elm_test_plug.c
index 3912df07b6..dff2d69684 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 EFL_ACCESS_BETA
+#define EFL_ACCESS_OBJECT_BETA
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "plug", ELM_WIN_BASIC);
 
    plug = elm_plug_add(win);
-   role = efl_access_role_get(plug);
+   role = efl_access_object_role_get(plug);
 
    ck_assert(role == EFL_ACCESS_ROLE_IMAGE);
 
diff --git a/src/tests/elementary/elm_test_popup.c b/src/tests/elementary/elm_test_popup.c
index 3283499758..99c07c63f1 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 EFL_ACCESS_BETA
+#define EFL_ACCESS_OBJECT_BETA
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "popup", ELM_WIN_BASIC);
 
    popup = elm_popup_add(win);
-   role = efl_access_role_get(popup);
+   role = efl_access_object_role_get(popup);
 
    ck_assert(role == EFL_ACCESS_ROLE_DIALOG);
 
diff --git a/src/tests/elementary/elm_test_prefs.c b/src/tests/elementary/elm_test_prefs.c
index 5efca7b9b1..a881512cf9 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 EFL_ACCESS_BETA
+#define EFL_ACCESS_OBJECT_BETA
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -38,7 +38,7 @@ EFL_START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "prefs", ELM_WIN_BASIC);
 
    prefs = elm_prefs_add(win);
-   role = efl_access_role_get(prefs);
+   role = efl_access_object_role_get(prefs);
 
    ck_assert(role == EFL_ACCESS_ROLE_REDUNDANT_OBJECT);
 
diff --git a/src/tests/elementary/elm_test_progressbar.c b/src/tests/elementary/elm_test_progressbar.c
index ad3fbec976..e561bb3575 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 EFL_ACCESS_BETA
+#define EFL_ACCESS_OBJECT_BETA
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "progressbar", ELM_WIN_BASIC);
 
    progressbar = elm_progressbar_add(win);
-   role = efl_access_role_get(progressbar);
+   role = efl_access_object_role_get(progressbar);
 
    ck_assert(role == EFL_ACCESS_ROLE_PROGRESS_BAR);
 
diff --git a/src/tests/elementary/elm_test_radio.c b/src/tests/elementary/elm_test_radio.c
index 954c3d8e18..13de95d6bf 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 EFL_ACCESS_BETA
+#define EFL_ACCESS_OBJECT_BETA
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "radio", ELM_WIN_BASIC);
 
    radio = elm_radio_add(win);
-   role = efl_access_role_get(radio);
+   role = efl_access_object_role_get(radio);
 
    ck_assert(role == EFL_ACCESS_ROLE_RADIO_BUTTON);
 
diff --git a/src/tests/elementary/elm_test_scroller.c b/src/tests/elementary/elm_test_scroller.c
index a21949dbcd..00df0038fb 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 EFL_ACCESS_BETA
+#define EFL_ACCESS_OBJECT_BETA
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "scroller", ELM_WIN_BASIC);
 
    scroller = elm_scroller_add(win);
-   role = efl_access_role_get(scroller);
+   role = efl_access_object_role_get(scroller);
 
    ck_assert(role == EFL_ACCESS_ROLE_SCROLL_PANE);
 
diff --git a/src/tests/elementary/elm_test_segmentcontrol.c b/src/tests/elementary/elm_test_segmentcontrol.c
index baca5d3704..fa57c060c3 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 EFL_ACCESS_BETA
+#define EFL_ACCESS_OBJECT_BETA
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "segmentcontrol", ELM_WIN_BASIC);
 
    segmentcontrol = elm_segment_control_add(win);
-   role = efl_access_role_get(segmentcontrol);
+   role = efl_access_object_role_get(segmentcontrol);
 
    ck_assert(role == EFL_ACCESS_ROLE_LIST);
 
diff --git a/src/tests/elementary/elm_test_separator.c b/src/tests/elementary/elm_test_separator.c
index 3e85e42b33..a9863859ea 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 EFL_ACCESS_BETA
+#define EFL_ACCESS_OBJECT_BETA
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "icon", ELM_WIN_BASIC);
 
    separator = elm_separator_add(win);
-   role = efl_access_role_get(separator);
+   role = efl_access_object_role_get(separator);
 
    ck_assert(role == EFL_ACCESS_ROLE_SEPARATOR);
 
diff --git a/src/tests/elementary/elm_test_slider.c b/src/tests/elementary/elm_test_slider.c
index 1cff728e87..b3445a01ca 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 EFL_ACCESS_BETA
+#define EFL_ACCESS_OBJECT_BETA
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "slider", ELM_WIN_BASIC);
 
    slider = elm_slider_add(win);
-   role = efl_access_role_get(slider);
+   role = efl_access_object_role_get(slider);
 
    ck_assert(role == EFL_ACCESS_ROLE_SLIDER);
 
diff --git a/src/tests/elementary/elm_test_slideshow.c b/src/tests/elementary/elm_test_slideshow.c
index fd618ec44b..31e4edc8bc 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 EFL_ACCESS_BETA
+#define EFL_ACCESS_OBJECT_BETA
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "slideshow", ELM_WIN_BASIC);
 
    slideshow = elm_slideshow_add(win);
-   role = efl_access_role_get(slideshow);
+   role = efl_access_object_role_get(slideshow);
 
    ck_assert(role == EFL_ACCESS_ROLE_DOCUMENT_PRESENTATION);
 
diff --git a/src/tests/elementary/elm_test_spinner.c b/src/tests/elementary/elm_test_spinner.c
index fc3bd4edcc..c954ef5b26 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 EFL_ACCESS_BETA
+#define EFL_ACCESS_OBJECT_BETA
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "spinner", ELM_WIN_BASIC);
 
    spinner = elm_spinner_add(win);
-   role = efl_access_role_get(spinner);
+   role = efl_access_object_role_get(spinner);
 
    ck_assert(role == EFL_ACCESS_ROLE_SPIN_BUTTON);
 
diff --git a/src/tests/elementary/elm_test_table.c b/src/tests/elementary/elm_test_table.c
index 57b8b383df..6fb1c7092f 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 EFL_ACCESS_BETA
+#define EFL_ACCESS_OBJECT_BETA
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "table", ELM_WIN_BASIC);
 
    table = elm_table_add(win);
-   role = efl_access_role_get(table);
+   role = efl_access_object_role_get(table);
 
    ck_assert(role == EFL_ACCESS_ROLE_FILLER);
 
diff --git a/src/tests/elementary/elm_test_thumb.c b/src/tests/elementary/elm_test_thumb.c
index 9b82f750a2..a4983b8175 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 EFL_ACCESS_BETA
+#define EFL_ACCESS_OBJECT_BETA
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -35,7 +35,7 @@ EFL_START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "thumb", ELM_WIN_BASIC);
 
    thumb = elm_thumb_add(win);
-   role = efl_access_role_get(thumb);
+   role = efl_access_object_role_get(thumb);
 
    ck_assert(role == EFL_ACCESS_ROLE_IMAGE);
 
diff --git a/src/tests/elementary/elm_test_toolbar.c b/src/tests/elementary/elm_test_toolbar.c
index e4d759c524..39221277b2 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 EFL_ACCESS_BETA
+#define EFL_ACCESS_OBJECT_BETA
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "toolbar", ELM_WIN_BASIC);
 
    toolbar = elm_toolbar_add(win);
-   role = efl_access_role_get(toolbar);
+   role = efl_access_object_role_get(toolbar);
 
    ck_assert(role == EFL_ACCESS_ROLE_TOOL_BAR);
 
diff --git a/src/tests/elementary/elm_test_video.c b/src/tests/elementary/elm_test_video.c
index 9e8d709d7f..e643475632 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 EFL_ACCESS_BETA
+#define EFL_ACCESS_OBJECT_BETA
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "video", ELM_WIN_BASIC);
 
    video = elm_video_add(win);
-   role = efl_access_role_get(video);
+   role = efl_access_object_role_get(video);
 
    ck_assert(role == EFL_ACCESS_ROLE_ANIMATION);
 
diff --git a/src/tests/elementary/elm_test_web.c b/src/tests/elementary/elm_test_web.c
index 2ae4a2517b..28607fac5b 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 EFL_ACCESS_BETA
+#define EFL_ACCESS_OBJECT_BETA
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "web", ELM_WIN_BASIC);
 
    web = elm_web_add(win);
-   role = efl_access_role_get(web);
+   role = efl_access_object_role_get(web);
 
    ck_assert(role == EFL_ACCESS_ROLE_HTML_CONTAINER);
 
diff --git a/src/tests/elementary/elm_test_win.c b/src/tests/elementary/elm_test_win.c
index c7ef94a74e..311b16bc64 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 EFL_ACCESS_BETA
+#define EFL_ACCESS_OBJECT_BETA
 #define EFL_ACCESS_COMPONENT_BETA
 #define EFL_ACCESS_COMPONENT_PROTECTED
 #define EFL_CANVAS_SCENE_BETA
@@ -88,7 +88,7 @@ EFL_START_TEST (elm_atspi_role_get)
 
    win = elm_win_add(NULL, "win", ELM_WIN_BASIC);
 
-   role = efl_access_role_get(win);
+   role = efl_access_object_role_get(win);
 
    ck_assert(role == EFL_ACCESS_ROLE_WINDOW);