diff --git a/legacy/elementary/src/lib/elm_bubble.c b/legacy/elementary/src/lib/elm_bubble.c
index e78a38d748..8d51498d86 100644
--- a/legacy/elementary/src/lib/elm_bubble.c
+++ b/legacy/elementary/src/lib/elm_bubble.c
@@ -269,7 +269,7 @@ _pos_set(Eo *obj, void *_pd, va_list *list)
 {
    Elm_Bubble_Pos pos = va_arg(*list, Elm_Bubble_Pos);
    Elm_Bubble_Smart_Data *sd = _pd;
-   Elm_Layout_Smart_Data *ld = eo_data_scope_get(obj, ELM_OBJ_LAYOUT_CLASS);
+   ELM_LAYOUT_DATA_GET(obj, ld);
 
    if (pos < ELM_BUBBLE_POS_TOP_LEFT || pos > ELM_BUBBLE_POS_BOTTOM_RIGHT)
      return;
diff --git a/legacy/elementary/src/lib/elm_frame.c b/legacy/elementary/src/lib/elm_frame.c
index a72816add9..e8cf703566 100644
--- a/legacy/elementary/src/lib/elm_frame.c
+++ b/legacy/elementary/src/lib/elm_frame.c
@@ -158,7 +158,7 @@ static void
 _elm_frame_smart_calculate(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
 {
    Elm_Frame_Smart_Data *sd = _pd;
-   Elm_Layout_Smart_Data *ld = eo_data_scope_get(obj, elm_obj_layout_class_get());
+   ELM_LAYOUT_DATA_GET(obj, ld);
 
    if (ld->needs_size_calc)
      {
diff --git a/legacy/elementary/src/lib/elm_index.c b/legacy/elementary/src/lib/elm_index.c
index b27c5b86ef..4f11399e61 100644
--- a/legacy/elementary/src/lib/elm_index.c
+++ b/legacy/elementary/src/lib/elm_index.c
@@ -339,7 +339,7 @@ _elm_index_smart_theme(Eo *obj, void *_pd, va_list *list)
 
    Elm_Index_Smart_Data *sd = _pd;
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
-   Elm_Layout_Smart_Data *ld = eo_data_scope_get(obj, ELM_OBJ_LAYOUT_CLASS);
+   ELM_LAYOUT_DATA_GET(obj, ld);
 
    _index_box_clear(obj, 0);
    _index_box_clear(obj, 1);
diff --git a/legacy/elementary/src/lib/elm_panes.c b/legacy/elementary/src/lib/elm_panes.c
index bbc1d5e85b..48d8d7520d 100644
--- a/legacy/elementary/src/lib/elm_panes.c
+++ b/legacy/elementary/src/lib/elm_panes.c
@@ -51,7 +51,7 @@ _elm_panes_smart_theme(Eo *obj, void *_pd, va_list *list)
    Eina_Bool *ret = va_arg(*list, Eina_Bool *);
    if (ret) *ret = EINA_FALSE;
    Eina_Bool int_ret = EINA_FALSE;
-   Elm_Layout_Smart_Data *ld = eo_data_scope_get(obj, ELM_OBJ_LAYOUT_CLASS);
+   ELM_LAYOUT_DATA_GET(obj, ld);
 
    if (sd->horizontal)
      eina_stringshare_replace(&ld->group, "horizontal");
diff --git a/legacy/elementary/src/lib/elm_progressbar.c b/legacy/elementary/src/lib/elm_progressbar.c
index 84cdef6585..541db172c0 100644
--- a/legacy/elementary/src/lib/elm_progressbar.c
+++ b/legacy/elementary/src/lib/elm_progressbar.c
@@ -176,7 +176,7 @@ _elm_progressbar_smart_theme(Eo *obj, void *_pd, va_list *list)
    Eina_Bool *ret = va_arg(*list, Eina_Bool *);
    if (ret) *ret = EINA_FALSE;
    Eina_Bool int_ret = EINA_FALSE;
-   Elm_Layout_Smart_Data *ld = eo_data_scope_get(obj, ELM_OBJ_LAYOUT_CLASS);
+   ELM_LAYOUT_DATA_GET(obj, ld);
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
 
    if (sd->horizontal)
diff --git a/legacy/elementary/src/lib/elm_scroller.c b/legacy/elementary/src/lib/elm_scroller.c
index 52b575eea4..a9fdf207c8 100644
--- a/legacy/elementary/src/lib/elm_scroller.c
+++ b/legacy/elementary/src/lib/elm_scroller.c
@@ -869,7 +869,7 @@ _custom_widget_base_theme_set(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
 {
    const char *klass = va_arg(*list, const char *);
    const char *group = va_arg(*list, const char *);
-   Elm_Layout_Smart_Data *ld = eo_data_scope_get(obj, ELM_OBJ_LAYOUT_CLASS);
+   ELM_LAYOUT_DATA_GET(obj, ld);
 
    EINA_SAFETY_ON_NULL_RETURN(klass);
    EINA_SAFETY_ON_NULL_RETURN(group);
diff --git a/legacy/elementary/src/lib/elm_separator.c b/legacy/elementary/src/lib/elm_separator.c
index 3b6e9fc2f6..e4d1e49963 100644
--- a/legacy/elementary/src/lib/elm_separator.c
+++ b/legacy/elementary/src/lib/elm_separator.c
@@ -21,7 +21,7 @@ _elm_separator_smart_theme(Eo *obj, void *_pd, va_list *list)
    Eina_Bool *ret = va_arg(*list, Eina_Bool *);
    if (ret) *ret = EINA_FALSE;
    Eina_Bool int_ret;
-   Elm_Layout_Smart_Data *ld = eo_data_scope_get(obj, ELM_OBJ_LAYOUT_CLASS);
+   ELM_LAYOUT_DATA_GET(obj, ld);
 
    if (sd->horizontal)
      eina_stringshare_replace(&ld->group, "horizontal");
diff --git a/legacy/elementary/src/lib/elm_slider.c b/legacy/elementary/src/lib/elm_slider.c
index 162d423803..f8ad153011 100644
--- a/legacy/elementary/src/lib/elm_slider.c
+++ b/legacy/elementary/src/lib/elm_slider.c
@@ -471,7 +471,7 @@ _elm_slider_smart_theme(Eo *obj, void *_pd, va_list *list)
    Eina_Bool *ret = va_arg(*list, Eina_Bool *);
    if (ret) *ret = EINA_FALSE;
    Eina_Bool int_ret;
-   Elm_Layout_Smart_Data *ld = eo_data_scope_get(obj, ELM_OBJ_LAYOUT_CLASS);
+   ELM_LAYOUT_DATA_GET(obj, ld);
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
 
    if (sd->horizontal)