rename elm_button to Efl.Ui.Button

ref T5323

Signed-off-by: Amitesh Singh <amitesh.sh@samsung.com>

25 files changed, 72 insertions, 73 deletions

diff --git a/config/default/base.src.in b/config/default/base.src.in
index a2a698c00a..6c9cfd9952 100644
--- a/config/default/base.src.in
+++ b/config/default/base.src.in
@@ -608,7 +608,7 @@ group "Elm_Config" struct {
         }
      }
      group "Elm_Config_Bindings_Widget" struct {
-        value "name" string: "Elm_Button";
+        value "name" string: "Efl.Ui.Button";
         group "key_bindings" list {
            group "Elm_Config_Binding_Key" struct {
               value "context" int: 0;
diff --git a/config/mobile/base.src.in b/config/mobile/base.src.in
index 957e05f25a..b6b128b82a 100644
--- a/config/mobile/base.src.in
+++ b/config/mobile/base.src.in
@@ -612,7 +612,7 @@ group "Elm_Config" struct {
         }
      }
      group "Elm_Config_Bindings_Widget" struct {
-        value "name" string: "Elm_Button";
+        value "name" string: "Efl.Ui.Button";
         group "key_bindings" list {
            group "Elm_Config_Binding_Key" struct {
               value "context" int: 0;
diff --git a/config/standard/base.src.in b/config/standard/base.src.in
index d085e3a51f..61848b3da9 100644
--- a/config/standard/base.src.in
+++ b/config/standard/base.src.in
@@ -609,7 +609,7 @@ group "Elm_Config" struct {
         }
      }
      group "Elm_Config_Bindings_Widget" struct {
-        value "name" string: "Elm_Button";
+        value "name" string: "Efl.Ui.Button";
         group "key_bindings" list {
            group "Elm_Config_Binding_Key" struct {
               value "context" int: 0;
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 7d5d211cc4..a5b38bf458 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -105,7 +105,7 @@ src/lib/elementary/elm_actionslider.c
 src/lib/elementary/elm_bg.c
 src/lib/elementary/elm_box.c
 src/lib/elementary/elm_bubble.c
-src/lib/elementary/elm_button.c
+src/lib/elementary/efl_ui_button.c
 src/lib/elementary/elm_calendar.c
 src/lib/elementary/efl_ui_check.c
 src/lib/elementary/elm_clock.c
diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am
index 8b047fe615..483d8d2a4e 100644
--- a/src/Makefile_Elementary.am
+++ b/src/Makefile_Elementary.am
@@ -5,7 +5,7 @@ elm_public_eolian_files = \
 	lib/elementary/elm_atspi_bridge.eo \
 	lib/elementary/elm_atspi_app_object.eo \
 	lib/elementary/elm_bg.eo \
-	lib/elementary/elm_button.eo \
+	lib/elementary/efl_ui_button.eo \
 	lib/elementary/elm_calendar.eo \
 	lib/elementary/efl_ui_check.eo \
 	lib/elementary/elm_clock.eo \
@@ -94,7 +94,7 @@ elm_public_eolian_files = \
 	lib/elementary/efl_ui_grid_static.eo \
 	lib/elementary/efl_ui_layout_internal_box.eo \
 	lib/elementary/efl_ui_layout_internal_table.eo \
-	lib/elementary/elm_button_internal_part.eo \
+	lib/elementary/efl_ui_button_internal_part.eo \
 	lib/elementary/elm_ctxpopup_internal_part.eo \
 	lib/elementary/elm_dayselector_internal_part.eo \
 	lib/elementary/elm_entry_internal_part.eo \
@@ -215,7 +215,7 @@ includesunstable_HEADERS = \
 	lib/elementary/elm_widget_bg.h \
 	lib/elementary/elm_widget_box.h \
 	lib/elementary/elm_widget_bubble.h \
-	lib/elementary/elm_widget_button.h \
+	lib/elementary/efl_ui_button_private.h \
 	lib/elementary/elm_widget_calendar.h \
 	lib/elementary/efl_ui_check_private.h \
 	lib/elementary/elm_widget_clock.h \
@@ -333,7 +333,7 @@ includesub_HEADERS = \
 	lib/elementary/elm_bubble.h \
 	lib/elementary/elm_bubble_legacy.h \
 	lib/elementary/elm_button.h \
-	lib/elementary/elm_button_eo.h \
+	lib/elementary/efl_ui_button_eo.h \
 	lib/elementary/elm_button_legacy.h \
 	lib/elementary/elm_cache.h \
 	lib/elementary/elm_calendar.h \
@@ -553,7 +553,7 @@ lib_elementary_libelementary_la_SOURCES = \
 	lib/elementary/elm_bg.c \
 	lib/elementary/elm_box.c \
 	lib/elementary/elm_bubble.c \
-	lib/elementary/elm_button.c \
+	lib/elementary/efl_ui_button.c \
 	lib/elementary/elm_calendar.c \
 	lib/elementary/efl_ui_check.c \
 	lib/elementary/elm_clock.c \
diff --git a/src/bin/elementary/test_efl_ui_text.c b/src/bin/elementary/test_efl_ui_text.c
index 6ac5e5749d..a8e05b9680 100644
--- a/src/bin/elementary/test_efl_ui_text.c
+++ b/src/bin/elementary/test_efl_ui_text.c
@@ -84,7 +84,7 @@ my_efl_ui_text_anchor_hover_opened(void *data EINA_UNUSED, const Efl_Event *even
 
    Efl_Ui_Text_Anchor_Hover_Info *ei = event->info;
 
-   bt = efl_add(ELM_BUTTON_CLASS, en);
+   bt = efl_add(EFL_UI_BUTTON_CLASS, en);
    elm_object_text_set(bt, ei->anchor_info->name);
    evas_object_show(bt);
    elm_object_part_content_set(ei->hover, "middle", bt);
diff --git a/src/bin/elementary/test_evas_mask.c b/src/bin/elementary/test_evas_mask.c
index 33b8d9bd42..9938e9f4ba 100644
--- a/src/bin/elementary/test_evas_mask.c
+++ b/src/bin/elementary/test_evas_mask.c
@@ -164,19 +164,19 @@ test_evas_mask(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
                   efl_gfx_visible_set(efl_added, 1));
 
    // FIXME: button EO API
-   efl_add(ELM_BUTTON_CLASS, win,
+   efl_add(EFL_UI_BUTTON_CLASS, win,
            efl_text_set(efl_added, "Toggle mask"),
            efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _toggle_mask, ly),
            efl_pack(box2, efl_added),
            efl_gfx_visible_set(efl_added, 1));
 
-   efl_add(ELM_BUTTON_CLASS, win,
+   efl_add(EFL_UI_BUTTON_CLASS, win,
            efl_text_set(efl_added, "Toggle map"),
            efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _toggle_map, ly),
            efl_pack(box2, efl_added),
            efl_gfx_visible_set(efl_added, 1));
 
-   efl_add(ELM_BUTTON_CLASS, win,
+   efl_add(EFL_UI_BUTTON_CLASS, win,
            efl_text_set(efl_added, "Rotate Window"),
            efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _rotate_win, win),
            efl_pack(box2, efl_added),
diff --git a/src/bin/elementary/test_evas_snapshot.c b/src/bin/elementary/test_evas_snapshot.c
index 2a32277819..d7aa804efb 100644
--- a/src/bin/elementary/test_evas_snapshot.c
+++ b/src/bin/elementary/test_evas_snapshot.c
@@ -190,7 +190,7 @@ test_evas_snapshot(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e
                  efl_pack_grid(grid, efl_added, 0, GRID_SIZE + 1, GRID_SIZE, 1),
                  efl_gfx_visible_set(efl_added, 1));
 
-   efl_add(ELM_BUTTON_CLASS, win,
+   efl_add(EFL_UI_BUTTON_CLASS, win,
            efl_text_set(efl_added, "Toggle animation"),
            efl_gfx_size_hint_align_set(efl_added, -1.0, -1.0),
            efl_gfx_size_hint_weight_set(efl_added, 1.0, 0.0),
@@ -198,7 +198,7 @@ test_evas_snapshot(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e
            efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _anim_toggle, win),
            efl_gfx_visible_set(efl_added, 1));
 
-   efl_add(ELM_BUTTON_CLASS, win,
+   efl_add(EFL_UI_BUTTON_CLASS, win,
            efl_text_set(efl_added, "Save to file"),
            efl_gfx_size_hint_align_set(efl_added, -1.0, -1.0),
            efl_gfx_size_hint_weight_set(efl_added, 1.0, 0.0),
@@ -206,7 +206,7 @@ test_evas_snapshot(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e
            efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _save_image, win),
            efl_gfx_visible_set(efl_added, 1));
 
-   efl_add(ELM_BUTTON_CLASS, win,
+   efl_add(EFL_UI_BUTTON_CLASS, win,
            efl_text_set(efl_added, "Map"),
            efl_gfx_size_hint_align_set(efl_added, -1.0, -1.0),
            efl_gfx_size_hint_weight_set(efl_added, 1.0, 0.0),
@@ -214,7 +214,7 @@ test_evas_snapshot(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e
            efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _toggle_map, win),
            efl_gfx_visible_set(efl_added, 1));
 
-   efl_add(ELM_BUTTON_CLASS, win,
+   efl_add(EFL_UI_BUTTON_CLASS, win,
            efl_text_set(efl_added, "Close"),
            efl_gfx_size_hint_align_set(efl_added, -1.0, -1.0),
            efl_gfx_size_hint_weight_set(efl_added, 1.0, 0.0),
diff --git a/src/bin/elementary/test_gfx_filters.c b/src/bin/elementary/test_gfx_filters.c
index dfa8a084fb..c7e19f9f8b 100644
--- a/src/bin/elementary/test_gfx_filters.c
+++ b/src/bin/elementary/test_gfx_filters.c
@@ -368,7 +368,7 @@ test_gfx_filters(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
                   efl_gfx_visible_set(efl_added, 1));
       efl_pack(box2, o);
 
-      o = efl_add(ELM_BUTTON_CLASS, win,
+      o = efl_add(EFL_UI_BUTTON_CLASS, win,
                   efl_text_set(efl_added, "Flip"),
                   efl_gfx_size_hint_weight_set(efl_added, 0.0, 1.0),
                   efl_gfx_size_hint_align_set(efl_added, -1.0, 0.5),
diff --git a/src/examples/elementary/button_cxx_example_00.cc b/src/examples/elementary/button_cxx_example_00.cc
index 79b9dcb93c..b3547cde68 100644
--- a/src/examples/elementary/button_cxx_example_00.cc
+++ b/src/examples/elementary/button_cxx_example_00.cc
@@ -23,7 +23,7 @@ elm_main (int argc EINA_UNUSED, char **argv EINA_UNUSED)
    // win.title_set("Hello, World!");
    win.autohide_set(true);
 
-   ::elm::Button btn(win);
+   efl::ui::Button btn(win);
    btn.eo_cxx::elm::Layout::text_set(nullptr,"Good-Bye, World!");
    btn.eo_cxx::efl::Gfx::size_set(120, 30);
    btn.eo_cxx::efl::Gfx::position_set(60, 15);
diff --git a/src/lib/elementary/elm_button.c b/src/lib/elementary/efl_ui_button.c
index 2ca0ae8e67..5303386313 100644
--- a/src/lib/elementary/elm_button.c
+++ b/src/lib/elementary/efl_ui_button.c
@@ -8,14 +8,14 @@
 
 #include <Elementary.h>
 #include "elm_priv.h"
-#include "elm_widget_button.h"
+#include "efl_ui_button_private.h"
 #include "elm_widget_layout.h"
-#include "elm_button_internal_part.eo.h"
+#include "efl_ui_button_internal_part.eo.h"
 #include "elm_part_helper.h"
 
-#define MY_CLASS ELM_BUTTON_CLASS
+#define MY_CLASS EFL_UI_BUTTON_CLASS
 
-#define MY_CLASS_NAME "Elm_Button"
+#define MY_CLASS_NAME "Efl.Ui.Button"
 #define MY_CLASS_NAME_LEGACY "elm_button"
 
 static const char SIG_CLICKED[] = "clicked";
@@ -75,7 +75,7 @@ _activate(Evas_Object *obj)
 }
 
 EOLIAN static void
-_elm_button_elm_layout_sizing_eval(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED)
+_efl_ui_button_elm_layout_sizing_eval(Eo *obj, Efl_Ui_Button_Data *_pd EINA_UNUSED)
 {
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
    Evas_Coord minw = -1, minh = -1;
@@ -87,7 +87,7 @@ _elm_button_elm_layout_sizing_eval(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED)
 }
 
 EOLIAN static Eina_Bool
-_elm_button_elm_widget_activate(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED, Elm_Activate act)
+_efl_ui_button_elm_widget_activate(Eo *obj, Efl_Ui_Button_Data *_pd EINA_UNUSED, Elm_Activate act)
 {
    if (elm_widget_disabled_get(obj)) return EINA_FALSE;
    if (act != ELM_ACTIVATE_DEFAULT) return EINA_FALSE;
@@ -120,7 +120,7 @@ _icon_signal_emit(Evas_Object *obj)
  * is elm.swallow.content, not elm.swallow.icon. Fix that whenever we
  * can changed the theme API */
 EOLIAN static Elm_Theme_Apply
-_elm_button_elm_widget_theme_apply(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED)
+_efl_ui_button_elm_widget_theme_apply(Eo *obj, Efl_Ui_Button_Data *_pd EINA_UNUSED)
 {
    Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED;
 
@@ -135,7 +135,7 @@ _elm_button_elm_widget_theme_apply(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED)
  * is elm.swallow.content, not elm.swallow.icon. Fix that whenever we
  * can changed the theme API */
 EOLIAN static Eina_Bool
-_elm_button_elm_widget_sub_object_del(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED, Evas_Object *sobj)
+_efl_ui_button_elm_widget_sub_object_del(Eo *obj, Efl_Ui_Button_Data *_pd EINA_UNUSED, Evas_Object *sobj)
 {
    Eina_Bool int_ret = EINA_FALSE;
 
@@ -151,7 +151,7 @@ _elm_button_elm_widget_sub_object_del(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED,
  * is elm.swallow.content, not elm.swallow.icon. Fix that whenever we
  * can changed the theme API */
 static Eina_Bool
-_elm_button_content_set(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED, const char *part, Evas_Object *content)
+_efl_ui_button_content_set(Eo *obj, Efl_Ui_Button_Data *_pd EINA_UNUSED, const char *part, Evas_Object *content)
 {
    Eina_Bool int_ret = EINA_FALSE;
 
@@ -172,7 +172,7 @@ _key_action_activate(Evas_Object *obj, const char *params EINA_UNUSED)
 }
 
 EOLIAN static Eina_Bool
-_elm_button_elm_widget_widget_event(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info)
+_efl_ui_button_elm_widget_widget_event(Eo *obj, Efl_Ui_Button_Data *_pd EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info)
 {
    (void) src;
    Evas_Event_Key_Down *ev = event_info;
@@ -281,7 +281,7 @@ _access_state_cb(void *data EINA_UNUSED, Evas_Object *obj)
 }
 
 EOLIAN static void
-_elm_button_efl_canvas_group_group_add(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED)
+_efl_ui_button_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Button_Data *_pd EINA_UNUSED)
 {
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
 
@@ -312,13 +312,13 @@ _elm_button_efl_canvas_group_group_add(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED
 }
 
 EOLIAN static const Elm_Layout_Part_Alias_Description*
-_elm_button_elm_layout_content_aliases_get(Eo *obj EINA_UNUSED, Elm_Button_Data *_pd EINA_UNUSED)
+_efl_ui_button_elm_layout_content_aliases_get(Eo *obj EINA_UNUSED, Efl_Ui_Button_Data *_pd EINA_UNUSED)
 {
    return _content_aliases;
 }
 
 EOLIAN static const Elm_Layout_Part_Alias_Description*
-_elm_button_elm_layout_text_aliases_get(Eo *obj EINA_UNUSED, Elm_Button_Data *_pd EINA_UNUSED)
+_efl_ui_button_elm_layout_text_aliases_get(Eo *obj EINA_UNUSED, Efl_Ui_Button_Data *_pd EINA_UNUSED)
 {
    return _text_aliases;
 }
@@ -332,7 +332,7 @@ elm_button_add(Evas_Object *parent)
 }
 
 EOLIAN static Eo *
-_elm_button_efl_object_constructor(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED)
+_efl_ui_button_efl_object_constructor(Eo *obj, Efl_Ui_Button_Data *_pd EINA_UNUSED)
 {
    obj = efl_constructor(efl_super(obj, MY_CLASS));
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
@@ -343,7 +343,7 @@ _elm_button_efl_object_constructor(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED)
 }
 
 EOLIAN static void
-_elm_button_efl_ui_autorepeat_autorepeat_enabled_set(Eo *obj EINA_UNUSED, Elm_Button_Data *sd, Eina_Bool on)
+_efl_ui_button_efl_ui_autorepeat_autorepeat_enabled_set(Eo *obj EINA_UNUSED, Efl_Ui_Button_Data *sd, Eina_Bool on)
 {
    ELM_SAFE_FREE(sd->timer, ecore_timer_del);
    sd->autorepeat = on;
@@ -351,10 +351,10 @@ _elm_button_efl_ui_autorepeat_autorepeat_enabled_set(Eo *obj EINA_UNUSED, Elm_Bu
 }
 
 #define _AR_CAPABLE(obj) \
-  (_internal_elm_button_autorepeat_supported_get(obj))
+  (_internal_efl_ui_button_autorepeat_supported_get(obj))
 
 static Eina_Bool
-_internal_elm_button_autorepeat_supported_get(const Evas_Object *obj)
+_internal_efl_ui_button_autorepeat_supported_get(const Evas_Object *obj)
 {
    Eina_Bool ret = EINA_FALSE;
    ret = efl_ui_autorepeat_supported_get(obj);
@@ -362,19 +362,19 @@ _internal_elm_button_autorepeat_supported_get(const Evas_Object *obj)
 }
 
 EOLIAN static Eina_Bool
-_elm_button_efl_ui_autorepeat_autorepeat_supported_get(Eo *obj EINA_UNUSED, Elm_Button_Data *_pd EINA_UNUSED)
+_efl_ui_button_efl_ui_autorepeat_autorepeat_supported_get(Eo *obj EINA_UNUSED, Efl_Ui_Button_Data *_pd EINA_UNUSED)
 {
    return EINA_TRUE;
 }
 
 EOLIAN static Eina_Bool
-_elm_button_efl_ui_autorepeat_autorepeat_enabled_get(Eo *obj, Elm_Button_Data *sd)
+_efl_ui_button_efl_ui_autorepeat_autorepeat_enabled_get(Eo *obj, Efl_Ui_Button_Data *sd)
 {
    return (_AR_CAPABLE(obj) & sd->autorepeat);
 }
 
 EOLIAN static void
-_elm_button_efl_ui_autorepeat_autorepeat_initial_timeout_set(Eo *obj, Elm_Button_Data *sd, double t)
+_efl_ui_button_efl_ui_autorepeat_autorepeat_initial_timeout_set(Eo *obj, Efl_Ui_Button_Data *sd, double t)
 {
    if (!_AR_CAPABLE(obj))
      {
@@ -388,7 +388,7 @@ _elm_button_efl_ui_autorepeat_autorepeat_initial_timeout_set(Eo *obj, Elm_Button
 }
 
 EOLIAN static double
-_elm_button_efl_ui_autorepeat_autorepeat_initial_timeout_get(Eo *obj, Elm_Button_Data *sd)
+_efl_ui_button_efl_ui_autorepeat_autorepeat_initial_timeout_get(Eo *obj, Efl_Ui_Button_Data *sd)
 {
    if (!_AR_CAPABLE(obj))
       return 0.0;
@@ -397,7 +397,7 @@ _elm_button_efl_ui_autorepeat_autorepeat_initial_timeout_get(Eo *obj, Elm_Button
 }
 
 EOLIAN static void
-_elm_button_efl_ui_autorepeat_autorepeat_gap_timeout_set(Eo *obj, Elm_Button_Data *sd, double t)
+_efl_ui_button_efl_ui_autorepeat_autorepeat_gap_timeout_set(Eo *obj, Efl_Ui_Button_Data *sd, double t)
 {
    if (!_AR_CAPABLE(obj))
      {
@@ -412,25 +412,25 @@ _elm_button_efl_ui_autorepeat_autorepeat_gap_timeout_set(Eo *obj, Elm_Button_Dat
 }
 
 EOLIAN static double
-_elm_button_efl_ui_autorepeat_autorepeat_gap_timeout_get(Eo *obj EINA_UNUSED, Elm_Button_Data *sd)
+_efl_ui_button_efl_ui_autorepeat_autorepeat_gap_timeout_get(Eo *obj EINA_UNUSED, Efl_Ui_Button_Data *sd)
 {
    return sd->ar_gap_timeout;
 }
 
 EOLIAN static Eina_Bool
-_elm_button_elm_widget_focus_next_manager_is(Eo *obj EINA_UNUSED, Elm_Button_Data *_pd EINA_UNUSED)
+_efl_ui_button_elm_widget_focus_next_manager_is(Eo *obj EINA_UNUSED, Efl_Ui_Button_Data *_pd EINA_UNUSED)
 {
    return EINA_FALSE;
 }
 
 EOLIAN static Eina_Bool
-_elm_button_elm_widget_focus_direction_manager_is(Eo *obj EINA_UNUSED, Elm_Button_Data *_pd EINA_UNUSED)
+_efl_ui_button_elm_widget_focus_direction_manager_is(Eo *obj EINA_UNUSED, Efl_Ui_Button_Data *_pd EINA_UNUSED)
 {
    return EINA_FALSE;
 }
 
 EOLIAN const Elm_Atspi_Action *
-_elm_button_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Button_Data *pd EINA_UNUSED)
+_efl_ui_button_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Efl_Ui_Button_Data *pd EINA_UNUSED)
 {
    static Elm_Atspi_Action atspi_actions[] = {
           { "activate", "activate", NULL, _key_action_activate },
@@ -440,18 +440,18 @@ _elm_button_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUSE
 }
 
 static void
-_elm_button_class_constructor(Efl_Class *klass)
+_efl_ui_button_class_constructor(Efl_Class *klass)
 {
    evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
 }
 
-EFL_TEXT_DEFAULT_IMPLEMENT(elm_button, Elm_Button_Data)
+EFL_TEXT_DEFAULT_IMPLEMENT(efl_ui_button, Efl_Ui_Button_Data)
 
 /* Efl.Part begin */
 
-ELM_PART_OVERRIDE(elm_button, ELM_BUTTON, ELM_LAYOUT, Elm_Button_Data, Elm_Part_Data)
-ELM_PART_OVERRIDE_CONTENT_SET(elm_button, ELM_BUTTON, ELM_LAYOUT, Elm_Button_Data, Elm_Part_Data)
-#include "elm_button_internal_part.eo.c"
+ELM_PART_OVERRIDE(efl_ui_button, EFL_UI_BUTTON, ELM_LAYOUT, Efl_Ui_Button_Data, Elm_Part_Data)
+ELM_PART_OVERRIDE_CONTENT_SET(efl_ui_button, EFL_UI_BUTTON, ELM_LAYOUT, Efl_Ui_Button_Data, Elm_Part_Data)
+#include "efl_ui_button_internal_part.eo.c"
 
 /* Efl.Part end */
 
@@ -493,7 +493,7 @@ elm_button_autorepeat_get(const Evas_Object *obj)
 
 /* Internal EO APIs and hidden overrides */
 
-#define ELM_BUTTON_EXTRA_OPS \
-   EFL_CANVAS_GROUP_ADD_OPS(elm_button)
+#define EFL_UI_BUTTON_EXTRA_OPS \
+   EFL_CANVAS_GROUP_ADD_OPS(efl_ui_button)
 
-#include "elm_button.eo.c"
+#include "efl_ui_button.eo.c"
diff --git a/src/lib/elementary/elm_button.eo b/src/lib/elementary/efl_ui_button.eo
index 9489e6cc21..cdde5ceb4b 100644
--- a/src/lib/elementary/elm_button.eo
+++ b/src/lib/elementary/efl_ui_button.eo
@@ -1,4 +1,4 @@
-class Elm.Button (Elm.Layout, Efl.Ui.Clickable, Efl.Ui.Autorepeat, Efl.Text,
+class Efl.Ui.Button (Elm.Layout, Efl.Ui.Clickable, Efl.Ui.Autorepeat, Efl.Text,
                   Elm.Interface.Atspi_Widget_Action)
 {
    [[Push-button widget
@@ -7,7 +7,6 @@ class Elm.Button (Elm.Layout, Efl.Ui.Clickable, Efl.Ui.Autorepeat, Efl.Text,
    and it also has an autorepeat feature.
    ]]
    legacy_prefix: elm_button;
-   eo_prefix: elm_obj_button;
    methods {
    }
    implements {
diff --git a/src/lib/elementary/efl_ui_button_eo.h b/src/lib/elementary/efl_ui_button_eo.h
new file mode 100644
index 0000000000..5ef3a00d10
--- /dev/null
+++ b/src/lib/elementary/efl_ui_button_eo.h
@@ -0,0 +1 @@
+#include "efl_ui_button.eo.h"
\ No newline at end of file
diff --git a/src/lib/elementary/elm_button_internal_part.eo b/src/lib/elementary/efl_ui_button_internal_part.eo
index 7d7c5bb51f..fde79c863d 100644
--- a/src/lib/elementary/elm_button_internal_part.eo
+++ b/src/lib/elementary/efl_ui_button_internal_part.eo
@@ -1,4 +1,4 @@
-class Elm.Button.Internal.Part (Elm.Layout.Internal.Part)
+class Efl.Ui.Button.Internal.Part (Elm.Layout.Internal.Part)
 {
    [[Elementary button internal part class]]
    data: null;
diff --git a/src/lib/elementary/elm_widget_button.h b/src/lib/elementary/efl_ui_button_private.h
index d227d5eb9b..49bfcdbae4 100644
--- a/src/lib/elementary/elm_widget_button.h
+++ b/src/lib/elementary/efl_ui_button_private.h
@@ -1,5 +1,5 @@
-#ifndef ELM_WIDGET_BUTTON_H
-#define ELM_WIDGET_BUTTON_H
+#ifndef EFL_UI_BUTTON_PRIVATE_H
+#define EFL_UI_BUTTON_PRIVATE_H
 
 #include "Elementary.h"
 
@@ -24,7 +24,7 @@
 /**
  * Base widget smart data extended with button instance data.
  */
-typedef struct _Elm_Button_Data
+typedef struct _Efl_Ui_button_Data
 {
    /* auto-repeat stuff */
    double                ar_initial_timeout; /**< Time to wait until first auto-repeated click is generated */
@@ -34,14 +34,14 @@ typedef struct _Elm_Button_Data
 
    Eina_Bool             autorepeat : 1; /**< Whether auto-repetition of clicks is enabled or not (bound to _Elm_Button_Smart_Class::admits_autorepeat) */
    Eina_Bool             repeating : 1; /**< Whether auto-repetition is going on */
-} Elm_Button_Data;
+} Efl_Ui_Button_Data;
 
 /**
  * @}
  */
 
 #define ELM_BUTTON_DATA_GET(o, sd) \
-  Elm_Button_Data * sd = efl_data_scope_get(o, ELM_BUTTON_CLASS)
+  Efl_Ui_Button_Data * sd = efl_data_scope_get(o, EFL_UI_BUTTON_CLASS)
 
 #define ELM_BUTTON_DATA_GET_OR_RETURN(o, ptr)        \
   ELM_BUTTON_DATA_GET(o, ptr);                       \
@@ -62,7 +62,7 @@ typedef struct _Elm_Button_Data
     }
 
 #define ELM_BUTTON_CHECK(obj)                              \
-  if (EINA_UNLIKELY(!efl_isa((obj), ELM_BUTTON_CLASS))) \
+  if (EINA_UNLIKELY(!efl_isa((obj), EFL_UI_BUTTON_CLASS))) \
     return
 
 #endif
diff --git a/src/lib/elementary/efl_ui_nstate.c b/src/lib/elementary/efl_ui_nstate.c
index 271a4b1c35..fc5a56fb70 100644
--- a/src/lib/elementary/efl_ui_nstate.c
+++ b/src/lib/elementary/efl_ui_nstate.c
@@ -6,7 +6,7 @@
 #include "Elementary.h"
 #include "elm_priv.h"
 #include "efl_ui_nstate.eo.h"
-#include "elm_widget_button.h"
+#include "efl_ui_button_private.h"
 
 #define MY_CLASS EFL_UI_NSTATE_CLASS
 #define MY_CLASS_NAME "Efl.Ui.Nstate"
diff --git a/src/lib/elementary/efl_ui_nstate.eo b/src/lib/elementary/efl_ui_nstate.eo
index a3546f6536..7f8bb978f6 100644
--- a/src/lib/elementary/efl_ui_nstate.eo
+++ b/src/lib/elementary/efl_ui_nstate.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Nstate(Elm.Button)
+class Efl.Ui.Nstate(Efl.Ui.Button)
 {
    [[Efl UI nstate class]]
    methods {
diff --git a/src/lib/elementary/elm_button.h b/src/lib/elementary/elm_button.h
index 0df901ff1b..f8396a730c 100644
--- a/src/lib/elementary/elm_button.h
+++ b/src/lib/elementary/elm_button.h
@@ -68,7 +68,7 @@
  */
 
 #ifdef EFL_EO_API_SUPPORT
-#include "elm_button_eo.h"
+#include "efl_ui_button_eo.h"
 #endif
 #ifndef EFL_NOLEGACY_API_SUPPORT
 #include "elm_button_legacy.h"
diff --git a/src/lib/elementary/elm_button_eo.h b/src/lib/elementary/elm_button_eo.h
deleted file mode 100644
index c77b179516..0000000000
--- a/src/lib/elementary/elm_button_eo.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "elm_button.eo.h"
\ No newline at end of file
diff --git a/src/lib/elementary/elm_button_legacy.h b/src/lib/elementary/elm_button_legacy.h
index ee7fe79eaf..05760f82db 100644
--- a/src/lib/elementary/elm_button_legacy.h
+++ b/src/lib/elementary/elm_button_legacy.h
@@ -108,4 +108,4 @@ EAPI void                        elm_button_autorepeat_set(Evas_Object *obj, Ein
  */
 EAPI Eina_Bool                   elm_button_autorepeat_get(const Evas_Object *obj);
 
-#include "elm_button.eo.legacy.h"
+#include "efl_ui_button.eo.legacy.h"
diff --git a/src/lib/elementary/elm_combobox.eo b/src/lib/elementary/elm_combobox.eo
index def7430efe..d4633a11d5 100644
--- a/src/lib/elementary/elm_combobox.eo
+++ b/src/lib/elementary/elm_combobox.eo
@@ -1,4 +1,4 @@
-class Elm.Combobox (Elm.Button, Efl.Ui.Selectable,
+class Elm.Combobox (Efl.Ui.Button, Efl.Ui.Selectable,
                     Elm.Interface.Atspi_Widget_Action,
                     Elm.Entry, Elm.Genlist, Elm.Hover)
 {
diff --git a/src/lib/elementary/elm_fileselector_button.eo b/src/lib/elementary/elm_fileselector_button.eo
index 977e39110e..5cfcb544bc 100644
--- a/src/lib/elementary/elm_fileselector_button.eo
+++ b/src/lib/elementary/elm_fileselector_button.eo
@@ -1,4 +1,4 @@
-class Elm.Fileselector_Button (Elm.Button, Elm.Interface.Fileselector)
+class Elm.Fileselector_Button (Efl.Ui.Button, Elm.Interface.Fileselector)
 {
    [[Elementary fileselector button class]]
    event_prefix: elm_fileselector_button;
diff --git a/src/lib/elementary/elm_hoversel.eo b/src/lib/elementary/elm_hoversel.eo
index 4b5204f85d..fcdd6cfa57 100644
--- a/src/lib/elementary/elm_hoversel.eo
+++ b/src/lib/elementary/elm_hoversel.eo
@@ -1,6 +1,6 @@
 import elm_general;
 
-class Elm.Hoversel (Elm.Button, Efl.Ui.Selectable,
+class Elm.Hoversel (Efl.Ui.Button, Efl.Ui.Selectable,
                     Efl.Ui.Clickable,
                     Elm.Interface.Atspi_Widget_Action)
 {
diff --git a/src/lib/elementary/elm_part_helper.h b/src/lib/elementary/elm_part_helper.h
index 017365ad7b..36c7888406 100644
--- a/src/lib/elementary/elm_part_helper.h
+++ b/src/lib/elementary/elm_part_helper.h
@@ -133,7 +133,7 @@ _ ## type ## _efl_text_text_set(Eo *obj, Type *pd EINA_UNUSED, const char *text)
 } \
 \
 EOLIAN static const char * \
-_ ## type ## _efl_text_text_get(Eo *obj, Elm_Button_Data *pd EINA_UNUSED) \
+_ ## type ## _efl_text_text_get(Eo *obj, Efl_Ui_Button_Data *pd EINA_UNUSED) \
 { \
    return elm_layout_text_get(obj, NULL); \
 }
diff --git a/src/tests/elementary/elm_test_layout.c b/src/tests/elementary/elm_test_layout.c
index 725ab602c4..87004b52f8 100644
--- a/src/tests/elementary/elm_test_layout.c
+++ b/src/tests/elementary/elm_test_layout.c
@@ -37,7 +37,7 @@ START_TEST(elm_layout_swallows)
    elm_layout_file_set(ly, buf, "layout");
    evas_object_show(ly);
 
-   bt = efl_add(ELM_BUTTON_CLASS, ly);
+   bt = efl_add(EFL_UI_BUTTON_CLASS, ly);
    fail_if(!efl_content_set(efl_part(ly, "element1"), bt));
    ck_assert_ptr_eq(efl_parent_get(bt), ly);
 
@@ -47,7 +47,7 @@ START_TEST(elm_layout_swallows)
    fail_if(!efl_content_set(efl_part(ly, "element1"), bt));
    ck_assert_ptr_eq(efl_parent_get(bt), ly);
 
-   bt2 = efl_add(ELM_BUTTON_CLASS, ly);
+   bt2 = efl_add(EFL_UI_BUTTON_CLASS, ly);
    fail_if(!efl_content_set(efl_part(ly, "element1"), bt2));
    ck_assert_ptr_eq(efl_parent_get(bt2), ly);
    /* bt is deleted at this point. */