diff --git a/legacy/eobj/examples/access/inherit.h b/legacy/eobj/examples/access/inherit.h
index e43aabb870..51beb8897c 100644
--- a/legacy/eobj/examples/access/inherit.h
+++ b/legacy/eobj/examples/access/inherit.h
@@ -12,7 +12,7 @@ enum {
 
 #define INHERIT_ID(sub_id) (INHERIT_BASE_ID + sub_id)
 
-#define INHERIT_PROT_PRINT() INHERIT_ID(INHERIT_SUB_ID_PROT_PRINT)
+#define inherit_prot_print() INHERIT_ID(INHERIT_SUB_ID_PROT_PRINT)
 
 #define INHERIT_CLASS inherit_class_get()
 const Eobj_Class *inherit_class_get(void) EINA_CONST;
diff --git a/legacy/eobj/examples/access/main.c b/legacy/eobj/examples/access/main.c
index a2b22fcbb2..b019a04e18 100644
--- a/legacy/eobj/examples/access/main.c
+++ b/legacy/eobj/examples/access/main.c
@@ -11,7 +11,7 @@ main(int argc, char *argv[])
 
    Eobj *obj = eobj_add(INHERIT_CLASS, NULL);
 
-   eobj_do(obj, SIMPLE_A_SET(1), INHERIT_PROT_PRINT());
+   eobj_do(obj, simple_a_set(1), inherit_prot_print());
 
    Simple_Public_Data *pd = eobj_data_get(obj, SIMPLE_CLASS);
    printf("Pub: %d\n", pd->public_x2);
diff --git a/legacy/eobj/examples/access/simple.h b/legacy/eobj/examples/access/simple.h
index 88fffa6b47..c9f773b7ea 100644
--- a/legacy/eobj/examples/access/simple.h
+++ b/legacy/eobj/examples/access/simple.h
@@ -17,7 +17,7 @@ typedef struct
 
 #define SIMPLE_ID(sub_id) (SIMPLE_BASE_ID + sub_id)
 
-#define SIMPLE_A_SET(a) SIMPLE_ID(SIMPLE_SUB_ID_A_SET), EOBJ_TYPECHECK(int, a)
+#define simple_a_set(a) SIMPLE_ID(SIMPLE_SUB_ID_A_SET), EOBJ_TYPECHECK(int, a)
 
 extern const Eobj_Event_Description _SIG_A_CHANGED;
 #define SIG_A_CHANGED (&(_SIG_A_CHANGED))
diff --git a/legacy/eobj/examples/composite_objects/comp.c b/legacy/eobj/examples/composite_objects/comp.c
index d1239b8612..5303d4c8fb 100644
--- a/legacy/eobj/examples/composite_objects/comp.c
+++ b/legacy/eobj/examples/composite_objects/comp.c
@@ -15,7 +15,7 @@ _a_get(const Eobj *obj, const void *class_data EINA_UNUSED, va_list *list)
 {
    int *a;
    a = va_arg(*list, int *);
-   eobj_query_super(obj, SIMPLE_A_GET(a));
+   eobj_query_super(obj, simple_a_get(a));
 }
 
 static void
@@ -30,7 +30,7 @@ _constructor(Eobj *obj, void *class_data EINA_UNUSED)
    fail_if(eobj_composite_is(obj));
    fail_if(!eobj_composite_is(simple));
 
-   eobj_do(obj, EOBJ_BASE_DATA_SET("simple-obj", simple, NULL));
+   eobj_do(obj, eobj_base_data_set("simple-obj", simple, NULL));
 
    eobj_unref(simple);
 }
diff --git a/legacy/eobj/examples/composite_objects/main.c b/legacy/eobj/examples/composite_objects/main.c
index 0ebddcd2be..0635d2e9b0 100644
--- a/legacy/eobj/examples/composite_objects/main.c
+++ b/legacy/eobj/examples/composite_objects/main.c
@@ -30,20 +30,20 @@ main(int argc, char *argv[])
    eobj_event_callback_add(obj, SIG_A_CHANGED, _a_changed_cb, NULL);
 
    int a;
-   eobj_do(obj, SIMPLE_A_SET(1));
+   eobj_do(obj, simple_a_set(1));
    fail_if(!cb_called);
 
-   eobj_do(obj, SIMPLE_A_GET(&a));
+   eobj_do(obj, simple_a_get(&a));
    fail_if(a != 1);
 
    /* disable the callback forwarder, and fail if it's still called. */
    Eobj *simple;
-   eobj_do(obj, EOBJ_BASE_DATA_GET("simple-obj", (void **) &simple));
+   eobj_do(obj, eobj_base_data_get("simple-obj", (void **) &simple));
    eobj_ref(simple);
    eobj_event_callback_forwarder_del(simple, SIG_A_CHANGED, obj);
 
    cb_called = EINA_FALSE;
-   eobj_do(obj, SIMPLE_A_SET(2));
+   eobj_do(obj, simple_a_set(2));
    fail_if(cb_called);
 
    fail_if(!eobj_composite_is(simple));
diff --git a/legacy/eobj/examples/composite_objects/simple.h b/legacy/eobj/examples/composite_objects/simple.h
index 827cbdafe3..336b8cceae 100644
--- a/legacy/eobj/examples/composite_objects/simple.h
+++ b/legacy/eobj/examples/composite_objects/simple.h
@@ -18,8 +18,8 @@ typedef struct
 
 #define SIMPLE_ID(sub_id) (SIMPLE_BASE_ID + sub_id)
 
-#define SIMPLE_A_SET(a) SIMPLE_ID(SIMPLE_SUB_ID_A_SET), EOBJ_TYPECHECK(int, a)
-#define SIMPLE_A_GET(a) SIMPLE_ID(SIMPLE_SUB_ID_A_GET), EOBJ_TYPECHECK(int *, a)
+#define simple_a_set(a) SIMPLE_ID(SIMPLE_SUB_ID_A_SET), EOBJ_TYPECHECK(int, a)
+#define simple_a_get(a) SIMPLE_ID(SIMPLE_SUB_ID_A_GET), EOBJ_TYPECHECK(int *, a)
 
 extern const Eobj_Event_Description _SIG_A_CHANGED;
 #define SIG_A_CHANGED (&(_SIG_A_CHANGED))
diff --git a/legacy/eobj/examples/constructors/main.c b/legacy/eobj/examples/constructors/main.c
index b67e873728..a7ef68965c 100644
--- a/legacy/eobj/examples/constructors/main.c
+++ b/legacy/eobj/examples/constructors/main.c
@@ -23,10 +23,10 @@ main(int argc, char *argv[])
 
    fail_if(my_init_count != 2);
 
-   eobj_do(obj, SIMPLE_A_SET(1), SIMPLE_B_SET(2));
+   eobj_do(obj, simple_a_set(1), simple_b_set(2));
 
    int a, b;
-   eobj_do(obj, SIMPLE_A_GET(&a), SIMPLE_B_GET(&b),  MIXIN_ADD_AND_PRINT(5));
+   eobj_do(obj, simple_a_get(&a), simple_b_get(&b),  mixin_add_and_print(5));
 
    eobj_unref(obj);
 
diff --git a/legacy/eobj/examples/constructors/mixin.c b/legacy/eobj/examples/constructors/mixin.c
index 3399537567..635fc34880 100644
--- a/legacy/eobj/examples/constructors/mixin.c
+++ b/legacy/eobj/examples/constructors/mixin.c
@@ -12,7 +12,7 @@ static void
 _add_and_print_set(const Eobj *obj, const void *class_data EINA_UNUSED, va_list *list)
 {
    int a, b, x;
-   eobj_query(obj, SIMPLE_A_GET(&a), SIMPLE_B_GET(&b));
+   eobj_query(obj, simple_a_get(&a), simple_b_get(&b));
    x = va_arg(*list, const int);
    printf("%s %d\n", __func__, a + b + x);
 }
diff --git a/legacy/eobj/examples/constructors/mixin.h b/legacy/eobj/examples/constructors/mixin.h
index 886418c4ab..ef6017b82f 100644
--- a/legacy/eobj/examples/constructors/mixin.h
+++ b/legacy/eobj/examples/constructors/mixin.h
@@ -12,7 +12,7 @@ enum {
 
 #define MIXIN_ID(sub_id) (MIXIN_BASE_ID + sub_id)
 
-#define MIXIN_ADD_AND_PRINT(x) MIXIN_ID(MIXIN_SUB_ID_ADD_AND_SET), EOBJ_TYPECHECK(int, x)
+#define mixin_add_and_print(x) MIXIN_ID(MIXIN_SUB_ID_ADD_AND_SET), EOBJ_TYPECHECK(int, x)
 
 #define MIXIN_CLASS mixin_class_get()
 const Eobj_Class *mixin_class_get(void) EINA_CONST;
diff --git a/legacy/eobj/examples/constructors/simple.h b/legacy/eobj/examples/constructors/simple.h
index 77ba28400f..005d12c2c2 100644
--- a/legacy/eobj/examples/constructors/simple.h
+++ b/legacy/eobj/examples/constructors/simple.h
@@ -15,10 +15,10 @@ enum {
 
 #define SIMPLE_ID(sub_id) (SIMPLE_BASE_ID + sub_id)
 
-#define SIMPLE_A_SET(a) SIMPLE_ID(SIMPLE_SUB_ID_A_SET), EOBJ_TYPECHECK(int, a)
-#define SIMPLE_A_GET(a) SIMPLE_ID(SIMPLE_SUB_ID_A_GET), EOBJ_TYPECHECK(int *, a)
-#define SIMPLE_B_SET(b) SIMPLE_ID(SIMPLE_SUB_ID_B_SET), EOBJ_TYPECHECK(int, b)
-#define SIMPLE_B_GET(b) SIMPLE_ID(SIMPLE_SUB_ID_B_GET), EOBJ_TYPECHECK(int *, b)
+#define simple_a_set(a) SIMPLE_ID(SIMPLE_SUB_ID_A_SET), EOBJ_TYPECHECK(int, a)
+#define simple_a_get(a) SIMPLE_ID(SIMPLE_SUB_ID_A_GET), EOBJ_TYPECHECK(int *, a)
+#define simple_b_set(b) SIMPLE_ID(SIMPLE_SUB_ID_B_SET), EOBJ_TYPECHECK(int, b)
+#define simple_b_get(b) SIMPLE_ID(SIMPLE_SUB_ID_B_GET), EOBJ_TYPECHECK(int *, b)
 
 #define SIMPLE_CLASS simple_class_get()
 const Eobj_Class *simple_class_get(void) EINA_CONST;
diff --git a/legacy/eobj/examples/evas/elw_box.h b/legacy/eobj/examples/evas/elw_box.h
index 7abca14ce7..89777e8edc 100644
--- a/legacy/eobj/examples/evas/elw_box.h
+++ b/legacy/eobj/examples/evas/elw_box.h
@@ -13,11 +13,11 @@ enum {
 #define ELW_BOX_ID(sub_id) (ELW_BOX_BASE_ID + sub_id)
 
 /**
- * @def ELW_BOX_PACK_END(obj)
+ * @def elw_box_pack_end(obj)
  * @brief Pack object to the end of the box
  * @param[in] obj object to pack into box
  */
-#define ELW_BOX_PACK_END(obj) ELW_BOX_ID(ELW_BOX_SUB_ID_PACK_END), EOBJ_TYPECHECK(Eobj *, obj)
+#define elw_box_pack_end(obj) ELW_BOX_ID(ELW_BOX_SUB_ID_PACK_END), EOBJ_TYPECHECK(Eobj *, obj)
 
 #define ELW_BOX_CLASS elw_box_class_get()
 const Eobj_Class *elw_box_class_get(void) EINA_CONST;
diff --git a/legacy/eobj/examples/evas/elw_boxedbutton.c b/legacy/eobj/examples/evas/elw_boxedbutton.c
index a3ccbaa9c8..ff14824201 100644
--- a/legacy/eobj/examples/evas/elw_boxedbutton.c
+++ b/legacy/eobj/examples/evas/elw_boxedbutton.c
@@ -23,9 +23,9 @@ _constructor(Eobj *obj, void *class_data EINA_UNUSED)
    Eobj *bt = eobj_add(ELW_BUTTON_CLASS, obj);
    eobj_composite_object_attach(obj, bt);
    eobj_event_callback_forwarder_add(bt, SIG_CLICKED, obj);
-   eobj_do(bt, EVAS_OBJ_VISIBILITY_SET(EINA_TRUE));
+   eobj_do(bt, evas_obj_visibility_set(EINA_TRUE));
 
-   eobj_do(obj, ELW_BOX_PACK_END(bt));
+   eobj_do(obj, elw_box_pack_end(bt));
    eobj_unref(bt);
 }
 
diff --git a/legacy/eobj/examples/evas/elw_button.c b/legacy/eobj/examples/evas/elw_button.c
index b470d7729b..788246d6ee 100644
--- a/legacy/eobj/examples/evas/elw_button.c
+++ b/legacy/eobj/examples/evas/elw_button.c
@@ -26,7 +26,7 @@ _position_set(Eobj *obj, void *class_data EINA_UNUSED, va_list *list)
    x = va_arg(*list, Evas_Coord);
    y = va_arg(*list, Evas_Coord);
    printf("But set position %d,%d\n", x, y);
-   eobj_do_super(obj, EVAS_OBJ_POSITION_SET(x, y));
+   eobj_do_super(obj, evas_obj_position_set(x, y));
 }
 
 static void
diff --git a/legacy/eobj/examples/evas/elw_button.h b/legacy/eobj/examples/evas/elw_button.h
index d63d4ad072..02875df24a 100644
--- a/legacy/eobj/examples/evas/elw_button.h
+++ b/legacy/eobj/examples/evas/elw_button.h
@@ -13,12 +13,12 @@ enum {
 #define ELW_BUTTON_ID(sub_id) (ELW_BUTTON_BASE_ID + sub_id)
 
 /**
- * @def ELW_BUTTON_TEXT_SET(text)
+ * @def elw_button_text_set(text)
  * @brief Set button text
  * @param[in] text text to assing to button
  * FIXME Doesn't belong here, but just for the example...
  */
-#define ELW_BUTTON_TEXT_SET(text) ELW_BUTTON_ID(ELW_BUTTON_SUB_ID_TEXT_SET), EOBJ_TYPECHECK(const char *, text)
+#define elw_button_text_set(text) ELW_BUTTON_ID(ELW_BUTTON_SUB_ID_TEXT_SET), EOBJ_TYPECHECK(const char *, text)
 
 extern const Eobj_Event_Description _SIG_CLICKED;
 #define SIG_CLICKED (&(_SIG_CLICKED))
diff --git a/legacy/eobj/examples/evas/evas_obj.c b/legacy/eobj/examples/evas/evas_obj.c
index a7cb3d8280..2528ea8457 100644
--- a/legacy/eobj/examples/evas/evas_obj.c
+++ b/legacy/eobj/examples/evas/evas_obj.c
@@ -85,7 +85,7 @@ _constructor(Eobj *obj, void *class_data EINA_UNUSED)
    /* Add type check. */
    Eobj *parent = eobj_parent_get(obj);
    if (parent)
-      eobj_do(parent, EVAS_OBJ_CHILD_ADD(obj));
+      eobj_do(parent, evas_obj_child_add(obj));
 }
 
 static void
diff --git a/legacy/eobj/examples/evas/evas_obj.h b/legacy/eobj/examples/evas/evas_obj.h
index 67f79518ff..e76e68a7e6 100644
--- a/legacy/eobj/examples/evas/evas_obj.h
+++ b/legacy/eobj/examples/evas/evas_obj.h
@@ -18,54 +18,54 @@ enum {
 #define EVAS_OBJ_ID(sub_id) (EVAS_OBJ_BASE_ID + sub_id)
 
 /**
- * @def EVAS_OBJ_POSITION_SET(x, y)
+ * @def evas_obj_position_set(x, y)
  * @brief Set object's position
  * @param[in] x object's X position
  * @param[in] y object's Y position
  */
-#define EVAS_OBJ_POSITION_SET(x, y) EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_POSITION_SET), EOBJ_TYPECHECK(Evas_Coord, x), EOBJ_TYPECHECK(Evas_Coord, y)
+#define evas_obj_position_set(x, y) EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_POSITION_SET), EOBJ_TYPECHECK(Evas_Coord, x), EOBJ_TYPECHECK(Evas_Coord, y)
 
 /**
- * @def EVAS_OBJ_SIZE_SET(w, h)
+ * @def evas_obj_size_set(w, h)
  * @brief Set object's size
  * @param[in] w object's width
  * @param[in] h object's height
  */
-#define EVAS_OBJ_SIZE_SET(w, h) EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_SIZE_SET), EOBJ_TYPECHECK(Evas_Coord, w), EOBJ_TYPECHECK(Evas_Coord, h)
+#define evas_obj_size_set(w, h) EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_SIZE_SET), EOBJ_TYPECHECK(Evas_Coord, w), EOBJ_TYPECHECK(Evas_Coord, h)
 
 /**
- * @def EVAS_OBJ_COLOR_SET(r, g, b, a)
+ * @def evas_obj_color_set(r, g, b, a)
  * @brief Set object's color
  * @param[in] r r-value of color
  * @param[in] g g-value of color
  * @param[in] b b-value of color
  * @param[in] a a-value of color
  */
-#define EVAS_OBJ_COLOR_SET(r, g, b, a) EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_COLOR_SET), EOBJ_TYPECHECK(int, r), EOBJ_TYPECHECK(int, g), EOBJ_TYPECHECK(int, b), EOBJ_TYPECHECK(int, a)
+#define evas_obj_color_set(r, g, b, a) EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_COLOR_SET), EOBJ_TYPECHECK(int, r), EOBJ_TYPECHECK(int, g), EOBJ_TYPECHECK(int, b), EOBJ_TYPECHECK(int, a)
 
 /**
- * @def EVAS_OBJ_COLOR_GET(r, g, b, a)
+ * @def evas_obj_color_get(r, g, b, a)
  * @brief Set object's position
  * @param[out] r integer pointer for r-value of color
  * @param[out] g integer pointer for g-value of color
  * @param[out] b integer pointer for b-value of color
  * @param[out] a integer pointer for a-value of color
  */
-#define EVAS_OBJ_COLOR_GET(r, g, b, a) EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_COLOR_GET), EOBJ_TYPECHECK(int *, r), EOBJ_TYPECHECK(int *, g), EOBJ_TYPECHECK(int *, b), EOBJ_TYPECHECK(int *, a)
+#define evas_obj_color_get(r, g, b, a) EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_COLOR_GET), EOBJ_TYPECHECK(int *, r), EOBJ_TYPECHECK(int *, g), EOBJ_TYPECHECK(int *, b), EOBJ_TYPECHECK(int *, a)
 
 /**
- * @def EVAS_OBJ_VISIBILITY_SET(v)
+ * @def evas_obj_visibility_set(v)
  * @brief Set object's visible property
  * @param[in] v True/False value
  */
-#define EVAS_OBJ_VISIBILITY_SET(v) EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_VISIBILITY_SET), EOBJ_TYPECHECK(Eina_Bool, v)
+#define evas_obj_visibility_set(v) EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_VISIBILITY_SET), EOBJ_TYPECHECK(Eina_Bool, v)
 
 /**
- * @def EVAS_OBJ_CHILD_ADD(child)
+ * @def evas_obj_child_add(child)
  * @brief Add child to current object
  * @param[in] pointer to child object
  */
-#define EVAS_OBJ_CHILD_ADD(child) EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_CHILD_ADD), EOBJ_TYPECHECK(Eobj *, child)
+#define evas_obj_child_add(child) EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_CHILD_ADD), EOBJ_TYPECHECK(Eobj *, child)
 
 #define EVAS_OBJ_CLASS evas_object_class_get()
 const Eobj_Class *evas_object_class_get(void) EINA_CONST;
@@ -76,7 +76,7 @@ static inline Evas_Object *
 eobj_evas_object_get(const Eobj *obj)
 {
    void *data;
-   eobj_query(obj, EOBJ_BASE_DATA_GET(EVAS_OBJ_STR, &data));
+   eobj_query(obj, eobj_base_data_get(EVAS_OBJ_STR, &data));
    return data;
 }
 
@@ -84,7 +84,7 @@ eobj_evas_object_get(const Eobj *obj)
 static inline void
 eobj_evas_object_set(Eobj *obj, Evas_Object *evas_obj)
 {
-   eobj_do(obj, EOBJ_BASE_DATA_SET(EVAS_OBJ_STR, evas_obj, NULL));
+   eobj_do(obj, eobj_base_data_set(EVAS_OBJ_STR, evas_obj, NULL));
 }
 
 #endif
diff --git a/legacy/eobj/examples/evas/test.c b/legacy/eobj/examples/evas/test.c
index c442e909c2..a5706bd4a3 100644
--- a/legacy/eobj/examples/evas/test.c
+++ b/legacy/eobj/examples/evas/test.c
@@ -30,26 +30,26 @@ main(int argc, char *argv[])
    eobj_init();
 
    Eobj *win = eobj_add(ELW_WIN_CLASS, NULL);
-   eobj_do(win, EVAS_OBJ_SIZE_SET(winw, winh), EVAS_OBJ_VISIBILITY_SET(EINA_TRUE));
+   eobj_do(win, evas_obj_size_set(winw, winh), evas_obj_visibility_set(EINA_TRUE));
 
    Eobj *bt = eobj_add(ELW_BUTTON_CLASS, win);
-   eobj_do(bt, EVAS_OBJ_POSITION_SET(25, 25),
-         EVAS_OBJ_SIZE_SET(50, 50),
-         EVAS_OBJ_COLOR_SET(255, 0, 0, 255),
-         ELW_BUTTON_TEXT_SET("Click"),
-         EVAS_OBJ_VISIBILITY_SET(EINA_TRUE));
+   eobj_do(bt, evas_obj_position_set(25, 25),
+         evas_obj_size_set(50, 50),
+         evas_obj_color_set(255, 0, 0, 255),
+         elw_button_text_set("Click"),
+         evas_obj_visibility_set(EINA_TRUE));
    eobj_event_callback_add(bt, SIG_CLICKED, _btn_clicked_cb, "btn");
 
    int r, g, b, a;
-   eobj_do(bt, EVAS_OBJ_COLOR_GET(&r, &g, &b, &a));
+   eobj_do(bt, evas_obj_color_get(&r, &g, &b, &a));
    printf("RGBa(%d, %d, %d, %d)\n", r, g, b, a);
 
    Eobj *bx = eobj_add(ELW_BOXEDBUTTON_CLASS, win);
-   eobj_do(bx, EVAS_OBJ_POSITION_SET(100, 100),
-         EVAS_OBJ_SIZE_SET(70, 70),
-         EVAS_OBJ_COLOR_SET(0, 0, 255, 255),
-         ELW_BUTTON_TEXT_SET("Click2"),
-         EVAS_OBJ_VISIBILITY_SET(EINA_TRUE));
+   eobj_do(bx, evas_obj_position_set(100, 100),
+         evas_obj_size_set(70, 70),
+         evas_obj_color_set(0, 0, 255, 255),
+         elw_button_text_set("Click2"),
+         evas_obj_visibility_set(EINA_TRUE));
    eobj_event_callback_add(bx, SIG_CLICKED, _btn_clicked_cb, "bxedbtn");
 
    elm_run();
diff --git a/legacy/eobj/examples/function_overrides/inherit2.c b/legacy/eobj/examples/function_overrides/inherit2.c
index c0dd8a2dbf..db5089f6d5 100644
--- a/legacy/eobj/examples/function_overrides/inherit2.c
+++ b/legacy/eobj/examples/function_overrides/inherit2.c
@@ -18,17 +18,17 @@ _a_set(Eobj *obj, void *class_data EINA_UNUSED, va_list *list)
    int a;
    a = va_arg(*list, int);
    printf("%s %d\n", eobj_class_name_get(MY_CLASS), a);
-   eobj_do(obj, SIMPLE_A_PRINT());
-   eobj_do_super(obj, SIMPLE_A_SET(a + 1));
+   eobj_do(obj, simple_a_print());
+   eobj_do_super(obj, simple_a_set(a + 1));
 
-   fail_if(eobj_do_super(obj, SIMPLE_A_PRINT()));
+   fail_if(eobj_do_super(obj, simple_a_print()));
 }
 
 static void
 _print(Eobj *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED)
 {
    printf("Hey\n");
-   fail_if(eobj_do_super(obj, INHERIT2_PRINT()));
+   fail_if(eobj_do_super(obj, inherit2_print()));
 }
 
 static void
diff --git a/legacy/eobj/examples/function_overrides/inherit2.h b/legacy/eobj/examples/function_overrides/inherit2.h
index 6c83778075..c85544d333 100644
--- a/legacy/eobj/examples/function_overrides/inherit2.h
+++ b/legacy/eobj/examples/function_overrides/inherit2.h
@@ -13,8 +13,8 @@ enum {
 
 #define INHERIT2_ID(sub_id) (INHERIT2_BASE_ID + sub_id)
 
-#define INHERIT2_PRINT() INHERIT2_ID(INHERIT2_SUB_ID_PRINT)
-#define INHERIT2_PRINT2() INHERIT2_ID(INHERIT2_SUB_ID_PRINT2)
+#define inherit2_print() INHERIT2_ID(INHERIT2_SUB_ID_PRINT)
+#define inherit2_print2() INHERIT2_ID(INHERIT2_SUB_ID_PRINT2)
 
 #define INHERIT2_CLASS inherit2_class_get()
 const Eobj_Class *inherit2_class_get(void) EINA_CONST;
diff --git a/legacy/eobj/examples/function_overrides/inherit3.c b/legacy/eobj/examples/function_overrides/inherit3.c
index 8f8a8dd6ff..385b2c3fd8 100644
--- a/legacy/eobj/examples/function_overrides/inherit3.c
+++ b/legacy/eobj/examples/function_overrides/inherit3.c
@@ -14,7 +14,7 @@ _a_set(Eobj *obj, void *class_data EINA_UNUSED, va_list *list)
    int a;
    a = va_arg(*list, int);
    printf("%s %d\n", eobj_class_name_get(MY_CLASS), a);
-   eobj_do_super(obj, SIMPLE_A_SET(a + 1));
+   eobj_do_super(obj, simple_a_set(a + 1));
 }
 
 static void
diff --git a/legacy/eobj/examples/function_overrides/main.c b/legacy/eobj/examples/function_overrides/main.c
index 68b9f246eb..59de0fc536 100644
--- a/legacy/eobj/examples/function_overrides/main.c
+++ b/legacy/eobj/examples/function_overrides/main.c
@@ -15,7 +15,7 @@ main(int argc, char *argv[])
 
    Eobj *obj = eobj_add(INHERIT2_CLASS, NULL);
 
-   eobj_do(obj, SIMPLE_A_SET(1));
+   eobj_do(obj, simple_a_set(1));
    Simple_Public_Data *pd = eobj_data_get(obj, SIMPLE_CLASS);
    fail_if(pd->a != 2);
 
@@ -23,20 +23,20 @@ main(int argc, char *argv[])
 
    obj = eobj_add(INHERIT3_CLASS, NULL);
 
-   eobj_do(obj, SIMPLE_A_SET(1));
+   eobj_do(obj, simple_a_set(1));
    pd = eobj_data_get(obj, SIMPLE_CLASS);
    fail_if(pd->a != 3);
 
    eobj_unref(obj);
 
    obj = eobj_add(INHERIT2_CLASS, NULL);
-   eobj_do(obj, INHERIT2_PRINT());
+   eobj_do(obj, inherit2_print());
    eobj_unref(obj);
 
    obj = eobj_add(SIMPLE_CLASS, NULL);
-   fail_if(eobj_do(obj, INHERIT2_PRINT2()));
+   fail_if(eobj_do(obj, inherit2_print2()));
 
-   fail_if(eobj_do_super(obj, SIMPLE_A_PRINT()));
+   fail_if(eobj_do_super(obj, simple_a_print()));
 
    eobj_constructor_super(obj);
    eobj_destructor_super(obj);
diff --git a/legacy/eobj/examples/function_overrides/simple.h b/legacy/eobj/examples/function_overrides/simple.h
index c6b461172c..64d15b6e8b 100644
--- a/legacy/eobj/examples/function_overrides/simple.h
+++ b/legacy/eobj/examples/function_overrides/simple.h
@@ -18,8 +18,8 @@ typedef struct
 
 #define SIMPLE_ID(sub_id) (SIMPLE_BASE_ID + sub_id)
 
-#define SIMPLE_A_SET(a) SIMPLE_ID(SIMPLE_SUB_ID_A_SET), EOBJ_TYPECHECK(int, a)
-#define SIMPLE_A_PRINT() SIMPLE_ID(SIMPLE_SUB_ID_A_PRINT)
+#define simple_a_set(a) SIMPLE_ID(SIMPLE_SUB_ID_A_SET), EOBJ_TYPECHECK(int, a)
+#define simple_a_print() SIMPLE_ID(SIMPLE_SUB_ID_A_PRINT)
 
 extern const Eobj_Event_Description _SIG_A_CHANGED;
 #define SIG_A_CHANGED (&(_SIG_A_CHANGED))
diff --git a/legacy/eobj/examples/mixin/main.c b/legacy/eobj/examples/mixin/main.c
index 966e4741e0..be3b94b85a 100644
--- a/legacy/eobj/examples/mixin/main.c
+++ b/legacy/eobj/examples/mixin/main.c
@@ -15,13 +15,13 @@ main(int argc, char *argv[])
 
    Eobj *obj = eobj_add(SIMPLE_CLASS, NULL);
 
-   eobj_do(obj, SIMPLE_A_SET(1), SIMPLE_B_SET(2));
+   eobj_do(obj, simple_a_set(1), simple_b_set(2));
 
    int a, b, sum = 0;
-   eobj_do(obj, SIMPLE_A_GET(&a), SIMPLE_B_GET(&b),  MIXIN_AB_SUM_GET(&sum));
+   eobj_do(obj, simple_a_get(&a), simple_b_get(&b),  mixin_ab_sum_get(&sum));
    fail_if(sum != a + b + 2); /* 2 for the two mixins... */
 
-   eobj_do(obj, MIXIN_AB_SUM_GET(&sum), MIXIN_AB_SUM_GET(&sum));
+   eobj_do(obj, mixin_ab_sum_get(&sum), mixin_ab_sum_get(&sum));
 
    Mixin2_Public_Data *pd2 = eobj_data_get(obj, MIXIN2_CLASS);
    fail_if(pd2->count != 6);
diff --git a/legacy/eobj/examples/mixin/mixin.c b/legacy/eobj/examples/mixin/mixin.c
index dae82847da..c0a49e8fe8 100644
--- a/legacy/eobj/examples/mixin/mixin.c
+++ b/legacy/eobj/examples/mixin/mixin.c
@@ -12,7 +12,7 @@ static void
 _ab_sum_get(const Eobj *obj, const void *class_data EINA_UNUSED, va_list *list)
 {
    int a, b;
-   eobj_query(obj, SIMPLE_A_GET(&a), SIMPLE_B_GET(&b));
+   eobj_query(obj, simple_a_get(&a), simple_b_get(&b));
    int *sum = va_arg(*list, int *);
    if (sum)
       *sum = a + b;
diff --git a/legacy/eobj/examples/mixin/mixin.h b/legacy/eobj/examples/mixin/mixin.h
index 9e49cb187f..81237bf5d5 100644
--- a/legacy/eobj/examples/mixin/mixin.h
+++ b/legacy/eobj/examples/mixin/mixin.h
@@ -14,11 +14,11 @@ enum {
 
 
 /**
- * @def MIXIN_AB_SUM_GET(sum)
+ * @def mixin_ab_sum_get(sum)
  * @brief Get sum of a,b integer elements
  * @param[out] sum integer pointer to sum - value
  */
-#define MIXIN_AB_SUM_GET(sum) MIXIN_ID(MIXIN_SUB_ID_AB_SUM_GET), EOBJ_TYPECHECK(int *, sum)
+#define mixin_ab_sum_get(sum) MIXIN_ID(MIXIN_SUB_ID_AB_SUM_GET), EOBJ_TYPECHECK(int *, sum)
 
 #define MIXIN_CLASS mixin_class_get()
 const Eobj_Class *mixin_class_get(void) EINA_CONST;
diff --git a/legacy/eobj/examples/mixin/mixin2.c b/legacy/eobj/examples/mixin/mixin2.c
index bd638f44fc..771d6140ee 100644
--- a/legacy/eobj/examples/mixin/mixin2.c
+++ b/legacy/eobj/examples/mixin/mixin2.c
@@ -16,14 +16,14 @@ _ab_sum_get(const Eobj *obj, const void *class_data, va_list *list)
    Mixin2_Public_Data *pd = (Mixin2_Public_Data *) class_data;
    int *sum = va_arg(*list, int *);
    printf("%s %s\n", eobj_class_name_get(MY_CLASS), __func__);
-   eobj_query_super(obj, MIXIN_AB_SUM_GET(sum));
+   eobj_query_super(obj, mixin_ab_sum_get(sum));
 
    ++*sum;
    pd->count += 2;
 
      {
         int _a, _b;
-        eobj_query(obj, SIMPLE_A_GET(&_a), SIMPLE_B_GET(&_b));
+        eobj_query(obj, simple_a_get(&_a), simple_b_get(&_b));
         fail_if(*sum != _a + _b + 1);
      }
 }
diff --git a/legacy/eobj/examples/mixin/mixin3.c b/legacy/eobj/examples/mixin/mixin3.c
index 349fe83bc5..904ad3b00b 100644
--- a/legacy/eobj/examples/mixin/mixin3.c
+++ b/legacy/eobj/examples/mixin/mixin3.c
@@ -16,14 +16,14 @@ _ab_sum_get(const Eobj *obj, const void *class_data EINA_UNUSED, va_list *list)
    Mixin3_Public_Data *pd = (Mixin3_Public_Data *) class_data;
    int *sum = va_arg(*list, int *);
    printf("%s %s\n", eobj_class_name_get(MY_CLASS), __func__);
-   eobj_query_super(obj, MIXIN_AB_SUM_GET(sum));
+   eobj_query_super(obj, mixin_ab_sum_get(sum));
 
    ++*sum;
    pd->count += 3;
 
      {
         int _a, _b;
-        eobj_query(obj, SIMPLE_A_GET(&_a), SIMPLE_B_GET(&_b));
+        eobj_query(obj, simple_a_get(&_a), simple_b_get(&_b));
         fail_if(*sum != _a + _b + 2);
      }
 }
diff --git a/legacy/eobj/examples/mixin/simple.h b/legacy/eobj/examples/mixin/simple.h
index 6f3a6d74ab..76070ba3a4 100644
--- a/legacy/eobj/examples/mixin/simple.h
+++ b/legacy/eobj/examples/mixin/simple.h
@@ -16,32 +16,32 @@ enum {
 #define SIMPLE_ID(sub_id) (SIMPLE_BASE_ID + sub_id)
 
 /**
- * @def SIMPLE_A_SET(a)
+ * @def simple_a_set(a)
  * @brief Set value to a-property
  * @param[in] a integer value to set
  */
-#define SIMPLE_A_SET(a) SIMPLE_ID(SIMPLE_SUB_ID_A_SET), EOBJ_TYPECHECK(int, a)
+#define simple_a_set(a) SIMPLE_ID(SIMPLE_SUB_ID_A_SET), EOBJ_TYPECHECK(int, a)
 
 /**
- * @def SIMPLE_A_GET(a)
+ * @def simple_a_get(a)
  * @brief Get value of a-property
  * @param[out] integer pointer to a-value
  */
-#define SIMPLE_A_GET(a) SIMPLE_ID(SIMPLE_SUB_ID_A_GET), EOBJ_TYPECHECK(int *, a)
+#define simple_a_get(a) SIMPLE_ID(SIMPLE_SUB_ID_A_GET), EOBJ_TYPECHECK(int *, a)
 
 /**
- * @def SIMPLE_B_SET(b)
+ * @def simple_b_set(b)
  * @brief Set value to b-property
  * @param[in] a integer value to set
  */
-#define SIMPLE_B_SET(b) SIMPLE_ID(SIMPLE_SUB_ID_B_SET), EOBJ_TYPECHECK(int, b)
+#define simple_b_set(b) SIMPLE_ID(SIMPLE_SUB_ID_B_SET), EOBJ_TYPECHECK(int, b)
 
 /**
- * @def SIMPLE_B_GET(b)
+ * @def simple_b_get(b)
  * @brief Get value of b-property
  * @param[out] integer pointer to b-value
  */
-#define SIMPLE_B_GET(b) SIMPLE_ID(SIMPLE_SUB_ID_B_GET), EOBJ_TYPECHECK(int *, b)
+#define simple_b_get(b) SIMPLE_ID(SIMPLE_SUB_ID_B_GET), EOBJ_TYPECHECK(int *, b)
 
 #define SIMPLE_CLASS simple_class_get()
 const Eobj_Class *simple_class_get(void) EINA_CONST;
diff --git a/legacy/eobj/examples/signals/main.c b/legacy/eobj/examples/signals/main.c
index a9be0a1fd8..311311e490 100644
--- a/legacy/eobj/examples/signals/main.c
+++ b/legacy/eobj/examples/signals/main.c
@@ -37,7 +37,7 @@ main(int argc, char *argv[])
    /* This will never be called because the previous callback returns NULL. */
    eobj_event_callback_priority_add(obj, SIG_A_CHANGED, EOBJ_CALLBACK_PRIORITY_AFTER, _a_changed_cb, (void *) 4);
 
-   eobj_do(obj, SIMPLE_A_SET(1));
+   eobj_do(obj, simple_a_set(1));
 
    fail_if(cb_count != 3);
 
diff --git a/legacy/eobj/examples/signals/simple.c b/legacy/eobj/examples/signals/simple.c
index 0a23d59ffa..53559f4425 100644
--- a/legacy/eobj/examples/signals/simple.c
+++ b/legacy/eobj/examples/signals/simple.c
@@ -70,7 +70,7 @@ _constructor(Eobj *obj, void *class_data EINA_UNUSED)
    eobj_event_callback_add(obj, EOBJ_EV_CALLBACK_ADD, _cb_added, NULL);
    eobj_event_callback_add(obj, EOBJ_EV_CALLBACK_DEL, _cb_deled, NULL);
 
-   eobj_do(obj, EOBJ_BASE_DATA_SET("cb_count", (intptr_t) 0, NULL));
+   eobj_do(obj, eobj_base_data_set("cb_count", (intptr_t) 0, NULL));
 }
 
 static void
diff --git a/legacy/eobj/examples/signals/simple.h b/legacy/eobj/examples/signals/simple.h
index 8b83c53e50..946a76f17a 100644
--- a/legacy/eobj/examples/signals/simple.h
+++ b/legacy/eobj/examples/signals/simple.h
@@ -18,11 +18,11 @@ typedef struct
 #define SIMPLE_ID(sub_id) (SIMPLE_BASE_ID + sub_id)
 
 /**
- * @def SIMPLE_A_SET(a)
+ * @def simple_a_set(a)
  * @brief Set value to a - property
  * @param[in] a integer value to set
  */
-#define SIMPLE_A_SET(a) SIMPLE_ID(SIMPLE_SUB_ID_A_SET), EOBJ_TYPECHECK(int, a)
+#define simple_a_set(a) SIMPLE_ID(SIMPLE_SUB_ID_A_SET), EOBJ_TYPECHECK(int, a)
 
 extern const Eobj_Event_Description _SIG_A_CHANGED;
 #define SIG_A_CHANGED (&(_SIG_A_CHANGED))
diff --git a/legacy/eobj/lib/Eobj.h b/legacy/eobj/lib/Eobj.h
index 68eb4bd91c..9b03457816 100644
--- a/legacy/eobj/lib/Eobj.h
+++ b/legacy/eobj/lib/Eobj.h
@@ -884,37 +884,37 @@ enum {
 #define EOBJ_BASE_ID(sub_id) (EOBJ_BASE_BASE_ID + sub_id)
 
 /**
- * @def EOBJ_BASE_DATA_SET(key, data, free_func)
+ * @def eobj_base_data_set(key, data, free_func)
  * Set generic data to object.
  * @param[in] key the key associated with the data
  * @param[in] data the data to set.
  * @param[in] free_func the func to free data with (NULL means "do nothing").
  *
- * @see #EOBJ_BASE_DATA_GET
- * @see #EOBJ_BASE_DATA_DEL
+ * @see #eobj_base_data_get
+ * @see #eobj_base_data_del
  */
-#define EOBJ_BASE_DATA_SET(key, data, free_func) EOBJ_BASE_ID(EOBJ_BASE_SUB_ID_DATA_SET), EOBJ_TYPECHECK(const char *, key), EOBJ_TYPECHECK(const void *, data), EOBJ_TYPECHECK(eobj_base_data_free_func, free_func)
+#define eobj_base_data_set(key, data, free_func) EOBJ_BASE_ID(EOBJ_BASE_SUB_ID_DATA_SET), EOBJ_TYPECHECK(const char *, key), EOBJ_TYPECHECK(const void *, data), EOBJ_TYPECHECK(eobj_base_data_free_func, free_func)
 
 /**
- * @def EOBJ_BASE_DATA_GET(key, data)
+ * @def eobj_base_data_get(key, data)
  * Get generic data from object.
  * @param[in] key the key associated with the data
  * @param[out] data the data for the key
  *
- * @see #EOBJ_BASE_DATA_SET
- * @see #EOBJ_BASE_DATA_DEL
+ * @see #eobj_base_data_set
+ * @see #eobj_base_data_del
  */
-#define EOBJ_BASE_DATA_GET(key, data) EOBJ_BASE_ID(EOBJ_BASE_SUB_ID_DATA_GET), EOBJ_TYPECHECK(const char *, key), EOBJ_TYPECHECK(void **, data)
+#define eobj_base_data_get(key, data) EOBJ_BASE_ID(EOBJ_BASE_SUB_ID_DATA_GET), EOBJ_TYPECHECK(const char *, key), EOBJ_TYPECHECK(void **, data)
 
 /**
- * @def EOBJ_BASE_DATA_DEL(key)
+ * @def eobj_base_data_del(key)
  * Del generic data from object.
  * @param[in] key the key associated with the data
  *
- * @see #EOBJ_BASE_DATA_SET
- * @see #EOBJ_BASE_DATA_GET
+ * @see #eobj_base_data_set
+ * @see #eobj_base_data_get
  */
-#define EOBJ_BASE_DATA_DEL(key) EOBJ_BASE_ID(EOBJ_BASE_SUB_ID_DATA_DEL), EOBJ_TYPECHECK(const char *, key)
+#define eobj_base_data_del(key) EOBJ_BASE_ID(EOBJ_BASE_SUB_ID_DATA_DEL), EOBJ_TYPECHECK(const char *, key)
 
 /**
  * @var _EOBJ_EV_CALLBACK_ADD
diff --git a/legacy/eobj/lib/eobj_base_class.c b/legacy/eobj/lib/eobj_base_class.c
index abdf52313c..22c1dbf384 100644
--- a/legacy/eobj/lib/eobj_base_class.c
+++ b/legacy/eobj/lib/eobj_base_class.c
@@ -56,7 +56,7 @@ _data_set(Eobj *obj, void *class_data, va_list *list)
 
    if (!key) return;
 
-   eobj_do(obj, EOBJ_BASE_DATA_DEL(key));
+   eobj_do(obj, eobj_base_data_del(key));
 
    node = malloc(sizeof(Eobj_Generic_Data_Node));
    node->key = eina_stringshare_add(key);
diff --git a/legacy/eobj/tests/class_simple.h b/legacy/eobj/tests/class_simple.h
index c6b461172c..64d15b6e8b 100644
--- a/legacy/eobj/tests/class_simple.h
+++ b/legacy/eobj/tests/class_simple.h
@@ -18,8 +18,8 @@ typedef struct
 
 #define SIMPLE_ID(sub_id) (SIMPLE_BASE_ID + sub_id)
 
-#define SIMPLE_A_SET(a) SIMPLE_ID(SIMPLE_SUB_ID_A_SET), EOBJ_TYPECHECK(int, a)
-#define SIMPLE_A_PRINT() SIMPLE_ID(SIMPLE_SUB_ID_A_PRINT)
+#define simple_a_set(a) SIMPLE_ID(SIMPLE_SUB_ID_A_SET), EOBJ_TYPECHECK(int, a)
+#define simple_a_print() SIMPLE_ID(SIMPLE_SUB_ID_A_PRINT)
 
 extern const Eobj_Event_Description _SIG_A_CHANGED;
 #define SIG_A_CHANGED (&(_SIG_A_CHANGED))
diff --git a/legacy/eobj/tests/eobj_test_class_errors.c b/legacy/eobj/tests/eobj_test_class_errors.c
index b7bfbfd502..e9e3768bd0 100644
--- a/legacy/eobj/tests/eobj_test_class_errors.c
+++ b/legacy/eobj/tests/eobj_test_class_errors.c
@@ -343,7 +343,7 @@ START_TEST(eobj_const_ops)
    fail_if(!klass);
 
    Eobj *obj = eobj_add(klass, NULL);
-   eobj_do(obj, SIMPLE_A_SET(7), SIMPLE_A_PRINT());
+   eobj_do(obj, simple_a_set(7), simple_a_print());
    fail_if(_const_ops_counter != 0);
 
    eobj_unref(obj);
diff --git a/legacy/eobj/tests/eobj_test_general.c b/legacy/eobj/tests/eobj_test_general.c
index cf43e4c7a7..499491ca3c 100644
--- a/legacy/eobj/tests/eobj_test_general.c
+++ b/legacy/eobj/tests/eobj_test_general.c
@@ -167,9 +167,9 @@ START_TEST(eobj_op_errors)
    eobj_unref(obj);
 
    obj = eobj_add(SIMPLE_CLASS, NULL);
-   fail_if(!eobj_do(obj, SIMPLE_A_PRINT()));
-   fail_if(!eobj_query(obj, SIMPLE_A_PRINT()));
-   fail_if(eobj_query(obj, SIMPLE_A_SET(1)));
+   fail_if(!eobj_do(obj, simple_a_print()));
+   fail_if(!eobj_query(obj, simple_a_print()));
+   fail_if(eobj_query(obj, simple_a_set(1)));
 
    eobj_shutdown();
 }
@@ -191,56 +191,56 @@ START_TEST(eobj_generic_data)
    Eobj *obj = eobj_add(SIMPLE_CLASS, NULL);
    void *data;
 
-   eobj_do(obj, EOBJ_BASE_DATA_SET("test1", (void *) 1, NULL));
-   eobj_do(obj, EOBJ_BASE_DATA_GET("test1", &data));
+   eobj_do(obj, eobj_base_data_set("test1", (void *) 1, NULL));
+   eobj_do(obj, eobj_base_data_get("test1", &data));
    fail_if(1 != (int) data);
-   eobj_do(obj, EOBJ_BASE_DATA_DEL("test1"));
-   eobj_do(obj, EOBJ_BASE_DATA_GET("test1", &data));
+   eobj_do(obj, eobj_base_data_del("test1"));
+   eobj_do(obj, eobj_base_data_get("test1", &data));
    fail_if(data);
 
-   eobj_do(obj, EOBJ_BASE_DATA_SET("test1", (void *) 1, NULL));
-   eobj_do(obj, EOBJ_BASE_DATA_SET("test2", (void *) 2, NULL));
-   eobj_do(obj, EOBJ_BASE_DATA_GET("test1", &data));
+   eobj_do(obj, eobj_base_data_set("test1", (void *) 1, NULL));
+   eobj_do(obj, eobj_base_data_set("test2", (void *) 2, NULL));
+   eobj_do(obj, eobj_base_data_get("test1", &data));
    fail_if(1 != (int) data);
-   eobj_do(obj, EOBJ_BASE_DATA_GET("test2", &data));
+   eobj_do(obj, eobj_base_data_get("test2", &data));
    fail_if(2 != (int) data);
 
-   eobj_do(obj, EOBJ_BASE_DATA_GET("test2", &data));
+   eobj_do(obj, eobj_base_data_get("test2", &data));
    fail_if(2 != (int) data);
-   eobj_do(obj, EOBJ_BASE_DATA_DEL("test2"));
-   eobj_do(obj, EOBJ_BASE_DATA_GET("test2", &data));
+   eobj_do(obj, eobj_base_data_del("test2"));
+   eobj_do(obj, eobj_base_data_get("test2", &data));
    fail_if(data);
 
-   eobj_do(obj, EOBJ_BASE_DATA_GET("test1", &data));
+   eobj_do(obj, eobj_base_data_get("test1", &data));
    fail_if(1 != (int) data);
-   eobj_do(obj, EOBJ_BASE_DATA_DEL("test1"));
-   eobj_do(obj, EOBJ_BASE_DATA_GET("test1", &data));
+   eobj_do(obj, eobj_base_data_del("test1"));
+   eobj_do(obj, eobj_base_data_get("test1", &data));
    fail_if(data);
 
    int a = 0;
-   eobj_do(obj, EOBJ_BASE_DATA_SET("test3", &a, _fake_free_func));
-   eobj_do(obj, EOBJ_BASE_DATA_GET("test3", &data));
+   eobj_do(obj, eobj_base_data_set("test3", &a, _fake_free_func));
+   eobj_do(obj, eobj_base_data_get("test3", &data));
    fail_if(&a != data);
-   eobj_do(obj, EOBJ_BASE_DATA_GET("test3", NULL));
-   eobj_do(obj, EOBJ_BASE_DATA_DEL("test3"));
+   eobj_do(obj, eobj_base_data_get("test3", NULL));
+   eobj_do(obj, eobj_base_data_del("test3"));
    fail_if(a != 1);
 
    a = 0;
-   eobj_do(obj, EOBJ_BASE_DATA_SET("test3", &a, _fake_free_func));
-   eobj_do(obj, EOBJ_BASE_DATA_SET("test3", NULL, _fake_free_func));
+   eobj_do(obj, eobj_base_data_set("test3", &a, _fake_free_func));
+   eobj_do(obj, eobj_base_data_set("test3", NULL, _fake_free_func));
    fail_if(a != 1);
    a = 0;
    data = (void *) 123;
-   eobj_do(obj, EOBJ_BASE_DATA_SET(NULL, &a, _fake_free_func));
-   eobj_do(obj, EOBJ_BASE_DATA_GET(NULL, &data));
+   eobj_do(obj, eobj_base_data_set(NULL, &a, _fake_free_func));
+   eobj_do(obj, eobj_base_data_get(NULL, &data));
    fail_if(data);
-   eobj_do(obj, EOBJ_BASE_DATA_DEL(NULL));
+   eobj_do(obj, eobj_base_data_del(NULL));
 
    a = 0;
-   eobj_do(obj, EOBJ_BASE_DATA_SET("test3", &a, _fake_free_func));
-   eobj_do(obj, EOBJ_BASE_DATA_SET("test3", NULL, NULL));
+   eobj_do(obj, eobj_base_data_set("test3", &a, _fake_free_func));
+   eobj_do(obj, eobj_base_data_set("test3", NULL, NULL));
    fail_if(a != 1);
-   eobj_do(obj, EOBJ_BASE_DATA_SET("test3", &a, _fake_free_func));
+   eobj_do(obj, eobj_base_data_set("test3", &a, _fake_free_func));
 
    eobj_unref(obj);
    fail_if(a != 2);