efl theme: Replace legacy signal names with efl ui signal names

Replace legacy signal/source names with efl ui signal/source names.
e.g. From "elm,state,content,set" "elm" to "efl,state,content,set" "efl"

22 files changed, 833 insertions, 323 deletions

diff --git a/src/lib/elementary/efl_ui_button.c b/src/lib/elementary/efl_ui_button.c
index 1e7dedd..6835d06 100644
--- a/src/lib/elementary/efl_ui_button.c
+++ b/src/lib/elementary/efl_ui_button.c
@@ -87,8 +87,12 @@ _efl_ui_button_efl_ui_widget_on_access_activate(Eo *obj, Efl_Ui_Button_Data *_pd
    if (evas_object_freeze_events_get(obj)) return EINA_FALSE;
 
    efl_event_callback_legacy_call
-     (obj, EFL_UI_EVENT_CLICKED, NULL);
-   elm_layout_signal_emit(obj, "elm,anim,activate", "elm");
+      (obj, EFL_UI_EVENT_CLICKED, NULL);
+
+   if (elm_widget_is_legacy(obj))
+     elm_layout_signal_emit(obj, "elm,anim,activate", "elm");
+   else
+     elm_layout_signal_emit(obj, "efl,anim,activate", "efl");
 
    return EINA_TRUE;
 }
@@ -96,7 +100,10 @@ _efl_ui_button_efl_ui_widget_on_access_activate(Eo *obj, Efl_Ui_Button_Data *_pd
 static Eina_Bool
 _key_action_activate(Evas_Object *obj, const char *params EINA_UNUSED)
 {
-   elm_layout_signal_emit(obj, "elm,anim,activate", "elm");
+   if (elm_widget_is_legacy(obj))
+     elm_layout_signal_emit(obj, "elm,anim,activate", "elm");
+   else
+     elm_layout_signal_emit(obj, "efl,anim,activate", "efl");
    _activate(obj);
    return EINA_TRUE;
 }
@@ -204,15 +211,30 @@ _efl_ui_button_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Button_Data *_pd EINA_
    efl_canvas_group_add(efl_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
-   edje_object_signal_callback_add
-     (wd->resize_obj, "elm,action,click", "*",
-     _on_clicked_signal, obj);
-   edje_object_signal_callback_add
-     (wd->resize_obj, "elm,action,press", "*",
-     _on_pressed_signal, obj);
-   edje_object_signal_callback_add
-     (wd->resize_obj, "elm,action,unpress", "*",
-     _on_unpressed_signal, obj);
+   if (elm_widget_is_legacy(obj))
+     {
+        edje_object_signal_callback_add
+           (wd->resize_obj, "elm,action,click", "*",
+            _on_clicked_signal, obj);
+        edje_object_signal_callback_add
+           (wd->resize_obj, "elm,action,press", "*",
+            _on_pressed_signal, obj);
+        edje_object_signal_callback_add
+           (wd->resize_obj, "elm,action,unpress", "*",
+            _on_unpressed_signal, obj);
+     }
+   else
+     {
+        edje_object_signal_callback_add
+           (wd->resize_obj, "efl,action,click", "*",
+            _on_clicked_signal, obj);
+        edje_object_signal_callback_add
+           (wd->resize_obj, "efl,action,press", "*",
+            _on_pressed_signal, obj);
+        edje_object_signal_callback_add
+           (wd->resize_obj, "efl,action,unpress", "*",
+            _on_unpressed_signal, obj);
+     }
 
    _elm_access_object_register(obj, wd->resize_obj);
    _elm_access_text_set
diff --git a/src/lib/elementary/efl_ui_calendar.c b/src/lib/elementary/efl_ui_calendar.c
index b55d1c6..02bb517 100644
--- a/src/lib/elementary/efl_ui_calendar.c
+++ b/src/lib/elementary/efl_ui_calendar.c
@@ -112,7 +112,7 @@ _unselect(Evas_Object *obj,
    char emission[32];
 
    snprintf(emission, sizeof(emission), "cit_%d,unselected", selected);
-   elm_layout_signal_emit(obj, emission, "elm");
+   elm_layout_signal_emit(obj, emission, "efl");
 }
 
 static inline void
@@ -125,7 +125,7 @@ _select(Evas_Object *obj,
 
    sd->focused_it = sd->selected_it = selected;
    snprintf(emission, sizeof(emission), "cit_%d,selected", selected);
-   elm_layout_signal_emit(obj, emission, "elm");
+   elm_layout_signal_emit(obj, emission, "efl");
 }
 
 static inline void
@@ -134,7 +134,7 @@ _not_today(Efl_Ui_Calendar_Data *sd)
    char emission[32];
 
    snprintf(emission, sizeof(emission), "cit_%d,not_today", sd->today_it);
-   elm_layout_signal_emit(sd->obj, emission, "elm");
+   elm_layout_signal_emit(sd->obj, emission, "efl");
    sd->today_it = -1;
 }
 
@@ -145,7 +145,7 @@ _today(Efl_Ui_Calendar_Data *sd,
    char emission[32];
 
    snprintf(emission, sizeof(emission), "cit_%d,today", it);
-   elm_layout_signal_emit(sd->obj, emission, "elm");
+   elm_layout_signal_emit(sd->obj, emission, "efl");
    sd->today_it = it;
 }
 
@@ -156,7 +156,7 @@ _enable(Efl_Ui_Calendar_Data *sd,
    char emission[32];
 
    snprintf(emission, sizeof(emission), "cit_%d,enable", it);
-   elm_layout_signal_emit(sd->obj, emission, "elm");
+   elm_layout_signal_emit(sd->obj, emission, "efl");
 }
 
 static inline void
@@ -166,7 +166,7 @@ _disable(Efl_Ui_Calendar_Data *sd,
    char emission[32];
 
    snprintf(emission, sizeof(emission), "cit_%d,disable", it);
-   elm_layout_signal_emit(sd->obj, emission, "elm");
+   elm_layout_signal_emit(sd->obj, emission, "efl");
 }
 
 static void
@@ -759,7 +759,7 @@ _update_unfocused_it(Evas_Object *obj, int unfocused_it)
    sd->focused_it = -1;
 
    snprintf(emission, sizeof(emission), "cit_%d,unfocused", unfocused_it);
-   elm_layout_signal_emit(obj, emission, "elm");
+   elm_layout_signal_emit(obj, emission, "efl");
 }
 
 static Eina_Bool
@@ -775,12 +775,12 @@ _update_focused_it(Evas_Object *obj, int focused_it)
      return EINA_FALSE;
 
    snprintf(emission, sizeof(emission), "cit_%d,unfocused", sd->focused_it);
-   elm_layout_signal_emit(obj, emission, "elm");
+   elm_layout_signal_emit(obj, emission, "efl");
 
    sd->focused_it = focused_it;
 
    snprintf(emission, sizeof(emission), "cit_%d,focused", sd->focused_it);
-   elm_layout_signal_emit(obj, emission, "elm");
+   elm_layout_signal_emit(obj, emission, "efl");
 
    return EINA_TRUE;
 }
@@ -986,7 +986,7 @@ _efl_ui_calendar_constructor_internal(Eo *obj, Efl_Ui_Calendar_Data *priv)
    priv->format_cb = NULL;
 
    edje_object_signal_callback_add
-     (wd->resize_obj, "elm,action,selected", "*",
+     (wd->resize_obj, "efl,action,selected", "*",
      _day_selected, obj);
 
    current_date = time(NULL);
diff --git a/src/lib/elementary/efl_ui_check.c b/src/lib/elementary/efl_ui_check.c
index 6c781cf..4c55b69 100644
--- a/src/lib/elementary/efl_ui_check.c
+++ b/src/lib/elementary/efl_ui_check.c
@@ -60,8 +60,17 @@ _activate(Evas_Object *obj)
         // so that we can distinguish between state change by user or state change
         // by calling state_change() api. Keep both the signal for backward compatibility
         // and remove "elm,state,check,on" signal emission when we can break ABI.
-        elm_layout_signal_emit(obj, "elm,activate,check,on", "elm");
-        elm_layout_signal_emit(obj, "elm,state,check,on", "elm");
+        if (elm_widget_is_legacy(obj))
+          {
+             elm_layout_signal_emit(obj, "elm,activate,check,on", "elm");
+             elm_layout_signal_emit(obj, "elm,state,check,on", "elm");
+          }
+        else
+          {
+             elm_layout_signal_emit(obj, "efl,activate,check,on", "efl");
+             elm_layout_signal_emit(obj, "efl,state,check,on", "efl");
+          }
+
         if (_elm_config->access_mode != ELM_ACCESS_MODE_OFF)
              _elm_access_say(E_("State: On"));
      }
@@ -71,8 +80,17 @@ _activate(Evas_Object *obj)
         // so that we can distinguish between state change by user or state change
         // by calling state_change() api. Keep both the signal for backward compatibility
         // and remove "elm,state,check,off" signal emission when we can break ABI.
-        elm_layout_signal_emit(obj, "elm,activate,check,off", "elm");
-        elm_layout_signal_emit(obj, "elm,state,check,off", "elm");
+        if (elm_widget_is_legacy(obj))
+          {
+             elm_layout_signal_emit(obj, "elm,activate,check,off", "elm");
+             elm_layout_signal_emit(obj, "elm,state,check,off", "elm");
+          }
+        else
+          {
+             elm_layout_signal_emit(obj, "efl,activate,check,off", "efl");
+             elm_layout_signal_emit(obj, "efl,state,check,off", "efl");
+          }
+
         if (_elm_config->access_mode != ELM_ACCESS_MODE_OFF)
              _elm_access_say(E_("State: Off"));
      }
@@ -127,10 +145,20 @@ _efl_ui_check_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Check_Data *sd EINA_UNUS
 
    if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
 
-   if (efl_ui_nstate_value_get(obj) == 0)
-     elm_layout_signal_emit(obj, "elm,state,check,off", "elm");
+   if (elm_widget_is_legacy(obj))
+     {
+        if (efl_ui_nstate_value_get(obj) == 0)
+          elm_layout_signal_emit(obj, "elm,state,check,off", "elm");
+        else
+          elm_layout_signal_emit(obj, "elm,state,check,on", "elm");
+     }
    else
-     elm_layout_signal_emit(obj, "elm,state,check,on", "elm");
+     {
+        if (efl_ui_nstate_value_get(obj) == 0)
+          elm_layout_signal_emit(obj, "efl,state,check,off", "efl");
+        else
+          elm_layout_signal_emit(obj, "efl,state,check,on", "efl");
+     }
 
    edje_object_message_signal_process(wd->resize_obj);
 
@@ -195,7 +223,12 @@ _on_check_off(void *data,
    EFL_UI_CHECK_DATA_GET(obj, sd);
 
    if (sd->statep) *sd->statep = 0;
-   elm_layout_signal_emit(obj, "elm,state,check,off", "elm");
+
+   if (elm_widget_is_legacy(obj))
+     elm_layout_signal_emit(obj, "elm,state,check,off", "elm");
+   else
+     elm_layout_signal_emit(obj, "efl,state,check,off", "efl");
+
    efl_ui_nstate_value_set(obj, 0);
 
    if (_elm_config->atspi_mode)
@@ -215,7 +248,12 @@ _on_check_on(void *data,
    EFL_UI_CHECK_DATA_GET(obj, sd);
 
    if (sd->statep) *sd->statep = 1;
-   elm_layout_signal_emit(obj, "elm,state,check,on", "elm");
+
+   if (elm_widget_is_legacy(obj))
+     elm_layout_signal_emit(obj, "elm,state,check,on", "elm");
+   else
+     elm_layout_signal_emit(obj, "efl,state,check,on", "efl");
+
    efl_ui_nstate_value_set(obj, 1);
 
    if (_elm_config->atspi_mode)
@@ -246,10 +284,20 @@ _efl_ui_check_selected_set(Eo *obj, Efl_Ui_Check_Data *sd, Eina_Bool value)
 
    if (sd->statep) *sd->statep = value;
 
-   if (value == 1)
-     elm_layout_signal_emit(obj, "elm,state,check,on", "elm");
+   if (elm_widget_is_legacy(obj))
+     {
+        if (value == 1)
+          elm_layout_signal_emit(obj, "elm,state,check,on", "elm");
+        else
+          elm_layout_signal_emit(obj, "elm,state,check,off", "elm");
+     }
    else
-     elm_layout_signal_emit(obj, "elm,state,check,off", "elm");
+     {
+        if (value == 1)
+          elm_layout_signal_emit(obj, "efl,state,check,on", "efl");
+        else
+          elm_layout_signal_emit(obj, "efl,state,check,off", "efl");
+     }
 
    edje_object_message_signal_process(wd->resize_obj);
 
@@ -280,12 +328,25 @@ _efl_ui_check_efl_object_constructor(Eo *obj, Efl_Ui_Check_Data *pd EINA_UNUSED)
    evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
 
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL);
-   efl_layout_signal_callback_add
-     (wd->resize_obj, "elm,action,check,on", "*", _on_check_on, obj);
-   efl_layout_signal_callback_add
-     (wd->resize_obj, "elm,action,check,off", "*", _on_check_off, obj);
-   efl_layout_signal_callback_add
-     (wd->resize_obj, "elm,action,check,toggle", "*", _on_check_toggle, obj);
+
+   if (elm_widget_is_legacy(obj))
+     {
+        efl_layout_signal_callback_add
+           (wd->resize_obj, "elm,action,check,on", "*", _on_check_on, obj);
+        efl_layout_signal_callback_add
+           (wd->resize_obj, "elm,action,check,off", "*", _on_check_off, obj);
+        efl_layout_signal_callback_add
+           (wd->resize_obj, "elm,action,check,toggle", "*", _on_check_toggle, obj);
+     }
+   else
+     {
+        efl_layout_signal_callback_add
+           (wd->resize_obj, "efl,action,check,on", "*", _on_check_on, obj);
+        efl_layout_signal_callback_add
+           (wd->resize_obj, "efl,action,check,off", "*", _on_check_off, obj);
+        efl_layout_signal_callback_add
+           (wd->resize_obj, "efl,action,check,toggle", "*", _on_check_toggle, obj);
+     }
 
    efl_access_object_role_set(obj, EFL_ACCESS_ROLE_CHECK_BOX);
    _elm_access_object_register(obj, wd->resize_obj);
@@ -313,10 +374,20 @@ elm_check_state_set(Evas_Object *obj, Eina_Bool state)
         nd->state = state;
         if (sd->statep) *sd->statep = state;
 
-        if (state == 1)
-          elm_layout_signal_emit(obj, "elm,state,check,on", "elm");
+        if (elm_widget_is_legacy(obj))
+          {
+             if (state == 1)
+               elm_layout_signal_emit(obj, "elm,state,check,on", "elm");
+             else
+               elm_layout_signal_emit(obj, "elm,state,check,off", "elm");
+          }
         else
-          elm_layout_signal_emit(obj, "elm,state,check,off", "elm");
+          {
+             if (state == 1)
+               elm_layout_signal_emit(obj, "efl,state,check,on", "efl");
+             else
+               elm_layout_signal_emit(obj, "efl,state,check,off", "efl");
+          }
         edje_object_message_signal_process(wd->resize_obj);
      }
 }
@@ -343,10 +414,21 @@ elm_check_state_pointer_set(Eo *obj, Eina_Bool *statep)
    if (*sd->statep != nd->state)
      {
         nd->state = *sd->statep;
-        if (nd->state == 1)
-          elm_layout_signal_emit(obj, "elm,state,check,on", "elm");
+
+        if (elm_widget_is_legacy(obj))
+          {
+             if (nd->state == 1)
+               elm_layout_signal_emit(obj, "elm,state,check,on", "elm");
+             else
+               elm_layout_signal_emit(obj, "elm,state,check,off", "elm");
+          }
         else
-          elm_layout_signal_emit(obj, "elm,state,check,off", "elm");
+          {
+             if (nd->state == 1)
+               elm_layout_signal_emit(obj, "efl,state,check,on", "efl");
+             else
+               elm_layout_signal_emit(obj, "efl,state,check,off", "efl");
+          }
      }
 }
 
diff --git a/src/lib/elementary/efl_ui_clock.c b/src/lib/elementary/efl_ui_clock.c
index 1b80ab6..95c569a 100644
--- a/src/lib/elementary/efl_ui_clock.c
+++ b/src/lib/elementary/efl_ui_clock.c
@@ -396,13 +396,13 @@ _reload_format(Evas_Object *obj)
           {
              snprintf(buf, sizeof(buf), EDC_PART_FIELD_ENABLE_SIG_STR,
                       field->location);
-             elm_layout_signal_emit(obj, buf, "elm");
+             elm_layout_signal_emit(obj, buf, "efl");
           }
         else
           {
              snprintf(buf, sizeof(buf), EDC_PART_FIELD_DISABLE_SIG_STR,
                       field->location);
-             elm_layout_signal_emit(obj, buf, "elm");
+             elm_layout_signal_emit(obj, buf, "efl");
           }
         if (field->location + 1)
           {
@@ -535,7 +535,7 @@ _efl_ui_clock_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Clock_Data *sd)
           {
              snprintf(buf, sizeof(buf), EDC_PART_FIELD_ENABLE_SIG_STR,
                       field->location);
-             elm_layout_signal_emit(obj, buf, "elm");
+             elm_layout_signal_emit(obj, buf, "efl");
 
              if (field->location)
                {
@@ -549,7 +549,7 @@ _efl_ui_clock_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Clock_Data *sd)
           {
              snprintf(buf, sizeof(buf), EDC_PART_FIELD_DISABLE_SIG_STR,
                       field->location);
-             elm_layout_signal_emit(obj, buf, "elm");
+             elm_layout_signal_emit(obj, buf, "efl");
           }
      }
 
@@ -993,7 +993,7 @@ _efl_ui_clock_field_visible_set(Eo *obj, Efl_Ui_Clock_Data *sd, Efl_Ui_Clock_Typ
 
         snprintf(buf, sizeof(buf), EDC_PART_FIELD_ENABLE_SIG_STR,
                  field->location);
-        elm_layout_signal_emit(obj, buf, "elm");
+        elm_layout_signal_emit(obj, buf, "efl");
 
         ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
         edje_object_message_signal_process(wd->resize_obj);
@@ -1010,7 +1010,7 @@ _efl_ui_clock_field_visible_set(Eo *obj, Efl_Ui_Clock_Data *sd, Efl_Ui_Clock_Typ
 
         snprintf(buf, sizeof(buf), EDC_PART_FIELD_DISABLE_SIG_STR,
                  field->location);
-        elm_layout_signal_emit(obj, buf, "elm");
+        elm_layout_signal_emit(obj, buf, "efl");
 
         ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
         edje_object_message_signal_process(wd->resize_obj);
diff --git a/src/lib/elementary/efl_ui_frame.c b/src/lib/elementary/efl_ui_frame.c
index 6e405f7..69decbe 100644
--- a/src/lib/elementary/efl_ui_frame.c
+++ b/src/lib/elementary/efl_ui_frame.c
@@ -76,7 +76,12 @@ _on_frame_clicked(void *data,
    if (sd->collapsible)
      {
         efl_event_callback_add(wd->resize_obj, EFL_LAYOUT_EVENT_RECALC, _recalc, data);
-        elm_layout_signal_emit(data, "elm,action,toggle", "elm");
+
+        if (elm_widget_is_legacy(data))
+          elm_layout_signal_emit(data, "elm,action,toggle", "elm");
+        else
+          elm_layout_signal_emit(data, "efl,action,toggle", "efl");
+
         sd->collapsed++;
         sd->anim = EINA_TRUE;
         elm_widget_tree_unfocusable_set(data, sd->collapsed);
@@ -109,12 +114,24 @@ _efl_ui_frame_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Frame_Data *_pd EINA_UN
    efl_canvas_group_add(efl_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
-   edje_object_signal_callback_add
-     (wd->resize_obj, "elm,anim,done", "elm",
-     _on_recalc_done, obj);
-   edje_object_signal_callback_add
-     (wd->resize_obj, "elm,action,click", "elm",
-     _on_frame_clicked, obj);
+   if (elm_widget_is_legacy(obj))
+     {
+        edje_object_signal_callback_add
+           (wd->resize_obj, "elm,anim,done", "elm",
+            _on_recalc_done, obj);
+        edje_object_signal_callback_add
+           (wd->resize_obj, "elm,action,click", "elm",
+            _on_frame_clicked, obj);
+     }
+   else
+     {
+        edje_object_signal_callback_add
+           (wd->resize_obj, "efl,anim,done", "efl",
+            _on_recalc_done, obj);
+        edje_object_signal_callback_add
+           (wd->resize_obj, "efl,action,click", "efl",
+            _on_frame_clicked, obj);
+     }
 
    elm_widget_can_focus_set(obj, EINA_FALSE);
 
@@ -158,7 +175,11 @@ _efl_ui_frame_collapse_set(Eo *obj, Efl_Ui_Frame_Data *sd, Eina_Bool collapse)
    collapse = !!collapse;
    if (sd->collapsed == collapse) return;
 
-   elm_layout_signal_emit(obj, "elm,action,switch", "elm");
+   if (elm_widget_is_legacy(obj))
+     elm_layout_signal_emit(obj, "elm,action,switch", "elm");
+   else
+     elm_layout_signal_emit(obj, "efl,action,switch", "efl");
+
    edje_object_message_signal_process(wd->resize_obj);
    sd->collapsed = !!collapse;
    sd->anim = EINA_FALSE;
@@ -175,7 +196,11 @@ _efl_ui_frame_collapse_go(Eo *obj, Efl_Ui_Frame_Data *sd, Eina_Bool collapse)
    collapse = !!collapse;
    if (sd->collapsed == collapse) return;
 
-   elm_layout_signal_emit(obj, "elm,action,toggle", "elm");
+   if (elm_widget_is_legacy(obj))
+     elm_layout_signal_emit(obj, "elm,action,toggle", "elm");
+   else
+     elm_layout_signal_emit(obj, "efl,action,toggle", "efl");
+
    efl_event_callback_legacy_call
      (wd->resize_obj, EFL_LAYOUT_EVENT_RECALC, obj);
    sd->collapsed = collapse;
diff --git a/src/lib/elementary/efl_ui_image_zoomable.c b/src/lib/elementary/efl_ui_image_zoomable.c
index 1dcd87c..d4426aa 100644
--- a/src/lib/elementary/efl_ui_image_zoomable.c
+++ b/src/lib/elementary/efl_ui_image_zoomable.c
@@ -267,9 +267,15 @@ _grid_load(Evas_Object *obj,
                   sd->preload_num++;
                   if (sd->preload_num == 1)
                     {
-                       edje_object_signal_emit
-                         (wd->resize_obj,
-                         "elm,state,busy,start", "elm");
+                       if (elm_widget_is_legacy(obj))
+                         edje_object_signal_emit
+                            (wd->resize_obj,
+                             "elm,state,busy,start", "elm");
+                       else
+                         edje_object_signal_emit
+                            (wd->resize_obj,
+                             "efl,state,busy,start", "efl");
+
                        efl_event_callback_legacy_call
                         (obj, EFL_UI_IMAGE_ZOOMABLE_EVENT_LOAD_DETAIL, NULL);
                     }
@@ -279,9 +285,15 @@ _grid_load(Evas_Object *obj,
                   sd->preload_num--;
                   if (!sd->preload_num)
                     {
-                       edje_object_signal_emit
-                         (wd->resize_obj,
-                         "elm,state,busy,stop", "elm");
+                       if (elm_widget_is_legacy(obj))
+                         edje_object_signal_emit
+                            (wd->resize_obj,
+                             "elm,state,busy,stop", "elm");
+                       else
+                         edje_object_signal_emit
+                            (wd->resize_obj,
+                             "efl,state,busy,stop", "efl");
+
                        efl_event_callback_legacy_call
                         (obj, EFL_UI_IMAGE_ZOOMABLE_EVENT_LOADED_DETAIL, NULL);
                     }
@@ -477,9 +489,15 @@ _grid_clear(Evas_Object *obj,
                   sd->preload_num--;
                   if (!sd->preload_num)
                     {
-                       edje_object_signal_emit
-                         (wd->resize_obj,
-                         "elm,state,busy,stop", "elm");
+                       if (elm_widget_is_legacy(obj))
+                         edje_object_signal_emit
+                            (wd->resize_obj,
+                             "elm,state,busy,stop", "elm");
+                       else
+                         edje_object_signal_emit
+                            (wd->resize_obj,
+                             "efl,state,busy,stop", "efl");
+
                        efl_event_callback_legacy_call
                          (obj, EFL_UI_IMAGE_ZOOMABLE_EVENT_LOAD_DETAIL, NULL);
                     }
@@ -510,9 +528,15 @@ _tile_preloaded_cb(void *data,
         sd->preload_num--;
         if (!sd->preload_num)
           {
-             edje_object_signal_emit
-               (wd->resize_obj, "elm,state,busy,stop",
-               "elm");
+             if (elm_widget_is_legacy(git->obj))
+               edje_object_signal_emit
+                  (wd->resize_obj, "elm,state,busy,stop",
+                   "elm");
+             else
+               edje_object_signal_emit
+                  (wd->resize_obj, "efl,state,busy,stop",
+                   "efl");
+
              efl_event_callback_legacy_call
                (wd->obj, EFL_UI_IMAGE_ZOOMABLE_EVENT_LOADED_DETAIL, NULL);
           }
@@ -715,8 +739,13 @@ _main_img_preloaded_cb(void *data,
    sd->preload_num--;
    if (!sd->preload_num)
      {
-        edje_object_signal_emit
-          (wd->resize_obj, "elm,state,busy,stop", "elm");
+        if (elm_widget_is_legacy(data))
+          edje_object_signal_emit
+             (wd->resize_obj, "elm,state,busy,stop", "elm");
+        else
+          edje_object_signal_emit
+             (wd->resize_obj, "efl,state,busy,stop", "efl");
+
         efl_event_callback_legacy_call
           (obj, EFL_UI_IMAGE_ZOOMABLE_EVENT_LOADED_DETAIL, NULL);
      }
@@ -872,14 +901,22 @@ _efl_ui_image_zoomable_efl_ui_focus_object_on_focus_update(Eo *obj, Efl_Ui_Image
 
    if (efl_ui_focus_object_focus_get(obj))
      {
-        edje_object_signal_emit
-          (wd->resize_obj, "elm,action,focus", "elm");
+        if (elm_widget_is_legacy(obj))
+          edje_object_signal_emit
+             (wd->resize_obj, "elm,action,focus", "elm");
+        else
+          edje_object_signal_emit
+             (wd->resize_obj, "efl,action,focus", "efl");
         evas_object_focus_set(wd->resize_obj, EINA_TRUE);
      }
    else
      {
-        edje_object_signal_emit
-          (wd->resize_obj, "elm,action,unfocus", "elm");
+        if (elm_widget_is_legacy(obj))
+          edje_object_signal_emit
+             (wd->resize_obj, "elm,action,unfocus", "elm");
+        else
+          edje_object_signal_emit
+             (wd->resize_obj, "efl,action,unfocus", "efl");
         evas_object_focus_set(wd->resize_obj, EINA_FALSE);
      }
 
@@ -1549,10 +1586,20 @@ _efl_ui_image_zoomable_bar_show_cb(void *data, const Efl_Event *event)
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
    Efl_Ui_Scrollbar_Direction type = *(Efl_Ui_Scrollbar_Direction *)(event->info);
 
-   if (type == EFL_UI_SCROLLBAR_DIRECTION_HORIZONTAL)
-     edje_object_signal_emit(wd->resize_obj, "elm,action,show,hbar", "elm");
-   else if (type == EFL_UI_SCROLLBAR_DIRECTION_VERTICAL)
-     edje_object_signal_emit(wd->resize_obj, "elm,action,show,vbar", "elm");
+   if (elm_widget_is_legacy(obj))
+     {
+        if (type == EFL_UI_SCROLLBAR_DIRECTION_HORIZONTAL)
+          edje_object_signal_emit(wd->resize_obj, "elm,action,show,hbar", "elm");
+        else if (type == EFL_UI_SCROLLBAR_DIRECTION_VERTICAL)
+          edje_object_signal_emit(wd->resize_obj, "elm,action,show,vbar", "elm");
+     }
+   else
+     {
+        if (type == EFL_UI_SCROLLBAR_DIRECTION_HORIZONTAL)
+          edje_object_signal_emit(wd->resize_obj, "efl,action,show,hbar", "efl");
+        else if (type == EFL_UI_SCROLLBAR_DIRECTION_VERTICAL)
+          edje_object_signal_emit(wd->resize_obj, "efl,action,show,vbar", "efl");
+     }
 }
 
 static void
@@ -1562,10 +1609,20 @@ _efl_ui_image_zoomable_bar_hide_cb(void *data, const Efl_Event *event)
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
    Efl_Ui_Scrollbar_Direction type = *(Efl_Ui_Scrollbar_Direction *)(event->info);
 
-   if (type == EFL_UI_SCROLLBAR_DIRECTION_HORIZONTAL)
-     edje_object_signal_emit(wd->resize_obj, "elm,action,hide,hbar", "elm");
-   else if (type == EFL_UI_SCROLLBAR_DIRECTION_VERTICAL)
-     edje_object_signal_emit(wd->resize_obj, "elm,action,hide,vbar", "elm");
+   if (elm_widget_is_legacy(obj))
+     {
+        if (type == EFL_UI_SCROLLBAR_DIRECTION_HORIZONTAL)
+          edje_object_signal_emit(wd->resize_obj, "elm,action,hide,hbar", "elm");
+        else if (type == EFL_UI_SCROLLBAR_DIRECTION_VERTICAL)
+          edje_object_signal_emit(wd->resize_obj, "elm,action,hide,vbar", "elm");
+     }
+   else
+     {
+        if (type == EFL_UI_SCROLLBAR_DIRECTION_HORIZONTAL)
+          edje_object_signal_emit(wd->resize_obj, "efl,action,hide,hbar", "efl");
+        else if (type == EFL_UI_SCROLLBAR_DIRECTION_VERTICAL)
+          edje_object_signal_emit(wd->resize_obj, "efl,action,hide,vbar", "efl");
+     }
 }
 
 static void
@@ -1627,7 +1684,7 @@ _efl_ui_image_zoomable_edje_object_attach(Eo *obj)
    else
      {
         efl_layout_signal_callback_add
-           (obj, "reload", "elm", _efl_ui_image_zoomable_reload_cb, obj);
+           (obj, "reload", "efl", _efl_ui_image_zoomable_reload_cb, obj);
         efl_layout_signal_callback_add
            (obj, "drag", "efl.dragable.vbar", _efl_ui_image_zoomable_vbar_drag_cb,
             obj);
@@ -1647,10 +1704,10 @@ _efl_ui_image_zoomable_edje_object_attach(Eo *obj)
            (obj, "drag,page", "efl.dragable.vbar",
             _efl_ui_image_zoomable_edje_drag_cb, obj);
         efl_layout_signal_callback_add
-           (obj, "elm,vbar,press", "elm",
+           (obj, "efl,vbar,press", "efl",
             _efl_ui_image_zoomable_vbar_press_cb, obj);
         efl_layout_signal_callback_add
-           (obj, "elm,vbar,unpress", "elm",
+           (obj, "efl,vbar,unpress", "efl",
             _efl_ui_image_zoomable_vbar_unpress_cb, obj);
         efl_layout_signal_callback_add
            (obj, "drag", "efl.dragable.hbar", _efl_ui_image_zoomable_hbar_drag_cb,
@@ -1671,10 +1728,10 @@ _efl_ui_image_zoomable_edje_object_attach(Eo *obj)
            (obj, "drag,page", "efl.dragable.hbar",
             _efl_ui_image_zoomable_edje_drag_cb, obj);
         efl_layout_signal_callback_add
-           (obj, "elm,hbar,press", "elm",
+           (obj, "efl,hbar,press", "efl",
             _efl_ui_image_zoomable_hbar_press_cb, obj);
         efl_layout_signal_callback_add
-           (obj, "elm,hbar,unpress", "elm",
+           (obj, "efl,hbar,unpress", "efl",
             _efl_ui_image_zoomable_hbar_unpress_cb, obj);
      }
 }
@@ -1738,10 +1795,10 @@ _efl_ui_image_zoomable_edje_object_detach(Evas_Object *obj)
    else
      {
         efl_layout_signal_callback_del
-           (obj, "reload", "elm", _efl_ui_image_zoomable_reload_cb, obj);
+           (obj, "reload", "efl", _efl_ui_image_zoomable_reload_cb, obj);
         efl_layout_signal_callback_del
-           (obj, "drag", "efl.dragable.vbar", _efl_ui_image_zoomable_vbar_drag_cb,
-            obj);
+           (obj, "drag", "efl.dragable.vbar",
+            _efl_ui_image_zoomable_vbar_drag_cb, obj);
         efl_layout_signal_callback_del
            (obj, "drag,set", "efl.dragable.vbar",
             _efl_ui_image_zoomable_edje_drag_cb, obj);
@@ -1758,14 +1815,14 @@ _efl_ui_image_zoomable_edje_object_detach(Evas_Object *obj)
            (obj, "drag,page", "efl.dragable.vbar",
             _efl_ui_image_zoomable_edje_drag_cb, obj);
         efl_layout_signal_callback_del
-           (obj, "elm,vbar,press", "elm",
+           (obj, "efl,vbar,press", "efl",
             _efl_ui_image_zoomable_vbar_press_cb, obj);
         efl_layout_signal_callback_del
-           (obj, "elm,vbar,unpress", "elm",
+           (obj, "efl,vbar,unpress", "efl",
             _efl_ui_image_zoomable_vbar_unpress_cb, obj);
         efl_layout_signal_callback_del
-           (obj, "drag", "efl.dragable.hbar", _efl_ui_image_zoomable_hbar_drag_cb,
-            obj);
+           (obj, "drag", "efl.dragable.hbar",
+            _efl_ui_image_zoomable_hbar_drag_cb, obj);
         efl_layout_signal_callback_del
            (obj, "drag,set", "efl.dragable.hbar",
             _efl_ui_image_zoomable_edje_drag_cb, obj);
@@ -1782,10 +1839,10 @@ _efl_ui_image_zoomable_edje_object_detach(Evas_Object *obj)
            (obj, "drag,page", "efl.dragable.hbar",
             _efl_ui_image_zoomable_edje_drag_cb, obj);
         efl_layout_signal_callback_del
-           (obj, "elm,hbar,press", "elm",
+           (obj, "efl,hbar,press", "efl",
             _efl_ui_image_zoomable_hbar_press_cb, obj);
         efl_layout_signal_callback_del
-           (obj, "elm,hbar,unpress", "elm",
+           (obj, "efl,hbar,unpress", "efl",
             _efl_ui_image_zoomable_hbar_unpress_cb, obj);
      }
 }
@@ -2044,8 +2101,12 @@ _img_proxy_set(Evas_Object *obj, Efl_Ui_Image_Zoomable_Data *sd,
    sd->preload_num++;
    if (sd->preload_num == 1)
      {
-        edje_object_signal_emit
-           (wd->resize_obj, "elm,state,busy,start", "elm");
+        if (elm_widget_is_legacy(obj))
+          edje_object_signal_emit
+             (wd->resize_obj, "elm,state,busy,start", "elm");
+        else
+          edje_object_signal_emit
+             (wd->resize_obj, "efl,state,busy,start", "efl");
         efl_event_callback_legacy_call(obj, EFL_UI_IMAGE_ZOOMABLE_EVENT_LOAD_DETAIL, NULL);
      }
 
@@ -2128,8 +2189,12 @@ _internal_file_set(Eo *obj, Efl_Ui_Image_Zoomable_Data *sd, const char *file, Ei
    sd->preload_num++;
    if (sd->preload_num == 1)
      {
-        edje_object_signal_emit
-          (wd->resize_obj, "elm,state,busy,start", "elm");
+        if (elm_widget_is_legacy(obj))
+          edje_object_signal_emit
+             (wd->resize_obj, "elm,state,busy,start", "elm");
+        else
+          edje_object_signal_emit
+             (wd->resize_obj, "efl,state,busy,start", "efl");
         efl_event_callback_legacy_call(obj, EFL_UI_IMAGE_ZOOMABLE_EVENT_LOAD_DETAIL, NULL);
      }
 
diff --git a/src/lib/elementary/efl_ui_layout_object.c b/src/lib/elementary/efl_ui_layout_object.c
index 76bbd10..a499704 100644
--- a/src/lib/elementary/efl_ui_layout_object.c
+++ b/src/lib/elementary/efl_ui_layout_object.c
@@ -180,13 +180,14 @@ _signals_emit(Eo *obj,
      {
         snprintf(buf, sizeof(buf), "elm,state,%s,%s", type,
                  set ? "visible" : "hidden");
+        efl_layout_signal_emit(obj, buf, "elm");
      }
    else
      {
-        snprintf(buf, sizeof(buf), "elm,state,%s,%s", type,
+        snprintf(buf, sizeof(buf), "efl,state,%s,%s", type,
                  set ? "set" : "unset");
+        efl_layout_signal_emit(obj, buf, "efl");
      }
-   efl_layout_signal_emit(obj, buf, "elm");
 }
 
 static inline void
@@ -413,12 +414,24 @@ _efl_ui_layout_object_efl_ui_widget_on_disabled_update(Eo *obj, Efl_Ui_Layout_Ob
 
    // Not calling efl_super here: Elm.Widget simply returns false.
 
-   if (disabled)
-     edje_object_signal_emit
-       (wd->resize_obj, "elm,state,disabled", "elm");
+   if (elm_widget_is_legacy(obj))
+     {
+        if (disabled)
+          edje_object_signal_emit
+             (wd->resize_obj, "elm,state,disabled", "elm");
+        else
+          edje_object_signal_emit
+             (wd->resize_obj, "elm,state,enabled", "elm");
+     }
    else
-     edje_object_signal_emit
-       (wd->resize_obj, "elm,state,enabled", "elm");
+     {
+        if (disabled)
+          edje_object_signal_emit
+             (wd->resize_obj, "efl,state,disabled", "efl");
+        else
+          edje_object_signal_emit
+             (wd->resize_obj, "efl,state,enabled", "efl");
+     }
 
    return EINA_TRUE;
 }
@@ -470,12 +483,18 @@ _efl_ui_layout_object_efl_ui_focus_object_on_focus_update(Eo *obj, Efl_Ui_Layout
 
    if (efl_ui_focus_object_focus_get(obj))
      {
-        elm_layout_signal_emit(obj, "elm,action,focus", "elm");
+        if (elm_widget_is_legacy(obj))
+          elm_layout_signal_emit(obj, "elm,action,focus", "elm");
+        else
+          elm_layout_signal_emit(obj, "efl,action,focus", "efl");
         evas_object_focus_set(wd->resize_obj, EINA_TRUE);
      }
    else
      {
-        elm_layout_signal_emit(obj, "elm,action,unfocus", "elm");
+        if (elm_widget_is_legacy(obj))
+          elm_layout_signal_emit(obj, "elm,action,unfocus", "elm");
+        else
+          elm_layout_signal_emit(obj, "efl,action,unfocus", "efl");
         evas_object_focus_set(wd->resize_obj, EINA_FALSE);
      }
 
@@ -710,8 +729,12 @@ _efl_ui_layout_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Layout_Object_Data *_p
 
    elm_widget_can_focus_set(obj, EINA_FALSE);
 
-   edje_object_signal_callback_add
-     (edje, "size,eval", "elm", _on_size_evaluate_signal, obj);
+   if (elm_widget_is_legacy(obj))
+     edje_object_signal_callback_add
+        (edje, "size,eval", "elm", _on_size_evaluate_signal, obj);
+   else
+     edje_object_signal_callback_add
+        (edje, "size,eval", "efl", _on_size_evaluate_signal, obj);
 
    elm_layout_sizing_eval(obj);
 }
@@ -1934,7 +1957,10 @@ _view_update(Efl_Ui_Layout_Sub_Connect *sc, const char *property)
    eina_strbuf_append(buf, sc->name);
    eina_strbuf_replace_all(buf, "%v", property);
 
-   elm_layout_signal_emit(sc->obj, eina_strbuf_string_get(buf), "elm");
+   if (elm_widget_is_legacy(sc->obj))
+     elm_layout_signal_emit(sc->obj, eina_strbuf_string_get(buf), "elm");
+   else
+     elm_layout_signal_emit(sc->obj, eina_strbuf_string_get(buf), "efl");
    eina_strbuf_free(buf);
 }
 
diff --git a/src/lib/elementary/efl_ui_navigation_bar.c b/src/lib/elementary/efl_ui_navigation_bar.c
index 2a1720d..77d6a31 100644
--- a/src/lib/elementary/efl_ui_navigation_bar.c
+++ b/src/lib/elementary/efl_ui_navigation_bar.c
@@ -71,9 +71,9 @@ _efl_ui_navigation_bar_content_set(Eo *obj, Efl_Ui_Navigation_Bar_Data *_pd EINA
    if (eina_streq(part, "left_content"))
      {
         if (content)
-          efl_layout_signal_emit(obj, "elm,state,left_content,visible", "elm");
+          efl_layout_signal_emit(obj, "efl,state,left_content,set", "efl");
         else
-          efl_layout_signal_emit(obj, "elm,state,left_content,hidden", "elm");
+          efl_layout_signal_emit(obj, "efl,state,left_content,unset", "efl");
         efl_layout_signal_process(obj, EINA_FALSE);
 
         return efl_content_set(efl_part(efl_super(obj, MY_CLASS), "efl.left_content"), content);
@@ -100,7 +100,7 @@ _efl_ui_navigation_bar_content_unset(Eo *obj, Efl_Ui_Navigation_Bar_Data *_pd EI
 {
   if (eina_streq(part, "left_content"))
     {
-       efl_layout_signal_emit(obj, "elm,state,left_content,hidden", "elm");
+       efl_layout_signal_emit(obj, "efl,state,left_content,unset", "efl");
        efl_layout_signal_process(obj, EINA_FALSE);
        return efl_content_unset(efl_part(efl_super(obj, MY_CLASS), "efl.left_content"));
     }
@@ -136,13 +136,13 @@ _efl_ui_navigation_bar_part_back_button_efl_gfx_entity_visible_set(Eo *obj, void
         if (!efl_content_set(efl_part(efl_super(pd->obj, MY_CLASS), "efl.back_button"), ppd->back_button))
           ERR("Part for back button(i.e. \"back_button\") does not exist!");
         else
-          efl_layout_signal_emit(pd->obj, "elm,state,back_button,visible", "elm");
+          efl_layout_signal_emit(pd->obj, "efl,state,back_button,visible", "efl");
      }
    else
      {
         efl_content_unset(efl_part(efl_super(pd->obj, MY_CLASS), "efl.back_button"));
         efl_gfx_entity_visible_set(ppd->back_button, visible);
-        efl_layout_signal_emit(pd->obj, "elm,state,back_button,hidden", "elm");
+        efl_layout_signal_emit(pd->obj, "efl,state,back_button,hidden", "efl");
      }
 
      efl_layout_signal_process(pd->obj, EINA_FALSE);
diff --git a/src/lib/elementary/efl_ui_nstate.c b/src/lib/elementary/efl_ui_nstate.c
index f0cf1e5..3811bbb 100644
--- a/src/lib/elementary/efl_ui_nstate.c
+++ b/src/lib/elementary/efl_ui_nstate.c
@@ -45,7 +45,7 @@ _efl_ui_nstate_efl_object_constructor(Eo *obj, Efl_Ui_Nstate_Data *pd)
 
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL);
    efl_layout_signal_callback_add
-     (wd->resize_obj, "elm,action,state,changed", "*", _on_state_changed, obj);
+     (wd->resize_obj, "efl,action,state,changed", "*", _on_state_changed, obj);
 
    //TODO: Add ATSPI call here
 
@@ -64,8 +64,8 @@ _state_signal_emit(Evas_Object *obj, Efl_Ui_Nstate_Data *sd)
 {
    char buf[64];
 
-   sprintf(buf, "elm,state,changed,%d", sd->state);
-   elm_layout_signal_emit(obj, buf, "elm");
+   sprintf(buf, "efl,state,changed,%d", sd->state);
+   elm_layout_signal_emit(obj, buf, "efl");
    edje_object_message_signal_process(elm_layout_edje_get(obj));
    elm_layout_sizing_eval(obj);
 }
diff --git a/src/lib/elementary/efl_ui_panes.c b/src/lib/elementary/efl_ui_panes.c
index 57b4ecf..b6c19b0 100644
--- a/src/lib/elementary/efl_ui_panes.c
+++ b/src/lib/elementary/efl_ui_panes.c
@@ -136,11 +136,16 @@ _efl_ui_panes_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Panes_Data *sd)
 
    if (sd->fixed)
      {
-        elm_layout_signal_emit(obj, "elm,panes,fixed", "elm");
+        if (elm_widget_is_legacy(obj))
+          {
+             elm_layout_signal_emit(obj, "elm,panes,fixed", "elm");
 
-        //TODO: remove this signal on EFL 2.0.
-        // I left this due to the backward compatibility.
-        elm_layout_signal_emit(obj, "elm.panes.fixed", "elm");
+             //TODO: remove this signal on EFL 2.0.
+             // I left this due to the backward compatibility.
+             elm_layout_signal_emit(obj, "elm.panes.fixed", "elm");
+          }
+        else
+          elm_layout_signal_emit(obj, "efl,panes,fixed", "efl");
      }
 
    elm_layout_sizing_eval(obj);
@@ -415,18 +420,36 @@ _efl_ui_panes_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Panes_Data *_pd EINA_UN
 
    elm_panes_content_left_size_set(obj, 0.5);
 
-   edje_object_signal_callback_add
-     (wd->resize_obj, "elm,action,click", "*",
-     _on_clicked, obj);
-   edje_object_signal_callback_add
-     (wd->resize_obj, "elm,action,click,double", "*",
-     _double_clicked, obj);
-   edje_object_signal_callback_add
-     (wd->resize_obj, "elm,action,press", "*",
-     _on_pressed, obj);
-   edje_object_signal_callback_add
-     (wd->resize_obj, "elm,action,unpress", "*",
-     _on_unpressed, obj);
+   if (elm_widget_is_legacy(obj))
+     {
+        edje_object_signal_callback_add
+           (wd->resize_obj, "elm,action,click", "*",
+            _on_clicked, obj);
+        edje_object_signal_callback_add
+           (wd->resize_obj, "elm,action,click,double", "*",
+            _double_clicked, obj);
+        edje_object_signal_callback_add
+           (wd->resize_obj, "elm,action,press", "*",
+            _on_pressed, obj);
+        edje_object_signal_callback_add
+           (wd->resize_obj, "elm,action,unpress", "*",
+            _on_unpressed, obj);
+     }
+   else
+     {
+        edje_object_signal_callback_add
+           (wd->resize_obj, "efl,action,click", "*",
+            _on_clicked, obj);
+        edje_object_signal_callback_add
+           (wd->resize_obj, "efl,action,click,double", "*",
+            _double_clicked, obj);
+        edje_object_signal_callback_add
+           (wd->resize_obj, "efl,action,press", "*",
+            _on_pressed, obj);
+        edje_object_signal_callback_add
+           (wd->resize_obj, "efl,action,unpress", "*",
+            _on_unpressed, obj);
+     }
    evas_object_event_callback_add
      (wd->resize_obj, EVAS_CALLBACK_RESIZE,
      _on_resize, obj);
@@ -555,19 +578,29 @@ _efl_ui_panes_fixed_set(Eo *obj, Efl_Ui_Panes_Data *sd, Eina_Bool fixed)
    sd->fixed = !!fixed;
    if (sd->fixed == EINA_TRUE)
      {
-        elm_layout_signal_emit(obj, "elm,panes,fixed", "elm");
+        if (elm_widget_is_legacy(obj))
+          {
+             elm_layout_signal_emit(obj, "elm,panes,fixed", "elm");
 
-        //TODO: remove this signal on EFL 2.0.
-        // I left this due to the backward compatibility.
-        elm_layout_signal_emit(obj, "elm.panes.fixed", "elm");
+             //TODO: remove this signal on EFL 2.0.
+             // I left this due to the backward compatibility.
+             elm_layout_signal_emit(obj, "elm.panes.fixed", "elm");
+          }
+        else
+          elm_layout_signal_emit(obj, "efl,panes,fixed", "efl");
      }
    else
      {
-        elm_layout_signal_emit(obj, "elm,panes,unfixed", "elm");
+        if (elm_widget_is_legacy(obj))
+          {
+             elm_layout_signal_emit(obj, "elm,panes,unfixed", "elm");
 
-        //TODO: remove this signal on EFL 2.0.
-        // I left this due to the backward compatibility.
-        elm_layout_signal_emit(obj, "elm.panes.unfixed", "elm");
+             //TODO: remove this signal on EFL 2.0.
+             // I left this due to the backward compatibility.
+             elm_layout_signal_emit(obj, "elm.panes.unfixed", "elm");
+          }
+        else
+          elm_layout_signal_emit(obj, "efl,panes,unfixed", "efl");
      }
 }
 
diff --git a/src/lib/elementary/efl_ui_popup.c b/src/lib/elementary/efl_ui_popup.c
index 1b16ffd..b3772bb 100644
--- a/src/lib/elementary/efl_ui_popup.c
+++ b/src/lib/elementary/efl_ui_popup.c
@@ -227,7 +227,7 @@ _efl_ui_popup_efl_object_constructor(Eo *obj, Efl_Ui_Popup_Data *pd)
    evas_object_smart_member_add(pd->backwall, obj);
    evas_object_stack_below(pd->backwall, wd->resize_obj);
 
-   edje_object_signal_callback_add(pd->backwall, "elm,action,clicked", "*",
+   edje_object_signal_callback_add(pd->backwall, "efl,action,clicked", "*",
                                    _backwall_clicked_cb, obj);
 
    pd->align = EFL_UI_POPUP_ALIGN_CENTER;
@@ -367,7 +367,7 @@ _efl_ui_popup_part_efl_file_file_set(Eo *obj, void *_pd EINA_UNUSED, const char
         Eo *prev_obj = edje_object_part_swallow_get(sd->backwall, "efl.content");
         if (prev_obj)
           {
-             edje_object_signal_emit(sd->backwall, "elm,state,content,unset", "elm");
+             edje_object_signal_emit(sd->backwall, "efl,state,content,unset", "efl");
              edje_object_part_unswallow(sd->backwall, prev_obj);
              efl_del(prev_obj);
           }
@@ -380,7 +380,7 @@ _efl_ui_popup_part_efl_file_file_set(Eo *obj, void *_pd EINA_UNUSED, const char
              return EINA_FALSE;
           }
         edje_object_part_swallow(sd->backwall, "efl.content", image);
-        edje_object_signal_emit(sd->backwall, "elm,state,content,set", "elm");
+        edje_object_signal_emit(sd->backwall, "efl,state,content,set", "efl");
 
         return EINA_TRUE;
      }
diff --git a/src/lib/elementary/efl_ui_popup_alert.c b/src/lib/elementary/efl_ui_popup_alert.c
index 0799635..16e88a1 100644
--- a/src/lib/elementary/efl_ui_popup_alert.c
+++ b/src/lib/elementary/efl_ui_popup_alert.c
@@ -33,9 +33,9 @@ _efl_ui_popup_alert_text_set(Eo *obj, Efl_Ui_Popup_Alert_Data *pd, const char *p
           {
              efl_text_set(efl_part(efl_super(obj, MY_CLASS), "title"), label);
              if (label)
-               elm_layout_signal_emit(obj, "elm,title,show", "elm");
+               elm_layout_signal_emit(obj, "efl,title,show", "efl");
              else
-               elm_layout_signal_emit(obj, "elm,title,hide", "elm");
+               elm_layout_signal_emit(obj, "efl,title,hide", "efl");
 
              ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
              edje_object_message_signal_process(wd->resize_obj);
@@ -168,7 +168,7 @@ _efl_ui_popup_alert_button_set(Eo *obj, Efl_Ui_Popup_Alert_Data *pd, Efl_Ui_Popu
                                  pd->button[EFL_UI_POPUP_ALERT_BUTTON_NEGATIVE]);
      }
 
-   elm_layout_signal_emit(obj, "elm,buttons,show", "elm");
+   elm_layout_signal_emit(obj, "efl,buttons,show", "efl");
    edje_object_message_signal_process(wd->resize_obj);
    elm_layout_sizing_eval(obj);
 }
diff --git a/src/lib/elementary/efl_ui_progressbar.c b/src/lib/elementary/efl_ui_progressbar.c
index 51451b1..e483440 100644
--- a/src/lib/elementary/efl_ui_progressbar.c
+++ b/src/lib/elementary/efl_ui_progressbar.c
@@ -247,16 +247,32 @@ _efl_ui_progressbar_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Progressbar_Data *
    int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
    if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
 
-   if (sd->pulse)
-     elm_layout_signal_emit(obj, "elm,state,pulse", "elm");
+   if (elm_widget_is_legacy(obj))
+     {
+        if (sd->pulse)
+          elm_layout_signal_emit(obj, "elm,state,pulse", "elm");
+        else
+          elm_layout_signal_emit(obj, "elm,state,fraction", "elm");
+
+        if (sd->pulse_state)
+          elm_layout_signal_emit(obj, "elm,state,pulse,start", "elm");
+
+        if (sd->format_cb && (!sd->pulse))
+          elm_layout_signal_emit(obj, "elm,state,units,visible", "elm");
+     }
    else
-     elm_layout_signal_emit(obj, "elm,state,fraction", "elm");
+     {
+        if (sd->pulse)
+          elm_layout_signal_emit(obj, "efl,state,pulse", "efl");
+        else
+          elm_layout_signal_emit(obj, "efl,state,fraction", "efl");
 
-   if (sd->pulse_state)
-     elm_layout_signal_emit(obj, "elm,state,pulse,start", "elm");
+        if (sd->pulse_state)
+          elm_layout_signal_emit(obj, "efl,state,pulse,start", "efl");
 
-   if (sd->format_cb && (!sd->pulse))
-     elm_layout_signal_emit(obj, "elm,state,units,visible", "elm");
+        if (sd->format_cb && (!sd->pulse))
+          elm_layout_signal_emit(obj, "efl,state,units,visible", "efl");
+     }
 
    if (_is_horizontal(sd->dir))
      evas_object_size_hint_min_set
@@ -267,10 +283,20 @@ _efl_ui_progressbar_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Progressbar_Data *
        (sd->spacer, 1, (double)sd->size * efl_gfx_entity_scale_get(obj) *
        elm_config_scale_get());
 
-   if (_is_inverted(sd->dir))
-     elm_layout_signal_emit(obj, "elm,state,inverted,on", "elm");
+   if (elm_widget_is_legacy(obj))
+     {
+        if (_is_inverted(sd->dir))
+          elm_layout_signal_emit(obj, "elm,state,inverted,on", "elm");
+        else
+          elm_layout_signal_emit(obj, "elm,state,inverted,off", "elm");
+     }
    else
-     elm_layout_signal_emit(obj, "elm,state,inverted,off", "elm");
+     {
+        if (_is_inverted(sd->dir))
+          elm_layout_signal_emit(obj, "efl,state,inverted,on", "efl");
+        else
+          elm_layout_signal_emit(obj, "efl,state,inverted,off", "efl");
+     }
 
    _units_set(obj);
    _val_set(obj);
@@ -608,7 +634,10 @@ _efl_ui_progressbar_efl_ui_format_format_cb_set(Eo *obj, Efl_Ui_Progressbar_Data
    sd->format_free_cb = func_free_cb;
    if (!sd->format_strbuf) sd->format_strbuf = eina_strbuf_new();
 
-   elm_layout_signal_emit(obj, "elm,state,units,visible", "elm");
+   if (elm_widget_is_legacy(obj))
+     elm_layout_signal_emit(obj, "elm,state,units,visible", "elm");
+   else
+     elm_layout_signal_emit(obj, "efl,state,units,visible", "efl");
    edje_object_message_signal_process(wd->resize_obj);
 
    _units_set(obj);
@@ -623,10 +652,20 @@ _efl_ui_progressbar_pulse_set(Eo *obj, Efl_Ui_Progressbar_Data *sd, Eina_Bool st
 
    sd->pulse_state = state;
 
-   if (sd->pulse_state)
-     elm_layout_signal_emit(obj, "elm,state,pulse,start", "elm");
+   if (elm_widget_is_legacy(obj))
+     {
+        if (sd->pulse_state)
+          elm_layout_signal_emit(obj, "elm,state,pulse,start", "elm");
+        else
+          elm_layout_signal_emit(obj, "elm,state,pulse,stop", "elm");
+     }
    else
-     elm_layout_signal_emit(obj, "elm,state,pulse,stop", "elm");
+     {
+        if (sd->pulse_state)
+          elm_layout_signal_emit(obj, "efl,state,pulse,start", "efl");
+        else
+          elm_layout_signal_emit(obj, "efl,state,pulse,stop", "efl");
+     }
 }
 
 EOLIAN static Eina_Bool
diff --git a/src/lib/elementary/efl_ui_radio.c b/src/lib/elementary/efl_ui_radio.c
index 755532d..d986860 100644
--- a/src/lib/elementary/efl_ui_radio.c
+++ b/src/lib/elementary/efl_ui_radio.c
@@ -55,8 +55,16 @@ _state_set(Evas_Object *obj, Eina_Bool state, Eina_Bool activate)
              // so that we can distinguish between state change by user or state change
              // by calling state_change() api. Keep both the signal for backward compatibility
              // and only emit "elm,state,radio,on" when activate is false  when we can break ABI.
-             if (activate) elm_layout_signal_emit(obj, "elm,activate,radio,on", "elm");
-             elm_layout_signal_emit(obj, "elm,state,radio,on", "elm");
+             if (elm_widget_is_legacy(obj))
+               {
+                  if (activate) elm_layout_signal_emit(obj, "elm,activate,radio,on", "elm");
+                  elm_layout_signal_emit(obj, "elm,state,radio,on", "elm");
+               }
+             else
+               {
+                  if (activate) elm_layout_signal_emit(obj, "efl,activate,radio,on", "efl");
+                  elm_layout_signal_emit(obj, "efl,state,radio,on", "efl");
+               }
           }
         else
           {
@@ -64,8 +72,16 @@ _state_set(Evas_Object *obj, Eina_Bool state, Eina_Bool activate)
              // so that we can distinguish between state change by user or state change
              // by calling state_change() api. Keep both the signal for backward compatibility
              // and only emit "elm,state,radio,off"when activate is false when we can break ABI.
-             if (activate) elm_layout_signal_emit(obj, "elm,activate,radio,off", "elm");
-             elm_layout_signal_emit(obj, "elm,state,radio,off", "elm");
+             if (elm_widget_is_legacy(obj))
+               {
+                  if (activate) elm_layout_signal_emit(obj, "elm,activate,radio,off", "elm");
+                  elm_layout_signal_emit(obj, "elm,state,radio,off", "elm");
+               }
+             else
+               {
+                  if (activate) elm_layout_signal_emit(obj, "efl,activate,radio,off", "efl");
+                  elm_layout_signal_emit(obj, "efl,state,radio,off", "efl");
+               }
           }
         if (_elm_config->atspi_mode)
           {
@@ -138,8 +154,16 @@ _efl_ui_radio_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Radio_Data *sd)
    int_ret = efl_ui_widget_theme_apply(efl_super(obj, EFL_UI_CHECK_CLASS));
    if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
 
-   if (sd->state) elm_layout_signal_emit(obj, "elm,state,radio,on", "elm");
-   else elm_layout_signal_emit(obj, "elm,state,radio,off", "elm");
+   if (elm_widget_is_legacy(obj))
+     {
+        if (sd->state) elm_layout_signal_emit(obj, "elm,state,radio,on", "elm");
+        else elm_layout_signal_emit(obj, "elm,state,radio,off", "elm");
+     }
+   else
+     {
+        if (sd->state) elm_layout_signal_emit(obj, "efl,state,radio,on", "efl");
+        else elm_layout_signal_emit(obj, "efl,state,radio,off", "efl");
+     }
 
    edje_object_message_signal_process(wd->resize_obj);
 
@@ -188,8 +212,13 @@ _efl_ui_radio_efl_object_constructor(Eo *obj, Efl_Ui_Radio_Data *pd)
    evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
 
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL);
-   elm_layout_signal_callback_add
-     (obj, "elm,action,radio,toggle", "*", _radio_on_cb, obj);
+
+   if (elm_widget_is_legacy(obj))
+     elm_layout_signal_callback_add
+        (obj, "elm,action,radio,toggle", "*", _radio_on_cb, obj);
+   else
+     elm_layout_signal_callback_add
+        (obj, "efl,action,radio,toggle", "*", _radio_on_cb, obj);
 
    pd->group = calloc(1, sizeof(Group));
    pd->group->radios = eina_list_append(pd->group->radios, obj);
diff --git a/src/lib/elementary/efl_ui_scroller.c b/src/lib/elementary/efl_ui_scroller.c
index c086957..c7351e9 100644
--- a/src/lib/elementary/efl_ui_scroller.c
+++ b/src/lib/elementary/efl_ui_scroller.c
@@ -233,9 +233,9 @@ _efl_ui_scroller_bar_show_cb(void *data, const Efl_Event *event)
    Efl_Ui_Scrollbar_Direction type = *(Efl_Ui_Scrollbar_Direction *)(event->info);
 
    if (type == EFL_UI_SCROLLBAR_DIRECTION_HORIZONTAL)
-     edje_object_signal_emit(wd->resize_obj, "elm,action,show,hbar", "elm");
+     edje_object_signal_emit(wd->resize_obj, "efl,action,show,hbar", "efl");
    else if (type == EFL_UI_SCROLLBAR_DIRECTION_VERTICAL)
-     edje_object_signal_emit(wd->resize_obj, "elm,action,show,vbar", "elm");
+     edje_object_signal_emit(wd->resize_obj, "efl,action,show,vbar", "efl");
 }
 
 static void
@@ -247,9 +247,9 @@ _efl_ui_scroller_bar_hide_cb(void *data, const Efl_Event *event)
    Efl_Ui_Scrollbar_Direction type = *(Efl_Ui_Scrollbar_Direction *)(event->info);
 
    if (type == EFL_UI_SCROLLBAR_DIRECTION_HORIZONTAL)
-     edje_object_signal_emit(wd->resize_obj, "elm,action,hide,hbar", "elm");
+     edje_object_signal_emit(wd->resize_obj, "efl,action,hide,hbar", "efl");
    else if (type == EFL_UI_SCROLLBAR_DIRECTION_VERTICAL)
-     edje_object_signal_emit(wd->resize_obj, "elm,action,hide,vbar", "elm");
+     edje_object_signal_emit(wd->resize_obj, "efl,action,hide,vbar", "efl");
 }
 
 static void
@@ -258,7 +258,7 @@ _scroll_edje_object_attach(Eo *obj)
    EFL_UI_SCROLLER_DATA_GET_OR_RETURN(obj, sd);
 
    efl_layout_signal_callback_add
-     (obj, "reload", "elm", _efl_ui_scroller_reload_cb, obj);
+     (obj, "reload", "efl", _efl_ui_scroller_reload_cb, obj);
    efl_layout_signal_callback_add
      (obj, "drag", "efl.dragable.vbar", _efl_ui_scroller_vbar_drag_cb,
      obj);
@@ -278,10 +278,10 @@ _scroll_edje_object_attach(Eo *obj)
      (obj, "drag,page", "efl.dragable.vbar",
      _efl_ui_scroller_edje_drag_cb, obj);
    efl_layout_signal_callback_add
-     (obj, "elm,vbar,press", "elm",
+     (obj, "efl,vbar,press", "efl",
      _efl_ui_scroller_vbar_press_cb, obj);
    efl_layout_signal_callback_add
-     (obj, "elm,vbar,unpress", "elm",
+     (obj, "efl,vbar,unpress", "efl",
      _efl_ui_scroller_vbar_unpress_cb, obj);
    efl_layout_signal_callback_add
      (obj, "drag", "efl.dragable.hbar", _efl_ui_scroller_hbar_drag_cb,
@@ -302,10 +302,10 @@ _scroll_edje_object_attach(Eo *obj)
      (obj, "drag,page", "efl.dragable.hbar",
      _efl_ui_scroller_edje_drag_cb, obj);
    efl_layout_signal_callback_add
-     (obj, "elm,hbar,press", "elm",
+     (obj, "efl,hbar,press", "efl",
      _efl_ui_scroller_hbar_press_cb, obj);
    efl_layout_signal_callback_add
-     (obj, "elm,hbar,unpress", "elm",
+     (obj, "efl,hbar,unpress", "efl",
      _efl_ui_scroller_hbar_unpress_cb, obj);
 }
 
@@ -315,7 +315,7 @@ _scroll_edje_object_detach(Evas_Object *obj)
    EFL_UI_SCROLLER_DATA_GET_OR_RETURN(obj, sd);
 
    efl_layout_signal_callback_del
-     (obj, "reload", "elm", _efl_ui_scroller_reload_cb, obj);
+     (obj, "reload", "efl", _efl_ui_scroller_reload_cb, obj);
    efl_layout_signal_callback_del
      (obj, "drag", "efl.dragable.vbar", _efl_ui_scroller_vbar_drag_cb,
      obj);
@@ -335,10 +335,10 @@ _scroll_edje_object_detach(Evas_Object *obj)
      (obj, "drag,page", "efl.dragable.vbar",
      _efl_ui_scroller_edje_drag_cb, obj);
    efl_layout_signal_callback_del
-     (obj, "elm,vbar,press", "elm",
+     (obj, "efl,vbar,press", "efl",
      _efl_ui_scroller_vbar_press_cb, obj);
    efl_layout_signal_callback_del
-     (obj, "elm,vbar,unpress", "elm",
+     (obj, "efl,vbar,unpress", "efl",
      _efl_ui_scroller_vbar_unpress_cb, obj);
    efl_layout_signal_callback_del
      (obj, "drag", "efl.dragable.hbar", _efl_ui_scroller_hbar_drag_cb,
@@ -359,10 +359,10 @@ _scroll_edje_object_detach(Evas_Object *obj)
      (obj, "drag,page", "efl.dragable.hbar",
      _efl_ui_scroller_edje_drag_cb, obj);
    efl_layout_signal_callback_del
-     (obj, "elm,hbar,press", "elm",
+     (obj, "efl,hbar,press", "efl",
      _efl_ui_scroller_hbar_press_cb, obj);
    efl_layout_signal_callback_del
-     (obj, "elm,hbar,unpress", "elm",
+     (obj, "efl,hbar,unpress", "efl",
      _efl_ui_scroller_hbar_unpress_cb, obj);
 }
 
diff --git a/src/lib/elementary/efl_ui_spin_button.c b/src/lib/elementary/efl_ui_spin_button.c
index 2a37bce..37ef72f 100644
--- a/src/lib/elementary/efl_ui_spin_button.c
+++ b/src/lib/elementary/efl_ui_spin_button.c
@@ -157,8 +157,8 @@ _entry_hide(Evas_Object *obj)
 {
    Efl_Ui_Spin_Button_Data *sd = efl_data_scope_get(obj, MY_CLASS);
 
-   elm_layout_signal_emit(obj, "elm,state,button,active", "elm");
-   elm_layout_signal_emit(obj, "elm,state,entry,inactive", "elm");
+   elm_layout_signal_emit(obj, "efl,state,button,active", "efl");
+   elm_layout_signal_emit(obj, "efl,state,entry,inactive", "efl");
 
    if (sd->entry_visible && !evas_focus_state_get(evas_object_evas_get(obj)))
      sd->entry_reactivate = EINA_TRUE;
@@ -340,7 +340,7 @@ _entry_show_cb(void *data,
    elm_object_focus_set(obj, EINA_TRUE);
    elm_entry_select_all(obj);
    sd->entry_visible = EINA_TRUE;
-   elm_layout_signal_emit(data, "elm,state,button,inactive", "elm");
+   elm_layout_signal_emit(data, "efl,state,button,inactive", "efl");
 }
 
 static void
@@ -378,7 +378,7 @@ _toggle_entry(Evas_Object *obj)
         efl_event_callback_add(sd->ent, EFL_UI_FOCUS_OBJECT_EVENT_FOCUS_CHANGED,
                                _entry_focus_changed_cb, obj);
         sd->entry_visible = EINA_TRUE;
-        elm_layout_signal_emit(obj, "elm,state,entry,active", "elm");
+        elm_layout_signal_emit(obj, "efl,state,entry,active", "efl");
         {
            Eina_List *items = NULL;
 
@@ -658,13 +658,13 @@ _access_increment_decrement_info_say(Evas_Object *obj,
    if (is_incremented)
      {
         elm_object_signal_emit
-           (sd->inc_button, "elm,action,anim,activate", "elm");
+           (sd->inc_button, "efl,action,anim,activate", "efl");
         eina_strbuf_append(buf, E_("incremented"));
      }
    else
      {
         elm_object_signal_emit
-           (sd->dec_button, "elm,action,anim,activate", "elm");
+           (sd->dec_button, "efl,action,anim,activate", "efl");
         eina_strbuf_append(buf, E_("decremented"));
      }
 
@@ -688,10 +688,10 @@ _access_spinner_register(Evas_Object *obj, Eina_Bool is_access)
         /* unregister access */
         _elm_access_edje_object_part_object_unregister
            (obj, elm_layout_edje_get(obj), "access");
-        elm_layout_signal_emit(obj, "elm,state,access,inactive", "elm");
+        elm_layout_signal_emit(obj, "efl,state,access,inactive", "efl");
         return;
      }
-   elm_layout_signal_emit(obj, "elm,state,access,active", "elm");
+   elm_layout_signal_emit(obj, "efl,state,access,active", "efl");
    ao = _elm_access_edje_object_part_object_register
       (obj, elm_layout_edje_get(obj), "access");
 
@@ -783,7 +783,7 @@ _efl_ui_spin_button_efl_object_constructor(Eo *obj, Efl_Ui_Spin_Button_Data *sd)
      }
 
    elm_layout_signal_callback_add
-      (obj, "elm,action,entry,toggle", "*", _entry_toggle_cb, NULL);
+      (obj, "efl,action,entry,toggle", "*", _entry_toggle_cb, NULL);
 
    elm_widget_can_focus_set(obj, EINA_TRUE);
 
diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c
index c984e23..3a87047 100644
--- a/src/lib/elementary/efl_ui_text.c
+++ b/src/lib/elementary/efl_ui_text.c
@@ -444,9 +444,9 @@ _efl_ui_text_guide_update(Evas_Object *obj,
    EFL_UI_TEXT_DATA_GET(obj, sd);
 
    if ((has_text) && (!sd->has_text))
-     edje_object_signal_emit(sd->entry_edje, "elm,guide,disabled", "elm");
+     edje_object_signal_emit(sd->entry_edje, "efl,guide,disabled", "efl");
    else if ((!has_text) && (sd->has_text))
-     edje_object_signal_emit(sd->entry_edje, "elm,guide,enabled", "elm");
+     edje_object_signal_emit(sd->entry_edje, "efl,guide,enabled", "efl");
 
    sd->has_text = has_text;
 }
@@ -465,7 +465,7 @@ _validate(Evas_Object *obj)
    res = efl_event_callback_call(obj, EFL_UI_TEXT_EVENT_VALIDATE, (void *)&vc);
    buf = eina_strbuf_new();
    eina_strbuf_append_printf(buf, "validation,%s,%s", vc.signal, res == EINA_FALSE ? "fail" : "pass");
-   edje_object_signal_emit(sd->scr_edje, eina_strbuf_string_get(buf), "elm");
+   edje_object_signal_emit(sd->scr_edje, eina_strbuf_string_get(buf), "efl");
    eina_tmpstr_del(vc.signal);
    eina_strbuf_free(buf);
 }
@@ -515,12 +515,12 @@ _hide_selection_handler(Evas_Object *obj)
 
    if (sd->start_handler_shown)
      {
-        edje_object_signal_emit(sd->start_handler, "elm,handler,hide", "elm");
+        edje_object_signal_emit(sd->start_handler, "efl,handler,hide", "efl");
         sd->start_handler_shown = EINA_FALSE;
      }
    if (sd->end_handler_shown)
      {
-        edje_object_signal_emit(sd->end_handler, "elm,handler,hide", "elm");
+        edje_object_signal_emit(sd->end_handler, "efl,handler,hide", "efl");
         sd->end_handler_shown = EINA_FALSE;
      }
 }
@@ -606,13 +606,13 @@ _update_selection_handler(Eo *obj)
         if (!sd->start_handler_shown && !hidden)
           {
              edje_object_signal_emit(sd->start_handler,
-                                     "elm,handler,show", "elm");
+                                     "efl,handler,show", "efl");
              sd->start_handler_shown = EINA_TRUE;
           }
         else if (sd->start_handler_shown && hidden)
           {
              edje_object_signal_emit(sd->start_handler,
-                                     "elm,handler,hide", "elm");
+                                     "efl,handler,hide", "efl");
              sd->start_handler_shown = EINA_FALSE;
           }
 
@@ -632,13 +632,13 @@ _update_selection_handler(Eo *obj)
         if (!sd->end_handler_shown && !hidden)
           {
              edje_object_signal_emit(sd->end_handler,
-                                     "elm,handler,show", "elm");
+                                     "efl,handler,show", "efl");
              sd->end_handler_shown = EINA_TRUE;
           }
         else if (sd->end_handler_shown && hidden)
           {
              edje_object_signal_emit(sd->end_handler,
-                                     "elm,handler,hide", "elm");
+                                     "efl,handler,hide", "efl");
              sd->end_handler_shown = EINA_FALSE;
           }
         eina_rectangle_free(rect);
@@ -648,13 +648,13 @@ _update_selection_handler(Eo *obj)
         if (sd->start_handler_shown)
           {
              edje_object_signal_emit(sd->start_handler,
-                                     "elm,handler,hide", "elm");
+                                     "efl,handler,hide", "efl");
              sd->start_handler_shown = EINA_FALSE;
           }
         if (sd->end_handler_shown)
           {
              edje_object_signal_emit(sd->end_handler,
-                                     "elm,handler,hide", "elm");
+                                     "efl,handler,hide", "efl");
              sd->end_handler_shown = EINA_FALSE;
           }
      }
@@ -804,11 +804,11 @@ _efl_ui_text_efl_ui_widget_on_disabled_update(Eo *obj, Efl_Ui_Text_Data *sd, Ein
                        _dnd_pos_cb, NULL,
                        _dnd_drop_cb, NULL);
 
-   emission = disabled ? "elm,state,disabled" : "elm,state,enabled";
-   edje_object_signal_emit(sd->entry_edje, emission, "elm");
+   emission = disabled ? "efl,state,disabled" : "efl,state,enabled";
+   edje_object_signal_emit(sd->entry_edje, emission, "efl");
    if (sd->scroll)
      {
-        edje_object_signal_emit(sd->scr_edje, emission, "elm");
+        edje_object_signal_emit(sd->scr_edje, emission, "efl");
         elm_interface_scrollable_freeze_set(obj, disabled);
      }
    sd->disabled = disabled;
@@ -881,7 +881,7 @@ _efl_ui_text_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Text_Data *sd)
                                    elm_widget_theme_element_get(obj));
 
    if (elm_widget_disabled_get(obj))
-     edje_object_signal_emit(sd->entry_edje, "elm,state,disabled", "elm");
+     edje_object_signal_emit(sd->entry_edje, "efl,state,disabled", "efl");
 
    edje_object_part_text_input_panel_layout_set
      (sd->entry_edje, "efl.text", (Edje_Input_Panel_Layout)sd->input_panel_layout);
@@ -912,9 +912,9 @@ _efl_ui_text_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Text_Data *sd)
 
    if (efl_ui_focus_object_focus_get(obj))
      {
-        edje_object_signal_emit(sd->entry_edje, "elm,action,focus", "elm");
+        edje_object_signal_emit(sd->entry_edje, "efl,action,focus", "efl");
         if (sd->scroll)
-          edje_object_signal_emit(sd->scr_edje, "elm,action,focus", "elm");
+          edje_object_signal_emit(sd->scr_edje, "efl,action,focus", "efl");
      }
 
    edje_object_message_signal_process(sd->entry_edje);
@@ -1144,9 +1144,9 @@ _efl_ui_text_efl_ui_focus_object_on_focus_update(Eo *obj, Efl_Ui_Text_Data *sd)
         Eo *sw = edje_object_part_swallow_get(sd->entry_edje, "efl.text");
         evas_object_focus_set(sw, EINA_TRUE);
 
-        _edje_signal_emit(sd, "elm,action,focus", "elm");
+        _edje_signal_emit(sd, "efl,action,focus", "efl");
         if (sd->scroll)
-          edje_object_signal_emit(sd->scr_edje, "elm,action,focus", "elm");
+          edje_object_signal_emit(sd->scr_edje, "efl,action,focus", "efl");
 
         if (top && top_is_win && sd->input_panel_enable && !sd->input_panel_show_on_demand)
           elm_win_keyboard_mode_set(top, ELM_WIN_KEYBOARD_ON);
@@ -1159,9 +1159,9 @@ _efl_ui_text_efl_ui_focus_object_on_focus_update(Eo *obj, Efl_Ui_Text_Data *sd)
      {
         Eo *sw = edje_object_part_swallow_get(sd->entry_edje, "efl.text");
 
-        _edje_signal_emit(sd, "elm,action,unfocus", "elm");
+        _edje_signal_emit(sd, "efl,action,unfocus", "efl");
         if (sd->scroll)
-          edje_object_signal_emit(sd->scr_edje, "elm,action,unfocus", "elm");
+          edje_object_signal_emit(sd->scr_edje, "efl,action,unfocus", "efl");
         evas_object_focus_set(sw, EINA_FALSE);
 
         if (top && top_is_win && sd->input_panel_enable)
@@ -1176,11 +1176,11 @@ _efl_ui_text_efl_ui_focus_object_on_focus_update(Eo *obj, Efl_Ui_Text_Data *sd)
                   sd->sel_mode = EINA_FALSE;
                   elm_widget_scroll_hold_pop(obj);
                   edje_object_part_text_select_allow_set(sd->entry_edje, "efl.text", EINA_FALSE);
-                  edje_object_signal_emit(sd->entry_edje, "elm,state,select,off", "elm");
+                  edje_object_signal_emit(sd->entry_edje, "efl,state,select,off", "efl");
                   edje_object_part_text_select_none(sd->entry_edje, "efl.text");
                }
           }
-        edje_object_signal_emit(sd->scr_edje, "validation,default", "elm");
+        edje_object_signal_emit(sd->scr_edje, "validation,default", "efl");
      }
 
    return EINA_TRUE;
@@ -1230,11 +1230,11 @@ _efl_ui_text_efl_ui_widget_widget_sub_object_del(Eo *obj, Efl_Ui_Text_Data *_pd
     * smart function */
    if (sobj == elm_layout_content_get(obj, "efl.icon"))
      {
-        elm_layout_signal_emit(obj, "elm,action,hide,icon", "elm");
+        elm_layout_signal_emit(obj, "efl,action,hide,icon", "efl");
      }
    else if (sobj == elm_layout_content_get(obj, "efl.end"))
      {
-        elm_layout_signal_emit(obj, "elm,action,hide,end", "elm");
+        elm_layout_signal_emit(obj, "efl,action,hide,end", "efl");
      }
 
    ret = elm_widget_sub_object_del(efl_super(obj, MY_CLASS), sobj);
@@ -1321,7 +1321,7 @@ _hover_selected_cb(void *data,
           edje_object_part_text_select_allow_set
             (sd->entry_edje, "efl.text", EINA_TRUE);
      }
-   edje_object_signal_emit(sd->entry_edje, "elm,state,select,on", "elm");
+   edje_object_signal_emit(sd->entry_edje, "efl,state,select,on", "efl");
 
    if (!_elm_config->desktop_entry)
      elm_widget_scroll_hold_push(data);
@@ -1478,7 +1478,7 @@ _cut_cb(Eo *obj)
    if (!_elm_config->desktop_entry)
      edje_object_part_text_select_allow_set
        (sd->entry_edje, "efl.text", EINA_FALSE);
-   edje_object_signal_emit(sd->entry_edje, "elm,state,select,off", "elm");
+   edje_object_signal_emit(sd->entry_edje, "efl,state,select,off", "efl");
 
    if (!_elm_config->desktop_entry)
      elm_widget_scroll_hold_pop(obj);
@@ -1507,7 +1507,7 @@ _copy_cb(Eo *obj)
      {
         edje_object_part_text_select_allow_set
           (sd->entry_edje, "efl.text", EINA_FALSE);
-        edje_object_signal_emit(sd->entry_edje, "elm,state,select,off", "elm");
+        edje_object_signal_emit(sd->entry_edje, "efl,state,select,off", "efl");
         elm_widget_scroll_hold_pop(obj);
      }
    _selection_store(ELM_SEL_TYPE_CLIPBOARD, obj);
@@ -1532,7 +1532,7 @@ _hover_cancel_cb(void *data,
    if (!_elm_config->desktop_entry)
      edje_object_part_text_select_allow_set
        (sd->entry_edje, "efl.text", EINA_FALSE);
-   edje_object_signal_emit(sd->entry_edje, "elm,state,select,off", "elm");
+   edje_object_signal_emit(sd->entry_edje, "efl,state,select,off", "efl");
    if (!_elm_config->desktop_entry)
      elm_widget_scroll_hold_pop(data);
    edje_object_part_text_select_none(sd->entry_edje, "efl.text");
@@ -1807,7 +1807,7 @@ static void
 _magnifier_hide(void *data)
 {
    EFL_UI_TEXT_DATA_GET(data, sd);
-   edje_object_signal_emit(sd->mgf_bg, "elm,action,hide,magnifier", "elm");
+   edje_object_signal_emit(sd->mgf_bg, "efl,action,hide,magnifier", "efl");
    elm_widget_scroll_freeze_pop(data);
    evas_object_hide(sd->mgf_clip);
 }
@@ -1816,7 +1816,7 @@ static void
 _magnifier_show(void *data)
 {
    EFL_UI_TEXT_DATA_GET(data, sd);
-   edje_object_signal_emit(sd->mgf_bg, "elm,action,show,magnifier", "elm");
+   edje_object_signal_emit(sd->mgf_bg, "efl,action,show,magnifier", "efl");
    elm_widget_scroll_freeze_push(data);
    evas_object_show(sd->mgf_clip);
 }
@@ -2181,11 +2181,11 @@ _entry_cursor_changed_signal_cb(void *data,
    sd->cur_changed = EINA_TRUE;
    if (efl_ui_focus_object_focus_get(data))
      {
-        edje_object_signal_emit(sd->entry_edje, "elm,action,show,cursor", "elm");
+        edje_object_signal_emit(sd->entry_edje, "efl,action,show,cursor", "efl");
      }
    else
      {
-        edje_object_signal_emit(sd->entry_edje, "elm,action,hide,cursor", "elm");
+        edje_object_signal_emit(sd->entry_edje, "efl,action,hide,cursor", "efl");
      }
 
    sd->deferred_decoration_cursor = EINA_TRUE;
@@ -2574,7 +2574,7 @@ _efl_ui_text_content_set(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED, const char
    if (!int_ret) return EINA_FALSE;
 
    /* too bad entry does not follow the pattern
-    * "elm,state,{icon,end},visible", we have to repeat ourselves */
+    * "efl,state,{icon,end},visible", we have to repeat ourselves */
    if (!part || !strcmp(part, "icon") || !strcmp(part, "efl.icon"))
      efl_ui_text_icon_visible_set(obj, EINA_TRUE);
 
@@ -2593,7 +2593,7 @@ _efl_ui_text_content_unset(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED, const cha
    if (!ret) return NULL;
 
    /* too bad entry does not follow the pattern
-    * "elm,state,{icon,end},hidden", we have to repeat ourselves */
+    * "efl,state,{icon,end},hidden", we have to repeat ourselves */
    if (!part || !strcmp(part, "icon") || !strcmp(part, "efl.icon"))
      efl_ui_text_icon_visible_set(obj, EINA_FALSE);
 
@@ -3426,7 +3426,7 @@ _efl_ui_text_select_none(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd)
         if (!_elm_config->desktop_entry)
           edje_object_part_text_select_allow_set
             (sd->entry_edje, "efl.text", EINA_FALSE);
-        edje_object_signal_emit(sd->entry_edje, "elm,state,select,off", "elm");
+        edje_object_signal_emit(sd->entry_edje, "efl,state,select,off", "efl");
      }
    if (sd->have_selection)
      efl_event_callback_call(obj, EFL_UI_EVENT_SELECTION_CLEARED, NULL);
diff --git a/src/lib/elementary/efl_ui_timepicker.c b/src/lib/elementary/efl_ui_timepicker.c
index 9d00554..3c13f4f 100644
--- a/src/lib/elementary/efl_ui_timepicker.c
+++ b/src/lib/elementary/efl_ui_timepicker.c
@@ -173,16 +173,16 @@ _fields_init(Eo *obj)
                        //TODO: monitoring locale change and update field location.
                        if (field == 0)
                          {
-                            elm_object_signal_emit(obj, "elm,state,colon,visible,field1", "elm");
-                            elm_object_signal_emit(obj, "elm,state,colon,invisible,field0", "elm");
+                            elm_object_signal_emit(obj, "efl,state,colon,visible,field1", "efl");
+                            elm_object_signal_emit(obj, "efl,state,colon,invisible,field0", "efl");
                          }
                        else
                          {
-                            elm_object_signal_emit(obj, "elm,state,colon,visible,field0", "elm");
-                            elm_object_signal_emit(obj, "elm,state,colon,invisible,field1", "elm");
+                            elm_object_signal_emit(obj, "efl,state,colon,visible,field0", "efl");
+                            elm_object_signal_emit(obj, "efl,state,colon,invisible,field1", "efl");
                          }
 
-                       elm_layout_signal_emit(obj, "elm,state,ampm,visible", "elm");
+                       elm_layout_signal_emit(obj, "efl,state,ampm,visible", "efl");
                        edje_object_message_signal_process(elm_layout_edje_get(obj));
                        efl_content_set(efl_part(obj, buf), pd->ampm);
                     }
@@ -267,9 +267,9 @@ _efl_ui_timepicker_ampm_set(Eo *obj, Efl_Ui_Timepicker_Data *pd, Eina_Bool is_24
 
    pd->is_24hour = is_24hour;
    if (pd->is_24hour == EINA_TRUE)
-     elm_layout_signal_emit(obj, "elm,state,ampm,invisible", "elm");
+     elm_layout_signal_emit(obj, "efl,state,ampm,invisible", "efl");
    else
-     elm_layout_signal_emit(obj, "elm,state,ampm,visible", "elm");
+     elm_layout_signal_emit(obj, "efl,state,ampm,visible", "efl");
    _field_value_update(obj);
 }
 
diff --git a/src/lib/elementary/efl_ui_video.c b/src/lib/elementary/efl_ui_video.c
index 58a3d8d..c9afad2 100644
--- a/src/lib/elementary/efl_ui_video.c
+++ b/src/lib/elementary/efl_ui_video.c
@@ -140,13 +140,19 @@ _on_size_hints_changed(void *data EINA_UNUSED,
 static void
 _on_open_done(void *data, const Efl_Event *event EINA_UNUSED)
 {
-   elm_layout_signal_emit(data, "elm,video,open", "elm");
+   if(elm_widget_is_legacy(data))
+     elm_layout_signal_emit(data, "elm,video,open", "elm");
+   else
+     elm_layout_signal_emit(data, "efl,video,open", "efl");
 }
 
 static void
 _on_playback_started(void *data, const Efl_Event *event EINA_UNUSED)
 {
-   elm_layout_signal_emit(data, "elm,video,play", "elm");
+   if(elm_widget_is_legacy(data))
+     elm_layout_signal_emit(data, "elm,video,play", "elm");
+   else
+     elm_layout_signal_emit(data, "efl,video,play", "efl");
 
    return;
 
@@ -157,7 +163,11 @@ _on_playback_finished(void *data, const Efl_Event *event EINA_UNUSED)
 {
    EFL_UI_VIDEO_DATA_GET(data, sd);
    emotion_object_play_set(sd->emotion, EINA_FALSE);
-   elm_layout_signal_emit(data, "elm,video,end", "elm");
+
+   if(elm_widget_is_legacy(data))
+     elm_layout_signal_emit(data, "elm,video,end", "elm");
+   else
+     elm_layout_signal_emit(data, "efl,video,end", "efl");
 }
 
 static void
@@ -174,8 +184,17 @@ _on_title_changed(void *data, const Efl_Event *event EINA_UNUSED)
    EFL_UI_VIDEO_DATA_GET(data, sd);
 
    title = emotion_object_title_get(sd->emotion);
-   elm_layout_text_set(data, "elm,title", title);
-   elm_layout_signal_emit(data, "elm,video,title", "elm");
+
+   if(elm_widget_is_legacy(data))
+     {
+        elm_layout_text_set(data, "elm,title", title);
+        elm_layout_signal_emit(data, "elm,video,title", "elm");
+     }
+   else
+     {
+        elm_layout_text_set(data, "efl,title", title);
+        elm_layout_signal_emit(data, "efl,video,title", "efl");
+     }
 }
 
 static void
@@ -279,7 +298,10 @@ _efl_ui_video_efl_file_file_set(Eo *obj, Efl_Ui_Video_Data *sd, const char *file
    if (filename && ((!strncmp(filename, "file://", 7)) || (!strstr(filename, "://"))))
      emotion_object_last_position_load(sd->emotion);
 
-   elm_layout_signal_emit(obj, "elm,video,load", "elm");
+   if(elm_widget_is_legacy(obj))
+     elm_layout_signal_emit(obj, "elm,video,load", "elm");
+   else
+     elm_layout_signal_emit(obj, "efl,video,load", "efl");
 
    return EINA_TRUE;
 }
@@ -314,7 +336,11 @@ _efl_ui_video_efl_player_play_set(Eo *obj, Efl_Ui_Video_Data *sd, Eina_Bool play
         ELM_SAFE_FREE(sd->timer, ecore_timer_del);
         sd->stop = EINA_FALSE;
         emotion_object_play_set(sd->emotion, EINA_TRUE);
-        elm_layout_signal_emit(obj, "elm,video,play", "elm");
+
+        if(elm_widget_is_legacy(obj))
+          elm_layout_signal_emit(obj, "elm,video,play", "elm");
+        else
+          elm_layout_signal_emit(obj, "efl,video,play", "efl");
      }
    else
      {
@@ -323,7 +349,11 @@ _efl_ui_video_efl_player_play_set(Eo *obj, Efl_Ui_Video_Data *sd, Eina_Bool play
          */
         if (!sd->timer) sd->timer = ecore_timer_add(20.0, _suspend_cb, obj);
         emotion_object_play_set(sd->emotion, EINA_FALSE);
-        elm_layout_signal_emit(obj, "elm,video,pause", "elm");
+
+        if(elm_widget_is_legacy(obj))
+          elm_layout_signal_emit(obj, "elm,video,pause", "elm");
+        else
+          elm_layout_signal_emit(obj, "efl,video,pause", "efl");
      }
 }
 
@@ -338,7 +368,12 @@ _efl_ui_video_efl_player_stop(Eo *obj, Efl_Ui_Video_Data *sd)
 
    sd->stop = EINA_TRUE;
    emotion_object_play_set(sd->emotion, EINA_FALSE);
-   elm_layout_signal_emit(obj, "elm,video,stop", "elm");
+
+   if(elm_widget_is_legacy(obj))
+     elm_layout_signal_emit(obj, "elm,video,stop", "elm");
+   else
+     elm_layout_signal_emit(obj, "efl,video,stop", "efl");
+
    emotion_object_suspend_set(sd->emotion, EMOTION_HIBERNATE);
 }
 
diff --git a/src/lib/elementary/efl_ui_widget.c b/src/lib/elementary/efl_ui_widget.c
index 5b1c5d5..db97056 100644
--- a/src/lib/elementary/efl_ui_widget.c
+++ b/src/lib/elementary/efl_ui_widget.c
@@ -3098,8 +3098,17 @@ elm_widget_theme_object_set(Evas_Object *obj, Evas_Object *edj, const char *wnam
    if (sd->orient_mode != -1)
      {
         char buf[128];
-        snprintf(buf, sizeof(buf), "elm,state,orient,%d", sd->orient_mode);
-        elm_widget_signal_emit(obj, buf, "elm");
+
+        if (elm_widget_is_legacy(obj))
+          {
+             snprintf(buf, sizeof(buf), "elm,state,orient,%d", sd->orient_mode);
+             elm_widget_signal_emit(obj, buf, "elm");
+          }
+        else
+          {
+             snprintf(buf, sizeof(buf), "efl,state,orient,%d", sd->orient_mode);
+             elm_widget_signal_emit(obj, buf, "efl");
+          }
      }
 
    return ret;
@@ -3583,8 +3592,17 @@ _efl_ui_widget_on_orientation_update(Eo *obj, Elm_Widget_Smart_Data *sd, int ori
    if (orient_mode != -1)
      {
         char buf[128];
-        snprintf(buf, sizeof(buf), "elm,state,orient,%d", orient_mode);
-        elm_widget_signal_emit(obj, buf, "elm");
+
+        if (elm_widget_is_legacy(obj))
+          {
+             snprintf(buf, sizeof(buf), "elm,state,orient,%d", orient_mode);
+             elm_widget_signal_emit(obj, buf, "elm");
+          }
+        else
+          {
+             snprintf(buf, sizeof(buf), "efl,state,orient,%d", orient_mode);
+             elm_widget_signal_emit(obj, buf, "efl");
+          }
      }
 }
 
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 14e6c9f..ea57983 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -1077,11 +1077,17 @@ _elm_win_focus_highlight_visible_set(Efl_Ui_Win_Data *sd,
    if (visible)
      {
         evas_object_show(fobj);
-        edje_object_signal_emit(fobj, "elm,action,focus,show", "elm");
+        if (elm_widget_is_legacy(sd->obj))
+          edje_object_signal_emit(fobj, "elm,action,focus,show", "elm");
+        else
+          edje_object_signal_emit(fobj, "efl,action,focus,show", "efl");
      }
    else
      {
-        edje_object_signal_emit(fobj, "elm,action,focus,hide", "elm");
+        if (elm_widget_is_legacy(sd->obj))
+          edje_object_signal_emit(fobj, "elm,action,focus,hide", "elm");
+        else
+          edje_object_signal_emit(fobj, "efl,action,focus,hide", "efl");
      }
 }
 
@@ -1137,7 +1143,10 @@ _elm_win_focus_highlight_simple_setup(Efl_Ui_Win_Data *sd,
         if (clip) evas_object_clip_set(obj, clip);
      }
 
-   edje_object_signal_emit(obj, "elm,state,anim,stop", "elm");
+   if (elm_widget_is_legacy(sd->obj))
+     edje_object_signal_emit(obj, "elm,state,anim,stop", "elm");
+   else
+     edje_object_signal_emit(obj, "efl,state,anim,stop", "efl");
 }
 
 static void
@@ -1178,8 +1187,14 @@ _elm_win_focus_highlight_reconfigure_job(void *data)
         evas_object_event_callback_del_full
            (previous, EVAS_CALLBACK_DEL, _elm_win_focus_prev_target_del, data);
         if (sd->focus_highlight.prev.in_theme)
-          elm_widget_signal_emit
-             (previous, "elm,action,focus_highlight,hide", "elm");
+          {
+             if (elm_widget_is_legacy(sd->obj))
+               elm_widget_signal_emit
+                  (previous, "elm,action,focus_highlight,hide", "elm");
+             else
+               elm_widget_signal_emit
+                  (previous, "efl,action,focus_highlight,hide", "efl");
+          }
      }
 
    if (!target)
@@ -1187,16 +1202,32 @@ _elm_win_focus_highlight_reconfigure_job(void *data)
    else if (sd->focus_highlight.cur.in_theme)
      {
         common_visible = EINA_FALSE;
-        if (sd->focus_highlight.cur.visible)
-          sig = "elm,action,focus_highlight,show";
+
+        if (elm_widget_is_legacy(sd->obj))
+          {
+             if (sd->focus_highlight.cur.visible)
+               sig = "elm,action,focus_highlight,show";
+             else
+               sig = "elm,action,focus_highlight,hide";
+          }
         else
-          sig = "elm,action,focus_highlight,hide";
+          {
+             if (sd->focus_highlight.cur.visible)
+               sig = "efl,action,focus_highlight,show";
+             else
+               sig = "efl,action,focus_highlight,hide";
+          }
      }
    else
      common_visible = sd->focus_highlight.cur.visible;
 
    if (sig)
-     elm_widget_signal_emit(target, sig, "elm");
+     {
+        if (elm_widget_is_legacy(sd->obj))
+          elm_widget_signal_emit(target, sig, "elm");
+        else
+          elm_widget_signal_emit(target, sig, "efl");
+     }
 
    if ((!target) || (!common_visible) || (sd->focus_highlight.cur.in_theme))
      {
@@ -2232,6 +2263,7 @@ _elm_win_modality_increment(Efl_Ui_Win_Data *modalsd)
 {
    Efl_Ui_Win *current;
    Eina_List *l;
+   Eina_Bool is_legacy = elm_widget_is_legacy(modalsd->obj);
 
    EINA_LIST_FOREACH(_elm_win_list, l, current)
      {
@@ -2241,7 +2273,10 @@ _elm_win_modality_increment(Efl_Ui_Win_Data *modalsd)
         if (cursd->modal_count > 0)
           {
              Edje_Object *ed = _elm_win_modal_blocker_edje_get(cursd);
-             edje_object_signal_emit(ed, "elm,action,show_blocker", "elm");
+             if (is_legacy)
+               edje_object_signal_emit(ed, "elm,action,show_blocker", "elm");
+             else
+               edje_object_signal_emit(ed, "efl,action,show_blocker", "efl");
              efl_event_callback_legacy_call
                    (cursd->main_menu, EFL_UI_WIN_EVENT_ELM_ACTION_BLOCK_MENU, NULL);
              _elm_win_frame_style_update(cursd, 0, 1);
@@ -2254,6 +2289,7 @@ _elm_win_modality_decrement(Efl_Ui_Win_Data *modalsd)
 {
    Efl_Ui_Win *current;
    Eina_List *l;
+   Eina_Bool is_legacy = elm_widget_is_legacy(modalsd->obj);
 
    EINA_LIST_FOREACH(_elm_win_list, l, current)
      {
@@ -2263,7 +2299,10 @@ _elm_win_modality_decrement(Efl_Ui_Win_Data *modalsd)
         if (cursd->modal_count == 0)
           {
              Edje_Object *ed = _elm_win_modal_blocker_edje_get(cursd);
-             edje_object_signal_emit(ed, "elm,action,hide_blocker", "elm");
+             if (is_legacy)
+               edje_object_signal_emit(ed, "elm,action,hide_blocker", "elm");
+             else
+               edje_object_signal_emit(ed, "efl,action,hide_blocker", "efl");
              efl_event_callback_legacy_call
                    (cursd->main_menu, ELM_MENU_EVENT_ELM_ACTION_UNBLOCK_MENU, NULL);
              _elm_win_frame_style_update(cursd, 0, 1);
@@ -2687,8 +2726,12 @@ _elm_win_focus_highlight_shutdown(Efl_Ui_Win_Data *sd)
    _elm_win_focus_highlight_reconfigure_job_stop(sd);
    if (sd->focus_highlight.cur.target)
      {
-        elm_widget_signal_emit(sd->focus_highlight.cur.target,
-                               "elm,action,focus_highlight,hide", "elm");
+        if (elm_widget_is_legacy(sd->obj))
+          elm_widget_signal_emit(sd->focus_highlight.cur.target,
+                                 "elm,action,focus_highlight,hide", "elm");
+        else
+          elm_widget_signal_emit(sd->focus_highlight.cur.target,
+                                 "efl,action,focus_highlight,hide", "efl");
         _elm_win_focus_target_callbacks_del(sd);
         evas_object_event_callback_del_full
            (sd->focus_highlight.cur.target,
@@ -3826,12 +3869,25 @@ _elm_win_focus_highlight_init(Efl_Ui_Win_Data *sd)
    if (!sd->focus_highlight.fobj)
      {
         sd->focus_highlight.fobj = edje_object_add(sd->evas);
-        edje_object_signal_callback_add(sd->focus_highlight.fobj,
-                                        "elm,action,focus,hide,end", "*",
-                                        _elm_win_focus_highlight_hide, NULL);
-        edje_object_signal_callback_add(sd->focus_highlight.fobj,
-                                        "elm,action,focus,anim,end", "*",
-                                        _elm_win_focus_highlight_anim_end, sd->obj);
+
+        if (elm_widget_is_legacy(sd->obj))
+          {
+             edje_object_signal_callback_add(sd->focus_highlight.fobj,
+                                             "elm,action,focus,hide,end", "*",
+                                             _elm_win_focus_highlight_hide, NULL);
+             edje_object_signal_callback_add(sd->focus_highlight.fobj,
+                                             "elm,action,focus,anim,end", "*",
+                                             _elm_win_focus_highlight_anim_end, sd->obj);
+          }
+        else
+          {
+             edje_object_signal_callback_add(sd->focus_highlight.fobj,
+                                             "efl,action,focus,hide,end", "*",
+                                             _elm_win_focus_highlight_hide, NULL);
+             edje_object_signal_callback_add(sd->focus_highlight.fobj,
+                                             "efl,action,focus,anim,end", "*",
+                                             _elm_win_focus_highlight_anim_end, sd->obj);
+          }
      }
 
    _elm_win_focus_highlight_reconfigure_job_start(sd);
@@ -4353,31 +4409,66 @@ _elm_win_frame_add(Efl_Ui_Win_Data *sd, const char *element, const char *style)
    evas_object_event_callback_add
      (sd->frame_obj, EVAS_CALLBACK_RESIZE, _elm_win_frame_obj_resize, sd);
 
-   edje_object_signal_callback_add
-     (sd->frame_obj, "elm,action,move,start", "elm",
-     _elm_win_frame_cb_move_start, obj);
-   edje_object_signal_callback_add
-     (sd->frame_obj, "elm,action,move,stop", "elm",
-     _elm_win_frame_cb_move_stop, obj);
-   edje_object_signal_callback_add
-     (sd->frame_obj, "elm,action,resize,show", "*",
-     _elm_win_frame_cb_resize_show, obj);
-   edje_object_signal_callback_add
-     (sd->frame_obj, "elm,action,resize,hide", "*",
-     _elm_win_frame_cb_resize_hide, obj);
-   edje_object_signal_callback_add
-     (sd->frame_obj, "elm,action,resize,start", "*",
-     _elm_win_frame_cb_resize_start, obj);
-   edje_object_signal_callback_add
-     (sd->frame_obj, "elm,action,minimize", "elm",
-     _elm_win_frame_cb_minimize, obj);
-   edje_object_signal_callback_add
-     (sd->frame_obj, "elm,action,maximize", "elm",
-     _elm_win_frame_cb_maximize, obj);
-   edje_object_signal_callback_add
-     (sd->frame_obj, "elm,action,close", "elm", _elm_win_frame_cb_close, obj);
-   edje_object_signal_callback_add
-     (sd->frame_obj, "elm,action,menu", "elm", _elm_win_frame_cb_menu, obj);
+   if (elm_widget_is_legacy(sd->obj))
+     {
+        edje_object_signal_callback_add
+           (sd->frame_obj, "elm,action,move,start", "elm",
+            _elm_win_frame_cb_move_start, obj);
+        edje_object_signal_callback_add
+           (sd->frame_obj, "elm,action,move,stop", "elm",
+            _elm_win_frame_cb_move_stop, obj);
+        edje_object_signal_callback_add
+           (sd->frame_obj, "elm,action,resize,show", "*",
+            _elm_win_frame_cb_resize_show, obj);
+        edje_object_signal_callback_add
+           (sd->frame_obj, "elm,action,resize,hide", "*",
+            _elm_win_frame_cb_resize_hide, obj);
+        edje_object_signal_callback_add
+           (sd->frame_obj, "elm,action,resize,start", "*",
+            _elm_win_frame_cb_resize_start, obj);
+        edje_object_signal_callback_add
+           (sd->frame_obj, "elm,action,minimize", "elm",
+            _elm_win_frame_cb_minimize, obj);
+        edje_object_signal_callback_add
+           (sd->frame_obj, "elm,action,maximize", "elm",
+            _elm_win_frame_cb_maximize, obj);
+        edje_object_signal_callback_add
+           (sd->frame_obj, "elm,action,close", "elm",
+            _elm_win_frame_cb_close, obj);
+        edje_object_signal_callback_add
+           (sd->frame_obj, "elm,action,menu", "elm",
+            _elm_win_frame_cb_menu, obj);
+     }
+   else
+     {
+        edje_object_signal_callback_add
+           (sd->frame_obj, "efl,action,move,start", "efl",
+            _elm_win_frame_cb_move_start, obj);
+        edje_object_signal_callback_add
+           (sd->frame_obj, "efl,action,move,stop", "efl",
+            _elm_win_frame_cb_move_stop, obj);
+        edje_object_signal_callback_add
+           (sd->frame_obj, "efl,action,resize,show", "*",
+            _elm_win_frame_cb_resize_show, obj);
+        edje_object_signal_callback_add
+           (sd->frame_obj, "efl,action,resize,hide", "*",
+            _elm_win_frame_cb_resize_hide, obj);
+        edje_object_signal_callback_add
+           (sd->frame_obj, "efl,action,resize,start", "*",
+            _elm_win_frame_cb_resize_start, obj);
+        edje_object_signal_callback_add
+           (sd->frame_obj, "efl,action,minimize", "efl",
+            _elm_win_frame_cb_minimize, obj);
+        edje_object_signal_callback_add
+           (sd->frame_obj, "efl,action,maximize", "efl",
+            _elm_win_frame_cb_maximize, obj);
+        edje_object_signal_callback_add
+           (sd->frame_obj, "efl,action,close", "efl",
+            _elm_win_frame_cb_close, obj);
+        edje_object_signal_callback_add
+           (sd->frame_obj, "efl,action,menu", "efl",
+            _elm_win_frame_cb_menu, obj);
+     }
 
    if (!sd->pointer.obj)
      {
@@ -4487,25 +4578,40 @@ _elm_win_frame_style_update(Efl_Ui_Win_Data *sd, Eina_Bool force_emit, Eina_Bool
    if (trap && sd->csd.wayland && sd->csd.need_borderless)
      shadow = 0;
 
-#define STATE_SET(state, s1, s2) do { \
+#define STATE_SET(state, s1, s2, s3) do { \
    if (force_emit || (state != sd->csd.cur_##state)) \
      { \
         const char *sig = state ? s1 : s2; \
-        edje_object_signal_emit(sd->frame_obj, sig, "elm"); \
+        edje_object_signal_emit(sd->frame_obj, sig, s3); \
         DBG("frame style emit: %p %s", sd->obj, sig); \
         sd->csd.cur_##state = state; \
         changed = EINA_TRUE; \
      } } while (0)
 
-   STATE_SET(borderless, "elm,state,borderless,on", "elm,state,borderless,off");
-   STATE_SET(shadow, "elm,state,shadow,on", "elm,state,shadow,off");
-   STATE_SET(maximized, "elm,state,maximized", "elm,state,unmaximized");
-   STATE_SET(focus, "elm,action,focus", "elm,action,unfocus");
-   STATE_SET(bg_solid, "elm,state,background,solid,on", "elm,state,background,solid,off");
-   STATE_SET(bg_standard, "elm,state,background,standard,on", "elm,state,background,standard,off");
-   STATE_SET(unresizable, "elm,state,unresizable,on", "elm,state,unresizable,off");
-   STATE_SET(menu, "elm,action,show_menu", "elm,action,hide_menu");
-   STATE_SET(indicator, "elm,action,show_indicator", "elm,action,hide_indicator");
+   if (elm_widget_is_legacy(sd->obj))
+     {
+        STATE_SET(borderless, "elm,state,borderless,on", "elm,state,borderless,off", "elm");
+        STATE_SET(shadow, "elm,state,shadow,on", "elm,state,shadow,off", "elm");
+        STATE_SET(maximized, "elm,state,maximized", "elm,state,unmaximized", "elm");
+        STATE_SET(focus, "elm,action,focus", "elm,action,unfocus", "elm");
+        STATE_SET(bg_solid, "elm,state,background,solid,on", "elm,state,background,solid,off", "elm");
+        STATE_SET(bg_standard, "elm,state,background,standard,on", "elm,state,background,standard,off", "elm");
+        STATE_SET(unresizable, "elm,state,unresizable,on", "elm,state,unresizable,off", "elm");
+        STATE_SET(menu, "elm,action,show_menu", "elm,action,hide_menu", "elm");
+        STATE_SET(indicator, "elm,action,show_indicator", "elm,action,hide_indicator", "elm");
+     }
+   else
+     {
+        STATE_SET(borderless, "efl,state,borderless,on", "efl,state,borderless,off", "efl");
+        STATE_SET(shadow, "efl,state,shadow,on", "efl,state,shadow,off", "efl");
+        STATE_SET(maximized, "efl,state,maximized", "efl,state,unmaximized", "efl");
+        STATE_SET(focus, "efl,action,focus", "efl,action,unfocus", "efl");
+        STATE_SET(bg_solid, "efl,state,background,solid,on", "efl,state,background,solid,off", "efl");
+        STATE_SET(bg_standard, "efl,state,background,standard,on", "efl,state,background,standard,off", "efl");
+        STATE_SET(unresizable, "efl,state,unresizable,on", "efl,state,unresizable,off", "efl");
+        STATE_SET(menu, "efl,action,show_menu", "efl,action,hide_menu", "efl");
+        STATE_SET(indicator, "efl,action,show_indicator", "efl,action,hide_indicator", "efl");
+     }
 
 #undef STATE_SET
 
@@ -5959,7 +6065,10 @@ _dbus_menu_set(Eina_Bool dbus_connect, void *data)
           {
              // Note: Based on EFL 1.18 the signal was "elm,action,hide"
              // and not "elm,action,hide_menu" as expected.
-             edje_object_signal_emit(swallow, "elm,action,hide", "elm");
+             if (elm_widget_is_legacy(data))
+               edje_object_signal_emit(swallow, "elm,action,hide", "elm");
+             else
+               edje_object_signal_emit(swallow, "efl,action,hide", "efl");
              edje_object_message_signal_recursive_process(swallow);
           }
      }
@@ -5981,7 +6090,10 @@ _dbus_menu_set(Eina_Bool dbus_connect, void *data)
           }
         else
           {
-             edje_object_signal_emit(swallow, "elm,action,show_menu", "elm");
+             if (elm_widget_is_legacy(data))
+               edje_object_signal_emit(swallow, "elm,action,show_menu", "elm");
+             else
+               edje_object_signal_emit(swallow, "efl,action,show_menu", "efl");
              edje_object_message_signal_recursive_process(swallow);
           }
      }
@@ -6478,7 +6590,7 @@ _efl_ui_win_keyboard_mode_get(const Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd)
 }
 
 EOLIAN static void
-_efl_ui_win_indicator_mode_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, Efl_Ui_Win_Indicator_Mode mode)
+_efl_ui_win_indicator_mode_set(Eo *obj, Efl_Ui_Win_Data *sd, Efl_Ui_Win_Indicator_Mode mode)
 {
    sd->legacy.forbidden = EINA_TRUE;
    if (sd->indimode == mode) return;
@@ -6492,12 +6604,24 @@ _efl_ui_win_indicator_mode_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, Efl_Ui_
 
    if (!sd->indicator) _indicator_add(sd);
 
-   if (sd->indimode == EFL_UI_WIN_INDICATOR_BG_OPAQUE)
-     edje_object_signal_emit(sd->frame_obj, "elm,action,indicator,bg_opaque", "elm");
-   else if (sd->indimode == EFL_UI_WIN_INDICATOR_BG_TRANSPARENT)
-     edje_object_signal_emit(sd->frame_obj, "elm,action,indicator,bg_transparent", "elm");
-   else if (sd->indimode == EFL_UI_WIN_INDICATOR_HIDDEN)
-     edje_object_signal_emit(sd->frame_obj, "elm,action,indicator,hidden", "elm");
+   if (elm_widget_is_legacy(obj))
+     {
+        if (sd->indimode == EFL_UI_WIN_INDICATOR_BG_OPAQUE)
+          edje_object_signal_emit(sd->frame_obj, "elm,action,indicator,bg_opaque", "elm");
+        else if (sd->indimode == EFL_UI_WIN_INDICATOR_BG_TRANSPARENT)
+          edje_object_signal_emit(sd->frame_obj, "elm,action,indicator,bg_transparent", "elm");
+        else if (sd->indimode == EFL_UI_WIN_INDICATOR_HIDDEN)
+          edje_object_signal_emit(sd->frame_obj, "elm,action,indicator,hidden", "elm");
+     }
+   else
+     {
+        if (sd->indimode == EFL_UI_WIN_INDICATOR_BG_OPAQUE)
+          edje_object_signal_emit(sd->frame_obj, "efl,action,indicator,bg_opaque", "efl");
+        else if (sd->indimode == EFL_UI_WIN_INDICATOR_BG_TRANSPARENT)
+          edje_object_signal_emit(sd->frame_obj, "efl,action,indicator,bg_transparent", "efl");
+        else if (sd->indimode == EFL_UI_WIN_INDICATOR_HIDDEN)
+          edje_object_signal_emit(sd->frame_obj, "efl,action,indicator,hidden", "efl");
+     }
 
    edje_object_message_signal_process(sd->frame_obj);
    evas_object_smart_calculate(sd->frame_obj);
diff --git a/src/lib/elementary/els_tooltip.c b/src/lib/elementary/els_tooltip.c
index 322ebbc..8021aa3 100644
--- a/src/lib/elementary/els_tooltip.c
+++ b/src/lib/elementary/els_tooltip.c
@@ -280,7 +280,11 @@ _elm_tooltip_hide_anim_start(Elm_Tooltip *tt)
    TTDBG("HIDE START\n");
    /* hide slightly faster when in window mode to look less stupid */
    if ((tt->hide_timeout > 0) && tt->tt_win) extra = 0.1;
-   edje_object_signal_emit(tt->tooltip, "elm,action,hide", "elm");
+
+   if (elm_widget_is_legacy(tt->owner))
+     edje_object_signal_emit(tt->tooltip, "elm,action,hide", "elm");
+   else
+     edje_object_signal_emit(tt->tooltip, "efl,action,hide", "efl");
    tt->hide_timer = ecore_timer_add
      (tt->hide_timeout - extra, _elm_tooltip_hide_anim_cb, tt);
 }
@@ -290,7 +294,12 @@ _elm_tooltip_hide_anim_stop(Elm_Tooltip *tt)
 {
    if (!tt->hide_timer) return;
    if (tt->tooltip)
-     edje_object_signal_emit(tt->tooltip, "elm,action,show", "elm");
+     {
+        if (elm_widget_is_legacy(tt->owner))
+          edje_object_signal_emit(tt->tooltip, "elm,action,show", "elm");
+        else
+          edje_object_signal_emit(tt->tooltip, "efl,action,show", "efl");
+     }
 
    ELM_SAFE_FREE(tt->hide_timer, ecore_timer_del);
 }
@@ -500,7 +509,10 @@ _elm_tooltip_reconfigure(Elm_Tooltip *tt)
                                         tt->content);
           }
 
-        edje_object_signal_emit(tt->tooltip, "elm,action,show", "elm");
+        if (elm_widget_is_legacy(tt->owner))
+          edje_object_signal_emit(tt->tooltip, "elm,action,show", "elm");
+        else
+          edje_object_signal_emit(tt->tooltip, "efl,action,show", "efl");
      }
 
    if (!tt->content)