diff --git a/src/bin/elementary/test_datetime.c b/src/bin/elementary/test_datetime.c
index 6bc0f8c583..719275baca 100644
--- a/src/bin/elementary/test_datetime.c
+++ b/src/bin/elementary/test_datetime.c
@@ -34,7 +34,6 @@ _bt_clicked(void *data EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUS
    efl_ui_clock_pause_set(dt1, EINA_TRUE);
    elm_datetime_value_set(dt1, &new_time);
    elm_object_disabled_set(dt1, EINA_TRUE);
-
    elm_object_disabled_set(obj, EINA_TRUE);
    evas_object_del(dt2);
    evas_object_del(dt3);
diff --git a/src/bin/elementary/test_multibuttonentry.c b/src/bin/elementary/test_multibuttonentry.c
index 2d371416a1..e4c3370908 100644
--- a/src/bin/elementary/test_multibuttonentry.c
+++ b/src/bin/elementary/test_multibuttonentry.c
@@ -3,7 +3,7 @@
 #endif
 #include <Elementary.h>
 
-static Efl_Ui_Multibuttonentry_Format_Cb format_func = NULL;
+static Elm_Multibuttonentry_Format_Cb format_func = NULL;
 
 static char *
 _custom_format(int count, void *data EINA_UNUSED)
diff --git a/src/lib/elementary/efl_ui_multibuttonentry.c b/src/lib/elementary/efl_ui_multibuttonentry.c
index 5c6ec2c18c..5ec2c27c17 100644
--- a/src/lib/elementary/efl_ui_multibuttonentry.c
+++ b/src/lib/elementary/efl_ui_multibuttonentry.c
@@ -2099,7 +2099,7 @@ elm_multibuttonentry_add(Evas_Object *parent)
 
 typedef struct
 {
-   Efl_Ui_Multibuttonentry_Format_Cb format_cb;
+   Elm_Multibuttonentry_Format_Cb format_cb;
    void *data;
 } Mbe_Format_Wrapper_Data ;
 
@@ -2130,7 +2130,7 @@ _format_legacy_to_format_eo_free_cb(void *data)
 }
 
 EAPI void
-elm_multibuttonentry_format_function_set(Eo *obj, Efl_Ui_Multibuttonentry_Format_Cb format_function, const void *data)
+elm_multibuttonentry_format_function_set(Eo *obj, Elm_Multibuttonentry_Format_Cb format_function, const void *data)
 {
    Mbe_Format_Wrapper_Data *mfwd = malloc(sizeof(Mbe_Format_Wrapper_Data));
 
diff --git a/src/lib/elementary/elc_multibuttonentry_common.h b/src/lib/elementary/elc_multibuttonentry_common.h
index 8601dbffcc..b076385698 100644
--- a/src/lib/elementary/elc_multibuttonentry_common.h
+++ b/src/lib/elementary/elc_multibuttonentry_common.h
@@ -30,4 +30,4 @@ typedef Eina_Bool                   (*Elm_Multibuttonentry_Item_Filter_Cb)(Evas_
  *
  * @ingroup Multibuttonentry
  */
-typedef char * (*Efl_Ui_Multibuttonentry_Format_Cb)(int count, void *data);
+typedef char * (*Elm_Multibuttonentry_Format_Cb)(int count, void *data);
diff --git a/src/lib/elementary/elc_multibuttonentry_legacy.h b/src/lib/elementary/elc_multibuttonentry_legacy.h
index 8831fe71ca..98b666b05a 100644
--- a/src/lib/elementary/elc_multibuttonentry_legacy.h
+++ b/src/lib/elementary/elc_multibuttonentry_legacy.h
@@ -24,7 +24,7 @@ EAPI Evas_Object               *elm_multibuttonentry_add(Evas_Object *parent);
  *
  * @ingroup Multibuttonentry
  */
- EAPI void elm_multibuttonentry_format_function_set(Eo *obj, Efl_Ui_Multibuttonentry_Format_Cb format_function, const void *data);
+ EAPI void elm_multibuttonentry_format_function_set(Eo *obj, Elm_Multibuttonentry_Format_Cb format_function, const void *data);
 
 #include "elm_multibuttonentry_item.eo.legacy.h"
 #include "efl_ui_multibuttonentry.eo.legacy.h"