diff --git a/src/Makefile_Edje.am b/src/Makefile_Edje.am
index e87c45e9e6..1f7ffe980f 100644
--- a/src/Makefile_Edje.am
+++ b/src/Makefile_Edje.am
@@ -4,7 +4,7 @@
 edje_eolian_files = \
 	lib/edje/efl_layout_calc.eo \
 	lib/edje/efl_layout_signal.eo \
-	lib/edje/efl_canvas_layout_group.eo \
+	lib/edje/efl_layout_group.eo \
 	lib/edje/edje_object.eo \
 	lib/edje/efl_canvas_layout_part.eo \
 	lib/edje/efl_canvas_layout_part_box.eo \
diff --git a/src/lib/edje/Edje_Eo.h b/src/lib/edje/Edje_Eo.h
index cd2465e7ee..663d6c5244 100644
--- a/src/lib/edje/Edje_Eo.h
+++ b/src/lib/edje/Edje_Eo.h
@@ -2,7 +2,7 @@
 
 #include "efl_layout_calc.eo.h"
 #include "efl_layout_signal.eo.h"
-#include "efl_canvas_layout_group.eo.h"
+#include "efl_layout_group.eo.h"
 #include "edje_object.eo.h"
 #include "edje_edit.eo.h"
 
diff --git a/src/lib/edje/Edje_Legacy.h b/src/lib/edje/Edje_Legacy.h
index aaecf138bc..730b6ff64b 100644
--- a/src/lib/edje/Edje_Legacy.h
+++ b/src/lib/edje/Edje_Legacy.h
@@ -3111,4 +3111,4 @@ typedef Efl_Canvas_Layout_Part_Type Edje_Part_Type;
  */
 #include "edje_object.eo.legacy.h"
 #include "edje_edit.eo.legacy.h"
-#include "efl_canvas_layout_group.eo.legacy.h"
+#include "efl_layout_group.eo.legacy.h"
diff --git a/src/lib/edje/edje_legacy.c b/src/lib/edje/edje_legacy.c
index 526b31a113..2ead3b40be 100644
--- a/src/lib/edje/edje_legacy.c
+++ b/src/lib/edje/edje_legacy.c
@@ -1188,7 +1188,7 @@ EAPI void
 edje_object_size_min_get(const Edje_Object *obj, int *minw, int *minh)
 {
    Eina_Size2D sz;
-   sz = efl_canvas_layout_group_size_min_get(obj);
+   sz = efl_layout_group_size_min_get(obj);
    if (minw) *minw = sz.w;
    if (minh) *minh = sz.h;
 }
@@ -1197,7 +1197,7 @@ EAPI void
 edje_object_size_max_get(const Edje_Object *obj, int *maxw, int *maxh)
 {
    Eina_Size2D sz;
-   sz = efl_canvas_layout_group_size_max_get(obj);
+   sz = efl_layout_group_size_max_get(obj);
    if (maxw) *maxw = sz.w;
    if (maxh) *maxh = sz.h;
 }
diff --git a/src/lib/edje/edje_object.eo b/src/lib/edje/edje_object.eo
index a23fb94aca..5af4a417b5 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.Layout.Calc,
-                   Efl.Layout.Signal, Efl.Canvas.Layout_Group,
+                   Efl.Layout.Signal, Efl.Layout.Group,
                    Efl.Player, Efl.Gfx.Color_Class, Efl.Gfx.Text_Class,
                    Efl.Gfx.Size_Class)
 {
@@ -115,9 +115,9 @@ class Edje.Object (Efl.Canvas.Group, Efl.File, Efl.Container, Efl.Part,
       Efl.Layout.Calc.calc_freeze;
       Efl.Layout.Calc.calc_thaw;
       Efl.Layout.Calc.calc_force;
-      Efl.Canvas.Layout_Group.group_size_min { get; }
-      Efl.Canvas.Layout_Group.group_size_max { get; }
-      Efl.Canvas.Layout_Group.group_data { get; }
+      Efl.Layout.Group.group_size_min { get; }
+      Efl.Layout.Group.group_size_max { get; }
+      Efl.Layout.Group.group_data { get; }
       Efl.Layout.Signal.message_send;
       Efl.Layout.Signal.signal_callback_add;
       Efl.Layout.Signal.signal_callback_del;
diff --git a/src/lib/edje/edje_smart.c b/src/lib/edje/edje_smart.c
index 2a029d7839..6c2406d13a 100644
--- a/src/lib/edje/edje_smart.c
+++ b/src/lib/edje/edje_smart.c
@@ -546,4 +546,4 @@ _edje_object_efl_player_play_speed_get(Eo *obj EINA_UNUSED, Edje *pd)
 #include "edje_global.eo.c"
 #include "efl_layout_calc.eo.c"
 #include "efl_layout_signal.eo.c"
-#include "efl_canvas_layout_group.eo.c"
+#include "efl_layout_group.eo.c"
diff --git a/src/lib/edje/edje_util.c b/src/lib/edje/edje_util.c
index d941b8291b..3ff4c31b80 100644
--- a/src/lib/edje/edje_util.c
+++ b/src/lib/edje/edje_util.c
@@ -450,7 +450,7 @@ _edje_object_efl_ui_base_mirrored_set(Eo *obj, Edje *ed, Eina_Bool rtl)
 }
 
 EOLIAN const char *
-_edje_object_efl_canvas_layout_group_group_data_get(Eo *obj EINA_UNUSED, Edje *ed, const char *key)
+_edje_object_efl_layout_group_group_data_get(Eo *obj EINA_UNUSED, Edje *ed, const char *key)
 {
    if (!key) return NULL;
    if (!ed->collection) return NULL;
@@ -3316,7 +3316,7 @@ _edje_object_efl_part_part(Eo *obj, Edje *ed, const char *part)
 }
 
 EOLIAN Eina_Size2D
-_edje_object_efl_canvas_layout_group_group_size_min_get(Eo *obj EINA_UNUSED, Edje *ed)
+_edje_object_efl_layout_group_group_size_min_get(Eo *obj EINA_UNUSED, Edje *ed)
 {
    if ((!ed) || (!ed->collection))
      return EINA_SIZE2D(0, 0);
@@ -3325,7 +3325,7 @@ _edje_object_efl_canvas_layout_group_group_size_min_get(Eo *obj EINA_UNUSED, Edj
 }
 
 EOLIAN Eina_Size2D
-_edje_object_efl_canvas_layout_group_group_size_max_get(Eo *obj EINA_UNUSED, Edje *ed EINA_UNUSED)
+_edje_object_efl_layout_group_group_size_max_get(Eo *obj EINA_UNUSED, Edje *ed EINA_UNUSED)
 {
    Eina_Size2D sz;
 
diff --git a/src/lib/edje/efl_canvas_layout_group.eo b/src/lib/edje/efl_layout_group.eo
similarity index 98%
rename from src/lib/edje/efl_canvas_layout_group.eo
rename to src/lib/edje/efl_layout_group.eo
index 3c85ecee82..bd711e97ab 100644
--- a/src/lib/edje/efl_canvas_layout_group.eo
+++ b/src/lib/edje/efl_layout_group.eo
@@ -1,6 +1,6 @@
 import eina_types;
 
-interface Efl.Canvas.Layout_Group
+interface Efl.Layout.Group
 {
    [[APIs representing static data from a group in an edje file.
 
diff --git a/src/lib/elementary/efl_ui_image.c b/src/lib/elementary/efl_ui_image.c
index 63933d8d27..ef34892c4e 100644
--- a/src/lib/elementary/efl_ui_image.c
+++ b/src/lib/elementary/efl_ui_image.c
@@ -1172,19 +1172,19 @@ _efl_ui_image_efl_layout_signal_signal_emit(Eo *obj EINA_UNUSED, Efl_Ui_Image_Da
 }
 
 EOLIAN static Eina_Size2D
-_efl_ui_image_efl_canvas_layout_group_group_size_min_get(Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *sd)
+_efl_ui_image_efl_layout_group_group_size_min_get(Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *sd)
 {
    if (sd->edje)
-     return efl_canvas_layout_group_size_min_get(sd->img);
+     return efl_layout_group_size_min_get(sd->img);
    else
      return EINA_SIZE2D(0, 0);
 }
 
 EOLIAN static Eina_Size2D
-_efl_ui_image_efl_canvas_layout_group_group_size_max_get(Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *sd)
+_efl_ui_image_efl_layout_group_group_size_max_get(Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *sd)
 {
    if (sd->edje)
-     return efl_canvas_layout_group_size_max_get(sd->img);
+     return efl_layout_group_size_max_get(sd->img);
    else
      return EINA_SIZE2D(0, 0);
 }
diff --git a/src/lib/elementary/efl_ui_image.eo b/src/lib/elementary/efl_ui_image.eo
index 906549689b..91a601c036 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.Layout.Calc,
-                 Efl.Canvas.Layout_Group, Efl.Layout.Signal)
+                 Efl.Layout.Group, Efl.Layout.Signal)
 {
    [[ Efl UI image class]]
    event_prefix: efl_ui_image;
@@ -138,8 +138,8 @@ class Efl.Ui.Image (Elm.Widget, Efl.Ui.Clickable, Efl.Ui.Draggable,
       Efl.Player.playable { get; }
       Efl.Player.play { get; set; }
       Efl.Layout.Signal.signal_emit;
-      Efl.Canvas.Layout_Group.group_size_min { get; }
-      Efl.Canvas.Layout_Group.group_size_max { get; }
+      Efl.Layout.Group.group_size_min { get; }
+      Efl.Layout.Group.group_size_max { get; }
       //Efl.Canvas.Layout_Group.group_data { get; }
       Efl.Layout.Calc.calc_size_min;
       Efl.Layout.Calc.calc_force;
diff --git a/src/lib/elementary/efl_ui_image_zoomable.c b/src/lib/elementary/efl_ui_image_zoomable.c
index 388235f416..09321aab70 100644
--- a/src/lib/elementary/efl_ui_image_zoomable.c
+++ b/src/lib/elementary/efl_ui_image_zoomable.c
@@ -1552,19 +1552,19 @@ _efl_ui_image_zoomable_efl_image_image_size_get(Eo *obj EINA_UNUSED, Efl_Ui_Imag
 }
 
 EOLIAN static Eina_Size2D
-_efl_ui_image_zoomable_efl_canvas_layout_group_group_size_min_get(Eo *obj EINA_UNUSED, Efl_Ui_Image_Zoomable_Data *sd)
+_efl_ui_image_zoomable_efl_layout_group_group_size_min_get(Eo *obj EINA_UNUSED, Efl_Ui_Image_Zoomable_Data *sd)
 {
    if (sd->edje)
-     return efl_canvas_layout_group_size_min_get(sd->edje);
+     return efl_layout_group_size_min_get(sd->edje);
    else
      return EINA_SIZE2D(0, 0);
 }
 
 EOLIAN static Eina_Size2D
-_efl_ui_image_zoomable_efl_canvas_layout_group_group_size_max_get(Eo *obj EINA_UNUSED, Efl_Ui_Image_Zoomable_Data *sd)
+_efl_ui_image_zoomable_efl_layout_group_group_size_max_get(Eo *obj EINA_UNUSED, Efl_Ui_Image_Zoomable_Data *sd)
 {
    if (sd->edje)
-     return efl_canvas_layout_group_size_max_get(sd->edje);
+     return efl_layout_group_size_max_get(sd->edje);
    else
      return EINA_SIZE2D(0, 0);
 }
diff --git a/src/lib/elementary/efl_ui_image_zoomable.eo b/src/lib/elementary/efl_ui_image_zoomable.eo
index 9549e1f4f2..62dc1b15e7 100644
--- a/src/lib/elementary/efl_ui_image_zoomable.eo
+++ b/src/lib/elementary/efl_ui_image_zoomable.eo
@@ -66,8 +66,8 @@ class Efl.Ui.Image_Zoomable (Elm.Widget, Efl.Ui.Image, Efl.Ui.Zoom,
       Efl.File.file { get; set; }
       Efl.Orientation.orientation { get; set; }
       Efl.Flipable.flip { get; set; }
-      Efl.Canvas.Layout_Group.group_size_min { get; }
-      Efl.Canvas.Layout_Group.group_size_max { get; }
+      Efl.Layout.Group.group_size_min { get; }
+      Efl.Layout.Group.group_size_max { get; }
       //Efl.Canvas.Layout_Group.group_data { get; }
    }
    events {
diff --git a/src/lib/elementary/efl_ui_layout.c b/src/lib/elementary/efl_ui_layout.c
index c86c636670..2ed5db22cc 100644
--- a/src/lib/elementary/efl_ui_layout.c
+++ b/src/lib/elementary/efl_ui_layout.c
@@ -1549,27 +1549,27 @@ elm_layout_edje_get(const Eo *obj)
 }
 
 EOLIAN static const char *
-_efl_ui_layout_efl_canvas_layout_group_group_data_get(Eo *obj, Efl_Ui_Layout_Data *_pd EINA_UNUSED, const char *key)
+_efl_ui_layout_efl_layout_group_group_data_get(Eo *obj, Efl_Ui_Layout_Data *_pd EINA_UNUSED, const char *key)
 {
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL);
 
-   return efl_canvas_layout_group_data_get(wd->resize_obj, key);
+   return efl_layout_group_data_get(wd->resize_obj, key);
 }
 
 EOLIAN static Eina_Size2D
-_efl_ui_layout_efl_canvas_layout_group_group_size_min_get(Eo *obj, Efl_Ui_Layout_Data *_pd EINA_UNUSED)
+_efl_ui_layout_efl_layout_group_group_size_min_get(Eo *obj, Efl_Ui_Layout_Data *_pd EINA_UNUSED)
 {
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_SIZE2D(0, 0));
 
-   return efl_canvas_layout_group_size_min_get(wd->resize_obj);
+   return efl_layout_group_size_min_get(wd->resize_obj);
 }
 
 EOLIAN static Eina_Size2D
-_efl_ui_layout_efl_canvas_layout_group_group_size_max_get(Eo *obj, Efl_Ui_Layout_Data *_pd EINA_UNUSED)
+_efl_ui_layout_efl_layout_group_group_size_max_get(Eo *obj, Efl_Ui_Layout_Data *_pd EINA_UNUSED)
 {
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_SIZE2D(0, 0));
 
-   return efl_canvas_layout_group_size_max_get(wd->resize_obj);
+   return efl_layout_group_size_max_get(wd->resize_obj);
 }
 
 /* layout's sizing evaluation is deferred. evaluation requests are
@@ -2358,7 +2358,7 @@ elm_layout_signal_emit(Eo *obj, const char *emission, const char *source)
 EAPI const char *
 elm_layout_data_get(const Evas_Object *obj, const char *key)
 {
-   return efl_canvas_layout_group_data_get(obj, key);
+   return efl_layout_group_data_get(obj, key);
 }
 
 EAPI Eina_Bool
diff --git a/src/lib/elementary/efl_ui_layout.eo b/src/lib/elementary/efl_ui_layout.eo
index 45b163ce02..b4f4bdf9f5 100644
--- a/src/lib/elementary/efl_ui_layout.eo
+++ b/src/lib/elementary/efl_ui_layout.eo
@@ -1,7 +1,7 @@
 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.Layout.Calc, Efl.Layout.Signal,
-                     Efl.Canvas.Layout_Group)
+                     Efl.Layout.Group)
 {
    [[Elementary layout class]]
    methods {
@@ -55,9 +55,9 @@ class Efl.Ui.Layout (Elm.Widget, Efl.Part, Efl.Container, Efl.File,
       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; }
+      Efl.Layout.Group.group_data { get; }
+      Efl.Layout.Group.group_size_min { get; }
+      Efl.Layout.Group.group_size_max { get; }
       Elm.Widget.widget_sub_object_add;
       Elm.Widget.theme_apply;
       Elm.Widget.on_disabled_update;