diff --git a/src/lib/elementary/efl_ui_collection.eo b/src/lib/elementary/efl_ui_collection.eo
index 30451214ad..43eacec9af 100644
--- a/src/lib/elementary/efl_ui_collection.eo
+++ b/src/lib/elementary/efl_ui_collection.eo
@@ -1,12 +1,10 @@
 class @beta Efl.Ui.Collection extends Efl.Ui.Layout_Base implements
-                   Efl.Ui.Scrollable_Interactive,
-                   Efl.Ui.Scrollbar,
                    Efl.Pack_Linear, Efl.Pack_Layout,
                    Efl.Ui.Layout_Orientable,
                    Efl.Ui.Multi_Selectable,
                    Efl.Ui.Focus.Manager_Sub,
                    Efl.Ui.Widget_Focus_Manager
-   composite
+   composites
                    Efl.Ui.Scrollable_Interactive,
                    Efl.Ui.Scrollbar,
                    Efl.Ui.Focus.Manager
diff --git a/src/lib/elementary/efl_ui_image_zoomable.eo b/src/lib/elementary/efl_ui_image_zoomable.eo
index 932c732e15..cc8ae5dac9 100644
--- a/src/lib/elementary/efl_ui_image_zoomable.eo
+++ b/src/lib/elementary/efl_ui_image_zoomable.eo
@@ -2,10 +2,8 @@
 struct @extern Elm.Photocam.Error; [[Photocam error information.]]
 struct @extern Elm.Photocam.Progress; [[Photocam progress information.]]
 
-class @beta Efl.Ui.Image_Zoomable extends Efl.Ui.Image implements Efl.Ui.Zoom,
-                             Efl.Ui.Scrollable_Interactive,
-                             Efl.Ui.Scrollbar
-   composite Efl.Ui.Scrollable_Interactive, Efl.Ui.Scrollbar
+class @beta Efl.Ui.Image_Zoomable extends Efl.Ui.Image implements Efl.Ui.Zoom
+   composites Efl.Ui.Scrollable_Interactive, Efl.Ui.Scrollbar
 {
    [[Elementary Image Zoomable class]]
    methods {
diff --git a/src/lib/elementary/efl_ui_list_view.eo b/src/lib/elementary/efl_ui_list_view.eo
index 5c49394ec4..37db3fb183 100644
--- a/src/lib/elementary/efl_ui_list_view.eo
+++ b/src/lib/elementary/efl_ui_list_view.eo
@@ -7,10 +7,12 @@ struct @beta Efl.Ui.List_View_Item_Event
    child: Efl.Model; [[TBD]]
    index: int; [[TBD]]
 }
-class @beta Efl.Ui.List_View extends Efl.Ui.Layout_Base implements Efl.Ui.Scrollable_Interactive, Efl.Ui.Scrollbar,
-                Efl.Access.Widget.Action, Efl.Access.Selection, Efl.Ui.Focus.Composition, Efl.Ui.Focus.Manager_Sub,
-                Efl.Ui.Container_Selectable, Efl.Ui.List_View_Model, Efl.Ui.Widget_Focus_Manager
-   composite
+class @beta Efl.Ui.List_View extends Efl.Ui.Layout_Base implements
+                Efl.Access.Widget.Action, Efl.Access.Selection,
+                Efl.Ui.Focus.Composition, Efl.Ui.Focus.Manager_Sub,
+                Efl.Ui.Container_Selectable, Efl.Ui.List_View_Model,
+                Efl.Ui.Widget_Focus_Manager
+   composites
                 Efl.Ui.Scrollable_Interactive, Efl.Ui.Scrollbar
 {
    methods {
diff --git a/src/lib/elementary/efl_ui_panel.eo b/src/lib/elementary/efl_ui_panel.eo
index edf688c2eb..f02845eb1c 100644
--- a/src/lib/elementary/efl_ui_panel.eo
+++ b/src/lib/elementary/efl_ui_panel.eo
@@ -16,9 +16,9 @@ struct @beta Efl.Ui.Panel_Scroll_Info
 }
 
 class @beta Efl.Ui.Panel extends Efl.Ui.Layout_Base
-                         implements Efl.Ui.Focus.Layer, Efl.Ui.Scrollable_Interactive, Efl.Content,
+                         implements Efl.Ui.Focus.Layer, Efl.Content,
                                     Efl.Access.Widget.Action
-                         composite Efl.Ui.Scrollable_Interactive
+                         composites Efl.Ui.Scrollable_Interactive
 {
    [[Elementary panel class]]
    methods {
diff --git a/src/lib/elementary/efl_ui_radio_box.eo b/src/lib/elementary/efl_ui_radio_box.eo
index 15f6b3ee13..e6b2259376 100644
--- a/src/lib/elementary/efl_ui_radio_box.eo
+++ b/src/lib/elementary/efl_ui_radio_box.eo
@@ -1,5 +1,4 @@
-class @beta Efl.Ui.Radio_Box extends Efl.Ui.Box implements Efl.Ui.Radio_Group
-   composite Efl.Ui.Radio_Group
+class @beta Efl.Ui.Radio_Box extends Efl.Ui.Box composites Efl.Ui.Radio_Group
 {
    [[A standard @Efl.Ui.Box container which automatically handles grouping of any @Efl.Ui.Radio
      widget added to it in addition to regular widgets.
diff --git a/src/lib/elementary/efl_ui_scroller.eo b/src/lib/elementary/efl_ui_scroller.eo
index 7a2bb90306..b3cfeec9cb 100644
--- a/src/lib/elementary/efl_ui_scroller.eo
+++ b/src/lib/elementary/efl_ui_scroller.eo
@@ -1,10 +1,8 @@
 class @beta Efl.Ui.Scroller extends Efl.Ui.Layout_Base implements
-                       Efl.Ui.Scrollable_Interactive,
-                       Efl.Ui.Scrollbar,
                        Efl.Ui.Focus.Manager_Sub,
                        Efl.Ui.Widget_Focus_Manager,
                        Efl.Content
-   composite
+   composites
                        Efl.Ui.Scrollable_Interactive,
                        Efl.Ui.Scrollbar
 {
diff --git a/src/lib/elementary/efl_ui_tab_bar.eo b/src/lib/elementary/efl_ui_tab_bar.eo
index 996a897b98..cf06e0de47 100644
--- a/src/lib/elementary/efl_ui_tab_bar.eo
+++ b/src/lib/elementary/efl_ui_tab_bar.eo
@@ -1,6 +1,6 @@
 class @beta Efl.Ui.Tab_Bar extends Efl.Ui.Layout_Base
-   implements Efl.Ui.Single_Selectable, Efl.Pack_Linear
-   composite Efl.Pack_Linear, Efl.Pack
+   implements Efl.Ui.Single_Selectable
+   composites Efl.Pack_Linear, Efl.Pack
 {
    [[A selectable box of items.
 
diff --git a/src/lib/elementary/efl_ui_tags.eo b/src/lib/elementary/efl_ui_tags.eo
index 29728900eb..194c9b74e5 100644
--- a/src/lib/elementary/efl_ui_tags.eo
+++ b/src/lib/elementary/efl_ui_tags.eo
@@ -1,6 +1,6 @@
 class @beta Efl.Ui.Tags extends Efl.Ui.Layout_Base
-   implements Efl.Text, Efl.Ui.Format
-   composite Efl.Text
+   implements Efl.Ui.Format
+   composites Efl.Text
 {
    [[A widget displaying a list of tags. The user can remove tags by clicking
      on each tag "close" button and add new tags by typing text in the text
diff --git a/src/lib/elementary/efl_ui_text.eo b/src/lib/elementary/efl_ui_text.eo
index eb74be4b1a..d05b6a14db 100644
--- a/src/lib/elementary/efl_ui_text.eo
+++ b/src/lib/elementary/efl_ui_text.eo
@@ -3,8 +3,8 @@ import elm_general;
 
 class @beta Efl.Ui.Text extends Efl.Ui.Layout_Base implements Efl.Input.Clickable,
                  Efl.Access.Text, Efl.Access.Editable.Text, Efl.File,
-                 Efl.Ui.Text_Selectable, Efl.Text_Interactive, Efl.Text_Markup
-   composite
+                 Efl.Ui.Text_Selectable
+   composites
                  Efl.Text_Interactive, Efl.Text_Markup
 {
    [[A flexible text widget which can be static (as a label) or editable by
diff --git a/src/lib/elementary/efl_ui_video.eo b/src/lib/elementary/efl_ui_video.eo
index 9cc1b43b42..5fc841a3b3 100644
--- a/src/lib/elementary/efl_ui_video.eo
+++ b/src/lib/elementary/efl_ui_video.eo
@@ -1,6 +1,6 @@
 class @beta Efl.Ui.Video extends Efl.Ui.Layout_Base
-   implements Efl.File, Efl.Player, Efl.Access.Widget.Action
-   composite Efl.Player
+   implements Efl.File, Efl.Access.Widget.Action
+   composites Efl.Player
 {
    [[Efl UI video class]]
    methods {
diff --git a/src/lib/elementary/efl_ui_widget_focus_manager.eo b/src/lib/elementary/efl_ui_widget_focus_manager.eo
index d12a4a0c79..431fea71c8 100644
--- a/src/lib/elementary/efl_ui_widget_focus_manager.eo
+++ b/src/lib/elementary/efl_ui_widget_focus_manager.eo
@@ -1,7 +1,6 @@
 mixin Efl.Ui.Widget_Focus_Manager
    requires Efl.Ui.Widget
-   extends Efl.Ui.Focus.Manager
-   composite Efl.Ui.Focus.Manager
+   composites Efl.Ui.Focus.Manager
 {
   [[Helper mixin for widgets which also can act as focus managers.
 
diff --git a/src/lib/elementary/efl_ui_win.eo b/src/lib/elementary/efl_ui_win.eo
index 6fa01b8291..745e7a318b 100644
--- a/src/lib/elementary/efl_ui_win.eo
+++ b/src/lib/elementary/efl_ui_win.eo
@@ -137,9 +137,9 @@ enum Efl.Ui.Win_Move_Resize_Mode
 class Efl.Ui.Win extends Efl.Ui.Widget implements Efl.Canvas.Scene, Efl.Access.Window,
                   Efl.Access.Component, Efl.Access.Widget.Action,
                   Efl.Content, Efl.Input.State, Efl.Input.Interface, Efl.Screen,
-                  Efl.Text, Efl.Config,
-                  Efl.Ui.Widget_Focus_Manager, Efl.Ui.Focus.Manager_Window_Root
-   composite      Efl.Config
+                  Efl.Text, Efl.Ui.Widget_Focus_Manager,
+                  Efl.Ui.Focus.Manager_Window_Root
+   composites     Efl.Config
 {
    [[Efl UI window class.
 
diff --git a/src/tests/eolian/data/unimpl.eo b/src/tests/eolian/data/unimpl.eo
index e08699a231..1e11a85e93 100644
--- a/src/tests/eolian/data/unimpl.eo
+++ b/src/tests/eolian/data/unimpl.eo
@@ -1,4 +1,4 @@
-class Unimpl implements Iface composite Iface {
+class Unimpl composites Iface {
     implements {
         Iface.foo;
     }