diff --git a/legacy/elementary/src/lib/elc_multibuttonentry.c b/legacy/elementary/src/lib/elc_multibuttonentry.c
index 1f4927b47d..a3b24943a8 100644
--- a/legacy/elementary/src/lib/elc_multibuttonentry.c
+++ b/legacy/elementary/src/lib/elc_multibuttonentry.c
@@ -47,7 +47,7 @@ struct _Multibuttonentry_Item
 
 typedef struct _Elm_Multibuttonentry_Item_Filter
   {
-     Elm_Multibuttonentry_Item_Filter_callback callback_func;
+     Elm_Multibuttonentry_Item_Filter_Cb callback_func;
      void *data;
   } Elm_Multibuttonentry_Item_Filter;
 
@@ -76,7 +76,7 @@ struct _Widget_Data
      int  shrink;
      Eina_Bool focused: 1;
      Eina_Bool last_btn_select: 1;
-     Elm_Multibuttonentry_Item_Filter_callback add_callback;
+     Elm_Multibuttonentry_Item_Filter_Cb add_callback;
      void *add_callback_data;
   };
 
@@ -942,7 +942,7 @@ _add_button_item(Evas_Object *obj, const char *str, Multibuttonentry_Pos pos, co
 }
 
 static Elm_Multibuttonentry_Item_Filter*
-_filter_new(Elm_Multibuttonentry_Item_Filter_callback func, void *data)
+_filter_new(Elm_Multibuttonentry_Item_Filter_Cb func, void *data)
 {
    Elm_Multibuttonentry_Item_Filter *item_filter = ELM_NEW(Elm_Multibuttonentry_Item_Filter);
    if (!item_filter) return NULL;
@@ -1704,7 +1704,7 @@ elm_multibuttonentry_item_data_set(Elm_Object_Item *it, void *data)
 }
 
 EAPI void
-elm_multibuttonentry_item_filter_append(Evas_Object *obj, Elm_Multibuttonentry_Item_Filter_callback func, void *data)
+elm_multibuttonentry_item_filter_append(Evas_Object *obj, Elm_Multibuttonentry_Item_Filter_Cb func, void *data)
 {
    Elm_Multibuttonentry_Item_Filter *new_item_filter = NULL;
    Elm_Multibuttonentry_Item_Filter *_item_filter = NULL;
@@ -1731,7 +1731,7 @@ elm_multibuttonentry_item_filter_append(Evas_Object *obj, Elm_Multibuttonentry_I
 }
 
 EAPI void
-elm_multibuttonentry_item_filter_prepend(Evas_Object *obj, Elm_Multibuttonentry_Item_Filter_callback func, void *data)
+elm_multibuttonentry_item_filter_prepend(Evas_Object *obj, Elm_Multibuttonentry_Item_Filter_Cb func, void *data)
 {
    Elm_Multibuttonentry_Item_Filter *new_item_filter = NULL;
    Elm_Multibuttonentry_Item_Filter *_item_filter = NULL;
@@ -1757,7 +1757,7 @@ elm_multibuttonentry_item_filter_prepend(Evas_Object *obj, Elm_Multibuttonentry_
 }
 
 EAPI void
-elm_multibuttonentry_item_filter_remove(Evas_Object *obj, Elm_Multibuttonentry_Item_Filter_callback func, void *data)
+elm_multibuttonentry_item_filter_remove(Evas_Object *obj, Elm_Multibuttonentry_Item_Filter_Cb func, void *data)
 {
    Widget_Data *wd;
    Eina_List *l;
diff --git a/legacy/elementary/src/lib/elc_multibuttonentry.h b/legacy/elementary/src/lib/elc_multibuttonentry.h
index 915f2ce467..70ed7fa751 100644
--- a/legacy/elementary/src/lib/elc_multibuttonentry.h
+++ b/legacy/elementary/src/lib/elc_multibuttonentry.h
@@ -50,9 +50,20 @@
  * @{
  */
 
-// XXX: typedef Eina_Bool                   (*Elm_Multibuttonentry_Item_Filter_Cb)(Evas_Object *obj, const char *item_label, void *item_data, void *data);
-// XXX: need documentation.
-typedef Eina_Bool                   (*Elm_Multibuttonentry_Item_Filter_callback)(Evas_Object *obj, const char *item_label, void *item_data, void *data);
+/**
+ * @brief Callback to be invoked when an item is added to the multibuttonentry.
+ *
+ * @param obj The parent object
+ * @param item_label The label corresponding to the added item.
+ * @param item_data data specific to this item. 
+ * @param data data specific to the multibuttonentry.
+ *
+ * @return EINA_TRUE
+ *         EINA_FALSE otherwise.
+ *
+ * @ingroup Multibuttonentry
+ */
+typedef Eina_Bool                   (*Elm_Multibuttonentry_Item_Filter_Cb)(Evas_Object *obj, const char *item_label, void *item_data, void *data);
 
 /**
  * @brief Add a new multibuttonentry to the parent
@@ -267,7 +278,7 @@ EAPI Elm_Object_Item *elm_multibuttonentry_item_next_get(const Elm_Object_Item *
  * @ingroup Multibuttonentry
  */
 // XXX: EAPI void                       elm_multibuttonentry_item_filter_append(Evas_Object *obj, Elm_Multibuttonentry_Item_Filter_CB func, void *data);
-EAPI void                       elm_multibuttonentry_item_filter_append(Evas_Object *obj, Elm_Multibuttonentry_Item_Filter_callback func, void *data);
+EAPI void                       elm_multibuttonentry_item_filter_append(Evas_Object *obj, Elm_Multibuttonentry_Item_Filter_Cb func, void *data);
 
 /**
  * Prepend a filter function for text inserted in the Multibuttonentry
@@ -282,7 +293,7 @@ EAPI void                       elm_multibuttonentry_item_filter_append(Evas_Obj
  * @ingroup Multibuttonentry
  */
 // XXX: EAPI void                       elm_multibuttonentry_item_filter_prepend(Evas_Object *obj, Elm_Multibuttonentry_Item_Filter_Cb func, void *data);
-EAPI void                       elm_multibuttonentry_item_filter_prepend(Evas_Object *obj, Elm_Multibuttonentry_Item_Filter_callback func, void *data);
+EAPI void                       elm_multibuttonentry_item_filter_prepend(Evas_Object *obj, Elm_Multibuttonentry_Item_Filter_Cb func, void *data);
 
 /**
  * Remove a filter from the list
@@ -297,7 +308,7 @@ EAPI void                       elm_multibuttonentry_item_filter_prepend(Evas_Ob
  * @ingroup Multibuttonentry
  */
 // XXX: EAPI void                       elm_multibuttonentry_item_filter_del(Evas_Object *obj, Elm_Multibuttonentry_Item_Filter_Cb func, void *data); --> api name and callback changes.
-EAPI void                       elm_multibuttonentry_item_filter_remove(Evas_Object *obj, Elm_Multibuttonentry_Item_Filter_callback func, void *data);
+EAPI void                       elm_multibuttonentry_item_filter_remove(Evas_Object *obj, Elm_Multibuttonentry_Item_Filter_Cb func, void *data);
 
 /**
  * @}