diff --git a/src/bin/elementary/test_win_dialog.c b/src/bin/elementary/test_win_dialog.c
index b0a061660c..5429ba09df 100644
--- a/src/bin/elementary/test_win_dialog.c
+++ b/src/bin/elementary/test_win_dialog.c
@@ -83,7 +83,7 @@ _bt3_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_
 
    //lb = efl_add(EFL_UI_TEXT_CLASS, dia);,
    lb = elm_label_add(dia);
-   efl_event_callback_add(dia, EFL_GFX_ENTITY_EVENT_CHANGE_SIZE_HINTS, _size_update, lb);
+   efl_event_callback_add(dia, EFL_GFX_ENTITY_EVENT_HINTS_CHANGED, _size_update, lb);
    efl_event_callback_add(dia, EFL_GFX_ENTITY_EVENT_RESIZE, _size_update, lb);
    elm_object_text_set(lb, "This is a Dialog Window");
    efl_gfx_hint_weight_set(lb, 1.0, 1.0);
@@ -110,7 +110,7 @@ _bt4_clicked_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *even
 
    //lb = efl_add(EFL_UI_TEXT_CLASS, dia);,
    lb = elm_label_add(dia);
-   efl_event_callback_add(dia, EFL_GFX_ENTITY_EVENT_CHANGE_SIZE_HINTS, _size_update, lb);
+   efl_event_callback_add(dia, EFL_GFX_ENTITY_EVENT_HINTS_CHANGED, _size_update, lb);
    efl_event_callback_add(dia, EFL_GFX_ENTITY_EVENT_RESIZE, _size_update, lb);
    elm_object_text_set(lb, "This is a Centered Dialog Window");
    efl_gfx_hint_weight_set(lb, 1.0, 1.0);
diff --git a/src/lib/efl/interfaces/efl_gfx_hint.eo b/src/lib/efl/interfaces/efl_gfx_hint.eo
index 2cbcf87676..72ab35ebb3 100644
--- a/src/lib/efl/interfaces/efl_gfx_hint.eo
+++ b/src/lib/efl/interfaces/efl_gfx_hint.eo
@@ -217,6 +217,6 @@ interface @beta Efl.Gfx.Hint
       }
    }
    events {
-      change,size,hints: void; [[Object hints changed.]]
+      hints,changed: void; [[Object hints changed.]]
    }
 }
diff --git a/src/lib/elementary/efl_ui_grid.c b/src/lib/elementary/efl_ui_grid.c
index 4fa6d5a2ce..2d927969fa 100644
--- a/src/lib/elementary/efl_ui_grid.c
+++ b/src/lib/elementary/efl_ui_grid.c
@@ -602,7 +602,7 @@ _efl_ui_grid_efl_object_finalize(Eo *obj,
                           _efl_ui_grid_bar_hide_cb, obj);
    efl_event_callback_add(obj, EFL_GFX_ENTITY_EVENT_RESIZE,
                           _efl_ui_grid_resized_cb, obj);
-   efl_event_callback_add(obj, EFL_GFX_ENTITY_EVENT_CHANGE_SIZE_HINTS,
+   efl_event_callback_add(obj, EFL_GFX_ENTITY_EVENT_HINTS_CHANGED,
                           _efl_ui_grid_size_hint_changed_cb, obj);
    efl_event_callback_add(pd->pan, EFL_GFX_ENTITY_EVENT_RESIZE,
                           _efl_ui_grid_pan_resized_cb, obj);
@@ -630,7 +630,7 @@ _efl_ui_grid_efl_object_invalidate(Eo *obj, Efl_Ui_Grid_Data *pd)
                           _efl_ui_grid_bar_hide_cb, obj);
    efl_event_callback_del(obj, EFL_GFX_ENTITY_EVENT_RESIZE,
                           _efl_ui_grid_resized_cb, obj);
-   efl_event_callback_del(obj, EFL_GFX_ENTITY_EVENT_CHANGE_SIZE_HINTS,
+   efl_event_callback_del(obj, EFL_GFX_ENTITY_EVENT_HINTS_CHANGED,
                           _efl_ui_grid_size_hint_changed_cb, obj);
    efl_event_callback_del(pd->pan, EFL_GFX_ENTITY_EVENT_RESIZE,
                           _efl_ui_grid_pan_resized_cb, obj);
diff --git a/src/lib/elementary/efl_ui_image.c b/src/lib/elementary/efl_ui_image.c
index a49e7c3141..90ec82003f 100644
--- a/src/lib/elementary/efl_ui_image.c
+++ b/src/lib/elementary/efl_ui_image.c
@@ -594,7 +594,7 @@ EOLIAN static void
 _efl_ui_image_efl_canvas_group_group_del(Eo *obj, Efl_Ui_Image_Data *sd)
 {
    if (elm_widget_is_legacy(obj))
-     efl_event_callback_del(obj, EFL_GFX_ENTITY_EVENT_CHANGE_SIZE_HINTS,
+     efl_event_callback_del(obj, EFL_GFX_ENTITY_EVENT_HINTS_CHANGED,
                             _on_size_hints_changed, sd);
    ecore_job_del(sd->sizing_job);
    ecore_timer_del(sd->anim_timer);
@@ -2312,7 +2312,7 @@ elm_image_add(Evas_Object *parent)
    Evas_Object *obj = elm_legacy_add(EFL_UI_IMAGE_LEGACY_CLASS, parent);
    EFL_UI_IMAGE_DATA_GET(obj, priv);
 
-   efl_event_callback_add(obj, EFL_GFX_ENTITY_EVENT_CHANGE_SIZE_HINTS, _on_size_hints_changed, priv);
+   efl_event_callback_add(obj, EFL_GFX_ENTITY_EVENT_HINTS_CHANGED, _on_size_hints_changed, priv);
 
    return obj;
 }
diff --git a/src/lib/elementary/efl_ui_list.c b/src/lib/elementary/efl_ui_list.c
index 5511106c65..bc364505f3 100644
--- a/src/lib/elementary/efl_ui_list.c
+++ b/src/lib/elementary/efl_ui_list.c
@@ -458,7 +458,7 @@ _efl_ui_list_efl_object_finalize(Eo *obj,
                           _efl_ui_list_bar_hide_cb, obj);
    efl_event_callback_add(obj, EFL_GFX_ENTITY_EVENT_RESIZE,
                           _efl_ui_list_resized_cb, obj);
-   efl_event_callback_add(obj, EFL_GFX_ENTITY_EVENT_CHANGE_SIZE_HINTS,
+   efl_event_callback_add(obj, EFL_GFX_ENTITY_EVENT_HINTS_CHANGED,
                           _efl_ui_list_size_hint_changed_cb, obj);
    efl_event_callback_add(pd->pan, EFL_GFX_ENTITY_EVENT_RESIZE,
                           _efl_ui_list_pan_resized_cb, obj);
@@ -483,7 +483,7 @@ _efl_ui_list_efl_object_destructor(Eo *obj, Efl_Ui_List_Data *pd)
                           _efl_ui_list_bar_hide_cb, obj);
    efl_event_callback_del(obj, EFL_GFX_ENTITY_EVENT_RESIZE,
                           _efl_ui_list_resized_cb, obj);
-   efl_event_callback_del(obj, EFL_GFX_ENTITY_EVENT_CHANGE_SIZE_HINTS,
+   efl_event_callback_del(obj, EFL_GFX_ENTITY_EVENT_HINTS_CHANGED,
                           _efl_ui_list_size_hint_changed_cb, obj);
    efl_event_callback_del(pd->pan, EFL_GFX_ENTITY_EVENT_RESIZE,
                           _efl_ui_list_pan_resized_cb, obj);
diff --git a/src/lib/elementary/efl_ui_scroller.c b/src/lib/elementary/efl_ui_scroller.c
index af9228c6c0..d3a1f91e02 100644
--- a/src/lib/elementary/efl_ui_scroller.c
+++ b/src/lib/elementary/efl_ui_scroller.c
@@ -446,7 +446,7 @@ _efl_ui_scroller_efl_object_finalize(Eo *obj,
                           _efl_ui_scroller_bar_hide_cb, obj);
    efl_event_callback_add(obj, EFL_GFX_ENTITY_EVENT_RESIZE,
                           _efl_ui_scroller_resized_cb, obj);
-   efl_event_callback_add(obj, EFL_GFX_ENTITY_EVENT_CHANGE_SIZE_HINTS,
+   efl_event_callback_add(obj, EFL_GFX_ENTITY_EVENT_HINTS_CHANGED,
                           _efl_ui_scroller_size_hint_changed_cb, obj);
    efl_event_callback_add(sd->pan_obj, EFL_GFX_ENTITY_EVENT_RESIZE,
                           _efl_ui_scroller_pan_resized_cb, obj);
@@ -470,7 +470,7 @@ _efl_ui_scroller_efl_object_destructor(Eo *obj,
                           _efl_ui_scroller_bar_hide_cb, obj);
    efl_event_callback_del(obj, EFL_GFX_ENTITY_EVENT_RESIZE,
                           _efl_ui_scroller_resized_cb, obj);
-   efl_event_callback_del(obj, EFL_GFX_ENTITY_EVENT_CHANGE_SIZE_HINTS,
+   efl_event_callback_del(obj, EFL_GFX_ENTITY_EVENT_HINTS_CHANGED,
                           _efl_ui_scroller_size_hint_changed_cb, obj);
    efl_event_callback_del(sd->pan_obj, EFL_GFX_ENTITY_EVENT_RESIZE,
                           _efl_ui_scroller_pan_resized_cb, obj);
diff --git a/src/lib/evas/canvas/evas_callbacks.c b/src/lib/evas/canvas/evas_callbacks.c
index 25894bbd7a..710bedda5e 100644
--- a/src/lib/evas/canvas/evas_callbacks.c
+++ b/src/lib/evas/canvas/evas_callbacks.c
@@ -55,7 +55,7 @@ DEFINE_EVAS_CALLBACKS(_legacy_evas_callback_table, EVAS_CALLBACK_LAST,
                       EFL_GFX_ENTITY_EVENT_STACK_CHANGED,
                       EVAS_OBJECT_EVENT_DEL,
                       EFL_EVENT_HOLD,
-                      EFL_GFX_ENTITY_EVENT_CHANGE_SIZE_HINTS,
+                      EFL_GFX_ENTITY_EVENT_HINTS_CHANGED,
                       EFL_GFX_IMAGE_EVENT_PRELOAD,
                       EFL_CANVAS_SCENE_EVENT_FOCUS_IN,
                       EFL_CANVAS_SCENE_EVENT_FOCUS_OUT,
diff --git a/src/lib/evas/canvas/evas_object_box.c b/src/lib/evas/canvas/evas_object_box.c
index 49647136f0..1e71c250bd 100644
--- a/src/lib/evas/canvas/evas_object_box.c
+++ b/src/lib/evas/canvas/evas_object_box.c
@@ -166,7 +166,7 @@ _evas_object_box_option_new(Evas_Object *o, Evas_Object_Box_Data *priv EINA_UNUS
 EFL_CALLBACKS_ARRAY_DEFINE(evas_object_box_callbacks,
   { EFL_GFX_ENTITY_EVENT_RESIZE, _on_child_resize },
   { EFL_EVENT_INVALIDATE, _on_child_invalidate },
-  { EFL_GFX_ENTITY_EVENT_CHANGE_SIZE_HINTS, _on_child_hints_changed }
+  { EFL_GFX_ENTITY_EVENT_HINTS_CHANGED, _on_child_hints_changed }
 );
 
 static void
diff --git a/src/lib/evas/canvas/evas_object_inform.c b/src/lib/evas/canvas/evas_object_inform.c
index 3eb729f50e..12433f7487 100644
--- a/src/lib/evas/canvas/evas_object_inform.c
+++ b/src/lib/evas/canvas/evas_object_inform.c
@@ -55,7 +55,7 @@ evas_object_inform_call_changed_size_hints(Evas_Object *eo_obj, Evas_Object_Prot
 {
    int event_id = _evas_object_event_new();
 
-   evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_CHANGED_SIZE_HINTS, NULL, event_id, EFL_GFX_ENTITY_EVENT_CHANGE_SIZE_HINTS);
+   evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_CHANGED_SIZE_HINTS, NULL, event_id, EFL_GFX_ENTITY_EVENT_HINTS_CHANGED);
    _evas_post_event_callback_call(obj->layer->evas->evas, obj->layer->evas, event_id);
 }
 
diff --git a/src/lib/evas/canvas/evas_object_table.c b/src/lib/evas/canvas/evas_object_table.c
index 1e304256bd..4480e33fce 100644
--- a/src/lib/evas/canvas/evas_object_table.c
+++ b/src/lib/evas/canvas/evas_object_table.c
@@ -266,7 +266,7 @@ _on_child_hints_changed(void *data, const Efl_Event *event EINA_UNUSED)
 
 EFL_CALLBACKS_ARRAY_DEFINE(evas_object_table_callbacks,
   { EFL_EVENT_INVALIDATE, _on_child_invalidate },
-  { EFL_GFX_ENTITY_EVENT_CHANGE_SIZE_HINTS, _on_child_hints_changed }
+  { EFL_GFX_ENTITY_EVENT_HINTS_CHANGED, _on_child_hints_changed }
 );
 
 static void