diff --git a/src/lib/ecore/efl_loop_consumer.eo b/src/lib/ecore/efl_loop_consumer.eo
index 62534536b4..def99ef035 100644
--- a/src/lib/ecore/efl_loop_consumer.eo
+++ b/src/lib/ecore/efl_loop_consumer.eo
@@ -1,4 +1,4 @@
-abstract Efl.Loop_Consumer (Efl.Object)
+abstract Efl.Loop_Consumer extends Efl.Object
 {
    [[An Efl.Loop_Consumer is a class which requires one of the parents to provide
      an Efl.Loop interface when performing provider_find. It will enforce this by
@@ -25,7 +25,7 @@ abstract Efl.Loop_Consumer (Efl.Object)
          params {
             result: any_value; [[The value to be delivered.
 
-            Note that the value contents must survive this function scope, that is, do 
+            Note that the value contents must survive this function scope, that is, do
             not use stack allocated blobs, arrays, structures or types that keep
             references to memory you give. Values will be automatically cleaned up using
             \@ref eina_value_flush() once they are unused (no more future or futures returned a new value)]]
diff --git a/src/lib/ecore/efl_task.eo b/src/lib/ecore/efl_task.eo
index 8670299de4..0a425d9f94 100644
--- a/src/lib/ecore/efl_task.eo
+++ b/src/lib/ecore/efl_task.eo
@@ -15,7 +15,7 @@ enum Efl.Task_Flags {
    no_exit_code_error = 4,
 }
 
-abstract Efl.Task (Efl.Object, Efl.Io.Reader, Efl.Io.Writer, Efl.Io.Closer)
+abstract Efl.Task extends Efl.Object implements Efl.Io.Reader, Efl.Io.Writer, Efl.Io.Closer
 {
    [[ ]]
    methods {
diff --git a/src/lib/ecore_audio/ecore_audio.eo b/src/lib/ecore_audio/ecore_audio.eo
index e2c9fb8f5f..c93726f800 100644
--- a/src/lib/ecore_audio/ecore_audio.eo
+++ b/src/lib/ecore_audio/ecore_audio.eo
@@ -12,7 +12,7 @@ enum Ecore.Audio.Format {
     last [[Sentinel value to indicate last enum field during iteration]]
 }
 
-abstract Ecore.Audio (Efl.Object)
+abstract Ecore.Audio extends Efl.Object
 {
    [[Convenience audio class.]]
 
diff --git a/src/lib/ecore_con/efl_net_server_fd.eo b/src/lib/ecore_con/efl_net_server_fd.eo
index bbb25a58bf..4758be1634 100644
--- a/src/lib/ecore_con/efl_net_server_fd.eo
+++ b/src/lib/ecore_con/efl_net_server_fd.eo
@@ -1,4 +1,4 @@
-abstract Efl.Net.Server_Fd (Efl.Loop_Fd, Efl.Net.Server) {
+abstract Efl.Net.Server_Fd extends Efl.Loop_Fd implements Efl.Net.Server {
     [[A generic server based on file descriptors.
 
       @since 1.19
diff --git a/src/lib/ector/cairo/ector_renderer_cairo.eo b/src/lib/ector/cairo/ector_renderer_cairo.eo
index 02431e0b25..f28efe9e96 100644
--- a/src/lib/ector/cairo/ector_renderer_cairo.eo
+++ b/src/lib/ector/cairo/ector_renderer_cairo.eo
@@ -1,4 +1,4 @@
-abstract Ector.Renderer.Cairo (Ector.Renderer)
+abstract Ector.Renderer.Cairo extends Ector.Renderer
 {
    [[Ector cairo renderer abstract class]]
    methods {
diff --git a/src/lib/ector/ector_renderer.eo b/src/lib/ector/ector_renderer.eo
index 844ec1adaa..46bd9df9c6 100644
--- a/src/lib/ector/ector_renderer.eo
+++ b/src/lib/ector/ector_renderer.eo
@@ -1,6 +1,6 @@
 import eina_types;
 
-abstract Ector.Renderer (Efl.Object)
+abstract Ector.Renderer extends Efl.Object
 {
    [[Ector renderer abstract interface]]
 
diff --git a/src/lib/ector/gl/ector_renderer_gl.eo b/src/lib/ector/gl/ector_renderer_gl.eo
index 97941d28c2..95b4ef3f5e 100644
--- a/src/lib/ector/gl/ector_renderer_gl.eo
+++ b/src/lib/ector/gl/ector_renderer_gl.eo
@@ -1,6 +1,6 @@
 import ector_types;
 
-abstract Ector.Renderer.GL (Ector.Renderer)
+abstract Ector.Renderer.GL extends Ector.Renderer
 {
    [[Ector GL renderer abstract class]]
    methods {
diff --git a/src/lib/ector/software/ector_renderer_software.eo b/src/lib/ector/software/ector_renderer_software.eo
index 09faabfbe0..bd94cc6781 100644
--- a/src/lib/ector/software/ector_renderer_software.eo
+++ b/src/lib/ector/software/ector_renderer_software.eo
@@ -1,4 +1,4 @@
-abstract Ector.Renderer.Software (Ector.Renderer)
+abstract Ector.Renderer.Software extends Ector.Renderer
 {
    [[Ector software renderer class]]
    data: null;
diff --git a/src/lib/elementary/efl_ui_grid_item.eo b/src/lib/elementary/efl_ui_grid_item.eo
index 6c2eeeda01..f430cab123 100644
--- a/src/lib/elementary/efl_ui_grid_item.eo
+++ b/src/lib/elementary/efl_ui_grid_item.eo
@@ -1,5 +1,5 @@
 
-abstract Efl.Ui.Grid_Item (Efl.Ui.Item)
+abstract Efl.Ui.Grid_Item extends Efl.Ui.Item
 {
    implements {
       //Efl.Object
diff --git a/src/lib/elementary/efl_ui_item.eo b/src/lib/elementary/efl_ui_item.eo
index ea9cf5d4f1..e3ba8afa33 100644
--- a/src/lib/elementary/efl_ui_item.eo
+++ b/src/lib/elementary/efl_ui_item.eo
@@ -1,4 +1,4 @@
-abstract Efl.Ui.Item (Efl.Ui.Layout, Efl.Ui.Selectable, Efl.Ui.Clickable)
+abstract Efl.Ui.Item extends Efl.Ui.Layout implements Efl.Ui.Selectable, Efl.Ui.Clickable
 {
    [[Item abstract class for pack widget. All item have to be inherited from this class.]]
    methods {
diff --git a/src/lib/elementary/efl_ui_list_item.eo b/src/lib/elementary/efl_ui_list_item.eo
index 82943ad3c6..e1bcf9235d 100644
--- a/src/lib/elementary/efl_ui_list_item.eo
+++ b/src/lib/elementary/efl_ui_list_item.eo
@@ -1,5 +1,5 @@
 
-abstract Efl.Ui.List_Item (Efl.Ui.Item)
+abstract Efl.Ui.List_Item extends Efl.Ui.Item
 {
    implements {
       //Efl.Object
diff --git a/src/lib/elementary/efl_ui_widget.eo b/src/lib/elementary/efl_ui_widget.eo
index 08fdcde4e9..5ffb67d0ac 100644
--- a/src/lib/elementary/efl_ui_widget.eo
+++ b/src/lib/elementary/efl_ui_widget.eo
@@ -13,10 +13,10 @@ struct Efl.Ui.Widget_Focus_State {
    logical : bool; [[$true if this is registered as logical currently]]
 }
 
-abstract Efl.Ui.Widget (Efl.Canvas.Group, Efl.Access.Object,
+abstract Efl.Ui.Widget extends Efl.Canvas.Group implements Efl.Access.Object,
                         Efl.Access.Component, Efl.Part, Efl.Ui.Focus.Object,
                         Efl.Ui.Cursor, Efl.Ui.L10n,
-                        Efl.Ui.Selection, Efl.Ui.Dnd)
+                        Efl.Ui.Selection, Efl.Ui.Dnd
 {
    [[Efl UI widget abstract class]]
    legacy_prefix: elm_widget;
diff --git a/src/lib/elementary/elm_web.eo b/src/lib/elementary/elm_web.eo
index f1a09244cc..42930883b0 100644
--- a/src/lib/elementary/elm_web.eo
+++ b/src/lib/elementary/elm_web.eo
@@ -5,7 +5,7 @@ type Elm_Web_Dialog_Confirm: __undefined_type; [[Elementary web dialog confirm t
 type Elm_Web_Dialog_Prompt: __undefined_type; [[Elementary web dialog prompt type]]
 type Elm_Web_Dialog_Alert: __undefined_type; [[Elementary web dialog alert type]]
 
-abstract Elm.Web (Efl.Ui.Widget, Efl.Ui.Legacy, Efl.Ui.Zoom)
+abstract Elm.Web extends Efl.Ui.Widget implements Efl.Ui.Legacy, Efl.Ui.Zoom
 {
    [[Elementary web view class]]
    legacy_prefix: elm_web;
diff --git a/src/lib/evas/canvas/efl_canvas_animation.eo b/src/lib/evas/canvas/efl_canvas_animation.eo
index 63f882c09b..eb12ef8536 100644
--- a/src/lib/evas/canvas/efl_canvas_animation.eo
+++ b/src/lib/evas/canvas/efl_canvas_animation.eo
@@ -1,6 +1,6 @@
 import efl_canvas_animation_types;
 
-abstract Efl.Canvas.Animation (Efl.Object, Efl.Playable)
+abstract Efl.Canvas.Animation extends Efl.Object implements Efl.Playable
 {
    [[Efl animation class]]
    eo_prefix: efl_animation;
diff --git a/src/lib/evas/canvas/efl_canvas_animation_group.eo b/src/lib/evas/canvas/efl_canvas_animation_group.eo
index 76fcbb2d81..091fc45e6c 100644
--- a/src/lib/evas/canvas/efl_canvas_animation_group.eo
+++ b/src/lib/evas/canvas/efl_canvas_animation_group.eo
@@ -1,4 +1,4 @@
-abstract Efl.Canvas.Animation_Group (Efl.Canvas.Animation)
+abstract Efl.Canvas.Animation_Group extends Efl.Canvas.Animation
 {
    [[Efl group animation abstract class]]
    eo_prefix: efl_animation_group;
diff --git a/src/lib/evas/canvas/efl_canvas_image_internal.eo b/src/lib/evas/canvas/efl_canvas_image_internal.eo
index 1ccb02965f..fc7df3c497 100644
--- a/src/lib/evas/canvas/efl_canvas_image_internal.eo
+++ b/src/lib/evas/canvas/efl_canvas_image_internal.eo
@@ -1,7 +1,7 @@
-abstract Efl.Canvas.Image_Internal (Efl.Canvas.Object, Efl.Canvas.Filter.Internal,
+abstract Efl.Canvas.Image_Internal extends Efl.Canvas.Object implements Efl.Canvas.Filter.Internal,
                                     Efl.Gfx.Image, Efl.Gfx.Buffer,
                                     Efl.Gfx.Fill, Efl.Gfx.View,
-                                    Efl.Orientation, Efl.File)
+                                    Efl.Orientation, Efl.File
 {
    [[Efl canvas internal image class]]
    data: Evas_Image_Data;
diff --git a/src/lib/evas/canvas/efl_canvas_object.eo b/src/lib/evas/canvas/efl_canvas_object.eo
index ac4577896f..6bcae5d1ee 100644
--- a/src/lib/evas/canvas/efl_canvas_object.eo
+++ b/src/lib/evas/canvas/efl_canvas_object.eo
@@ -2,9 +2,9 @@ import efl_text_types;
 
 struct Efl.Canvas.Object_Animation_Event; [[Information of animation events]]
 
-abstract Efl.Canvas.Object (Efl.Loop_Consumer, Efl.Gfx.Entity, Efl.Gfx.Color, Efl.Gfx.Stack, Efl.Animator,
+abstract Efl.Canvas.Object extends Efl.Loop_Consumer implements Efl.Gfx.Entity, Efl.Gfx.Color, Efl.Gfx.Stack, Efl.Animator,
                             Efl.Input.Interface, Efl.Gfx.Size_Hint,
-                            Efl.Gfx.Map, Efl.Ui.I18n, Efl.Canvas.Pointer)
+                            Efl.Gfx.Map, Efl.Ui.I18n, Efl.Canvas.Pointer
 {
    [[Efl canvas object abstract class]]
    legacy_prefix: evas_object;
@@ -93,7 +93,7 @@ abstract Efl.Canvas.Object (Efl.Loop_Consumer, Efl.Gfx.Entity, Efl.Gfx.Color, Ef
 
               If $freeze is $false, events will be processed on that
               object as normal.
-            
+
               Warning: If you block only key/mouse up events with this API,
               you can't be sure of the state of any objects that have only
               key/mouse down events.
diff --git a/src/lib/evas/canvas/efl_canvas_surface.eo b/src/lib/evas/canvas/efl_canvas_surface.eo
index 8946b20efa..729fb1a37f 100644
--- a/src/lib/evas/canvas/efl_canvas_surface.eo
+++ b/src/lib/evas/canvas/efl_canvas_surface.eo
@@ -1,4 +1,4 @@
-abstract Efl.Canvas.Surface (Efl.Canvas.Image_Internal)
+abstract Efl.Canvas.Surface extends Efl.Canvas.Image_Internal
 {
    [[Native surfaces usually bound to an externally-managed buffer.
 
diff --git a/src/lib/evas/canvas/efl_canvas_vg_gradient.eo b/src/lib/evas/canvas/efl_canvas_vg_gradient.eo
index 76502c826d..409b24633d 100644
--- a/src/lib/evas/canvas/efl_canvas_vg_gradient.eo
+++ b/src/lib/evas/canvas/efl_canvas_vg_gradient.eo
@@ -1,4 +1,4 @@
-abstract Efl.Canvas.Vg.Gradient (Efl.Canvas.Vg.Node, Efl.Gfx.Gradient)
+abstract Efl.Canvas.Vg.Gradient extends Efl.Canvas.Vg.Node implements Efl.Gfx.Gradient
 {
    [[Efl vectopr graphics gradient abstract class]]
    legacy_prefix: evas_vg_gradient;
diff --git a/src/lib/evas/canvas/efl_canvas_vg_node.eo b/src/lib/evas/canvas/efl_canvas_vg_node.eo
index 361fe741d7..b20ec58f9d 100644
--- a/src/lib/evas/canvas/efl_canvas_vg_node.eo
+++ b/src/lib/evas/canvas/efl_canvas_vg_node.eo
@@ -1,6 +1,6 @@
 import eina_types;
 
-abstract Efl.Canvas.Vg.Node (Efl.Object, Efl.Gfx.Entity, Efl.Gfx.Color, Efl.Gfx.Stack, Efl.Duplicate, Efl.Gfx.Path)
+abstract Efl.Canvas.Vg.Node extends Efl.Object implements Efl.Gfx.Entity, Efl.Gfx.Color, Efl.Gfx.Stack, Efl.Duplicate, Efl.Gfx.Path
 {
    [[Efl vector graphics abstract class]]
    eo_prefix: efl_canvas_vg_node;
diff --git a/src/lib/evas/canvas/evas_canvas3d_object.eo b/src/lib/evas/canvas/evas_canvas3d_object.eo
index 8b917cf555..987b8405d5 100644
--- a/src/lib/evas/canvas/evas_canvas3d_object.eo
+++ b/src/lib/evas/canvas/evas_canvas3d_object.eo
@@ -1,6 +1,6 @@
 import evas_canvas3d_types;
 
-abstract Evas.Canvas3D.Object (Efl.Object)
+abstract Evas.Canvas3D.Object extends Efl.Object
 {
    [[Evas 3D canvas object class]]
    data: Evas_Canvas3D_Object_Data;
diff --git a/src/lib/evas/gesture/efl_canvas_gesture.eo b/src/lib/evas/gesture/efl_canvas_gesture.eo
index d4abd7c671..731f02206a 100644
--- a/src/lib/evas/gesture/efl_canvas_gesture.eo
+++ b/src/lib/evas/gesture/efl_canvas_gesture.eo
@@ -1,6 +1,6 @@
 import efl_canvas_gesture_types;
 
-abstract Efl.Canvas.Gesture(Efl.Object)
+abstract Efl.Canvas.Gesture extends Efl.Object
 {
    [[EFL Gesture abstract class]]
    eo_prefix: efl_gesture;
diff --git a/src/lib/evas/gesture/efl_canvas_gesture_recognizer.eo b/src/lib/evas/gesture/efl_canvas_gesture_recognizer.eo
index d2a918e118..9b4bdb28d8 100644
--- a/src/lib/evas/gesture/efl_canvas_gesture_recognizer.eo
+++ b/src/lib/evas/gesture/efl_canvas_gesture_recognizer.eo
@@ -1,6 +1,6 @@
 import efl_canvas_gesture_types;
 
-abstract Efl.Canvas.Gesture_Recognizer (Efl.Object)
+abstract Efl.Canvas.Gesture_Recognizer extends Efl.Object
 {
    [[EFL Gesture Recognizer abstract class]]
    eo_prefix: efl_gesture_recognizer;