diff --git a/legacy/eobj/src/examples/evas/elw_boxedbutton.c b/legacy/eobj/src/examples/evas/elw_boxedbutton.c
index 825fcb9a76..4c1a284812 100644
--- a/legacy/eobj/src/examples/evas/elw_boxedbutton.c
+++ b/legacy/eobj/src/examples/evas/elw_boxedbutton.c
@@ -21,7 +21,7 @@ _constructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED)
    eo_do_super(obj, eo_constructor());
 
    Eo *bt = eo_add(ELW_BUTTON_CLASS, obj);
-   eo_composite_object_attach(bt, obj);
+   eo_composite_attach(bt, obj);
    eo_do(bt, eo_event_callback_forwarder_add(EV_CLICKED, obj));
    eo_do(bt, evas_obj_visibility_set(EINA_TRUE));
 
diff --git a/legacy/eobj/src/lib/Eo.h b/legacy/eobj/src/lib/Eo.h
index 976509ce93..b4705422b5 100644
--- a/legacy/eobj/src/lib/Eo.h
+++ b/legacy/eobj/src/lib/Eo.h
@@ -795,10 +795,10 @@ EAPI void eo_manual_free(Eo *obj);
  *
  * This functions also sets the parent of comp_obj to parent.
  *
- * @see eo_composite_object_detach()
+ * @see eo_composite_detach()
  * @see eo_composite_is()
  */
-EAPI void eo_composite_object_attach(Eo *comp_obj, Eo *parent);
+EAPI void eo_composite_attach(Eo *comp_obj, Eo *parent);
 
 /**
  * @brief Detach a composite object from another object.
@@ -807,18 +807,18 @@ EAPI void eo_composite_object_attach(Eo *comp_obj, Eo *parent);
  *
  * This functions also sets the parent of comp_obj to @c NULL.
  *
- * @see eo_composite_object_attach()
+ * @see eo_composite_attach()
  * @see eo_composite_is()
  */
-EAPI void eo_composite_object_detach(Eo *comp_obj, Eo *parent);
+EAPI void eo_composite_detach(Eo *comp_obj, Eo *parent);
 
 /**
  * @brief Check if an object is a composite object.
  * @param comp_obj the object to be checked.
  * @return @c EINA_TRUE if it is, @c EINA_FALSE otherwise.
  *
- * @see eo_composite_object_attach()
- * @see eo_composite_object_detach()
+ * @see eo_composite_attach()
+ * @see eo_composite_detach()
  */
 EAPI Eina_Bool eo_composite_is(const Eo *comp_obj);
 
diff --git a/legacy/eobj/src/lib/eo.c b/legacy/eobj/src/lib/eo.c
index f0b6011910..aa0689df94 100644
--- a/legacy/eobj/src/lib/eo.c
+++ b/legacy/eobj/src/lib/eo.c
@@ -1071,7 +1071,7 @@ eo_parent_set(Eo *obj, const Eo *parent)
 
    if (eo_composite_is(obj))
      {
-        eo_composite_object_detach(obj->parent, obj);
+        eo_composite_detach(obj->parent, obj);
      }
 
    if (obj->parent)
@@ -1259,7 +1259,7 @@ _eo_del_internal(Eo *obj)
         Eo *emb_obj;
         EINA_LIST_FOREACH_SAFE(obj->composite_objects, itr, itr_n, emb_obj)
           {
-             eo_composite_object_detach(obj, emb_obj);
+             eo_composite_detach(obj, emb_obj);
           }
      }
 
@@ -1506,7 +1506,7 @@ eo_shutdown(void)
 }
 
 EAPI void
-eo_composite_object_attach(Eo *comp_obj, Eo *parent)
+eo_composite_attach(Eo *comp_obj, Eo *parent)
 {
    EO_MAGIC_RETURN(comp_obj, EO_EINA_MAGIC);
    EO_MAGIC_RETURN(parent, EO_EINA_MAGIC);
@@ -1517,7 +1517,7 @@ eo_composite_object_attach(Eo *comp_obj, Eo *parent)
 }
 
 EAPI void
-eo_composite_object_detach(Eo *comp_obj, Eo *parent)
+eo_composite_detach(Eo *comp_obj, Eo *parent)
 {
    EO_MAGIC_RETURN(comp_obj, EO_EINA_MAGIC);
    EO_MAGIC_RETURN(parent, EO_EINA_MAGIC);
diff --git a/legacy/eobj/src/tests/composite_objects/comp.c b/legacy/eobj/src/tests/composite_objects/comp.c
index 1f463c2964..ea56934bcb 100644
--- a/legacy/eobj/src/tests/composite_objects/comp.c
+++ b/legacy/eobj/src/tests/composite_objects/comp.c
@@ -24,7 +24,7 @@ _constructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED)
    eo_do_super(obj, eo_constructor());
 
    Eo *simple = eo_add(SIMPLE_CLASS, obj);
-   eo_composite_object_attach(simple, obj);
+   eo_composite_attach(simple, obj);
    eo_do(simple, eo_event_callback_forwarder_add(EV_A_CHANGED, obj));
 
    fail_if(eo_composite_is(obj));
diff --git a/legacy/eobj/src/tests/composite_objects/main.c b/legacy/eobj/src/tests/composite_objects/main.c
index 36bad0f421..453f6d2b90 100644
--- a/legacy/eobj/src/tests/composite_objects/main.c
+++ b/legacy/eobj/src/tests/composite_objects/main.c
@@ -47,9 +47,9 @@ main(int argc, char *argv[])
    fail_if(cb_called);
 
    fail_if(!eo_composite_is(simple));
-   eo_composite_object_detach(simple, obj);
+   eo_composite_detach(simple, obj);
    fail_if(eo_composite_is(simple));
-   eo_composite_object_attach(simple, obj);
+   eo_composite_attach(simple, obj);
    fail_if(!eo_composite_is(simple));
 
    eo_unref(simple);
diff --git a/legacy/eobj/src/tests/eo_suite/eo_test_general.c b/legacy/eobj/src/tests/eo_suite/eo_test_general.c
index 550b62af7f..9676263848 100644
--- a/legacy/eobj/src/tests/eo_suite/eo_test_general.c
+++ b/legacy/eobj/src/tests/eo_suite/eo_test_general.c
@@ -72,7 +72,7 @@ START_TEST(eo_composite_tests)
    Eo *obj2 = eo_add(SIMPLE_CLASS, NULL);
    fail_if(!obj2);
 
-   eo_composite_object_attach(obj2, obj);
+   eo_composite_attach(obj2, obj);
    eo_parent_set(obj2, NULL);
    fail_if(eo_composite_is(obj2));
 
@@ -543,10 +543,10 @@ START_TEST(eo_magic_checks)
 
         fail_if(eo_data_get((Eo *) buf, SIMPLE_CLASS));
 
-        eo_composite_object_attach((Eo *) buf, obj);
-        eo_composite_object_attach(obj, (Eo *) buf);
-        eo_composite_object_detach((Eo *) buf, obj);
-        eo_composite_object_detach(obj, (Eo *) buf);
+        eo_composite_attach((Eo *) buf, obj);
+        eo_composite_attach(obj, (Eo *) buf);
+        eo_composite_detach((Eo *) buf, obj);
+        eo_composite_detach(obj, (Eo *) buf);
         eo_composite_is((Eo *) buf);
 
         eo_do(obj, eo_event_callback_forwarder_add(NULL, (Eo *) buf));