24 files changed, 98 insertions, 98 deletions

diff --git a/src/Makefile_Edje.am b/src/Makefile_Edje.am
index fd7c903e38..2c1921a7e3 100644
--- a/src/Makefile_Edje.am
+++ b/src/Makefile_Edje.am
@@ -3,7 +3,7 @@
 
 edje_eolian_files = \
         lib/edje/efl_canvas_layout_calc.eo \
-        lib/edje/efl_canvas_layout_signal.eo \
+        lib/edje/efl_layout_signal.eo \
         lib/edje/efl_canvas_layout_group.eo \
         lib/edje/edje_object.eo \
         lib/edje/efl_canvas_layout_part.eo \
diff --git a/src/lib/edje/Edje_Eo.h b/src/lib/edje/Edje_Eo.h
index 877f3bea07..9f3c7bc3bc 100644
--- a/src/lib/edje/Edje_Eo.h
+++ b/src/lib/edje/Edje_Eo.h
@@ -1,7 +1,7 @@
 #include <Efl.h>
 
 #include "efl_canvas_layout_calc.eo.h"
-#include "efl_canvas_layout_signal.eo.h"
+#include "efl_layout_signal.eo.h"
 #include "efl_canvas_layout_group.eo.h"
 #include "edje_object.eo.h"
 #include "edje_edit.eo.h"
diff --git a/src/lib/edje/edje_legacy.c b/src/lib/edje/edje_legacy.c
index 4bf32aa0f6..700d17cbd6 100644
--- a/src/lib/edje/edje_legacy.c
+++ b/src/lib/edje/edje_legacy.c
@@ -64,20 +64,20 @@ edje_object_part_state_get(const Edje_Object *obj, const char * part, double *va
 EAPI void
 edje_object_message_signal_process(Edje_Object *obj)
 {
-   efl_canvas_layout_signal_process(obj, EINA_FALSE);
+   efl_layout_signal_process(obj, EINA_FALSE);
 }
 
 /* since 1.20 */
 EAPI void
 edje_object_message_signal_recursive_process(Edje_Object *obj)
 {
-   efl_canvas_layout_signal_process(obj, EINA_TRUE);
+   efl_layout_signal_process(obj, EINA_TRUE);
 }
 
 EAPI void
 edje_object_signal_callback_add(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func, void *data)
 {
-   efl_canvas_layout_signal_callback_add(obj, emission, source, (Efl_Signal_Cb) func, data);
+   efl_layout_signal_callback_add(obj, emission, source, (Efl_Signal_Cb) func, data);
 }
 
 EAPI void *
@@ -133,7 +133,7 @@ edje_object_signal_callback_del(Evas_Object *obj, const char *emission, const ch
 EAPI void
 edje_object_signal_emit(Evas_Object *obj, const char *emission, const char *source)
 {
-   efl_canvas_layout_signal_emit(obj, emission, source);
+   efl_layout_signal_emit(obj, emission, source);
 }
 
 EAPI Eina_Bool
diff --git a/src/lib/edje/edje_message_queue.c b/src/lib/edje/edje_message_queue.c
index 4e132154ec..d971582e4d 100644
--- a/src/lib/edje/edje_message_queue.c
+++ b/src/lib/edje/edje_message_queue.c
@@ -32,7 +32,7 @@ _edje_object_message_propagate_send(Evas_Object *obj, Edje_Message_Type type, in
 }
 
 EOLIAN void
-_edje_object_efl_canvas_layout_signal_message_send(Eo *obj, Edje *pd EINA_UNUSED, int id, const Eina_Value val)
+_edje_object_efl_layout_signal_message_send(Eo *obj, Edje *pd EINA_UNUSED, int id, const Eina_Value val)
 {
    const Eina_Value_Type *valtype;
    Edje_Message_Type msgtype;
@@ -228,7 +228,7 @@ end:
 }
 
 EOLIAN void
-_edje_object_efl_canvas_layout_signal_signal_process(Eo *obj, Edje *ed, Eina_Bool recurse)
+_edje_object_efl_layout_signal_signal_process(Eo *obj, Edje *ed, Eina_Bool recurse)
 {
    Eina_List *l;
    Evas_Object *o;
@@ -238,7 +238,7 @@ _edje_object_efl_canvas_layout_signal_signal_process(Eo *obj, Edje *ed, Eina_Boo
    if (!recurse) return;
 
    EINA_LIST_FOREACH(ed->subobjs, l, o)
-     efl_canvas_layout_signal_process(o, EINA_TRUE);
+     efl_layout_signal_process(o, EINA_TRUE);
 }
 
 static Eina_Bool
diff --git a/src/lib/edje/edje_object.eo b/src/lib/edje/edje_object.eo
index 66d584bb4a..af514c52e2 100644
--- a/src/lib/edje/edje_object.eo
+++ b/src/lib/edje/edje_object.eo
@@ -4,7 +4,7 @@ import edje_types;
 
 class Edje.Object (Efl.Canvas.Group, Efl.File, Efl.Container, Efl.Part,
                    Efl.Observer, Efl.Ui.Base, Efl.Canvas.Layout_Calc,
-                   Efl.Canvas.Layout_Signal, Efl.Canvas.Layout_Group,
+                   Efl.Layout.Signal, Efl.Canvas.Layout_Group,
                    Efl.Player, Efl.Gfx.Color_Class, Efl.Gfx.Text_Class,
                    Efl.Gfx.Size_Class)
 {
@@ -118,11 +118,11 @@ class Edje.Object (Efl.Canvas.Group, Efl.File, Efl.Container, Efl.Part,
       Efl.Canvas.Layout_Group.group_size_min { get; }
       Efl.Canvas.Layout_Group.group_size_max { get; }
       Efl.Canvas.Layout_Group.group_data { get; }
-      Efl.Canvas.Layout_Signal.message_send;
-      Efl.Canvas.Layout_Signal.signal_callback_add;
-      Efl.Canvas.Layout_Signal.signal_callback_del;
-      Efl.Canvas.Layout_Signal.signal_emit;
-      Efl.Canvas.Layout_Signal.signal_process;
+      Efl.Layout.Signal.message_send;
+      Efl.Layout.Signal.signal_callback_add;
+      Efl.Layout.Signal.signal_callback_del;
+      Efl.Layout.Signal.signal_emit;
+      Efl.Layout.Signal.signal_process;
       Efl.Ui.Base.mirrored { set; get; }
       Efl.Ui.Base.language { set; get; }
       Efl.Gfx.scale { set; get; }
diff --git a/src/lib/edje/edje_program.c b/src/lib/edje/edje_program.c
index a231f244ac..7412fa2674 100644
--- a/src/lib/edje/edje_program.c
+++ b/src/lib/edje/edje_program.c
@@ -248,13 +248,13 @@ edje_object_propagate_callback_add(Evas_Object *obj, Efl_Signal_Cb func, void *d
 }
 
 EOLIAN Eina_Bool
-_edje_object_efl_canvas_layout_signal_signal_callback_add(Eo *obj EINA_UNUSED, Edje *ed, const char *emission, const char *source, Efl_Signal_Cb func, void *data)
+_edje_object_efl_layout_signal_signal_callback_add(Eo *obj EINA_UNUSED, Edje *ed, const char *emission, const char *source, Efl_Signal_Cb func, void *data)
 {
    return _edje_object_signal_callback_add(ed, emission, source, func, data);
 }
 
 EOLIAN Eina_Bool
-_edje_object_efl_canvas_layout_signal_signal_callback_del(Eo *obj EINA_UNUSED, Edje *ed, const char *emission, const char *source, Efl_Signal_Cb func, void *data)
+_edje_object_efl_layout_signal_signal_callback_del(Eo *obj EINA_UNUSED, Edje *ed, const char *emission, const char *source, Efl_Signal_Cb func, void *data)
 {
    Edje_Signal_Callback_Group *gp;
    Eina_Bool ok;
@@ -277,7 +277,7 @@ _edje_object_efl_canvas_layout_signal_signal_callback_del(Eo *obj EINA_UNUSED, E
 }
 
 EOLIAN void
-_edje_object_efl_canvas_layout_signal_signal_emit(Eo *obj EINA_UNUSED, Edje *ed, const char *emission, const char *source)
+_edje_object_efl_layout_signal_signal_emit(Eo *obj EINA_UNUSED, Edje *ed, const char *emission, const char *source)
 {
    if (ed->delete_me) return;
    if ((!emission) || (!source)) return;
diff --git a/src/lib/edje/edje_smart.c b/src/lib/edje/edje_smart.c
index 733879c36a..662d4f5618 100644
--- a/src/lib/edje/edje_smart.c
+++ b/src/lib/edje/edje_smart.c
@@ -545,5 +545,5 @@ _edje_object_efl_player_play_speed_get(Eo *obj EINA_UNUSED, Edje *pd)
 #include "edje_object.eo.c"
 #include "edje_global.eo.c"
 #include "efl_canvas_layout_calc.eo.c"
-#include "efl_canvas_layout_signal.eo.c"
+#include "efl_layout_signal.eo.c"
 #include "efl_canvas_layout_group.eo.c"
diff --git a/src/lib/edje/efl_canvas_layout_signal.eo b/src/lib/edje/efl_layout_signal.eo
index 669c7e4ed9..708dc3279a 100644
--- a/src/lib/edje/efl_canvas_layout_signal.eo
+++ b/src/lib/edje/efl_layout_signal.eo
@@ -10,7 +10,7 @@
 
 type Efl.Signal_Cb: __undefined_type; [[Signal callback.]]
 
-interface Efl.Canvas.Layout_Signal
+interface Efl.Layout.Signal
 {
    [[Layouts asynchronous messaging and signaling interface.
 
diff --git a/src/lib/elementary/efl_ui_check.c b/src/lib/elementary/efl_ui_check.c
index d0997bad4a..c79e430756 100644
--- a/src/lib/elementary/efl_ui_check.c
+++ b/src/lib/elementary/efl_ui_check.c
@@ -328,11 +328,11 @@ _efl_ui_check_efl_object_constructor(Eo *obj, Efl_Ui_Check_Data *pd EINA_UNUSED)
      CRI("Failed to set layout!");
 
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL);
-   efl_canvas_layout_signal_callback_add
+   efl_layout_signal_callback_add
      (wd->resize_obj, "elm,action,check,on", "*", _on_check_on, obj);
-   efl_canvas_layout_signal_callback_add
+   efl_layout_signal_callback_add
      (wd->resize_obj, "elm,action,check,off", "*", _on_check_off, obj);
-   efl_canvas_layout_signal_callback_add
+   efl_layout_signal_callback_add
      (wd->resize_obj, "elm,action,check,toggle", "*", _on_check_toggle, obj);
 
    efl_access_role_set(obj, EFL_ACCESS_ROLE_CHECK_BOX);
diff --git a/src/lib/elementary/efl_ui_image.c b/src/lib/elementary/efl_ui_image.c
index 8038e846ca..292875d804 100644
--- a/src/lib/elementary/efl_ui_image.c
+++ b/src/lib/elementary/efl_ui_image.c
@@ -1165,7 +1165,7 @@ _efl_ui_image_efl_file_file_set(Eo *obj, Efl_Ui_Image_Data *sd, const char *file
 }
 
 EOLIAN static void
-_efl_ui_image_efl_canvas_layout_signal_signal_emit(Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *sd, const char *emission, const char *source)
+_efl_ui_image_efl_layout_signal_signal_emit(Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *sd, const char *emission, const char *source)
 {
    if (sd->edje)
      edje_object_signal_emit(sd->img, emission, source);
diff --git a/src/lib/elementary/efl_ui_image.eo b/src/lib/elementary/efl_ui_image.eo
index 09faa043aa..3e6f1e6174 100644
--- a/src/lib/elementary/efl_ui_image.eo
+++ b/src/lib/elementary/efl_ui_image.eo
@@ -48,7 +48,7 @@ class Efl.Ui.Image (Elm.Widget, Efl.Ui.Clickable, Efl.Ui.Draggable,
                  Efl.Access.Image, Efl.Access.Widget.Action,
                  Efl.Orientation, Efl.Flipable,
                  Efl.Ui.View, Efl.Ui.Model.Connect, Efl.Canvas.Layout_Calc,
-                 Efl.Canvas.Layout_Group, Efl.Canvas.Layout_Signal)
+                 Efl.Canvas.Layout_Group, Efl.Layout.Signal)
 {
    [[ Efl UI image class]]
    event_prefix: efl_ui_image;
@@ -137,7 +137,7 @@ class Efl.Ui.Image (Elm.Widget, Efl.Ui.Clickable, Efl.Ui.Draggable,
       Efl.Flipable.flip { get; set; }
       Efl.Player.playable { get; }
       Efl.Player.play { get; set; }
-      Efl.Canvas.Layout_Signal.signal_emit;
+      Efl.Layout.Signal.signal_emit;
       Efl.Canvas.Layout_Group.group_size_min { get; }
       Efl.Canvas.Layout_Group.group_size_max { get; }
       //Efl.Canvas.Layout_Group.group_data { get; }
diff --git a/src/lib/elementary/efl_ui_layout.c b/src/lib/elementary/efl_ui_layout.c
index 0e42559af9..f1efc08143 100644
--- a/src/lib/elementary/efl_ui_layout.c
+++ b/src/lib/elementary/efl_ui_layout.c
@@ -816,27 +816,27 @@ _efl_ui_layout_theme_set(Eo *obj, Efl_Ui_Layout_Data *sd, const char *klass, con
 }
 
 EOLIAN static void
-_efl_ui_layout_efl_canvas_layout_signal_signal_emit(Eo *obj, Efl_Ui_Layout_Data *_pd EINA_UNUSED, const char *emission, const char *source)
+_efl_ui_layout_efl_layout_signal_signal_emit(Eo *obj, Efl_Ui_Layout_Data *_pd EINA_UNUSED, const char *emission, const char *source)
 {
    // Don't do anything else than call forward here
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
-   efl_canvas_layout_signal_emit(wd->resize_obj, emission, source);
+   efl_layout_signal_emit(wd->resize_obj, emission, source);
 }
 
 EOLIAN static Eina_Bool
-_efl_ui_layout_efl_canvas_layout_signal_signal_callback_add(Eo *obj, Efl_Ui_Layout_Data *_pd EINA_UNUSED, const char *emission, const char *source, Efl_Signal_Cb func, void *data)
+_efl_ui_layout_efl_layout_signal_signal_callback_add(Eo *obj, Efl_Ui_Layout_Data *_pd EINA_UNUSED, const char *emission, const char *source, Efl_Signal_Cb func, void *data)
 {
    // Don't do anything else than call forward here
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
-   return efl_canvas_layout_signal_callback_add(wd->resize_obj, emission, source, func, data);
+   return efl_layout_signal_callback_add(wd->resize_obj, emission, source, func, data);
 }
 
 EOLIAN static Eina_Bool
-_efl_ui_layout_efl_canvas_layout_signal_signal_callback_del(Eo *obj, Efl_Ui_Layout_Data *_pd EINA_UNUSED, const char *emission, const char *source, Edje_Signal_Cb func, void *data)
+_efl_ui_layout_efl_layout_signal_signal_callback_del(Eo *obj, Efl_Ui_Layout_Data *_pd EINA_UNUSED, const char *emission, const char *source, Edje_Signal_Cb func, void *data)
 {
    // Don't do anything else than call forward here
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
-   return efl_canvas_layout_signal_callback_add(wd->resize_obj, emission, source, func, data);
+   return efl_layout_signal_callback_add(wd->resize_obj, emission, source, func, data);
 }
 
 // TODO:
@@ -2069,17 +2069,17 @@ EOLIAN static void _efl_ui_layout_class_constructor(Efl_Class *klass)
 }
 
 EOLIAN static void
-_efl_ui_layout_efl_canvas_layout_signal_message_send(Eo *obj, Efl_Ui_Layout_Data *pd EINA_UNUSED, int id, const Eina_Value msg)
+_efl_ui_layout_efl_layout_signal_message_send(Eo *obj, Efl_Ui_Layout_Data *pd EINA_UNUSED, int id, const Eina_Value msg)
 {
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
-   efl_canvas_layout_signal_message_send(wd->resize_obj, id, msg);
+   efl_layout_signal_message_send(wd->resize_obj, id, msg);
 }
 
 EOLIAN static void
-_efl_ui_layout_efl_canvas_layout_signal_signal_process(Eo *obj, Efl_Ui_Layout_Data *pd EINA_UNUSED, Eina_Bool recurse)
+_efl_ui_layout_efl_layout_signal_signal_process(Eo *obj, Efl_Ui_Layout_Data *pd EINA_UNUSED, Eina_Bool recurse)
 {
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
-   efl_canvas_layout_signal_process(wd->resize_obj, recurse);
+   efl_layout_signal_process(wd->resize_obj, recurse);
 }
 
 
@@ -2273,7 +2273,7 @@ _elm_layout_signal_callback_add_legacy(Eo *obj, Eo *edje, Eina_List **p_edje_sig
    esd->data = data;
    *p_edje_signals = eina_list_append(*p_edje_signals, esd);
 
-   efl_canvas_layout_signal_callback_add(edje, emission, source,
+   efl_layout_signal_callback_add(edje, emission, source,
                                          _edje_signal_callback, esd);
 }
 
@@ -2316,7 +2316,7 @@ _elm_layout_signal_callback_del_legacy(Eo *obj EINA_UNUSED, Eo *edje, Eina_List
           {
              *p_edje_signals = eina_list_remove_list(*p_edje_signals, l);
 
-             efl_canvas_layout_signal_callback_del(edje, emission, source,
+             efl_layout_signal_callback_del(edje, emission, source,
                                                    _edje_signal_callback, esd);
 
              eina_stringshare_del(esd->emission);
@@ -2352,7 +2352,7 @@ elm_layout_signal_callback_del(Eo *obj, const char *emission, const char *source
 EAPI void
 elm_layout_signal_emit(Eo *obj, const char *emission, const char *source)
 {
-   efl_canvas_layout_signal_emit(obj, emission, source);
+   efl_layout_signal_emit(obj, emission, source);
 }
 
 EAPI const char *
diff --git a/src/lib/elementary/efl_ui_layout.eo b/src/lib/elementary/efl_ui_layout.eo
index 7bb5aa0ca1..44cd39fc1c 100644
--- a/src/lib/elementary/efl_ui_layout.eo
+++ b/src/lib/elementary/efl_ui_layout.eo
@@ -1,6 +1,6 @@
 class Efl.Ui.Layout (Elm.Widget, Efl.Part, Efl.Container, Efl.File,
                      Efl.Ui.View, Efl.Ui.Model.Connect, Efl.Ui.Model.Factory.Connect,
-                     Efl.Canvas.Layout_Calc, Efl.Canvas.Layout_Signal,
+                     Efl.Canvas.Layout_Calc, Efl.Layout.Signal,
                      Efl.Canvas.Layout_Group)
 {
    [[Elementary layout class]]
@@ -50,11 +50,11 @@ class Efl.Ui.Layout (Elm.Widget, Efl.Part, Efl.Container, Efl.File,
       Efl.Canvas.Group.group_calculate;
       Efl.Canvas.Layout_Calc.calc_freeze;
       Efl.Canvas.Layout_Calc.calc_thaw;
-      Efl.Canvas.Layout_Signal.signal_callback_add;
-      Efl.Canvas.Layout_Signal.signal_callback_del;
-      Efl.Canvas.Layout_Signal.signal_emit;
-      Efl.Canvas.Layout_Signal.message_send;
-      Efl.Canvas.Layout_Signal.signal_process;
+      Efl.Layout.Signal.signal_callback_add;
+      Efl.Layout.Signal.signal_callback_del;
+      Efl.Layout.Signal.signal_emit;
+      Efl.Layout.Signal.message_send;
+      Efl.Layout.Signal.signal_process;
       Efl.Canvas.Layout_Group.group_data { get; }
       Efl.Canvas.Layout_Group.group_size_min { get; }
       Efl.Canvas.Layout_Group.group_size_max { get; }
diff --git a/src/lib/elementary/efl_ui_nstate.c b/src/lib/elementary/efl_ui_nstate.c
index b1798cf774..7eab66de57 100644
--- a/src/lib/elementary/efl_ui_nstate.c
+++ b/src/lib/elementary/efl_ui_nstate.c
@@ -50,7 +50,7 @@ _efl_ui_nstate_efl_object_constructor(Eo *obj, Efl_Ui_Nstate_Data *pd)
      CRI("Failed to set layout!");
 
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL);
-   efl_canvas_layout_signal_callback_add
+   efl_layout_signal_callback_add
      (wd->resize_obj, "elm,action,state,changed", "*", _on_state_changed, obj);
 
    //TODO: Add ATSPI call here
diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c
index b568e221b8..341b5a4bdb 100644
--- a/src/lib/elementary/efl_ui_text.c
+++ b/src/lib/elementary/efl_ui_text.c
@@ -2615,41 +2615,41 @@ _markup_filter_cb(void *data,
 }
 
 EOLIAN static void
-_efl_ui_text_efl_canvas_layout_signal_signal_emit(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd, const char *emission, const char *source)
+_efl_ui_text_efl_layout_signal_signal_emit(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd, const char *emission, const char *source)
 {
    /* always pass to both edje objs */
-   efl_canvas_layout_signal_emit(sd->entry_edje, emission, source);
+   efl_layout_signal_emit(sd->entry_edje, emission, source);
 
    // FIXME: This should not be here!
-   efl_canvas_layout_signal_process(sd->entry_edje, EINA_TRUE);
+   efl_layout_signal_process(sd->entry_edje, EINA_TRUE);
 
    if (sd->scr_edje)
      {
-        efl_canvas_layout_signal_emit(sd->scr_edje, emission, source);
-        efl_canvas_layout_signal_process(sd->scr_edje, EINA_TRUE); // FIXME
+        efl_layout_signal_emit(sd->scr_edje, emission, source);
+        efl_layout_signal_process(sd->scr_edje, EINA_TRUE); // FIXME
      }
 }
 
 EOLIAN static Eina_Bool
-_efl_ui_text_efl_canvas_layout_signal_signal_callback_add(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd, const char *emission, const char *source, Edje_Signal_Cb func_cb, void *data)
+_efl_ui_text_efl_layout_signal_signal_callback_add(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd, const char *emission, const char *source, Edje_Signal_Cb func_cb, void *data)
 {
    Eina_Bool ok;
 
-   ok = efl_canvas_layout_signal_callback_add(sd->entry_edje, emission, source, func_cb, data);
+   ok = efl_layout_signal_callback_add(sd->entry_edje, emission, source, func_cb, data);
    if (sd->scr_edje)
-     ok = efl_canvas_layout_signal_callback_add(sd->scr_edje, emission, source, func_cb, data);
+     ok = efl_layout_signal_callback_add(sd->scr_edje, emission, source, func_cb, data);
 
    return ok;
 }
 
 EOLIAN static Eina_Bool
-_efl_ui_text_efl_canvas_layout_signal_signal_callback_del(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd, const char *emission, const char *source, Edje_Signal_Cb func_cb, void *data)
+_efl_ui_text_efl_layout_signal_signal_callback_del(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd, const char *emission, const char *source, Edje_Signal_Cb func_cb, void *data)
 {
    Eina_Bool ok;
 
-   ok = efl_canvas_layout_signal_callback_del(sd->entry_edje, emission, source, func_cb, data);
+   ok = efl_layout_signal_callback_del(sd->entry_edje, emission, source, func_cb, data);
    if (sd->scr_edje)
-     ok = efl_canvas_layout_signal_callback_del(sd->scr_edje, emission, source, func_cb, data);
+     ok = efl_layout_signal_callback_del(sd->scr_edje, emission, source, func_cb, data);
 
    return ok;
 }
diff --git a/src/lib/elementary/efl_ui_text.eo b/src/lib/elementary/efl_ui_text.eo
index 67ad82d034..567d692630 100644
--- a/src/lib/elementary/efl_ui_text.eo
+++ b/src/lib/elementary/efl_ui_text.eo
@@ -355,9 +355,9 @@ class Efl.Ui.Text (Efl.Ui.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable,
       Efl.Gfx.position { set; }
       Efl.Gfx.size { set; }
       Efl.Canvas.Group.group_member_add;
-      Efl.Canvas.Layout_Signal.signal_callback_add;
-      Efl.Canvas.Layout_Signal.signal_callback_del;
-      Efl.Canvas.Layout_Signal.signal_emit;
+      Efl.Layout.Signal.signal_callback_add;
+      Efl.Layout.Signal.signal_callback_del;
+      Efl.Layout.Signal.signal_emit;
       Elm.Widget.on_access_activate;
       Elm.Widget.theme_apply;
       Elm.Widget.on_focus_update;
diff --git a/src/lib/elementary/elc_naviframe.c b/src/lib/elementary/elc_naviframe.c
index 0a63100b46..412cf63992 100644
--- a/src/lib/elementary/elc_naviframe.c
+++ b/src/lib/elementary/elc_naviframe.c
@@ -1048,7 +1048,7 @@ _back_btn_new(Evas_Object *obj, const char *title_label)
 }
 
 EOLIAN static void
-_elm_naviframe_efl_canvas_layout_signal_signal_emit(Eo *obj, Elm_Naviframe_Data *sd EINA_UNUSED, const char *emission, const char *source)
+_elm_naviframe_efl_layout_signal_signal_emit(Eo *obj, Elm_Naviframe_Data *sd EINA_UNUSED, const char *emission, const char *source)
 {
    Elm_Object_Item *eo_top_it;
 
@@ -1056,7 +1056,7 @@ _elm_naviframe_efl_canvas_layout_signal_signal_emit(Eo *obj, Elm_Naviframe_Data
    if (!eo_top_it) return;
    ELM_NAVIFRAME_ITEM_DATA_GET(eo_top_it, top_it);
 
-   efl_canvas_layout_signal_emit(VIEW(top_it), emission, source);
+   efl_layout_signal_emit(VIEW(top_it), emission, source);
 }
 
 /* content/text smart functions proxying things to the top item, which
diff --git a/src/lib/elementary/elc_popup.c b/src/lib/elementary/elc_popup.c
index d7bb894572..cc10c9da0b 100644
--- a/src/lib/elementary/elc_popup.c
+++ b/src/lib/elementary/elc_popup.c
@@ -500,7 +500,7 @@ _elm_popup_elm_layout_sizing_eval(Eo *obj, Elm_Popup_Data *sd)
 }
 
 EOLIAN static void
-_elm_popup_efl_canvas_layout_signal_signal_emit(Eo *obj EINA_UNUSED, Elm_Popup_Data *sd, const char *emission, const char *source)
+_elm_popup_efl_layout_signal_signal_emit(Eo *obj EINA_UNUSED, Elm_Popup_Data *sd, const char *emission, const char *source)
 {
    elm_layout_signal_emit(sd->main_layout, emission, source);
 }
diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c
index be39d2dc2b..3d7f23b149 100644
--- a/src/lib/elementary/elm_entry.c
+++ b/src/lib/elementary/elm_entry.c
@@ -984,9 +984,9 @@ _elm_entry_elm_widget_theme_apply(Eo *obj, Elm_Entry_Data *sd)
    elm_entry_end_visible_set(obj, EINA_TRUE);
 
    if (sd->scroll)
-     efl_canvas_layout_signal_emit(sd->entry_edje, "elm,scroll,enable", "elm");
+     efl_layout_signal_emit(sd->entry_edje, "elm,scroll,enable", "elm");
    else
-     efl_canvas_layout_signal_emit(sd->entry_edje, "elm,scroll,disable", "elm");
+     efl_layout_signal_emit(sd->entry_edje, "elm,scroll,disable", "elm");
 
    sd->changed = EINA_TRUE;
    elm_layout_sizing_eval(obj);
@@ -3054,7 +3054,7 @@ _chars_add_till_limit(Evas_Object *obj,
 }
 
 EOLIAN static void
-_elm_entry_efl_canvas_layout_signal_signal_emit(Eo *obj EINA_UNUSED, Elm_Entry_Data *sd, const char *emission, const char *source)
+_elm_entry_efl_layout_signal_signal_emit(Eo *obj EINA_UNUSED, Elm_Entry_Data *sd, const char *emission, const char *source)
 {
    /* always pass to both edje objs */
    edje_object_signal_emit(sd->entry_edje, emission, source);
@@ -3068,25 +3068,25 @@ _elm_entry_efl_canvas_layout_signal_signal_emit(Eo *obj EINA_UNUSED, Elm_Entry_D
 }
 
 EOLIAN static Eina_Bool
-_elm_entry_efl_canvas_layout_signal_signal_callback_add(Eo *obj EINA_UNUSED, Elm_Entry_Data *sd, const char *emission, const char *source, Edje_Signal_Cb func_cb, void *data)
+_elm_entry_efl_layout_signal_signal_callback_add(Eo *obj EINA_UNUSED, Elm_Entry_Data *sd, const char *emission, const char *source, Edje_Signal_Cb func_cb, void *data)
 {
    Eina_Bool ok;
 
-   ok = efl_canvas_layout_signal_callback_add(sd->entry_edje, emission, source, func_cb, data);
+   ok = efl_layout_signal_callback_add(sd->entry_edje, emission, source, func_cb, data);
    if (sd->scr_edje)
-     ok = efl_canvas_layout_signal_callback_add(sd->scr_edje, emission, source, func_cb, data);
+     ok = efl_layout_signal_callback_add(sd->scr_edje, emission, source, func_cb, data);
 
    return ok;
 }
 
 EOLIAN static Eina_Bool
-_elm_entry_efl_canvas_layout_signal_signal_callback_del(Eo *obj EINA_UNUSED, Elm_Entry_Data *sd, const char *emission, const char *source, Edje_Signal_Cb func_cb, void *data)
+_elm_entry_efl_layout_signal_signal_callback_del(Eo *obj EINA_UNUSED, Elm_Entry_Data *sd, const char *emission, const char *source, Edje_Signal_Cb func_cb, void *data)
 {
    Eina_Bool ok;
 
-   ok = efl_canvas_layout_signal_callback_del(sd->entry_edje, emission, source, func_cb, data);
+   ok = efl_layout_signal_callback_del(sd->entry_edje, emission, source, func_cb, data);
    if (sd->scr_edje)
-     ok = efl_canvas_layout_signal_callback_del(sd->scr_edje, emission, source, func_cb, data);
+     ok = efl_layout_signal_callback_del(sd->scr_edje, emission, source, func_cb, data);
 
    return ok;
 }
@@ -3104,7 +3104,7 @@ _elm_entry_signal_callback_add_legacy(Eo *obj, const char *emission, const char
                                           emission, source, func_cb, data);
 
    if (sd->scr_edje)
-     efl_canvas_layout_signal_callback_add(sd->scr_edje, emission, source, func_cb, data);
+     efl_layout_signal_callback_add(sd->scr_edje, emission, source, func_cb, data);
 }
 
 void *
@@ -3120,7 +3120,7 @@ _elm_entry_signal_callback_del_legacy(Eo *obj, const char *emission, const char
                                                  emission, source, func_cb);
 
    if (sd->scr_edje)
-     efl_canvas_layout_signal_callback_del(sd->scr_edje, emission, source, func_cb, data);
+     efl_layout_signal_callback_del(sd->scr_edje, emission, source, func_cb, data);
 
    return data;
 }
diff --git a/src/lib/elementary/elm_entry.eo b/src/lib/elementary/elm_entry.eo
index a2d9b2db92..a6015a97a3 100644
--- a/src/lib/elementary/elm_entry.eo
+++ b/src/lib/elementary/elm_entry.eo
@@ -842,9 +842,9 @@ class Elm.Entry (Efl.Ui.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable,
       Efl.Gfx.position { set; }
       Efl.Gfx.size { set; }
       Efl.Canvas.Group.group_member_add;
-      Efl.Canvas.Layout_Signal.signal_callback_add;
-      Efl.Canvas.Layout_Signal.signal_callback_del;
-      Efl.Canvas.Layout_Signal.signal_emit;
+      Efl.Layout.Signal.signal_callback_add;
+      Efl.Layout.Signal.signal_callback_del;
+      Efl.Layout.Signal.signal_emit;
       Elm.Widget.on_access_activate;
       Elm.Widget.theme_apply;
       Elm.Widget.on_focus_update;
diff --git a/src/lib/elementary/elm_naviframe.eo b/src/lib/elementary/elm_naviframe.eo
index bfdbfc832b..0cb644f274 100644
--- a/src/lib/elementary/elm_naviframe.eo
+++ b/src/lib/elementary/elm_naviframe.eo
@@ -148,7 +148,7 @@ class Elm.Naviframe (Efl.Ui.Layout, Efl.Access.Widget.Action)
       Efl.Ui.Translatable.translation_update;
       Elm.Widget.theme_apply;
       Elm.Widget.widget_event;
-      Efl.Canvas.Layout_Signal.signal_emit;
+      Efl.Layout.Signal.signal_emit;
       Efl.Access.Widget.Action.elm_actions { get; }
       Elm.Widget.resize_object { set; }
       Efl.Part.part;
diff --git a/src/lib/elementary/elm_popup.eo b/src/lib/elementary/elm_popup.eo
index db836a84ea..1532328815 100644
--- a/src/lib/elementary/elm_popup.eo
+++ b/src/lib/elementary/elm_popup.eo
@@ -174,7 +174,7 @@ class Elm.Popup (Efl.Ui.Layout, Efl.Ui.Focus.Layer, Efl.Access.Widget.Action)
       Efl.Ui.Translatable.translation_update;
       Elm.Widget.widget_sub_object_del;
       Elm.Widget.widget_event;
-      Efl.Canvas.Layout_Signal.signal_emit;
+      Efl.Layout.Signal.signal_emit;
       Efl.Access.Widget.Action.elm_actions { get; }
       Efl.Access.state_set { get; }
       Efl.Access.name { get; }
diff --git a/src/tests/edje/edje_test_edje.c b/src/tests/edje/edje_test_edje.c
index 3ea0a34acf..4d83f48949 100644
--- a/src/tests/edje/edje_test_edje.c
+++ b/src/tests/edje/edje_test_edje.c
@@ -835,7 +835,7 @@ START_TEST(edje_test_message_send_eo)
 
    eina_value_setup(&v, EINA_VALUE_TYPE_STRING);
    eina_value_set(&v, "hello world");
-   efl_canvas_layout_signal_message_send(obj, 0, v);
+   efl_layout_signal_message_send(obj, 0, v);
    eina_value_flush(&v);
    edje_message_signal_process();
    edje_object_calc_force(obj);
@@ -843,7 +843,7 @@ START_TEST(edje_test_message_send_eo)
 
    eina_value_setup(&v, EINA_VALUE_TYPE_INT);
    eina_value_set(&v, 42);
-   efl_canvas_layout_signal_message_send(obj, 1, v);
+   efl_layout_signal_message_send(obj, 1, v);
    eina_value_flush(&v);
    edje_message_signal_process();
    edje_object_calc_force(obj);
@@ -851,7 +851,7 @@ START_TEST(edje_test_message_send_eo)
 
    eina_value_setup(&v, EINA_VALUE_TYPE_FLOAT);
    eina_value_set(&v, 0.12);
-   efl_canvas_layout_signal_message_send(obj, 2, v);
+   efl_layout_signal_message_send(obj, 2, v);
    eina_value_flush(&v);
    edje_message_signal_process();
    edje_object_calc_force(obj);
@@ -862,7 +862,7 @@ START_TEST(edje_test_message_send_eo)
    eina_value_array_append(va, 12);
    eina_value_array_append(va, 42);
    eina_value_array_append(va, 255);
-   efl_canvas_layout_signal_message_send(obj, 3, *va);
+   efl_layout_signal_message_send(obj, 3, *va);
    eina_value_free(va);
    edje_message_signal_process();
    edje_object_calc_force(obj);
diff --git a/src/tests/emotion/emotion_test_main-eo.c b/src/tests/emotion/emotion_test_main-eo.c
index 66bcfa922f..d3e4218408 100644
--- a/src/tests/emotion/emotion_test_main-eo.c
+++ b/src/tests/emotion/emotion_test_main-eo.c
@@ -434,7 +434,7 @@ video_obj_signal_play_cb(void *data, Evas_Object *o, const char *emission EINA_U
 {
    Evas_Object *ov = data;
    emotion_object_play_set(ov, EINA_TRUE);
-   efl_canvas_layout_signal_emit(o, "video_state", "play");
+   efl_layout_signal_emit(o, "video_state", "play");
 }
 
 static void
@@ -442,7 +442,7 @@ video_obj_signal_pause_cb(void *data, Evas_Object *o, const char *emission EINA_
 {
    Evas_Object *ov = data;
    emotion_object_play_set(ov, EINA_FALSE);
-   efl_canvas_layout_signal_emit(o, "video_state", "pause");
+   efl_layout_signal_emit(o, "video_state", "pause");
 }
 
 static void
@@ -451,7 +451,7 @@ video_obj_signal_stop_cb(void *data, Evas_Object *o, const char *emission EINA_U
    Evas_Object *ov = data;
    emotion_object_play_set(ov, EINA_FALSE);
    emotion_object_position_set(ov, 0.0);
-   efl_canvas_layout_signal_emit(o, "video_state", "stop");
+   efl_layout_signal_emit(o, "video_state", "stop");
 }
 
 static void
@@ -634,22 +634,22 @@ init_video_object(const char *module_filename, const char *filename)
 
    efl_event_callback_array_add(o, emotion_object_test_callbacks(), oe);
 
-   efl_canvas_layout_signal_callback_add(oe, "video_control", "play", video_obj_signal_play_cb, o);
-   efl_canvas_layout_signal_callback_add(oe, "video_control", "pause", video_obj_signal_pause_cb, o);
-   efl_canvas_layout_signal_callback_add(oe, "video_control", "stop", video_obj_signal_stop_cb, o);
-   efl_canvas_layout_signal_callback_add(oe, "drag", "video_progress", video_obj_signal_jump_cb, o);
-   efl_canvas_layout_signal_callback_add(oe, "drag", "video_alpha", video_obj_signal_alpha_cb, o);
-   efl_canvas_layout_signal_callback_add(oe, "drag", "video_volume", video_obj_signal_vol_cb, o);
-   efl_canvas_layout_signal_callback_add(oe, "frame_move", "start", video_obj_signal_frame_move_start_cb, oe);
-   efl_canvas_layout_signal_callback_add(oe, "frame_move", "stop", video_obj_signal_frame_move_stop_cb, oe);
-   efl_canvas_layout_signal_callback_add(oe, "frame_resize", "start", video_obj_signal_frame_resize_start_cb, oe);
-   efl_canvas_layout_signal_callback_add(oe, "frame_resize", "stop", video_obj_signal_frame_resize_stop_cb, oe);
-   efl_canvas_layout_signal_callback_add(oe, "mouse, move", "*", video_obj_signal_frame_move_cb, oe);
+   efl_layout_signal_callback_add(oe, "video_control", "play", video_obj_signal_play_cb, o);
+   efl_layout_signal_callback_add(oe, "video_control", "pause", video_obj_signal_pause_cb, o);
+   efl_layout_signal_callback_add(oe, "video_control", "stop", video_obj_signal_stop_cb, o);
+   efl_layout_signal_callback_add(oe, "drag", "video_progress", video_obj_signal_jump_cb, o);
+   efl_layout_signal_callback_add(oe, "drag", "video_alpha", video_obj_signal_alpha_cb, o);
+   efl_layout_signal_callback_add(oe, "drag", "video_volume", video_obj_signal_vol_cb, o);
+   efl_layout_signal_callback_add(oe, "frame_move", "start", video_obj_signal_frame_move_start_cb, oe);
+   efl_layout_signal_callback_add(oe, "frame_move", "stop", video_obj_signal_frame_move_stop_cb, oe);
+   efl_layout_signal_callback_add(oe, "frame_resize", "start", video_obj_signal_frame_resize_start_cb, oe);
+   efl_layout_signal_callback_add(oe, "frame_resize", "stop", video_obj_signal_frame_resize_stop_cb, oe);
+   efl_layout_signal_callback_add(oe, "mouse, move", "*", video_obj_signal_frame_move_cb, oe);
    efl_ui_drag_value_set(efl_part(oe, "video_alpha"), 0.0, 1.0);
    efl_text_set(efl_part(oe, "video_alpha_txt"), "alpha 255");
    efl_ui_drag_value_set(efl_part(oe, "video_volume"), 0.0, 0.5);
    efl_text_set(efl_part(oe, "video_volume_txt"), "vol 0.50");
-   efl_canvas_layout_signal_emit(oe, "video_state", "play");
+   efl_layout_signal_emit(oe, "video_state", "play");
    efl_gfx_visible_set(oe, EINA_TRUE);
 }