1 files changed, 16 insertions, 16 deletions

diff --git a/src/tests/eo/function_overrides/function_overrides_inherit2.c b/src/tests/eo/function_overrides/function_overrides_inherit2.c
index 26e92e5212..7bae304b4c 100644
--- a/src/tests/eo/function_overrides/function_overrides_inherit2.c
+++ b/src/tests/eo/function_overrides/function_overrides_inherit2.c
@@ -14,12 +14,12 @@
 static void
 _a_set(Eo *obj, void *class_data EINA_UNUSED, int a)
 {
-   printf("%s %d\n", eo_class_name_get(MY_CLASS), a);
+   printf("%s %d\n", efl_class_name_get(MY_CLASS), a);
    simple_a_print(obj);
-   simple_a_set(eo_super(obj, MY_CLASS), a + 1);
+   simple_a_set(efl_super(obj, MY_CLASS), a + 1);
 
    Eina_Bool called = EINA_FALSE;
-   called = simple_a_print(eo_super(obj, MY_CLASS));
+   called = simple_a_print(efl_super(obj, MY_CLASS));
    fail_if(!called);
 }
 
@@ -28,7 +28,7 @@ _print(Eo *obj, void *class_data EINA_UNUSED)
 {
    Eina_Bool called = EINA_FALSE;
    printf("Hey\n");
-   called = inherit2_print(eo_super(obj, MY_CLASS));
+   called = inherit2_print(efl_super(obj, MY_CLASS));
    fail_if(called);
 
    return EINA_TRUE;
@@ -46,36 +46,36 @@ static Eina_Bool
 _class_print(Efl_Class *klass, void *data EINA_UNUSED)
 {
    Eina_Bool called = EINA_FALSE;
-   printf("Print %s-%s\n", eo_class_name_get(klass), eo_class_name_get(MY_CLASS));
-   called = simple_class_print(eo_super(klass, MY_CLASS));
+   printf("Print %s-%s\n", efl_class_name_get(klass), efl_class_name_get(MY_CLASS));
+   called = simple_class_print(efl_super(klass, MY_CLASS));
    fail_if(!called);
 
-   called = simple_class_print2(eo_super(klass, MY_CLASS));
+   called = simple_class_print2(efl_super(klass, MY_CLASS));
    fail_if(!called);
 
    return EINA_TRUE;
 }
 
-EAPI EO_FUNC_BODY(inherit2_print, Eina_Bool, EINA_FALSE);
-EAPI EO_FUNC_BODY(inherit2_print2, Eina_Bool, EINA_FALSE);
+EAPI EFL_FUNC_BODY(inherit2_print, Eina_Bool, EINA_FALSE);
+EAPI EFL_FUNC_BODY(inherit2_print2, Eina_Bool, EINA_FALSE);
 
 static Efl_Op_Description op_descs[] = {
-     EO_OP_FUNC(inherit2_print, _print),
-     EO_OP_FUNC(inherit2_print2, _print2),
-     EO_OP_CLASS_FUNC_OVERRIDE(simple_class_print, _class_print),
-     EO_OP_FUNC_OVERRIDE(simple_a_set, _a_set),
+     EFL_OBJECT_OP_FUNC(inherit2_print, _print),
+     EFL_OBJECT_OP_FUNC(inherit2_print2, _print2),
+     EFL_OBJECT_OP_CLASS_FUNC_OVERRIDE(simple_class_print, _class_print),
+     EFL_OBJECT_OP_FUNC_OVERRIDE(simple_a_set, _a_set),
 };
 
 static const Efl_Class_Description class_desc = {
      EO_VERSION,
      "Inherit2",
-     EO_CLASS_TYPE_REGULAR,
-     EO_CLASS_DESCRIPTION_OPS(op_descs),
+     EFL_CLASS_TYPE_REGULAR,
+     EFL_CLASS_DESCRIPTION_OPS(op_descs),
      NULL,
      0,
      NULL,
      NULL
 };
 
-EO_DEFINE_CLASS(inherit2_class_get, &class_desc, INHERIT_CLASS, NULL);
+EFL_DEFINE_CLASS(inherit2_class_get, &class_desc, INHERIT_CLASS, NULL);